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:
@@ -9,9 +9,9 @@
|
||||
@@ol.k list_items.rest :cmp.bool false :initial.int 1 : Ordered list, with numbered list elements. @@
|
||||
@@ol :: @eval list.List(K, "ol") eval@ @@
|
||||
|
||||
@@define descriptions.rest :font i : @eval list.Define(K) eval@ @@
|
||||
@@define descriptions.rest(2) :font i : @eval list.Define(K) eval@ @@
|
||||
|
||||
@@columns items.rest :n.int 2 : @eval list.columns(K) eval@ @@
|
||||
@@columns items :n.int 2 : @eval list.columns(K) eval@ @@
|
||||
##
|
||||
|
||||
#[
|
||||
|
||||
@@ -11,9 +11,7 @@ class List(klammer_base.Klammer_base):
|
||||
def __init__(self, K, list_type):
|
||||
super().__init__(K)
|
||||
self.list_type = list_type
|
||||
self.items = kutil.rest_args(self.list_items)
|
||||
if self.items[-1].strip() == "":
|
||||
self.items = self.items[:-1]
|
||||
self.items = self.list_items
|
||||
word_count = max([len(e.strip().split()) for e in self.items])
|
||||
self.compressed = False #and word_count < int(self.List_compressed_word_max)
|
||||
|
||||
@@ -31,11 +29,11 @@ class List(klammer_base.Klammer_base):
|
||||
command = {'ol' : 'enumerate', 'ul' : 'itemize'}[self.list_type]
|
||||
init = ""
|
||||
if self.__dict__.get("initial") and self.initial != 1:
|
||||
init = "\\addtocounter{enumi}{" + str(int(self.initial) - 1) + "}"
|
||||
init = "\\addtocounter{enumi}{" + str(self.initial - 1) + "}"
|
||||
#topsep = '[noitemsep,topsep=0pt]'
|
||||
topsep = "[noitemsep,topsep=0pt," if self.compressed else "[topsep=0pt,itemsep=2pt,"
|
||||
topsep += "leftmargin=16pt]"
|
||||
listsep = '\\setlist{nolistsep}' if self.cmp == 'true' else ''
|
||||
listsep = '\\setlist{nolistsep}' if self.cmp else ''
|
||||
result = f'{listsep}\n\\begin{{{command}}}{topsep}{init}\n{body}\n\\end{{{command}}}\n'
|
||||
return result
|
||||
|
||||
@@ -58,7 +56,7 @@ class List(klammer_base.Klammer_base):
|
||||
class Define(klammer_base.Klammer_base):
|
||||
def __init__(self, K):
|
||||
super().__init__(K)
|
||||
self.items = kutil.rest_args(self.descriptions, 2)
|
||||
self.items = self.descriptions
|
||||
#self.show()
|
||||
#pprint.pprint(self.items)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user