texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/maintain/generate_code_convert_data.pl, tp/M


From: Patrice Dumas
Subject: branch master updated: * tp/maintain/generate_code_convert_data.pl, tp/Makefile.am (dist_modules_DATA, Texinfo/HTMLData.pm, MAINTAINERCLEANFILES), tp/Texinfo/XS/Makefile.am (C_libtexinfo_sources, EXTRA_DIST) (BUILT_SOURCES, main/html_conversion_data.c, MAINTAINERCLEANFILES): rename Texinfo/Data.pm as Texinfo/HTMLData.pm and main/conversion_data.c as main/html_conversion_data.c. Report from Gavin.
Date: Mon, 21 Oct 2024 14:00:31 -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 b6f0f81804 * tp/maintain/generate_code_convert_data.pl, tp/Makefile.am 
(dist_modules_DATA, Texinfo/HTMLData.pm, MAINTAINERCLEANFILES), 
tp/Texinfo/XS/Makefile.am (C_libtexinfo_sources, EXTRA_DIST) (BUILT_SOURCES, 
main/html_conversion_data.c, MAINTAINERCLEANFILES): rename Texinfo/Data.pm as 
Texinfo/HTMLData.pm and main/conversion_data.c as main/html_conversion_data.c.  
Report from Gavin.
b6f0f81804 is described below

commit b6f0f81804b86220e4bbb3ee635aaea182ba75ab
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Oct 21 19:59:17 2024 +0200

    * tp/maintain/generate_code_convert_data.pl, tp/Makefile.am
    (dist_modules_DATA, Texinfo/HTMLData.pm, MAINTAINERCLEANFILES),
    tp/Texinfo/XS/Makefile.am (C_libtexinfo_sources, EXTRA_DIST)
    (BUILT_SOURCES, main/html_conversion_data.c, MAINTAINERCLEANFILES):
    rename Texinfo/Data.pm as Texinfo/HTMLData.pm and
    main/conversion_data.c as main/html_conversion_data.c.  Report from
    Gavin.
---
 ChangeLog                                            | 10 ++++++++++
 tp/Makefile.am                                       |  7 ++++---
 tp/Texinfo/Convert/HTML.pm                           | 16 ++++++++--------
 tp/Texinfo/{Data.pm => HTMLData.pm}                  |  2 +-
 tp/Texinfo/OutputUnits.pm                            |  4 ++--
 tp/Texinfo/XS/Makefile.am                            | 20 ++++++++++----------
 tp/Texinfo/XS/convert/build_html_perl_state.c        |  2 +-
 tp/Texinfo/XS/convert/convert_html.c                 |  2 +-
 tp/Texinfo/XS/convert/converter.c                    |  2 +-
 tp/Texinfo/XS/convert/format_html.c                  |  2 +-
 tp/Texinfo/XS/convert/get_html_perl_info.c           |  2 +-
 tp/Texinfo/XS/convert/html_prepare_converter.c       |  2 +-
 tp/Texinfo/XS/main/build_perl_info.c                 |  2 +-
 tp/Texinfo/XS/main/converter_types.h                 |  2 +-
 .../{conversion_data.c => html_conversion_data.c}    |  2 +-
 .../{conversion_data.h => html_conversion_data.h}    |  0
 tp/Texinfo/XS/main/option_types.h                    |  2 +-
 tp/Texinfo/XS/main/tree_types.h                      |  2 +-
 tp/Texinfo/XS/main/utils.c                           |  2 +-
 tp/maintain/generate_code_convert_data.pl            |  4 ++--
 20 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e5eaced142..612b5377c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-10-21  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/maintain/generate_code_convert_data.pl, tp/Makefile.am
+       (dist_modules_DATA, Texinfo/HTMLData.pm, MAINTAINERCLEANFILES),
+       tp/Texinfo/XS/Makefile.am (C_libtexinfo_sources, EXTRA_DIST)
+       (BUILT_SOURCES, main/html_conversion_data.c, MAINTAINERCLEANFILES):
+       rename Texinfo/Data.pm as Texinfo/HTMLData.pm and
+       main/conversion_data.c as main/html_conversion_data.c.  Report from
+       Gavin.
+
 2024-10-21  Gavin Smith <gavinsmith0123@gmail.com>
 
        Remove Perl and string list implementations for "registered ids"
diff --git a/tp/Makefile.am b/tp/Makefile.am
index 60b3e812d2..8ef181bc96 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -74,7 +74,7 @@ dist_modules_DATA = \
  Texinfo/Common.pm \
  Texinfo/Commands.pod \
  Texinfo/Commands.pm \
- Texinfo/Data.pm \
+ Texinfo/HTMLData.pm \
  Texinfo/DebugTree.pm \
  Texinfo/Document.pm \
  Texinfo/DocumentXS.pm \
@@ -396,7 +396,7 @@ $(srcdir)/Texinfo/Options.pm: 
Texinfo/Convert/converters_defaults.txt Texinfo/op
            $(srcdir)/Texinfo/Options.pm \
               < $(srcdir)/Texinfo/options_data.txt
 
-$(srcdir)/Texinfo/Data.pm: Texinfo/Data/default_css_element_class_styles.csv 
Texinfo/Data/default_direction_strings.csv 
Texinfo/Data/default_special_unit_info.csv 
Texinfo/Data/html_style_commands_element.csv 
$(srcdir)/maintain/generate_code_convert_data.pl
+$(srcdir)/Texinfo/HTMLData.pm: 
Texinfo/Data/default_css_element_class_styles.csv 
Texinfo/Data/default_direction_strings.csv 
Texinfo/Data/default_special_unit_info.csv 
Texinfo/Data/html_style_commands_element.csv 
$(srcdir)/maintain/generate_code_convert_data.pl
        $(srcdir)/maintain/generate_code_convert_data.pl \
              $(srcdir)/Texinfo/Data/default_css_element_class_styles.csv \
              $(srcdir)/Texinfo/Data/default_direction_strings.csv \
@@ -449,4 +449,5 @@ distclean-local:
 
 CLEANFILES = texi2any makeinfo Texinfo/ModulePath.pm
 DISTCLEANFILES = maintain/catalog.xml
-MAINTAINERCLEANFILES = Texinfo/Commands.pm Texinfo/Options.pm Texinfo/Data.pm
+MAINTAINERCLEANFILES = Texinfo/Commands.pm Texinfo/Options.pm \
+      Texinfo/HTMLData.pm
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 0848a66a89..303c71e1b9 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -66,7 +66,7 @@ use Texinfo::XSLoader;
 use Texinfo::Commands;
 use Texinfo::Options;
 use Texinfo::Common;
-use Texinfo::Data;
+use Texinfo::HTMLData;
 use Texinfo::Config;
 use Texinfo::Convert::Unicode;
 use Texinfo::Convert::Texinfo;
@@ -2561,13 +2561,13 @@ foreach my $buttons ('CHAPTER_FOOTER_BUTTONS', 
'TOP_FOOTER_BUTTONS') {
 
 
 my %default_special_unit_info
-  = %{ Texinfo::Data::get_default_special_unit_info() };
+  = %{ Texinfo::HTMLData::get_default_special_unit_info() };
 
 # TODO translation context should be consistent with special_unit_info()
 %default_translated_special_unit_info
-  = %{ Texinfo::Data::get_default_translated_special_unit_info() };
+  = %{ Texinfo::HTMLData::get_default_translated_special_unit_info() };
 
-my $direction_orders = Texinfo::Data::get_directions_order();
+my $direction_orders = Texinfo::HTMLData::get_directions_order();
 # 'global', 'relative', 'file'
 # include space direction
 my @global_directions_order = @{$direction_orders->[0]};
@@ -2580,14 +2580,14 @@ foreach my $direction_order (@$direction_orders) {
 
 # for rel, see http://www.w3.org/TR/REC-html40/types.html#type-links
 my %default_converted_directions_strings
-  = %{ Texinfo::Data::get_default_converted_directions_strings() };
+  = %{ Texinfo::HTMLData::get_default_converted_directions_strings() };
 
 # translation contexts should be consistent with
 # %direction_type_translation_context.  If the direction is not used
 # as is, it should also be taken into account in direction_string().
 # For now 'This' becomes 'This (current section)'.
 my %default_translated_directions_strings
-   = %{ Texinfo::Data::get_default_translated_directions_strings() };
+   = %{ Texinfo::HTMLData::get_default_translated_directions_strings() };
 
 my @style_commands_contexts = ('normal', 'preformatted');
 my @no_args_commands_contexts
@@ -2735,7 +2735,7 @@ sub converter_defaults($$)
 }
 
 my %default_css_element_class_styles
-  = %{ Texinfo::Data::get_base_default_css_info() };
+  = %{ Texinfo::HTMLData::get_base_default_css_info() };
 
 $default_css_element_class_styles{'pre.format-preformatted'}
   = $default_css_element_class_styles{'pre.display-preformatted'};
@@ -3107,7 +3107,7 @@ foreach my $quoted_command ('samp') {
 my %default_upper_case_commands = ( 'sc' => 1 );
 
 my %style_commands_element
-   = %{ Texinfo::Data::get_html_style_commands_element() };
+   = %{ Texinfo::HTMLData::get_html_style_commands_element() };
 
 my %default_style_commands_formatting;
 
diff --git a/tp/Texinfo/Data.pm b/tp/Texinfo/HTMLData.pm
similarity index 99%
rename from tp/Texinfo/Data.pm
rename to tp/Texinfo/HTMLData.pm
index 0c5bb385cb..224ab6b35c 100644
--- a/tp/Texinfo/Data.pm
+++ b/tp/Texinfo/HTMLData.pm
@@ -1,6 +1,6 @@
 # Automatically generated from generate_code_convert_data.pl
 
-package Texinfo::Data;
+package Texinfo::HTMLData;
 
 use Texinfo::Common;
 
diff --git a/tp/Texinfo/OutputUnits.pm b/tp/Texinfo/OutputUnits.pm
index e022657e7e..c611807615 100644
--- a/tp/Texinfo/OutputUnits.pm
+++ b/tp/Texinfo/OutputUnits.pm
@@ -41,7 +41,7 @@ use Texinfo::XSLoader;
 
 use Texinfo::Commands;
 use Texinfo::Common;
-use Texinfo::Data;
+use Texinfo::HTMLData;
 use Texinfo::ManipulateTree;
 
 require Exporter;
@@ -652,7 +652,7 @@ sub output_unit_texi($)
                                                           $unit_command);
 }
 
-my $direction_orders = Texinfo::Data::get_directions_order();
+my $direction_orders = Texinfo::HTMLData::get_directions_order();
 # 'global', 'relative', 'file'
 my @relative_directions_order = @{$direction_orders->[1]};
 my @file_directions_order = @{$direction_orders->[2]};
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 91c076226b..69da7a7849 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -142,8 +142,8 @@ C_libtexinfo_sources = \
                      main/convert_utils.h \
                      main/customization_options.c \
                      main/customization_options.h \
-                     main/conversion_data.c \
-                     main/conversion_data.h \
+                     main/html_conversion_data.c \
+                     main/html_conversion_data.h \
                      main/floats.c \
                      main/floats.h \
                      main/manipulate_tree.c \
@@ -227,8 +227,8 @@ XS_libtexinfo_sources = \
 
 EXTRA_DIST += main/accent_tables_8bit_codepoints.c
 EXTRA_DIST += main/command_data.c
-EXTRA_DIST += main/conversion_data.c
-EXTRA_DIST += main/conversion_data.h
+EXTRA_DIST += main/html_conversion_data.c
+EXTRA_DIST += main/html_conversion_data.h
 EXTRA_DIST += main/cmd_normalization.c
 EXTRA_DIST += main/cmd_unicode.c
 EXTRA_DIST += main/cmd_text.c
@@ -256,8 +256,8 @@ BUILT_SOURCES = main/accent_tables_8bit_codepoints.c \
                 main/cmd_unicode.c \
                 main/command_data.c \
                 main/command_ids.h \
-                main/conversion_data.c \
-                main/conversion_data.h \
+                main/html_conversion_data.c \
+                main/html_conversion_data.h \
                 main/element_types.c \
                 main/element_types.h \
                 main/global_commands_types.h \
@@ -343,17 +343,17 @@ MAINTAINERCLEANFILES += main/options_init_free.c 
main/options_types.h \
                         convert/converters_options.h \
                         main/options_get_perl.c
 
-$(srcdir)/main/conversion_data.c $(srcdir)/main/conversion_data.h: 
main/command_data.c $(srcdir)/../Data/default_css_element_class_styles.csv 
$(srcdir)/../Data/default_direction_strings.csv 
$(srcdir)/../Data/default_special_unit_info.csv 
$(srcdir)/../Data/html_style_commands_element.csv 
$(srcdir)/../../maintain/generate_code_convert_data.pl
+$(srcdir)/main/html_conversion_data.c $(srcdir)/main/html_conversion_data.h: 
main/command_data.c $(srcdir)/../Data/default_css_element_class_styles.csv 
$(srcdir)/../Data/default_direction_strings.csv 
$(srcdir)/../Data/default_special_unit_info.csv 
$(srcdir)/../Data/html_style_commands_element.csv 
$(srcdir)/../../maintain/generate_code_convert_data.pl
        $(PERL) $(srcdir)/../../maintain/generate_code_convert_data.pl \
                < $(srcdir)/main/command_data.c \
                    $(srcdir)/../Data/default_css_element_class_styles.csv \
                    $(srcdir)/../Data/default_direction_strings.csv \
                    $(srcdir)/../Data/default_special_unit_info.csv \
                    $(srcdir)/../Data/html_style_commands_element.csv \
-                   C $(srcdir)/main/conversion_data.c \
-                   $(srcdir)/main/conversion_data.h
+                   C $(srcdir)/main/html_conversion_data.c \
+                   $(srcdir)/main/html_conversion_data.h
 
-MAINTAINERCLEANFILES += main/conversion_data.c main/conversion_data.h
+MAINTAINERCLEANFILES += main/html_conversion_data.c main/html_conversion_data.h
 
 
 ########################## shared perl XS library for texinfo XS codes
diff --git a/tp/Texinfo/XS/convert/build_html_perl_state.c 
b/tp/Texinfo/XS/convert/build_html_perl_state.c
index c97885a2fd..dd7b7e9300 100644
--- a/tp/Texinfo/XS/convert/build_html_perl_state.c
+++ b/tp/Texinfo/XS/convert/build_html_perl_state.c
@@ -29,7 +29,7 @@
 
 #undef context
 
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 #include "tree_types.h"
 #include "converter_types.h"
 /* for builtin_command_name */
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 4b18346c56..9e484d2f96 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -22,7 +22,7 @@
 
 #include "copy-file.h"
 
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 #include "text.h"
 #include "element_types.h"
 #include "tree_types.h"
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index e2a690a28a..9560c1fe3f 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 #include "text.h"
 #include "command_ids.h"
 #include "element_types.h"
diff --git a/tp/Texinfo/XS/convert/format_html.c 
b/tp/Texinfo/XS/convert/format_html.c
index bcba223f73..2552c80ddd 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -25,7 +25,7 @@
 #include <unistr.h>
 #include <unictype.h>
 
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 #include "text.h"
 #include "element_types.h"
 #include "tree_types.h"
diff --git a/tp/Texinfo/XS/convert/get_html_perl_info.c 
b/tp/Texinfo/XS/convert/get_html_perl_info.c
index 534f7798c9..ad757b0ef6 100644
--- a/tp/Texinfo/XS/convert/get_html_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_html_perl_info.c
@@ -31,7 +31,7 @@
 
 #undef context
 
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 #include "command_ids.h"
 #include "converter_types.h"
 #include "types_data.h"
diff --git a/tp/Texinfo/XS/convert/html_prepare_converter.c 
b/tp/Texinfo/XS/convert/html_prepare_converter.c
index c1a809bbfd..b0b65b9496 100644
--- a/tp/Texinfo/XS/convert/html_prepare_converter.c
+++ b/tp/Texinfo/XS/convert/html_prepare_converter.c
@@ -28,7 +28,7 @@
 #include "element_types.h"
 #include "tree_types.h"
 #include "converter_types.h"
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 /* new_element */
 #include "tree.h"
 #include "errors.h"
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index c13fccbef2..9c488e47d9 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -1352,7 +1352,7 @@ pass_document_parser_errors_to_registrar (size_t 
document_descriptor,
     return;
    */
 
-  /* Add error registrar to Parser */
+  /* Add error registrar to Parser if needed */
   parser_registrar_sv = hv_fetch (parser_hv, "registrar",
                                   strlen ("registrar"), 0);
   if (parser_registrar_sv)
diff --git a/tp/Texinfo/XS/main/converter_types.h 
b/tp/Texinfo/XS/main/converter_types.h
index 290f491557..becb7dad1c 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -22,7 +22,7 @@
 #include <stdio.h>
 
 /* for enum special_unit_info_type SPECIAL_UNIT_INFO_TYPE_NR ... */
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 #include "element_types.h"
 #include "command_ids.h"
 #include "tree_types.h"
diff --git a/tp/Texinfo/XS/main/conversion_data.c 
b/tp/Texinfo/XS/main/html_conversion_data.c
similarity index 99%
rename from tp/Texinfo/XS/main/conversion_data.c
rename to tp/Texinfo/XS/main/html_conversion_data.c
index bfdc96bd16..64e7c10fa9 100644
--- a/tp/Texinfo/XS/main/conversion_data.c
+++ b/tp/Texinfo/XS/main/html_conversion_data.c
@@ -2,7 +2,7 @@
 
 #include <config.h>
 
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 #include "tree_types.h"
 #include "converter_types.h"
 
diff --git a/tp/Texinfo/XS/main/conversion_data.h 
b/tp/Texinfo/XS/main/html_conversion_data.h
similarity index 100%
rename from tp/Texinfo/XS/main/conversion_data.h
rename to tp/Texinfo/XS/main/html_conversion_data.h
diff --git a/tp/Texinfo/XS/main/option_types.h 
b/tp/Texinfo/XS/main/option_types.h
index b1446a9304..a2f7c547c3 100644
--- a/tp/Texinfo/XS/main/option_types.h
+++ b/tp/Texinfo/XS/main/option_types.h
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 #include "tree_types.h"
 
 enum global_option_type {
diff --git a/tp/Texinfo/XS/main/tree_types.h b/tp/Texinfo/XS/main/tree_types.h
index 85aaf2296b..3f669706a3 100644
--- a/tp/Texinfo/XS/main/tree_types.h
+++ b/tp/Texinfo/XS/main/tree_types.h
@@ -19,7 +19,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 #include "command_ids.h"
 #include "element_types.h"
 #include "text.h"
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index 15b2e0ac21..c89eb12a3a 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -36,7 +36,7 @@
 #include <libintl.h>
 #endif
 
-#include "conversion_data.h"
+#include "html_conversion_data.h"
 /* also for xvasprintf */
 #include "text.h"
 #include "command_ids.h"
diff --git a/tp/maintain/generate_code_convert_data.pl 
b/tp/maintain/generate_code_convert_data.pl
index 971e7715a4..a59bde97fa 100755
--- a/tp/maintain/generate_code_convert_data.pl
+++ b/tp/maintain/generate_code_convert_data.pl
@@ -94,7 +94,7 @@ if ($perl_format) {
 
   print OUT "# Automatically generated from $program_name\n\n";
 
-  print OUT "package Texinfo::Data;\n\n";
+  print OUT "package Texinfo::HTMLData;\n\n";
 
   print OUT "use Texinfo::Common;\n\n";
 
@@ -115,7 +115,7 @@ if ($perl_format) {
   print OUT "/* Automatically generated from $program_name */\n\n";
 
   print OUT "#include <config.h>\n\n";
-  print OUT "#include \"conversion_data.h\"\n";
+  print OUT "#include \"html_conversion_data.h\"\n";
   print OUT "#include \"tree_types.h\"\n";
   print OUT "#include \"converter_types.h\"\n\n";
 



reply via email to

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