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)
This commit is contained in:
@@ -11,12 +11,12 @@ using numbered_element_spec = std::tuple<std::string, std::string, std::string>;
|
||||
//using numbered_elements = std::vector<std::vector<numbered_element_spec>>;
|
||||
using numbered_elements = std::vector<numbered_element_spec>;
|
||||
|
||||
numbered_elements html_line_states(std::vector<std::string> lines);
|
||||
numbered_elements latex_line_states(std::vector<std::string> lines);
|
||||
numbered_elements html_line_states(const std::vector<std::string>& lines);
|
||||
numbered_elements latex_line_states(const std::vector<std::string>& lines);
|
||||
|
||||
std::pair<std::string, int> add_html_caption_numbers(std::string html_text, int& chapter_number);
|
||||
std::string add_latex_caption_numbers(std::string text);
|
||||
std::pair<std::string, int> add_html_caption_numbers(const std::string& html_text, int& chapter_number);
|
||||
std::string add_latex_caption_numbers(const std::string& text);
|
||||
|
||||
std::string resolve_caption_references(
|
||||
std::string target, std::vector<std::string> lines, numbered_elements states);
|
||||
const std::string& target, const std::vector<std::string>& lines, numbered_elements states);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user