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)
121 lines
3.8 KiB
Python
121 lines
3.8 KiB
Python
import re
|
|
import textwrap
|
|
import pprint
|
|
|
|
import klammer_base
|
|
import phases
|
|
import kutil
|
|
import latex_util
|
|
import html_util
|
|
from html_util import E
|
|
import color
|
|
|
|
class Indent(klammer_base.Klammer_base):
|
|
def __init__(self, K):
|
|
super().__init__(K)
|
|
# Doesn't do anything now:
|
|
# self.s = kutil.escape(self.s)
|
|
if self.right < 0:
|
|
self.right = self.left
|
|
self.reduce = self.left + self.right
|
|
|
|
def html(self):
|
|
text_align = "justify" if not self.ragged else "left"
|
|
return E("div").body(self.s)\
|
|
.sty("margin", f"0.5rem {self.right}ex 0.5rem {self.left}ex")\
|
|
.sty("text-align", text_align)\
|
|
.str()
|
|
def tex(self):
|
|
if self.ragged:
|
|
self.s = "\\raggedright " + self.s
|
|
result = rf"\hspace*{{{self.left}ex}}" + latex_util.minipage(
|
|
self.s, rf"\linewidth - {self.reduce}ex", center=False)
|
|
result = latex_util.block(result)
|
|
return result
|
|
|
|
def txt(self):
|
|
indent = phases.txt_nbsp_marker() * self.left # a space that survives
|
|
width = int(self.Target_txt_width) - self.left - self.right + 1 # Off-by one for textwrap
|
|
result = self.s
|
|
result = re.sub("KK0022", '"', result)
|
|
result = indent + f"\n{indent}".join(textwrap.wrap(result, width=width, break_on_hyphens=True))
|
|
return result
|
|
|
|
|
|
class Note(klammer_base.Klammer_base):
|
|
def __init__(self, K):
|
|
super().__init__(K)
|
|
|
|
def html(self):
|
|
result = E("div").cls("box")\
|
|
.sty("width", f"{self.width*100}%")\
|
|
.sty("background-color", html_util.color(self.color))\
|
|
.sty("border-color", html_util.color(self.border_color))\
|
|
.sty("margin-left", "auto")\
|
|
.body(f"<b>{self.label}:</b> {self.s}")\
|
|
.str()
|
|
return result
|
|
|
|
def tex(self):
|
|
return latex_util.color_box(
|
|
f"\\textbf{{{self.label}:}} {self.s}",
|
|
self.width, self.color, self.border_color)
|
|
|
|
|
|
class Block(klammer_base.Klammer_base):
|
|
def __init__(self, K):
|
|
super().__init__(K)
|
|
|
|
def tex(self):
|
|
# NOT latex_util.block(): a textblock is absolutely positioned and
|
|
# does not participate in the normal flow, so breaking the paragraph
|
|
# around it would move the surrounding text.
|
|
to_x, to_y = [float(e) for e in self.to.split()]
|
|
pt_x, pt_y = [float(e) for e in self.point.split()]
|
|
result = f"""
|
|
\\begin{{textblock}}{{{self.width}}}[{pt_x},{pt_y}]({to_x},{to_y})
|
|
\\vspace*{{-1\\parskip}}
|
|
{self.content.strip()}
|
|
\\end{{textblock}}
|
|
"""
|
|
return result
|
|
|
|
|
|
class Lines(klammer_base.Klammer_base):
|
|
def __init__(self, K):
|
|
super().__init__(K)
|
|
self.lines = self.s.split("\n")
|
|
|
|
def html(self):
|
|
result = ""
|
|
for line in self.lines:
|
|
result += line + "<br/>\n"
|
|
return result
|
|
|
|
def tex(self):
|
|
return "\\\\\n".join(self.lines) + "\n"
|
|
|
|
def txt(self):
|
|
return self.lines
|
|
|
|
class Left_right(klammer_base.Klammer_base):
|
|
def __init__(self, K):
|
|
super().__init__(K)
|
|
self.rows = list(zip(self.parts[0], self.parts[1]))
|
|
|
|
def html(self):
|
|
result = ""
|
|
for left, right in self.rows:
|
|
result += E("div").body(
|
|
E("span").cls("left_right").body(left).str() + \
|
|
E("span").cls("left_right").sty("text-align", "right").body(right).str()).str();
|
|
result = E("p").body(result).str()
|
|
return result
|
|
|
|
def tex(self):
|
|
result = ""
|
|
for left, right in self.rows:
|
|
result += rf"\parbox{{\linewidth}}{{{left} \hfill {right}}}" + " \\\\\n"
|
|
result = result[:-3]
|
|
return result
|