texi2html-cvs
[Top][All Lists]
Advanced

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

[Texi2html-cvs] texi2html ChangeLog NEWS T2h_i18n.pm texi2html....


From: Patrice Dumas
Subject: [Texi2html-cvs] texi2html ChangeLog NEWS T2h_i18n.pm texi2html....
Date: Wed, 03 Oct 2007 07:39:35 +0000

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        07/10/03 07:39:34

Modified files:
        .              : ChangeLog NEWS T2h_i18n.pm texi2html.init 
                         texi2html.pl 
        Tests/formatting: formatting.texi 
        Tests/formatting_res: exotic_formatting.html 
                              exotic_formatting.passfirst 
                              exotic_formatting.passtexi 
                              exotic_formatting_2.html 
                              exotic_formatting_3.html 
                              exotic_formatting_4.html 
                              exotic_formatting_5.html 
                              exotic_formatting_abt.html 
                              exotic_formatting_ovr.html 
                              exotic_formatting_toc.html formatting.html 
                              formatting.passfirst formatting.passtexi 
                              formatting_html32.html 
                              formatting_html32.passfirst 
                              formatting_html32.passtexi 
                              fr_formatting.html fr_formatting.passfirst 
                              fr_formatting.passtexi 
                              icons_fr_formatting.html 
                              icons_fr_formatting.passfirst 
                              icons_fr_formatting.passtexi 
                              to_utf8_formatting.html 
                              to_utf8_formatting.passfirst 
                              to_utf8_formatting.passtexi 
                              weird_quotes_formatting.html 
                              weird_quotes_formatting.passfirst 
                              weird_quotes_formatting.passtexi 
        doc            : texi2html.html texi2html.texi 
        examples       : html32.init roff.init 

Log message:
                * texi2html.pl, T2h_i18n.pm: keep the state in the global hash
                and use it in translations.
                * texi2html.pl, texi2html.init, examples/*, doc/*: modify the 
                normal_text function reference API, add an input variable true 
                if in simple text.
                * Tests/formatting/*: test for symbols kept in preformatted and 
                @-commands in @*ref appearing in @example.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.273&r2=1.274
http://cvs.savannah.gnu.org/viewcvs/texi2html/NEWS?cvsroot=texi2html&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/texi2html/T2h_i18n.pm?cvsroot=texi2html&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.188&r2=1.189
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting/formatting.texi?cvsroot=texi2html&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/exotic_formatting.html?cvsroot=texi2html&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/exotic_formatting.passfirst?cvsroot=texi2html&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/exotic_formatting.passtexi?cvsroot=texi2html&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/exotic_formatting_2.html?cvsroot=texi2html&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/exotic_formatting_3.html?cvsroot=texi2html&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/exotic_formatting_4.html?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/exotic_formatting_5.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/exotic_formatting_abt.html?cvsroot=texi2html&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/exotic_formatting_ovr.html?cvsroot=texi2html&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/exotic_formatting_toc.html?cvsroot=texi2html&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/formatting.html?cvsroot=texi2html&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/formatting.passfirst?cvsroot=texi2html&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/formatting.passtexi?cvsroot=texi2html&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/formatting_html32.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/formatting_html32.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/formatting_html32.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/fr_formatting.html?cvsroot=texi2html&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/fr_formatting.passfirst?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/fr_formatting.passtexi?cvsroot=texi2html&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/icons_fr_formatting.html?cvsroot=texi2html&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/icons_fr_formatting.passfirst?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/icons_fr_formatting.passtexi?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/to_utf8_formatting.html?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/to_utf8_formatting.passfirst?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/to_utf8_formatting.passtexi?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/weird_quotes_formatting.html?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/weird_quotes_formatting.passfirst?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/weird_quotes_formatting.passtexi?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.html?cvsroot=texi2html&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.texi?cvsroot=texi2html&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/html32.init?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/roff.init?cvsroot=texi2html&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -b -r1.273 -r1.274
--- ChangeLog   2 Oct 2007 09:17:06 -0000       1.273
+++ ChangeLog   3 Oct 2007 07:39:29 -0000       1.274
@@ -1,5 +1,15 @@
 2007-10-02  Patrice Dumas  <address@hidden>
 
+       * texi2html.pl, T2h_i18n.pm: keep the state in the global hash
+       and use it in translations.
+       * texi2html.pl, texi2html.init, examples/*, doc/*: modify the 
+       normal_text function reference API, add an input variable true 
+       if in simple text.
+       * Tests/formatting/*: test for symbols kept in preformatted and 
+       @-commands in @*ref appearing in @example.
+
+2007-10-02  Patrice Dumas  <address@hidden>
+
        * texi2html.init: remove trailing new line in @html block (report 
        from Graham Percival).
        * Tests/formatting/block_EOL.texi: test for end of lines in raw

Index: NEWS
===================================================================
RCS file: /cvsroot/texi2html/texi2html/NEWS,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- NEWS        2 Oct 2007 09:17:06 -0000       1.66
+++ NEWS        3 Oct 2007 07:39:29 -0000       1.67
@@ -27,6 +27,9 @@
   has been added, that should print the heading navigation of an element.
   Previously it was done in print_section.
 
+* change in the normal_text function reference API, now there is an 
+  input variable true if in simple text.
+
 * BUG FIXES
   ---------
 

Index: T2h_i18n.pm
===================================================================
RCS file: /cvsroot/texi2html/texi2html/T2h_i18n.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- T2h_i18n.pm 30 Sep 2007 12:47:11 -0000      1.20
+++ T2h_i18n.pm 3 Oct 2007 07:39:29 -0000       1.21
@@ -305,11 +305,18 @@
 }
 
 my $error_no_en = 0;
+
+# arguments should already be converted
 sub get_string($;$$)
 {
     my $string = shift;
     my $arguments = shift;
     my $state = shift;
+    if (!defined($state) and defined($Texi2HTML::THISDOC{'state'}))
+    {
+        $state = main::duplicate_state($Texi2HTML::THISDOC{'state'});
+    }
+
     my $T2H_LANGUAGES = $Texi2HTML::Config::LANGUAGES;
     if (! exists($T2H_LANGUAGES->{'en'}))
     {
@@ -367,6 +374,8 @@
                 last;
             }
         }
+        # the arguments are not already there. But the @-commands in the 
+        # strings are substituted.
         $string = main::substitute_line($result, $state);
     }
     # now we substitute the arguments 

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- texi2html.init      2 Oct 2007 09:17:06 -0000       1.122
+++ texi2html.init      3 Oct 2007 07:39:29 -0000       1.123
@@ -12,7 +12,7 @@
 # Afterwards, load the file with command-line 
 # option -init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.122 2007/10/02 09:17:06 pertusus Exp $
+# $Id: texi2html.init,v 1.123 2007/10/03 07:39:29 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -3622,12 +3622,13 @@
 }
 #
 #
-sub t2h_default_normal_text($$$$$)
+sub t2h_default_normal_text($$$$$$)
 {
    my $text = shift;
    my $in_raw_text = shift;
    my $in_preformatted = shift;
    my $in_code = shift;
+   my $in_simple = shift;
    my $style_stack = shift;
    $text = uc($text) if (in_cmd($style_stack, 'sc'));
    $text = &$protect_text($text) unless($in_raw_text);
@@ -3639,9 +3640,11 @@
            $text =~ s/--/\&ndash\;/g;
            $text =~ s/``/\&ldquo\;/g;
            $text =~ s/''/\&rdquo\;/g;
-           # to be like texinfo
-           #$text =~ s/'/\&rsquo\;/g;
-           #$text =~ s/`/\&lsquo\;/g;
+           if (! $in_simple)
+           { # lquot and rquot don't seem to be accepted in title.
+           #    $text =~ s/'/$iso_symbols{"'"}/g if (defined 
($iso_symbols{"'"}));
+           #    $text =~ s/`/$iso_symbols{'`'}/g if (defined 
($iso_symbols{'`'}));
+           }
        }
        else
        {

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- texi2html.pl        1 Oct 2007 10:41:59 -0000       1.188
+++ texi2html.pl        3 Oct 2007 07:39:29 -0000       1.189
@@ -60,7 +60,7 @@
 #--##########################################################################
 
 # CVS version:
-# $Id: texi2html.pl,v 1.188 2007/10/01 10:41:59 pertusus Exp $
+# $Id: texi2html.pl,v 1.189 2007/10/03 07:39:29 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -723,8 +723,10 @@
     my $text = shift;
     my $in_raw_text = shift;
     my $in_preformatted = shift;
-    my $in_code =shift;
+    my $in_code = shift;
+    my $in_simple = shift;
     my $style_stack = shift;
+
     $text = &$protect_text($text) unless($in_raw_text);
     $text = uc($text) if (in_small_caps($style_stack));
 
@@ -746,6 +748,7 @@
     my $in_raw_text = shift;
     my $in_preformatted = shift;
     my $in_code =shift;
+    my $in_simple =shift;
     my $style_stack = shift;
 
     $text = uc($text) if (in_small_caps($style_stack));
@@ -6086,6 +6089,8 @@
     my @head_lines = ();
     my $one_section = 1 if (@elements_list == 1);
 
+    push_state(\%state);
+
     if (@elements_list == 0)
     {
         warn "$WARN empty document\n";
@@ -6734,6 +6739,7 @@
         &$Texi2HTML::Config::print_page_foot($FH);
         close_out ($FH);
     }
+    pop_state();
 }
 
 # print section, close file if needed.
@@ -7849,7 +7855,7 @@
     my $state = shift;
     return $text if ($state->{'keep_texi'});
     my $remove_texi = 1 if ($state->{'remove_texi'} and 
!$state->{'simple_format'});
-    return (&$Texi2HTML::Config::normal_text($text, $remove_texi, 
$state->{'preformatted'}, $state->{'code_style'},$state->{'command_stack'}));
+    return (&$Texi2HTML::Config::normal_text($text, $remove_texi, 
$state->{'preformatted'}, 
$state->{'code_style'},$state->{'simple_format'},$state->{'command_stack'}));
 }
 
 sub end_simple_format($$)
@@ -8044,7 +8050,7 @@
     {
         $args[$i] = substitute_line($args[$i], $new_state);
     }
-    #print STDERR "(@args)\n";
+    #print STDERR "XREF: (@args)\n";
     
     if (($macro eq 'inforef') or ($args[3] ne '') or ($args[4] ne ''))
     {# external ref
@@ -8178,8 +8184,7 @@
               $text .= $line
          }
          $text =~ s/ $//;
-         my $simple_format_state = duplicate_state($state);
-         $explanation_simple_format = 
simple_format($simple_format_state,$text);
+         $explanation_simple_format = simple_format($state, $text);
          $explanation_text = substitute_line($text, duplicate_state($state));
     }
     return &$Texi2HTML::Config::acronym_like($command, $acronym_texi, 
substitute_line($acronym_texi, duplicate_state($state)), 
@@ -8377,12 +8382,14 @@
            'keep_texi' => $state->{'keep_texi'}, 
            'keep_nr' => $state->{'keep_nr'}, 
            'preformatted_stack' => $state->{'preformatted_stack'},
-           'multiple_pass' => $state->{'multiple_pass'},
-# this is needed for preformatted
-           'command_stack' => [ @{$state->{'command_stack'}}  ],
-           'preformatted_context' => 
-                {'stack_at_beginning' => [ @{$state->{'command_stack'}}  ] }
+           'multiple_pass' => $state->{'multiple_pass'}
     };
+# this is needed for preformatted
+    my $command_stack = $state->{'command_stack'};
+    $command_stack = [] if (!defined($command_stack));
+    $new_state->{'command_stack'} = [ @$command_stack ];
+    $new_state->{'preformatted_context'} = {'stack_at_beginning' => [ 
@$command_stack ]};
+    $new_state->{'code_style'} = 0 if (!defined($new_state->{'code_style'}));
     return $new_state;
 }
 
@@ -8635,7 +8642,14 @@
 sub simple_format($@)
 {
     my $state = shift;
-    $state = {} if (!defined($state));
+    if (!defined($state))
+    {
+        $state = {};
+    }
+    else
+    {
+        $state = duplicate_state($state);
+    }
     $state->{'remove_texi'} = 1;
     $state->{'simple_format'} = 1;
     # WARNING currently it is only used for lines. It may change in the future.
@@ -11981,6 +11995,28 @@
     }
 }
 
+my @states_stack = ();
+
+sub push_state($)
+{
+   my $new_state = shift;
+   push @states_stack, $new_state;
+   $Texi2HTML::THISDOC{'state'} = $new_state;
+}
+
+sub pop_state()
+{
+   pop @states_stack;
+   if (@states_stack)
+   {
+       $Texi2HTML::THISDOC{'state'} = $states_stack[-1];
+   }
+   else
+   {
+       $Texi2HTML::THISDOC{'state'} = undef;
+   }
+}
+
 sub substitute_line($;$)
 {
     my $line = shift;
@@ -12012,6 +12048,7 @@
     }
     $state->{'spool'} = [];
     #print STDERR "SUBST_TEXT begin\n";
+    push_state($state);
     
     while (@_ or @{$state->{'spool'}})
     {
@@ -12052,6 +12089,7 @@
          close_stack(\$text, address@hidden, $state, undef);
     }
     #print STDERR "SUBST_TEXT end\n";
+    pop_state();
     return $result . $text;
 }
 

Index: Tests/formatting/formatting.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting/formatting.texi,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Tests/formatting/formatting.texi    30 Sep 2007 12:47:14 -0000      1.24
+++ Tests/formatting/formatting.texi    3 Oct 2007 07:39:30 -0000       1.25
@@ -401,7 +401,7 @@
 d--eftypemethod
 @end deftypemethod
 
address@hidden@@address@hidden, cross ref name, title, file name, 
address@hidden @xref{chapter, cross ref name, title, file name, manual}
address@hidden@@address@hidden@@@@, cross r---ef name@@@@, t---itle@@@@, file 
n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, cross r---ef name@@, 
t---itle@@, file n---ame@@, ma---nual@@}
 @code{@@address@hidden, cross ref name, title, file name, address@hidden 
@ref{chapter, cross ref name, title, file name, manual}
 @code{@@address@hidden, cross ref name, title, file name, address@hidden 
@pxref{chapter, cross ref name, title, file name, manual}
 @code{@@address@hidden, cross ref name, file address@hidden @inforef{chapter, 
cross ref name, file name}

Index: Tests/formatting_res/exotic_formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/exotic_formatting.html,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- Tests/formatting_res/exotic_formatting.html 30 Sep 2007 12:47:15 -0000      
1.62
+++ Tests/formatting_res/exotic_formatting.html 3 Oct 2007 07:39:30 -0000       
1.63
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 
@@ -1174,7 +1174,7 @@
 <tr><td colspan="2"><p>d&ndash;eftypemethod
 </p></td></tr></table>
 
-<p><code>@xref{chapter, cross ref name, title, file name, manual}</code> See 
<a href="../file name/chapter.html#chapter">cross ref name: (file 
name)chapter</a> section `title' in <cite>manual</cite>
+<p><code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> See <a href="../file 
n---ame@@/c_002d_002d_002dhapter_0040.html#c_002d_002d_002dhapter_0040">cross 
r&mdash;ef name@: (file n&mdash;ame@)c&mdash;hapter@</a> section 
`t&mdash;itle@' in <cite>ma&mdash;nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="../file name/chapter.html#chapter">cross ref name: (file name)chapter</a> 
section `title' in <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a 
href="../file name/chapter.html#chapter">cross ref name: (file name)chapter</a> 
section `title' in <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file 
name/chapter.html#chapter">cross ref name: (file name)chapter</a>
@@ -1882,7 +1882,7 @@
 <tr><td colspan="2"><pre class="example">d--eftypemethod
 </pre></td></tr></table>
 <pre class="example">
-<code>@xref{chapter, cross ref name, title, file name, manual}</code> See <a 
href="../file name/chapter.html#chapter">cross ref name: (file name)chapter</a> 
section `title' in <cite>manual</cite>
+<code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> See <a href="../file 
n---ame@@/c_002d_002d_002dhapter_0040.html#c_002d_002d_002dhapter_0040">cross 
r---ef name@: (file n---ame@)c---hapter@</a> section `t---itle@' in 
<cite>ma---nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="../file name/chapter.html#chapter">cross ref name: (file name)chapter</a> 
section `title' in <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a 
href="../file name/chapter.html#chapter">cross ref name: (file name)chapter</a> 
section `title' in <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file 
name/chapter.html#chapter">cross ref name: (file name)chapter</a>

Index: Tests/formatting_res/exotic_formatting.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/exotic_formatting.passfirst,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Tests/formatting_res/exotic_formatting.passfirst    30 Sep 2007 12:47:15 
-0000      1.24
+++ Tests/formatting_res/exotic_formatting.passfirst    3 Oct 2007 07:39:30 
-0000       1.25
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/exotic_formatting.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/exotic_formatting.passtexi,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- Tests/formatting_res/exotic_formatting.passtexi     30 Sep 2007 12:47:15 
-0000      1.25
+++ Tests/formatting_res/exotic_formatting.passtexi     3 Oct 2007 07:39:30 
-0000       1.26
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,503) d--eftypemethod
 formatting.texi(mymacro,503) @end deftypemethod
 formatting.texi(mymacro,503) 
-formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,503) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -1375,7 +1375,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/exotic_formatting_2.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/exotic_formatting_2.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- Tests/formatting_res/exotic_formatting_2.html       30 Sep 2007 12:47:15 
-0000      1.38
+++ Tests/formatting_res/exotic_formatting_2.html       3 Oct 2007 07:39:30 
-0000       1.39
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 

Index: Tests/formatting_res/exotic_formatting_3.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/exotic_formatting_3.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- Tests/formatting_res/exotic_formatting_3.html       30 Sep 2007 12:47:15 
-0000      1.41
+++ Tests/formatting_res/exotic_formatting_3.html       3 Oct 2007 07:39:30 
-0000       1.42
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 

Index: Tests/formatting_res/exotic_formatting_4.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/exotic_formatting_4.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Tests/formatting_res/exotic_formatting_4.html       30 Sep 2007 12:47:15 
-0000      1.4
+++ Tests/formatting_res/exotic_formatting_4.html       3 Oct 2007 07:39:30 
-0000       1.5
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 

Index: Tests/formatting_res/exotic_formatting_5.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/exotic_formatting_5.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Tests/formatting_res/exotic_formatting_5.html       30 Sep 2007 12:47:15 
-0000      1.5
+++ Tests/formatting_res/exotic_formatting_5.html       3 Oct 2007 07:39:30 
-0000       1.6
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 

Index: Tests/formatting_res/exotic_formatting_abt.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/exotic_formatting_abt.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- Tests/formatting_res/exotic_formatting_abt.html     30 Sep 2007 12:47:15 
-0000      1.34
+++ Tests/formatting_res/exotic_formatting_abt.html     3 Oct 2007 07:39:30 
-0000       1.35
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 

Index: Tests/formatting_res/exotic_formatting_ovr.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/exotic_formatting_ovr.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- Tests/formatting_res/exotic_formatting_ovr.html     30 Sep 2007 12:47:15 
-0000      1.34
+++ Tests/formatting_res/exotic_formatting_ovr.html     3 Oct 2007 07:39:31 
-0000       1.35
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 

Index: Tests/formatting_res/exotic_formatting_toc.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/exotic_formatting_toc.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- Tests/formatting_res/exotic_formatting_toc.html     30 Sep 2007 12:47:16 
-0000      1.34
+++ Tests/formatting_res/exotic_formatting_toc.html     3 Oct 2007 07:39:31 
-0000       1.35
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 

Index: Tests/formatting_res/formatting.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/formatting.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- Tests/formatting_res/formatting.html        30 Sep 2007 12:47:16 -0000      
1.63
+++ Tests/formatting_res/formatting.html        3 Oct 2007 07:39:31 -0000       
1.64
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 
@@ -1029,7 +1029,7 @@
 <dd><p>d&ndash;eftypemethod
 </p></dd></dl>
 
-<p><code>@xref{chapter, cross ref name, title, file name, manual}</code> See 
<a href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
+<p><code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> See <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r&mdash;ef name@: (file 
n&mdash;ame@)c&mdash;hapter@</a> section `t&mdash;itle@' in 
<cite>ma&mdash;nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> See <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>
@@ -1593,7 +1593,7 @@
 <dd><pre class="example">d--eftypemethod
 </pre></dd></dl>
 <pre class="example">
-<code>@xref{chapter, cross ref name, title, file name, manual}</code> See <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
+<code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> See <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r---ef name@: (file 
n---ame@)c---hapter@</a> section `t---itle@' in <cite>ma---nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> See <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>

Index: Tests/formatting_res/formatting.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/formatting.passfirst,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Tests/formatting_res/formatting.passfirst   30 Sep 2007 12:47:16 -0000      
1.24
+++ Tests/formatting_res/formatting.passfirst   3 Oct 2007 07:39:31 -0000       
1.25
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/formatting.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/formatting.passtexi,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- Tests/formatting_res/formatting.passtexi    30 Sep 2007 12:47:16 -0000      
1.26
+++ Tests/formatting_res/formatting.passtexi    3 Oct 2007 07:39:31 -0000       
1.27
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,503) d--eftypemethod
 formatting.texi(mymacro,503) @end deftypemethod
 formatting.texi(mymacro,503) 
-formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,503) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -1375,7 +1375,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/formatting_html32.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/formatting_html32.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Tests/formatting_res/formatting_html32.html 30 Sep 2007 12:47:16 -0000      
1.1
+++ Tests/formatting_res/formatting_html32.html 3 Oct 2007 07:39:31 -0000       
1.2
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 
@@ -1013,7 +1013,7 @@
 <dd><p>d-eftypemethod
 </p></dd></dl>
 
-<p><code>@xref{chapter, cross ref name, title, file name, manual}</code> See 
<a href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
+<p><code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> See <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r--ef name@: (file 
n--ame@)c--hapter@</a> section `t--itle@' in <cite>ma--nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> See <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>
@@ -1577,7 +1577,7 @@
 <dd><pre>d--eftypemethod
 </pre></dd></dl>
 <pre>
-<code>@xref{chapter, cross ref name, title, file name, manual}</code> See <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
+<code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> See <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r---ef name@: (file 
n---ame@)c---hapter@</a> section `t---itle@' in <cite>ma---nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> See <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>

Index: Tests/formatting_res/formatting_html32.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/formatting_html32.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Tests/formatting_res/formatting_html32.passfirst    30 Sep 2007 12:47:16 
-0000      1.1
+++ Tests/formatting_res/formatting_html32.passfirst    3 Oct 2007 07:39:31 
-0000       1.2
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/formatting_html32.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/formatting_html32.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Tests/formatting_res/formatting_html32.passtexi     30 Sep 2007 12:47:16 
-0000      1.1
+++ Tests/formatting_res/formatting_html32.passtexi     3 Oct 2007 07:39:31 
-0000       1.2
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,503) d--eftypemethod
 formatting.texi(mymacro,503) @end deftypemethod
 formatting.texi(mymacro,503) 
-formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,503) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -1375,7 +1375,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/fr_formatting.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/fr_formatting.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- Tests/formatting_res/fr_formatting.html     30 Sep 2007 12:47:17 -0000      
1.56
+++ Tests/formatting_res/fr_formatting.html     3 Oct 2007 07:39:31 -0000       
1.57
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 
@@ -1029,7 +1029,7 @@
 <dd><p>d&ndash;eftypemethod
 </p></dd></dl>
 
-<p><code>@xref{chapter, cross ref name, title, file name, manual}</code> Voir 
<a href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
+<p><code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> Voir <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r&mdash;ef name@: (file 
n&mdash;ame@)c&mdash;hapter@</a> section `t&mdash;itle@' dans 
<cite>ma&mdash;nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> voir <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> Voir <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>
@@ -1593,7 +1593,7 @@
 <dd><pre class="example">d--eftypemethod
 </pre></dd></dl>
 <pre class="example">
-<code>@xref{chapter, cross ref name, title, file name, manual}</code> Voir <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
+<code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> Voir <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r---ef name@: (file 
n---ame@)c---hapter@</a> section `t---itle@' dans <cite>ma---nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> voir <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> Voir <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>

Index: Tests/formatting_res/fr_formatting.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/fr_formatting.passfirst,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- Tests/formatting_res/fr_formatting.passfirst        30 Sep 2007 12:47:17 
-0000      1.23
+++ Tests/formatting_res/fr_formatting.passfirst        3 Oct 2007 07:39:32 
-0000       1.24
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/fr_formatting.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/fr_formatting.passtexi,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Tests/formatting_res/fr_formatting.passtexi 30 Sep 2007 12:47:17 -0000      
1.24
+++ Tests/formatting_res/fr_formatting.passtexi 3 Oct 2007 07:39:32 -0000       
1.25
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,503) d--eftypemethod
 formatting.texi(mymacro,503) @end deftypemethod
 formatting.texi(mymacro,503) 
-formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,503) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -1375,7 +1375,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/icons_fr_formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/icons_fr_formatting.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- Tests/formatting_res/icons_fr_formatting.html       30 Sep 2007 12:47:17 
-0000      1.18
+++ Tests/formatting_res/icons_fr_formatting.html       3 Oct 2007 07:39:32 
-0000       1.19
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 
@@ -1029,7 +1029,7 @@
 <dd><p>d&ndash;eftypemethod
 </p></dd></dl>
 
-<p><code>@xref{chapter, cross ref name, title, file name, manual}</code> Voir 
<a href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
+<p><code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> Voir <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r&mdash;ef name@: (file 
n&mdash;ame@)c&mdash;hapter@</a> section `t&mdash;itle@' dans 
<cite>ma&mdash;nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> voir <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> Voir <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>
@@ -1593,7 +1593,7 @@
 <dd><pre class="example">d--eftypemethod
 </pre></dd></dl>
 <pre class="example">
-<code>@xref{chapter, cross ref name, title, file name, manual}</code> Voir <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
+<code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> Voir <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r---ef name@: (file 
n---ame@)c---hapter@</a> section `t---itle@' dans <cite>ma---nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> voir <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' dans <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> Voir <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>

Index: Tests/formatting_res/icons_fr_formatting.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/icons_fr_formatting.passfirst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Tests/formatting_res/icons_fr_formatting.passfirst  30 Sep 2007 12:47:17 
-0000      1.7
+++ Tests/formatting_res/icons_fr_formatting.passfirst  3 Oct 2007 07:39:32 
-0000       1.8
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/icons_fr_formatting.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/icons_fr_formatting.passtexi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Tests/formatting_res/icons_fr_formatting.passtexi   30 Sep 2007 12:47:17 
-0000      1.7
+++ Tests/formatting_res/icons_fr_formatting.passtexi   3 Oct 2007 07:39:32 
-0000       1.8
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,503) d--eftypemethod
 formatting.texi(mymacro,503) @end deftypemethod
 formatting.texi(mymacro,503) 
-formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,503) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -1375,7 +1375,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/to_utf8_formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/to_utf8_formatting.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Tests/formatting_res/to_utf8_formatting.html        30 Sep 2007 12:47:19 
-0000      1.12
+++ Tests/formatting_res/to_utf8_formatting.html        3 Oct 2007 07:39:32 
-0000       1.13
@@ -370,7 +370,7 @@
 d–eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 
@@ -1029,7 +1029,7 @@
 <dd><p>d–eftypemethod
 </p></dd></dl>
 
-<p><code>@xref{chapter, cross ref name, title, file name, manual}</code> See 
<a href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
+<p><code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> See <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r—ef name@: (file 
n—ame@)c—hapter@</a> section `t—itle@' in <cite>ma—nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> See <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>
@@ -1593,7 +1593,7 @@
 <dd><pre class="example">d--eftypemethod
 </pre></dd></dl>
 <pre class="example">
-<code>@xref{chapter, cross ref name, title, file name, manual}</code> See <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
+<code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> See <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r---ef name@: (file 
n---ame@)c---hapter@</a> section `t---itle@' in <cite>ma---nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> See <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>

Index: Tests/formatting_res/to_utf8_formatting.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/to_utf8_formatting.passfirst,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Tests/formatting_res/to_utf8_formatting.passfirst   30 Sep 2007 12:47:19 
-0000      1.6
+++ Tests/formatting_res/to_utf8_formatting.passfirst   3 Oct 2007 07:39:32 
-0000       1.7
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/to_utf8_formatting.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/to_utf8_formatting.passtexi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Tests/formatting_res/to_utf8_formatting.passtexi    30 Sep 2007 12:47:19 
-0000      1.6
+++ Tests/formatting_res/to_utf8_formatting.passtexi    3 Oct 2007 07:39:32 
-0000       1.7
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,503) d--eftypemethod
 formatting.texi(mymacro,503) @end deftypemethod
 formatting.texi(mymacro,503) 
-formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,503) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -1375,7 +1375,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/weird_quotes_formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/weird_quotes_formatting.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Tests/formatting_res/weird_quotes_formatting.html   30 Sep 2007 12:47:19 
-0000      1.11
+++ Tests/formatting_res/weird_quotes_formatting.html   3 Oct 2007 07:39:32 
-0000       1.12
@@ -370,7 +370,7 @@
 d-eftypemethod
 
 
address@hidden, cross ref name, title, file name, manual} 
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
 @ref{chapter, cross ref name, title, file name, manual} 
 @pxref{chapter, cross ref name, title, file name, manual} 
 @inforef{chapter, cross ref name, file name} 
@@ -1029,7 +1029,7 @@
 <dd><p>d&ndash;eftypemethod
 </p></dd></dl>
 
-<p><code>@xref{chapter, cross ref name, title, file name, manual}</code> See 
<a href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
+<p><code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> See <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r&mdash;ef name@: (file 
n&mdash;ame@)c&mdash;hapter@</a> section `t&mdash;itle@' in 
<cite>ma&mdash;nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> See <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>
@@ -1593,7 +1593,7 @@
 <dd><pre class="example">d--eftypemethod
 </pre></dd></dl>
 <pre class="example">
-<code>@xref{chapter, cross ref name, title, file name, manual}</code> See <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
+<code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</code> See <a href="file 
n---ame@@.html#c_002d_002d_002dhapter_0040">cross r---ef name@: (file 
n---ame@)c---hapter@</a> section `t---itle@' in <cite>ma---nual@</cite>
 <code>@ref{chapter, cross ref name, title, file name, manual}</code> <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a 
href="file name.html#chapter">cross ref name: (file name)chapter</a> section 
`title' in <cite>manual</cite>
 <code>@inforef{chapter, cross ref name, file name}</code> See <a href="file 
name.html#chapter">cross ref name: (file name)chapter</a>

Index: Tests/formatting_res/weird_quotes_formatting.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/weird_quotes_formatting.passfirst,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Tests/formatting_res/weird_quotes_formatting.passfirst      30 Sep 2007 
12:47:19 -0000      1.5
+++ Tests/formatting_res/weird_quotes_formatting.passfirst      3 Oct 2007 
07:39:32 -0000       1.6
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: Tests/formatting_res/weird_quotes_formatting.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/Tests/formatting_res/weird_quotes_formatting.passtexi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Tests/formatting_res/weird_quotes_formatting.passtexi       30 Sep 2007 
12:47:19 -0000      1.5
+++ Tests/formatting_res/weird_quotes_formatting.passtexi       3 Oct 2007 
07:39:33 -0000       1.6
@@ -401,7 +401,7 @@
 formatting.texi(mymacro,503) d--eftypemethod
 formatting.texi(mymacro,503) @end deftypemethod
 formatting.texi(mymacro,503) 
-formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,503) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,503) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -888,7 +888,7 @@
 formatting.texi(mymacro,506) d--eftypemethod
 formatting.texi(mymacro,506) @end deftypemethod
 formatting.texi(mymacro,506) 
-formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,506) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,506) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}
@@ -1375,7 +1375,7 @@
 formatting.texi(mymacro,509) d--eftypemethod
 formatting.texi(mymacro,509) @end deftypemethod
 formatting.texi(mymacro,509) 
-formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @xref{chapter, cross ref name, title, file name, 
manual}
+formatting.texi(mymacro,509) @code{@@address@hidden@@@@, cross r---ef 
name@@@@, t---itle@@@@, file n---ame@@@@, ma---nual@@@@@}} @xref{c---hapter@@, 
cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @ref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, title, 
file name, address@hidden @pxref{chapter, cross ref name, title, file name, 
manual}
 formatting.texi(mymacro,509) @code{@@address@hidden, cross ref name, file 
address@hidden @inforef{chapter, cross ref name, file name}

Index: doc/texi2html.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.html,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- doc/texi2html.html  1 Oct 2007 10:42:02 -0000       1.55
+++ doc/texi2html.html  3 Oct 2007 07:39:33 -0000       1.56
@@ -31,7 +31,7 @@
 permission notice may be stated in a translation approved
 by the Free Software Foundation.
  -->
-<!-- Created on October, 1 2007 by texi2html 1.79 -->
+<!-- Created on October, 3 2007 by texi2html 1.79 -->
 <!--
 Written by: Lionel Cons <address@hidden> (original author)
             Karl Berry  <address@hidden>
@@ -3957,7 +3957,7 @@
 </p>
 
 <dl>
-<dt><u>Function Reference:</u> $processed_text <b>normal_text</b><i> $text 
$in_raw_text $in_preformatted $in_code $command_stack </i>
+<dt><u>Function Reference:</u> $processed_text <b>normal_text</b><i> $text 
$in_raw_text $in_preformatted $in_code $in_simple $command_stack </i>
 <a name="IDX227"></a>
 </dt>
 <dd><p>The function processes <var>$text</var> and returns 
<var>$processed_text</var>. 
@@ -3967,7 +3967,8 @@
 is true if in a preformatted environemnt, and <var>$in_code</var> is true
 if in a special command like <code>@code</code>, <code>@env</code> where
 &lsquo;<samp>---</samp>&rsquo;, &lsquo;<samp>--</samp>&rsquo;, 
&lsquo;<samp>``</samp>&rsquo; and &lsquo;<samp>''</samp>&rsquo; should not be
-touched. <var>$command_stack</var> is an array containing the name of the 
+touched. <var>$in_simple</var> is true if in string context.
+ <var>$command_stack</var> is an array containing the name of the 
 formatting @-command that enclose the text.  
 </p>
 <p>In the default case the &lsquo;<samp>---</samp>&rsquo;, 
&lsquo;<samp>--</samp>&rsquo;, &lsquo;<samp>``</samp>&rsquo; and 
&lsquo;<samp>''</samp>&rsquo;
@@ -6195,6 +6196,7 @@
 <ul>
 <li> what was done in the beginning of the $print_section 
 function reference is now done in $print_element_header.
+</li><li> there is a new argument for $normal_text.
 </li></ul>
 </li><li> API changes between 1.76 and 1.78: 
 <ul>
@@ -7112,7 +7114,7 @@
 </tr></table>
 <h1>About This Document</h1>
 <p>
-  This document was generated by <em>Patrice Dumas</em> on <em>October, 1 
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
+  This document was generated by <em>Patrice Dumas</em> on <em>October, 3 
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
 </p>
 <p>
   The buttons in the navigation panels have the following meaning:
@@ -7214,7 +7216,7 @@
 <hr size="1">
 <p>
  <font size="-1">
-  This document was generated by <em>Patrice Dumas</em> on <em>October, 1 
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
+  This document was generated by <em>Patrice Dumas</em> on <em>October, 3 
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
  </font>
  <br>
 

Index: doc/texi2html.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.texi,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- doc/texi2html.texi  30 Sep 2007 12:47:41 -0000      1.57
+++ doc/texi2html.texi  3 Oct 2007 07:39:33 -0000       1.58
@@ -2559,7 +2559,7 @@
 of protecting special characters
 
 
address@hidden {Function Reference} $processed_text normal_text $text 
$in_raw_text $in_preformatted $in_code $command_stack 
address@hidden {Function Reference} $processed_text normal_text $text 
$in_raw_text $in_preformatted $in_code $in_simple $command_stack 
 The function processes @var{$text} and returns @var{$processed_text}. 
 The other arguments give some information about the context of the text.
 @var{$in_raw_text} is true if the text appears in special place where
@@ -2567,7 +2567,8 @@
 is true if in a preformatted environemnt, and @var{$in_code} is true
 if in a special command like @code{@@code}, @code{@@env} where
 @samp{---}, @samp{--}, @samp{``} and @samp{''} should not be
-touched. @var{$command_stack} is an array containing the name of the 
+touched. @var{$in_simple} is true if in string context.
+ @var{$command_stack} is an array containing the name of the 
 formatting @@-command that enclose the text.  
 
 In the default case the @samp{---}, @samp{--}, @samp{``} and @samp{''}
@@ -3984,6 +3985,7 @@
 @itemize @bullet
 @item what was done in the beginning of the $print_section 
 function reference is now done in $print_element_header.
address@hidden there is a new argument for $normal_text.
 @end itemize
 @item API changes between 1.76 and 1.78: 
 @itemize @bullet

Index: examples/html32.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/html32.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- examples/html32.init        30 Sep 2007 12:47:41 -0000      1.12
+++ examples/html32.init        3 Oct 2007 07:39:33 -0000       1.13
@@ -113,6 +113,7 @@
    my $in_raw_text = shift;
    my $in_preformatted = shift;
    my $in_code = shift;
+   my $in_simple = shift;
    my $style_stack = shift;
    $text = uc($text) if (in_cmd($style_stack, 'sc'));
    $text = &$protect_text($text) unless($in_raw_text);

Index: examples/roff.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/roff.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- examples/roff.init  30 Sep 2007 12:47:41 -0000      1.13
+++ examples/roff.init  3 Oct 2007 07:39:33 -0000       1.14
@@ -532,6 +532,9 @@
    my $in_raw_text = shift;
    my $in_preformatted = shift;
    my $in_code =shift;
+   my $in_simple = shift;
+   my $style_stack = shift;
+
    $text = &$protect_text($text) unless($in_raw_text);
    if (! $in_code and !$in_preformatted and !$in_raw_text)
    {




reply via email to

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