summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base/ltmiscen.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/base/ltmiscen.dtx')
-rw-r--r--Master/texmf-dist/source/latex/base/ltmiscen.dtx61
1 files changed, 58 insertions, 3 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltmiscen.dtx b/Master/texmf-dist/source/latex/base/ltmiscen.dtx
index d28f2921f06..4501067d3e5 100644
--- a/Master/texmf-dist/source/latex/base/ltmiscen.dtx
+++ b/Master/texmf-dist/source/latex/base/ltmiscen.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2014
+% Copyright 1993-2017
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -32,7 +32,7 @@
%<*driver>
% \fi
\ProvidesFile{ltmiscen.dtx}
- [2014/09/29 v1.1l LaTeX Kernel (Misc. Environments)]
+ [2017/03/09 v1.1m LaTeX Kernel (Misc. Environments)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltmiscen.dtx}
@@ -609,6 +609,10 @@
% \changes{v1.0b}{1994/03/16}
% {Remove \cs{global}\cs{@inlabelfalse} again.}
% \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2017-04-15}{\@verbatim}%
+%<latexrelease> {Disable hyphenation in verbatim}%
\def\@verbatim{\trivlist \item\relax
\if@minipage\else\vskip\parskip\fi
\leftskip\@totalleftmargin\rightskip\z@skip
@@ -619,8 +623,14 @@
% from a surrounding list (the verbatim guru says).
% \changes{v0.9p}{1994/01/18}
% {Only add \cs{penalty} if in hmode}
+% Switch language when in vertical mode.
% \begin{macrocode}
\@@par
+% \end{macrocode}
+% Set |\language| here to suppress hyphenation. Done this way rather
+% than setting |\hyphenchar| as that is a global setting.
+% \begin{macrocode}
+ \language\l@nohyphenation
\@tempswafalse
\def\par{%
\if@tempswa
@@ -642,10 +652,10 @@
% so that \cs{dospecials} cannot reset the category code
% of characters handled by \cs{@noligs}.}
% \changes{v1.1h}{2000/01/07}{Disable hyphenation even if the font allows it.}
+% \changes{v1.1m}{2017-03-09}{Use \cs{language} not \cs{hyphenchar}}
% \begin{macrocode}
\let\do\@makeother \dospecials
\obeylines \verbatim@font \@noligs
- \hyphenchar\font\m@ne
% \end{macrocode}
% To avoid a breakpoint after the labels box, we remove the penalty
% put there by the list macros: another use of |\unpenalty|!
@@ -653,6 +663,29 @@
% \begin{macrocode}
\everypar \expandafter{\the\everypar \unpenalty}%
}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000-00-00}{\@verbatim}%
+%<latexrelease> {Disable hyphenation in verbatim}%
+%<latexrelease>\def\@verbatim{\trivlist \item\relax
+%<latexrelease> \if@minipage\else\vskip\parskip\fi
+%<latexrelease> \leftskip\@totalleftmargin\rightskip\z@skip
+%<latexrelease> \parindent\z@\parfillskip\@flushglue\parskip\z@skip
+%<latexrelease> \@@par
+%<latexrelease> \@tempswafalse
+%<latexrelease> \def\par{%
+%<latexrelease> \if@tempswa
+%<latexrelease> \leavevmode \null \@@par\penalty\interlinepenalty
+%<latexrelease> \else
+%<latexrelease> \@tempswatrue
+%<latexrelease> \ifhmode\@@par\penalty\interlinepenalty\fi
+%<latexrelease> \fi}%
+%<latexrelease> \let\do\@makeother \dospecials
+%<latexrelease> \obeylines \verbatim@font \@noligs
+%<latexrelease> \hyphenchar\font\m@ne
+%<latexrelease> \everypar \expandafter{\the\everypar \unpenalty}%
+%<latexrelease>}
+%<*2ekernel>
% \end{macrocode}
% \end{macro}
%
@@ -731,12 +764,34 @@
% \cs{dospecials}
% so that \cs{dospecials} cannot reset the category code
% of characters handled by \cs{@noligs}.}
+% \changes{v1.1m}{2017/03/09}
+% {Use \cs{language} to stop hyphenation}
% \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2017-04-15}{\verb}%
+%<latexrelease> {Disable hyphenation in verb}%
\def\verb{\relax\ifmmode\hbox\else\leavevmode\null\fi
\bgroup
\verb@eol@error \let\do\@makeother \dospecials
\verbatim@font\@noligs
+% \end{macrocode}
+% Set |\language| here to suppress hyphenation. Done this way rather
+% than setting |\hyphenchar| as that is a global setting.
+% \begin{macrocode}
+ \language\l@nohyphenation
\@ifstar\@sverb\@verb}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000-00-00}{\verb}%
+%<latexrelease> {Disable hyphenation in verb}%
+%<latexrelease>\def\verb{\relax\ifmmode\hbox\else\leavevmode\null\fi
+%<latexrelease> \bgroup
+%<latexrelease> \verb@eol@error \let\do\@makeother \dospecials
+%<latexrelease> \verbatim@font\@noligs
+%<latexrelease> \@ifstar\@sverb\@verb}
+%<*2ekernel>
% \end{macrocode}
% \end{macro}
%