ack
e4f1307aa9
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)
52 lines
2.7 KiB
C++
52 lines
2.7 KiB
C++
#pragma once
|
|
|
|
#include "katom.h"
|
|
|
|
// Finding katoms in text by MATCHING: at each
|
|
// position, the katom type that matches the most characters wins, and the
|
|
// position advances past it. No text is divided and no katom rewrite rule
|
|
// is consulted.
|
|
//
|
|
// A COMPONENT, not a katomization method in itself -- which is what the
|
|
// name says. The composition that makes a method of it,
|
|
// katomize_text_by_matching(), lives in katomize.{h,cpp} beside the entry
|
|
// point for katomization by rewriting, because naming the process is that
|
|
// file's job and this one only supplies a way of doing part of it.
|
|
//
|
|
// It is built into libklammertext.so but NOTHING IN THE ENGINE CALLS IT:
|
|
// katomization goes through katomize.{h,cpp}, which divides text by the
|
|
// rules. This is the alternative, kept so the two stay comparable
|
|
// (dbg/katomize_compare.sh --which category,matching) and so the question
|
|
// stays open rather than being settled by deletion.
|
|
//
|
|
// The claim under test is not "this is faster" or "this is more correct".
|
|
// It is that matching over the EXISTING katom_types table is easier for one
|
|
// person to hold in their head than 30 ordered katom rewrite rules. It
|
|
// diverges on 153 of 9,694 corpus lines, every one of them prose that
|
|
// MENTIONS syntax rather than using it -- so the choice is not between two
|
|
// readings of the language but between two behaviours on text that is not
|
|
// quite in it.
|
|
|
|
// The character stream to katoms, longest match at each position. No
|
|
// rewriting, no recursion.
|
|
katom_list katomize_by_matching(const std::string& s, const std::string& source, int source_line);
|
|
|
|
// Desugaring only: the abbreviated form @name-arg-arg becomes the katoms
|
|
// @name arg | arg @. A separate pass over the katom list, because it is a
|
|
// separate job -- it INSERTS a delimiter that was not in the source, which
|
|
// is a source-to-source transform and not a question about where katoms
|
|
// begin and end. In katomization by rewriting these two jobs share one loop.
|
|
katom_list expand_abbreviations(const katom_list& katoms);
|
|
|
|
|
|
// Whether a katom type is something the SOURCE can contain. Five of the
|
|
// katom_t values are processing STATES a katom is later moved into
|
|
// (replaced, ignored, literal, eval_result, ws_added), not source
|
|
// categories, and their entries in katom_types carry no usable pattern --
|
|
// four are the empty string, which as a regex matches everywhere and would
|
|
// stall any katomizer. See notes/Klammertext_improvements.md §1: "katom_t
|
|
// mixes source categories with processing states". The rewrite katomizer
|
|
// never trips over this because it only ever asks whole-text "does this
|
|
// match", and an empty pattern matches only the empty string there.
|
|
bool appears_in_source(katom_t type);
|