[201_25] 有序列表添加括号和半括号

TeXmacs/packages/customize/list/prefix-enumerations.ts

@@ -4,7 +4,7 @@
 
 <\body>
   <active*|<\src-title>
-    <src-package|prefix-enumerations|1.0>
+    <src-package|prefix-enumerations|1.2>
 
     <\src-purpose>
       Prefix nested enumerations by the outer counter
@@ -33,14 +33,24 @@
 
   <assign|prefix-enumerate-numeric|true>
 
+  <assign|prefix-enumerate-numeric-bracket|true>
+
   <assign|prefix-enumerate-numeric-paren|true>
 
   <assign|prefix-enumerate-roman|true>
 
+  <assign|prefix-enumerate-roman-bracket|true>
+
+  <assign|prefix-enumerate-roman-paren|true>
+
   <assign|prefix-enumerate-Roman|true>
 
   <assign|prefix-enumerate-alpha|true>
 
+  <assign|prefix-enumerate-alpha-bracket|true>
+
+  <assign|prefix-enumerate-alpha-full-paren|true>
+
   <assign|prefix-enumerate-Alpha|true>
 
   <assign|prefix-enumerate-circle|true>
@@ -52,4 +62,4 @@
   <\collection>
     <associate|sfactor|7>
   </collection>
-</initial>
+</initial>

TeXmacs/packages/standard/std-list.ts

@@ -4,7 +4,7 @@
 
 <\body>
   <active*|<\src-title>
-    <src-package|std-list|1.0>
+    <src-package|std-list|1.3>
 
     <\src-purpose>
       Standard list environments
@@ -56,6 +56,8 @@
 
   <assign|aligned-paren-item|<macro|name|<aligned-item|(<arg|name>)<item-spc>>>>
 
+  <assign|aligned-full-paren-item|<macro|name|<aligned-item|(<arg|name>)<item-spc>>>>
+
   <assign|aligned-strong-dot-item|<macro|name|<aligned-item|<item-strong|<arg|name>.<item-spc>>>>>
 
   <assign|compact-space-item|<macro|name|<compact-item|<arg|name> \ >>>
@@ -266,14 +268,24 @@
 
   <new-list|enumerate-numeric|<value|aligned-dot-item>|<value|identity>>
 
+  <new-list|enumerate-numeric-bracket|<value|aligned-bracket-item>|<value|identity>>
+
   <new-list|enumerate-numeric-paren|<value|aligned-paren-item>|<value|identity>>
 
   <new-list|enumerate-roman|<value|aligned-dot-item>|<macro|name|<number|<arg|name>|roman>>>
 
+  <new-list|enumerate-roman-bracket|<value|aligned-bracket-item>|<macro|name|<number|<arg|name>|roman>>>
+
+  <new-list|enumerate-roman-paren|<value|aligned-paren-item>|<macro|name|<number|<arg|name>|roman>>>
+
   <new-list|enumerate-Roman|<value|aligned-dot-item>|<macro|name|<number|<arg|name>|Roman>>>
 
   <new-list|enumerate-alpha|<value|aligned-dot-item>|<macro|name|<number|<arg|name>|alpha>>>
 
+  <new-list|enumerate-alpha-bracket|<value|aligned-bracket-item>|<macro|name|<number|<arg|name>|alpha>>>
+
+  <new-list|enumerate-alpha-full-paren|<value|aligned-full-paren-item>|<macro|name|<number|<arg|name>|alpha>>>
+
   <new-list|enumerate-Alpha|<value|aligned-dot-item>|<macro|name|<number|<arg|name>|Alpha>>>
 
   <new-list|enumerate-circle|<value|aligned-item>|<macro|name|<number|<arg|name>|circle>>>
@@ -294,4 +306,4 @@
 </body>
 
 <initial|<\collection>
-</collection>>
+</collection>>

TeXmacs/plugins/html/progs/convert/html/tmhtml-expand.scm

@@ -33,8 +33,10 @@
              chapter-title section-title subsection-title subsubsection-title
              paragraph-title subparagraph-title
              itemize itemize-minus itemize-dot itemize-arrow
-             enumerate enumerate-numeric enumerate-roman
-             enumerate-Roman enumerate-alpha enumerate-Alpha
+             enumerate enumerate-numeric enumerate-numeric-bracket
+             enumerate-roman enumerate-roman-bracket enumerate-roman-paren
+             enumerate-Roman enumerate-alpha enumerate-alpha-bracket
+             enumerate-alpha-full-paren enumerate-Alpha
              description description-compact description-dash
              description-aligned description-long description-paragraphs item*
          strong em dfn code* samp kbd var abbr acronym

TeXmacs/plugins/html/progs/convert/html/tmhtml.scm

@@ -2051,8 +2051,11 @@
   ;; Lists
   ((:or itemize itemize-minus itemize-dot itemize-arrow)
    ,tmhtml-itemize)
-  ((:or enumerate enumerate-numeric enumerate-roman enumerate-Roman
-        enumerate-alpha enumerate-Alpha)
+  ((:or enumerate enumerate-numeric enumerate-numeric-bracket
+        enumerate-roman enumerate-roman-bracket enumerate-roman-paren
+        enumerate-Roman
+        enumerate-alpha enumerate-alpha-bracket
+        enumerate-alpha-full-paren enumerate-Alpha)
    ,tmhtml-enumerate)
   ((:or description description-compact description-dash
         description-aligned description-long description-paragraphs)

TeXmacs/plugins/lang/dic/en_US/zh_CN.scm

@@ -689,11 +689,16 @@
 ("enumerate Alpha" "有序列表(大写字母)")
 ("enumerate Roman" "有序列表(大写罗马数字)")
 ("enumerate alpha" "有序列表(小写字母)")
+("enumerate alpha bracket" "有序列表(带右括号小写字母)")
+("enumerate alpha full paren" "有序列表(带括号小写字母)")
 ("enumerate circle" "有序列表(带圈数字)")
 ("enumerate hanzi" "有序列表(汉字数字)")
 ("enumerate numeric" "有序列表(阿拉伯数字)")
+("enumerate numeric bracket" "有序列表(带右括号阿拉伯数字)")
 ("enumerate numeric paren" "有序列表(带括号阿拉伯数字)")
 ("enumerate roman" "有序列表(小写罗马数字)")
+("enumerate roman bracket" "有序列表(带右括号小写罗马数字)")
+("enumerate roman paren" "有序列表(带括号小写罗马数字)")
 ("enumerate" "有序列表")
 ("enunciation" "语义块")
 ("env" "")

TeXmacs/plugins/lang/dic/en_US/zh_TW.scm

@@ -453,8 +453,16 @@
 ("enumerate Alpha" "有序列表(大寫字母)")
 ("enumerate Roman" "有序列表(大寫羅馬數字)")
 ("enumerate alpha" "有序列表(小寫字母)")
+("enumerate alpha bracket" "有序列表(帶右括號小寫字母)")
+("enumerate alpha full paren" "有序列表(帶括號小寫字母)")
+("enumerate circle" "有序列表(帶圈數字)")
+("enumerate hanzi" "有序列表(漢字數字)")
 ("enumerate numeric" "有序列表(阿拉伯數字)")
+("enumerate numeric bracket" "有序列表(帶右括號阿拉伯數字)")
+("enumerate numeric paren" "有序列表(帶括號阿拉伯數字)")
 ("enumerate roman" "有序列表(小寫羅馬數字)")
+("enumerate roman bracket" "有序列表(帶右括號小寫羅馬數字)")
+("enumerate roman paren" "有序列表(帶括號小寫羅馬數字)")
 ("enumerate" "有序列舉")
 ("enunciation" "說明")
 ("env" "")

TeXmacs/plugins/latex/progs/convert/latex/latex-define.scm

@@ -634,9 +634,14 @@
 (latex-texmacs-itemize "itemizedot" "$\\bullet$")
 (latex-texmacs-itemize "itemizearrow" "$\\rightarrow$")
 (latex-texmacs-enumerate "enumeratenumeric" "1.")
+(latex-texmacs-enumerate "enumeratenumericbracket" "1{\\textup{)}}")
 (latex-texmacs-enumerate "enumerateroman" "i.")
+(latex-texmacs-enumerate "enumerateromanbracket" "i{\\textup{)}}")
+(latex-texmacs-enumerate "enumerateromanparen" "(i)")
 (latex-texmacs-enumerate "enumerateromancap" "I.")
 (latex-texmacs-enumerate "enumeratealpha" "a{\\textup{)}}")
+(latex-texmacs-enumerate "enumeratealphabracket" "a{\\textup{)}}")
+(latex-texmacs-enumerate "enumeratealphafullparen" "(a)")
 (latex-texmacs-enumerate "enumeratealphacap" "A.")
 (latex-texmacs-description "descriptioncompact")
 (latex-texmacs-description "descriptionaligned")

TeXmacs/plugins/latex/progs/convert/latex/latex-texmacs-drd.scm

@@ -228,9 +228,14 @@
   ("itemizedot" 0)
   ("itemizearrow" 0)
   ("enumeratenumeric" 0)
+  ("enumeratenumericbracket" 0)
   ("enumerateroman" 0)
+  ("enumerateromanbracket" 0)
+  ("enumerateromanparen" 0)
   ("enumerateromancap" 0)
   ("enumeratealpha" 0)
+  ("enumeratealphabracket" 0)
+  ("enumeratealphafullparen" 0)
   ("enumeratealphacap" 0)
   ("descriptioncompact" 0)
   ("descriptionaligned" 0)
@@ -240,8 +245,11 @@
 
 (logic-group latex-texmacs-list%
   begin-itemizeminus begin-itemizedot begin-itemizearrow
-  begin-enumeratenumeric begin-enumerateroman begin-enumerateromancap
-  begin-enumeratealpha begin-enumeratealphacap
+  begin-enumeratenumeric begin-enumeratenumericbracket
+  begin-enumerateroman begin-enumerateromanbracket
+  begin-enumerateromanparen begin-enumerateromancap
+  begin-enumeratealpha begin-enumeratealphabracket
+  begin-enumeratealphafullparen begin-enumeratealphacap
   begin-descriptioncompact begin-descriptionaligned
   begin-descriptiondash begin-descriptionlong begin-descriptionparagraphs)
 

TeXmacs/plugins/latex/progs/convert/latex/tmtex.scm

@@ -3143,8 +3143,11 @@
   ((:or description description-compact description-aligned
         description-dash description-long description-paragraphs
         itemize itemize-minus itemize-dot itemize-arrow
-        enumerate enumerate-numeric enumerate-roman enumerate-Roman
-        enumerate-alpha enumerate-Alpha enumerate-hanzi)
+        enumerate enumerate-numeric enumerate-numeric-bracket
+        enumerate-roman enumerate-roman-bracket enumerate-roman-paren
+        enumerate-Roman
+        enumerate-alpha enumerate-alpha-bracket
+        enumerate-alpha-full-paren enumerate-Alpha enumerate-hanzi)
    (,tmtex-list-env 1))
   ((:or folded unfolded folded-plain unfolded-plain folded-std unfolded-std
         folded-explain unfolded-explain folded-env unfolded-env

TeXmacs/progs/convert/latex/latex-define.scm

@@ -634,9 +634,14 @@
 (latex-texmacs-itemize "itemizedot" "$\\bullet$")
 (latex-texmacs-itemize "itemizearrow" "$\\rightarrow$")
 (latex-texmacs-enumerate "enumeratenumeric" "1.")
+(latex-texmacs-enumerate "enumeratenumericbracket" "1{\\textup{)}}")
 (latex-texmacs-enumerate "enumerateroman" "i.")
+(latex-texmacs-enumerate "enumerateromanbracket" "i{\\textup{)}}")
+(latex-texmacs-enumerate "enumerateromanparen" "(i)")
 (latex-texmacs-enumerate "enumerateromancap" "I.")
 (latex-texmacs-enumerate "enumeratealpha" "a{\\textup{)}}")
+(latex-texmacs-enumerate "enumeratealphabracket" "a{\\textup{)}}")
+(latex-texmacs-enumerate "enumeratealphafullparen" "(a)")
 (latex-texmacs-enumerate "enumeratealphacap" "A.")
 (latex-texmacs-description "descriptioncompact")
 (latex-texmacs-description "descriptionaligned")

TeXmacs/progs/convert/latex/latex-texmacs-drd.scm

@@ -228,9 +228,14 @@
   ("itemizedot" 0)
   ("itemizearrow" 0)
   ("enumeratenumeric" 0)
+  ("enumeratenumericbracket" 0)
   ("enumerateroman" 0)
+  ("enumerateromanbracket" 0)
+  ("enumerateromanparen" 0)
   ("enumerateromancap" 0)
   ("enumeratealpha" 0)
+  ("enumeratealphabracket" 0)
+  ("enumeratealphafullparen" 0)
   ("enumeratealphacap" 0)
   ("descriptioncompact" 0)
   ("descriptionaligned" 0)
@@ -240,8 +245,11 @@
 
 (logic-group latex-texmacs-list%
   begin-itemizeminus begin-itemizedot begin-itemizearrow
-  begin-enumeratenumeric begin-enumerateroman begin-enumerateromancap
-  begin-enumeratealpha begin-enumeratealphacap
+  begin-enumeratenumeric begin-enumeratenumericbracket
+  begin-enumerateroman begin-enumerateromanbracket
+  begin-enumerateromanparen begin-enumerateromancap
+  begin-enumeratealpha begin-enumeratealphabracket
+  begin-enumeratealphafullparen begin-enumeratealphacap
   begin-descriptioncompact begin-descriptionaligned
   begin-descriptiondash begin-descriptionlong begin-descriptionparagraphs)
 

TeXmacs/progs/convert/latex/tmtex.scm

@@ -3143,8 +3143,11 @@
   ((:or description description-compact description-aligned
         description-dash description-long description-paragraphs
         itemize itemize-minus itemize-dot itemize-arrow
-        enumerate enumerate-numeric enumerate-roman enumerate-Roman
-        enumerate-alpha enumerate-Alpha)
+        enumerate enumerate-numeric enumerate-numeric-bracket
+        enumerate-roman enumerate-roman-bracket enumerate-roman-paren
+        enumerate-Roman
+        enumerate-alpha enumerate-alpha-bracket
+        enumerate-alpha-full-paren enumerate-Alpha)
    (,tmtex-list-env 1))
   ((:or folded unfolded folded-plain unfolded-plain folded-std unfolded-std
         folded-explain unfolded-explain folded-env unfolded-env

TeXmacs/progs/convert/tools/tmpre.scm

@@ -20,7 +20,10 @@
 (logic-group tmpre-inline-env%
   verbatim code center indent description itemize itemize-minus
   itemize-dot itemize-arrow enumerate enumerate-numeric
-  enumerate-roman enumerate-Roman enumerate-alpha enumerate-Alpha
+  enumerate-numeric-bracket
+  enumerate-roman enumerate-roman-bracket enumerate-roman-paren
+  enumerate-Roman enumerate-alpha
+  enumerate-alpha-bracket enumerate-alpha-full-paren enumerate-Alpha
   enumerate-circle enumerate-hanzi enumerate-numeric-paren
   equation equation* eqnarray eqnarray* leqnarray leqnarray*
   elsequation elsequation*)

TeXmacs/progs/generic/generic-edit.scm

@@ -168,8 +168,10 @@
 
 ;; 辅助函数：定义 enumerate-tag-list
 (define (enumerate-tag-list)
-  '(enumerate enumerate-numeric enumerate-roman
-    enumerate-Roman enumerate-alpha enumerate-Alpha
+  '(enumerate enumerate-numeric enumerate-numeric-bracket
+    enumerate-roman enumerate-roman-bracket enumerate-roman-paren
+    enumerate-Roman enumerate-alpha enumerate-alpha-bracket
+    enumerate-alpha-full-paren enumerate-Alpha
     enumerate-circle enumerate-hanzi enumerate-numeric-paren))
 
 ;; 辅助函数：定义 itemize-tag-list

TeXmacs/progs/text/text-drd.scm

@@ -88,8 +88,10 @@
   itemize itemize-minus itemize-dot itemize-arrow)
 
 (define-group enumerate-tag
-  enumerate enumerate-numeric enumerate-roman
-  enumerate-Roman enumerate-alpha enumerate-Alpha
+  enumerate enumerate-numeric enumerate-numeric-bracket
+  enumerate-roman enumerate-roman-bracket enumerate-roman-paren
+  enumerate-Roman enumerate-alpha enumerate-alpha-bracket
+  enumerate-alpha-full-paren enumerate-Alpha
   enumerate-circle enumerate-hanzi enumerate-numeric-paren)
 
 (define-group description-tag

TeXmacs/progs/text/text-menu.scm

@@ -412,10 +412,15 @@
   ((shortcut "Default" "1 . space") (make-tmlist 'enumerate))
   ---
   ("1, 2, 3, ..." (make-tmlist 'enumerate-numeric))
+  ("1), 2), 3), ..." (make-tmlist 'enumerate-numeric-bracket))
   ("(1), (2), (3), ..." (make-tmlist 'enumerate-numeric-paren))
   ("i, ii, iii, ..." (make-tmlist 'enumerate-roman))
+  ("i), ii), iii), ..." (make-tmlist 'enumerate-roman-bracket))
+  ("(i), (ii), (iii), ..." (make-tmlist 'enumerate-roman-paren))
   ("I, II, III, ..." (make-tmlist 'enumerate-Roman))
   ("a, b, c, ..." (make-tmlist 'enumerate-alpha))
+  ("a), b), c), ..." (make-tmlist 'enumerate-alpha-bracket))
+  ("(a), (b), (c), ..." (make-tmlist 'enumerate-alpha-full-paren))
   ("A, B, C, ..." (make-tmlist 'enumerate-Alpha))
   ("①, ②, ③, ..." (make-tmlist 'enumerate-circle))
   ("一, 二, 三, ..." (make-tmlist 'enumerate-hanzi)))
@@ -439,10 +444,15 @@
   ((shortcut "Enumerate" "1 . space") (make-tmlist 'enumerate))
   ---
   ("1, 2, 3, ..." (make-tmlist 'enumerate-numeric))
+  ("1), 2), 3), ..." (make-tmlist 'enumerate-numeric-bracket))
   ("(1), (2), (3), ..." (make-tmlist 'enumerate-numeric-paren))
   ("i, ii, iii, ..." (make-tmlist 'enumerate-roman))
+  ("i), ii), iii), ..." (make-tmlist 'enumerate-roman-bracket))
+  ("(i), (ii), (iii), ..." (make-tmlist 'enumerate-roman-paren))
   ("I, II, III, ..." (make-tmlist 'enumerate-Roman))
   ("a, b, c, ..." (make-tmlist 'enumerate-alpha))
+  ("a), b), c), ..." (make-tmlist 'enumerate-alpha-bracket))
+  ("(a), (b), (c), ..." (make-tmlist 'enumerate-alpha-full-paren))
   ("A, B, C, ..." (make-tmlist 'enumerate-Alpha))
   ("①, ②, ③, ..." (make-tmlist 'enumerate-circle))
   ("一, 二, 三, ..." (make-tmlist 'enumerate-hanzi))

TeXmacs/tests/tmu/201_25.tmu

@@ -51,6 +51,14 @@
     <item>
   </enumerate-numeric-paren>
 
+  <\enumerate-numeric-bracket>
+    <item>
+
+    <item>
+
+    <item>
+  </enumerate-numeric-bracket>
+
   <\enumerate-circle>
     <item>
 
@@ -67,6 +75,22 @@
     <item>
   </enumerate-alpha>
 
+  <\enumerate-alpha-bracket>
+    <item>
+
+    <item>
+
+    <item>
+  </enumerate-alpha-bracket>
+
+  <\enumerate-alpha-full-paren>
+    <item>
+
+    <item>
+
+    <item>
+  </enumerate-alpha-full-paren>
+
   <\enumerate-Alpha>
     <item>
 
@@ -75,6 +99,22 @@
     <item>
   </enumerate-Alpha>
 
+  <\enumerate-roman-bracket>
+    <item>
+
+    <item>
+
+    <item>
+  </enumerate-roman-bracket>
+
+  <\enumerate-roman-paren>
+    <item>
+
+    <item>
+
+    <item>
+  </enumerate-roman-paren>
+
   \;
 
   \;