[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Wed, 2 Oct 2024 11:42:48 -0400 (EDT) |
branch: master
commit 32cdcf206b0edeec2c3f6e22f85c81991991fb85
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Aug 1 17:08:54 2024 +0200
* tp/maintain/regenerate_C_options_info.pl: protect " in generated C
strings.
* tp/Texinfo/Convert/HTML.pm (_set_variables_texi2html),
tp/Texinfo/Convert/converters_defaults.txt (texi2html): add texi2html
regular options to Texinfo/Convert/converters_defaults.txt.
---
ChangeLog | 9 +++++++
tp/Texinfo/Convert/HTML.pm | 31 ++++---------------------
tp/Texinfo/Convert/converters_defaults.txt | 29 +++++++++++++++++++++++
tp/Texinfo/XS/convert/converters_defaults.c | 27 +++++++++++++++++++++
tp/Texinfo/XS/convert/converters_defaults.h | 2 ++
tp/maintain/generate_code_convert_data.pl | 1 +
tp/maintain/regenerate_C_options_info.pl | 4 +++-
tp/maintain/regenerate_documentlanguages-loc.pl | 2 +-
8 files changed, 77 insertions(+), 28 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 183a7f1ae2..01b109ff8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,15 @@
Add TODO item from Bruno CI.
+2024-08-01 Patrice Dumas <pertusus@free.fr>
+
+ * tp/maintain/regenerate_C_options_info.pl: protect " in generated C
+ strings.
+
+ * tp/Texinfo/Convert/HTML.pm (_set_variables_texi2html),
+ tp/Texinfo/Convert/converters_defaults.txt (texi2html): add texi2html
+ regular options to Texinfo/Convert/converters_defaults.txt.
+
2024-08-01 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/Utils.pm (output_files_initialize)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 4456053417..9aa6734324 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -13732,32 +13732,6 @@ sub _set_variables_texi2html($)
{
my $options = shift;
my @texi2html_options = (
- # added hopefully temporarily to be able to validate with W3C validator
- #['DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>'],
- #['DOCTYPE', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>'],
- ['FORMAT_MENU', 'menu'],
- ['USE_SETFILENAME_EXTENSION', 0],
- ['footnotestyle', 'separate'],
- ['CONTENTS_OUTPUT_LOCATION', 'separate_element'],
- ['FORCE', 1],
- ['USE_ACCESSKEY', 0],
- ['NODE_NAME_IN_MENU', 0],
- ['SHORT_TOC_LINK_TO_TOC', 0],
- ['SHOW_TITLE', 1],
- ['USE_REL_REV', 0],
- ['USE_LINKS', 0],
- ['USE_NODES', 0],
- ['SPLIT', ''],
- ['PROGRAM_NAME_IN_FOOTER', 1],
- ['PROGRAM_NAME_IN_ABOUT', 1],
- ['HEADER_IN_TABLE', 1],
- ['MENU_ENTRY_COLON', ''],
- ['INDEX_ENTRY_COLON', ''],
- ['DO_ABOUT', undef],
- ['CHAPTER_HEADER_LEVEL', 1],
- ['BIG_RULE', '<hr style="height: 6px;">'],
- ['FOOTNOTE_END_HEADER_LEVEL', 3],
- ['FOOTNOTE_SEPARATE_HEADER_LEVEL', 1],
['SECTION_BUTTONS', ['FastBack', 'Back', 'Up', 'Forward', 'FastForward',
' ', ' ', ' ', ' ',
'Top', 'Contents', 'Index', 'About' ]],
@@ -13780,6 +13754,11 @@ sub _set_variables_texi2html($)
' ', ' ', ' ', ' ',
'Top', 'Contents', 'Index', 'About' ]],
);
+ my $regular_texi2html_options
+ = Texinfo::Options::get_converter_regular_options('texi2html');
+ foreach my $option (keys(%$regular_texi2html_options)) {
+ $options->{$option} = $regular_texi2html_options->{$option};
+ }
foreach my $option (@texi2html_options) {
$options->{$option->[0]} = $option->[1];
}
diff --git a/tp/Texinfo/Convert/converters_defaults.txt
b/tp/Texinfo/Convert/converters_defaults.txt
index 5c45993fa2..5bdefbe131 100644
--- a/tp/Texinfo/Convert/converters_defaults.txt
+++ b/tp/Texinfo/Convert/converters_defaults.txt
@@ -99,3 +99,32 @@ XREF_USE_FLOAT_LABEL 0
xrefautomaticsectiontitle on
+- texi2html
+
+# added hopefully temporarily to be able to validate with W3C validator
+#DOCTYPE <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01
Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+#DOCTYPE <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
+FORMAT_MENU menu
+USE_SETFILENAME_EXTENSION 0
+footnotestyle separate
+CONTENTS_OUTPUT_LOCATION separate_element
+FORCE 1
+USE_ACCESSKEY 0
+NODE_NAME_IN_MENU 0
+SHORT_TOC_LINK_TO_TOC 0
+SHOW_TITLE 1
+USE_REL_REV 0
+USE_LINKS 0
+USE_NODES 0
+SPLIT
+PROGRAM_NAME_IN_FOOTER 1
+PROGRAM_NAME_IN_ABOUT 1
+HEADER_IN_TABLE 1
+MENU_ENTRY_COLON
+INDEX_ENTRY_COLON
+DO_ABOUT undef
+CHAPTER_HEADER_LEVEL 1
+BIG_RULE <hr style="height: 6px;">
+FOOTNOTE_END_HEADER_LEVEL 3
+FOOTNOTE_SEPARATE_HEADER_LEVEL 1
+
diff --git a/tp/Texinfo/XS/convert/converters_defaults.c
b/tp/Texinfo/XS/convert/converters_defaults.c
index b2c7f0e08b..7a14071af2 100644
--- a/tp/Texinfo/XS/convert/converters_defaults.c
+++ b/tp/Texinfo/XS/convert/converters_defaults.c
@@ -75,3 +75,30 @@ void set_html_regular_options_defaults (OPTIONS *options)
set_conf (&options->xrefautomaticsectiontitle, -2, "on");
}
+void set_texi2html_regular_options_defaults (OPTIONS *options)
+{
+ set_conf (&options->FORMAT_MENU, -2, "menu");
+ set_conf (&options->USE_SETFILENAME_EXTENSION, 0, 0);
+ set_conf (&options->footnotestyle, -2, "separate");
+ set_conf (&options->CONTENTS_OUTPUT_LOCATION, -2, "separate_element");
+ set_conf (&options->FORCE, 1, 0);
+ set_conf (&options->USE_ACCESSKEY, 0, 0);
+ set_conf (&options->NODE_NAME_IN_MENU, 0, 0);
+ set_conf (&options->SHORT_TOC_LINK_TO_TOC, 0, 0);
+ set_conf (&options->SHOW_TITLE, 1, 0);
+ set_conf (&options->USE_REL_REV, 0, 0);
+ set_conf (&options->USE_LINKS, 0, 0);
+ set_conf (&options->USE_NODES, 0, 0);
+ set_conf (&options->SPLIT, -2, "");
+ set_conf (&options->PROGRAM_NAME_IN_FOOTER, 1, 0);
+ set_conf (&options->PROGRAM_NAME_IN_ABOUT, 1, 0);
+ set_conf (&options->HEADER_IN_TABLE, 1, 0);
+ set_conf (&options->MENU_ENTRY_COLON, -2, "");
+ set_conf (&options->INDEX_ENTRY_COLON, -2, "");
+ set_conf (&options->DO_ABOUT, -1, 0);
+ set_conf (&options->CHAPTER_HEADER_LEVEL, 1, 0);
+ set_conf (&options->BIG_RULE, -2, "<hr style=\"height: 6px;\">");
+ set_conf (&options->FOOTNOTE_END_HEADER_LEVEL, 3, 0);
+ set_conf (&options->FOOTNOTE_SEPARATE_HEADER_LEVEL, 1, 0);
+}
+
diff --git a/tp/Texinfo/XS/convert/converters_defaults.h
b/tp/Texinfo/XS/convert/converters_defaults.h
index a895b0488f..ae67bcc304 100644
--- a/tp/Texinfo/XS/convert/converters_defaults.h
+++ b/tp/Texinfo/XS/convert/converters_defaults.h
@@ -18,4 +18,6 @@ void set_converter_regular_options_defaults (OPTIONS
*options);
void set_html_regular_options_defaults (OPTIONS *options);
+void set_texi2html_regular_options_defaults (OPTIONS *options);
+
#endif
diff --git a/tp/maintain/generate_code_convert_data.pl
b/tp/maintain/generate_code_convert_data.pl
index c3caa6fb6b..806178b946 100755
--- a/tp/maintain/generate_code_convert_data.pl
+++ b/tp/maintain/generate_code_convert_data.pl
@@ -24,6 +24,7 @@ use strict;
use warnings;
+# in Perl core standard modules
use File::Basename;
use Text::Wrap;
diff --git a/tp/maintain/regenerate_C_options_info.pl
b/tp/maintain/regenerate_C_options_info.pl
index 66f6933d36..b1ff9081c9 100755
--- a/tp/maintain/regenerate_C_options_info.pl
+++ b/tp/maintain/regenerate_C_options_info.pl
@@ -301,7 +301,9 @@ sub get_value($$)
if ($type eq 'integer') {
$int_value = $value;
} else {
- $char_value = '"'.$value.'"';
+ my $protected = $value;
+ $protected =~ s/\"/\\\"/g;
+ $char_value = '"'.$protected.'"';
}
}
diff --git a/tp/maintain/regenerate_documentlanguages-loc.pl
b/tp/maintain/regenerate_documentlanguages-loc.pl
index 9e4d0c4b51..7e245b7477 100755
--- a/tp/maintain/regenerate_documentlanguages-loc.pl
+++ b/tp/maintain/regenerate_documentlanguages-loc.pl
@@ -22,7 +22,7 @@ use warnings;
use File::Basename;
use List::Util qw(first);
-# not in core perl
+# not in Perl core standard modules
use Text::CSV;
my $dir = 'maintain';