texinfo/tp TODO Texinfo/Common.pm Texinfo/Conve...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/08/12 07:00:51

Modified files:
        tp             : TODO 
        tp/Texinfo     : Common.pm 
        tp/Texinfo/Convert: NodeNameNormalization.pm Text.pm 

Log message:
        Upper case innermost character in accent stack in Convert::Text only if 
        it is a single character.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.150&r2=1.151
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.51&r2=1.52

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- TODO        11 Aug 2011 22:08:51 -0000      1.150
+++ TODO        12 Aug 2011 07:00:46 -0000      1.151
@@ -1,3 +1,10 @@
+Mail Karl about   Xref Command Expansion
+
+ Quotation mark commands are likewise replaced by their Unicode values
+(*note Inserting Quotation Marks::).
+
+
+
 l 3273 in HTML.pm don't be in preformatted for the description.
 but call the function for the other stuff.
 

Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- Texinfo/Common.pm   11 Aug 2011 22:08:51 -0000      1.54
+++ Texinfo/Common.pm   12 Aug 2011 07:00:48 -0000      1.55
@@ -811,7 +811,7 @@
 }
 
 # This should do the job, or at least don't do wrong if $self
-#Â is not defined, as could be the case if called from 
+# is not defined, as could be the case if called from 
 # Texinfo::Convert::Text.
 sub expand_verbatiminclude($$)
 {

Index: Texinfo/Convert/NodeNameNormalization.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Texinfo/Convert/NodeNameNormalization.pm    11 Aug 2011 21:07:16 -0000      
1.11
+++ Texinfo/Convert/NodeNameNormalization.pm    12 Aug 2011 07:00:49 -0000      
1.12
@@ -234,6 +234,8 @@
                          or $root->{'args'}->[0]->{'type'} eq 'misc_arg')))));
   my $result = '';
   if (defined($root->{'text'})) {
+    # FIXME the manual says that (in HTML Xref Command Expansion)
+    # Quotation mark commands are likewise replaced by their Unicode values
     $result = $root->{'text'};
     $result =~ s/\s+/ /go;
     $result = uc($result) if ($in_sc);
@@ -261,6 +263,8 @@
                          #$root, \&Texinfo::Convert::Text::ascii_accent);
                                                     $root);
       if (!defined($accented_char)) {
+        # In this case, the node normalization do not follow the specification,
+        # but we cannot do better
         $accented_char = Texinfo::Convert::Text::ascii_accent($accent_text,
                                                               $root);
       }

Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- Texinfo/Convert/Text.pm     11 Aug 2011 22:08:51 -0000      1.51
+++ Texinfo/Convert/Text.pm     12 Aug 2011 07:00:50 -0000      1.52
@@ -787,7 +787,7 @@
 
   my ($result, $innermost_accent, $stack) = _find_innermost_accent($current);
 
-  $result = uc($result) if ($in_upper_case);
+  $result = uc($result) if ($in_upper_case and $result =~ /^\w$/);
   foreach my $accent_command (reverse(@$stack)) {
     $result = ascii_accent ($result, {'cmdname' => $accent_command});
   }