[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES), tp/Texinfo/XS/convert/call_html_perl_function.c, tp/Texinfo/XS/main/build_perl_info.c, tp/Texinfo/XS/main/call_perl_function.c, tp/Texinfo/XS/convert/build_html_perl_state.c: new files convert/call_html_perl_function.c and convert/build_html_perl_state.c with HTML specific content of call_perl_function.c and build_perl_info.c. |
|
Date: |
Tue, 07 Nov 2023 11:35:04 -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 398ac7893b * tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES),
tp/Texinfo/XS/convert/call_html_perl_function.c,
tp/Texinfo/XS/main/build_perl_info.c, tp/Texinfo/XS/main/call_perl_function.c,
tp/Texinfo/XS/convert/build_html_perl_state.c: new files
convert/call_html_perl_function.c and convert/build_html_perl_state.c with HTML
specific content of call_perl_function.c and build_perl_info.c.
398ac7893b is described below
commit 398ac7893b4fa76011dcf5d2fffa2f440cb5e3f7
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Nov 7 17:34:53 2023 +0100
* tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES),
tp/Texinfo/XS/convert/call_html_perl_function.c,
tp/Texinfo/XS/main/build_perl_info.c,
tp/Texinfo/XS/main/call_perl_function.c,
tp/Texinfo/XS/convert/build_html_perl_state.c: new files
convert/call_html_perl_function.c and convert/build_html_perl_state.c
with HTML specific content of call_perl_function.c and
build_perl_info.c.
---
ChangeLog | 11 +
tp/Texinfo/XS/Makefile.am | 4 +
tp/Texinfo/XS/convert/ConvertXS.xs | 1 +
tp/Texinfo/XS/convert/build_html_perl_state.c | 1070 +++++++++++++++++++
tp/Texinfo/XS/convert/build_html_perl_state.h | 37 +
.../call_html_perl_function.c} | 48 +-
.../call_html_perl_function.h} | 10 +-
tp/Texinfo/XS/convert/convert_html.c | 2 +-
tp/Texinfo/XS/main/build_perl_info.c | 1017 +------------------
tp/Texinfo/XS/main/build_perl_info.h | 28 +-
tp/Texinfo/XS/main/call_perl_function.c | 1072 +-------------------
tp/Texinfo/XS/main/call_perl_function.h | 60 --
12 files changed, 1142 insertions(+), 2218 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1f6e983f8f..f2aca4eba6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2023-11-07 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES),
+ tp/Texinfo/XS/convert/call_html_perl_function.c,
+ tp/Texinfo/XS/main/build_perl_info.c,
+ tp/Texinfo/XS/main/call_perl_function.c,
+ tp/Texinfo/XS/convert/build_html_perl_state.c: new files
+ convert/call_html_perl_function.c and convert/build_html_perl_state.c
+ with HTML specific content of call_perl_function.c and
+ build_perl_info.c.
+
2023-11-06 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/Converter.pm (import, _XS_get_unclosed_stream)
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index fe9b05f9d6..f66675f324 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -364,6 +364,10 @@ endif
ConvertXS_la_SOURCES = \
convert/ConvertXS.c \
+ convert/build_html_perl_state.h \
+ convert/build_html_perl_state.c \
+ convert/call_html_perl_function.h \
+ convert/call_html_perl_function.c \
convert/convert_plain_texinfo.h \
convert/convert_plain_texinfo.c \
convert/convert_text.h \
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs
b/tp/Texinfo/XS/convert/ConvertXS.xs
index cf917ab0a7..8c28600bb8 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -34,6 +34,7 @@
#include "get_perl_info.h"
#include "build_perl_info.h"
+#include "build_html_perl_state.h"
#include "convert_plain_texinfo.h"
#include "convert_text.h"
#include "convert_to_text.h"
diff --git a/tp/Texinfo/XS/convert/build_html_perl_state.c
b/tp/Texinfo/XS/convert/build_html_perl_state.c
new file mode 100644
index 0000000000..6be33603b6
--- /dev/null
+++ b/tp/Texinfo/XS/convert/build_html_perl_state.c
@@ -0,0 +1,1070 @@
+/* Copyright 2010-2023 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+
+/* Avoid namespace conflicts. */
+#define context perl_context
+
+#define PERL_NO_GET_CONTEXT
+#include "EXTERN.h"
+#include "perl.h"
+/* Avoid warnings about Perl headers redefining symbols that gnulib
+ redefined already. */
+#if defined _WIN32 && !defined __CYGWIN__
+ #undef free
+#endif
+#include "XSUB.h"
+
+#undef context
+
+#include "tree_types.h"
+#include "converter_types.h"
+/* for fatal HMSF_* */
+#include "utils.h"
+/* for debugging */
+#include "debug.h"
+#include "convert_to_texinfo.h"
+#include "output_unit.h"
+#include "command_stack.h"
+#include "build_perl_info.h"
+/* for NAMED_STRING_ELEMENT_LIST */
+#include "translations.h"
+#include "build_html_perl_state.h"
+
+#define LOCALEDIR DATADIR "/locale"
+
+ /* TODO the following NOTE could be obsolete, as this code is now part
+ of a library that is not linked against Gnulib. However, XS dynamic
+ shared object link against both the library this code is part of and
+ another library that does not use perl headers and do not link against
+ perl libraries but links against Gnulib. */
+
+ /* NOTE: Do not call 'malloc' or 'free' in any function called in this file.
+ Since this file (build_perl_info.c) includes the Perl headers,
+ we get the Perl redefinitions, which we do not want, as we don't use
+ them throughout the rest of the program. */
+
+ /* Can't use asprintf here, because it might come from Gnulib, and
+ will then use malloc that is different from Perl's malloc, whereas
+ free below is redirected to Perl's implementation. This could
+ cause crashes if the two malloc/free implementations were different. */
+
+HV *
+build_html_element_targets (HTML_TARGET_LIST *html_targets)
+{
+ HV *hv;
+ int i;
+
+ dTHX;
+
+ hv = newHV ();
+
+ if (!html_targets || html_targets->number <= 0)
+ return hv;
+
+#define STORE(key, sv) hv_store (html_target_hv, key, strlen (key), sv, 0)
+ for (i = 0; i < html_targets->number; i++)
+ {
+ HV *html_target_hv;
+ HTML_TARGET *html_target = &html_targets->list[i];
+ SV *target_sv = newSVpv_utf8 (html_target->target, 0);
+ SV *element_sv;
+ SV *html_target_sv;
+
+ if (!html_target->element->hv)
+ {
+ fprintf (stderr, "BUG: No hv for target '%s'\n",
html_target->target);
+ fatal ("No hv for target");
+ }
+
+ element_sv = newRV_inc ((SV *) html_target->element->hv);
+
+ html_target_hv = newHV ();
+ html_target_sv = newRV_noinc ((SV *) html_target_hv);
+ hv_store_ent (hv, element_sv, html_target_sv, 0);
+
+ STORE("target", target_sv);
+ if (html_target->special_unit_filename)
+ STORE("special_unit_filename",
+ newSVpv_utf8 (html_target->special_unit_filename, 0));
+ if (html_target->node_filename)
+ STORE("node_filename",
+ newSVpv_utf8 (html_target->node_filename, 0));
+ if (html_target->section_filename)
+ STORE("section_filename",
+ newSVpv_utf8 (html_target->section_filename, 0));
+ if (html_target->contents_target)
+ STORE("contents_target",
+ newSVpv_utf8 (html_target->contents_target, 0));
+ if (html_target->shortcontents_target)
+ STORE("shortcontents_target",
+ newSVpv_utf8 (html_target->shortcontents_target, 0));
+ }
+#undef STORE
+ return hv;
+}
+
+void
+pass_html_element_targets (SV *converter_sv, HTML_TARGET_LIST *html_targets)
+{
+ HV *targets_hv;
+ HV *hv;
+
+ dTHX;
+
+ hv = (HV *) SvRV (converter_sv);
+
+ targets_hv = build_html_element_targets (html_targets);
+
+ hv_store (hv, "targets", strlen ("targets"),
+ newRV_noinc ((SV *) targets_hv), 0);
+}
+
+HV *
+build_html_special_targets (HTML_TARGET_LIST **html_special_targets)
+{
+ HV *hv;
+ HV *html_special_target_hv;
+
+ dTHX;
+
+ hv = newHV ();
+
+ /* could be generalized if needed */
+
+ HTML_TARGET_LIST *html_special_target =
html_special_targets[ST_footnote_location];
+ html_special_target_hv = build_html_element_targets (html_special_target);
+
+ hv_store (hv, "footnote_location", strlen ("footnote_location"),
+ newRV_noinc ((SV *) html_special_target_hv), 0);
+
+ return hv;
+}
+
+void
+pass_html_special_targets (SV *converter_sv,
+ HTML_TARGET_LIST **html_special_targets)
+{
+ HV *special_targets_hv;
+ HV *hv;
+
+ dTHX;
+
+ hv = (HV *) SvRV (converter_sv);
+
+ special_targets_hv = build_html_special_targets (html_special_targets);
+
+ hv_store (hv, "special_targets", strlen ("special_targets"),
+ newRV_noinc ((SV *) special_targets_hv), 0);
+}
+
+HV *
+build_html_seen_ids (STRING_LIST *seen_ids)
+{
+ HV *hv;
+ int i;
+
+ dTHX;
+
+ hv = newHV ();
+
+ if (seen_ids && seen_ids->number > 0)
+ {
+ for (i = 0; i < seen_ids->number; i++)
+ {
+ char *target = seen_ids->list[i];
+ SV *target_sv = newSVpv_utf8 (target, 0);
+ hv_store_ent (hv, target_sv, newSViv (1), 0);
+ }
+ }
+
+ return hv;
+}
+
+void
+pass_html_seen_ids (SV *converter_sv, STRING_LIST *seen_ids)
+{
+ HV *seen_ids_hv;
+ HV *hv;
+
+ dTHX;
+
+ hv = (HV *) SvRV (converter_sv);
+
+ seen_ids_hv = build_html_seen_ids (seen_ids);
+
+ hv_store (hv, "seen_ids", strlen ("seen_ids"),
+ newRV_noinc ((SV *) seen_ids_hv), 0);
+}
+
+SV *
+build_html_files_source_info (FILE_SOURCE_INFO_LIST *files_source_info)
+{
+ int i;
+ HV *hv;
+
+ dTHX;
+
+ hv = newHV ();
+
+ if (files_source_info)
+ {
+#define STORE(key, sv) hv_store (file_source_info_hv, key, strlen (key), sv, 0)
+ for (i = 0; i < files_source_info->number; i++)
+ {
+ FILE_SOURCE_INFO * file_source_info = &files_source_info->list[i];
+ HV *file_source_info_hv;
+ SV *file_source_info_sv;
+ char *filename = file_source_info->filename;
+ SV *filename_sv = newSVpv_utf8 (filename, 0);
+
+ file_source_info_hv = newHV ();
+ file_source_info_sv = newRV_noinc ((SV *) file_source_info_hv);
+
+ hv_store_ent (hv, filename_sv, file_source_info_sv, 0);
+
+ STORE("file_info_type", newSVpv_utf8 (file_source_info->type, 0));
+ if (file_source_info->name)
+ STORE("file_info_name", newSVpv_utf8 (file_source_info->name, 0));
+ /* not actually used in downstream code, but present also in perl */
+ if (file_source_info->path)
+ STORE("file_info_path", newSVpv_utf8 (file_source_info->path, 0));
+ else
+ STORE("file_info_path", newSV(0));
+
+ if (file_source_info->element)
+ {
+ SV *element_sv = newRV_inc ((SV *)
file_source_info->element->hv);
+ STORE("file_info_element", element_sv);
+ }
+ }
+#undef STORE
+ }
+ return newRV_noinc ((SV *) hv);
+}
+
+HV *
+build_html_global_units_directions (OUTPUT_UNIT **global_units_directions,
+ SPECIAL_UNIT_DIRECTION **special_units_direction_name)
+{
+ int i;
+ SPECIAL_UNIT_DIRECTION **s;
+ SPECIAL_UNIT_DIRECTION *special_unit_direction;
+ HV *hv;
+
+ dTHX;
+
+ if (!global_units_directions)
+ return 0;
+
+ hv = newHV ();
+
+ for (i = 0; i < D_Last+1; i++)
+ {
+ if (global_units_directions[i])
+ {
+ char *direction_name = html_global_unit_direction_names[i];
+ hv_store (hv, direction_name, strlen (direction_name),
+ newRV_inc ((SV *) global_units_directions[i]->hv), 0);
+ }
+ }
+
+ for (s = special_units_direction_name; (special_unit_direction = *s) ; s++)
+ {
+ char *direction_name = special_unit_direction->direction;
+ OUTPUT_UNIT *output_unit = special_unit_direction->output_unit;
+ hv_store (hv, direction_name, strlen (direction_name),
+ newRV_inc ((SV *) output_unit->hv), 0);
+ }
+
+ return hv;
+}
+
+void
+pass_html_global_units_directions (SV *converter_sv,
+ OUTPUT_UNIT **global_units_directions,
+ SPECIAL_UNIT_DIRECTION **special_units_direction_name)
+{
+ HV *global_units_directions_hv;
+ SV *global_units_directions_sv;
+ HV *converter_hv;
+
+ dTHX;
+
+ converter_hv = (HV *) SvRV (converter_sv);
+
+ global_units_directions_hv
+ = build_html_global_units_directions (global_units_directions,
+ special_units_direction_name);
+ if (global_units_directions_hv)
+ global_units_directions_sv
+ = newRV_noinc ((SV *) global_units_directions_hv);
+ else
+ global_units_directions_sv = newSV (0);
+
+ hv_store (converter_hv, "global_units_directions",
+ strlen ("global_units_directions"), global_units_directions_sv, 0);
+}
+
+HV *
+build_html_elements_in_file_count (
+ FILE_NAME_PATH_COUNTER_LIST *output_unit_files)
+{
+ int i;
+ HV *hv;
+
+ dTHX;
+
+ hv = newHV ();
+
+ if (output_unit_files)
+ {
+ for (i = 0; i < output_unit_files->number; i++)
+ {
+ FILE_NAME_PATH_COUNTER *output_unit_file
+ = &output_unit_files->list[i];
+ char *filename = output_unit_file->filename;
+ SV *filename_sv = newSVpv_utf8 (filename, 0);
+
+ hv_store_ent (hv, filename_sv,
+ newSViv (output_unit_file->elements_in_file_count), 0);
+ }
+ }
+
+ return hv;
+}
+
+void
+pass_html_elements_in_file_count (SV *converter_sv,
+ FILE_NAME_PATH_COUNTER_LIST *output_unit_files)
+{
+ HV *elements_in_file_count_hv;
+ HV *converter_hv;
+
+ dTHX;
+
+ converter_hv = (HV *) SvRV (converter_sv);
+
+ elements_in_file_count_hv
+ = build_html_elements_in_file_count (output_unit_files);
+
+ hv_store (converter_hv, "elements_in_file_count",
+ strlen ("elements_in_file_count"),
+ newRV_noinc ((SV *) elements_in_file_count_hv), 0);
+}
+
+void
+build_html_translated_names (HV *hv, CONVERTER *converter)
+{
+ int j;
+ SV **directions_strings_sv;
+ HV *directions_strings_hv;
+ SV **special_unit_info_sv;
+ HV *special_unit_info_hv;
+ SV **targets_sv;
+ SV **no_arg_commands_formatting_sv;
+ HV *direction_string_hv;
+
+ dTHX;
+
+ /* reset with empty hash */
+#define FETCH(key) key##_sv = hv_fetch (hv, #key, strlen (#key), 0);
+ FETCH(directions_strings);
+ directions_strings_hv = (HV *) SvRV (*directions_strings_sv);
+#define tds_type(name) \
+ direction_string_hv = newHV (); \
+ hv_store (directions_strings_hv, #name, strlen (#name), \
+ newRV_noinc ((SV *) direction_string_hv), 0);
+ TDS_TRANSLATED_TYPES_LIST
+#undef tds_type
+
+ FETCH(special_unit_info);
+ special_unit_info_hv = (HV *) SvRV (*special_unit_info_sv);
+
+ /* reset with empty hash */
+ for (j = 0; translated_special_unit_info[j].tree_type >= 0; j++)
+ {
+ int tree_type = translated_special_unit_info[j].string_type;
+ const char *type_name = special_unit_info_type_names[tree_type];
+ char *key;
+ HV *special_unit_hv = newHV ();
+ xasprintf (&key, "%s_tree", type_name);
+ hv_store (special_unit_info_hv, key, strlen (key),
+ newRV_noinc ((SV *) special_unit_hv), 0);
+ free (key);
+ }
+
+ /* remove some info that will be redone on demand */
+ if (converter->reset_target_commands.number > 0)
+ {
+ int j;
+ HV *targets_hv;
+ FETCH(targets);
+ targets_hv = (HV *) SvRV (*targets_sv);
+
+ for (j = 0; j < converter->reset_target_commands.number; j++)
+ {
+ ELEMENT *command = converter->reset_target_commands.list[j];
+ SV *command_sv = newRV_noinc ((SV *) command->hv);
+ HE *target_he = hv_fetch_ent (targets_hv, command_sv, 0, 0);
+ if (!target_he)
+ {
+ char *element_str = print_element_debug (command, 0);
+ fprintf (stderr, "BUG: cannot retrieve target %d %s\n",
+ j, element_str);
+ free (element_str);
+ }
+ else
+ {
+ SV *target_sv = HeVAL (target_he);
+ HV *target_hv = (HV *) SvRV (target_sv);
+ if (hv_exists (target_hv, "text", strlen ("text")))
+ hv_delete (target_hv, "text", strlen ("text"), G_DISCARD);
+ if (hv_exists (target_hv, "string", strlen ("string")))
+ hv_delete (target_hv, "string", strlen ("string"), G_DISCARD);
+ if (hv_exists (target_hv, "tree", strlen ("tree")))
+ hv_delete (target_hv, "tree", strlen ("tree"), G_DISCARD);
+ }
+ }
+ converter->reset_target_commands.number = 0;
+ }
+
+ /* pass all the information for each context for translated commands */
+ if (converter->no_arg_formatted_cmd_translated.number)
+ {
+ int max_context = HCC_type_css_string +1;
+ int j;
+ HV *no_arg_commands_formatting_hv;
+ FETCH(no_arg_commands_formatting);
+ no_arg_commands_formatting_hv
+ = (HV *) SvRV (*no_arg_commands_formatting_sv);
+ for (j = 0; j < converter->no_arg_formatted_cmd_translated.number; j++)
+ {
+ int k;
+ enum command_id cmd
+ = converter->no_arg_formatted_cmd_translated.list[j];
+ HTML_COMMAND_CONVERSION **conversion_contexts
+ = converter->html_command_conversion[cmd];
+ char *cmdname = builtin_command_data[cmd].cmdname;
+ SV **no_arg_command_sv
+ = hv_fetch (no_arg_commands_formatting_hv,
+ cmdname, strlen (cmdname), 0);
+ HV *no_arg_command_hv = (HV *) SvRV (*no_arg_command_sv);
+ for (k = 0; k < max_context; k++)
+ {
+ if (conversion_contexts[k])
+ {
+ HTML_COMMAND_CONVERSION *no_arg_cmd_context
+ = conversion_contexts[k];
+
+ char *context_name = html_conversion_context_type_names[k];
+ SV **context_sv = hv_fetch (no_arg_command_hv,
+ context_name, strlen (context_name), 0);
+ HV *context_hv = (HV *) SvRV (*context_sv);
+
+ #define REPLACE_STR(key) \
+ if (no_arg_cmd_context->key) \
+ { \
+ hv_store (context_hv, #key, strlen (#key), \
+ newSVpv_utf8 (no_arg_cmd_context->key, 0), 0);
\
+ } \
+ else if (hv_exists (context_hv, #key, strlen (#key))) \
+ hv_delete (context_hv, #key, strlen (#key), G_DISCARD);
+
+ REPLACE_STR(text)
+ REPLACE_STR(translated_converted)
+ REPLACE_STR(translated_to_convert)
+ #undef REPLACE_STR
+
+ if (no_arg_cmd_context->tree)
+ {
+ if (!no_arg_cmd_context->tree->hv)
+ element_to_perl_hash (no_arg_cmd_context->tree);
+ hv_store (context_hv, "tree", strlen ("tree"),
+ newRV_inc ((SV *) no_arg_cmd_context->tree->hv),
0);
+ }
+ else if (hv_exists (context_hv, "tree", strlen ("tree")))
+ hv_delete (context_hv, "tree", strlen ("tree"), G_DISCARD);
+ }
+ }
+ }
+
+ memset (converter->no_arg_formatted_cmd_translated.list, 0,
+ converter->no_arg_formatted_cmd_translated.number
+ * sizeof (enum command_id));
+ converter->no_arg_formatted_cmd_translated.number = 0;
+ }
+
+#undef FETCH
+
+}
+
+void
+build_html_formatting_context_ctx (HV *hv,
+ HTML_FORMATTING_CONTEXT *formatting_context)
+{
+ dTHX;
+
+#define STORE(key, value) hv_store (hv, key, strlen (key), value, 0)
+#define STORE_INT(name) STORE(#name, newSViv (formatting_context->name))
+ STORE_INT(preformatted_number);
+ STORE_INT(paragraph_number);
+ STORE_INT(space_protected);
+ STORE_INT(no_break);
+#undef STORE_INT
+
+#define STORE_CTX(name) STORE(#name, newSViv (formatting_context->name##_ctx))
+ STORE_CTX(upper_case);
+#undef STORE_CTX
+}
+
+HV *
+build_html_formatting_context (HTML_FORMATTING_CONTEXT *formatting_context)
+{
+ HV *hv;
+
+ dTHX;
+
+ hv = newHV ();
+
+#define STORE(key, value) hv_store (hv, key, strlen (key), value, 0)
+
+ STORE("context_name", newSVpv (formatting_context->context_name, 0));
+
+#undef STORE
+ build_html_formatting_context_ctx (hv, formatting_context);
+
+ return hv;
+}
+
+AV *
+build_html_formatting_context_stack (
+ HTML_FORMATTING_CONTEXT_STACK *formatting_context_stack)
+{
+ int i;
+ AV *formatting_context_av;
+
+ dTHX;
+
+ formatting_context_av = newAV ();
+ for (i = 0; i < formatting_context_stack->top; i++)
+ {
+ HTML_FORMATTING_CONTEXT *formatting_context
+ = &formatting_context_stack->stack[i];
+ HV *context_hv = build_html_formatting_context (formatting_context);
+ av_push (formatting_context_av, newRV_noinc ((SV *) context_hv));
+ }
+ return formatting_context_av;
+}
+
+AV *
+build_html_composition_context_stack
+ (COMMAND_OR_TYPE_STACK *composition_context_stack)
+{
+ AV *composition_context_av;
+ int i;
+
+ dTHX;
+
+ composition_context_av = newAV ();
+
+ for (i = 0; i < composition_context_stack->top; i++)
+ {
+ char *context_str = 0;
+ COMMAND_OR_TYPE *context
+ = &composition_context_stack->stack[i];
+ if (context->variety == CTV_type_type)
+ context_str = element_type_names[context->type];
+ else if (context->variety == CTV_type_command)
+ context_str = builtin_command_data[context->cmd].cmdname;
+ else
+ context_str = "";
+ av_push (composition_context_av, newSVpv (context_str, 0));
+ }
+ return composition_context_av;
+}
+
+AV *
+build_html_preformatted_classes_stack
+ (STRING_STACK *preformatted_classes_stack)
+{
+ AV *preformatted_classes_av;
+ int i;
+
+ dTHX;
+
+ preformatted_classes_av = newAV ();
+
+ for (i = 0; i < preformatted_classes_stack->top; i++)
+ {
+ char *context_str = preformatted_classes_stack->stack[i];
+ av_push (preformatted_classes_av, newSVpv (context_str, 0));
+ }
+ return preformatted_classes_av;
+}
+
+AV *
+build_html_monospace_stack (MONOSPACE_CONTEXT_STACK *monospace_stack)
+{
+ AV *monospace_av;
+ int i;
+
+ dTHX;
+
+ monospace_av = newAV ();
+
+ for (i = 0; i < monospace_stack->top; i++)
+ {
+ enum monospace_context context
+ = monospace_stack->stack[i];
+ av_push (monospace_av, newSViv (context));
+ }
+ return monospace_av;
+}
+
+AV *
+build_html_block_commands_stack (COMMAND_STACK *block_commands_stack)
+{
+ AV *block_commands_av;
+ int i;
+
+ dTHX;
+
+ block_commands_av = newAV ();
+
+ for (i = 0; i < block_commands_stack->top; i++)
+ {
+ enum command_id cmd = block_commands_stack->stack[i];
+ char *context_str = builtin_command_data[cmd].cmdname;
+ av_push (block_commands_av, newSVpv (context_str, 0));
+ }
+ return block_commands_av;
+}
+
+void
+build_html_document_context_ctx (HV *hv,
+ HTML_DOCUMENT_CONTEXT *document_context)
+{
+ dTHX;
+
+#define STORE(key, value) hv_store (hv, key, strlen (key), value, 0)
+#define STORE_CTX(name) STORE(#name, newSViv (document_context->name##_ctx))
+ STORE_CTX(string);
+ STORE_CTX(raw);
+ STORE_CTX(verbatim);
+ STORE_CTX(math);
+#undef STORE_CTX
+#undef STORE
+}
+
+HV *
+build_html_document_context (HTML_DOCUMENT_CONTEXT *document_context)
+{
+ HV *hv;
+ AV *monospace_av;
+ AV *composition_context_av;
+ AV *block_commands_av;
+ AV *formatting_context_av;
+ AV *preformatted_classes_av;
+
+ dTHX;
+
+ hv = newHV ();
+
+ build_html_document_context_ctx (hv, document_context);
+
+#define STORE(key, value) hv_store (hv, key, strlen (key), value, 0)
+
+ STORE ("context", newSVpv_utf8 (document_context->context, 0));
+ STORE ("document_global_context",
+ newSVpv_utf8 (document_context->document_global_context, 0));
+
+ monospace_av = build_html_monospace_stack (
+ &document_context->monospace);
+ STORE ("monospace", newRV_noinc ((SV *) monospace_av));
+
+ composition_context_av = build_html_composition_context_stack (
+ &document_context->composition_context);
+ STORE ("composition_context", newRV_noinc ((SV *) composition_context_av));
+
+ block_commands_av = build_html_block_commands_stack
+ (&document_context->block_commands);
+ STORE ("block_commands", newRV_noinc ((SV *) block_commands_av));
+
+ preformatted_classes_av = build_html_preformatted_classes_stack
+ (&document_context->preformatted_classes);
+ STORE ("preformatted_classes", newRV_noinc ((SV *) preformatted_classes_av));
+
+ formatting_context_av = build_html_formatting_context_stack
+ (&document_context->formatting_context);
+ STORE ("formatting_context", newRV_noinc ((SV *) formatting_context_av));
+
+#undef STORE
+ return hv;
+}
+
+/* there is no need to return anything. */
+SV *
+build_html_formatting_state (CONVERTER *converter, unsigned long flags)
+{
+ HV *hv;
+ SV **document_context_sv;
+ AV *document_context_av;
+ SV **multiple_pass_sv;
+ AV *multiple_pass_av;
+ SV **file_counters_sv;
+ HV *file_counters_hv;
+ /*
+ SV **files_information_sv;
+ HV *files_information_hv;
+ */
+ int i;
+
+ dTHX;
+
+ if (!converter->hv)
+ return newSV (0);
+
+ hv = converter->hv;
+
+#define FETCH(key) key##_sv = hv_fetch (hv, #key, strlen (#key), 0);
+#define STORE(key, value) hv_store (hv, key, strlen (key), value, 0)
+
+ if (flags & HMSF_converter_state)
+ {
+ STORE("document_global_context",
+ newSViv (converter->document_global_context));
+
+ STORE("ignore_notice",
+ newSViv (converter->ignore_notice));
+ }
+
+ if (flags & HMSF_current_root)
+ {
+ if (!converter->current_root_command)
+ STORE("current_root_command", newSV (0));
+ else
+ STORE("current_root_command",
+ newRV_inc ((SV *) converter->current_root_command->hv));
+ }
+
+ if (flags & HMSF_current_node)
+ {
+ if (!converter->current_node)
+ STORE("current_node", newSV (0));
+ else
+ STORE("current_node",
+ newRV_inc ((SV *) converter->current_node->hv));
+ }
+
+ if (flags & HMSF_current_output_unit)
+ {
+ if (!converter->current_output_unit)
+ STORE("current_output_unit", newSV (0));
+ else
+ STORE("current_output_unit",
+ newRV_inc ((SV *) converter->current_output_unit->hv));
+ }
+
+ /* for scalars corresponding to value that can be found in get_info
+ the value associated to the key in the 'converter_info' hash is
+ a reference to the value in the converter, such as
+ \$converter->{"current_filename"}.
+ *current_filename_sv corresponds to $converter->{"current_filename"},
+ the value should be changed, but the SV should not be replaced */
+ if (flags & HMSF_current_filename)
+ {
+ SV **current_filename_sv;
+ current_filename_sv = hv_fetch (hv, "current_filename",
+ strlen ("current_filename"), 1);
+ sv_setpv (*current_filename_sv, converter->current_filename);
+ if (converter->current_filename)
+ SvUTF8_on (*current_filename_sv);
+ }
+
+ if (flags & HMSF_document_context
+ && (converter->document_context_change
+ || converter->document_contexts_to_pop))
+ {
+ SSize_t top_document_context_idx;
+ FETCH(document_context);
+
+ if (!document_context_sv)
+ {
+ document_context_av = newAV ();
+ fprintf (stderr, "BUG: no document context\n");
+ STORE("document_context", newRV_noinc ((SV *) document_context_av));
+ top_document_context_idx = -1;
+ }
+ else
+ {
+ int doc_top_target;
+ document_context_av = (AV *) SvRV (*document_context_sv);
+ /* check consistentcy of C and perl document context stack levels */
+ top_document_context_idx = av_top_index (document_context_av);
+ doc_top_target = top_document_context_idx+1
+ + converter->document_context_change;
+ if (doc_top_target != converter->html_document_context.top)
+ {
+ fprintf (stderr,
+ "BUG: top and document context level change mismatch %zu %d (%zu)\n",
+ converter->html_document_context.top, doc_top_target,
+ top_document_context_idx+1);
+ }
+
+ /* remove obsolete document contexts in perl */
+ while (converter->document_contexts_to_pop)
+ {
+ converter->document_contexts_to_pop--;
+ top_document_context_idx--;
+ av_pop (document_context_av);
+ }
+ }
+
+ /* add the modified contexts */
+ for (i = top_document_context_idx +1;
+ i < converter->html_document_context.top; i++)
+ {
+ HTML_DOCUMENT_CONTEXT *document_context
+ = &converter->html_document_context.stack[i];
+ HV *document_context_hv = build_html_document_context
(document_context);
+ av_push (document_context_av, newRV_noinc ((SV *)
document_context_hv));
+ }
+ converter->document_context_change = 0;
+ }
+
+ if (flags & (HMSF_formatting_context | HMSF_composition_context
+ | HMSF_preformatted_classes | HMSF_block_commands
+ | HMSF_monospace | HMSF_top_document_ctx
+ | HMSF_top_formatting_context))
+ {
+ HTML_DOCUMENT_CONTEXT *top_document_ctx
+ = html_top_document_context (converter);
+ SSize_t top_document_context_idx;
+ SV **top_document_context_sv;
+ HV *top_document_context_hv;
+ AV *formatting_context_av;
+ AV *composition_context_av;
+ AV *preformatted_classes_av;
+ AV *block_commands_av;
+ AV *monospace_av;
+
+ document_context_sv = hv_fetch (hv, "document_context",
+ strlen ("document_context"), 0);
+ if (!document_context_sv)
+ {
+ fprintf (stderr,
+ "BUG: no document context but formatting F: %#8lx\n",
flags);
+ abort();
+ }
+ document_context_av = (AV *) SvRV (*document_context_sv);
+ top_document_context_idx = av_top_index (document_context_av);
+ if (top_document_context_idx < 0)
+ {
+ fprintf (stderr,
+ "BUG: empty document_context but formatting F: %#8lx\n", flags);
+ }
+ top_document_context_sv = av_fetch (document_context_av,
+ top_document_context_idx, 0);
+
+ top_document_context_hv = (HV *) SvRV (*top_document_context_sv);
+#define build_context(name) \
+ if (flags & HMSF_##name) \
+ { \
+ name##_av = build_html_##name##_stack( \
+ &top_document_ctx->name); \
+ hv_store (top_document_context_hv, #name, \
+ strlen (#name), \
+ newRV_noinc ((SV *) name##_av), 0); \
+ }
+ build_context(formatting_context)
+ build_context(composition_context)
+ build_context(preformatted_classes)
+ build_context(block_commands)
+ build_context(monospace)
+#undef build_context
+
+ if (flags & HMSF_top_document_ctx)
+ build_html_document_context_ctx (top_document_context_hv,
+ top_document_ctx);
+
+ if (!(flags & HMSF_formatting_context)
+ && flags & HMSF_top_formatting_context)
+ {
+ HTML_FORMATTING_CONTEXT *top_formatting_ctx
+ = html_top_formatting_context (&top_document_ctx->formatting_context);
+ SSize_t top_formatting_context_idx;
+ SV **top_formatting_context_sv;
+ HV *top_formatting_context_hv;
+
+ SV **formatting_context_sv = hv_fetch (top_document_context_hv,
+ "formatting_context",
+ strlen ("formatting_context"), 0);
+ formatting_context_av = (AV *) SvRV (*formatting_context_sv);
+ top_formatting_context_idx = av_top_index (formatting_context_av);
+ top_formatting_context_sv = av_fetch (formatting_context_av,
+ top_formatting_context_idx, 0);
+ top_formatting_context_hv = (HV *) SvRV (*top_formatting_context_sv);
+ build_html_formatting_context_ctx (top_formatting_context_hv,
+ top_formatting_ctx);
+ }
+ }
+
+ if (flags & HMSF_multiple_pass)
+ {
+ FETCH(multiple_pass);
+
+ if (!multiple_pass_sv)
+ {
+ multiple_pass_av = newAV ();
+ STORE("multiple_pass", newRV_noinc ((SV *) multiple_pass_av));
+ }
+ else
+ {
+ multiple_pass_av = (AV *) SvRV (*multiple_pass_sv);
+ av_clear (multiple_pass_av);
+ }
+
+ for (i = 0; i < converter->multiple_pass.top; i++)
+ {
+ char *multiple_pass_str = converter->multiple_pass.stack[i];
+ av_push (multiple_pass_av, newSVpv_utf8(multiple_pass_str, 0));
+ }
+ }
+
+ if (converter->file_changed_counter.number)
+ {
+ FETCH(file_counters);
+ file_counters_hv = (HV *) SvRV (*file_counters_sv);
+
+ int j;
+ for (j = 0; j < converter->file_changed_counter.number; j++)
+ {
+ size_t file_idx = converter->file_changed_counter.list[j];
+ FILE_NAME_PATH_COUNTER *output_unit_file
+ = &converter->output_unit_files.list[file_idx];
+ char *filename = output_unit_file->filename;
+
+ SV *filename_sv = newSVpv_utf8 (filename, 0);
+
+ hv_store_ent (file_counters_hv, filename_sv,
+ newSViv (output_unit_file->counter), 0);
+
+ output_unit_file->counter_changed = 0;
+ }
+ memset (converter->file_changed_counter.list, 0,
+ converter->file_changed_counter.number * sizeof (size_t));
+ converter->file_changed_counter.number = 0;
+ }
+
+ /*
+ files_information_sv = hv_fetch (hv, "files_information",
+ strlen ("files_information"), 0);
+
+ if (!files_information_sv)
+ {
+ files_information_hv = newHV ();
+ STORE("files_information", newRV_noinc ((SV *) files_information_hv));
+ }
+ else
+ {
+ files_information_hv = (HV *) SvRV (*files_information_sv);
+ hv_clear (files_information_av);
+ }
+ */
+
+#undef STORE
+
+ if (flags & HMSF_translations)
+ build_html_translated_names (hv, converter);
+
+ return newRV_noinc ((SV *) hv);
+}
+
+SV *
+build_html_command_formatted_args (HTML_ARGS_FORMATTED *args_formatted)
+{
+ AV *av;
+ int i;
+
+ dTHX;
+
+ if (!args_formatted)
+ return newSV (0);
+
+ av = newAV ();
+
+ for (i = 0; i < args_formatted->number; i++)
+ {
+ HTML_ARG_FORMATTED *arg_formatted = &args_formatted->args[i];
+ if (arg_formatted->tree)
+ {
+ int j;
+ HV *arg_formated_hv = newHV ();
+ av_push (av, newRV_noinc ((SV *) arg_formated_hv));
+
+ hv_store (arg_formated_hv, "tree", strlen ("tree"),
+ newRV_inc ((SV *) arg_formatted->tree->hv), 0);
+
+ for (j = 0; j < AFT_type_raw+1; j++)
+ {
+ if (arg_formatted->formatted[j])
+ {
+ const char *format_name
+ = html_argument_formatting_type_names[j];
+ hv_store (arg_formated_hv, format_name, strlen (format_name),
+ newSVpv_utf8 (arg_formatted->formatted[j], 0), 0);
+ }
+ }
+ }
+ else
+ av_push (av, newSV(0));
+ }
+
+ return newRV_noinc ((SV *) av);
+}
+
+SV *
+build_replaced_substrings (NAMED_STRING_ELEMENT_LIST *replaced_substrings)
+{
+ HV *hv;
+ int i;
+
+ dTHX;
+
+ if (!replaced_substrings)
+ return newSV (0);
+
+ hv = newHV ();
+
+ for (i = 0; i < replaced_substrings->number; i++)
+ {
+ NAMED_STRING_ELEMENT *named_string_elt = &replaced_substrings->list[i];
+ SV *name_sv = newSVpv_utf8 (named_string_elt->name, 0);
+ SV *value_sv = 0;
+
+ if (named_string_elt->element)
+ value_sv = newRV_inc ((SV *) named_string_elt->element->hv);
+ else if (named_string_elt->string)
+ value_sv = newSVpv_utf8 (named_string_elt->string, 0);
+
+ if (value_sv)
+ hv_store_ent (hv, name_sv, value_sv, 0);
+ }
+
+ return newRV_noinc ((SV *) hv);
+}
+
diff --git a/tp/Texinfo/XS/convert/build_html_perl_state.h
b/tp/Texinfo/XS/convert/build_html_perl_state.h
new file mode 100644
index 0000000000..fe320107d2
--- /dev/null
+++ b/tp/Texinfo/XS/convert/build_html_perl_state.h
@@ -0,0 +1,37 @@
+/* build_html_perl_state.h - declarations for build_html_perl_state.c */
+#ifndef BUILD_HTML_PERL_STATE_H
+#define BUILD_HTML_PERL_STATE_H
+
+#include "EXTERN.h"
+#include "perl.h"
+
+#include "tree_types.h"
+#include "converter_types.h"
+/* for FILE_SOURCE_INFO_LIST HTML_ARGS_FORMATTED */
+#include "utils.h"
+/* for NAMED_STRING_ELEMENT_LIST */
+#include "translations.h"
+
+void pass_html_element_targets (SV *converter_sv,
+ HTML_TARGET_LIST *html_targets);
+void pass_html_special_targets (SV *converter_sv,
+ HTML_TARGET_LIST **html_special_targets);
+void pass_html_seen_ids (SV *converter_sv, STRING_LIST *seen_ids);
+
+void pass_converter_errors (ERROR_MESSAGE_LIST *error_messages,
+ HV *converter_hv);
+
+SV *build_html_files_source_info (FILE_SOURCE_INFO_LIST *files_source_info);
+void pass_html_global_units_directions (SV *converter_sv,
+ OUTPUT_UNIT **global_units_directions,
+ SPECIAL_UNIT_DIRECTION **special_units_direction_name);
+void pass_html_elements_in_file_count (SV *converter_sv,
+ FILE_NAME_PATH_COUNTER_LIST *output_unit_files);
+
+HV *build_html_document_context (HTML_DOCUMENT_CONTEXT *document_context);
+
+SV *build_html_formatting_state (CONVERTER *converter, unsigned long flags);
+
+SV *build_html_command_formatted_args (HTML_ARGS_FORMATTED *args_formatted);
+SV *build_replaced_substrings (NAMED_STRING_ELEMENT_LIST *replaced_substrings);
+#endif
diff --git a/tp/Texinfo/XS/main/call_perl_function.c
b/tp/Texinfo/XS/convert/call_html_perl_function.c
similarity index 97%
copy from tp/Texinfo/XS/main/call_perl_function.c
copy to tp/Texinfo/XS/convert/call_html_perl_function.c
index 9ba5be1673..fc88d75587 100644
--- a/tp/Texinfo/XS/main/call_perl_function.c
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.c
@@ -31,52 +31,10 @@
#undef context
#include "utils.h"
+/* for newSVpv_utf8 build_texinfo_tree */
#include "build_perl_info.h"
-#include "call_perl_function.h"
-
-char *
-call_nodenamenormalization_unicode_to_transliterate (char *text)
-{
- int count;
- char *result;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
-
- dTHX;
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 1);
-
- PUSHs(sv_2mortal (newSVpv_utf8 (text, 0)));
- PUTBACK;
-
- count = call_pv (
- "Texinfo::Convert::NodeNameNormalization::_unicode_to_transliterate",
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("_unicode_to_transliterate should return 1 item\n");
-
- result_sv = POPs;
- /* FIXME encoding */
- result_ret = SvPV (result_sv, len);
- result = strdup (result_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
+#include "build_html_perl_state.h"
+#include "call_html_perl_function.h"
TARGET_FILENAME *
call_file_id_setting_special_unit_target_file_name (CONVERTER *self,
diff --git a/tp/Texinfo/XS/main/call_perl_function.h
b/tp/Texinfo/XS/convert/call_html_perl_function.h
similarity index 93%
copy from tp/Texinfo/XS/main/call_perl_function.h
copy to tp/Texinfo/XS/convert/call_html_perl_function.h
index 5447019d9b..c326fb7e9e 100644
--- a/tp/Texinfo/XS/main/call_perl_function.h
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.h
@@ -1,9 +1,11 @@
-/* call_perl_function.h - API to interact with perl from C code */
-#ifndef CALL_PERL_FUNCTION_H
-#define CALL_PERL_FUNCTION_H
+/* call_html_perl_function.h - interact with HTML perl conversion from C code
*/
+#ifndef CALL_HTML_PERL_FUNCTION_H
+#define CALL_HTML_PERL_FUNCTION_H
#include "tree_types.h"
#include "converter_types.h"
+/* for TARGET_FILENAME */
+#include "utils.h"
#include "translations.h"
typedef struct FILE_NAME_PATH {
@@ -18,8 +20,6 @@ typedef struct TARGET_CONTENTS_FILENAME {
char *target_shortcontents;
} TARGET_CONTENTS_FILENAME;
-char *call_nodenamenormalization_unicode_to_transliterate (char *text);
-
TARGET_FILENAME *call_file_id_setting_special_unit_target_file_name (
CONVERTER *self, OUTPUT_UNIT *special_unit, char *target,
char *default_filename);
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index 9158356ce7..3fd449c6b2 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -38,7 +38,7 @@
#include "convert_to_texinfo.h"
#include "translations.h"
#include "convert_utils.h"
-#include "call_perl_function.h"
+#include "call_html_perl_function.h"
/* for TREE_AND_STRINGS */
#include "document.h"
#include "convert_html.h"
diff --git a/tp/Texinfo/XS/main/build_perl_info.c
b/tp/Texinfo/XS/main/build_perl_info.c
index 7c1df48519..5ad1d2ec4a 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -41,8 +41,7 @@
/* for GLOBAL_INFO ERROR_MESSAGE CONVERTER */
#include "converter_types.h"
#include "tree.h"
-/* for output_conversions fatal output_unit_type_names
- HMSF_* */
+/* for output_conversions fatal output_unit_type_names */
#include "utils.h"
/* for debugging */
#include "debug.h"
@@ -54,8 +53,6 @@
#include "output_unit.h"
/* for wipe_error_message_list */
#include "errors.h"
-#include "command_stack.h"
-#include "translations.h"
#include "build_perl_info.h"
#define LOCALEDIR DATADIR "/locale"
@@ -100,7 +97,7 @@ init (int texinfo_uninstalled, char *builddir)
}
-static void element_to_perl_hash (ELEMENT *e);
+void element_to_perl_hash (ELEMENT *e);
/* Return reference to Perl array built from e. If any of
the elements in E don't have 'hv' set, set it to an empty
@@ -464,7 +461,7 @@ static U32 HSH_macro = 0;
/* Set E->hv and 'hv' on E's descendants. e->parent->hv is assumed
to already exist. */
-static void
+void
element_to_perl_hash (ELEMENT *e)
{
SV *sv;
@@ -1795,1011 +1792,3 @@ build_output_files_information (CONVERTER *converter)
&converter->output_files_information);
}
-
-/* HTML specific */
-HV *
-build_html_element_targets (HTML_TARGET_LIST *html_targets)
-{
- HV *hv;
- int i;
-
- dTHX;
-
- hv = newHV ();
-
- if (!html_targets || html_targets->number <= 0)
- return hv;
-
-#define STORE(key, sv) hv_store (html_target_hv, key, strlen (key), sv, 0)
- for (i = 0; i < html_targets->number; i++)
- {
- HV *html_target_hv;
- HTML_TARGET *html_target = &html_targets->list[i];
- SV *target_sv = newSVpv_utf8 (html_target->target, 0);
- SV *element_sv;
- SV *html_target_sv;
-
- if (!html_target->element->hv)
- {
- fprintf (stderr, "BUG: No hv for target '%s'\n",
html_target->target);
- fatal ("No hv for target");
- }
-
- element_sv = newRV_inc ((SV *) html_target->element->hv);
-
- html_target_hv = newHV ();
- html_target_sv = newRV_noinc ((SV *) html_target_hv);
- hv_store_ent (hv, element_sv, html_target_sv, 0);
-
- STORE("target", target_sv);
- if (html_target->special_unit_filename)
- STORE("special_unit_filename",
- newSVpv_utf8 (html_target->special_unit_filename, 0));
- if (html_target->node_filename)
- STORE("node_filename",
- newSVpv_utf8 (html_target->node_filename, 0));
- if (html_target->section_filename)
- STORE("section_filename",
- newSVpv_utf8 (html_target->section_filename, 0));
- if (html_target->contents_target)
- STORE("contents_target",
- newSVpv_utf8 (html_target->contents_target, 0));
- if (html_target->shortcontents_target)
- STORE("shortcontents_target",
- newSVpv_utf8 (html_target->shortcontents_target, 0));
- }
-#undef STORE
- return hv;
-}
-
-void
-pass_html_element_targets (SV *converter_sv, HTML_TARGET_LIST *html_targets)
-{
- HV *targets_hv;
- HV *hv;
-
- dTHX;
-
- hv = (HV *) SvRV (converter_sv);
-
- targets_hv = build_html_element_targets (html_targets);
-
- hv_store (hv, "targets", strlen ("targets"),
- newRV_noinc ((SV *) targets_hv), 0);
-}
-
-HV *
-build_html_special_targets (HTML_TARGET_LIST **html_special_targets)
-{
- HV *hv;
- HV *html_special_target_hv;
-
- dTHX;
-
- hv = newHV ();
-
- /* could be generalized if needed */
-
- HTML_TARGET_LIST *html_special_target =
html_special_targets[ST_footnote_location];
- html_special_target_hv = build_html_element_targets (html_special_target);
-
- hv_store (hv, "footnote_location", strlen ("footnote_location"),
- newRV_noinc ((SV *) html_special_target_hv), 0);
-
- return hv;
-}
-
-void
-pass_html_special_targets (SV *converter_sv,
- HTML_TARGET_LIST **html_special_targets)
-{
- HV *special_targets_hv;
- HV *hv;
-
- dTHX;
-
- hv = (HV *) SvRV (converter_sv);
-
- special_targets_hv = build_html_special_targets (html_special_targets);
-
- hv_store (hv, "special_targets", strlen ("special_targets"),
- newRV_noinc ((SV *) special_targets_hv), 0);
-}
-
-HV *
-build_html_seen_ids (STRING_LIST *seen_ids)
-{
- HV *hv;
- int i;
-
- dTHX;
-
- hv = newHV ();
-
- if (seen_ids && seen_ids->number > 0)
- {
- for (i = 0; i < seen_ids->number; i++)
- {
- char *target = seen_ids->list[i];
- SV *target_sv = newSVpv_utf8 (target, 0);
- hv_store_ent (hv, target_sv, newSViv (1), 0);
- }
- }
-
- return hv;
-}
-
-void
-pass_html_seen_ids (SV *converter_sv, STRING_LIST *seen_ids)
-{
- HV *seen_ids_hv;
- HV *hv;
-
- dTHX;
-
- hv = (HV *) SvRV (converter_sv);
-
- seen_ids_hv = build_html_seen_ids (seen_ids);
-
- hv_store (hv, "seen_ids", strlen ("seen_ids"),
- newRV_noinc ((SV *) seen_ids_hv), 0);
-}
-
-SV *
-build_html_files_source_info (FILE_SOURCE_INFO_LIST *files_source_info)
-{
- int i;
- HV *hv;
-
- dTHX;
-
- hv = newHV ();
-
- if (files_source_info)
- {
-#define STORE(key, sv) hv_store (file_source_info_hv, key, strlen (key), sv, 0)
- for (i = 0; i < files_source_info->number; i++)
- {
- FILE_SOURCE_INFO * file_source_info = &files_source_info->list[i];
- HV *file_source_info_hv;
- SV *file_source_info_sv;
- char *filename = file_source_info->filename;
- SV *filename_sv = newSVpv_utf8 (filename, 0);
-
- file_source_info_hv = newHV ();
- file_source_info_sv = newRV_noinc ((SV *) file_source_info_hv);
-
- hv_store_ent (hv, filename_sv, file_source_info_sv, 0);
-
- STORE("file_info_type", newSVpv_utf8 (file_source_info->type, 0));
- if (file_source_info->name)
- STORE("file_info_name", newSVpv_utf8 (file_source_info->name, 0));
- /* not actually used in downstream code, but present also in perl */
- if (file_source_info->path)
- STORE("file_info_path", newSVpv_utf8 (file_source_info->path, 0));
- else
- STORE("file_info_path", newSV(0));
-
- if (file_source_info->element)
- {
- SV *element_sv = newRV_inc ((SV *)
file_source_info->element->hv);
- STORE("file_info_element", element_sv);
- }
- }
-#undef STORE
- }
- return newRV_noinc ((SV *) hv);
-}
-
-HV *
-build_html_global_units_directions (OUTPUT_UNIT **global_units_directions,
- SPECIAL_UNIT_DIRECTION **special_units_direction_name)
-{
- int i;
- SPECIAL_UNIT_DIRECTION **s;
- SPECIAL_UNIT_DIRECTION *special_unit_direction;
- HV *hv;
-
- dTHX;
-
- if (!global_units_directions)
- return 0;
-
- hv = newHV ();
-
- for (i = 0; i < D_Last+1; i++)
- {
- if (global_units_directions[i])
- {
- char *direction_name = html_global_unit_direction_names[i];
- hv_store (hv, direction_name, strlen (direction_name),
- newRV_inc ((SV *) global_units_directions[i]->hv), 0);
- }
- }
-
- for (s = special_units_direction_name; (special_unit_direction = *s) ; s++)
- {
- char *direction_name = special_unit_direction->direction;
- OUTPUT_UNIT *output_unit = special_unit_direction->output_unit;
- hv_store (hv, direction_name, strlen (direction_name),
- newRV_inc ((SV *) output_unit->hv), 0);
- }
-
- return hv;
-}
-
-void
-pass_html_global_units_directions (SV *converter_sv,
- OUTPUT_UNIT **global_units_directions,
- SPECIAL_UNIT_DIRECTION **special_units_direction_name)
-{
- HV *global_units_directions_hv;
- SV *global_units_directions_sv;
- HV *converter_hv;
-
- dTHX;
-
- converter_hv = (HV *) SvRV (converter_sv);
-
- global_units_directions_hv
- = build_html_global_units_directions (global_units_directions,
- special_units_direction_name);
- if (global_units_directions_hv)
- global_units_directions_sv
- = newRV_noinc ((SV *) global_units_directions_hv);
- else
- global_units_directions_sv = newSV (0);
-
- hv_store (converter_hv, "global_units_directions",
- strlen ("global_units_directions"), global_units_directions_sv, 0);
-}
-
-HV *
-build_html_elements_in_file_count (
- FILE_NAME_PATH_COUNTER_LIST *output_unit_files)
-{
- int i;
- HV *hv;
-
- dTHX;
-
- hv = newHV ();
-
- if (output_unit_files)
- {
- for (i = 0; i < output_unit_files->number; i++)
- {
- FILE_NAME_PATH_COUNTER *output_unit_file
- = &output_unit_files->list[i];
- char *filename = output_unit_file->filename;
- SV *filename_sv = newSVpv_utf8 (filename, 0);
-
- hv_store_ent (hv, filename_sv,
- newSViv (output_unit_file->elements_in_file_count), 0);
- }
- }
-
- return hv;
-}
-
-void
-pass_html_elements_in_file_count (SV *converter_sv,
- FILE_NAME_PATH_COUNTER_LIST *output_unit_files)
-{
- HV *elements_in_file_count_hv;
- HV *converter_hv;
-
- dTHX;
-
- converter_hv = (HV *) SvRV (converter_sv);
-
- elements_in_file_count_hv
- = build_html_elements_in_file_count (output_unit_files);
-
- hv_store (converter_hv, "elements_in_file_count",
- strlen ("elements_in_file_count"),
- newRV_noinc ((SV *) elements_in_file_count_hv), 0);
-}
-
-void
-build_html_translated_names (HV *hv, CONVERTER *converter)
-{
- int j;
- SV **directions_strings_sv;
- HV *directions_strings_hv;
- SV **special_unit_info_sv;
- HV *special_unit_info_hv;
- SV **targets_sv;
- SV **no_arg_commands_formatting_sv;
- HV *direction_string_hv;
-
- dTHX;
-
- /* reset with empty hash */
-#define FETCH(key) key##_sv = hv_fetch (hv, #key, strlen (#key), 0);
- FETCH(directions_strings);
- directions_strings_hv = (HV *) SvRV (*directions_strings_sv);
-#define tds_type(name) \
- direction_string_hv = newHV (); \
- hv_store (directions_strings_hv, #name, strlen (#name), \
- newRV_noinc ((SV *) direction_string_hv), 0);
- TDS_TRANSLATED_TYPES_LIST
-#undef tds_type
-
- FETCH(special_unit_info);
- special_unit_info_hv = (HV *) SvRV (*special_unit_info_sv);
-
- /* reset with empty hash */
- for (j = 0; translated_special_unit_info[j].tree_type >= 0; j++)
- {
- int tree_type = translated_special_unit_info[j].string_type;
- const char *type_name = special_unit_info_type_names[tree_type];
- char *key;
- HV *special_unit_hv = newHV ();
- xasprintf (&key, "%s_tree", type_name);
- hv_store (special_unit_info_hv, key, strlen (key),
- newRV_noinc ((SV *) special_unit_hv), 0);
- free (key);
- }
-
- /* remove some info that will be redone on demand */
- if (converter->reset_target_commands.number > 0)
- {
- int j;
- HV *targets_hv;
- FETCH(targets);
- targets_hv = (HV *) SvRV (*targets_sv);
-
- for (j = 0; j < converter->reset_target_commands.number; j++)
- {
- ELEMENT *command = converter->reset_target_commands.list[j];
- SV *command_sv = newRV_noinc ((SV *) command->hv);
- HE *target_he = hv_fetch_ent (targets_hv, command_sv, 0, 0);
- if (!target_he)
- {
- char *element_str = print_element_debug (command, 0);
- fprintf (stderr, "BUG: cannot retrieve target %d %s\n",
- j, element_str);
- free (element_str);
- }
- else
- {
- SV *target_sv = HeVAL (target_he);
- HV *target_hv = (HV *) SvRV (target_sv);
- if (hv_exists (target_hv, "text", strlen ("text")))
- hv_delete (target_hv, "text", strlen ("text"), G_DISCARD);
- if (hv_exists (target_hv, "string", strlen ("string")))
- hv_delete (target_hv, "string", strlen ("string"), G_DISCARD);
- if (hv_exists (target_hv, "tree", strlen ("tree")))
- hv_delete (target_hv, "tree", strlen ("tree"), G_DISCARD);
- }
- }
- converter->reset_target_commands.number = 0;
- }
-
- /* pass all the information for each context for translated commands */
- if (converter->no_arg_formatted_cmd_translated.number)
- {
- int max_context = HCC_type_css_string +1;
- int j;
- HV *no_arg_commands_formatting_hv;
- FETCH(no_arg_commands_formatting);
- no_arg_commands_formatting_hv
- = (HV *) SvRV (*no_arg_commands_formatting_sv);
- for (j = 0; j < converter->no_arg_formatted_cmd_translated.number; j++)
- {
- int k;
- enum command_id cmd
- = converter->no_arg_formatted_cmd_translated.list[j];
- HTML_COMMAND_CONVERSION **conversion_contexts
- = converter->html_command_conversion[cmd];
- char *cmdname = builtin_command_data[cmd].cmdname;
- SV **no_arg_command_sv
- = hv_fetch (no_arg_commands_formatting_hv,
- cmdname, strlen (cmdname), 0);
- HV *no_arg_command_hv = (HV *) SvRV (*no_arg_command_sv);
- for (k = 0; k < max_context; k++)
- {
- if (conversion_contexts[k])
- {
- HTML_COMMAND_CONVERSION *no_arg_cmd_context
- = conversion_contexts[k];
-
- char *context_name = html_conversion_context_type_names[k];
- SV **context_sv = hv_fetch (no_arg_command_hv,
- context_name, strlen (context_name), 0);
- HV *context_hv = (HV *) SvRV (*context_sv);
-
- #define REPLACE_STR(key) \
- if (no_arg_cmd_context->key) \
- { \
- hv_store (context_hv, #key, strlen (#key), \
- newSVpv_utf8 (no_arg_cmd_context->key, 0), 0);
\
- } \
- else if (hv_exists (context_hv, #key, strlen (#key))) \
- hv_delete (context_hv, #key, strlen (#key), G_DISCARD);
-
- REPLACE_STR(text)
- REPLACE_STR(translated_converted)
- REPLACE_STR(translated_to_convert)
- #undef REPLACE_STR
-
- if (no_arg_cmd_context->tree)
- {
- if (!no_arg_cmd_context->tree->hv)
- element_to_perl_hash (no_arg_cmd_context->tree);
- hv_store (context_hv, "tree", strlen ("tree"),
- newRV_inc ((SV *) no_arg_cmd_context->tree->hv),
0);
- }
- else if (hv_exists (context_hv, "tree", strlen ("tree")))
- hv_delete (context_hv, "tree", strlen ("tree"), G_DISCARD);
- }
- }
- }
-
- memset (converter->no_arg_formatted_cmd_translated.list, 0,
- converter->no_arg_formatted_cmd_translated.number
- * sizeof (enum command_id));
- converter->no_arg_formatted_cmd_translated.number = 0;
- }
-
-#undef FETCH
-
-}
-
-void
-build_html_formatting_context_ctx (HV *hv,
- HTML_FORMATTING_CONTEXT *formatting_context)
-{
- dTHX;
-
-#define STORE(key, value) hv_store (hv, key, strlen (key), value, 0)
-#define STORE_INT(name) STORE(#name, newSViv (formatting_context->name))
- STORE_INT(preformatted_number);
- STORE_INT(paragraph_number);
- STORE_INT(space_protected);
- STORE_INT(no_break);
-#undef STORE_INT
-
-#define STORE_CTX(name) STORE(#name, newSViv (formatting_context->name##_ctx))
- STORE_CTX(upper_case);
-#undef STORE_CTX
-}
-
-HV *
-build_html_formatting_context (HTML_FORMATTING_CONTEXT *formatting_context)
-{
- HV *hv;
-
- dTHX;
-
- hv = newHV ();
-
-#define STORE(key, value) hv_store (hv, key, strlen (key), value, 0)
-
- STORE("context_name", newSVpv (formatting_context->context_name, 0));
-
-#undef STORE
- build_html_formatting_context_ctx (hv, formatting_context);
-
- return hv;
-}
-
-AV *
-build_html_formatting_context_stack (
- HTML_FORMATTING_CONTEXT_STACK *formatting_context_stack)
-{
- int i;
- AV *formatting_context_av;
-
- dTHX;
-
- formatting_context_av = newAV ();
- for (i = 0; i < formatting_context_stack->top; i++)
- {
- HTML_FORMATTING_CONTEXT *formatting_context
- = &formatting_context_stack->stack[i];
- HV *context_hv = build_html_formatting_context (formatting_context);
- av_push (formatting_context_av, newRV_noinc ((SV *) context_hv));
- }
- return formatting_context_av;
-}
-
-AV *
-build_html_composition_context_stack
- (COMMAND_OR_TYPE_STACK *composition_context_stack)
-{
- AV *composition_context_av;
- int i;
-
- dTHX;
-
- composition_context_av = newAV ();
-
- for (i = 0; i < composition_context_stack->top; i++)
- {
- char *context_str = 0;
- COMMAND_OR_TYPE *context
- = &composition_context_stack->stack[i];
- if (context->variety == CTV_type_type)
- context_str = element_type_names[context->type];
- else if (context->variety == CTV_type_command)
- context_str = builtin_command_data[context->cmd].cmdname;
- else
- context_str = "";
- av_push (composition_context_av, newSVpv (context_str, 0));
- }
- return composition_context_av;
-}
-
-AV *
-build_html_preformatted_classes_stack
- (STRING_STACK *preformatted_classes_stack)
-{
- AV *preformatted_classes_av;
- int i;
-
- dTHX;
-
- preformatted_classes_av = newAV ();
-
- for (i = 0; i < preformatted_classes_stack->top; i++)
- {
- char *context_str = preformatted_classes_stack->stack[i];
- av_push (preformatted_classes_av, newSVpv (context_str, 0));
- }
- return preformatted_classes_av;
-}
-
-AV *
-build_html_monospace_stack (MONOSPACE_CONTEXT_STACK *monospace_stack)
-{
- AV *monospace_av;
- int i;
-
- dTHX;
-
- monospace_av = newAV ();
-
- for (i = 0; i < monospace_stack->top; i++)
- {
- enum monospace_context context
- = monospace_stack->stack[i];
- av_push (monospace_av, newSViv (context));
- }
- return monospace_av;
-}
-
-AV *
-build_html_block_commands_stack (COMMAND_STACK *block_commands_stack)
-{
- AV *block_commands_av;
- int i;
-
- dTHX;
-
- block_commands_av = newAV ();
-
- for (i = 0; i < block_commands_stack->top; i++)
- {
- enum command_id cmd = block_commands_stack->stack[i];
- char *context_str = builtin_command_data[cmd].cmdname;
- av_push (block_commands_av, newSVpv (context_str, 0));
- }
- return block_commands_av;
-}
-
-void
-build_html_document_context_ctx (HV *hv,
- HTML_DOCUMENT_CONTEXT *document_context)
-{
- dTHX;
-
-#define STORE(key, value) hv_store (hv, key, strlen (key), value, 0)
-#define STORE_CTX(name) STORE(#name, newSViv (document_context->name##_ctx))
- STORE_CTX(string);
- STORE_CTX(raw);
- STORE_CTX(verbatim);
- STORE_CTX(math);
-#undef STORE_CTX
-#undef STORE
-}
-
-HV *
-build_html_document_context (HTML_DOCUMENT_CONTEXT *document_context)
-{
- HV *hv;
- AV *monospace_av;
- AV *composition_context_av;
- AV *block_commands_av;
- AV *formatting_context_av;
- AV *preformatted_classes_av;
-
- dTHX;
-
- hv = newHV ();
-
- build_html_document_context_ctx (hv, document_context);
-
-#define STORE(key, value) hv_store (hv, key, strlen (key), value, 0)
-
- STORE ("context", newSVpv_utf8 (document_context->context, 0));
- STORE ("document_global_context",
- newSVpv_utf8 (document_context->document_global_context, 0));
-
- monospace_av = build_html_monospace_stack (
- &document_context->monospace);
- STORE ("monospace", newRV_noinc ((SV *) monospace_av));
-
- composition_context_av = build_html_composition_context_stack (
- &document_context->composition_context);
- STORE ("composition_context", newRV_noinc ((SV *) composition_context_av));
-
- block_commands_av = build_html_block_commands_stack
- (&document_context->block_commands);
- STORE ("block_commands", newRV_noinc ((SV *) block_commands_av));
-
- preformatted_classes_av = build_html_preformatted_classes_stack
- (&document_context->preformatted_classes);
- STORE ("preformatted_classes", newRV_noinc ((SV *) preformatted_classes_av));
-
- formatting_context_av = build_html_formatting_context_stack
- (&document_context->formatting_context);
- STORE ("formatting_context", newRV_noinc ((SV *) formatting_context_av));
-
-#undef STORE
- return hv;
-}
-
-/* there is no need to return anything. */
-SV *
-build_html_formatting_state (CONVERTER *converter, unsigned long flags)
-{
- HV *hv;
- SV **document_context_sv;
- AV *document_context_av;
- SV **multiple_pass_sv;
- AV *multiple_pass_av;
- SV **file_counters_sv;
- HV *file_counters_hv;
- /*
- SV **files_information_sv;
- HV *files_information_hv;
- */
- int i;
-
- dTHX;
-
- if (!converter->hv)
- return newSV (0);
-
- hv = converter->hv;
-
-#define FETCH(key) key##_sv = hv_fetch (hv, #key, strlen (#key), 0);
-#define STORE(key, value) hv_store (hv, key, strlen (key), value, 0)
-
- if (flags & HMSF_converter_state)
- {
- STORE("document_global_context",
- newSViv (converter->document_global_context));
-
- STORE("ignore_notice",
- newSViv (converter->ignore_notice));
- }
-
- if (flags & HMSF_current_root)
- {
- if (!converter->current_root_command)
- STORE("current_root_command", newSV (0));
- else
- STORE("current_root_command",
- newRV_inc ((SV *) converter->current_root_command->hv));
- }
-
- if (flags & HMSF_current_node)
- {
- if (!converter->current_node)
- STORE("current_node", newSV (0));
- else
- STORE("current_node",
- newRV_inc ((SV *) converter->current_node->hv));
- }
-
- if (flags & HMSF_current_output_unit)
- {
- if (!converter->current_output_unit)
- STORE("current_output_unit", newSV (0));
- else
- STORE("current_output_unit",
- newRV_inc ((SV *) converter->current_output_unit->hv));
- }
-
- /* for scalars corresponding to value that can be found in get_info
- the value associated to the key in the 'converter_info' hash is
- a reference to the value in the converter, such as
- \$converter->{"current_filename"}.
- *current_filename_sv corresponds to $converter->{"current_filename"},
- the value should be changed, but the SV should not be replaced */
- if (flags & HMSF_current_filename)
- {
- SV **current_filename_sv;
- current_filename_sv = hv_fetch (hv, "current_filename",
- strlen ("current_filename"), 1);
- sv_setpv (*current_filename_sv, converter->current_filename);
- if (converter->current_filename)
- SvUTF8_on (*current_filename_sv);
- }
-
- if (flags & HMSF_document_context
- && (converter->document_context_change
- || converter->document_contexts_to_pop))
- {
- SSize_t top_document_context_idx;
- FETCH(document_context);
-
- if (!document_context_sv)
- {
- document_context_av = newAV ();
- fprintf (stderr, "BUG: no document context\n");
- STORE("document_context", newRV_noinc ((SV *) document_context_av));
- top_document_context_idx = -1;
- }
- else
- {
- int doc_top_target;
- document_context_av = (AV *) SvRV (*document_context_sv);
- /* check consistentcy of C and perl document context stack levels */
- top_document_context_idx = av_top_index (document_context_av);
- doc_top_target = top_document_context_idx+1
- + converter->document_context_change;
- if (doc_top_target != converter->html_document_context.top)
- {
- fprintf (stderr,
- "BUG: top and document context level change mismatch %zu %d (%zu)\n",
- converter->html_document_context.top, doc_top_target,
- top_document_context_idx+1);
- }
-
- /* remove obsolete document contexts in perl */
- while (converter->document_contexts_to_pop)
- {
- converter->document_contexts_to_pop--;
- top_document_context_idx--;
- av_pop (document_context_av);
- }
- }
-
- /* add the modified contexts */
- for (i = top_document_context_idx +1;
- i < converter->html_document_context.top; i++)
- {
- HTML_DOCUMENT_CONTEXT *document_context
- = &converter->html_document_context.stack[i];
- HV *document_context_hv = build_html_document_context
(document_context);
- av_push (document_context_av, newRV_noinc ((SV *)
document_context_hv));
- }
- converter->document_context_change = 0;
- }
-
- if (flags & (HMSF_formatting_context | HMSF_composition_context
- | HMSF_preformatted_classes | HMSF_block_commands
- | HMSF_monospace | HMSF_top_document_ctx
- | HMSF_top_formatting_context))
- {
- HTML_DOCUMENT_CONTEXT *top_document_ctx
- = html_top_document_context (converter);
- SSize_t top_document_context_idx;
- SV **top_document_context_sv;
- HV *top_document_context_hv;
- AV *formatting_context_av;
- AV *composition_context_av;
- AV *preformatted_classes_av;
- AV *block_commands_av;
- AV *monospace_av;
-
- document_context_sv = hv_fetch (hv, "document_context",
- strlen ("document_context"), 0);
- if (!document_context_sv)
- {
- fprintf (stderr,
- "BUG: no document context but formatting F: %#8lx\n",
flags);
- abort();
- }
- document_context_av = (AV *) SvRV (*document_context_sv);
- top_document_context_idx = av_top_index (document_context_av);
- if (top_document_context_idx < 0)
- {
- fprintf (stderr,
- "BUG: empty document_context but formatting F: %#8lx\n", flags);
- }
- top_document_context_sv = av_fetch (document_context_av,
- top_document_context_idx, 0);
-
- top_document_context_hv = (HV *) SvRV (*top_document_context_sv);
-#define build_context(name) \
- if (flags & HMSF_##name) \
- { \
- name##_av = build_html_##name##_stack( \
- &top_document_ctx->name); \
- hv_store (top_document_context_hv, #name, \
- strlen (#name), \
- newRV_noinc ((SV *) name##_av), 0); \
- }
- build_context(formatting_context)
- build_context(composition_context)
- build_context(preformatted_classes)
- build_context(block_commands)
- build_context(monospace)
-#undef build_context
-
- if (flags & HMSF_top_document_ctx)
- build_html_document_context_ctx (top_document_context_hv,
- top_document_ctx);
-
- if (!(flags & HMSF_formatting_context)
- && flags & HMSF_top_formatting_context)
- {
- HTML_FORMATTING_CONTEXT *top_formatting_ctx
- = html_top_formatting_context (&top_document_ctx->formatting_context);
- SSize_t top_formatting_context_idx;
- SV **top_formatting_context_sv;
- HV *top_formatting_context_hv;
-
- SV **formatting_context_sv = hv_fetch (top_document_context_hv,
- "formatting_context",
- strlen ("formatting_context"), 0);
- formatting_context_av = (AV *) SvRV (*formatting_context_sv);
- top_formatting_context_idx = av_top_index (formatting_context_av);
- top_formatting_context_sv = av_fetch (formatting_context_av,
- top_formatting_context_idx, 0);
- top_formatting_context_hv = (HV *) SvRV (*top_formatting_context_sv);
- build_html_formatting_context_ctx (top_formatting_context_hv,
- top_formatting_ctx);
- }
- }
-
- if (flags & HMSF_multiple_pass)
- {
- FETCH(multiple_pass);
-
- if (!multiple_pass_sv)
- {
- multiple_pass_av = newAV ();
- STORE("multiple_pass", newRV_noinc ((SV *) multiple_pass_av));
- }
- else
- {
- multiple_pass_av = (AV *) SvRV (*multiple_pass_sv);
- av_clear (multiple_pass_av);
- }
-
- for (i = 0; i < converter->multiple_pass.top; i++)
- {
- char *multiple_pass_str = converter->multiple_pass.stack[i];
- av_push (multiple_pass_av, newSVpv_utf8(multiple_pass_str, 0));
- }
- }
-
- if (converter->file_changed_counter.number)
- {
- FETCH(file_counters);
- file_counters_hv = (HV *) SvRV (*file_counters_sv);
-
- int j;
- for (j = 0; j < converter->file_changed_counter.number; j++)
- {
- size_t file_idx = converter->file_changed_counter.list[j];
- FILE_NAME_PATH_COUNTER *output_unit_file
- = &converter->output_unit_files.list[file_idx];
- char *filename = output_unit_file->filename;
-
- SV *filename_sv = newSVpv_utf8 (filename, 0);
-
- hv_store_ent (file_counters_hv, filename_sv,
- newSViv (output_unit_file->counter), 0);
-
- output_unit_file->counter_changed = 0;
- }
- memset (converter->file_changed_counter.list, 0,
- converter->file_changed_counter.number * sizeof (size_t));
- converter->file_changed_counter.number = 0;
- }
-
- /*
- files_information_sv = hv_fetch (hv, "files_information",
- strlen ("files_information"), 0);
-
- if (!files_information_sv)
- {
- files_information_hv = newHV ();
- STORE("files_information", newRV_noinc ((SV *) files_information_hv));
- }
- else
- {
- files_information_hv = (HV *) SvRV (*files_information_sv);
- hv_clear (files_information_av);
- }
- */
-
-#undef STORE
-
- if (flags & HMSF_translations)
- build_html_translated_names (hv, converter);
-
- return newRV_noinc ((SV *) hv);
-}
-
-SV *
-build_html_command_formatted_args (HTML_ARGS_FORMATTED *args_formatted)
-{
- AV *av;
- int i;
-
- dTHX;
-
- if (!args_formatted)
- return newSV (0);
-
- av = newAV ();
-
- for (i = 0; i < args_formatted->number; i++)
- {
- HTML_ARG_FORMATTED *arg_formatted = &args_formatted->args[i];
- if (arg_formatted->tree)
- {
- int j;
- HV *arg_formated_hv = newHV ();
- av_push (av, newRV_noinc ((SV *) arg_formated_hv));
-
- hv_store (arg_formated_hv, "tree", strlen ("tree"),
- newRV_inc ((SV *) arg_formatted->tree->hv), 0);
-
- for (j = 0; j < AFT_type_raw+1; j++)
- {
- if (arg_formatted->formatted[j])
- {
- const char *format_name
- = html_argument_formatting_type_names[j];
- hv_store (arg_formated_hv, format_name, strlen (format_name),
- newSVpv_utf8 (arg_formatted->formatted[j], 0), 0);
- }
- }
- }
- else
- av_push (av, newSV(0));
- }
-
- return newRV_noinc ((SV *) av);
-}
-
-SV *
-build_replaced_substrings (NAMED_STRING_ELEMENT_LIST *replaced_substrings)
-{
- HV *hv;
- int i;
-
- dTHX;
-
- if (!replaced_substrings)
- return newSV (0);
-
- hv = newHV ();
-
- for (i = 0; i < replaced_substrings->number; i++)
- {
- NAMED_STRING_ELEMENT *named_string_elt = &replaced_substrings->list[i];
- SV *name_sv = newSVpv_utf8 (named_string_elt->name, 0);
- SV *value_sv = 0;
-
- if (named_string_elt->element)
- value_sv = newRV_inc ((SV *) named_string_elt->element->hv);
- else if (named_string_elt->string)
- value_sv = newSVpv_utf8 (named_string_elt->string, 0);
-
- if (value_sv)
- hv_store_ent (hv, name_sv, value_sv, 0);
- }
-
- return newRV_noinc ((SV *) hv);
-}
-
diff --git a/tp/Texinfo/XS/main/build_perl_info.h
b/tp/Texinfo/XS/main/build_perl_info.h
index 520859059a..11e4f3d17c 100644
--- a/tp/Texinfo/XS/main/build_perl_info.h
+++ b/tp/Texinfo/XS/main/build_perl_info.h
@@ -4,19 +4,20 @@
#include <stddef.h>
+#include "EXTERN.h"
+#include "perl.h"
+
#include "global_commands_types.h"
#include "tree_types.h"
#include "converter_types.h"
-/* for FILE_SOURCE_INFO_LIST and HTML_ARGS_FORMATTED */
-#include "utils.h"
-/* for NAMED_STRING_ELEMENT_LIST */
-#include "translations.h"
int init (int texinfo_uninstalled, char *srcdir_in);
/* does not exist as perl macro */
SV *newSVpv_utf8 (const char *str, STRLEN len);
+void element_to_perl_hash (ELEMENT *e);
+
SV *build_document (size_t document_descriptor, int no_store);
SV *get_document (size_t document_descriptor);
@@ -40,28 +41,9 @@ void rebuild_output_units_list (SV *output_units_sv,
void pass_output_unit_files (SV *converter_sv,
FILE_NAME_PATH_COUNTER_LIST *output_unit_files);
-void pass_html_element_targets (SV *converter_sv,
- HTML_TARGET_LIST *html_targets);
-void pass_html_special_targets (SV *converter_sv,
- HTML_TARGET_LIST **html_special_targets);
-void pass_html_seen_ids (SV *converter_sv, STRING_LIST *seen_ids);
-
void pass_converter_errors (ERROR_MESSAGE_LIST *error_messages,
HV *converter_hv);
-SV *build_html_files_source_info (FILE_SOURCE_INFO_LIST *files_source_info);
-void pass_html_global_units_directions (SV *converter_sv,
- OUTPUT_UNIT **global_units_directions,
- SPECIAL_UNIT_DIRECTION **special_units_direction_name);
-void pass_html_elements_in_file_count (SV *converter_sv,
- FILE_NAME_PATH_COUNTER_LIST *output_unit_files);
-
-HV *build_html_document_context (HTML_DOCUMENT_CONTEXT *document_context);
-
-SV *build_html_formatting_state (CONVERTER *converter, unsigned long flags);
-
void build_output_files_information (CONVERTER *converter);
-SV *build_html_command_formatted_args (HTML_ARGS_FORMATTED *args_formatted);
-SV *build_replaced_substrings (NAMED_STRING_ELEMENT_LIST *replaced_substrings);
#endif
diff --git a/tp/Texinfo/XS/main/call_perl_function.c
b/tp/Texinfo/XS/main/call_perl_function.c
index 9ba5be1673..81bc61e798 100644
--- a/tp/Texinfo/XS/main/call_perl_function.c
+++ b/tp/Texinfo/XS/main/call_perl_function.c
@@ -30,7 +30,8 @@
#undef context
-#include "utils.h"
+#include <string.h>
+
#include "build_perl_info.h"
#include "call_perl_function.h"
@@ -77,1072 +78,3 @@ call_nodenamenormalization_unicode_to_transliterate (char
*text)
return result;
}
-
-TARGET_FILENAME *
-call_file_id_setting_special_unit_target_file_name (CONVERTER *self,
- OUTPUT_UNIT *special_unit, char *target,
- char *default_filename)
-{
- SV **file_id_setting_sv;
-
- dTHX;
-
- if (!special_unit->hv)
- return 0;
-
- if (!self->hv)
- return 0;
-
- file_id_setting_sv = hv_fetch (self->hv, "file_id_setting",
- strlen ("file_id_setting"), 0);
- if (file_id_setting_sv)
- {
- SV **special_unit_target_file_name_sv;
- HV *file_id_setting_hv = (HV *)SvRV(*file_id_setting_sv);
- special_unit_target_file_name_sv = hv_fetch (file_id_setting_hv,
- "special_unit_target_file_name",
- strlen ("special_unit_target_file_name"),
0);
-
- if (special_unit_target_file_name_sv)
- {
- int count;
- char *target_ret;
- char *filename = 0;
- SV *target_ret_sv;
- SV *filename_sv;
- STRLEN len;
- TARGET_FILENAME *result
- = (TARGET_FILENAME *) malloc (sizeof (TARGET_FILENAME));
- result->filename = 0;
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 4);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newRV_inc (special_unit->hv)));
- /* FIXME encoding */
- PUSHs(sv_2mortal (newSVpv (target, 0)));
- PUSHs(sv_2mortal (newSVpv (default_filename, 0)));
- PUTBACK;
-
- count = call_sv (*special_unit_target_file_name_sv, G_ARRAY);
-
- SPAGAIN;
-
- if (count != 2)
- croak("special_unit_target_file_name should return 2 items\n");
-
- filename_sv = POPs;
- if (SvOK (filename_sv))
- {
- STRLEN len;
- filename = SvPV (filename_sv, len);
- result->filename = strdup (filename);
- }
-
- target_ret_sv = POPs;
- target_ret = SvPV (target_ret_sv, len);
- result->target = strdup (target_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
- }
- }
- return 0;
-}
-
-char *
-call_file_id_setting_label_target_name (CONVERTER *self,
- char *normalized, ELEMENT *label_element, char *target,
- int *called)
-{
- SV **file_id_setting_sv;
-
- dTHX;
-
- *called = 0;
-
- if (!label_element->hv)
- return 0;
-
- if (!self->hv)
- return 0;
-
- file_id_setting_sv = hv_fetch (self->hv, "file_id_setting",
- strlen ("file_id_setting"), 0);
- if (file_id_setting_sv)
- {
- SV **label_target_name_sv;
- HV *file_id_setting_hv = (HV *)SvRV(*file_id_setting_sv);
- label_target_name_sv = hv_fetch (file_id_setting_hv,
- "label_target_name",
- strlen ("label_target_name"), 0);
-
- if (label_target_name_sv)
- {
- int count;
- char *target_ret;
- STRLEN len;
- char *result;
- SV *target_ret_sv;
-
- *called = 1;
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 4);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv (normalized, 0)));
- PUSHs(sv_2mortal (newRV_inc (label_element->hv)));
- PUSHs(sv_2mortal (newSVpv (target, 0)));
- PUTBACK;
-
- count = call_sv (*label_target_name_sv, G_ARRAY);
-
- SPAGAIN;
-
- if (count != 1)
- croak("label_target_name should return 1 item\n");
-
- target_ret_sv = POPs;
- target_ret = SvPV (target_ret_sv, len);
- result = strdup (target_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
- }
- }
- return 0;
-}
-
-
-char *
-call_file_id_setting_node_file_name (CONVERTER *self,
- ELEMENT *target_element, char *node_filename,
- int *called)
-{
- SV **file_id_setting_sv;
-
- dTHX;
-
- *called = 0;
-
- if (!target_element->hv)
- return 0;
-
- if (!self->hv)
- return 0;
-
- file_id_setting_sv = hv_fetch (self->hv, "file_id_setting",
- strlen ("file_id_setting"), 0);
- if (file_id_setting_sv)
- {
- SV **node_file_name_sv;
- HV *file_id_setting_hv = (HV *)SvRV(*file_id_setting_sv);
- node_file_name_sv = hv_fetch (file_id_setting_hv,
- "node_file_name",
- strlen ("node_file_name"), 0);
-
- if (node_file_name_sv)
- {
- int count;
- char *result;
- SV *node_filename_ret_sv;
- *called = 1;
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 3);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newRV_inc (target_element->hv)));
- PUSHs(sv_2mortal (newSVpv (node_filename, 0)));
- PUTBACK;
-
- count = call_sv (*node_file_name_sv, G_ARRAY);
-
- SPAGAIN;
-
- if (count != 1)
- croak("node_file_name should return 1 item\n");
-
- node_filename_ret_sv = POPs;
- /* user can return undef */
- if (SvOK (node_filename_ret_sv))
- {
- char *node_filename_ret;
- STRLEN len;
- node_filename_ret = SvPV (node_filename_ret_sv, len);
- result = strdup (node_filename_ret);
- }
- else
- result = 0;
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
- }
- }
- return 0;
-}
-
-TARGET_CONTENTS_FILENAME *
-call_file_id_setting_sectioning_command_target_name (CONVERTER *self,
- ELEMENT *command, char *target, char *target_contents,
- char *target_shortcontents, char *filename)
-{
- SV **file_id_setting_sv;
-
- dTHX;
-
- if (!command->hv)
- return 0;
-
- if (!self->hv)
- return 0;
-
- file_id_setting_sv = hv_fetch (self->hv, "file_id_setting",
- strlen ("file_id_setting"), 0);
- if (file_id_setting_sv)
- {
- SV **sectioning_command_target_name_sv;
- HV *file_id_setting_hv = (HV *)SvRV(*file_id_setting_sv);
- sectioning_command_target_name_sv = hv_fetch (file_id_setting_hv,
- "sectioning_command_target_name",
- strlen ("sectioning_command_target_name"), 0);
-
- if (sectioning_command_target_name_sv)
- {
- int count;
- STRLEN len;
- SV *target_ret_sv;
- SV *target_contents_ret_sv;
- SV *target_shortcontents_ret_sv;
- SV *filename_ret_sv;
- char *target_ret;
- char *target_contents_ret;
- char *target_shortcontents_ret;
- char *filename_ret;
- TARGET_CONTENTS_FILENAME *result = (TARGET_CONTENTS_FILENAME *)
- malloc (sizeof (TARGET_CONTENTS_FILENAME));
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 6);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newRV_inc (command->hv)));
- PUSHs(sv_2mortal (newSVpv (target, 0)));
- PUSHs(sv_2mortal (newSVpv (target_contents, 0)));
- PUSHs(sv_2mortal (newSVpv (target_shortcontents, 0)));
- PUSHs(sv_2mortal (newSVpv (filename, 0)));
- PUTBACK;
-
- count = call_sv (*sectioning_command_target_name_sv, G_ARRAY);
-
- SPAGAIN;
-
- if (count != 4)
- croak("sectioning_command_target_name should return 4 items\n");
-
- filename_ret_sv = POPs;
- filename_ret = SvPV (filename_ret_sv, len);
- result->filename = strdup (filename_ret);
- target_shortcontents_ret_sv = POPs;
- target_shortcontents_ret = SvPV (target_shortcontents_ret_sv,
- len);
- result->target_shortcontents = strdup (target_shortcontents_ret);
- target_contents_ret_sv = POPs;
- target_contents_ret = SvPV (target_contents_ret_sv, len);
- result->target_contents = strdup (target_contents_ret);
- target_ret_sv = POPs;
- target_ret = SvPV (target_ret_sv, len);
- result->target = strdup (target_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
- }
- }
- return 0;
-}
-
-FILE_NAME_PATH *
-call_file_id_setting_unit_file_name (CONVERTER *self, OUTPUT_UNIT *output_unit,
- char *filename, char *filepath)
-{
- SV **file_id_setting_sv;
-
- dTHX;
-
- if (!output_unit->hv)
- return 0;
-
- if (!self->hv)
- return 0;
-
- file_id_setting_sv = hv_fetch (self->hv, "file_id_setting",
- strlen ("file_id_setting"), 0);
- if (file_id_setting_sv)
- {
- SV **unit_file_name_sv;
- HV *file_id_setting_hv = (HV *)SvRV(*file_id_setting_sv);
- unit_file_name_sv = hv_fetch (file_id_setting_hv,
- "unit_file_name",
- strlen ("unit_file_name"), 0);
-
- if (unit_file_name_sv)
- {
- int count;
- SV *filepath_ret_sv;
- SV *filename_ret_sv;
- FILE_NAME_PATH *result
- = (FILE_NAME_PATH *) malloc (sizeof (FILE_NAME_PATH));
- memset (result, 0, sizeof (FILE_NAME_PATH));
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 4);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newRV_inc (output_unit->hv)));
- PUSHs(sv_2mortal (newSVpv (filename, 0)));
- PUSHs(sv_2mortal (newSVpv (filepath, 0)));
- PUTBACK;
-
- count = call_sv (*unit_file_name_sv, G_ARRAY);
-
- SPAGAIN;
-
- if (count != 2)
- croak("unit_file_name should return 2 items\n");
-
- filepath_ret_sv = POPs;
- if (SvOK (filepath_ret_sv))
- {
- STRLEN len;
- char *filepath_ret = SvPV (filepath_ret_sv, len);
- result->filepath = strdup (filepath_ret);
- }
-
- filename_ret_sv = POPs;
- if (SvOK (filename_ret_sv))
- {
- STRLEN len;
- char *filename_ret = SvPV (filename_ret_sv, len);
- result->filename = strdup (filename_ret);
- }
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
- }
- }
- return 0;
-}
-
-char *
-call_formatting_function_format_title_titlepage (CONVERTER *self)
-{
- int count;
- char *result;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
- SV *formatting_reference_sv;
-
- dTHX;
-
- if (!self->hv)
- return 0;
-
- formatting_reference_sv
- = self->formatting_references[FR_format_title_titlepage].sv_reference;
-
- if (self->modified_state)
- {
- build_html_formatting_state (self, self->modified_state);
- self->modified_state = 0;
- }
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 1);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUTBACK;
-
- count = call_sv (formatting_reference_sv,
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("format_title_titlepage should return 1 item\n");
-
- result_sv = POPs;
- /* FIXME encoding */
- result_ret = SvPV (result_sv, len);
- result = strdup (result_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
-
-char *
-call_formatting_function_format_footnotes_segment (CONVERTER *self)
-{
- int count;
- char *result;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
- SV *formatting_reference_sv;
-
- dTHX;
-
- if (!self->hv)
- return 0;
-
- formatting_reference_sv
- = self->formatting_references[FR_format_footnotes_segment].sv_reference;
-
- if (self->modified_state)
- {
- build_html_formatting_state (self, self->modified_state);
- self->modified_state = 0;
- }
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 1);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUTBACK;
-
- count = call_sv (formatting_reference_sv,
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("format_footnotes_segment should return 1 item\n");
-
- result_sv = POPs;
- /* FIXME encoding */
- result_ret = SvPV (result_sv, len);
- result = strdup (result_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
-
-char *
-call_formatting_function_format_end_file (CONVERTER *self, char *filename,
- OUTPUT_UNIT *output_unit)
-{
- int count;
- char *result;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
- SV *formatting_reference_sv;
- SV *output_unit_sv;
-
- dTHX;
-
- if (!self->hv)
- return 0;
-
- formatting_reference_sv
- = self->formatting_references[FR_format_end_file].sv_reference;
-
- if (self->modified_state)
- {
- build_html_formatting_state (self, self->modified_state);
- self->modified_state = 0;
- }
-
- if (output_unit)
- output_unit_sv = newRV_inc (output_unit->hv);
- else
- output_unit_sv = newSV (0);
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 3);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv_utf8 (filename, 0)));
- PUSHs(sv_2mortal (output_unit_sv));
- PUTBACK;
-
- count = call_sv (formatting_reference_sv,
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("format_end_file should return 1 item\n");
-
- result_sv = POPs;
- /* FIXME encoding */
- result_ret = SvPV (result_sv, len);
- result = strdup (result_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
-
-char *
-call_formatting_function_format_begin_file (CONVERTER *self, char *filename,
- OUTPUT_UNIT *output_unit)
-{
- int count;
- char *result;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
- SV *formatting_reference_sv;
- SV *output_unit_sv;
-
- dTHX;
-
- if (!self->hv)
- return 0;
-
- formatting_reference_sv
- = self->formatting_references[FR_format_begin_file].sv_reference;
-
- if (self->modified_state)
- {
- build_html_formatting_state (self, self->modified_state);
- self->modified_state = 0;
- }
-
- if (output_unit)
- output_unit_sv = newRV_inc (output_unit->hv);
- else
- output_unit_sv = newSV (0);
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 3);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv_utf8 (filename, 0)));
- PUSHs(sv_2mortal (output_unit_sv));
- PUTBACK;
-
- count = call_sv (formatting_reference_sv,
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("format_begin_file should return 1 item\n");
-
- result_sv = POPs;
- /* FIXME encoding */
- result_ret = SvPV (result_sv, len);
- result = strdup (result_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
-
-char *
-call_formatting_function_format_translate_message (CONVERTER *self,
- const char *message, const char *lang,
- const char *message_context)
-{
- int count;
- char *result = 0;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
- SV *formatting_reference_sv;
-
- dTHX;
-
- if (!self->hv)
- return 0;
-
- formatting_reference_sv
- = self->formatting_references[
- FR_format_translate_message].sv_reference;
-
- if (self->modified_state)
- {
- build_html_formatting_state (self, self->modified_state);
- self->modified_state = 0;
- }
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 4);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv_utf8 (message, 0)));
- PUSHs(sv_2mortal (newSVpv (lang, 0)));
- PUSHs(sv_2mortal (newSVpv_utf8 (message_context, 0)));
- PUTBACK;
-
- count = call_sv (formatting_reference_sv,
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("format_translate_message should return 1 item\n");
-
- result_sv = POPs;
- if (SvOK (result_sv))
- {
- result_ret = SvPVutf8 (result_sv, len);
- result = strdup (result_ret);
- }
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
-
-
-
-char *
-call_types_conversion (CONVERTER *self, enum element_type type,
- FORMATTING_REFERENCE *formatting_reference,
- ELEMENT *element, char *content)
-{
- int count;
- char *result;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
- SV *formatting_reference_sv;
-
- dTHX;
-
- if (!self->hv)
- return 0;
-
- if (self->tree_to_build)
- {
- build_texinfo_tree (self->tree_to_build);
- self->tree_to_build = 0;
- }
-
- formatting_reference_sv = formatting_reference->sv_reference;
-
- if (self->modified_state)
- {
- build_html_formatting_state (self, self->modified_state);
- self->modified_state = 0;
- }
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 4);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv (element_type_names[type], 0)));
- PUSHs(sv_2mortal (newRV_inc (element->hv)));
- /* content == 0 is possible, hope that newSVpv result corresponds to
- undef in that case, but could also need to explicitely use newSV(0) */
- PUSHs(sv_2mortal (newSVpv_utf8 (content, 0)));
- PUTBACK;
-
- count = call_sv (formatting_reference_sv,
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("types_conversion should return 1 item\n");
-
- result_sv = POPs;
- /* it is encoded using non strict encoding, so the UTF-8 could be invalid.
- It could be possible to add a wrapper in perl that encode to UTF-8,
- but probably not worth it */
- result_ret = SvPVutf8 (result_sv, len);
- result = strdup (result_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
-
-char *
-call_types_open (CONVERTER *self, enum element_type type,
- ELEMENT *element)
-{
- int count;
- char *result;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
- SV *formatting_reference_sv;
-
- dTHX;
-
- if (self->tree_to_build)
- {
- build_texinfo_tree (self->tree_to_build);
- self->tree_to_build = 0;
- }
-
- if (!self->hv)
- return 0;
-
- formatting_reference_sv = self->types_open[type].sv_reference;
-
- if (self->modified_state)
- {
- build_html_formatting_state (self, self->modified_state);
- self->modified_state = 0;
- }
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 3);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv (element_type_names[type], 0)));
- PUSHs(sv_2mortal (newRV_inc (element->hv)));
- PUTBACK;
-
- count = call_sv (formatting_reference_sv,
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("types_open should return 1 item\n");
-
- result_sv = POPs;
- /* it is encoded using non strict encoding, so the UTF-8 could be invalid.
- It could be possible to add a wrapper in perl that encode to UTF-8,
- but probably not worth it */
- result_ret = SvPVutf8 (result_sv, len);
- result = strdup (result_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
-
-char *
-call_commands_conversion (CONVERTER *self, enum command_id cmd,
- FORMATTING_REFERENCE *formatting_reference,
- ELEMENT *element, HTML_ARGS_FORMATTED
*args_formatted,
- const char *content)
-{
- int count;
- char *result;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
- SV *formatting_reference_sv;
- SV *args_formatted_sv;
- char *command_name;
-
- dTHX;
-
- if (!self->hv)
- return 0;
-
- if (self->tree_to_build)
- {
- build_texinfo_tree (self->tree_to_build);
- self->tree_to_build = 0;
- }
-
- /* could also be builtin_command_data[cmd].cmdname) */
- command_name = element_command_name (element);
-
- formatting_reference_sv = formatting_reference->sv_reference;
-
- if (self->modified_state)
- {
- build_html_formatting_state (self, self->modified_state);
- self->modified_state = 0;
- }
-
- args_formatted_sv = build_html_command_formatted_args (args_formatted);
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 5);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv (command_name, 0)));
- PUSHs(sv_2mortal (newRV_inc (element->hv)));
- PUSHs(sv_2mortal (args_formatted_sv));
- /* content == 0 is possible, hope that newSVpv result corresponds to
- undef in that case, but could also need to explicitely use newSV(0) */
- PUSHs(sv_2mortal (newSVpv_utf8 (content, 0)));
- PUTBACK;
-
- count = call_sv (formatting_reference_sv,
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("commands_conversion should return 1 item\n");
-
- result_sv = POPs;
- /* it is encoded using non strict encoding, so the UTF-8 could be invalid.
- It could be possible to add a wrapper in perl that encode to UTF-8,
- but probably not worth it */
- result_ret = SvPVutf8 (result_sv, len);
- result = strdup (result_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
-
-char *
-call_commands_open (CONVERTER *self, enum command_id cmd,
- ELEMENT *element)
-{
- int count;
- char *result;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
- SV *formatting_reference_sv;
- char *command_name;
-
- dTHX;
-
- if (!self->hv)
- return 0;
-
- if (self->tree_to_build)
- {
- build_texinfo_tree (self->tree_to_build);
- self->tree_to_build = 0;
- }
-
- formatting_reference_sv = self->commands_open[cmd].sv_reference;
-
- /* could also be builtin_command_data[cmd].cmdname) */
- command_name = element_command_name (element);
-
- if (self->modified_state)
- {
- build_html_formatting_state (self, self->modified_state);
- self->modified_state = 0;
- }
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 3);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv (command_name, 0)));
- PUSHs(sv_2mortal (newRV_inc (element->hv)));
- PUTBACK;
-
- count = call_sv (formatting_reference_sv,
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("commands_open should return 1 item\n");
-
- result_sv = POPs;
- /* it is encoded using non strict encoding, so the UTF-8 could be invalid.
- It could be possible to add a wrapper in perl that encode to UTF-8,
- but probably not worth it */
- result_ret = SvPVutf8 (result_sv, len);
- result = strdup (result_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
-
-char *
-call_output_units_conversion (CONVERTER *self,
- enum output_unit_type unit_type,
- OUTPUT_UNIT *output_unit, const char *content)
-{
- int count;
- char *result;
- char *result_ret;
- STRLEN len;
- SV *result_sv;
- SV *formatting_reference_sv;
-
- dTHX;
-
- if (!self->hv)
- return 0;
-
- if (self->tree_to_build)
- {
- build_texinfo_tree (self->tree_to_build);
- self->tree_to_build = 0;
- }
-
- formatting_reference_sv
- = self->output_units_conversion[unit_type].sv_reference;
-
- if (self->modified_state)
- {
- build_html_formatting_state (self, self->modified_state);
- self->modified_state = 0;
- }
-
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- EXTEND(SP, 4);
-
- PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv (output_unit_type_names[unit_type], 0)));
- PUSHs(sv_2mortal (newRV_inc (output_unit->hv)));
- /* content == 0 is possible, hope that newSVpv result corresponds to
- undef in that case, but could also need to explicitely use newSV(0) */
- PUSHs(sv_2mortal (newSVpv_utf8 (content, 0)));
- PUTBACK;
-
- count = call_sv (formatting_reference_sv,
- G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1)
- croak("output_units_conversion should return 1 item\n");
-
-
- result_sv = POPs;
- /* it is encoded using non strict encoding, so the UTF-8 could be invalid.
- It could be possible to add a wrapper in perl that encode to UTF-8,
- but probably not worth it */
- result_ret = SvPVutf8 (result_sv, len);
- result = strdup (result_ret);
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return result;
-}
-
-
diff --git a/tp/Texinfo/XS/main/call_perl_function.h
b/tp/Texinfo/XS/main/call_perl_function.h
index 5447019d9b..b9c3f1f6a1 100644
--- a/tp/Texinfo/XS/main/call_perl_function.h
+++ b/tp/Texinfo/XS/main/call_perl_function.h
@@ -2,66 +2,6 @@
#ifndef CALL_PERL_FUNCTION_H
#define CALL_PERL_FUNCTION_H
-#include "tree_types.h"
-#include "converter_types.h"
-#include "translations.h"
-
-typedef struct FILE_NAME_PATH {
- char *filename;
- char *filepath;
-} FILE_NAME_PATH;
-
-typedef struct TARGET_CONTENTS_FILENAME {
- char *target;
- char *filename;
- char *target_contents;
- char *target_shortcontents;
-} TARGET_CONTENTS_FILENAME;
-
char *call_nodenamenormalization_unicode_to_transliterate (char *text);
-TARGET_FILENAME *call_file_id_setting_special_unit_target_file_name (
- CONVERTER *self, OUTPUT_UNIT *special_unit, char *target,
- char *default_filename);
-char *call_file_id_setting_label_target_name (CONVERTER *self,
- char *normalized, ELEMENT *label_element, char *target,
- int *called);
-char *call_file_id_setting_node_file_name (CONVERTER *self,
- ELEMENT *target_element, char *node_filename,
- int *called);
-TARGET_CONTENTS_FILENAME * call_file_id_setting_sectioning_command_target_name
- (CONVERTER *self,
- ELEMENT *command, char *target, char *target_contents,
- char *target_shortcontents, char *filename);
-FILE_NAME_PATH *call_file_id_setting_unit_file_name (CONVERTER *self,
- OUTPUT_UNIT *output_unit,
- char *filename, char *filepath);
-
-char *call_formatting_function_format_title_titlepage (CONVERTER *self);
-char *call_formatting_function_format_footnotes_segment (CONVERTER *self);
-char *call_formatting_function_format_end_file (CONVERTER *self,
- char *filename,
- OUTPUT_UNIT *output_unit);
-char *call_formatting_function_format_begin_file (CONVERTER *self,
- char *filename,
- OUTPUT_UNIT *output_unit);
-
-char *call_types_conversion (CONVERTER *self, enum element_type type,
- FORMATTING_REFERENCE *formatting_reference,
- ELEMENT *element, char *content);
-char *call_types_open (CONVERTER *self, enum element_type type,
- ELEMENT *element);
-char *call_commands_conversion (CONVERTER *self, enum command_id cmd,
- FORMATTING_REFERENCE *formatting_reference,
- ELEMENT *element, HTML_ARGS_FORMATTED
*args_formatted,
- const char *content);
-char *call_commands_open (CONVERTER *self, enum command_id cmd,
- ELEMENT *element);
-char *call_output_units_conversion (CONVERTER *self,
- enum output_unit_type unit_type,
- OUTPUT_UNIT *output_unit, const char *content);
-char *call_formatting_function_format_translate_message (CONVERTER *self,
- const char *message, const char *lang,
- const char *message_context);
-
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES), tp/Texinfo/XS/convert/call_html_perl_function.c, tp/Texinfo/XS/main/build_perl_info.c, tp/Texinfo/XS/main/call_perl_function.c, tp/Texinfo/XS/convert/build_html_perl_state.c: new files convert/call_html_perl_function.c and convert/build_html_perl_state.c with HTML specific content of call_perl_function.c and build_perl_info.c.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Convert/Converter.pm (import, _XS_get_unclosed_stream) (get_output_files_XS_unclosed_streams), tp/Texinfo/Convert/HTML.pm (output), tp/Texinfo/XS/convert/ConvertXS.xs (get_unclosed_stream), tp/Texinfo/XS/main/build_perl_info.c (build_output_files_unclosed_files): it is not possible to associate an unclosed stream to a SV from C. However, as found out by Gavin, it is possible to pass a stream through the XS interface. Therefore, in build_output_files_unclosed_files, the unclos [...]
- Next by Date:
branch master updated: * tp/Texinfo/XS/Makefile.am (lib_LTLIBRARIES, xs_LTLIBRARIES): Place libtexinfo.la and libtexinfoxs.la in xs_LTLIBRARIES instead.
- Previous by thread:
branch master updated: * tp/Texinfo/Convert/Converter.pm (import, _XS_get_unclosed_stream) (get_output_files_XS_unclosed_streams), tp/Texinfo/Convert/HTML.pm (output), tp/Texinfo/XS/convert/ConvertXS.xs (get_unclosed_stream), tp/Texinfo/XS/main/build_perl_info.c (build_output_files_unclosed_files): it is not possible to associate an unclosed stream to a SV from C. However, as found out by Gavin, it is possible to pass a stream through the XS interface. Therefore, in build_output_files_unclosed_files, the unclos [...]
- Next by thread:
branch master updated: * tp/Texinfo/XS/Makefile.am (lib_LTLIBRARIES, xs_LTLIBRARIES): Place libtexinfo.la and libtexinfoxs.la in xs_LTLIBRARIES instead.
- Index(es):