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:
@@ -8,8 +8,8 @@ const std::string link_delimiter { "%" };
|
||||
|
||||
class Heading {
|
||||
public:
|
||||
Heading(int level, std::string filename, std::string section, std::string id,
|
||||
std::string number, std::string title)
|
||||
Heading(int level, const std::string& filename, const std::string& section, const std::string& id,
|
||||
const std::string& number, const std::string& title)
|
||||
: m_level(level), m_filename(filename), m_section(section), m_id(id),
|
||||
m_number(number), m_title(title)
|
||||
{};
|
||||
@@ -25,7 +25,7 @@ std::ostream& operator<<(std::ostream& os, const Heading h);
|
||||
|
||||
/*
|
||||
std::tuple<std::string, std::vector<Heading>, std::vector<unsigned int>, unsigned int>
|
||||
add_section_numbers(std::string s, std::string basename, std::vector<unsigned int> levels, unsigned int initial_id,
|
||||
add_section_numbers(const std::string& s, const std::string& basename, std::vector<unsigned int> levels, unsigned int initial_id,
|
||||
std::map<std::string, std::string>& section_id_map);
|
||||
*/
|
||||
|
||||
@@ -35,7 +35,7 @@ std::pair<int, std::string>
|
||||
make_navigation_table_of_contents(std::vector<Heading> headings);
|
||||
|
||||
void show_table_of_contents(
|
||||
std::string kt_filename, std::string title, std::vector<Heading> headings);
|
||||
const std::string& kt_filename, const std::string& title, std::vector<Heading> headings);
|
||||
|
||||
std::string cache_table_of_contents(
|
||||
std::string kt_root_filename, std::string title, std::vector<Heading> headings);
|
||||
const std::string& kt_root_filename, const std::string& title, std::vector<Heading> headings);
|
||||
|
||||
Reference in New Issue
Block a user