ack/klammertext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Klammerset: the @@@klammerset construct, its search path, and const correctness

Browse Source 
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:
Andy Kopra
2026-07-30 23:50:07 +02:00
parent c42981f7e2
commit ef77f03584
83 changed files with 1429 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sks/kutil/kutil.cpp
View File

@@ -10,7 +10,7 @@
#include <filesystem>
std::string read_file(std::string filename)
std::string read_file(const std::string& filename)
{
std::ifstream stream {};
std::ostringstream buffer {};
@@ -36,7 +36,7 @@ std::string klammertext_dir()
return kdir;
}
bool in_subset(std::string base, std::vector<std::string> subset)
bool in_subset(const std::string& base, const std::vector<std::string>& subset)
{
return subset.empty() ||
(std::find(subset.begin(), subset.end(), base) != subset.end());
@@ -44,7 +44,7 @@ bool in_subset(std::string base, std::vector<std::string> subset)
std::vector<std::string> sks_files_of_type(std::string extension, std::vector<std::string> subset)
std::vector<std::string> sks_files_of_type(const std::string& extension, const std::vector<std::string>& subset)
{
bool dbg = false;
std::string kdir = klammertext_dir();
@@ -85,7 +85,7 @@ std::vector<std::string> sks_files_of_type(std::string extension, std::vector<st
return result;
}
std::string find_kt_file(std::string filename)
std::string find_kt_file(const std::string& filename)
{
std::string result {};
std::vector<std::string> prefix {"", "kt/"};
@@ -117,7 +117,7 @@ std::string find_kt_file(std::string filename)
}
std::string caption_marker(std::string name, std::string caption, std::string delimiter)
std::string caption_marker(const std::string& name, const std::string& caption, const std::string& delimiter)
{
std::string result {caption};
if (caption.size() > 0) {
@@ -128,7 +128,7 @@ std::string caption_marker(std::string name, std::string caption, std::string de
}
/*
std::string process(Machine& M, std::string target, fs::path source_filename,
std::string process(Machine& M, const std::string& target, const fs::path& source_filename,
bool post_process, bool unescape_chars)
{
// Text text(source_filename, false, false);
@@ -144,7 +144,7 @@ std::string process(Machine& M, std::string target, fs::path source_filename,
return processed;
}
std::string process(Machine& M, std::string target, std::string source_text,
std::string process(Machine& M, const std::string& target, const std::string& source_text,
bool post_process, bool unescape_chars)
{
Text text(source_text, false, false);
@@ -157,8 +157,8 @@ std::string process(Machine& M, std::string target, std::string source_text,
return processed;
}
std::string process(Machine& M, std::string target,
std::string source_text, fs::path source_filename,
std::string process(Machine& M, const std::string& target,
const std::string& source_text, const fs::path& source_filename,
bool post_process, bool unescape_chars)
{
Text text({source_text}, {source_filename}, false, false);