2026-07-18 18:48:23 +02:00
|
|
|
#pragma once
|
|
|
|
|
|
|
|
|
|
// Delusions of generality, but it's really just for Klammertext commands.
|
|
|
|
|
|
|
|
|
|
#include <map>
|
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).
2026-07-22 18:17:43 +02:00
|
|
|
#include <set>
|
2026-07-18 18:48:23 +02:00
|
|
|
#include <ranges>
|
|
|
|
|
#include <algorithm>
|
|
|
|
|
#include <regex>
|
|
|
|
|
|
|
|
|
|
inline std::map<std::string, std::string> regex_symbols {
|
|
|
|
|
{"'text'", R"((^[^-](?:\s|.)*))" },
|
|
|
|
|
{"'word'", R"((([^\s]+)))" },
|
|
|
|
|
{"'list'", R"((^[^-]?(?:\s|.)*))" },
|
|
|
|
|
// {"int", R"((\d))" },
|
|
|
|
|
// {"ints", R"((\d[ \d]*))" },
|
|
|
|
|
{"'verbosity'", R"(([01234]))" },
|
|
|
|
|
// {"targets", R"((html|tex|pdf|txt))" },
|
|
|
|
|
//{"'katom_display'", R"((none ?|all ?|type ?|index ?|ignored ?|replaced ?)*)" },
|
|
|
|
|
{"'katom_display'", R"(( *|none|all|type|index|ignored|replaced)*)" },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
inline std::map<std::string, std::string> regex_desc {
|
|
|
|
|
{"'verbosity'", "Verbosity during processing (0,1,2,3,4); default is 0." }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
std::regex make_regex(const std::string& key);
|
|
|
|
|
|
|
|
|
|
class Arg
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
std::string symbol();
|
|
|
|
|
void make_regex(const std::string& key);
|
|
|
|
|
|
|
|
|
|
std::string m_type {};
|
|
|
|
|
std::string m_name {};
|
|
|
|
|
std::string m_pattern {};
|
|
|
|
|
std::string m_rgx_symbol {};
|
|
|
|
|
std::regex m_rgx {};
|
|
|
|
|
std::string m_default_value {};
|
|
|
|
|
std::string m_parameter {};
|
|
|
|
|
std::string m_syntax {};
|
|
|
|
|
std::string m_desc {};
|
|
|
|
|
std::string m_value {};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
std::ostream& operator<<(std::ostream& os, const Arg& arg);
|
|
|
|
|
|
|
|
|
|
class Argv
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
static std::string delimiter;
|
|
|
|
|
void flag(const std::string& name, const std::string& desc);
|
|
|
|
|
void req(const std::string& name, const std::string& desc, const std::string& regex_pattern="'text'");
|
|
|
|
|
void opt(const std::string& name, const std::string& desc="", const std::string& parameter="", const std::string& default_value="", const std::string& regex_pattern="text");
|
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).
2026-07-22 18:17:43 +02:00
|
|
|
// A variadic option: --name collects every following word up to the
|
|
|
|
|
// next -/-- token (zero or more). get(name) returns the words
|
|
|
|
|
// space-joined; given(name) distinguishes "--name with no words"
|
|
|
|
|
// from an absent --name. Used for subcommand-style interfaces
|
|
|
|
|
// (kdesc --font install <dir>).
|
Target coverage: a klammer states the targets it serves
kdesc gains --coverage, which reports for every klammer the set of targets it
can render to, and — the point of it — which klammers' coverage cannot be
derived and must therefore be declared. Three rules: coverage is DERIVED
where the definitions determine it (a general body of klammer calls covers
the intersection of what those klammers cover, by a greatest fixpoint after
loading), DECLARED where the engine cannot interpret what decides it (an
@eval body, whose targets are undecidable), and UNKNOWN where nothing is
written — which never means "deliberately unavailable".
Two new spellings in a definition's name. A comma-separated target list,
"@@table.html,tex :: ...", gives one body several targets; it is surface
syntax, expanded at registration, and each member goes through the
redefinition rules on its own. And "@@date.* :: ..." writes the general
target out, asserting that the klammer works for EVERY target including ones
not yet defined — a stronger claim than a list of the targets defined today,
and the one target declaration that could be mechanically falsified.
The Standard Klammer Set was swept accordingly: it now has no general
definitions at all, every klammer names the targets it serves, six use ".*",
and tex and pdf are at zero undecided.
kdesc's flags are reorganised on two rules: a flag reached for often gets a
single letter (-k klammers, -t targets, -c characters, -i input), a more
specialised topic a multi-letter name (--argtypes, --katoms, --rewrite,
--optionsets, --coverage, --klammerset, --font); and -v says how much to show
about PROCESSING, never what the RESULT contains — so the katom regex column
is "--katoms full" and the coverage detail "--coverage all". NOTE: "-k" now
lists klammers (optionally filtered by a name/description search); the katom
table moved to "--katoms".
Fixes carried along: an option written with no value crashed the command with
SIGSEGV instead of reporting the mistake; two required positional arguments
never parsed; kdesc and kdiag printed an error and exited 0; and definition
diagnostics counted registrations rather than what was written, so one line
could be reported as two definitions and then printed twice.
Four new test suites: target_list, coverage, command_option, kdesc.
(from dev 46f54080bd9a)
2026-08-12 17:20:23 +02:00
|
|
|
// A variadic option: the words after the flag, up to the next one.
|
|
|
|
|
// `parameter` is shown in the usage line as "[<parameter>]" -- an option
|
|
|
|
|
// whose words are a free argument (a search phrase) should name it, so
|
|
|
|
|
// the usage says what may follow; a subcommand-style option (--font,
|
|
|
|
|
// --coverage) leaves it empty and documents its words in its own help.
|
|
|
|
|
void var(const std::string& name, const std::string& desc,
|
|
|
|
|
const std::string& parameter = "");
|
2026-07-18 18:48:23 +02:00
|
|
|
|
|
|
|
|
void update_width(Arg arg);
|
|
|
|
|
|
Klammerset: the @@@klammerset construct, its search path, and const correctness
The @@@klammerset system command formally declares a klammerset — a
named, logically related group of klammer definitions — with an
operative, idempotent declaration (:requires and :files load in order
at the declaration point, relative to the declaring file). A bare
symbol given to ktext -k, kdesc --input, or :requires resolves to
x/x.k on the search path: the document's directory, then
KLAMMERTEXT_KLAMMERSETS, then KLAMMERTEXT_HOME; kdesc --klammerset
lists the available sets. sks/sks.k is the first declared klammerset,
so `-k sks` loads the SKS by name. The engine's lookup classes were
renamed *_set → *_registry to keep the two concepts apart, and the
whole C++ tree now follows standard const-correctness conventions.
tst/ gains klammerset_test.sh (18 cases).
(from dev 64b1abf23e56)
2026-07-30 23:50:07 +02:00
|
|
|
void check_flags_and_options(const std::string& command, std::vector<std::string>& words);
|
2026-07-18 18:48:23 +02:00
|
|
|
void parse_flags(std::vector<std::string>& words, std::map<std::string, std::string>& named_args);
|
|
|
|
|
void parse_optional(std::vector<std::string>& words, std::map<std::string, std::string>& named_args);
|
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).
2026-07-22 18:17:43 +02:00
|
|
|
void parse_vars(std::vector<std::string>& words, std::map<std::string, std::string>& named_args);
|
|
|
|
|
|
|
|
|
|
// True when the named variadic option appeared on the command line
|
|
|
|
|
// (even with no following words).
|
|
|
|
|
bool given(const std::string& name) { return m_given.contains(name); };
|
2026-07-18 18:48:23 +02:00
|
|
|
|
|
|
|
|
void parse_positional(
|
Klammerset: the @@@klammerset construct, its search path, and const correctness
The @@@klammerset system command formally declares a klammerset — a
named, logically related group of klammer definitions — with an
operative, idempotent declaration (:requires and :files load in order
at the declaration point, relative to the declaring file). A bare
symbol given to ktext -k, kdesc --input, or :requires resolves to
x/x.k on the search path: the document's directory, then
KLAMMERTEXT_KLAMMERSETS, then KLAMMERTEXT_HOME; kdesc --klammerset
lists the available sets. sks/sks.k is the first declared klammerset,
so `-k sks` loads the SKS by name. The engine's lookup classes were
renamed *_set → *_registry to keep the two concepts apart, and the
whole C++ tree now follows standard const-correctness conventions.
tst/ gains klammerset_test.sh (18 cases).
(from dev 64b1abf23e56)
2026-07-30 23:50:07 +02:00
|
|
|
const std::string& command, // std::vector<std::string> words,
|
2026-07-18 18:48:23 +02:00
|
|
|
std::string pos_args, std::map<std::string, std::string>& named_args);
|
|
|
|
|
|
|
|
|
|
std::map<std::string, std::string> classify_arguments(int argc, char* argv[], bool full_parse=true);
|
|
|
|
|
void check_required(
|
|
|
|
|
const std::vector<std::string>& req_args, const std::string& command_name);
|
|
|
|
|
void check_flags(const std::map<std::string, std::string>& arg_map, const std::string& command_name);
|
|
|
|
|
|
|
|
|
|
void parse(int argc, char* argv[], bool full_parse=true);
|
|
|
|
|
std::string get(const std::string& name, bool missing_is_error=true);
|
|
|
|
|
|
|
|
|
|
bool as_bool(const std::string& name);
|
|
|
|
|
int as_int(const std::string& name);
|
|
|
|
|
int as_integer_range(const std::string& name, int low, int high);
|
|
|
|
|
int as_verbosity(const std::string& name);
|
|
|
|
|
std::string as_string(const std::string& name);
|
|
|
|
|
std::vector<std::string> as_vector(const std::string& name);
|
|
|
|
|
std::pair<std::string, std::vector<std::string>> as_input(const std::string& name, bool allow_empty=false);
|
|
|
|
|
|
|
|
|
|
void usage_line(Arg arg);
|
|
|
|
|
void usage(const std::string& command_name);
|
|
|
|
|
void describe();
|
|
|
|
|
// void describe(Argv original);
|
|
|
|
|
|
Klammerset: the @@@klammerset construct, its search path, and const correctness
The @@@klammerset system command formally declares a klammerset — a
named, logically related group of klammer definitions — with an
operative, idempotent declaration (:requires and :files load in order
at the declaration point, relative to the declaring file). A bare
symbol given to ktext -k, kdesc --input, or :requires resolves to
x/x.k on the search path: the document's directory, then
KLAMMERTEXT_KLAMMERSETS, then KLAMMERTEXT_HOME; kdesc --klammerset
lists the available sets. sks/sks.k is the first declared klammerset,
so `-k sks` loads the SKS by name. The engine's lookup classes were
renamed *_set → *_registry to keep the two concepts apart, and the
whole C++ tree now follows standard const-correctness conventions.
tst/ gains klammerset_test.sh (18 cases).
(from dev 64b1abf23e56)
2026-07-30 23:50:07 +02:00
|
|
|
bool is_flag(const std::string& name) const {
|
2026-07-18 18:48:23 +02:00
|
|
|
return std::ranges::count(m_flag_names, name) > 0;
|
|
|
|
|
}
|
|
|
|
|
|
Klammerset: the @@@klammerset construct, its search path, and const correctness
The @@@klammerset system command formally declares a klammerset — a
named, logically related group of klammer definitions — with an
operative, idempotent declaration (:requires and :files load in order
at the declaration point, relative to the declaring file). A bare
symbol given to ktext -k, kdesc --input, or :requires resolves to
x/x.k on the search path: the document's directory, then
KLAMMERTEXT_KLAMMERSETS, then KLAMMERTEXT_HOME; kdesc --klammerset
lists the available sets. sks/sks.k is the first declared klammerset,
so `-k sks` loads the SKS by name. The engine's lookup classes were
renamed *_set → *_registry to keep the two concepts apart, and the
whole C++ tree now follows standard const-correctness conventions.
tst/ gains klammerset_test.sh (18 cases).
(from dev 64b1abf23e56)
2026-07-30 23:50:07 +02:00
|
|
|
bool is_opt(const std::string& name) const {
|
2026-07-18 18:48:23 +02:00
|
|
|
return std::ranges::count(m_opt_names, name) > 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::string m_command {};
|
|
|
|
|
std::map<std::string, Arg> m_args {};
|
|
|
|
|
std::vector<std::string> m_names {};
|
|
|
|
|
std::vector<std::string> m_req_names {};
|
|
|
|
|
std::vector<std::string> m_flag_names {};
|
|
|
|
|
std::vector<std::string> m_opt_names {};
|
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).
2026-07-22 18:17:43 +02:00
|
|
|
std::vector<std::string> m_var_names {};
|
|
|
|
|
std::set<std::string> m_given {};
|
2026-07-18 18:48:23 +02:00
|
|
|
std::vector<std::string> m_hyphen_markers {};
|
2026-07-26 23:22:59 +02:00
|
|
|
// Original argv word boundaries for multi-word arguments (the single
|
|
|
|
|
// positional list and variadic --name options). as_vector() returns
|
|
|
|
|
// these, so a shell-quoted filename containing spaces stays one
|
|
|
|
|
// element; the space-joined m_value remains only for get()/describe().
|
|
|
|
|
std::map<std::string, std::vector<std::string>> m_vectors {};
|
2026-07-18 18:48:23 +02:00
|
|
|
long unsigned int m_syntax_size = 0;
|
|
|
|
|
};
|