Typed arguments, calculated tables, spans, closed-world fonts, top-level fnt/ and env/
Sync with klammertext-dev through b90b0e09: - Argument types end to end: :python_cast values are applied (Python @eval receives real bools/numbers/lists), argument values are validated against their argtype patterns with the argtype's description as the error message, argtypes can declare :default (overridable per declaration), and parameterized type families are supported: rest(N) casts a rest argument to an N-dimensional list (bar-count = dimension). - Unified indexed_range syntax (selector with parenthesized subsets, composable mnemonic names) for table lines and spans. - Table klammer: caption fonts fixed in both targets, :column_width / :leading / :colsep wired, :colspan and :rowspan render (HTML attributes; \multicolumn / \multirow), calculated cell values (:calc) with prefix operators, display-precision semantics, :calc_format and :decimal period|comma. - Fonts: closed-world resolution on the Klammertext font store (infrastructure in mac/font_store; no Google Fonts links or fetch). Default fonts live in the top-level fnt/; additional fonts install into KLAMMERTEXT_FONTS directories via kdesc --font (list, samples, preview, install — classification by font metadata). CSS font family names are quoted (digit-initial families were silently lost). - Environment files moved from mac/env/ to the top-level env/; shell profiles source env/runtime.env. Dead per-host variants removed. - Container: fnt/ ships in the image; curl removed (no network use).
This commit is contained in:
13
mac/state.h
13
mac/state.h
@@ -15,12 +15,14 @@ class Var
|
||||
public:
|
||||
Var() = default;
|
||||
Var(std::string name, std::string value=klammerstate::no_value,
|
||||
std::string delim=":", std::string desc="", Locator loc=Locator())
|
||||
std::string delim=":", std::string desc="", Locator loc=Locator(),
|
||||
Argtype argtype=Argtype())
|
||||
: m_name(name)
|
||||
, m_value(value)
|
||||
, m_delim(delim)
|
||||
, m_desc(desc)
|
||||
, m_loc(loc)
|
||||
, m_argtype(argtype)
|
||||
{};
|
||||
bool defined();
|
||||
|
||||
@@ -29,6 +31,7 @@ public:
|
||||
std::string m_delim {};
|
||||
std::string m_desc {};
|
||||
Locator m_loc {};
|
||||
Argtype m_argtype {};
|
||||
};
|
||||
|
||||
namespace klammerstate {
|
||||
@@ -44,7 +47,8 @@ public:
|
||||
|
||||
std::vector<std::string> names() const;
|
||||
void set(std::string name, std::string value,
|
||||
std::string delim=":", std::string desc="", Locator loc=Locator());
|
||||
std::string delim=":", std::string desc="", Locator loc=Locator(),
|
||||
Argtype argtype=Argtype());
|
||||
std::pair<Var, bool> get(std::string name);
|
||||
|
||||
std::string m_name {};
|
||||
@@ -58,8 +62,11 @@ public:
|
||||
void open_frame(std::string name);
|
||||
void close_frame();
|
||||
void set(std::string name, std::string value, bool update=false,
|
||||
std::string delim=" ", std::string desc="", Locator loc=Locator());
|
||||
std::string delim=" ", std::string desc="", Locator loc=Locator(),
|
||||
Argtype argtype=Argtype());
|
||||
void set(std::map<std::string, std::string> varmap);
|
||||
void set(const std::map<std::string, std::string>& varmap,
|
||||
const Parameter_set& parameters);
|
||||
void replace(std::string name, std::string value, bool error_if_not_defined=true);
|
||||
void add_environment_frame();
|
||||
Var get(std::string name, bool error_if_not_defined=false, Locator loc=Locator());
|
||||
|
||||
Reference in New Issue
Block a user