texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/Text.pm (copy_options_for_co


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/Text.pm (copy_options_for_convert_text), tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/Info.pm, tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoXML.pm, tp/Texinfo/Convert/Text.pm, tp/Texinfo/Convert/TextContent.pm, tp/Texinfo/Structuring.pm, tp/init/chm.pm, tp/init/highlight_syntax.pm: move copy_options_for_convert_text() from Texinfo::Common to Tex [...]
Date: Sun, 05 Sep 2021 16:07:21 -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 df4bae0  * tp/Texinfo/Convert/Text.pm (copy_options_for_convert_text), 
tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm, 
tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/IXIN.pm, 
tp/Texinfo/Convert/Info.pm, tp/Texinfo/Convert/LaTeX.pm, 
tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoXML.pm, 
tp/Texinfo/Convert/Text.pm, tp/Texinfo/Convert/TextContent.pm, 
tp/Texinfo/Structuring.pm, tp/init/chm.pm, tp/init/highlight_syntax.pm: move 
copy_options_for_convert_text() from Tex [...]
df4bae0 is described below

commit df4bae07f265f81e35c61ebf03ff53974e0e7ae8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Sep 5 22:07:12 2021 +0200

    * tp/Texinfo/Convert/Text.pm (copy_options_for_convert_text),
    tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm,
    tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/IXIN.pm,
    tp/Texinfo/Convert/Info.pm, tp/Texinfo/Convert/LaTeX.pm,
    tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoXML.pm,
    tp/Texinfo/Convert/Text.pm, tp/Texinfo/Convert/TextContent.pm,
    tp/Texinfo/Structuring.pm, tp/init/chm.pm,
    tp/init/highlight_syntax.pm: move copy_options_for_convert_text()
    from Texinfo::Common to Texinfo::Convert::Text.
---
 ChangeLog                         | 12 ++++++++++++
 tp/Texinfo/Common.pm              | 23 -----------------------
 tp/Texinfo/Convert/DocBook.pm     | 29 +++++++++++++++--------------
 tp/Texinfo/Convert/HTML.pm        | 12 ++++++------
 tp/Texinfo/Convert/IXIN.pm        |  4 ++--
 tp/Texinfo/Convert/Info.pm        |  8 +++++---
 tp/Texinfo/Convert/LaTeX.pm       | 16 ++++++++--------
 tp/Texinfo/Convert/Plaintext.pm   |  2 +-
 tp/Texinfo/Convert/TexinfoXML.pm  |  6 +++---
 tp/Texinfo/Convert/Text.pm        | 25 ++++++++++++++++++++++++-
 tp/Texinfo/Convert/TextContent.pm |  2 +-
 tp/Texinfo/Structuring.pm         |  3 ++-
 tp/init/chm.pm                    |  2 +-
 tp/init/highlight_syntax.pm       |  2 +-
 14 files changed, 81 insertions(+), 65 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b5d8a0a..84e63e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2021-09-05  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Convert/Text.pm (copy_options_for_convert_text),
+       tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm,
+       tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/IXIN.pm,
+       tp/Texinfo/Convert/Info.pm, tp/Texinfo/Convert/LaTeX.pm,
+       tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoXML.pm,
+       tp/Texinfo/Convert/Text.pm, tp/Texinfo/Convert/TextContent.pm,
+       tp/Texinfo/Structuring.pm, tp/init/chm.pm,
+       tp/init/highlight_syntax.pm: move copy_options_for_convert_text()
+       from Texinfo::Common to Texinfo::Convert::Text.
+
+2021-09-05  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Common.pm (%index_names), tp/t/test_utils.pl (test):
        complete the %index_names structure to have the 'contained_indices'
        field and use it as a reference in tests for the default index
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 3b31528..fd57d42 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1557,29 +1557,6 @@ sub normalize_top_node_name($)
   return $node;
 }
 
-# $SELF is typically a converter object.
-# Setup options as used by Texinfo::Convert::Text::convert_to_text
-# based on the converter informations.
-sub copy_options_for_convert_text($)
-{
-  my $self = shift;
-  my %options;
-  if ($self->get_conf('ENABLE_ENCODING')
-      and $self->get_conf('OUTPUT_ENCODING_NAME')) {
-    $options{'enabled_encoding'} = $self->get_conf('OUTPUT_ENCODING_NAME');
-  }
-  $options{'TEST'} = 1 if ($self->get_conf('TEST'));
-  $options{'NUMBER_SECTIONS'} = $self->get_conf('NUMBER_SECTIONS');
-  $options{'converter'} = $self;
-  $options{'expanded_formats_hash'} = $self->{'expanded_formats_hash'};
-  # for locate_include_file
-  $options{'INCLUDE_DIRECTORIES'} = $self->get_conf('INCLUDE_DIRECTORIES');
-  # for error registering
-  $options{'DEBUG'} = $self->get_conf('DEBUG');
-  $options{'PROGRAM'} = $self->get_conf('PROGRAM');
-  return %options;
-}
-
 # Used in count_bytes
 my $Encode_encoding_object;
 my $last_encoding;
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 6ad798a..e29cf37 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -845,7 +845,7 @@ sub _convert($$;$)
                 
$self->xml_protect_text(Texinfo::Convert::Text::convert_to_text(
                   {'contents' => $root->{'args'}->[-1]->{'contents'}},
                   {'code' => 1,
-                   Texinfo::Common::copy_options_for_convert_text($self)}));
+                   
Texinfo::Convert::Text::copy_options_for_convert_text($self)}));
             }
             my $node;
             if (defined($root->{'args'}->[0]) and 
@{$root->{'args'}->[0]->{'contents'}}) {
@@ -982,7 +982,8 @@ sub _convert($$;$)
             and @{$root->{'args'}->[0]->{'contents'}}) {
           my $basefile = Texinfo::Convert::Text::convert_to_text(
            {'contents' => $root->{'args'}->[0]->{'contents'}},
-           {'code' => 1, 
Texinfo::Common::copy_options_for_convert_text($self)});
+           {'code' => 1,
+            Texinfo::Convert::Text::copy_options_for_convert_text($self)});
           my $element;
           my $is_inline = $self->_is_inline($root);
           if ($is_inline) {
@@ -1037,9 +1038,9 @@ sub _convert($$;$)
             $email = $root->{'args'}->[0]->{'contents'};
             $email_text
               = $self->_protect_text(Texinfo::Convert::Text::convert_to_text(
-                      {'contents' => $email},
-                      {'code' => 1,
-                       
Texinfo::Common::copy_options_for_convert_text($self)}));
+                 {'contents' => $email},
+                 {'code' => 1,
+                  
Texinfo::Convert::Text::copy_options_for_convert_text($self)}));
           }
           if ($name and $email) {
             return "<ulink url=\"mailto:$email_text\";>"
@@ -1060,10 +1061,10 @@ sub _convert($$;$)
               and @{$root->{'args'}->[0]->{'contents'}}) {
             $url_content = $root->{'args'}->[0]->{'contents'};
             $url_text = $self->_protect_text(
-                Texinfo::Convert::Text::convert_to_text(
-                      {'contents' => $url_content},
-                      {'code' => 1,
-                       
Texinfo::Common::copy_options_for_convert_text($self)}));
+              Texinfo::Convert::Text::convert_to_text(
+                {'contents' => $url_content},
+                {'code' => 1,
+                 
Texinfo::Convert::Text::copy_options_for_convert_text($self)}));
           } else {
             $url_text = '';
           }
@@ -1235,8 +1236,8 @@ sub _convert($$;$)
             $multiply = 1;
             foreach my $prototype (@{$root->{'extra'}->{'prototypes'}}) {
               my $prototype_text
-                = Texinfo::Convert::Text::convert_to_text($prototype,
-                     {Texinfo::Common::copy_options_for_convert_text($self)});
+               = Texinfo::Convert::Text::convert_to_text($prototype,
+                  
{Texinfo::Convert::Text::copy_options_for_convert_text($self)});
               push @fractions,
                 Texinfo::Convert::Unicode::string_width($prototype_text);
             }
@@ -1278,9 +1279,9 @@ sub _convert($$;$)
               and $root->{'args'}->[0]->{'contents'}
               and @{$root->{'args'}->[0]->{'contents'}}) {
             my $quotation_arg_text
-                = Texinfo::Convert::Text::convert_to_text(
-                   $root->{'args'}->[0],
-                   {Texinfo::Common::copy_options_for_convert_text($self)});
+              = Texinfo::Convert::Text::convert_to_text(
+                 $root->{'args'}->[0],
+                 
{Texinfo::Convert::Text::copy_options_for_convert_text($self)});
             if ($docbook_special_quotations{lc($quotation_arg_text)}) {
               $element = lc($quotation_arg_text);
             } else {
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index cb85d73..c51a46a 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -4347,7 +4347,7 @@ sub _convert_def_line_type($$$$)
 
   if ($self->in_string()) {
     return $self->protect_text(Texinfo::Convert::Text::convert_to_text(
-       $command, Texinfo::Common::copy_options_for_convert_text($self)));
+       $command, 
Texinfo::Convert::Text::copy_options_for_convert_text($self)));
   }
 
   my $index_label = '';
@@ -6216,7 +6216,7 @@ sub _external_node_href($$$$)
     my $manual_name = Texinfo::Convert::Text::convert_to_text(
        {'contents' => $external_node->{'manual_content'}}, 
        { 'code' => 1, 
-         Texinfo::Common::copy_options_for_convert_text($self)});
+         Texinfo::Convert::Text::copy_options_for_convert_text($self)});
     my $manual_base = $manual_name;
     $manual_base =~ s/\.info*$//;
     $manual_base =~ s/^.*\///;
@@ -7241,7 +7241,7 @@ sub output_internal_links($)
         my $tree = $self->command_text($command, 'tree');
         if ($tree) {
           $text = Texinfo::Convert::Text::convert_to_text($tree, 
-                    {Texinfo::Common::copy_options_for_convert_text($self)});
+               {Texinfo::Convert::Text::copy_options_for_convert_text($self)});
         }
       }
       if (defined($href) or defined($text)) {
@@ -7253,7 +7253,7 @@ sub output_internal_links($)
     }
   }
   if ($self->{'parser'}) {
-    my %options = Texinfo::Common::copy_options_for_convert_text($self);
+    my %options = Texinfo::Convert::Text::copy_options_for_convert_text($self);
     foreach my $index_name (sort(keys 
(%{$self->{'index_entries_by_letter'}}))) {
       foreach my $letter_entry 
(@{$self->{'index_entries_by_letter'}->{$index_name}}) {
         foreach my $index_entry (@{$letter_entry->{'entries'}}) {
@@ -7464,7 +7464,7 @@ sub output($$)
   if ($self->{'extra'}->{'copying'}) {
     my $copying_comment = Texinfo::Convert::Text::convert_to_text(
      {'contents' => $self->{'extra'}->{'copying'}->{'contents'}}, 
-     {Texinfo::Common::copy_options_for_convert_text($self)});
+     {Texinfo::Convert::Text::copy_options_for_convert_text($self)});
     if ($copying_comment ne '') {
       $self->{'copying_comment'} = &{$self->{'format_comment'}}($self, 
$copying_comment);
     }
@@ -8042,7 +8042,7 @@ sub _convert($$;$)
               } elsif ($arg_type eq 'monospacetext') {
                 $arg_formatted->{$arg_type} 
                   = Texinfo::Convert::Text::convert_to_text($arg, {'code' => 1,
-                            
Texinfo::Common::copy_options_for_convert_text($self)});
+                     
Texinfo::Convert::Text::copy_options_for_convert_text($self)});
               } elsif ($arg_type eq 'raw') {
                 $self->{'document_context'}->[-1]->{'raw'}++;
                 $arg_formatted->{$arg_type} = $self->_convert($arg, 
$explanation);
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index 026ebb5..9e4683a 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -828,13 +828,13 @@ sub output_ixin($$)
             and @{$command->{'args'}->[0]->{'contents'}}) {
         $basefile = Texinfo::Convert::Text::convert_to_text(
           {'contents' => $command->{'args'}->[0]->{'contents'}},
-          {'code' => 1, 
Texinfo::Common::copy_options_for_convert_text($self)});
+          {'code' => 1, 
Texinfo::Convert::Text::copy_options_for_convert_text($self)});
       }
       if (defined($command->{'args'}->[4])
             and @{$command->{'args'}->[4]->{'contents'}}) {
         $extension = Texinfo::Convert::Text::convert_to_text(
           {'contents' => $command->{'args'}->[4]->{'contents'}},
-          {'code' => 1, 
Texinfo::Common::copy_options_for_convert_text($self)});
+          {'code' => 1, 
Texinfo::Convert::Text::copy_options_for_convert_text($self)});
         $extension =~ s/^\.//;
         @extension = ($extension);
       }
diff --git a/tp/Texinfo/Convert/Info.pm b/tp/Texinfo/Convert/Info.pm
index 43f8299..4fe17b2 100644
--- a/tp/Texinfo/Convert/Info.pm
+++ b/tp/Texinfo/Convert/Info.pm
@@ -487,12 +487,14 @@ sub _image($$)
       and @{$root->{'args'}->[0]->{'contents'}}) {
     my $basefile = Texinfo::Convert::Text::convert_to_text(
       {'contents' => $root->{'args'}->[0]->{'contents'}},
-      {'code' => 1, Texinfo::Common::copy_options_for_convert_text($self)});
+      {'code' => 1,
+       Texinfo::Convert::Text::copy_options_for_convert_text($self)});
     if (defined($root->{'args'}->[4])
         and @{$root->{'args'}->[4]->{'contents'}}) {
       my $extension = Texinfo::Convert::Text::convert_to_text(
         {'contents' => $root->{'args'}->[4]->{'contents'}},
-        {'code' => 1, Texinfo::Common::copy_options_for_convert_text($self)});
+        {'code' => 1,
+         Texinfo::Convert::Text::copy_options_for_convert_text($self)});
       unshift @extensions, ".$extension";
       unshift @extensions, "$extension";
     }
@@ -511,7 +513,7 @@ sub _image($$)
         and @{$root->{'args'}->[3]->{'contents'}}) {
      $alt = Texinfo::Convert::Text::convert_to_text(
        {'contents' => $root->{'args'}->[3]->{'contents'}},
-       {Texinfo::Common::copy_options_for_convert_text($self)});
+       {Texinfo::Convert::Text::copy_options_for_convert_text($self)});
     }
 
     my $result;
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 4a89291..aa1bb66 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -694,7 +694,7 @@ sub converter_initialize($)
 
   %{$self->{'quotes_map'}} = %quotes_map;
   $self->{'convert_text_options'} 
-      = {Texinfo::Common::copy_options_for_convert_text($self)};
+      = {Texinfo::Convert::Text::copy_options_for_convert_text($self)};
 
   # this condition means that there is no way to turn off
   # @U expansion to utf-8 characters even though this
@@ -1993,9 +1993,9 @@ sub _convert($$)
           $email = $root->{'args'}->[0]->{'contents'};
           $email_text 
             = $self->_protect_url(Texinfo::Convert::Text::convert_to_text(
-                       {'contents' => $email},
-                       {'code' => 1,
-                        
Texinfo::Common::copy_options_for_convert_text($self)}));
+                {'contents' => $email},
+                {'code' => 1,
+                 
Texinfo::Convert::Text::copy_options_for_convert_text($self)}));
         }
         if ($name and $email) {
           $result .= "\\href{mailto:$email_text}{$converted_name}";;
@@ -2016,10 +2016,10 @@ sub _convert($$)
         } elsif (@{$root->{'args'}->[0]->{'contents'}}) {
           my $url_content = $root->{'args'}->[0]->{'contents'};
           my $url_text = $self->_protect_url(
-               Texinfo::Convert::Text::convert_to_text(
-                   {'contents' => $url_content},
-                   {'code' => 1,
-                    Texinfo::Common::copy_options_for_convert_text($self)}));
+            Texinfo::Convert::Text::convert_to_text(
+               {'contents' => $url_content},
+               {'code' => 1,
+                
Texinfo::Convert::Text::copy_options_for_convert_text($self)}));
           if (scalar(@{$root->{'args'}}) == 2
              and defined($root->{'args'}->[1])
              and @{$root->{'args'}->[1]->{'contents'}}) {
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index d56d393..3f69e19 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -396,7 +396,7 @@ sub converter_initialize($)
 
   %{$self->{'style_map'}} = %style_map;
   $self->{'convert_text_options'} 
-      = {Texinfo::Common::copy_options_for_convert_text($self)};
+      = {Texinfo::Convert::Text::copy_options_for_convert_text($self)};
 
   if ($self->get_conf('ENABLE_ENCODING') and 
$self->get_conf('OUTPUT_ENCODING_NAME')
       and $self->get_conf('OUTPUT_ENCODING_NAME') eq 'utf-8') {
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 926f832..c2dc6f2 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -1232,15 +1232,15 @@ sub _convert($$;$)
               and @{$root->{'args'}->[$manual_arg_index]->{'contents'}}) {
             $manual = Texinfo::Convert::Text::convert_to_text({'contents'
                      => $root->{'args'}->[$manual_arg_index]->{'contents'}},
-                      {'code' => 1,
-                       Texinfo::Common::copy_options_for_convert_text($self)});
+                 {'code' => 1,
+                  
Texinfo::Convert::Text::copy_options_for_convert_text($self)});
           }
           if (!defined($manual) and $root->{'extra'}->{'node_argument'}
               and $root->{'extra'}->{'node_argument'}->{'manual_content'}) {
             $manual = Texinfo::Convert::Text::convert_to_text({'contents' 
                    => $root->{'extra'}->{'node_argument'}->{'manual_content'}},
                  {'code' => 1,
-                  Texinfo::Common::copy_options_for_convert_text($self)});
+                  
Texinfo::Convert::Text::copy_options_for_convert_text($self)});
           }
           if (defined($manual)) {
             my $manual_base = $manual;
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index f6159aa..67929b3 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -319,6 +319,29 @@ sub heading($$$;$$)
   return $result;
 }
 
+# $SELF is typically a converter object.
+# Setup options as used by Texinfo::Convert::Text::convert_to_text
+# based on the converter informations.
+sub copy_options_for_convert_text($)
+{
+  my $self = shift;
+  my %options;
+  if ($self->get_conf('ENABLE_ENCODING')
+      and $self->get_conf('OUTPUT_ENCODING_NAME')) {
+    $options{'enabled_encoding'} = $self->get_conf('OUTPUT_ENCODING_NAME');
+  }
+  $options{'TEST'} = 1 if ($self->get_conf('TEST'));
+  $options{'NUMBER_SECTIONS'} = $self->get_conf('NUMBER_SECTIONS');
+  $options{'converter'} = $self;
+  $options{'expanded_formats_hash'} = $self->{'expanded_formats_hash'};
+  # for locate_include_file
+  $options{'INCLUDE_DIRECTORIES'} = $self->get_conf('INCLUDE_DIRECTORIES');
+  # for error registering
+  $options{'DEBUG'} = $self->get_conf('DEBUG');
+  $options{'PROGRAM'} = $self->get_conf('PROGRAM');
+  return %options;
+}
+
 sub convert_to_text($;$)
 {
   my $root = shift;
@@ -721,7 +744,7 @@ sub output($$)
                              $outfile);
     return undef if (!$fh);
   }
-  my %options = Texinfo::Common::copy_options_for_convert_text($self);
+  my %options = copy_options_for_convert_text($self);
   my $result = _convert($tree, \%options);
   if ($fh) {
     print $fh $result;
diff --git a/tp/Texinfo/Convert/TextContent.pm 
b/tp/Texinfo/Convert/TextContent.pm
index 121732e..35d529f 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -129,7 +129,7 @@ sub _convert($$)
     } elsif 
(defined($Texinfo::Convert::Text::text_brace_no_arg_commands{$root->{'cmdname'}}))
 {
       return Texinfo::Convert::Text::brace_no_arg_command($root, undef);
     } elsif ($Texinfo::Common::accent_commands{$root->{'cmdname'}}) {
-      my %options = Texinfo::Common::copy_options_for_convert_text($self);
+      my %options = 
Texinfo::Convert::Text::copy_options_for_convert_text($self);
       my $result = Texinfo::Convert::Text::text_accents ($root, 
                                         $options{'enabled_encoding'});
       return $result;
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 4c5a616..42f17b3 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1582,7 +1582,8 @@ sub setup_index_entry_keys_formatting($$)
     if defined $self->{'values'}->{'txiindexatsignignore'};
 
   my $options = {'sort_string' => 1,
-   
Texinfo::Common::copy_options_for_convert_text($configuration_informations)};
+   Texinfo::Convert::Text::copy_options_for_convert_text(
+                                    $configuration_informations)};
 
   return $options, $ignore_chars;
 }
diff --git a/tp/init/chm.pm b/tp/init/chm.pm
index a0a7804..186ae5f 100644
--- a/tp/init/chm.pm
+++ b/tp/init/chm.pm
@@ -207,7 +207,7 @@ sub convert_tree ($$;$)
 
   return $converter->protect_text(
     Texinfo::Convert::Text::convert_to_text($tree,
-   {Texinfo::Common::copy_options_for_convert_text($converter),
+   {Texinfo::Convert::Text::copy_options_for_convert_text($converter),
      %$options}));
 }
 
diff --git a/tp/init/highlight_syntax.pm b/tp/init/highlight_syntax.pm
index 7006003..7ef8ddc 100644
--- a/tp/init/highlight_syntax.pm
+++ b/tp/init/highlight_syntax.pm
@@ -191,7 +191,7 @@ sub highlight_process($$)
         pop @{$tree->{'contents'}};
       }
       my $text = Texinfo::Convert::Text::convert_to_text($tree, {'code' => 1,
-                          
Texinfo::Common::copy_options_for_convert_text($self)});
+                  
Texinfo::Convert::Text::copy_options_for_convert_text($self)});
       # make sure that the text ends with a newline
       chomp ($text);
       $text .= "\n";



reply via email to

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