[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Tue, 8 Nov 2022 03:29:29 -0500 (EST) |
branch: master
commit 973be2ab2ae8f114444a8a8f76ea4c0ac0d581fe
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 4 23:13:24 2022 +0100
tp/Texinfo/XS/parsetexi/command_data.txt: reorder, format comments
---
tp/Texinfo/XS/parsetexi/command_data.txt | 228 ++++++++++++++++---------------
1 file changed, 120 insertions(+), 108 deletions(-)
diff --git a/tp/Texinfo/XS/parsetexi/command_data.txt
b/tp/Texinfo/XS/parsetexi/command_data.txt
index db884cb5fb..fd42bf8b36 100644
--- a/tp/Texinfo/XS/parsetexi/command_data.txt
+++ b/tp/Texinfo/XS/parsetexi/command_data.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Free Software Foundation, Inc.
+# Copyright 2010-2022 Free Software Foundation, Inc.
#
# This file is part of GNU Texinfo.
#
@@ -26,15 +26,16 @@
# invalid if not accept_internalvalue set in configuration
txiinternalvalue internal,brace INTERNAL_brace
-# nobrace:
+
+##############################################################
+# nobrace commands:
+#
# commands never taking braces nor arguments on the line
#
-# symbol: non-alphabetical one letter commands without braces.
+# symbol: non-alphabetical one letter commands without braces.
# skipspace: following spaces are skipped.
# other: other.
-
-##############################################################
# no brace commands - single letter commands
* nobrace NOBRACE_symbol
@@ -55,6 +56,28 @@ txiinternalvalue internal,brace
INTERNAL_brace
{ nobrace NOBRACE_symbol
\\ nobrace NOBRACE_symbol
+# no brace commands - miscellaneous commands
+
+# formatting
+noindent nobrace NOBRACE_skipspace
+indent nobrace NOBRACE_skipspace
+headitem nobrace,close_paragraph NOBRACE_skipspace
+item nobrace,close_paragraph NOBRACE_skipspace
+tab nobrace,close_paragraph NOBRACE_skipspace
+# only valid in heading or footing
+thischapter nobrace,in_heading_spec NOBRACE_other
+thischaptername nobrace,in_heading_spec NOBRACE_other
+thischapternum nobrace,in_heading_spec NOBRACE_other
+thissection nobrace,in_heading_spec NOBRACE_other
+thissectionname nobrace,in_heading_spec NOBRACE_other
+thissectionnum nobrace,in_heading_spec NOBRACE_other
+thisfile nobrace,in_heading_spec NOBRACE_other
+thispage nobrace,in_heading_spec NOBRACE_other
+thistitle nobrace,in_heading_spec NOBRACE_other
+# obsolete @-commands.
+refill nobrace,deprecated NOBRACE_other
+
+
##########################################################
#
# line commands
@@ -81,22 +104,55 @@ txiinternalvalue internal,brace
INTERNAL_brace
# depending on the context.
# line commands number of arguments is only set for LINE_specific commands
-# and is not used anywhere in the code, it is here as documentation only
+# and for @node. The number of arguments of LINE_specific commands
+# is not used anywhere in the code, it is here as documentation only.
+
+# Root commands
+node line,root,contain_simple_text LINE_line
4
+top line,root,sectioning_heading,global_unique LINE_line
+chapter line,root,sectioning_heading LINE_line
+unnumbered line,root,sectioning_heading LINE_line
+chapheading line,sectioning_heading,close_paragraph LINE_line
+appendix line,root,sectioning_heading LINE_line
+section line,root,sectioning_heading LINE_line
+unnumberedsec line,root,sectioning_heading LINE_line
+heading line,sectioning_heading,close_paragraph LINE_line
+appendixsec line,root,sectioning_heading LINE_line
+subsection line,root,sectioning_heading LINE_line
+unnumberedsubsec line,root,sectioning_heading LINE_line
+subheading line,sectioning_heading,close_paragraph LINE_line
+appendixsubsec line,root,sectioning_heading LINE_line
+subsubsection line,root,sectioning_heading LINE_line
+unnumberedsubsubsec line,root,sectioning_heading LINE_line
+subsubheading line,sectioning_heading,close_paragraph LINE_line
+appendixsubsubsec line,root,sectioning_heading LINE_line
+
+part line,root,sectioning_heading,global LINE_line
+appendixsection line,root,sectioning_heading LINE_line
+majorheading line,sectioning_heading,close_paragraph LINE_line
+centerchap line,root,sectioning_heading,deprecated LINE_line
+
+# end of document, end of block
bye line LINE_skipline
end line,contain_plain_text LINE_text
+
+# comments
+c line LINE_lineraw
+comment line LINE_lineraw
+
# set, clear, special argument
set line LINE_special
clear line LINE_special
unmacro line LINE_special
-# comments
-c line LINE_lineraw
-comment line LINE_lineraw
+
# special
definfoenclose line,contain_plain_text,deprecated LINE_specific 3
alias line,contain_plain_text LINE_specific 2
+
# number of arguments is not known in advance.
columnfractions line,contain_plain_text LINE_specific
-# file names.
+
+# file names, only plain text in argument
setfilename line,close_paragraph,global_unique,contain_plain_text
LINE_text
verbatiminclude line,close_paragraph,contain_plain_text
LINE_text
include line,contain_plain_text
LINE_text
@@ -107,8 +163,7 @@ contents line,close_paragraph,global
LINE_skipline
shortcontents line,close_paragraph,global LINE_skipline
summarycontents line,close_paragraph,global LINE_skipline
insertcopying line,close_paragraph,global LINE_skipline
-# arg should be an @-command
-clickstyle line,global LINE_special
+
# more relevant in preamble
documentencoding line,global,contain_plain_text LINE_text
novalidate line,global_unique LINE_skipline
@@ -170,10 +225,15 @@ synindex line,contain_plain_text
LINE_specific 2
defindex line,contain_plain_text LINE_specific 1
# one identifier arg
defcodeindex line,contain_plain_text LINE_specific 1
+
# language code arg
documentlanguage line,global,contain_plain_text,contain_plain_text
LINE_text
+
+# arg should be an @-command
+clickstyle line,global LINE_special
# arg code example distinct
kbdinputstyle line,global,contain_plain_text LINE_specific 1
+
# arg top bottom
everyheadingmarks line,global_unique,contain_plain_text
LINE_specific 1
everyfootingmarks line,global_unique,contain_plain_text
LINE_specific 1
@@ -186,6 +246,17 @@ oddfootingmarks
line,global_unique,contain_plain_text LINE_specifi
center line,close_paragraph LINE_line
printindex line,close_paragraph,global,contain_plain_text
LINE_specific 1
listoffloats line,close_paragraph,global,contain_simple_text
LINE_line
+exdent line,close_paragraph LINE_line
+# or nobrace skipspace, depending on the context
+item_LINE line,close_paragraph,contain_simple_text LINE_line
+itemx line,close_paragraph,contain_simple_text LINE_line
+# in index entries
+subentry line,contain_simple_text LINE_line
+# not valid for info (should be in @iftex)
+vskip line LINE_lineraw
+# one numerical/real arg
+need line,close_paragraph,contain_plain_text
LINE_specific 1
+
# especially in titlepage
# shorttitle
shorttitlepage line,global_unique,contain_simple_text LINE_line
@@ -196,45 +267,6 @@ title
line,global_unique,contain_simple_text LINE_line
# numerical arg
sp line,close_paragraph,contain_plain_text
LINE_specific 1
page line,close_paragraph LINE_skipline
-# one numerical/real arg
-need line,close_paragraph,contain_plain_text
LINE_specific 1
-
-# not valid for info (should be in @iftex)
-vskip line LINE_lineraw
-
-exdent line,close_paragraph LINE_line
-
-# or nobrace skipspace, depending on the context
-item_LINE line,close_paragraph,contain_simple_text LINE_line
-itemx line,close_paragraph,contain_simple_text LINE_line
-
-subentry line,contain_simple_text LINE_line
-
-##########################################################
-#
-# no brace commands - miscellaneous commands
-#
-##########################################################
-
-# formatting
-noindent nobrace NOBRACE_skipspace
-indent nobrace NOBRACE_skipspace
-headitem nobrace,close_paragraph NOBRACE_skipspace
-item nobrace,close_paragraph NOBRACE_skipspace
-tab nobrace,close_paragraph NOBRACE_skipspace
-# only valid in heading or footing
-thischapter nobrace,in_heading_spec NOBRACE_other
-thischaptername nobrace,in_heading_spec NOBRACE_other
-thischapternum nobrace,in_heading_spec NOBRACE_other
-thissection nobrace,in_heading_spec NOBRACE_other
-thissectionname nobrace,in_heading_spec NOBRACE_other
-thissectionnum nobrace,in_heading_spec NOBRACE_other
-thisfile nobrace,in_heading_spec NOBRACE_other
-thispage nobrace,in_heading_spec NOBRACE_other
-thistitle nobrace,in_heading_spec NOBRACE_other
-# obsolete @-commands.
-refill nobrace,deprecated NOBRACE_other
-
##########################################################
@@ -328,6 +360,7 @@ tieaccent brace,accent,contain_plain_text
BRACE_accent
dotless brace,accent,contain_plain_text BRACE_accent
# Style commands
+# Leading and trailing spaces kept in main text.
asis brace BRACE_style_other
i brace BRACE_style_other
b brace BRACE_style_other
@@ -359,10 +392,20 @@ t brace
BRACE_style_code
# No code style commands
r brace BRACE_style_no_code
+# context brace commands - commands that enclose full texts
+# not in the main document context. They can contain multiple paragraphs.
+footnote brace,global BRACE_context
+caption brace,close_paragraph BRACE_context
+shortcaption brace,close_paragraph,contain_simple_text
BRACE_context
+# Commands that enclose math content, and, because of that, are not in the
+# main document context.
+math brace,math,contain_simple_text BRACE_context
+
# in this category, the leading and trailing spaces are put in specific
# text with type, but commas do not delimitate arguments.
# As other arguments brace_commands, they can only contain simple text,
-# ie not ref, footnote, titlefont, anchor, verb.
+# ie not ref, footnote, titlefont, anchor, verb or even plain text,
+# without even indicatric @-commands.
# Parsers have specific checks for U content.
U brace BRACE_arguments 1
hyphenation brace,global,contain_plain_text BRACE_arguments 1
@@ -372,30 +415,21 @@ sortas brace,contain_plain_text
BRACE_arguments 1
seeentry brace,contain_simple_text BRACE_arguments 1
seealso brace,contain_simple_text BRACE_arguments 1
-# Leading and trailing spaces kept in main text.
-# verb is treated especially, it should not matter much in which category it
is.
-# value also is treated especially.
-value brace BRACE_special
-verb brace BRACE_special
-w brace,contain_simple_text BRACE_special
-
-# other brace commands, leading and trailing spaces kept in main text
-dmn brace,contain_plain_text BRACE_other 1
-titlefont brace,close_paragraph,global,contain_simple_text
BRACE_other 1
-
-# context brace commands - commands that enclose full texts
-# not in the main document context. They can contain multiple paragraphs.
-footnote brace,global BRACE_context
-caption brace,close_paragraph BRACE_context
-shortcaption brace,close_paragraph,contain_simple_text
BRACE_context
-# Commands that enclose math content, and, because of that, are not in the
-# main document context.
-math brace,math,contain_simple_text BRACE_context
-
# explained commands
abbr brace,contain_simple_text BRACE_arguments 2
acronym brace,contain_simple_text BRACE_arguments 2
+email brace,contain_simple_text BRACE_arguments 2
+
+uref brace,contain_simple_text BRACE_arguments 3
+url brace,contain_simple_text BRACE_arguments 3
+inforef brace,ref,contain_simple_text,deprecated
BRACE_arguments 3
+
+xref brace,ref,contain_simple_text BRACE_arguments 5
+ref brace,ref,contain_simple_text BRACE_arguments 5
+pxref brace,ref,contain_simple_text BRACE_arguments 5
+image brace,contain_simple_text BRACE_arguments 5
+
# leading space is ignored in inline brace commands, not trailing space
# inline format command
inlineraw brace BRACE_inline 2
@@ -406,20 +440,25 @@ inlinefmtifelse brace
BRACE_inline 3
inlineifclear brace BRACE_inline 2
inlineifset brace BRACE_inline 2
-email brace,contain_simple_text BRACE_arguments 2
-
-uref brace,contain_simple_text BRACE_arguments 3
-url brace,contain_simple_text BRACE_arguments 3
-inforef brace,ref,contain_simple_text,deprecated
BRACE_arguments 3
+# verb is treated especially, it should not matter much in which category it
is.
+# value also is treated especially.
+# Leading and trailing spaces kept in main text.
+value brace BRACE_special
+verb brace BRACE_special
+w brace,contain_simple_text BRACE_special
-xref brace,ref,contain_simple_text BRACE_arguments 5
-ref brace,ref,contain_simple_text BRACE_arguments 5
-pxref brace,ref,contain_simple_text BRACE_arguments 5
-image brace,contain_simple_text BRACE_arguments 5
+# other brace commands, leading and trailing spaces kept in main text
+dmn brace,contain_plain_text BRACE_other 1
+titlefont brace,close_paragraph,global,contain_simple_text
BRACE_other 1
##########################################################
+#
+# Block commands
+#
# commands delimiting blocks, with an @end.
+#
+##########################################################
# def* commands
deffn block,def,close_paragraph BLOCK_def
@@ -524,7 +563,6 @@ float
block,close_paragraph,contain_simple_text BL
displaymath block,close_paragraph,math BLOCK_math
-##################################################################
# Conditional commands
ifhtml block BLOCK_conditional
ifnothtml block BLOCK_conditional
@@ -545,29 +583,3 @@ ifclear block
BLOCK_conditional
ifcommanddefined block BLOCK_conditional
ifcommandnotdefined block BLOCK_conditional
-##########################################################
-# Root commands
-node line,root,contain_simple_text LINE_line
4
-top line,root,sectioning_heading,global_unique LINE_line
-chapter line,root,sectioning_heading LINE_line
-unnumbered line,root,sectioning_heading LINE_line
-chapheading line,sectioning_heading,close_paragraph LINE_line
-appendix line,root,sectioning_heading LINE_line
-section line,root,sectioning_heading LINE_line
-unnumberedsec line,root,sectioning_heading LINE_line
-heading line,sectioning_heading,close_paragraph LINE_line
-appendixsec line,root,sectioning_heading LINE_line
-subsection line,root,sectioning_heading LINE_line
-unnumberedsubsec line,root,sectioning_heading LINE_line
-subheading line,sectioning_heading,close_paragraph LINE_line
-appendixsubsec line,root,sectioning_heading LINE_line
-subsubsection line,root,sectioning_heading LINE_line
-unnumberedsubsubsec line,root,sectioning_heading LINE_line
-subsubheading line,sectioning_heading,close_paragraph LINE_line
-appendixsubsubsec line,root,sectioning_heading LINE_line
-
-part line,root,sectioning_heading,global LINE_line
-appendixsection line,root,sectioning_heading LINE_line
-majorheading line,sectioning_heading,close_paragraph LINE_line
-centerchap line,root,sectioning_heading,deprecated LINE_line
-
- [no subject], (continued)
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject],
Patrice Dumas <=
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08