[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Fri, 3 Jan 2025 17:50:02 -0500 (EST) |
branch: master
commit 87d94e26c130211f0dcf29c0baaa599b793a50ec
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Jan 3 18:17:05 2025 +0100
* tp/Texinfo/XS/main/converter_types.h (CONVERTER): rename
direction_unit_direction_name field as main_units_direction_names,
special_units_direction_name as special_units_direction_names and
global_units_direction_name as global_units_direction_names. Update
users.
* tp/Texinfo/XS/convert/html_prepare_converter.c
(html_setup_global_units_direction_names): rename
global_units_direction_names variable as global_units_directions_list
and special_units_direction_name as special_units_direction_names.
---
ChangeLog | 13 +++++++
tp/Texinfo/XS/convert/call_html_perl_function.c | 2 +-
tp/Texinfo/XS/convert/format_html.c | 6 +--
tp/Texinfo/XS/convert/html_conversion_state.c | 4 +-
tp/Texinfo/XS/convert/html_converter_finish.c | 12 +++---
tp/Texinfo/XS/convert/html_prepare_converter.c | 50 ++++++++++++-------------
tp/Texinfo/XS/main/build_perl_info.c | 6 +--
tp/Texinfo/XS/main/converter_types.h | 6 +--
tp/Texinfo/XS/main/get_perl_info.c | 8 ++--
tp/Texinfo/XS/main/utils.c | 10 ++---
10 files changed, 65 insertions(+), 52 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 336eb23275..5b46fd6036 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2025-01-03 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/main/converter_types.h (CONVERTER): rename
+ direction_unit_direction_name field as main_units_direction_names,
+ special_units_direction_name as special_units_direction_names and
+ global_units_direction_name as global_units_direction_names. Update
+ users.
+
+ * tp/Texinfo/XS/convert/html_prepare_converter.c
+ (html_setup_global_units_direction_names): rename
+ global_units_direction_names variable as global_units_directions_list
+ and special_units_direction_name as special_units_direction_names.
+
2025-01-03 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/call_conversion_perl.c
diff --git a/tp/Texinfo/XS/convert/call_html_perl_function.c
b/tp/Texinfo/XS/convert/call_html_perl_function.c
index 3707c6a441..a6f908a133 100644
--- a/tp/Texinfo/XS/convert/call_html_perl_function.c
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.c
@@ -2283,7 +2283,7 @@ call_button_direction_function (CONVERTER *self,
EXTEND(SP, 3);
PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv (self->direction_unit_direction_name[direction],
+ PUSHs(sv_2mortal (newSVpv (self->main_units_direction_names[direction],
0)));
PUSHs(sv_2mortal (newRV_inc (element->hv)));
diff --git a/tp/Texinfo/XS/convert/format_html.c
b/tp/Texinfo/XS/convert/format_html.c
index 58509b681d..9304b38d54 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -2127,7 +2127,7 @@ from_element_direction (CONVERTER *self, int direction,
/* To debug:
fprintf (stderr, "FED: %s %s\n", html_command_text_type_name[type],
- self->direction_unit_direction_name[direction]);
+ self->main_units_direction_names[direction]);
*/
if (direction < D_direction_Space)
@@ -2560,7 +2560,7 @@ direction_string (CONVERTER *self, int direction,
fprintf (stderr, "DS: %d %s %s %s\n", direction,
direction_string_type_names[string_type],
direction_string_context_names[context],
- self->direction_unit_direction_name[direction]);
+ self->main_units_direction_names[direction]);
*/
if (direction >= FIRSTINFILE_MIN_IDX && direction <= FIRSTINFILE_MAX_IDX)
{
@@ -2586,7 +2586,7 @@ direction_string (CONVERTER *self, int direction,
const char *direction_name;
text_init (&translation_context);
direction_name
- = self->direction_unit_direction_name[direction_unit_direction_idx];
+ = self->main_units_direction_names[direction_unit_direction_idx];
text_append (&translation_context, direction_name);
if (direction == RUD_type_This)
diff --git a/tp/Texinfo/XS/convert/html_conversion_state.c
b/tp/Texinfo/XS/convert/html_conversion_state.c
index ba251c45bb..9d212537da 100644
--- a/tp/Texinfo/XS/convert/html_conversion_state.c
+++ b/tp/Texinfo/XS/convert/html_conversion_state.c
@@ -1187,8 +1187,8 @@ html_find_direction_name_global_unit (const CONVERTER
*self,
searched_direction.direction = direction_name;
result = (SPECIAL_UNIT_DIRECTION *) bsearch (&searched_direction,
- self->global_units_direction_name.list,
- self->global_units_direction_name.number,
+ self->global_units_direction_names.list,
+ self->global_units_direction_names.number,
sizeof (SPECIAL_UNIT_DIRECTION),
compare_global_units_direction_name);
if (!result)
diff --git a/tp/Texinfo/XS/convert/html_converter_finish.c
b/tp/Texinfo/XS/convert/html_converter_finish.c
index 8509ef09d7..1975b2c83e 100644
--- a/tp/Texinfo/XS/convert/html_converter_finish.c
+++ b/tp/Texinfo/XS/convert/html_converter_finish.c
@@ -191,12 +191,12 @@ html_reset_converter (CONVERTER *self)
free (self->sorted_index_names.list);
memset (&self->sorted_index_names, 0, sizeof (INDEX_LIST));
- free (self->global_units_direction_name.list);
- self->global_units_direction_name.list = 0;
- self->global_units_direction_name.number = 0;
+ free (self->global_units_direction_names.list);
+ self->global_units_direction_names.list = 0;
+ self->global_units_direction_names.number = 0;
- free (self->special_units_direction_name);
- self->special_units_direction_name = 0;
+ free (self->special_units_direction_names);
+ self->special_units_direction_names = 0;
free (self->output_unit_file_indices);
self->output_unit_file_indices = 0;
free (self->special_unit_file_indices);
@@ -323,7 +323,7 @@ html_free_converter (CONVERTER *self)
free_strings_list (&self->customized_special_unit_varieties);
- free (self->direction_unit_direction_name);
+ free (self->main_units_direction_names);
free (self->special_unit_body);
free (self->special_unit_body_formatting);
diff --git a/tp/Texinfo/XS/convert/html_prepare_converter.c
b/tp/Texinfo/XS/convert/html_prepare_converter.c
index 293e502cc0..6f780a539d 100644
--- a/tp/Texinfo/XS/convert/html_prepare_converter.c
+++ b/tp/Texinfo/XS/convert/html_prepare_converter.c
@@ -1895,19 +1895,19 @@ html_converter_customize (CONVERTER *self)
customized information, mainly nr_special_units, which we
pretend could be customize (even though it cannot for now) */
- self->direction_unit_direction_name = (const char **) malloc
+ self->main_units_direction_names = (const char **) malloc
((nr_special_units + NON_SPECIAL_DIRECTIONS_NR +1) * sizeof (char *));
- memcpy (self->direction_unit_direction_name, html_button_direction_names,
+ memcpy (self->main_units_direction_names, html_button_direction_names,
NON_SPECIAL_DIRECTIONS_NR * sizeof (char *));
- memcpy (self->direction_unit_direction_name + NON_SPECIAL_DIRECTIONS_NR,
+ memcpy (self->main_units_direction_names + NON_SPECIAL_DIRECTIONS_NR,
self->special_unit_info[SUI_type_direction],
nr_special_units * sizeof (char *));
- self->direction_unit_direction_name[
+ self->main_units_direction_names[
nr_special_units + NON_SPECIAL_DIRECTIONS_NR] = 0;
/*
- for (l = 0; self->direction_unit_direction_name[l]; l++)
+ for (l = 0; self->main_units_direction_names[l]; l++)
fprintf (stderr, "DEBUG: direction unit names: %d '%s'\n", l,
- self->direction_unit_direction_name[l]);
+ self->main_units_direction_names[l]);
*/
@@ -4730,9 +4730,9 @@ html_prepare_output_units_global_targets (CONVERTER *self)
all_special_units_nr += units_list->number;
}
- self->special_units_direction_name = (SPECIAL_UNIT_DIRECTION *)
+ self->special_units_direction_names = (SPECIAL_UNIT_DIRECTION *)
malloc (sizeof (SPECIAL_UNIT_DIRECTION) * (all_special_units_nr+1));
- memset (self->special_units_direction_name, 0,
+ memset (self->special_units_direction_names, 0,
sizeof (SPECIAL_UNIT_DIRECTION) * (all_special_units_nr+1));
s = 0;
@@ -4754,8 +4754,8 @@ html_prepare_output_units_global_targets (CONVERTER *self)
self->global_units_directions[special_unit_direction_index]
= special_unit;
- self->special_units_direction_name[s].output_unit = special_unit;
- self->special_units_direction_name[s].direction
+ self->special_units_direction_names[s].output_unit =
special_unit;
+ self->special_units_direction_names[s].direction
= html_special_unit_info (self, SUI_type_direction,
special_unit_variety);
s++;
@@ -4779,50 +4779,50 @@ compare_global_units_direction_name (const void *a,
const void *b)
void
html_setup_global_units_direction_names (CONVERTER *self)
{
- SPECIAL_UNIT_DIRECTION *global_units_direction_names;
+ SPECIAL_UNIT_DIRECTION *global_units_directions_list;
int i;
int global_directions_nr = 0;
int global_units_direction_idx = 0;
- const SPECIAL_UNIT_DIRECTION *special_units_direction_name
- = self->special_units_direction_name;
+ const SPECIAL_UNIT_DIRECTION *special_units_direction_names
+ = self->special_units_direction_names;
for (i = 0; i < D_Last+1; i++)
if (self->global_units_directions[i])
global_directions_nr++;
- for (i = 0; special_units_direction_name[i].output_unit; i++)
+ for (i = 0; special_units_direction_names[i].output_unit; i++)
global_directions_nr++;
- global_units_direction_names = (SPECIAL_UNIT_DIRECTION *)
+ global_units_directions_list = (SPECIAL_UNIT_DIRECTION *)
malloc (sizeof (SPECIAL_UNIT_DIRECTION) * (global_directions_nr));
for (i = 0; i < D_Last+1; i++)
{
if (self->global_units_directions[i])
{
- global_units_direction_names[global_units_direction_idx].direction
+ global_units_directions_list[global_units_direction_idx].direction
= html_global_unit_direction_names[i];
- global_units_direction_names[global_units_direction_idx].output_unit
+ global_units_directions_list[global_units_direction_idx].output_unit
= self->global_units_directions[i];
global_units_direction_idx++;
}
}
- for (i = 0; special_units_direction_name[i].output_unit; i++)
+ for (i = 0; special_units_direction_names[i].output_unit; i++)
{
- global_units_direction_names[global_units_direction_idx].direction
- = special_units_direction_name[i].direction;
- global_units_direction_names[global_units_direction_idx].output_unit
- = special_units_direction_name[i].output_unit;
+ global_units_directions_list[global_units_direction_idx].direction
+ = special_units_direction_names[i].direction;
+ global_units_directions_list[global_units_direction_idx].output_unit
+ = special_units_direction_names[i].output_unit;
global_units_direction_idx++;
}
- qsort (global_units_direction_names,
+ qsort (global_units_directions_list,
global_directions_nr,
sizeof (SPECIAL_UNIT_DIRECTION), compare_global_units_direction_name);
- self->global_units_direction_name.list = global_units_direction_names;
- self->global_units_direction_name.number = global_directions_nr;
+ self->global_units_direction_names.list = global_units_directions_list;
+ self->global_units_direction_names.number = global_directions_nr;
}
static char *
diff --git a/tp/Texinfo/XS/main/build_perl_info.c
b/tp/Texinfo/XS/main/build_perl_info.c
index cabb931c68..794c1ed0d0 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -2947,17 +2947,17 @@ html_build_direction_icons (const CONVERTER *converter,
if (!direction_icons)
return newSV (0);
- if (!converter || !converter->direction_unit_direction_name)
+ if (!converter || !converter->main_units_direction_names)
return newSV (0);
icons_hv = newHV ();
- for (i = 0; converter->direction_unit_direction_name[i]; i++)
+ for (i = 0; converter->main_units_direction_names[i]; i++)
{
if (direction_icons->list[i])
{
const char *direction_name
- = converter->direction_unit_direction_name[i];
+ = converter->main_units_direction_names[i];
hv_store (icons_hv, direction_name, strlen (direction_name),
newSVpv_utf8 (direction_icons->list[i], 0), 0);
}
diff --git a/tp/Texinfo/XS/main/converter_types.h
b/tp/Texinfo/XS/main/converter_types.h
index 54cc67191d..6421d4abf4 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -881,16 +881,16 @@ typedef struct CONVERTER {
/* set for a converter, modified in a document */
HTML_NO_ARG_COMMAND_CONVERSION
html_no_arg_command_conversion[BUILTIN_CMD_NUMBER][NO_ARG_COMMAND_CONTEXT_NR];
char ***directions_strings[TDS_TYPE_MAX_NR];
- const char **direction_unit_direction_name;
+ const char **main_units_direction_names;
/* set for a document */
size_t output_units_descriptors[OUDT_external_nodes_units+1];
enum htmlxref_split_type document_htmlxref_split_type;
const OUTPUT_UNIT **global_units_directions;
- SPECIAL_UNIT_DIRECTION *special_units_direction_name;
+ SPECIAL_UNIT_DIRECTION *special_units_direction_names;
/* both for global units associated to normal output units and
for special output units, sorted according to direction name */
- SPECIAL_UNIT_DIRECTION_LIST global_units_direction_name;
+ SPECIAL_UNIT_DIRECTION_LIST global_units_direction_names;
ELEMENT **special_unit_info_tree[SUIT_type_heading+1];
SORTED_INDEX_NAMES sorted_index_names;
void *registered_ids_c_hashmap;
diff --git a/tp/Texinfo/XS/main/get_perl_info.c
b/tp/Texinfo/XS/main/get_perl_info.c
index a35d72b1e2..03f985f9a7 100644
--- a/tp/Texinfo/XS/main/get_perl_info.c
+++ b/tp/Texinfo/XS/main/get_perl_info.c
@@ -857,7 +857,7 @@ html_fill_direction_icons (const CONVERTER *converter,
if (direction_icons->number == 0)
{
- /* consistent with direction_unit_direction_name size */
+ /* consistent with main_units_direction_names size */
direction_icons->number = converter->special_unit_varieties.number
+ NON_SPECIAL_DIRECTIONS_NR;
direction_icons->list = (char **) malloc
@@ -866,10 +866,10 @@ html_fill_direction_icons (const CONVERTER *converter,
icons_hv = (HV *)SvRV ((SV *)direction_icons->sv);
- for (i = 0; converter->direction_unit_direction_name[i]; i++)
+ for (i = 0; converter->main_units_direction_names[i]; i++)
{
const char *direction_name
- = converter->direction_unit_direction_name[i];
+ = converter->main_units_direction_names[i];
SV **direction_icon_sv = hv_fetch (icons_hv, direction_name,
strlen (direction_name), 0);
if (direction_icon_sv && SvOK (*direction_icon_sv))
@@ -901,7 +901,7 @@ html_get_direction_icons_sv (const CONVERTER *converter,
SvREFCNT_inc ((SV *) icons_sv);
direction_icons->sv = icons_sv;
- if (!converter || !converter->direction_unit_direction_name)
+ if (!converter || !converter->main_units_direction_names)
return;
html_fill_direction_icons (converter, direction_icons);
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index bd04393994..f0d5ca1b81 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -2058,11 +2058,11 @@ int
html_get_direction_index (const CONVERTER *converter, const char *direction)
{
int i;
- if (converter && converter->direction_unit_direction_name)
+ if (converter && converter->main_units_direction_names)
{
- for (i = 0; converter->direction_unit_direction_name[i]; i++)
+ for (i = 0; converter->main_units_direction_names[i]; i++)
{
- if (!strcmp (direction, converter->direction_unit_direction_name[i]))
+ if (!strcmp (direction, converter->main_units_direction_names[i]))
return i;
}
return -2;
@@ -2077,8 +2077,8 @@ direction_unit_direction_name (int direction, const
CONVERTER *converter)
return 0;
else if (direction < NON_SPECIAL_DIRECTIONS_NR)
return html_button_direction_names[direction];
- else if (converter && converter->direction_unit_direction_name)
- return converter->direction_unit_direction_name[direction];
+ else if (converter && converter->main_units_direction_names)
+ return converter->main_units_direction_names[direction];
else
return 0;
}