texinfo doc/version.texi tp/Texinfo/Common.pm t...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/12/27 23:11:41

Modified files:
        doc            : version.texi 
        tp/Texinfo     : Common.pm 
        tp/Texinfo/Convert: Converter.pm Text.pm Unicode.pm XML.pm 
        util           : texinfo.dtd 

Log message:
        Add atchar lbracechar rbracechar backslashchar.
        Correct lbrace and rbrace to be associatd to the correct brace.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/version.texi?cvsroot=texinfo&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Unicode.pm?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texinfo.dtd?cvsroot=texinfo&r1=1.26&r2=1.27

Patches:
Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- doc/version.texi    25 Dec 2011 01:37:41 -0000      1.107
+++ doc/version.texi    27 Dec 2011 23:11:40 -0000      1.108
@@ -1,4 +1,4 @@
address@hidden UPDATED 24 December 2011
address@hidden UPDATED 26 December 2011
 @set UPDATED-MONTH December 2011
 @set EDITION 4.13.90
 @set VERSION 4.13.90

Index: tp/Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- tp/Texinfo/Common.pm        27 Dec 2011 22:29:26 -0000      1.107
+++ tp/Texinfo/Common.pm        27 Dec 2011 23:11:40 -0000      1.108
@@ -396,7 +396,8 @@
 foreach my $no_arg_command ('TeX','LaTeX','bullet','copyright',
   'registeredsymbol','dots','enddots','equiv','error','expansion','arrow',
   'minus','point','print','result','today',
-  'exclamdown','questiondown','pounds','ordf','ordm','comma','euro',
+  'exclamdown','questiondown','pounds','ordf','ordm',
+  'atchar', 'lbracechar', 'rbracechar', 'backslashchar', 'comma','euro',
   'geq','leq','tie','textdegree','click',
   'quotedblleft','quotedblright','quoteleft','quoteright','quotedblbase',
   'quotesinglbase','guillemetleft','guillemetright','guillemotleft',

Index: tp/Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- tp/Texinfo/Convert/Converter.pm     30 Nov 2011 00:11:16 -0000      1.68
+++ tp/Texinfo/Convert/Converter.pm     27 Dec 2011 23:11:41 -0000      1.69
@@ -810,6 +810,10 @@
                'ordf'         => '&ordf;',
                'ordm'         => '&ordm;',
                'comma'        => ',',
+               'atchar'       => '@',
+               'lbracechar'   => '{',
+               'rbracechar'   => '}',
+               'backslashchar' => '\\',
                'euro'         => '&euro;',
                'geq'          => '&ge;',
                'leq'          => '&le;',

Index: tp/Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- tp/Texinfo/Convert/Text.pm  22 Dec 2011 10:54:41 -0000      1.86
+++ tp/Texinfo/Convert/Text.pm  27 Dec 2011 23:11:41 -0000      1.87
@@ -108,6 +108,10 @@
                'ordf'         => 'a',
                'ordm'         => 'o',
                'comma'        => ',',
+               'atchar'       => '@',
+               'lbracechar'   => '{',
+               'rbracechar'   => '}',
+               'backslashchar' => '\\',
                'euro'         => 'Euro',
                'geq'          => '>=',
                'leq'          => '<=',

Index: tp/Texinfo/Convert/Unicode.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Unicode.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- tp/Texinfo/Convert/Unicode.pm       22 Oct 2011 19:56:27 -0000      1.24
+++ tp/Texinfo/Convert/Unicode.pm       27 Dec 2011 23:11:41 -0000      1.25
@@ -504,6 +504,10 @@
                'ordf'              => '00AA',
                'ordm'              => '00BA',
                'comma'             => '002C',
+               'atchar'            => '0040',
+               'backslashchar'     => '005C',
+               'lbracechar'        => '007B',
+               'rbracechar'        => '007D',
                'euro'              => '20AC',
                'geq'               => '2265',
                'leq'               => '2264',

Index: tp/Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- tp/Texinfo/Convert/XML.pm   15 Nov 2011 00:00:43 -0000      1.55
+++ tp/Texinfo/Convert/XML.pm   27 Dec 2011 23:11:41 -0000      1.56
@@ -81,8 +81,8 @@
            '?' => '&eosquest;',
            '.' => '&eosperiod;',
            '@' => '&arobase;',
-           '}' => '&lbrace;',
-           '{' => '&rbrace;',
+           '{' => '&lbrace;',
+           '}' => '&rbrace;',
            '\\' => '&backslash;',  # should only appear in math
 
            'TeX' => '&tex;',
@@ -104,6 +104,10 @@
            'L'            => '&Lslash;',
            'today'        => '<today/>',
            'comma'        => '&comma;',
+           'atchar'       => '&atchar;',
+           'lbracechar'   => '&lbracechar;',
+           'rbracechar'   => '&rbracechar;',
+           'backslashchar' => '&backslashchar;',
 );
 
 my %xml_commands_formatting

Index: util/texinfo.dtd
===================================================================
RCS file: /sources/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- util/texinfo.dtd    27 Dec 2011 22:31:27 -0000      1.26
+++ util/texinfo.dtd    27 Dec 2011 23:11:41 -0000      1.27
@@ -1,4 +1,4 @@
-<!-- $Id: texinfo.dtd,v 1.26 2011/12/27 22:31:27 pertusus Exp $
+<!-- $Id: texinfo.dtd,v 1.27 2011/12/27 23:11:41 pertusus Exp $
   Document Type Definition for Texinfo XML output (the '-'-xml option).
 
   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
@@ -824,9 +824,13 @@
 <!ENTITY slashbreak "/">
 <!ENTITY noeos      "<noeos/>">
 <!ENTITY arobase    "@">
-<!ENTITY lbrace     "}">
-<!ENTITY rbrace     "{">
+<!ENTITY lbrace     "{">
+<!ENTITY rbrace     "}">
 <!ENTITY comma     ",">
+<!ENTITY atchar     "@">
+<!ENTITY lbracechar "{">
+<!ENTITY rbracechar "}">
+<!ENTITY backslashchar "\\">
 <!ENTITY nbsp       "&#xa0;">
 <!ENTITY deg        "&#xb0;">
 <!ENTITY expansion  "&#x2192;">