Characters that killed a render, what may sit next to a klammer, and ref/

A character written in the ^...^ mnemonic form -- ^oe^, ^zz^, ^hello^ --
used to kill ktext outright: no message, no output, and an exit status
that looked like a crash because it was one.  Only the forms that happen
to spell hexadecimal digits escaped, and they were right by luck rather
than by reading.  Any caret form that names no character is now a located
error that quotes what was written.

A klammer may now sit inside square brackets and braces as it already
could inside parentheses, and may be followed by the punctuation that
ends a sentence: [@i word@], {@b word@}, @i word@'s.  The rule is a fixed
list of characters, because none of them can occur inside a klammer name
and so none of them is ambiguous next to a delimiter.  A letter still
cannot: "x@" is the named closing delimiter, so a letter before "@" has
two readings and no rule can separate them.

The abbreviations an author writes -- the hyphen form @i-word, a klammer
glued to its neighbouring punctuation -- are now recognised as author
conveniences only.  They are not applied to @@ definitions or @@@ system
commands, which are written by someone who needs no such shorthand and
whose forms are already whole.

Also fixed, each of them silent: an exported shell function in the
environment broke every @eval in the document; a line break written with
@nl was destroyed when it passed through a klammer that generates a
table, printing as \textbackslash{}newline in the finished PDF; and
"kdesc --coverage" shortened its file column by comparing the spelling of
a path rather than the path, so a klammer set reached by a symbolic link
showed a full path where its neighbours showed a short one.

New in the distribution: ref/, a small klammerset that describes the
Klammermachine's own tables in Klammertext.  It currently provides the
character tables -- the diacritics and the extended Latin letters -- as
klammers that render to any target, so the documentation of what can be
written cannot drift from what the machine accepts.  It is early, and
will grow.

The Klammertext taxonomy now has a section on targets, describes the
@@@klammerset system command alongside the other three, and states the
precedence of "^" -- what a caret means before a letter, a digit, a
punctuation character, and a quote, in one ordered list.

(from dev 6594c7ff8c1f)
This commit is contained in:
ack committed 2026-09-07 22:37:05 +02:00
1 parent b80e823ab3
commit e4f1307aa9
53 files changed
+2014 -350

No files matched your search

+23 -3
View File
@@ -4,6 +4,7 @@
#include <ostream>
#include <set>
#include "file.h"
#include "coverage.h"
#include "machine.h"
#include "katom.h"
@@ -121,9 +122,28 @@ std::string short_path(const std::string& path)
}
const char* home = std::getenv("KLAMMERTEXT_HOME");
if (home != nullptr) {
std::string prefix = std::string(home) + "/";
if (path.size() > prefix.size() && path.compare(0, prefix.size(), prefix) == 0) {
return path.substr(prefix.size());
// Compare CANONICAL paths, not the spellings. The engine resolves a
// definition's file to its physical path, while KLAMMERTEXT_HOME is
// whatever the user typed -- and on macOS those routinely differ,
// because /tmp and /var are symlinks to /private/tmp and
// /private/var. A plain prefix test then fails and every row prints
// its full path instead of the tail, which is exactly what the
// report exists to avoid. Seen 2026-09-07 on the distribution leg,
// where KLAMMERTEXT_HOME was /var/folders/.../dist and the files
// resolved to /private/var/folders/.../dist.
//
// weakly_canonical rather than canonical: it does not require the
// path to exist, so a stale or generated location still shortens
// instead of throwing. Errors are swallowed -- an unshortened path
// is a cosmetic loss, never a reason to fail a report.
std::error_code ec {};
fs::path home_real = fs::weakly_canonical(fs::path(home), ec);
fs::path path_real = fs::weakly_canonical(fs::path(path), ec);
std::string prefix = (ec ? std::string(home) : home_real.string()) + "/";
const std::string& subject = ec ? path : path_real.string();
if (subject.size() > prefix.size()
&& subject.compare(0, prefix.size(), prefix) == 0) {
return subject.substr(prefix.size());
}
}
return path;