2026-07-18 18:48:23 +02:00
|
|
|
#pragma once
|
|
|
|
|
|
|
|
|
|
#include "argtype.h"
|
|
|
|
|
|
|
|
|
|
// The Parameter class describes both parameters (in definitions) and
|
|
|
|
|
// arguments (in applications). Parameters are the primary concept:
|
|
|
|
|
// a designer declares parameters, and a writer supplies arguments to
|
|
|
|
|
// fill them. The class is named for the definition side because
|
|
|
|
|
// definitions come first; the Argument alias is used at application sites.
|
|
|
|
|
class Parameter
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
Parameter()
|
|
|
|
|
: m_name("_default")
|
|
|
|
|
, m_argtype(Argtype())
|
|
|
|
|
, m_optional(false)
|
|
|
|
|
, m_default("")
|
|
|
|
|
, m_loc()
|
|
|
|
|
, m_target()
|
|
|
|
|
{};
|
|
|
|
|
|
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
|
|
|
Parameter(const std::string& name, const Argtype& argtype, const Locator& loc,
|
|
|
|
|
bool optional=false, const std::string& default_value = "");
|
2026-07-18 18:48:23 +02:00
|
|
|
~Parameter() = default;
|
|
|
|
|
|
|
|
|
|
bool undefined() const { return m_name == "_default"; };
|
|
|
|
|
|
|
|
|
|
std::string m_name {};
|
|
|
|
|
Argtype m_argtype; // {};
|
|
|
|
|
bool m_optional {};
|
|
|
|
|
std::string m_default {};
|
Option sets: a .o target for shared parameters
A named group of optional parameters, declared once and used by several
klammers, so a writer learns one vocabulary instead of a spelling per
klammer. The "o" target is a pseudo-target beside "k": "k" declares a
klammer's interface and documents it, "o" declares an option interface and
documents it, and neither produces output for any target.
@@caption_args.o :caption :number.bool true :caption_side.side
: Arguments that define a caption for a block element @@
@@code.k :filename @hpos_args :hpos left @ @caption_args :caption_side top @
| text.literal : A source file displayed verbatim @@
A set is used only in the parameter list of a ".k" declaration -- the one
place a klammer's interface is declared once for all of its targets -- and
is resolved as that list is read. Names and types come from the set; a
default may be overridden where it is used. A klammer application in a
parameter list is now a definition-time error.
The SKS gains the sets caption_args and hpos_args (:hpos and :offset), and
@table, @image, @image_grid, @reference and @show gain .k declarations. A
distance is no longer written as a position: :hpos 4em is rejected, and the
same layout is :hpos left :offset 4em. Code listings are numbered by
default, like tables and figures.
New engine sources mac/option_set{,_registry}.{h,cpp}; tst/ ships two more
suites, option_set_test.sh and signature_test.sh (twelve in all).
(from dev 34e536cb0329)
2026-08-06 13:11:37 +02:00
|
|
|
// Where m_default came from, for kdesc provenance display. Default
|
|
|
|
|
// resolution has three levels -- the argument type's :default, an option
|
|
|
|
|
// set's declaration, and the site where the set is used (or the klammer's
|
|
|
|
|
// own parameter list) -- and a reader of kdesc is entitled to know which
|
|
|
|
|
// one produced the value a klammer will use when the argument is absent.
|
|
|
|
|
// True when m_default was filled from the argument type's :default:
|
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
|
|
|
bool m_default_from_type {};
|
Option sets: a .o target for shared parameters
A named group of optional parameters, declared once and used by several
klammers, so a writer learns one vocabulary instead of a spelling per
klammer. The "o" target is a pseudo-target beside "k": "k" declares a
klammer's interface and documents it, "o" declares an option interface and
documents it, and neither produces output for any target.
@@caption_args.o :caption :number.bool true :caption_side.side
: Arguments that define a caption for a block element @@
@@code.k :filename @hpos_args :hpos left @ @caption_args :caption_side top @
| text.literal : A source file displayed verbatim @@
A set is used only in the parameter list of a ".k" declaration -- the one
place a klammer's interface is declared once for all of its targets -- and
is resolved as that list is read. Names and types come from the set; a
default may be overridden where it is used. A klammer application in a
parameter list is now a definition-time error.
The SKS gains the sets caption_args and hpos_args (:hpos and :offset), and
@table, @image, @image_grid, @reference and @show gain .k declarations. A
distance is no longer written as a position: :hpos 4em is rejected, and the
same layout is :hpos left :offset 4em. Code listings are numbered by
default, like tables and figures.
New engine sources mac/option_set{,_registry}.{h,cpp}; tst/ ships two more
suites, option_set_test.sh and signature_test.sh (twelve in all).
(from dev 34e536cb0329)
2026-08-06 13:11:37 +02:00
|
|
|
// The option set (".o" target) this parameter was declared in; empty when
|
|
|
|
|
// it was declared in the klammer's own parameter list.
|
|
|
|
|
std::string m_option_set {};
|
|
|
|
|
// True when the option set declares a default for this parameter and the
|
|
|
|
|
// declaration using the set overrode it.
|
|
|
|
|
bool m_default_overridden {};
|
2026-07-18 18:48:23 +02:00
|
|
|
Locator m_loc;
|
|
|
|
|
std::string m_target {};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
using Argument = Parameter;
|