[latex3-commits] [latex2e-public] r1429 - restore tt \- in parboxes broken by r1422

[noreply at latex-project.org]

Author: carlisle
Date: 2017-03-27 22:14:09 +0200 (Mon, 27 Mar 2017)
New Revision: 1429

Modified:
   trunk/base/changes.txt
   trunk/base/ltdefns.dtx
Log:
restore tt \- in parboxes broken by r1422

Modified: trunk/base/changes.txt
===================================================================
--- trunk/base/changes.txt	2017-03-17 15:10:42 UTC (rev 1428)
+++ trunk/base/changes.txt	2017-03-27 20:14:09 UTC (rev 1429)
@@ -9,6 +9,11 @@
 #########################
 
 
+2017-03-27  David Carlisle  <latex-bugs at latex-project.org>
+
+	* ltdefns.dtx: move the definition of \@dischyph to be after that
+	of \- again.
+
 2017-03-17  David Carlisle  <latex-bugs at latex-project.org>
 
 	* ltsect.dtx: Adjust the documentation of

Modified: trunk/base/ltdefns.dtx
===================================================================
--- trunk/base/ltdefns.dtx	2017-03-17 15:10:42 UTC (rev 1428)
+++ trunk/base/ltdefns.dtx	2017-03-27 20:14:09 UTC (rev 1429)
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltdefns.dtx}
-             [2017/03/13 v1.5a LaTeX Kernel (definition commands)]
+             [2017/03/73 v1.5b LaTeX Kernel (definition commands)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltdefns.dtx}
@@ -150,13 +150,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@dischyph}
-% \changes{v1.0g}{1994/04/12}
-%         {Define \cs{@dischyph}, was previously in ltboxes.dtx}
-%    \begin{macrocode}
-\let\@dischyph=\-
-%    \end{macrocode}
-% \end{macro}
 %
 %  \begin{macro}{\@@italiccorr}
 % Save the original italic correction.
@@ -1411,6 +1404,11 @@
 % \begin{macro}{\-}
 % \changes{1.2x}{1995/12/13}{Documentation changed.}
 % \changes{v1.5a}{2017/03/13}{Define \cs{-} in terms of \cs{hyphenchar}}
+% \begin{macro}{\@dischyph}
+% \changes{v1.0g}{1994/04/12}
+%         {Define \cs{@dischyph}, was previously in ltboxes.dtx}
+% \changes{v1.5b}{2017/03/27}{Define \cs{@dischyph} after \cs{-}}
+% \end{macro}
 % Moved here to be after the definition of |\DeclareRobustCommand|.
 %
 % The primitive |\-| command adds a discretionary hyphen using the
@@ -1461,10 +1459,12 @@
           \fi
                }{}{}%
 }
+\let\@dischyph=\-
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}{\-}{Use \hyphenchar in \-}%
 %<latexrelease>\def\-{\discretionary{-}{}{}}
+%<latexrelease>\let\@dischyph=\-
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}