2026-07-18 18:48:23 +02:00
|
|
|
# Klammertext mac/ Makefile
|
|
|
|
|
# Improved version with automatic header dependency tracking
|
|
|
|
|
|
|
|
|
|
K := $(KLAMMERTEXT_HOME)
|
|
|
|
|
KS := $(K)/sks
|
|
|
|
|
|
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).
2026-07-22 18:17:43 +02:00
|
|
|
include $(K)/env/makefile.env
|
2026-07-18 18:48:23 +02:00
|
|
|
|
|
|
|
|
# Source files
|
|
|
|
|
BASENAMES := util error locator file argv character ktype katom katom_list \
|
Klammerset: the @@@klammerset construct, its search path, and const correctness
The @@@klammerset system command formally declares a klammerset — a
named, logically related group of klammer definitions — with an
operative, idempotent declaration (:requires and :files load in order
at the declaration point, relative to the declaring file). A bare
symbol given to ktext -k, kdesc --input, or :requires resolves to
x/x.k on the search path: the document's directory, then
KLAMMERTEXT_KLAMMERSETS, then KLAMMERTEXT_HOME; kdesc --klammerset
lists the available sets. sks/sks.k is the first declared klammerset,
so `-k sks` loads the SKS by name. The engine's lookup classes were
renamed *_set → *_registry to keep the two concepts apart, and the
whole C++ tree now follows standard const-correctness conventions.
tst/ gains klammerset_test.sh (18 cases).
(from dev 64b1abf23e56)
2026-07-30 23:50:07 +02:00
|
|
|
log show command argument argument_set argtype argtype_registry \
|
|
|
|
|
state eval eval_python eval_cpp klammer klammer_registry klammerset klammerset_registry deftype \
|
Recursion guard and static klammer checking
A klammer that reaches itself, directly or through a cycle, expanded
until the C++ stack was exhausted: the process died from SIGSEGV with no
message and no location. The former limit guarded only the top-level
fixed-point iteration, never the descent through klammer application. A
depth guard now raises a recursion error naming the klammer and where it
was applied. The same loop's termination test moves from "the katom list
stopped growing" to "a pass applied no klammer", since a klammer whose
body expands to nothing is a reduction that adds no katoms; exceeding the
round limit is now an error rather than a message followed by rendering a
document with live klammers still in it.
ktext --check locates every klammer application written in a document or
in a klammer body and checks name existence, argument count, option
names, and target coverage without applying anything, reporting all
problems at once. This is possible because Klammertext has no catcodes:
katom structure is fixed when a file is read, so a klammer body has a
determinate shape before it is expanded. The check therefore reaches what
the engine cannot -- the branch of a @cond that is not selected, and
bodies a given render never enters.
@cond's set of truth values is an open language question, so its meaning
is unchanged here; an unrecognized predicate now warns, giving its value
and location.
tst/ gains recursion_test.sh (7 cases) and check_test.sh (19 cases), and
this snapshot's test Makefile is generated from the shipped suite list so
the two cannot drift apart.
(from dev c27e63802406)
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-08-01 15:41:43 +02:00
|
|
|
target target_registry machine font_store check
|
2026-07-18 18:48:23 +02:00
|
|
|
|
|
|
|
|
SOURCES := $(addsuffix .cpp,$(BASENAMES))
|
|
|
|
|
OBJECTS := $(addsuffix .o,$(BASENAMES))
|
|
|
|
|
HEADERS := $(addsuffix .h,$(BASENAMES))
|
|
|
|
|
DEPFILES := $(addsuffix .d,$(BASENAMES))
|
|
|
|
|
|
|
|
|
|
# Shared library
|
|
|
|
|
LIBDIR := ../lib
|
|
|
|
|
LIBRARY := $(LIBDIR)/libklammertext.so
|
|
|
|
|
|
|
|
|
|
# Compiler flags for dependency generation
|
|
|
|
|
DEPFLAGS = -MMD -MP -MF $(@:.o=.d)
|
|
|
|
|
|
|
|
|
|
# Pattern rule for object files with automatic dependency generation
|
|
|
|
|
%.o : %.cpp
|
|
|
|
|
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(DEPFLAGS) $< -o $@
|
|
|
|
|
|
|
|
|
|
# Default target
|
|
|
|
|
.PHONY: all sks clean redo clang
|
|
|
|
|
|
|
|
|
|
all : $(LIBRARY)
|
|
|
|
|
$(MAKE) sks
|
|
|
|
|
|
|
|
|
|
# Create lib directory
|
|
|
|
|
$(LIBDIR):
|
|
|
|
|
mkdir -p $(LIBDIR)
|
|
|
|
|
|
|
|
|
|
# Build shared library
|
|
|
|
|
$(LIBRARY): $(OBJECTS) | $(LIBDIR)
|
|
|
|
|
$(CXX) $(CXXFLAGS) $(LDFLAGS) $(SHARED) $(SONAME) -o $@ $(OBJECTS) $(LDLIBS)
|
|
|
|
|
|
|
|
|
|
# Build sks components
|
|
|
|
|
sks :
|
|
|
|
|
$(MAKE) -C $(KS)/kutil
|
|
|
|
|
$(MAKE) -C $(KS)/target
|
|
|
|
|
$(MAKE) -C $(KS)/document
|
|
|
|
|
|
|
|
|
|
clean :
|
|
|
|
|
rm -f $(OBJECTS) $(DEPFILES) $(LIBRARY) *~
|
|
|
|
|
|
|
|
|
|
redo :
|
|
|
|
|
ifneq ($(filter clang,$(MAKECMDGOALS)),)
|
|
|
|
|
@:
|
|
|
|
|
else
|
|
|
|
|
$(MAKE) clean
|
|
|
|
|
$(MAKE) -j all
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# "make clang" = incremental build; "make clang redo" = full clean rebuild
|
|
|
|
|
clang :
|
|
|
|
|
$(MAKE) $(or $(filter-out clang,$(MAKECMDGOALS)),all) COMPILER=clang
|
|
|
|
|
|
|
|
|
|
# Include generated dependency files (if they exist)
|
|
|
|
|
-include $(DEPFILES)
|