texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/XS/convert/convert_html.c (convert_s


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XS/convert/convert_html.c (convert_style_command) (html_free_converter), tp/Texinfo/XS/convert/get_html_perl_info.c (html_converter_initialize_sv), tp/Texinfo/XS/main/converter_types.h (HTML_STYLE_COMMAND_CONVERSION, CONVERTER): add html_style_command_conversion field to CONVERTER with type HTML_STYLE_COMMAND_CONVERSION for style commands conversion, instead of using the same array as brace no arg commands.
Date: Wed, 02 Oct 2024 06:11:35 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new e25e05a758 * tp/Texinfo/XS/convert/convert_html.c 
(convert_style_command) (html_free_converter), 
tp/Texinfo/XS/convert/get_html_perl_info.c (html_converter_initialize_sv), 
tp/Texinfo/XS/main/converter_types.h (HTML_STYLE_COMMAND_CONVERSION, 
CONVERTER): add html_style_command_conversion field to CONVERTER with type 
HTML_STYLE_COMMAND_CONVERSION for style commands conversion, instead of using 
the same array as brace no arg commands.
e25e05a758 is described below

commit e25e05a75845c8b1cdb9f1beada4bb470cd2b83a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jul 31 10:08:35 2024 +0200

    * tp/Texinfo/XS/convert/convert_html.c (convert_style_command)
    (html_free_converter), tp/Texinfo/XS/convert/get_html_perl_info.c
    (html_converter_initialize_sv), tp/Texinfo/XS/main/converter_types.h
    (HTML_STYLE_COMMAND_CONVERSION, CONVERTER): add
    html_style_command_conversion field to CONVERTER with type
    HTML_STYLE_COMMAND_CONVERSION for style commands conversion, instead of
    using the same array as brace no arg commands.
    
    * tp/Texinfo/XS/convert/build_html_perl_state.c
    (build_no_arg_commands_formatting, build_html_translated_names),
    tp/Texinfo/XS/convert/convert_html.c
    (default_no_arg_commands_formatting, text_element_conversion)
    (convert_no_arg_command, css_string_convert_no_arg_command)
    (html_convert_css_string_for_list_mark)
    (set_no_arg_commands_formatting)
    (reset_unset_no_arg_commands_formatting_context)
    (copy_html_no_arg_command_conversion, html_initialize_output_state)
    (free_html_no_arg_command_conversion, html_free_converter)
    (html_translate_names), tp/Texinfo/XS/convert/get_html_perl_info.c
    (html_converter_initialize_sv, html_conversion_initialization_sv),
    tp/Texinfo/XS/main/converter_types.h (HTML_NO_ARG_COMMAND_CONVERSION):
    (CONVERTER): remove style field from HTML_COMMAND_CONVERSION and
    rename as HTML_NO_ARG_COMMAND_CONVERSION.  Rename
    html_command_conversion converter field as
    html_no_arg_command_conversion now that it contains onlt no args
    commands.  Rename copy_html_command_conversion as
    copy_html_no_arg_command_conversion, rename
    free_html_command_conversion as free_html_no_arg_command_conversion.
---
 ChangeLog                                     | 31 ++++++++++
 tp/Texinfo/XS/convert/build_html_perl_state.c | 10 ++--
 tp/Texinfo/XS/convert/convert_html.c          | 81 ++++++++++++++-------------
 tp/Texinfo/XS/convert/get_html_perl_info.c    | 18 +++---
 tp/Texinfo/XS/main/converter_types.h          | 21 ++++---
 5 files changed, 98 insertions(+), 63 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5804c4d3a6..dfc42fe92d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2024-07-31  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/convert_html.c (convert_style_command)
+       (html_free_converter), tp/Texinfo/XS/convert/get_html_perl_info.c
+       (html_converter_initialize_sv), tp/Texinfo/XS/main/converter_types.h
+       (HTML_STYLE_COMMAND_CONVERSION, CONVERTER): add
+       html_style_command_conversion field to CONVERTER with type
+       HTML_STYLE_COMMAND_CONVERSION for style commands conversion, instead of
+       using the same array as brace no arg commands.
+
+       * tp/Texinfo/XS/convert/build_html_perl_state.c
+       (build_no_arg_commands_formatting, build_html_translated_names),
+       tp/Texinfo/XS/convert/convert_html.c
+       (default_no_arg_commands_formatting, text_element_conversion)
+       (convert_no_arg_command, css_string_convert_no_arg_command)
+       (html_convert_css_string_for_list_mark)
+       (set_no_arg_commands_formatting)
+       (reset_unset_no_arg_commands_formatting_context)
+       (copy_html_no_arg_command_conversion, html_initialize_output_state)
+       (free_html_no_arg_command_conversion, html_free_converter)
+       (html_translate_names), tp/Texinfo/XS/convert/get_html_perl_info.c
+       (html_converter_initialize_sv, html_conversion_initialization_sv),
+       tp/Texinfo/XS/main/converter_types.h (HTML_NO_ARG_COMMAND_CONVERSION):
+       (CONVERTER): remove style field from HTML_COMMAND_CONVERSION and
+       rename as HTML_NO_ARG_COMMAND_CONVERSION.  Rename
+       html_command_conversion converter field as
+       html_no_arg_command_conversion now that it contains onlt no args
+       commands.  Rename copy_html_command_conversion as
+       copy_html_no_arg_command_conversion, rename
+       free_html_command_conversion as free_html_no_arg_command_conversion.
+
 2024-07-31  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Config.pm (texinfo_register_style_command_formatting):
diff --git a/tp/Texinfo/XS/convert/build_html_perl_state.c 
b/tp/Texinfo/XS/convert/build_html_perl_state.c
index 03b6dc7a3e..a5af96854d 100644
--- a/tp/Texinfo/XS/convert/build_html_perl_state.c
+++ b/tp/Texinfo/XS/convert/build_html_perl_state.c
@@ -112,8 +112,8 @@ build_no_arg_commands_formatting (const CONVERTER 
*converter)
 
       for (cctx = 0; cctx < HCC_type_css_string+1; cctx++)
         {
-          const HTML_COMMAND_CONVERSION *no_arg_format
-            = &converter->html_command_conversion[cmd][cctx];
+          const HTML_NO_ARG_COMMAND_CONVERSION *no_arg_format
+            = &converter->html_no_arg_command_conversion[cmd][cctx];
           const char *context_name = html_conversion_context_type_names[cctx];
 
           HV *spec_hv = newHV ();
@@ -619,8 +619,6 @@ build_html_translated_names (HV *hv, CONVERTER *converter)
           int k;
           enum command_id cmd
             = converter->no_arg_formatted_cmd_translated.list[j];
-          HTML_COMMAND_CONVERSION *conversion_contexts
-                = converter->html_command_conversion[cmd];
           const char *cmdname = builtin_command_data[cmd].cmdname;
           SV **no_arg_command_sv
              = hv_fetch (no_arg_commands_formatting_hv,
@@ -628,8 +626,8 @@ build_html_translated_names (HV *hv, CONVERTER *converter)
           HV *no_arg_command_hv = (HV *) SvRV (*no_arg_command_sv);
           for (k = 0; k < max_context; k++)
             {
-              HTML_COMMAND_CONVERSION *no_arg_cmd_context
-                  = &conversion_contexts[k];
+              HTML_NO_ARG_COMMAND_CONVERSION *no_arg_cmd_context
+                  = &converter->html_no_arg_command_conversion[cmd][k];
 
               const char *context_name = html_conversion_context_type_names[k];
               SV **context_sv = hv_fetch (no_arg_command_hv,
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index de53b43161..30c2178322 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -200,7 +200,7 @@ CMD_VARIETY command_special_unit_variety[] = {
                                 {0, 0},
 };
 
-static HTML_COMMAND_CONVERSION 
default_no_arg_commands_formatting[BUILTIN_CMD_NUMBER][HCC_type_css_string+1];
+static HTML_NO_ARG_COMMAND_CONVERSION 
default_no_arg_commands_formatting[BUILTIN_CMD_NUMBER][HCC_type_css_string+1];
 
 /* used to set flags to non-zero with a flag that does nothing */
 #define F_AFT_none              0x0001
@@ -9000,7 +9000,7 @@ html_prepare_node_redirection_page (CONVERTER *self, 
const ELEMENT *element,
 
 static void
 text_element_conversion (CONVERTER *self,
-                         const HTML_COMMAND_CONVERSION *specification,
+                         const HTML_NO_ARG_COMMAND_CONVERSION *specification,
                          const enum command_id cmd,
                          TEXT *result)
 {
@@ -9036,7 +9036,7 @@ convert_no_arg_command (CONVERTER *self, const enum 
command_id cmd,
 {
   enum command_id formatted_cmd = cmd;
   enum conversion_context context;
-  const HTML_COMMAND_CONVERSION *specification;
+  const HTML_NO_ARG_COMMAND_CONVERSION *specification;
 
   if (html_in_preformatted_context (self) || html_in_math (self))
     context = HCC_type_preformatted;
@@ -9056,8 +9056,8 @@ convert_no_arg_command (CONVERTER *self, const enum 
command_id cmd,
         }
       if (click_cmd)
         {
-          const HTML_COMMAND_CONVERSION *conv_context
-            = self->html_command_conversion[click_cmd];
+          const HTML_NO_ARG_COMMAND_CONVERSION *conv_context
+            = self->html_no_arg_command_conversion[click_cmd];
           if (conv_context[context].text || conv_context[context].element)
             {
               formatted_cmd = click_cmd;
@@ -9072,7 +9072,7 @@ convert_no_arg_command (CONVERTER *self, const enum 
command_id cmd,
     }
 
   specification
-    = &self->html_command_conversion[formatted_cmd][context];
+    = &self->html_no_arg_command_conversion[formatted_cmd][context];
 
   text_element_conversion (self, specification, formatted_cmd, result);
 }
@@ -9107,7 +9107,8 @@ css_string_convert_no_arg_command (CONVERTER *self,
     }
 
   text_append (result,
-    self->html_command_conversion[formatted_cmd][HCC_type_css_string].text);
+    self->html_no_arg_command_conversion[formatted_cmd]
+                                            [HCC_type_css_string].text);
 }
 
 void
@@ -9133,7 +9134,7 @@ convert_style_command (CONVERTER *self, const enum 
command_id cmd,
                     const char *content, TEXT *result)
 {
   enum command_id style_cmd = cmd;
-  const HTML_COMMAND_CONVERSION *formatting_spec;
+  const HTML_STYLE_COMMAND_CONVERSION *formatting_spec;
 
   /* happens with bogus @-commands without argument, like @strong something */
   if (!args_formatted || args_formatted->number <= 0
@@ -9155,10 +9156,10 @@ convert_style_command (CONVERTER *self, const enum 
command_id cmd,
 
   if (html_in_preformatted_context (self))
     formatting_spec
-      = &self->html_command_conversion[style_cmd][HCC_type_preformatted];
+      = &self->html_style_command_conversion[style_cmd][HCC_type_preformatted];
   else
     formatting_spec
-      = &self->html_command_conversion[style_cmd][HCC_type_normal];
+      = &self->html_style_command_conversion[style_cmd][HCC_type_normal];
 
   if (formatting_spec->element)
     {
@@ -12122,8 +12123,8 @@ html_convert_css_string_for_list_mark (CONVERTER *self, 
const ELEMENT *element,
     {
       enum command_id cmd = special_list_mark_css_string_no_arg_command[i].cmd;
       special_list_mark_css_string_no_arg_command[i].saved
-        = self->html_command_conversion[cmd][HCC_type_css_string].text;
-      self->html_command_conversion[cmd][HCC_type_css_string].text
+        = self->html_no_arg_command_conversion[cmd][HCC_type_css_string].text;
+      self->html_no_arg_command_conversion[cmd][HCC_type_css_string].text
         = special_list_mark_css_string_no_arg_command[i].string;
     }
 
@@ -12132,7 +12133,7 @@ html_convert_css_string_for_list_mark (CONVERTER *self, 
const ELEMENT *element,
   for (i = 0; special_list_mark_css_string_no_arg_command[i].cmd > 0; i++)
     {
       enum command_id cmd = special_list_mark_css_string_no_arg_command[i].cmd;
-      self->html_command_conversion[cmd][HCC_type_css_string].text
+      self->html_no_arg_command_conversion[cmd][HCC_type_css_string].text
         = special_list_mark_css_string_no_arg_command[i].saved;
       special_list_mark_css_string_no_arg_command[i].saved = 0;
     }
@@ -16817,7 +16818,8 @@ get_special_list_mark_css_string_no_arg_command (enum 
command_id cmd)
 }
 
 static void
-set_no_arg_commands_formatting (HTML_COMMAND_CONVERSION *spec, char *text)
+set_no_arg_commands_formatting (HTML_NO_ARG_COMMAND_CONVERSION *spec,
+                                char *text)
 {
   spec->text = text;
   spec->unset = 0;
@@ -17988,15 +17990,15 @@ reset_unset_no_arg_commands_formatting_context 
(CONVERTER *self,
                enum command_id cmd, enum conversion_context reset_context,
                enum conversion_context ref_context, int translate)
 {
-  HTML_COMMAND_CONVERSION *no_arg_command_context;
-  HTML_COMMAND_CONVERSION *conversion_contexts
-    = self->html_command_conversion[cmd];
+  HTML_NO_ARG_COMMAND_CONVERSION *no_arg_command_context;
+  HTML_NO_ARG_COMMAND_CONVERSION *conversion_contexts
+    = self->html_no_arg_command_conversion[cmd];
   no_arg_command_context = &conversion_contexts[reset_context];
   if (ref_context >= 0)
     {
       if (no_arg_command_context->unset)
         {
-          HTML_COMMAND_CONVERSION *no_arg_ref
+          HTML_NO_ARG_COMMAND_CONVERSION *no_arg_ref
             = &conversion_contexts[ref_context];
 
           if (no_arg_ref->text)
@@ -18153,12 +18155,11 @@ close_lone_conf_element (OPTION *option)
 }
 
 static void
-copy_html_command_conversion (HTML_COMMAND_CONVERSION *to,
-                              HTML_COMMAND_CONVERSION *from)
+copy_html_no_arg_command_conversion (HTML_NO_ARG_COMMAND_CONVERSION *to,
+                                     HTML_NO_ARG_COMMAND_CONVERSION *from)
 {
   if (from->element)
     to->element = strdup (from->element);
-  to->quote = from->quote;
   to->unset = from->unset;
   if (from->text)
     to->text = strdup (from->text);
@@ -18196,7 +18197,7 @@ html_initialize_output_state (CONVERTER *self, const 
char *context)
 
   /* corresponds with default_no_arg_commands_formatting
      + conf_default_no_arg_commands_formatting_normal in Perl */
-  HTML_COMMAND_CONVERSION
+  HTML_NO_ARG_COMMAND_CONVERSION
    
output_no_arg_commands_formatting[BUILTIN_CMD_NUMBER][HCC_type_css_string+1];
 
   output_encoding = self->conf->OUTPUT_ENCODING_NAME.o.string;
@@ -18314,13 +18315,14 @@ html_initialize_output_state (CONVERTER *self, const 
char *context)
       enum conversion_context cctx;
       for (cctx = 0; cctx < HCC_type_css_string+1; cctx++)
         {
-          HTML_COMMAND_CONVERSION *customized_no_arg_cmd
+          HTML_NO_ARG_COMMAND_CONVERSION *customized_no_arg_cmd
             = self->customized_no_arg_commands_formatting[cmd][cctx];
-          HTML_COMMAND_CONVERSION *result
-            = &self->html_command_conversion[cmd][cctx];
+          HTML_NO_ARG_COMMAND_CONVERSION *result
+            = &self->html_no_arg_command_conversion[cmd][cctx];
           if (customized_no_arg_cmd)
             {
-              copy_html_command_conversion (result, customized_no_arg_cmd);
+              copy_html_no_arg_command_conversion (result,
+                                                   customized_no_arg_cmd);
             }
           else if (!output_no_arg_commands_formatting[cmd][cctx].unset)
             {
@@ -18333,7 +18335,7 @@ html_initialize_output_state (CONVERTER *self, const 
char *context)
                 }
               if (unicode_brace_no_arg_formatting)
                 {
-                  memset (result, 0, sizeof (HTML_COMMAND_CONVERSION));
+                  memset (result, 0, sizeof (HTML_NO_ARG_COMMAND_CONVERSION));
                   result->text
                     = strdup (unicode_brace_no_arg_formatting);
 
@@ -18363,13 +18365,13 @@ html_initialize_output_state (CONVERTER *self, const 
char *context)
                 }
               else
                 {
-                  copy_html_command_conversion (result,
+                  copy_html_no_arg_command_conversion (result,
                      &output_no_arg_commands_formatting[cmd][cctx]);
                 }
             }
           else
             {
-              copy_html_command_conversion (result,
+              copy_html_no_arg_command_conversion (result,
                 &output_no_arg_commands_formatting[cmd][cctx]);
             }
         }
@@ -19426,7 +19428,8 @@ html_check_transfer_state_finalization (CONVERTER *self)
     }
 }
 
-void free_html_command_conversion (HTML_COMMAND_CONVERSION *format_spec,
+void free_html_no_arg_command_conversion (
+                             HTML_NO_ARG_COMMAND_CONVERSION *format_spec,
                                    enum conversion_context cctx)
 {
   if (cctx == HCC_type_normal && format_spec->translated_tree)
@@ -19535,9 +19538,9 @@ html_free_converter (CONVERTER *self)
       enum conversion_context cctx;
       for (cctx = 0; cctx < HCC_type_css_string+1; cctx++)
         {
-          HTML_COMMAND_CONVERSION *format_spec
-                = &self->html_command_conversion[cmd][cctx];
-          free_html_command_conversion (format_spec, cctx);
+          HTML_NO_ARG_COMMAND_CONVERSION *format_spec
+                = &self->html_no_arg_command_conversion[cmd][cctx];
+          free_html_no_arg_command_conversion (format_spec, cctx);
         }
     }
 
@@ -19547,11 +19550,11 @@ html_free_converter (CONVERTER *self)
       enum conversion_context cctx;
       for (cctx = 0; cctx < HCC_type_css_string+1; cctx++)
         {
-          HTML_COMMAND_CONVERSION *format_spec
+          HTML_NO_ARG_COMMAND_CONVERSION *format_spec
             = self->customized_no_arg_commands_formatting[cmd][cctx];
           if (format_spec)
             {
-              free_html_command_conversion (format_spec, cctx);
+              free_html_no_arg_command_conversion (format_spec, cctx);
               free (format_spec);
             }
         }
@@ -19572,8 +19575,8 @@ html_free_converter (CONVERTER *self)
       enum conversion_context cctx;
       for (cctx = 0; cctx < HCC_type_css_string+1; cctx++)
         {
-          HTML_COMMAND_CONVERSION *format_spec
-                = &self->html_command_conversion[cmd][cctx];
+          HTML_STYLE_COMMAND_CONVERSION *format_spec
+                = &self->html_style_command_conversion[cmd][cctx];
           free (format_spec->element);
         }
     }
@@ -19790,8 +19793,8 @@ html_translate_names (CONVERTER *self)
           int add_cmd = 0;
           for (cctx = 0; cctx < HCC_type_css_string+1; cctx++)
             {
-              HTML_COMMAND_CONVERSION *format_spec
-                = &self->html_command_conversion[cmd][cctx];
+              HTML_NO_ARG_COMMAND_CONVERSION *format_spec
+                = &self->html_no_arg_command_conversion[cmd][cctx];
               if (format_spec->translated_converted
                   && !format_spec->unset)
                 {
diff --git a/tp/Texinfo/XS/convert/get_html_perl_info.c 
b/tp/Texinfo/XS/convert/get_html_perl_info.c
index 97577cdf05..b8115b2add 100644
--- a/tp/Texinfo/XS/convert/get_html_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_html_perl_info.c
@@ -837,13 +837,13 @@ html_converter_initialize_sv (SV *converter_sv,
                         {
                           I32 spec_number;
                           I32 s;
-                          HTML_COMMAND_CONVERSION *format_spec;
+                          HTML_STYLE_COMMAND_CONVERSION *format_spec;
 
                           HV *format_spec_hv = (HV *)SvRV (format_spec_sv);
 
                           format_spec
                             = &converter
-                               ->html_command_conversion[cmd][context_idx];
+                             ->html_style_command_conversion[cmd][context_idx];
 
                           spec_number = hv_iterinit (format_spec_hv);
                           for (s = 0; s < spec_number; s++)
@@ -931,14 +931,14 @@ html_converter_initialize_sv (SV *converter_sv,
                         {
                           I32 spec_number;
                           I32 s;
-                          HTML_COMMAND_CONVERSION *format_spec;
+                          HTML_NO_ARG_COMMAND_CONVERSION *format_spec;
 
                           HV *format_spec_hv = (HV *)SvRV (format_spec_sv);
 
-                          format_spec = (HTML_COMMAND_CONVERSION *)
-                            malloc (sizeof (HTML_COMMAND_CONVERSION));
+                          format_spec = (HTML_NO_ARG_COMMAND_CONVERSION *)
+                            malloc (sizeof (HTML_NO_ARG_COMMAND_CONVERSION));
                           memset (format_spec, 0,
-                                  sizeof (HTML_COMMAND_CONVERSION));
+                                  sizeof (HTML_NO_ARG_COMMAND_CONVERSION));
                           converter->customized_no_arg_commands_formatting
                                               [cmd][context_idx] = format_spec;
 
@@ -1275,7 +1275,7 @@ html_conversion_initialization_sv (SV *converter_sv, 
CONVERTER *converter)
 
   converter_hv = (HV *)SvRV (converter_sv);
 
-  /* To get converter->html_command_conversion for no brace at commands
+  /* To get converter->html_no_arg_command_conversion for no brace at commands
      from $self->{'no_arg_commands_formatting'} */
   FETCH(no_arg_commands_formatting)
 
@@ -1337,13 +1337,13 @@ html_conversion_initialization_sv (SV *converter_sv, 
CONVERTER *converter)
                         {
                           I32 spec_number;
                           I32 s;
-                          HTML_COMMAND_CONVERSION *format_spec;
+                          HTML_NO_ARG_COMMAND_CONVERSION *format_spec;
 
                           HV *format_spec_hv = (HV *)SvRV (format_spec_sv);
 
                           format_spec
                             = &converter
-                               ->html_command_conversion[cmd][context_idx];
+                           ->html_no_arg_command_conversion[cmd][context_idx];
 
                           spec_number = hv_iterinit (format_spec_hv);
                           for (s = 0; s < spec_number; s++)
diff --git a/tp/Texinfo/XS/main/converter_types.h 
b/tp/Texinfo/XS/main/converter_types.h
index d43b4acf88..a320acd1b1 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -323,16 +323,19 @@ typedef struct HTML_SHARED_CONVERSION_STATE {
     /* formatted_nodedescriptions */
 } HTML_SHARED_CONVERSION_STATE;
 
-typedef struct HTML_COMMAND_CONVERSION {
+typedef struct HTML_NO_ARG_COMMAND_CONVERSION {
     char *element;
-    int quote; /* for style commands formatting only */
-    /* following is only for no arg command formatting */
     int unset;
     char *text;
     ELEMENT *translated_tree;
     char *translated_converted;
     char *translated_to_convert;
-} HTML_COMMAND_CONVERSION;
+} HTML_NO_ARG_COMMAND_CONVERSION;
+
+typedef struct HTML_STYLE_COMMAND_CONVERSION {
+    char *element;
+    int quote;
+} HTML_STYLE_COMMAND_CONVERSION;
 
 typedef struct HTML_DIRECTION_STRING_TRANSLATED {
     char *to_convert;
@@ -807,13 +810,13 @@ typedef struct CONVERTER {
     HTML_DIRECTION_STRING_TRANSLATED 
*translated_direction_strings[TDS_TRANSLATED_MAX_NR];
     HTML_DIRECTION_STRING_TRANSLATED 
**customized_translated_direction_strings[TDS_TRANSLATED_MAX_NR];
     HTML_STAGE_HANDLER_INFO_LIST html_stage_handlers[HSHT_type_finish +1];
-    HTML_COMMAND_CONVERSION 
*customized_no_arg_commands_formatting[BUILTIN_CMD_NUMBER][HCC_type_css_string+1];
+    HTML_NO_ARG_COMMAND_CONVERSION 
*customized_no_arg_commands_formatting[BUILTIN_CMD_NUMBER][HCC_type_css_string+1];
+    char ***customized_directions_strings[(TDS_TYPE_MAX_NR) - 
(TDS_TRANSLATED_MAX_NR)];
     /* set for a converter, modified in a document */
-    /* for both no args commands and style commands.
-        Only normal and preformatted HCC_type are actually used for
+       /* Only normal and preformatted HCC_type are actually used for
         style commands */
-    HTML_COMMAND_CONVERSION 
html_command_conversion[BUILTIN_CMD_NUMBER][HCC_type_css_string+1];
-    char ***customized_directions_strings[(TDS_TYPE_MAX_NR) - 
(TDS_TRANSLATED_MAX_NR)];
+    HTML_STYLE_COMMAND_CONVERSION 
html_style_command_conversion[BUILTIN_CMD_NUMBER][HCC_type_css_string+1];
+    HTML_NO_ARG_COMMAND_CONVERSION 
html_no_arg_command_conversion[BUILTIN_CMD_NUMBER][HCC_type_css_string+1];
     char ***directions_strings[TDS_TYPE_MAX_NR];
     const char **direction_unit_direction_name;
 



reply via email to

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