[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Fri, 4 Oct 2024 19:30:03 -0400 (EDT) |
branch: master
commit 485729d3216f80d419c7cbf996ce72598cd63700
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Aug 16 15:26:37 2024 +0200
* tp/Texinfo/XS/convert/convert_html.h,
tp/Texinfo/XS/convert/html_prepare_converter.h: comment out function
definitions already done in html_conversion_api.h or
html_converter_api.h.
---
ChangeLog | 7 +++++++
tp/Texinfo/XS/convert/convert_html.c | 1 +
tp/Texinfo/XS/convert/convert_html.h | 28 ++++++++++++++------------
tp/Texinfo/XS/convert/html_conversion_api.h | 2 ++
tp/Texinfo/XS/convert/html_prepare_converter.c | 2 ++
tp/Texinfo/XS/convert/html_prepare_converter.h | 28 +++++++++++++++-----------
tp/Texinfo/XS/main/utils.h | 1 -
7 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 603807aaa6..c26581fd58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-08-16 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/convert/convert_html.h,
+ tp/Texinfo/XS/convert/html_prepare_converter.h: comment out function
+ definitions already done in html_conversion_api.h or
+ html_converter_api.h.
+
2024-08-16 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/Makefile.am (libtexinfo_convert_la_SOURCES),
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index dfaf459a2d..c05664b993 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -66,6 +66,7 @@
#include "html_conversion_state.h"
#include "format_html.h"
#include "convert_html.h"
+#include "html_conversion_api.h"
const char *html_conversion_context_type_names[] = {
#define cctx_type(name) #name,
diff --git a/tp/Texinfo/XS/convert/convert_html.h
b/tp/Texinfo/XS/convert/convert_html.h
index 536cc54cc0..4dd73e3993 100644
--- a/tp/Texinfo/XS/convert/convert_html.h
+++ b/tp/Texinfo/XS/convert/convert_html.h
@@ -23,6 +23,8 @@
#include "html_converter_types.h"
+/* NOTE the intermediate level functions are declared in
+ html_conversion_api.h */
ELEMENT *html_cdt_tree (const char *string, CONVERTER *self,
NAMED_STRING_ELEMENT_LIST *replaced_substrings,
@@ -67,7 +69,7 @@ void html_complete_no_arg_commands_formatting (CONVERTER
*self,
int translate);
void html_reset_translated_special_unit_info_tree (CONVERTER *self);
-void html_translate_names (CONVERTER *self);
+/* void html_translate_names (CONVERTER *self); */
int html_run_stage_handlers (CONVERTER *self,
@@ -77,32 +79,32 @@ void html_setup_output_simple_page (CONVERTER *self,
const char *output_filename);
/* next two called separately for convert() */
-void html_prepare_simpletitle (CONVERTER *self);
-void html_prepare_title_titlepage (CONVERTER *self, const char *output_file,
- const char *output_filename);
+/* void html_prepare_simpletitle (CONVERTER *self); */
+/* void html_prepare_title_titlepage (CONVERTER *self, const char *output_file,
+ const char *output_filename); */
/* only for output() */
-int html_prepare_converted_output_info (CONVERTER *self,
+/* int html_prepare_converted_output_info (CONVERTER *self,
const char *output_file,
- const char *output_filename);
+ const char *output_filename); */
char *debug_print_html_contexts (const CONVERTER *self);
-char *html_convert_convert (CONVERTER *self, const ELEMENT *root);
+/* char *html_convert_convert (CONVERTER *self, const ELEMENT *root); */
-char *html_convert_output (CONVERTER *self, const ELEMENT *root,
+/* char *html_convert_output (CONVERTER *self, const ELEMENT *root,
const char *output_file,
const char *destination_directory,
const char *output_filename,
- const char *document_name);
+ const char *document_name); */
-void html_conversion_finalization (CONVERTER *self);
+/* void html_conversion_finalization (CONVERTER *self); */
void html_check_transfer_state_finalization (CONVERTER *self);
-void html_do_js_files (CONVERTER *self);
+/* void html_do_js_files (CONVERTER *self); */
void html_set_file_source_info (FILE_SOURCE_INFO *file_source_info,
const char *file_info_type,
@@ -126,8 +128,8 @@ char *html_prepare_node_redirection_page (CONVERTER *self,
int html_node_redirections (CONVERTER *self,
const char *output_file, const char *destination_directory);
-int html_finish_output (CONVERTER *self, const char *output_file,
- const char *destination_directory);
+/* int html_finish_output (CONVERTER *self, const char *output_file,
+ const char *destination_directory); */
#endif
diff --git a/tp/Texinfo/XS/convert/html_conversion_api.h
b/tp/Texinfo/XS/convert/html_conversion_api.h
index d467ea146a..efb5e8365a 100644
--- a/tp/Texinfo/XS/convert/html_conversion_api.h
+++ b/tp/Texinfo/XS/convert/html_conversion_api.h
@@ -34,6 +34,7 @@ void html_converter_customize (CONVERTER *self);
/* in options_init_free.c */
void html_fill_options_directions (OPTIONS *options, const CONVERTER
*converter);
+/* in html_prepare_converter.c */
void html_initialize_output_state (CONVERTER *self, const char *context);
int html_setup_output (CONVERTER *self, char **paths);
@@ -51,6 +52,7 @@ FILE_SOURCE_INFO_LIST *html_prepare_units_directions_files
(CONVERTER *self,
const char *output_file, const char *destination_directory,
const char *output_filename, const char *document_name);
+/* in convert_html.c */
void html_translate_names (CONVERTER *self);
/* next two called separately for convert() */
diff --git a/tp/Texinfo/XS/convert/html_prepare_converter.c
b/tp/Texinfo/XS/convert/html_prepare_converter.c
index 88b3f013ce..f29c8fa5f0 100644
--- a/tp/Texinfo/XS/convert/html_prepare_converter.c
+++ b/tp/Texinfo/XS/convert/html_prepare_converter.c
@@ -55,6 +55,8 @@
html_setup_output_simple_page */
#include "convert_html.h"
#include "html_prepare_converter.h"
+#include "html_conversion_api.h"
+#include "html_converter_api.h"
typedef struct CMD_VARIETY {
enum command_id cmd;
diff --git a/tp/Texinfo/XS/convert/html_prepare_converter.h
b/tp/Texinfo/XS/convert/html_prepare_converter.h
index 83ee79c68a..5d63a3e106 100644
--- a/tp/Texinfo/XS/convert/html_prepare_converter.h
+++ b/tp/Texinfo/XS/convert/html_prepare_converter.h
@@ -5,6 +5,10 @@
#include "command_ids.h"
#include "converter_types.h"
+/* NOTE the high-level functions are declared in html_converter_api.h.
+ the intermediate level functions are declared in
+ html_conversion_api.h */
+
/* in conversion_data.c */
extern const char *special_unit_info_type_names[SUI_type_heading + 1];
@@ -16,7 +20,7 @@ extern const char
*htmlxref_split_type_names[htmlxref_split_type_chapter + 1];
-void html_format_setup (void);
+/* void html_format_setup (void); */
@@ -31,15 +35,15 @@ SPECIAL_UNIT_INFO *html_add_special_unit_info (
SPECIAL_UNIT_INFO_LIST *special_unit_info_list,
int type, size_t variety_nr, const char *value);
-void html_converter_init_special_unit (CONVERTER *self);
-void html_converter_customize (CONVERTER *self);
+/* void html_converter_init_special_unit (CONVERTER *self); */
+/* void html_converter_customize (CONVERTER *self); */
char ***new_directions_strings_type (int nr_string_directions,
int nr_dir_str_contexts);
-void html_initialize_output_state (CONVERTER *self, const char *context);
+/* void html_initialize_output_state (CONVERTER *self, const char *context); */
void initialize_js_categories_list (JSLICENSE_CATEGORY_LIST *js_files_info,
size_t size);
@@ -47,30 +51,30 @@ void initialize_jslicense_files
(JSLICENSE_FILE_INFO_LIST *jslicences_files_info,
const char *category, size_t size);
-int html_setup_output (CONVERTER *self, char **paths);
-void html_setup_convert (CONVERTER *self);
+/* int html_setup_output (CONVERTER *self, char **paths); */
+/* void html_setup_convert (CONVERTER *self); */
-void html_prepare_conversion_units (CONVERTER *self);
+/* void html_prepare_conversion_units (CONVERTER *self); */
int html_id_is_registered (CONVERTER *self, const char *string);
void html_register_id (CONVERTER *self, const char *string);
-void html_prepare_conversion_units_targets (CONVERTER *self,
- const char *document_name);
+/* void html_prepare_conversion_units_targets (CONVERTER *self,
+ const char *document_name); */
/* called separately for convert() */
-void html_prepare_output_units_global_targets (CONVERTER *self);
+/* void html_prepare_output_units_global_targets (CONVERTER *self); */
/* called from XS only */
void html_setup_global_units_direction_names (CONVERTER *self);
/* only called for output() */
-FILE_SOURCE_INFO_LIST * html_prepare_units_directions_files (CONVERTER *self,
+/* FILE_SOURCE_INFO_LIST * html_prepare_units_directions_files (CONVERTER
*self,
const char *output_file, const char *destination_directory,
- const char *output_filename, const char *document_name);
+ const char *output_filename, const char *document_name); */
#endif
diff --git a/tp/Texinfo/XS/main/utils.h b/tp/Texinfo/XS/main/utils.h
index a66de63aea..0457a1ce5e 100644
--- a/tp/Texinfo/XS/main/utils.h
+++ b/tp/Texinfo/XS/main/utils.h
@@ -209,7 +209,6 @@ void set_output_encoding (OPTIONS
*customization_information,
DOCUMENT *document);
/* in options_init_free.c */
OPTION *get_command_option (OPTIONS *options, enum command_id cmd);
-void html_fill_options_directions (OPTIONS *options, const CONVERTER
*converter);
void add_include_directory (const char *filename,
STRING_LIST *include_dirs_list);