Merge branch 'feat/universal-themes'

CHANGES.md

@@ -2,8 +2,13 @@
 
 ## 3.3.0
 
+Development:
+
+- Add support for universal (cross-format) themes. (#276, #373)
+
 Fixes:
 
+- Prevent unwanted space tokens before `*ContextEnd` renderers. (#373)
 - Make ConTeXt command `\inputmarkdown` properly process extra options.
   (#389, #390, contributed by @ibotty)
 
@@ -13,6 +18,17 @@ Documentation:
   (#381, #382, contributed by @solernou)
 - Encourage alternatives to the `hybrid` option in the user manual. (#382)
 
+Speed Improvements:
+
+- Optimize needless catcode switching in package code. (3eb7231)
+
+Default Renderer Prototypes:
+
+- Fix the typesetting of level four headings with attributes for LaTeX document
+  classes without the `\chapter` command such as `article` and level five
+  headings for LaTeX document classes with the `\chapter` command such as
+  `book`. (86eefc0)
+
 ## 3.2.1 (2023-11-23)
 
 Fixes:

Dockerfile

@@ -80,11 +80,11 @@ mkdir -p                                               ${INSTALL_DIR}/scripts/ma
 cp ${BUILD_DIR}/markdown-cli.lua                       ${INSTALL_DIR}/scripts/markdown/
 mkdir -p                                               ${INSTALL_DIR}/tex/generic/markdown/
 cp ${BUILD_DIR}/markdown.tex                           ${INSTALL_DIR}/tex/generic/markdown/
+cp ${BUILD_DIR}/markdownthemewitiko_tilde.tex          ${INSTALL_DIR}/tex/generic/markdown/
 mkdir -p                                               ${INSTALL_DIR}/tex/latex/markdown/
 cp ${BUILD_DIR}/markdown.sty                           ${INSTALL_DIR}/tex/latex/markdown/
 cp ${BUILD_DIR}/markdownthemewitiko_dot.sty            ${INSTALL_DIR}/tex/latex/markdown/
 cp ${BUILD_DIR}/markdownthemewitiko_graphicx_http.sty  ${INSTALL_DIR}/tex/latex/markdown/
-cp ${BUILD_DIR}/markdownthemewitiko_tilde.sty          ${INSTALL_DIR}/tex/latex/markdown/
 mkdir -p                                               ${INSTALL_DIR}/tex/context/third/markdown/
 cp ${BUILD_DIR}/t-markdown.tex                         ${INSTALL_DIR}/tex/context/third/markdown/
 

Makefile

@@ -45,7 +45,7 @@ DOCUMENTATION=$(TECHNICAL_DOCUMENTATION) $(HTML_USER_MANUAL) $(ROOT_README) $(VE
 LIBRARIES=libraries/markdown-tinyyaml.lua
 INSTALLABLES=markdown.lua markdown-cli.lua markdown.tex markdown.sty t-markdown.tex \
   markdownthemewitiko_dot.sty markdownthemewitiko_graphicx_http.sty \
-  markdownthemewitiko_tilde.sty
+  markdownthemewitiko_tilde.tex
 EXTRACTABLES=$(INSTALLABLES) $(MARKDOWN_USER_MANUAL) $(TECHNICAL_DOCUMENTATION_RESOURCES)
 MAKEABLES=$(TECHNICAL_DOCUMENTATION) $(USER_MANUAL) $(INSTALLABLES) $(EXAMPLES)
 RESOURCES=$(DOCUMENTATION) $(EXAMPLES_RESOURCES) $(EXAMPLES_SOURCES) $(EXAMPLES) \
@@ -126,6 +126,9 @@ $(EXTRACTABLES): $(INSTALLER) $(DTXARCHIVE)
 	    -e 's#(((VERSION)))#$(VERSION)#g' \
 	    -e 's#(((LASTMODIFIED)))#$(LASTMODIFIED)#g' \
 	    $(INSTALLABLES)
+	sed -i \
+	    -e '/\\ExplSyntaxOff/{N;/\\ExplSyntaxOn/d;}' \
+	    $(INSTALLABLES)
 
 # This target produces the version file.
 $(VERSION_FILE): force
@@ -138,10 +141,12 @@ $(LIBRARIES): force
 # This target typesets the manual.
 $(TECHNICAL_DOCUMENTATION): $(DTXARCHIVE) $(TECHNICAL_DOCUMENTATION_RESOURCES)
 	latexmk -silent $< || (cat $(basename $@).log 1>&2; exit 1)
-	test `tail $(basename $<).log | sed -rn 's/.*\(([0-9]*) pages.*/\1/p'` -gt 350
+	test `tail $(basename $<).log | sed -rn 's/.*\(([0-9]*) pages.*/\1/p'` -ge 380
 
 # This pseudotarget continuously typesets the manual.
 preview: $(DTXARCHIVE) $(TECHNICAL_DOCUMENTATION_RESOURCES)
+	-mkdir markdown/
+	-ln -s ../markdown.tex markdown/markdown.tex
 	latexmk -silent -pvc $<
 
 # These targets typeset the examples.
@@ -209,9 +214,9 @@ $(TDSARCHIVE): $(DTXARCHIVE) $(INSTALLER) $(INSTALLABLES) $(DOCUMENTATION) $(EXA
 	  tex/context/third/markdown scripts/markdown
 	cp markdown.lua $(LIBRARIES) tex/luatex/markdown/
 	cp markdown-cli.lua scripts/markdown/
-	cp markdown.sty markdownthemewitiko_dot.sty markdownthemewitiko_graphicx_http.sty \
-	  markdownthemewitiko_tilde.sty tex/latex/markdown/
-	cp markdown.tex tex/generic/markdown/
+	cp markdown.sty markdownthemewitiko_graphicx_http.sty markdownthemewitiko_dot.sty \
+	  tex/latex/markdown/
+	cp markdown.tex markdownthemewitiko_tilde.tex tex/generic/markdown/
 	cp t-markdown.tex tex/context/third/markdown/
 	@# Installing the documentation.
 	mkdir -p doc/generic/markdown doc/latex/markdown/examples \