Remove redundant parameters to fancy list item renderers

Witiko · Aug 20, 2022 · 4fcf3ad · 4fcf3ad
1 parent 981db4b
commit 4fcf3ad
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 89 deletions.
diff --git a/markdown.dtx b/markdown.dtx
@@ -11314,9 +11314,7 @@ receives a single numeric argument that corresponds to the item number.
 The \mdef{markdownRendererFancyOlItem} macro represents an item in a fancy
 ordered list. This macro will only be produced, when the \Opt{startNumber}
 option is disabled and the \Opt{fancyLists} option is enabled. The macro receives
-two arguments: the style of the list item labels, and the style of delimiters
-between list item labels and texts. See the
-\mref{markdownRendererFancyOlBegin} macro for the valid style values.
+no arguments.
 
 % \end{markdown}
 %
@@ -11335,7 +11333,7 @@ between list item labels and texts. See the
 \prop_put:Nnn
   \g_@@_renderer_arities_prop
   { fancyOlItem }
-  { 2 }
+  { 0 }
 \ExplSyntaxOff
 %    \end{macrocode}
 % \par
@@ -11382,10 +11380,8 @@ option is enabled. The macro receives no arguments.
 
 The \mdef{markdownRendererFancyOlItemWithNumber} macro represents an item in a
 fancy ordered list. This macro will only be produced, when the \Opt{startNumber}
-and \Opt{tightLists} options are enabled. The macro receives three arguments:
-the style of the list item labels, the style of delimiters between list item
-labels and texts, and the item number. See the
-\mref{markdownRendererFancyOlBegin} macro for the valid style values.
+and \Opt{fancyLists} options are enabled. The macro receives a single numeric
+argument that corresponds to the item number.
 
 % \end{markdown}
 %
@@ -11404,7 +11400,7 @@ labels and texts, and the item number. See the
 \prop_put:Nnn
   \g_@@_renderer_arities_prop
   { fancyOlItemWithNumber }
-  { 3 }
+  { 1 }
 \ExplSyntaxOff
 %    \end{macrocode}
 % \par
@@ -22568,7 +22564,7 @@ M.extensions.fancy_lists = function()
         local buffer = {}
         local num = startnum
         for _,item in ipairs(items) do
-          buffer[#buffer + 1] = self.fancyitem(item,numstyle,numdelim,num)
+          buffer[#buffer + 1] = self.fancyitem(item,num)
           if num ~= nil then
             num = num + 1
           end
@@ -22589,20 +22585,17 @@ M.extensions.fancy_lists = function()
 %
 % Define \luamdef{writer->fancyitem} as a function that will transform an
 % input fancy ordered list item to the output format, where `s` is the text of
-% the list item, `numstyle` is the style of the list item labels, and
-% `numdelim` is the style of delimiters between list item labels. If the
-% optional parameter `num` is present, it is the number of the list item.
+% the list item. If the optional parameter `num` is present, it is the number
+% of the list item.
 %
 % \end{markdown}
 %  \begin{macrocode}
-      function self.fancyitem(s,numstyle,numdelim,num)
+      function self.fancyitem(s,num)
         if num ~= nil then
-          return {"\\markdownRendererFancyOlItemWithNumber{",numstyle,
-                  "}{",numdelim,"}{",num,"}",s,
+          return {"\\markdownRendererFancyOlItemWithNumber{",num,"}",s,
                   "\\markdownRendererFancyOlItemEnd "}
         else
-          return {"\\markdownRendererFancyOlItem{",numstyle,"}{",numdelim,
-                  "}",s,"\\markdownRendererFancyOlItemEnd "}
+          return {"\\markdownRendererFancyOlItem ",s,"\\markdownRendererFancyOlItemEnd "}
         end
       end
     end, extend_reader = function(self)
@@ -22954,8 +22947,8 @@ end
 \def\markdownRendererOlItemPrototype{}%
 \def\markdownRendererOlItemWithNumberPrototype#1{}%
 \def\markdownRendererOlItemEndPrototype{}%
-\def\markdownRendererFancyOlItemPrototype#1#2{\markdownRendererOlItem}%
-\def\markdownRendererFancyOlItemWithNumberPrototype#1#2#3{\markdownRendererOlItemWithNumber{#3}}%
+\def\markdownRendererFancyOlItemPrototype{\markdownRendererOlItem}%
+\def\markdownRendererFancyOlItemWithNumberPrototype{\markdownRendererOlItemWithNumber}%
 \def\markdownRendererFancyOlItemEndPrototype{}%
 \def\markdownRendererOlEndPrototype{}%
 \def\markdownRendererOlEndTightPrototype{}%
@@ -24326,8 +24319,12 @@ end
 %  \begin{macrocode}
 \ExplSyntaxOn
 \@ifpackageloaded{paralist}{
+  \tl_new:N
+    \l_@@_latex_fancy_list_item_label_number_style_tl
+  \tl_new:N
+    \l_@@_latex_fancy_list_item_label_delimiter_style_tl
   \cs_new:Nn
-    \@@_latex_translate_list_item_label_number:nn
+    \@@_latex_fancy_list_item_label_number:nn
     {
       \str_case:nn
         { #1 }
@@ -24340,7 +24337,7 @@ end
         }
     }
   \cs_new:Nn
-    \@@_latex_translate_list_item_label_delimiter:n
+    \@@_latex_fancy_list_item_label_delimiter:n
     {
       \str_case:nn
         { #1 }
@@ -24351,11 +24348,11 @@ end
         }
     }
   \cs_new:Nn
-    \@@_latex_translate_list_item_label:nnn
+    \@@_latex_fancy_list_item_label:nnn
     {
-      \@@_latex_translate_list_item_label_delimiter:n
+      \@@_latex_fancy_list_item_label_delimiter:n
         { #2 }
-      \@@_latex_translate_list_item_label_number:nn
+      \@@_latex_fancy_list_item_label_number:nn
         { #1 }
         { #3 }
     }
@@ -24371,28 +24368,56 @@ end
           { LowerAlpha } { a }
           { UpperAlpha } { A }
         }
-      \@@_latex_translate_list_item_label_delimiter:n
+      \@@_latex_fancy_list_item_label_delimiter:n
         { #2 }
     }
   \markdownSetup{rendererPrototypes={
     ulBeginTight = {\begin{compactitem}},
     ulEndTight = {\end{compactitem}},
     fancyOlBegin = {
+      \group_begin:
+      \tl_set:Nn
+        \l_@@_latex_fancy_list_item_label_number_style_tl
+        { #1 }
+      \tl_set:Nn
+        \l_@@_latex_fancy_list_item_label_delimiter_style_tl
+        { #2 }
       \begin{enumerate}[ \@@_latex_paralist_style:nn { #1 } { #2 } ]
     },
-    fancyOlEnd = {\end{enumerate}},
+    fancyOlEnd = {
+      \end{enumerate}
+      \group_end:
+    },
     olBeginTight = {\begin{compactenum}},
     olEndTight = {\end{compactenum}},
     fancyOlBeginTight = {
+      \group_begin:
+      \tl_set:Nn
+        \l_@@_latex_fancy_list_item_label_number_style_tl
+        { #1 }
+      \tl_set:Nn
+        \l_@@_latex_fancy_list_item_label_delimiter_style_tl
+        { #2 }
       \begin{compactenum}[ \@@_latex_paralist_style:nn { #1 } { #2 } ]
     },
-    fancyOlEndTight = {\end{compactenum}},
+    fancyOlEndTight = {
+      \end{compactenum}
+      \group_end:
+    },
     fancyOlItemWithNumber = {
       \markdownRendererOlItemWithNumber
-        { \@@_latex_translate_list_item_label:nnn { #1 } { #2 } { #3 } }
+        {
+          \@@_latex_fancy_list_item_label:VVn
+            \l_@@_latex_fancy_list_item_label_number_style_tl
+            \l_@@_latex_fancy_list_item_label_delimiter_style_tl
+            { #1 }
+        }
     },
     dlBeginTight = {\begin{compactdesc}},
     dlEndTight = {\end{compactdesc}}}}
+  \cs_generate_variant:Nn
+    \@@_latex_fancy_list_item_label:nnn
+    { VVn }
 }{
   \markdownSetup{rendererPrototypes={
     ulBeginTight = {\markdownRendererUlBegin},

diff --git a/tests/support/markdownthemewitiko_markdown_test.sty b/tests/support/markdownthemewitiko_markdown_test.sty
@@ -128,18 +128,11 @@
     olItemWithNumber = {%
       \TYPE{olItemWithNumber:      #1}},
     fancyOlItem = {%
-      \TYPE{BEGIN fancyOlItem}%
-      \TYPE{- numstyle:            #1}%
-      \TYPE{- numdelim:            #2}%
-      \TYPE{END fancyOlItem}},
+      \TYPE{fancyOlItem}},
     fancyOlItemEnd = {%
       \TYPE{fancyOlItemEnd}},
     fancyOlItemWithNumber = {%
-      \TYPE{BEGIN fancyOlItemWithNumber}%
-      \TYPE{- numstyle:            #1}%
-      \TYPE{- numdelim:            #2}%
-      \TYPE{- number:              #3}%
-      \TYPE{END fancyOlItemWithNumber}},
+      \TYPE{fancyOlItemWithNumber: #1}},
     olEnd = {%
       \TYPE{olEnd}},
     olEndTight = {%

diff --git a/tests/support/plain-setup.tex b/tests/support/plain-setup.tex
@@ -112,19 +112,12 @@
   \TYPE{olItemEnd}}%
 \def\markdownRendererOlItemWithNumber#1{%
   \TYPE{olItemWithNumber:      #1}}%
-\def\markdownRendererFancyOlItem#1#2{%
-  \TYPE{BEGIN fancyOlItem}%
-  \TYPE{- numstyle:            #1}%
-  \TYPE{- numdelim:            #2}%
-  \TYPE{END fancyOlItem}}%
+\def\markdownRendererFancyOlItem{%
+  \TYPE{fancyOlItem}}%
 \def\markdownRendererFancyOlItemEnd{%
   \TYPE{fancyOlItemEnd}}%
-\def\markdownRendererFancyOlItemWithNumber#1#2#3{%
-  \TYPE{BEGIN fancyOlItemWithNumber}%
-  \TYPE{- numstyle:            #1}%
-  \TYPE{- numdelim:            #2}%
-  \TYPE{- number:              #3}%
-  \TYPE{END fancyOlItemWithNumber}}%
+\def\markdownRendererFancyOlItemWithNumber#1{%
+  \TYPE{fancyOlItemWithNumber: #1}}%
 \def\markdownRendererOlEnd{%
   \TYPE{olEnd}}%
 \def\markdownRendererOlEndTight{%

diff --git a/tests/testfiles/lunamark-markdown/fancy-lists.test b/tests/testfiles/lunamark-markdown/fancy-lists.test
@@ -43,17 +43,9 @@ BEGIN fancyOlBegin
 - numstyle: LowerRoman
 - numdelim: Period
 END fancyOlBegin
-BEGIN fancyOlItemWithNumber
-- numstyle: LowerRoman
-- numdelim: Period
-- number: 4
-END fancyOlItemWithNumber
+fancyOlItemWithNumber: 4
 fancyOlItemEnd
-BEGIN fancyOlItemWithNumber
-- numstyle: LowerRoman
-- numdelim: Period
-- number: 5
-END fancyOlItemWithNumber
+fancyOlItemWithNumber: 5
 fancyOlItemEnd
 fancyOlEnd
 interblockSeparator
@@ -63,11 +55,9 @@ BEGIN fancyOlBeginTight
 - numstyle: UpperRoman
 - numdelim: Period
 END fancyOlBeginTight
-BEGIN fancyOlItemWithNumber
-- numstyle: UpperRoman
-- numdelim: Period
-- number: 4
-END fancyOlItemWithNumber
+fancyOlItemWithNumber: 4
+fancyOlItemEnd
+fancyOlItemWithNumber: 5
 fancyOlItemEnd
 fancyOlEndTight
 interblockSeparator
@@ -77,17 +67,9 @@ BEGIN fancyOlBegin
 - numstyle: LowerAlpha
 - numdelim: Period
 END fancyOlBegin
-BEGIN fancyOlItemWithNumber
-- numstyle: LowerAlpha
-- numdelim: Period
-- number: 4
-END fancyOlItemWithNumber
+fancyOlItemWithNumber: 4
 fancyOlItemEnd
-BEGIN fancyOlItemWithNumber
-- numstyle: LowerAlpha
-- numdelim: Period
-- number: 5
-END fancyOlItemWithNumber
+fancyOlItemWithNumber: 5
 fancyOlItemEnd
 fancyOlEnd
 interblockSeparator
@@ -97,11 +79,9 @@ BEGIN fancyOlBeginTight
 - numstyle: UpperAlpha
 - numdelim: Period
 END fancyOlBeginTight
-BEGIN fancyOlItemWithNumber
-- numstyle: UpperAlpha
-- numdelim: Period
-- number: 4
-END fancyOlItemWithNumber
+fancyOlItemWithNumber: 4
+fancyOlItemEnd
+fancyOlItemWithNumber: 5
 fancyOlItemEnd
 fancyOlEndTight
 interblockSeparator
@@ -111,17 +91,9 @@ BEGIN fancyOlBegin
 - numstyle: Decimal
 - numdelim: OneParen
 END fancyOlBegin
-BEGIN fancyOlItemWithNumber
-- numstyle: Decimal
-- numdelim: OneParen
-- number: 4
-END fancyOlItemWithNumber
+fancyOlItemWithNumber: 4
 fancyOlItemEnd
-BEGIN fancyOlItemWithNumber
-- numstyle: Decimal
-- numdelim: OneParen
-- number: 5
-END fancyOlItemWithNumber
+fancyOlItemWithNumber: 5
 fancyOlItemEnd
 fancyOlEnd
 documentEnd