Typed arguments, calculated tables, spans, closed-world fonts, top-level fnt/ and env/
Sync with klammertext-dev through b90b0e09: - Argument types end to end: :python_cast values are applied (Python @eval receives real bools/numbers/lists), argument values are validated against their argtype patterns with the argtype's description as the error message, argtypes can declare :default (overridable per declaration), and parameterized type families are supported: rest(N) casts a rest argument to an N-dimensional list (bar-count = dimension). - Unified indexed_range syntax (selector with parenthesized subsets, composable mnemonic names) for table lines and spans. - Table klammer: caption fonts fixed in both targets, :column_width / :leading / :colsep wired, :colspan and :rowspan render (HTML attributes; \multicolumn / \multirow), calculated cell values (:calc) with prefix operators, display-precision semantics, :calc_format and :decimal period|comma. - Fonts: closed-world resolution on the Klammertext font store (infrastructure in mac/font_store; no Google Fonts links or fetch). Default fonts live in the top-level fnt/; additional fonts install into KLAMMERTEXT_FONTS directories via kdesc --font (list, samples, preview, install — classification by font metadata). CSS font family names are quoted (digit-initial families were silently lost). - Environment files moved from mac/env/ to the top-level env/; shell profiles source env/runtime.env. Dead per-host variants removed. - Container: fnt/ ships in the image; curl removed (no network use).
This commit is contained in:
@@ -73,9 +73,8 @@ def make_caption_text(number, label, text, font_symbol, font_size):
|
||||
# caption = text # f"{{\\small \\it \\par {caption_text}}}"
|
||||
caption = text
|
||||
|
||||
font_symbol = "r"
|
||||
font_size = 1.2
|
||||
|
||||
if caption is None:
|
||||
return ""
|
||||
caption = font.tex_fontify(caption, font_symbol, font_size)
|
||||
return caption
|
||||
|
||||
@@ -108,9 +107,9 @@ def add_caption(element, caption_label, number, caption_text, latex_width,
|
||||
# minipage(caption),
|
||||
latex_width, vertical="t")
|
||||
elif side == "top":
|
||||
element = minipage(caption + "\n" + element,
|
||||
# minipage(caption, vertical="t") +
|
||||
# caption_margin + "\n" +
|
||||
# minipage(element),
|
||||
# A depth strut: the bottom-caption case uses \vstrut (height)
|
||||
# above the caption; a top caption needs the mirror image,
|
||||
# space below its line.
|
||||
element = minipage(caption + "\\rule[-0.75\\baselineskip]{0pt}{0pt}\n" + element,
|
||||
latex_width, vertical="t")
|
||||
return caption_wrapper(element, hpos)
|
||||
|
||||
Reference in New Issue
Block a user