[5408] no stretchiness around special chars in @url inside @raggedright

[karl]

Revision: 5408
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5408
Author:   karl
Date:     2014-02-06 23:16:46 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
no stretchiness around special chars in @url inside @raggedright

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-02-02 23:13:26 UTC (rev 5407)
+++ trunk/ChangeLog     2014-02-06 23:16:46 UTC (rev 5408)
@@ -1,3 +1,10 @@
+2014-02-06  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\ure{pre,post}stretchamount): new macros.
+       (\uref{pre,post}stretch): use them.
+       (\raggedright): reset them to 0pt.  Also increase rag to 2.4em.
+       Bug report from Werner Lember, 06 Feb 2014 19:01:05.
+
 2014-02-02  Karl Berry  <address@hidden>
 
        * doc/texinfo.texi (@t{@@documentencoding}): ISO-8859 ordering

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2014-02-02 23:13:26 UTC (rev 5407)
+++ trunk/doc/texinfo.tex       2014-02-06 23:16:46 UTC (rev 5408)
@@ -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{2014-01-30.15}
+\def\texinfoversion{2014-02-06.15}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2650,8 +2650,10 @@
 % 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{\urefprebreak \hskip0pt plus.13em }
-\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em }
+\def\urefprestretchamount{.13em}
+\def\urefpoststretchamount{.1em}
+\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax}
+\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax}
 %
 \def\urefcodeamp{\urefprestretch \&\urefpoststretch}
 \def\urefcodedot{\urefprestretch .\urefpoststretch}
@@ -6589,9 +6591,13 @@
 
 
 % @raggedright does more-or-less normal line breaking but no right
-% justification.  From plain.tex.
+% justification.  From plain.tex.  Don't stretch around special
+% characters in urls in this environment, since the stretch at the right
+% should be enough.
 \envdef\raggedright{%
-  \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax
+  \rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax
+  \def\urefprestretchamount{0pt}%
+  \def\urefpoststretchamount{0pt}%
 }
 \let\Eraggedright\par