[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBoo
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/NodeNameNormalization.pm, tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/Text.pm, tp/Texinfo/XS/parsetexi/command_data.txt: set letter_no_arg flag in command_data.txt and remove %letter_no_arg_commands from Common.pm. |
|
Date: |
Sun, 02 Oct 2022 17:20:30 -0400 |
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 fdb273008b * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm,
tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm,
tp/Texinfo/Convert/NodeNameNormalization.pm,
tp/Texinfo/Convert/Plaintext.pm,tp/Texinfo/Convert/Text.pm,
tp/Texinfo/XS/parsetexi/command_data.txt: set letter_no_arg flag in
command_data.txt and remove %letter_no_arg_commands from Common.pm.
fdb273008b is described below
commit fdb273008b114505b596a28be8e382f51dd3d7a9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Oct 2 23:20:19 2022 +0200
* tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm,
tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm,
tp/Texinfo/Convert/NodeNameNormalization.pm,
tp/Texinfo/Convert/Plaintext.pm,tp/Texinfo/Convert/Text.pm,
tp/Texinfo/XS/parsetexi/command_data.txt: set letter_no_arg flag
in command_data.txt and remove %letter_no_arg_commands from
Common.pm.
---
ChangeLog | 10 ++++++++++
tp/Texinfo/Common.pm | 7 -------
tp/Texinfo/Convert/DocBook.pm | 4 ++--
tp/Texinfo/Convert/HTML.pm | 3 +--
tp/Texinfo/Convert/LaTeX.pm | 2 +-
tp/Texinfo/Convert/NodeNameNormalization.pm | 3 ++-
tp/Texinfo/Convert/Plaintext.pm | 2 +-
tp/Texinfo/Convert/Text.pm | 2 +-
tp/Texinfo/XS/parsetexi/command_data.txt | 30 ++++++++++++++---------------
tp/Texinfo/XS/parsetexi/commands.h | 4 ++--
10 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dc4565f422..b56d3cc409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-10-02 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm,
+ tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm,
+ tp/Texinfo/Convert/NodeNameNormalization.pm,
+ tp/Texinfo/Convert/Plaintext.pm,tp/Texinfo/Convert/Text.pm,
+ tp/Texinfo/XS/parsetexi/command_data.txt: set letter_no_arg flag
+ in command_data.txt and remove %letter_no_arg_commands from
+ Common.pm.
+
2022-10-02 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm,
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 52a3648d9f..b5dbabee04 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -503,13 +503,6 @@ foreach my $in_index_command ('sortas', 'seeentry',
'seealso', 'subentry') {
$in_index_commands{$in_index_command} = 1;
}
-# commands with braces.
-our %letter_no_arg_commands;
-foreach my $letter_no_arg_command ('aa','AA','ae','oe','AE','OE','o','O',
- 'ss','l','L','DH','dh','TH','th') {
- $letter_no_arg_commands{$letter_no_arg_command} = 1;
-}
-
# also style_code brace commands
our %brace_code_commands;
foreach my $command ('code', 'command', 'env', 'file', 'indicateurl', 'kbd',
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 736fca24ca..c87d2fc197 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -704,8 +704,8 @@ sub _convert($$;$)
and defined($element->{'extra'}->{'clickstyle'})) {
$command = $element->{'extra'}->{'clickstyle'};
} elsif ($self->{'document_context'}->[-1]->{'upper_case'}->[-1]
- and
$Texinfo::Common::letter_no_arg_commands{$element->{'cmdname'}}
- and
$Texinfo::Common::letter_no_arg_commands{uc($element->{'cmdname'})}) {
+ and
$Texinfo::Commands::letter_no_arg_commands{$element->{'cmdname'}}
+ and
$Texinfo::Commands::letter_no_arg_commands{uc($element->{'cmdname'})}) {
$command = uc($element->{'cmdname'})
} else {
$command = $element->{'cmdname'};
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 619d71c4e3..f54ee66ecd 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -107,8 +107,7 @@ my %root_commands = %Texinfo::Commands::root_commands;
my %preformatted_commands = %Texinfo::Commands::preformatted_commands;
my %math_commands = %Texinfo::Commands::math_commands;
my %preformatted_code_commands =
%Texinfo::Commands::preformatted_code_commands;
-
-my %letter_no_arg_commands = %Texinfo::Common::letter_no_arg_commands;
+my %letter_no_arg_commands = %Texinfo::Commands::letter_no_arg_commands;
my %formatted_line_commands = %Texinfo::Common::formatted_line_commands;
my %formatted_nobrace_commands = %Texinfo::Common::formatted_nobrace_commands;
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index f774731f5c..4af63e128d 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -228,8 +228,8 @@ my %math_commands = %Texinfo::Commands::math_commands;
my %preformatted_code_commands =
%Texinfo::Commands::preformatted_code_commands;
my %default_index_commands = %Texinfo::Commands::default_index_commands;
my %heading_spec_commands = %Texinfo::Commands::heading_spec_commands;
+my %letter_no_arg_commands = %Texinfo::Commands::letter_no_arg_commands;
-my %letter_no_arg_commands = %Texinfo::Common::letter_no_arg_commands;
my %nobrace_symbol_text = %Texinfo::Common::nobrace_symbol_text;
my %explained_commands = %Texinfo::Common::explained_commands;
my %inline_format_commands = %Texinfo::Common::inline_format_commands;
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index 31e9f408f3..f7ae97e4b1 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -34,6 +34,7 @@ use Text::Unidecode;
# commands classes
use Texinfo::Commands;
+# for nobrace_symbol_text
use Texinfo::Common;
# use the hashes and functions
use Texinfo::Convert::Unicode;
@@ -262,7 +263,7 @@ sub _convert($;$)
and defined($element->{'extra'}->{'clickstyle'})
and
defined($normalize_node_brace_no_arg_commands{$element->{'extra'}->{'clickstyle'}}));
my $result = $normalize_node_brace_no_arg_commands{$command};
- if ($in_sc and $Texinfo::Common::letter_no_arg_commands{$command}) {
+ if ($in_sc and $Texinfo::Commands::letter_no_arg_commands{$command}) {
$result = uc($result);
}
return $result;
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 8115701ef2..49f1294aaf 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -102,8 +102,8 @@ my %preformatted_commands =
%Texinfo::Commands::preformatted_commands;
my %math_commands = %Texinfo::Commands::math_commands;
my %preformatted_code_commands =
%Texinfo::Commands::preformatted_code_commands;
my %default_index_commands = %Texinfo::Commands::default_index_commands;
+my %letter_no_arg_commands = %Texinfo::Commands::letter_no_arg_commands;
-my %letter_no_arg_commands = %Texinfo::Common::letter_no_arg_commands;
my %nobrace_symbol_text = %Texinfo::Common::nobrace_symbol_text;
my %explained_commands = %Texinfo::Common::explained_commands;
my %inline_format_commands = %Texinfo::Common::inline_format_commands;
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 6f3e417a6d..070699adef 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -269,7 +269,7 @@ sub brace_no_arg_command($;$)
$result = $text_brace_no_arg_commands{$command};
}
}
- if ($options and $Texinfo::Common::letter_no_arg_commands{$command}) {
+ if ($options and $Texinfo::Commands::letter_no_arg_commands{$command}) {
if ($options->{'sc'}) {
$result = uc($result);
} elsif ($options->{'lc'}) {
diff --git a/tp/Texinfo/XS/parsetexi/command_data.txt
b/tp/Texinfo/XS/parsetexi/command_data.txt
index fa2f615642..783ee596a3 100644
--- a/tp/Texinfo/XS/parsetexi/command_data.txt
+++ b/tp/Texinfo/XS/parsetexi/command_data.txt
@@ -241,21 +241,21 @@ refill nobrace,deprecated
NOBRACE_other
##########################################################
# letter_no_arg_commands
-aa brace BRACE_noarg
-AA brace BRACE_noarg
-ae brace BRACE_noarg
-oe brace BRACE_noarg
-AE brace BRACE_noarg
-OE brace BRACE_noarg
-o brace BRACE_noarg
-O brace BRACE_noarg
-ss brace BRACE_noarg
-l brace BRACE_noarg
-L brace BRACE_noarg
-DH brace BRACE_noarg
-dh brace BRACE_noarg
-TH brace BRACE_noarg
-th brace BRACE_noarg
+aa brace,letter_no_arg BRACE_noarg
+AA brace,letter_no_arg BRACE_noarg
+ae brace,letter_no_arg BRACE_noarg
+oe brace,letter_no_arg BRACE_noarg
+AE brace,letter_no_arg BRACE_noarg
+OE brace,letter_no_arg BRACE_noarg
+o brace,letter_no_arg BRACE_noarg
+O brace,letter_no_arg BRACE_noarg
+ss brace,letter_no_arg BRACE_noarg
+l brace,letter_no_arg BRACE_noarg
+L brace,letter_no_arg BRACE_noarg
+DH brace,letter_no_arg BRACE_noarg
+dh brace,letter_no_arg BRACE_noarg
+TH brace,letter_no_arg BRACE_noarg
+th brace,letter_no_arg BRACE_noarg
# no arg commands
TeX brace BRACE_noarg
diff --git a/tp/Texinfo/XS/parsetexi/commands.h
b/tp/Texinfo/XS/parsetexi/commands.h
index c787ae1436..bc7686dcd2 100644
--- a/tp/Texinfo/XS/parsetexi/commands.h
+++ b/tp/Texinfo/XS/parsetexi/commands.h
@@ -55,10 +55,10 @@ void wipe_user_commands (void);
#define CF_root 0x0004
#define CF_sectioning_heading 0x0008
#define CF_brace 0x0010
-/* CF_letter_no_arg is not used, in Common */
+/* CF_letter_no_arg is not used in XS parser, used in perl */
#define CF_letter_no_arg 0x0020
#define CF_accent 0x0040
-/* CF_math is not used, used in perl */
+/* CF_math is not used in XS parser, used in perl */
#define CF_math 0x0080
#define CF_variadic 0x0100
#define CF_INFOENCLOSE 0x0200
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/NodeNameNormalization.pm, tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/Text.pm, tp/Texinfo/XS/parsetexi/command_data.txt: set letter_no_arg flag in command_data.txt and remove %letter_no_arg_commands from Common.pm.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm: remove %context_brace_commands, instead check if brace_commands type is set to context.
- Next by Date:
branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/ParserNonXS.pm, tp/Texinfo/XS/parsetexi/command_data.txt, tp/Texinfo/XS/parsetexi/commands.c (close_preformatted_command), tp/Texinfo/XS/parsetexi/commands.h, tp/Texinfo/XS/parsetexi/parser.c (begin_paragraph, process_remaining_on_line): add close_paragraph flag in command_data.txt. Remove %close_paragraph_commands from Texinfo::Common. Remove the close_paragraph_command function.
- Previous by thread:
branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm: remove %context_brace_commands, instead check if brace_commands type is set to context.
- Next by thread:
branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/ParserNonXS.pm, tp/Texinfo/XS/parsetexi/command_data.txt, tp/Texinfo/XS/parsetexi/commands.c (close_preformatted_command), tp/Texinfo/XS/parsetexi/commands.h, tp/Texinfo/XS/parsetexi/parser.c (begin_paragraph, process_remaining_on_line): add close_paragraph flag in command_data.txt. Remove %close_paragraph_commands from Texinfo::Common. Remove the close_paragraph_command function.
- Index(es):