texinfo ChangeLog doc/texinfo.tex

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/01/19 17:48:16

Modified files:
        .              : ChangeLog 
        doc            : texinfo.tex 

Log message:
        allow breaks at ? within @url; document

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1202&r2=1.1203
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.335&r2=1.336

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1202
retrieving revision 1.1203
diff -u -b -r1.1202 -r1.1203
--- ChangeLog   19 Jan 2011 17:33:16 -0000      1.1202
+++ ChangeLog   19 Jan 2011 17:48:15 -0000      1.1203
@@ -1,5 +1,9 @@
 2011-01-19  Karl Berry  <address@hidden>
 
+       * doc/texinfo.tex (\urefcode): also allow breaks at ?.
+       (\urefcodequestion): new macro.
+       * doc/texinfo.txi (uref): document new line breaking.
+
        * doc/texinfo.tex: reduce line lengths to <= 79 chars.
 
 2011-01-17  Oleg Katsitadze <address@hidden>

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -b -r1.335 -r1.336
--- doc/texinfo.tex     19 Jan 2011 17:33:16 -0000      1.335
+++ doc/texinfo.tex     19 Jan 2011 17:48:15 -0000      1.336
@@ -163,13 +163,13 @@
 \chardef\dashChar  = `\-
 \chardef\dotChar   = `\.
 \chardef\exclamChar= `\!
+\chardef\hashChar  = `\#
 \chardef\lquoteChar= `\`
 \chardef\questChar = `\?
 \chardef\rquoteChar= `\'
 \chardef\semiChar  = `\;
-\chardef\underChar = `\_
 \chardef\slashChar = `\/
-\chardef\hashChar  = `\#
+\chardef\underChar = `\_
 
 % Ignore a token.
 %
@@ -2491,16 +2491,18 @@
     \codex
   }
 }
-% This is similar to \code, but allows line breaks after ., # and /.
+% Handle @url similarly to \code, but allows line breaks after .#?/ (only).
 {
-  \catcode`\.=\active \catcode`\#=\active \catcode`\/=\active
+  \catcode`\.=\active \catcode`\#=\active
+  \catcode`\?=\active \catcode`\/=\active
   %
   \global\def\urefcode{\begingroup
     \setupmarkupstyle{code}%
     \catcode\dotChar=\active \catcode\hashChar=\active
-    \catcode\slashChar=\active
+    \catcode\questChar=\active \catcode\slashChar=\active
     \let.\urefcodedot
     \let#\urefcodehash
+    \let?\urefcodequestion
     \let/\urefcodeslash
     \codex
   }
@@ -2519,10 +2521,14 @@
              \discretionary{}{}{}}%
             {\_}%
 }
+% we put a little stretch before and after the breakable chars, to help
+% line breaking of long url's.  The unequal skips make look better in
+% cmtt at least, especially for dots.
 \def\urefprestretch{\nobreak \hskip0pt plus.13em }
 \def\urefpoststretch{\allowbreak \hskip0pt plus.1em }
 \def\urefcodedot{\urefprestretch .\urefpoststretch}
 \def\urefcodehash{\urefprestretch \#\urefpoststretch}
+\def\urefcodequestion{\urefprestretch ?\urefpoststretch}
 \def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
 {
   \catcode`\/=\active