[7052] fix Unicode character in @copying

[Gavin D. Smith]

Revision: 7052
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7052
Author:   gavin
Date:     2016-03-22 07:04:31 +0000 (Tue, 22 Mar 2016)
Log Message:
-----------
fix Unicode character in @copying

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo-tex-test.texi
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-03-21 17:04:46 UTC (rev 7051)
+++ trunk/ChangeLog     2016-03-22 07:04:31 UTC (rev 7052)
@@ -1,3 +1,15 @@
+2016-03-21  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\scanexp): Simply call \scanmacro instead of 
+       expanding argument with \edef.
+       (\Efloat) <xref label for @float>: Don't call \scanexp.  Remove 
+       a comment.  Change some tabs to spaces.
+       * doc/test-texinfo-tex-texi.tex (Copying and captions): New 
+       section testing @float and @copying.
+
+       Broken Unicode character in @copying reported by Masamichi 
+       Hosoda.
+
 2016-03-21  Masamichi Hosoda  <address@hidden>
 
        * doc/texinfo.tex: Combine sections with XeTeX support.

Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi     2016-03-21 17:04:46 UTC (rev 7051)
+++ trunk/doc/texinfo-tex-test.texi     2016-03-22 07:04:31 UTC (rev 7052)
@@ -694,6 +694,52 @@
 @node Target
 @section Target
 
address@hidden Copying and captions
+
address@hidden Copying
+
address@hidden UTF-8
+
address@hidden
+This manual is for address@hidden
+Backslash address@hidden
+
+Copyrite @copyright{} address@hidden
+þ þ þ þ þ þ þ þ
address@hidden copying
+
+Now for the @@insertcopying:
+
address@hidden
+
+
address@hidden Captions
+
+
+There's a float in this section.
+
address@hidden Figure,fig:ex1
+This is a float.
+
address@hidden is a caption.
+Multiple paragraphs are allowed here.  Here are some ``special'' 
+characters: \ à.
+
+Paragraph breaks allowed.
+}
+
address@hidden caption text.}
+
+This float should have a caption somewhere.
address@hidden float
+
+List of floats now:
+
address@hidden Figure
+
+
+
+
 @chapter Document encoding
 
 @documentencoding UTF-8

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-03-21 17:04:46 UTC (rev 7051)
+++ trunk/doc/texinfo.tex       2016-03-22 07:04:31 UTC (rev 7052)
@@ -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{2016-03-21.10}
+\def\texinfoversion{2016-03-22.07}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -7807,7 +7807,7 @@
   % Process the macro body under the current catcode regime.
   \scantokens{#1\texinfoc}\aftermacro%
   %
-  % The \c is to remove the \newlinechar added by \scantokens, and
+  % The \texinfoc is to remove the \newlinechar added by \scantokens, and
   % can be noticed by \parsearg.
   %   The \aftermacro allows a \comment at the end of the macro definition
   % to duplicate itself past the final \newlinechar added by \scantokens:
@@ -7820,15 +7820,7 @@
 
 % Used for copying and captions
 \def\scanexp#1{%
-  \bgroup
-  % Undo catcode changes of \startcontents and \printindex
-  % When called from @insertcopying or (short)caption, we need active
-  % backslash to get it printed correctly.
-  % FIXME: This may not be needed.
-  address@hidden \catcode`\\=\active \escapechar=`\@
-  \edef\temp{\noexpand\scanmacro{#1}}%
-  \temp
-  \egroup
+  \expandafter\scanmacro\expandafter{#1}%
 }
 
 \newcount\paramno   % Count of parameters
@@ -9374,7 +9366,7 @@
     %
     \ifx\thiscaption\empty \else
       \ifx\floatident\empty \else
-       \appendtomacro\captionline{: }% had ident, so need a colon between
+        \appendtomacro\captionline{: }% had ident, so need a colon between
       \fi
       %
       % caption text.
@@ -9401,30 +9393,17 @@
         \requireauxfile
         \atdummies
         %
-        % since we read the caption text in the macro world, where ^^M
-        % is turned into a normal character, we have to scan it back, so
-        % we don't write the literal three characters "^^M" into the aux file.
-       \scanexp{%
-         \xdef\noexpand\gtemp{%
-           \ifx\thisshortcaption\empty
-             \thiscaption
-           \else
-             \thisshortcaption
-           \fi
-         }%
-       }%
+        \ifx\thisshortcaption\empty
+          \def\gtemp{\thiscaption}%
+        \else
+          \def\gtemp{\thisshortcaption}%
+        \fi
         address@hidden
-         \ifx\gtemp\empty \else : \gtemp \fi}}%
+          \ifx\gtemp\empty \else : \gtemp \fi}}%
       }%
     \fi
   \egroup  % end of \vtop
   %
-  % place the captured inserts
-  %
-  % BEWARE: when the floats start floating, we have to issue warning
-  % whenever an insert appears inside a float which could possibly
-  % float. --kasal, 26may04
-  %
   \checkinserts
 }