texinfo ChangeLog doc/texinfo.tex

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     13/02/01 23:48:52

Modified files:
        .              : ChangeLog 
        doc            : texinfo.tex 

Log message:
        handle @address@hidden

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1535&r2=1.1536
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.378&r2=1.379

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1535
retrieving revision 1.1536
diff -u -b -r1.1535 -r1.1536
--- ChangeLog   30 Jan 2013 01:35:41 -0000      1.1535
+++ ChangeLog   1 Feb 2013 23:48:51 -0000       1.1536
@@ -1,3 +1,13 @@
+2013-02-01  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (@normalturnoffactive): also reset -, so
+       @address@hidden works.
+       (\normaldash): rename from \realdash, for consistency.
+       Change all uses.
+
+       * Pod-Simple-Texinfo/pod2texi.pl (preamble): null if making
+       @include files.  More doc.
+
 2013-01-29  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (HTML Customization Files) <TOC_FILE>: is no more.

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -b -r1.378 -r1.379
--- doc/texinfo.tex     2 Jan 2013 00:57:53 -0000       1.378
+++ doc/texinfo.tex     1 Feb 2013 23:48:51 -0000       1.379
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2013-01-01.15}
+\def\texinfoversion{2013-02-01.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2496,7 +2496,7 @@
      \let-\codedash
      \let_\codeunder
     \else
-     \let-\realdash
+     \let-\normaldash
      \let_\realunder
     \fi
     \codex
@@ -2505,7 +2505,7 @@
 
 \def\codex #1{\tclose{#1}\endgroup}
 
-\def\realdash{-}
+\def\normaldash{-}
 \def\codedash{-\discretionary{}{}{}}
 \def\codeunder{%
   % this is all so @address@hidden can work.  In math mode, _
@@ -2520,9 +2520,9 @@
 }
 
 % An additional complication: the above will allow breaks after, e.g.,
-% each of the four underscores in __typeof__.  This is undesirable in
-% some manuals, especially if they don't have long identifiers in
-% general.  @allowcodebreaks provides a way to control this.
+% each of the four underscores in __typeof__.  This is bad.
+% @allowcodebreaks provides a document-level way to turn breaking at -
+% and _ on and off.
 %
 \newif\ifallowcodebreaks  \allowcodebreakstrue
 
@@ -4188,7 +4188,7 @@
     % ..., but we might end up with active ones in the argument if
     % we're called from @code, as @address@hidden, though.
     % So \let them to their normal equivalents.
-    \let-\realdash \let_\normalunderscore
+    \let-\normaldash \let_\normalunderscore
   }
 }
 
@@ -9993,9 +9993,12 @@
 @address@hidden@address@hidden
 
 % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.
+% the literal character `\'.  Also revert - to its normal character, in
+% case the active - from code has slipped in.
 %
address@hidden@normalturnoffactive{%
address@hidden = @active
+ @address@hidden
+   @address@hidden
   @let"address@hidden
   @address@hidden %$ font-lock fix
   @address@hidden
@@ -10009,6 +10012,7 @@
   @markupsetuplqdefault
   @markupsetuprqdefault
   @unsepspaces
+ }
 }
 
 % Make _ and + \other characters, temporarily.