plcore.dtx: Incorporate patch #52 from exppl2e.sty

texjporg · Aug 25, 2017 · e9e6d55 · e9e6d55
1 parent 9e96871
commit e9e6d55
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 73 deletions.
diff --git a/exppl2e.sty b/exppl2e.sty
@@ -34,7 +34,7 @@
 % case 1: This file must be a normal package
   \NeedsTeXFormat{pLaTeX2e}
   \ProvidesPackage{exppl2e}
-                [2017/07/29 v1.0n Experimental pLaTeX2e features]
+                [2017/08/25 v1.0o Experimental pLaTeX2e features]
   \PackageWarningNoLine{exppl2e}{%
       This is the unstable, experimental part of pLaTeX2e.\MessageBreak
       This package may contain:\MessageBreak
@@ -347,74 +347,9 @@
 % $B9TF,6XB'J8;z$NA0$G$N(B|\linebreak|$B$N5sF0$N=$@5$O!"(B
 % p\LaTeXe{}$B%+!<%M%k(B(2017/05/05)$B$KF3F~$7$?$?$a:o=|!#(B
 %
-% \begin{macro}{\@no@lnbk}
-% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B
-% $B$5$i$K!"(B|\\|$B$@$1$G$J$/(B|\linebreak|$B$K$D$$$F$bF1MM$NBP=h$r$7$^$9!#(B
-% \LaTeX{}$B$NDj5A$N$^$^$G$O%^%/%m$K$h$k%Z%J%k%F%#(B$-10000$$B$H(B
-% $B9TF,J8;z$N%Z%J%k%F%#(B$10000$$B$,2C;;$5$l$F$7$^$&$?$a!"(B
-% |\hskip\z@\relax|$B$rF~$l$F$*$-$^$9!#$J$*!"(B|\linebreak|$B$rH/9T$7$F(B
-% $B9TJ,3d$,5/$-$?>l9g!"?7$7$$9TF,$N(BJFM$B%0%k!=$O>C$($k$H$$$&=>Mh$N(B
-% p\LaTeX{}$B$N5sF0$b0];}$7$F$$$^$9!#(B
-% \changes{v1.2o}{2017/05/03}{$B9TF,6XB'J8;z$ND>A0$G$b2~9T$9$k$h$&$K$7$?(B}
-%
-% $BA02s$N(B|\hskip\z@\relax|$B$NDI2C$G$O!"(B|\nolinebreak|$B$N>l9g$K(B|\kanjiskip|$B$d(B
-% |\xkanjiskip|$B$,F~$i$J$$LdBj$,5/$-$F$7$^$$$^$7$?!#$=$3$G!"(B
-% |\penalty\z@\relax|$B$KJQ99$7$^$7$?!#$3$l$O!"L@<(E*$J(B|\penalty|$B%W%j%_%F%#%V(B
-% $BF1;N$N9g;;$O9T$o$l$J$$$3$H$rMxMQ$7$F$$$^$9!#(B
-% \changes{v????}{????/??/??}{\cs{nolinebreak}$B$N>l9g$K(B\cs{(x)kanjiskip}$B$,(B
-%    $BF~$i$J$/$J$C$F$$$?$N$r=$@5(B}
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{????/??/??}{\@no@lnbk}
-%<platexrelease>                   {Break before prebreakpenalty}%
-%<*plcore|platexrelease>
-\def\@no@lnbk #1[#2]{%
-  \ifvmode
-    \@nolnerr
-  \else
-    \@tempskipa\lastskip
-    \unskip
-    \penalty #1\@getpen{#2}%
-    \penalty\z@\relax %% added (????/??/??)
-    \ifdim\@tempskipa>\z@
-      \hskip\@tempskipa
-      \ignorespaces
-    \fi
-  \fi}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{2017/05/05}{\@no@lnbk}
-%<platexrelease>                   {Break before prebreakpenalty}%
-%<platexrelease>\def\@no@lnbk #1[#2]{%
-%<platexrelease>  \ifvmode
-%<platexrelease>    \@nolnerr
-%<platexrelease>  \else
-%<platexrelease>    \@tempskipa\lastskip
-%<platexrelease>    \unskip
-%<platexrelease>    \penalty #1\@getpen{#2}%
-%<platexrelease>    \hskip\z@\relax %% added (2017/05/03)
-%<platexrelease>    \ifdim\@tempskipa>\z@
-%<platexrelease>      \hskip\@tempskipa
-%<platexrelease>      \ignorespaces
-%<platexrelease>    \fi
-%<platexrelease>  \fi}
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\@no@lnbk}
-%<platexrelease>                   {Break before prebreakpenalty}%
-%<platexrelease>\def\@no@lnbk #1[#2]{%
-%<platexrelease>  \ifvmode
-%<platexrelease>    \@nolnerr
-%<platexrelease>  \else
-%<platexrelease>    \@tempskipa\lastskip
-%<platexrelease>    \unskip
-%<platexrelease>    \penalty #1\@getpen{#2}%
-%<platexrelease>    \ifdim\@tempskipa>\z@
-%<platexrelease>      \hskip\@tempskipa
-%<platexrelease>      \ignorespaces
-%<platexrelease>    \fi
-%<platexrelease>  \fi}
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
+% $B>e5-$N=$@5$K$h$j(B|\nolinebreak|$B$G(B|\(x)kanjiskip|$B$,(B
+% $BF~$i$J$/$J$C$F$$$?%P%0$N=$@5$O!"(B
+% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29+1)$B$KF3F~$7$?$?$a:o=|!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %

diff --git a/platexrelease.sty b/platexrelease.sty
@@ -435,6 +435,22 @@ of this package available from CTAN}
 \let\eminnershape\@undefined
 \plEndIncludeInRelease
 %% File: plcore.dtx
+\plIncludeInRelease{2017/07/29}{\@no@lnbk}
+                   {Break before prebreakpenalty}%
+\def\@no@lnbk #1[#2]{%
+  \ifvmode
+    \@nolnerr
+  \else
+    \@tempskipa\lastskip
+    \unskip
+    \penalty #1\@getpen{#2}%
+    \penalty\z@\relax %% added (2017/08/25)
+    \ifdim\@tempskipa>\z@
+      \hskip\@tempskipa
+      \ignorespaces
+    \fi
+  \fi}
+\plEndIncludeInRelease
 \plIncludeInRelease{2017/05/05}{\@no@lnbk}
                    {Break before prebreakpenalty}%
 \def\@no@lnbk #1[#2]{%

diff --git a/plcore.dtx b/plcore.dtx
@@ -68,13 +68,15 @@
 % \changes{v1.2n}{2017/04/23}{$B%I%-%e%a%s%H$NDI2C(B}
 % \changes{v1.2o}{2017/05/03}{$B9TF,6XB'J8;z$ND>A0$G$b2~9T$9$k$h$&$K$7$?(B}
 % \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
+% \changes{v1.2q}{2017/08/25}{\cs{nolinebreak}$B$N>l9g$K(B\cs{(x)kanjiskip}$B$,(B
+%    $BF~$i$J$/$J$C$F$$$?$N$r=$@5(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plcore.dtx}[2017/07/21 v1.2p pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2017/08/25 v1.2q pLaTeX core file]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plcore.dtx}
@@ -269,8 +271,15 @@
 % $B9TJ,3d$,5/$-$?>l9g!"?7$7$$9TF,$N(BJFM$B%0%k!=$O>C$($k$H$$$&=>Mh$N(B
 % p\LaTeX{}$B$N5sF0$b0];}$7$F$$$^$9!#(B
 % \changes{v1.2o}{2017/05/03}{$B9TF,6XB'J8;z$ND>A0$G$b2~9T$9$k$h$&$K$7$?(B}
+%
+% $BA02s$N(B|\hskip\z@\relax|$B$NDI2C$G$O!"(B|\nolinebreak|$B$N>l9g$K(B|\kanjiskip|$B$d(B
+% |\xkanjiskip|$B$,F~$i$J$$LdBj$,5/$-$F$7$^$$$^$7$?!#$=$3$G!"(B
+% |\penalty\z@\relax|$B$KJQ99$7$^$7$?!#$3$l$O!"L@<(E*$J(B|\penalty|$B%W%j%_%F%#%V(B
+% $BF1;N$N9g;;$O9T$o$l$J$$$3$H$rMxMQ$7$F$$$^$9!#(B
+% \changes{v1.2q}{2017/08/25}{\cs{nolinebreak}$B$N>l9g$K(B\cs{(x)kanjiskip}$B$,(B
+%    $BF~$i$J$/$J$C$F$$$?$N$r=$@5(B}
 %    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/05/05}{\@no@lnbk}
+%<platexrelease>\plIncludeInRelease{2017/07/29}{\@no@lnbk}
 %<platexrelease>                   {Break before prebreakpenalty}%
 %<*plcore|platexrelease>
 \def\@no@lnbk #1[#2]{%
@@ -280,14 +289,30 @@
     \@tempskipa\lastskip
     \unskip
     \penalty #1\@getpen{#2}%
-    \hskip\z@\relax %% added (2017/05/03)
+    \penalty\z@\relax %% added (2017/08/25)
     \ifdim\@tempskipa>\z@
       \hskip\@tempskipa
       \ignorespaces
     \fi
   \fi}
 %</plcore|platexrelease>
 %<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2017/05/05}{\@no@lnbk}
+%<platexrelease>                   {Break before prebreakpenalty}%
+%<platexrelease>\def\@no@lnbk #1[#2]{%
+%<platexrelease>  \ifvmode
+%<platexrelease>    \@nolnerr
+%<platexrelease>  \else
+%<platexrelease>    \@tempskipa\lastskip
+%<platexrelease>    \unskip
+%<platexrelease>    \penalty #1\@getpen{#2}%
+%<platexrelease>    \hskip\z@\relax %% added (2017/05/03)
+%<platexrelease>    \ifdim\@tempskipa>\z@
+%<platexrelease>      \hskip\@tempskipa
+%<platexrelease>      \ignorespaces
+%<platexrelease>    \fi
+%<platexrelease>  \fi}
+%<platexrelease>\plEndIncludeInRelease
 %<platexrelease>\plIncludeInRelease{0000/00/00}{\@no@lnbk}
 %<platexrelease>                   {Break before prebreakpenalty}%
 %<platexrelease>\def\@no@lnbk #1[#2]{%

diff --git a/plcore.ltx b/plcore.ltx
@@ -719,7 +719,7 @@
     \@tempskipa\lastskip
     \unskip
     \penalty #1\@getpen{#2}%
-    \hskip\z@\relax %% added (2017/05/03)
+    \penalty\z@\relax %% added (2017/08/25)
     \ifdim\@tempskipa>\z@
       \hskip\@tempskipa
       \ignorespaces