CTAN sync 202208270300

4 files changed, 59 insertions, 23 deletions

diff --git a/macros/generic/markdown/examples/context-mkii.tex b/macros/generic/markdown/examples/context-mkii.tex
index 19a7fb2931..7a49793ab8 100644
--- a/macros/generic/markdown/examples/context-mkii.tex
+++ b/macros/generic/markdown/examples/context-mkii.tex
@@ -7,16 +7,23 @@
 \usemodule[t][markdown]
 
 % Set options of the Markdown module.
-\def\markdownOptionHashEnumerators{true}
-\def\markdownOptionDefinitionLists{true}
-\def\markdownOptionSmartEllipses{true}
-\def\markdownOptionFootnotes{true}
-\def\markdownOptionInlineFootnotes{true}
-\def\markdownOptionFencedCode{true}
-\def\markdownOptionContentBlocks{true}
-\def\markdownOptionPipeTables{true}
-\def\markdownOptionTableCaptions{true}
-\def\markdownOptionTaskLists{true}
+\setupmarkdown
+  [
+    hashEnumerators = yes,
+    definitionLists = yes,
+    smartEllipses = yes,
+    footnotes = yes,
+    inlineFootnotes = yes,
+    fencedCode = yes,
+    contentBlocks = yes,
+    pipeTables = yes,
+    tableCaptions = yes,
+    taskLists = yes,
+    strikeThrough = yes,
+    superscripts = yes,
+    subscripts = yes,
+    fancyLists = yes,
+  ]
 
 % Set renderers of the Markdown module.
 \definetyping
@@ -30,7 +37,7 @@
 
 % Typeset the document `example.md` by letting the Markdown package handle
 % the conversion internally.
-\markdownInput{./example.md}
+\inputmarkdown{./example.md}
 
 % Typeset the document `example.tex` that we prepared separately using the
 % Lua command-line interface and that contains a plain TeX representation
diff --git a/macros/generic/markdown/examples/context-mkiv.tex b/macros/generic/markdown/examples/context-mkiv.tex
index 825632c5aa..419b34b554 100644
--- a/macros/generic/markdown/examples/context-mkiv.tex
+++ b/macros/generic/markdown/examples/context-mkiv.tex
@@ -7,16 +7,23 @@
 \usemodule[t][markdown]
 
 % Set options of the Markdown module.
-\def\markdownOptionHashEnumerators{true}
-\def\markdownOptionDefinitionLists{true}
-\def\markdownOptionSmartEllipses{true}
-\def\markdownOptionFootnotes{true}
-\def\markdownOptionInlineFootnotes{true}
-\def\markdownOptionFencedCode{true}
-\def\markdownOptionContentBlocks{true}
-\def\markdownOptionPipeTables{true}
-\def\markdownOptionTableCaptions{true}
-\def\markdownOptionTaskLists{true}
+\setupmarkdown
+  [
+    hashEnumerators = yes,
+    definitionLists = yes,
+    smartEllipses = yes,
+    footnotes = yes,
+    inlineFootnotes = yes,
+    fencedCode = yes,
+    contentBlocks = yes,
+    pipeTables = yes,
+    tableCaptions = yes,
+    taskLists = yes,
+    strikeThrough = yes,
+    superscripts = yes,
+    subscripts = yes,
+    fancyLists = yes,
+  ]
 
 % Set renderers of the Markdown module.
 \definehighlight
@@ -42,7 +49,7 @@
 
 % Typeset the document `example.md` by letting the Markdown package handle
 % the conversion internally.
-\markdownInput{./example.md}
+\inputmarkdown{./example.md}
 
 % Typeset the document `example.tex` that we prepared separately using the
 % Lua command-line interface and that contains a plain TeX representation
diff --git a/macros/generic/markdown/examples/example.md b/macros/generic/markdown/examples/example.md
index 63a16eecfd..24ca2c6362 100644
--- a/macros/generic/markdown/examples/example.md
+++ b/macros/generic/markdown/examples/example.md
@@ -65,6 +65,16 @@ This is an ordered list:
 
 7. the third item of an ordered list.
 
+This is a fancy ordered list:
+
+e) The first item of an ordered list
+
+   that spans several paragraphs,
+
+f) the second item of an ordered list,
+
+g) the third item of an ordered list.
+
 This is an ordered list using hash enumerators:
 
 #. The first item of an ordered list
@@ -87,6 +97,12 @@ This is a compact ordered list using hash enumerators:
 #. the second item of an ordered list,
 #. the third item of an ordered list.
 
+This is a compact fancy ordered list using hash enumerators:
+
+#) The first item of an ordered list,
+#) the second item of an ordered list,
+#) the third item of an ordered list.
+
 This is a task list:
 
 * [ ] Some unfinished task
@@ -102,7 +118,7 @@ This is a definition list:
 
 Term 1
 
-:   Definition 1
+:   Definition 1 with some ~~removed text~~
 
 Term 2
 
@@ -122,6 +138,8 @@ Term 2
 :   Definition 2
 :   Definition 3
 
+This is a ^superscript^ and a ~subscript~.
+
 This is a block quote:
 
 > This is the first level of quoting.
diff --git a/macros/generic/markdown/examples/latex.tex b/macros/generic/markdown/examples/latex.tex
index a09706a8ae..e29f9a418b 100644
--- a/macros/generic/markdown/examples/latex.tex
+++ b/macros/generic/markdown/examples/latex.tex
@@ -27,6 +27,10 @@
   pipeTables,
   tableCaptions,
   taskLists,
+  strikeThrough,
+  superscripts,
+  subscripts,
+  fancyLists,
 ]{markdown}
 \begin{markdown*}{hybrid}
 ---