texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/Commands.pod, tp/Texinfo/Common.pm (


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Commands.pod, tp/Texinfo/Common.pm (_add_preamble_before_content), tp/Texinfo/XS/parsetexi/command_data.awk, tp/Texinfo/command_data.txt: add preamble flag in command_data.txt instead of determining the hash in Texinfo::Common.
Date: Mon, 14 Nov 2022 08:19:37 -0500

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 669468c7ea * tp/Texinfo/Commands.pod, tp/Texinfo/Common.pm 
(_add_preamble_before_content), tp/Texinfo/XS/parsetexi/command_data.awk, 
tp/Texinfo/command_data.txt: add preamble flag in command_data.txt instead of 
determining the hash in Texinfo::Common.
669468c7ea is described below

commit 669468c7ea31a90827e3bb5c8cb8adc650cab1ae
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Nov 14 14:19:29 2022 +0100

    * tp/Texinfo/Commands.pod, tp/Texinfo/Common.pm
    (_add_preamble_before_content),
    tp/Texinfo/XS/parsetexi/command_data.awk, tp/Texinfo/command_data.txt:
    add preamble flag in command_data.txt instead of determining the hash
    in Texinfo::Common.
---
 ChangeLog                                |   8 ++
 man/pod2texi.1                           |   4 +-
 tp/Texinfo/Commands.pod                  |   5 +
 tp/Texinfo/Common.pm                     |  35 ++----
 tp/Texinfo/Convert/LaTeX.pm              |   1 -
 tp/Texinfo/XS/parsetexi/command_data.awk |   3 +-
 tp/Texinfo/command_data.txt              | 196 +++++++++++++++----------------
 7 files changed, 124 insertions(+), 128 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8841076540..32f667c293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-11-14  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Commands.pod, tp/Texinfo/Common.pm
+       (_add_preamble_before_content),
+       tp/Texinfo/XS/parsetexi/command_data.awk, tp/Texinfo/command_data.txt:
+       add preamble flag in command_data.txt instead of determining the hash
+       in Texinfo::Common.
+
 2022-11-14  Patrice Dumas  <pertusus@free.fr>
 
        * Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm
diff --git a/man/pod2texi.1 b/man/pod2texi.1
index 8b5778c50f..9608fb5d96 100644
--- a/man/pod2texi.1
+++ b/man/pod2texi.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "POD2TEXI 1"
-.TH POD2TEXI 1 "2022-10-24" "perl v5.34.0" "User Contributed Perl 
Documentation"
+.TH POD2TEXI 1 "2022-11-14" "perl v5.36.0" "User Contributed Perl 
Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/tp/Texinfo/Commands.pod b/tp/Texinfo/Commands.pod
index b65e631a14..c7d4d7c25f 100644
--- a/tp/Texinfo/Commands.pod
+++ b/tp/Texinfo/Commands.pod
@@ -252,6 +252,11 @@ X<C<%non_formatted_block_commands>>
 
 Block commands not formatted as text, such as C<@ignore> or C<@macro>.
 
+=item %preamble_commands
+X<C<%preamble_commands>>
+
+@-commands that do not stop the preamble.
+
 =item %preformatted_commands
 
 =item %preformatted_code_commands
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 2a39bb4d2c..ce942aaf74 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -221,9 +221,13 @@ if (0) {
   my @global_unique_settable = keys(%document_settable_unique_at_commands);
   my @global_unique_commands = 
keys(%Texinfo::Commands::global_unique_commands);
   my $lcu = List::Compare->new(\@global_unique_settable, 
\@global_unique_commands);
+  # only in the first list
   if (scalar($lcu->get_unique)) {
     warn 'BUG: Unique settable not global: '.join(',',$lcu->get_unique)."\n";
   }
+  if (scalar($lcu->get_complement)) {
+    print STDERR "global_uniq commands not settable: ".join(',', 
$lcu->get_complement)."\n";
+  }
 
   my @global_multi_settable = keys(%document_settable_multiple_at_commands);
   my @global_multi_commands = keys(%Texinfo::Commands::global_commands);
@@ -231,6 +235,9 @@ if (0) {
   if (scalar($lcm->get_unique)) {
     warn 'BUG: Multi settable not global: '.join(',',$lcm->get_unique)."\n";
   }
+  if (scalar($lcm->get_complement)) {
+    print STDERR "global commands not settable: ".join(',', 
$lcm->get_complement)."\n";
+  }
 }
 
 # a value corresponds to defaults that are the same for every output format
@@ -700,31 +707,6 @@ foreach my $command (
 }
 
 
-our %preamble_commands;
-foreach my $preamble_command ('direntry', 'hyphenation', 'errormsg',
-       'inlineraw', '*', keys(%document_settable_at_commands),
-       (grep {$Texinfo::Commands::block_commands{$_} eq 'format_raw'
-              or $Texinfo::Commands::block_commands{$_} eq 'region'}
-                                      
keys(%Texinfo::Commands::block_commands)),
-       keys(%Texinfo::Commands::inline_format_commands),
-       keys(%Texinfo::Commands::inline_conditional_commands),
-       keys(%Texinfo::Commands::non_formatted_block_commands),
-       keys(%Texinfo::Commands::line_commands),
-       keys(%Texinfo::Commands::nobrace_commands)) {
-  $preamble_commands{$preamble_command} = 1;
-}
-
-foreach my $formattable_or_formatted_misc_command (
-   keys(%Texinfo::Commands::formattable_line_commands),
-        keys(%Texinfo::Commands::formatted_line_commands),
-        keys(%Texinfo::Commands::formatted_nobrace_commands),
-        keys(%Texinfo::Commands::default_index_commands),
-        keys(%Texinfo::Commands::in_heading_spec_commands),
-        keys(%Texinfo::Commands::def_commands)) {
-  delete $preamble_commands{$formattable_or_formatted_misc_command};
-}
-
-
 # functions for main program.  Should not be called in user-defined code.
 # FIXME locate_init_file() is also called in HTML Converter for htmlxref files.
 
@@ -917,7 +899,8 @@ sub _add_preamble_before_content($)
         push @first_types, shift @{$before_node_section->{'contents'}};
       } elsif (($next_content->{'type'} and $next_content->{'type'} eq 
'paragraph')
                or ($next_content->{'cmdname'} and
-                   not $preamble_commands{$next_content->{'cmdname'}})) {
+                   not $Texinfo::Commands::preamble_commands{
+                                              $next_content->{'cmdname'}})) {
         last;
       } else {
         my $content = shift @{$before_node_section->{'contents'}};
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 62e06ccb77..7b0421992c 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -234,7 +234,6 @@ my %explained_commands = 
%Texinfo::Commands::explained_commands;
 my %inline_format_commands = %Texinfo::Commands::inline_format_commands;
 my %brace_code_commands       = %Texinfo::Commands::brace_code_commands;
 my %non_formatted_brace_command = 
%Texinfo::Commands::non_formatted_brace_command;
-my %preamble_commands = %Texinfo::Common::preamble_commands;
 
 my %nobrace_symbol_text = %Texinfo::Common::nobrace_symbol_text;
 
diff --git a/tp/Texinfo/XS/parsetexi/command_data.awk 
b/tp/Texinfo/XS/parsetexi/command_data.awk
index 60783f2f71..3df050e868 100644
--- a/tp/Texinfo/XS/parsetexi/command_data.awk
+++ b/tp/Texinfo/XS/parsetexi/command_data.awk
@@ -163,7 +163,8 @@ END {
                     && flags_array[flag_idx] != "formatted_line" \
                     && flags_array[flag_idx] != "formatted_nobrace" \
                     && flags_array[flag_idx] != "formattable_line" \
-                    && flags_array[flag_idx] != "non_formatted_block") {
+                    && flags_array[flag_idx] != "non_formatted_block" \
+                    && flags_array[flag_idx] != "preamble") {
                   old_str = flags_str
                   flags_str = old_str "," flags_array[flag_idx]
                 }
diff --git a/tp/Texinfo/command_data.txt b/tp/Texinfo/command_data.txt
index 9cd5d0c0d0..b16a5ce416 100644
--- a/tp/Texinfo/command_data.txt
+++ b/tp/Texinfo/command_data.txt
@@ -42,7 +42,7 @@ txiinternalvalue        internal,brace                  
INTERNAL_brace
 
 # no brace commands - single letter commands
 
-*                       nobrace,formatted_nobrace       NOBRACE_symbol
+*                       nobrace,preamble,formatted_nobrace   NOBRACE_symbol
 # space
 \x20                    nobrace,formatted_nobrace       NOBRACE_symbol
 \t                      nobrace,formatted_nobrace       NOBRACE_symbol
@@ -63,8 +63,8 @@ txiinternalvalue        internal,brace                  
INTERNAL_brace
 # no brace commands - miscellaneous commands
 
 # formatting
-noindent                nobrace                         NOBRACE_skipspace
-indent                  nobrace                         NOBRACE_skipspace
+noindent                nobrace,preamble                NOBRACE_skipspace
+indent                  nobrace,preamble                NOBRACE_skipspace
 headitem                nobrace,formatted_nobrace,close_paragraph         
NOBRACE_skipspace
 item                    nobrace,formatted_nobrace,close_paragraph         
NOBRACE_skipspace
 tab                     nobrace,formatted_nobrace,close_paragraph         
NOBRACE_skipspace
@@ -79,7 +79,7 @@ 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
+refill                  nobrace,preamble,deprecated     NOBRACE_other
 
 
 ##########################################################
@@ -137,114 +137,114 @@ majorheading            
line,formatted_line,sectioning_heading,close_paragraph
 centerchap              line,formatted_line,root,sectioning_heading,deprecated 
   LINE_line
 
 # end of document, end of block
-bye                     line                            LINE_skipline
-end                     line,contain_plain_text         LINE_text
+bye                     line,preamble                       LINE_skipline
+end                     line,preamble,contain_plain_text    LINE_text
 
 # comments
-c                       line                            LINE_lineraw
-comment                 line                            LINE_lineraw
+c                       line,preamble                   LINE_lineraw
+comment                 line,preamble                   LINE_lineraw
 
 # set, clear, special argument
-set                     line                            LINE_special
-clear                   line                            LINE_special
-unmacro                 line                            LINE_special
+set                     line,preamble                   LINE_special
+clear                   line,preamble                   LINE_special
+unmacro                 line,preamble                   LINE_special
 
 # special
-definfoenclose          line,contain_plain_text,deprecated  LINE_specific  3
-alias                   line,contain_plain_text         LINE_specific  2
+definfoenclose          line,preamble,contain_plain_text,deprecated    
LINE_specific  3
+alias                   line,preamble,contain_plain_text               
LINE_specific  2
 
 # number of arguments is not known in advance.
-columnfractions         line,contain_plain_text         LINE_specific
+columnfractions         line,preamble,contain_plain_text         LINE_specific
 
 # file names, only plain text in argument
-setfilename             line,close_paragraph,global_unique,contain_plain_text  
     LINE_text
-verbatiminclude         
line,formattable_line,close_paragraph,contain_plain_text    LINE_text
-include                 line,contain_plain_text                                
     LINE_text
-
-raisesections           line                             LINE_skipline
-lowersections           line                             LINE_skipline
-contents                line,close_paragraph,global      LINE_skipline
-shortcontents           line,close_paragraph,global      LINE_skipline
-summarycontents         line,close_paragraph,global      LINE_skipline
+setfilename             
line,close_paragraph,global_unique,preamble,contain_plain_text   LINE_text
+verbatiminclude         
line,formattable_line,close_paragraph,contain_plain_text         LINE_text
+include                 line,preamble,contain_plain_text                       
          LINE_text
+
+raisesections           line,preamble                    LINE_skipline
+lowersections           line,preamble                    LINE_skipline
+contents                line,close_paragraph,global,preamble    LINE_skipline
+shortcontents           line,close_paragraph,global,preamble    LINE_skipline
+summarycontents         line,close_paragraph,global,preamble    LINE_skipline
 insertcopying           line,formattable_line,close_paragraph,global      
LINE_skipline
 
 # more relevant in preamble
-documentencoding        line,global,contain_plain_text   LINE_text
-novalidate              line,global_unique               LINE_skipline
+documentencoding        line,global,preamble,contain_plain_text   LINE_text
+novalidate              line,global_unique,preamble               LINE_skipline
 # Position with regard with direntry is significant
-dircategory             line,close_paragraph,contain_simple_text   LINE_line
+dircategory             line,close_paragraph,preamble,contain_simple_text   
LINE_line
 # arg like 200mm,150mm or 11.5in
-pagesizes               line,global_unique,contain_plain_text      LINE_line
-finalout                line                            LINE_skipline
+pagesizes               line,global_unique,preamble,contain_plain_text      
LINE_line
+finalout                line,preamble                            LINE_skipline
 # arg none asis
 # or a number and forbids anything else on the line
-paragraphindent         line,global,contain_plain_text  LINE_specific  1
+paragraphindent         line,global,preamble,contain_plain_text  LINE_specific 
 1
 # arg none insert
-firstparagraphindent    line,global,contain_plain_text  LINE_specific  1
+firstparagraphindent    line,global,preamble,contain_plain_text  LINE_specific 
 1
 # arg on off
-frenchspacing           line,global,contain_plain_text  LINE_specific  1
+frenchspacing           line,global,preamble,contain_plain_text  LINE_specific 
 1
 # arg on off
-codequoteundirected     line,global,contain_plain_text  LINE_specific  1
+codequoteundirected     line,global,preamble,contain_plain_text  LINE_specific 
 1
 # arg on off
-codequotebacktick       line,global,contain_plain_text  LINE_specific  1
+codequotebacktick       line,global,preamble,contain_plain_text  LINE_specific 
 1
 # arg on off
-xrefautomaticsectiontitle line,global,contain_plain_text    LINE_specific  1
+xrefautomaticsectiontitle line,global,preamble,contain_plain_text    
LINE_specific  1
 # arg on off
-deftypefnnewline        line,global,contain_plain_text  LINE_specific  1
+deftypefnnewline        line,global,preamble,contain_plain_text  LINE_specific 
 1
 # arg 10 11
-fonttextsize            line,global_unique,contain_plain_text    LINE_specific 
 1
+fonttextsize            line,global_unique,preamble,contain_plain_text    
LINE_specific  1
 # arg false or true
-allowcodebreaks         line,global,contain_plain_text  LINE_specific  1
+allowcodebreaks         line,global,preamble,contain_plain_text  LINE_specific 
 1
 # arg asis or a number
-exampleindent           line,global,contain_plain_text  LINE_specific  1
+exampleindent           line,global,preamble,contain_plain_text  LINE_specific 
 1
 # args end and separate, nothing else on the line
-footnotestyle           line,global_unique,contain_plain_text    LINE_specific 
 1
+footnotestyle           line,global_unique,preamble,contain_plain_text    
LINE_specific  1
 # arg after|before|none
-urefbreakstyle          line,global,contain_plain_text  LINE_specific  1
-smallbook               line,global_unique              LINE_skipline
-afourpaper              line,global_unique              LINE_skipline
-afivepaper              line,global_unique              LINE_skipline
-afourlatex              line,global_unique              LINE_skipline
-afourwide               line,global_unique              LINE_skipline
-bsixpaper               line,global_unique              LINE_skipline
+urefbreakstyle          line,global,preamble,contain_plain_text  LINE_specific 
 1
+smallbook               line,global_unique,preamble     LINE_skipline
+afivepaper              line,global_unique,preamble     LINE_skipline
+afourpaper              line,global_unique,preamble     LINE_skipline
+afourlatex              line,global_unique,preamble     LINE_skipline
+afourwide               line,global_unique,preamble     LINE_skipline
+bsixpaper               line,global_unique,preamble     LINE_skipline
 # arg off on single double singleafter doubleafter
 # interacts with setchapternewpage
-headings                line,global,contain_plain_text  LINE_specific  1
+headings                line,global,preamble,contain_plain_text  LINE_specific 
 1
 # arg off on odd
-setchapternewpage       line,global_unique,contain_plain_text    LINE_specific 
 1
+setchapternewpage       line,global_unique,preamble,contain_plain_text    
LINE_specific  1
 # arg on off
-microtype               line,global,contain_plain_text  LINE_specific  1
+microtype               line,global,preamble,contain_plain_text  LINE_specific 
 1
 
-everyheading            line,global,heading_spec,contain_simple_text      
LINE_line
-everyfooting            line,global,heading_spec,contain_simple_text      
LINE_line
-evenheading             line,global,heading_spec,contain_simple_text      
LINE_line
-evenfooting             line,global,heading_spec,contain_simple_text      
LINE_line
-oddheading              line,global,heading_spec,contain_simple_text      
LINE_line
-oddfooting              line,global,heading_spec,contain_simple_text      
LINE_line
+everyheading            line,global,heading_spec,preamble,contain_simple_text  
    LINE_line
+everyfooting            line,global,heading_spec,preamble,contain_simple_text  
    LINE_line
+evenheading             line,global,heading_spec,preamble,contain_simple_text  
    LINE_line
+evenfooting             line,global,heading_spec,preamble,contain_simple_text  
    LINE_line
+oddheading              line,global,heading_spec,preamble,contain_simple_text  
    LINE_line
+oddfooting              line,global,heading_spec,preamble,contain_simple_text  
    LINE_line
 
 # args are index identifiers
-syncodeindex            line,contain_plain_text         LINE_specific  2
-synindex                line,contain_plain_text         LINE_specific  2
+syncodeindex            line,preamble,contain_plain_text         LINE_specific 
 2
+synindex                line,preamble,contain_plain_text         LINE_specific 
 2
 # one identifier arg
-defindex                line,contain_plain_text         LINE_specific  1
+defindex                line,preamble,contain_plain_text         LINE_specific 
 1
 # one identifier arg
-defcodeindex            line,contain_plain_text         LINE_specific  1
+defcodeindex            line,preamble,contain_plain_text         LINE_specific 
 1
 
 # language code arg
-documentlanguage        line,global,contain_plain_text,contain_plain_text  
LINE_text
+documentlanguage        line,global,preamble,contain_plain_text  LINE_text
 
 # arg should be an @-command
-clickstyle              line,global                      LINE_special
+clickstyle              line,global,preamble            LINE_special
 # arg code example distinct
-kbdinputstyle           line,global,contain_plain_text  LINE_specific  1
+kbdinputstyle           line,global,preamble,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
-evenheadingmarks        line,global_unique,contain_plain_text       
LINE_specific  1
-oddheadingmarks         line,global_unique,contain_plain_text       
LINE_specific  1
-evenfootingmarks        line,global_unique,contain_plain_text       
LINE_specific  1
-oddfootingmarks         line,global_unique,contain_plain_text       
LINE_specific  1
+everyheadingmarks       line,global_unique,preamble,contain_plain_text   
LINE_specific  1
+everyfootingmarks       line,global_unique,preamble,contain_plain_text   
LINE_specific  1
+evenheadingmarks        line,global_unique,preamble,contain_plain_text   
LINE_specific  1
+oddheadingmarks         line,global_unique,preamble,contain_plain_text   
LINE_specific  1
+evenfootingmarks        line,global_unique,preamble,contain_plain_text   
LINE_specific  1
+oddfootingmarks         line,global_unique,preamble,contain_plain_text   
LINE_specific  1
 
 # formatting
 center                  line,formatted_line,close_paragraph                
LINE_line
@@ -261,10 +261,10 @@ vskip                   line,formattable_line             
          LINE_lineraw
 # one numerical/real arg
 need                    
line,formattable_line,close_paragraph,contain_plain_text   LINE_specific  1
 
+shorttitlepage          line,global_unique,preamble,contain_simple_text     
LINE_line
+settitle                line,global_unique,preamble,contain_simple_text     
LINE_line
 # especially in titlepage
-#  shorttitle
-shorttitlepage          line,global_unique,contain_simple_text     LINE_line
-settitle                line,global_unique,contain_simple_text     LINE_line
+# can appear in preamble only within @titlepage
 author                  line,formatted_line,global,contain_simple_text         
   LINE_line
 subtitle                line,formatted_line,global,contain_simple_text         
   LINE_line
 title                   line,formatted_line,global_unique,contain_simple_text  
   LINE_line
@@ -411,13 +411,13 @@ math                    brace,math,contain_simple_text  
BRACE_context
 # 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
-anchor                  brace,contain_simple_text       BRACE_arguments     1
-errormsg                brace,contain_simple_text       BRACE_arguments     1
-sortas                  brace,in_index,contain_plain_text        
BRACE_arguments     1
-seeentry                brace,in_index,contain_simple_text       
BRACE_arguments     1
-seealso                 brace,in_index,contain_simple_text       
BRACE_arguments     1
+U                       brace                                      
BRACE_arguments     1
+hyphenation             brace,global,preamble,contain_plain_text   
BRACE_arguments     1
+anchor                  brace,contain_simple_text                  
BRACE_arguments     1
+errormsg                brace,preamble,contain_simple_text         
BRACE_arguments     1
+sortas                  brace,in_index,contain_plain_text          
BRACE_arguments     1
+seeentry                brace,in_index,contain_simple_text         
BRACE_arguments     1
+seealso                 brace,in_index,contain_simple_text         
BRACE_arguments     1
 
 # explained commands
 abbr                    brace,explained,contain_simple_text      
BRACE_arguments     2
@@ -436,13 +436,13 @@ image                   brace,contain_simple_text       
BRACE_arguments     5
 
 # leading space is ignored in inline brace commands, not trailing space
 # inline format command
-inlineraw               brace,inline_format             BRACE_inline        2
-inlinefmt               brace,inline_format             BRACE_inline        2
-inlinefmtifelse         brace,inline_format             BRACE_inline        3
+inlineraw               brace,preamble,inline_format    BRACE_inline        2
+inlinefmt               brace,preamble,inline_format    BRACE_inline        2
+inlinefmtifelse         brace,preamble,inline_format    BRACE_inline        3
 
 # inline conditional commands
-inlineifclear           brace,inline_conditional        BRACE_inline        2
-inlineifset             brace,inline_conditional        BRACE_inline        2
+inlineifclear           brace,preamble,inline_conditional   BRACE_inline       
 2
+inlineifset             brace,preamble,inline_conditional   BRACE_inline       
 2
 
 # verb is treated especially, it should not matter much in which category it 
is.
 # value also is treated especially.
@@ -513,9 +513,9 @@ deftypemethodx          line,def,def_alias,close_paragraph  
   LINE_line
 multitable              block,close_paragraph,blockitem,contain_simple_text   
BLOCK_multitable
 
 # menu commands in which menu entry and menu comments appear
-menu                    block,close_paragraph           BLOCK_menu
-detailmenu              block,close_paragraph,global    BLOCK_menu
-direntry                block,close_paragraph           BLOCK_menu
+menu                    block,close_paragraph             BLOCK_menu
+detailmenu              block,close_paragraph,global      BLOCK_menu
+direntry                block,close_paragraph,preamble    BLOCK_menu
 
 # align commands
 raggedright             block,close_paragraph
@@ -528,9 +528,9 @@ cartouche               block,close_paragraph
 group                   block,close_paragraph
 
 # region commands
-titlepage               block,close_paragraph,global_unique       BLOCK_region
-copying                 block,close_paragraph,global_unique       BLOCK_region
-documentdescription     block,close_paragraph,global_unique       BLOCK_region
+titlepage               block,close_paragraph,global_unique,preamble     
BLOCK_region
+copying                 block,close_paragraph,global_unique,preamble     
BLOCK_region
+documentdescription     block,close_paragraph,global_unique,preamble     
BLOCK_region
 
 # preformatted commands
 example           
block,close_paragraph,preformatted,preformatted_code,variadic,contain_simple_text
   BLOCK_preformatted
@@ -543,17 +543,17 @@ format            block,close_paragraph,preformatted      
BLOCK_preformatted
 smallformat       block,close_paragraph,preformatted      BLOCK_preformatted
 
 # format raw commands
-html                    block                             BLOCK_format_raw
-tex                     block                             BLOCK_format_raw
-xml                     block                             BLOCK_format_raw
-docbook                 block                             BLOCK_format_raw
-latex                   block                             BLOCK_format_raw
+html                    block,preamble                    BLOCK_format_raw
+tex                     block,preamble                    BLOCK_format_raw
+xml                     block,preamble                    BLOCK_format_raw
+docbook                 block,preamble                    BLOCK_format_raw
+latex                   block,preamble                    BLOCK_format_raw
 
 # raw commands
-verbatim                block,close_paragraph             BLOCK_raw
-ignore                  block,non_formatted_block         BLOCK_raw
-macro                   block,non_formatted_block         BLOCK_raw
-rmacro                  block,non_formatted_block         BLOCK_raw
+verbatim                block,close_paragraph                 BLOCK_raw
+ignore                  block,preamble,non_formatted_block    BLOCK_raw
+macro                   block,preamble,non_formatted_block    BLOCK_raw
+rmacro                  block,preamble,non_formatted_block    BLOCK_raw
 
 table                   block,close_paragraph,blockitem,contain_simple_text   
BLOCK_item_line       1
 ftable                  block,close_paragraph,blockitem,contain_simple_text   
BLOCK_item_line       1



reply via email to

[Prev in Thread] Current Thread [Next in Thread]