texlive[44369] trunk: lwarp (15may17)
commits+karl at tug.org
commits+karl at tug.org
Mon May 15 23:14:35 CEST 2017
Revision: 44369
http://tug.org/svn/texlive?view=revision&revision=44369
Author: karl
Date: 2017-05-15 23:14:35 +0200 (Mon, 15 May 2017)
Log Message:
-----------
lwarp (15may17)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
trunk/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2017-05-15 21:14:13 UTC (rev 44368)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2017-05-15 21:14:35 UTC (rev 44369)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.30"
+printversion = "v0.31"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl 2017-05-15 21:14:13 UTC (rev 44368)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl 2017-05-15 21:14:35 UTC (rev 44369)
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: updmap.pl 44149 2017-05-02 09:57:51Z preining $
+# $Id: updmap.pl 44331 2017-05-14 02:15:43Z preining $
# updmap - maintain map files for outline fonts.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
@@ -14,7 +14,7 @@
# the original versions were licensed under the following agreement:
# Anyone may freely use, modify, and/or distribute this file, without
-my $svnid = '$Id: updmap.pl 44149 2017-05-02 09:57:51Z preining $';
+my $svnid = '$Id: updmap.pl 44331 2017-05-14 02:15:43Z preining $';
my $TEXMFROOT;
BEGIN {
@@ -27,10 +27,10 @@
unshift(@INC, "$TEXMFROOT/tlpkg");
}
-my $lastchdate = '$Date: 2017-05-02 11:57:51 +0200 (Tue, 02 May 2017) $';
+my $lastchdate = '$Date: 2017-05-14 04:15:43 +0200 (Sun, 14 May 2017) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 44149 $';
+my $svnrev = '$Revision: 44331 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "r$svnrev ($lastchdate)";
@@ -866,6 +866,10 @@
$italicmax = .3;
s/,Italic//;
}
+ # replace supported "/AJ16" and co. for ptex-fontmaps CID emulation
+ # note that the emulation method in GS is incomplete
+ # due to "Reversal CMap method" (cf. "ToUnicode method")
+ s!/A[JGCK]1[0-6]!!;
# break out if unsupported constructs are found: @ / ,
next if (m![\@/,]!);
# make everything single spaced
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2017-05-15 21:14:13 UTC (rev 44368)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2017-05-15 21:14:35 UTC (rev 44369)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.30 README.txt
+LaTeX lwarp package v0.31 README.txt
Files included are:
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2017-05-15 21:14:13 UTC (rev 44368)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2017-05-15 21:14:35 UTC (rev 44369)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.30"
+printversion = "v0.31"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2017-05-15 21:14:13 UTC (rev 44368)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2017-05-15 21:14:35 UTC (rev 44369)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2017/04/29 v0.30 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2017/05/15 v0.31 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -972,7 +972,7 @@
%<*package>
% \fi
%
-% \CheckSum{10974}
+% \CheckSum{10985}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -1041,6 +1041,7 @@
% \changes{v0.28}{2017/04/14}{\ 2017/04/14}
% \changes{v0.29}{2017/04/15}{\ 2017/04/15}
% \changes{v0.30}{2017/04/29}{\ 2017/04/29}
+% \changes{v0.31}{2017/05/15}{\ 2017/05/15}
@@ -1174,6 +1175,11 @@
% For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}.
%
% \begin{description}
+% \item[v0.31:] \
+% \begin{itemize}
+% \item Improved compatibility with \pkg{keyfloat},
+% including the new \env{keywrap} environment.
+% \end{itemize}
% \item[v0.30:] \
% \begin{itemize}
% \item \pkg{lwarp-newproject} has been removed, and its functions
@@ -7822,7 +7828,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.30"
+printversion = "v0.31"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -16931,7 +16937,6 @@
\begin{warpHTML}
% \end{macrocode}
-
% \begin{environment}{center}
% Replace \env{center} functionality with \CSS\ tags:
% \begin{macrocode}
@@ -16966,6 +16971,7 @@
% \end{macrocode}
% \end{environment}
+
% \begin{macrocode}
\end{warpHTML}
% \end{macrocode}
@@ -20131,7 +20137,7 @@
%
% Borrowed from the \pkg{lwarp} version of \pkg{keyfloat}:
% \begin{macrocode}
-\DeclareDocumentEnvironment{KFLT at marginfloat}{O{-1.2ex} m}
+\NewDocumentEnvironment{KFLTfloatflt at marginfloat}{O{-1.2ex} m}
{% start
\LWR at maybeincthisfloat%
\LWR at forcenewpage
@@ -20145,12 +20151,12 @@
}
\DeclareDocumentEnvironment{floatingfigure}{o m}
- {\begin{KFLT at marginfloat}{figure}}
- {\end{KFLT at marginfloat}}
+ {\begin{KFLTfloatflt at marginfloat}{figure}}
+ {\end{KFLTfloatflt at marginfloat}}
\DeclareDocumentEnvironment{floatingtable}{o +m}
- {\begin{KFLT at marginfloat}{table}#2}
- {\end{KFLT at marginfloat}}
+ {\begin{KFLTfloatflt at marginfloat}{table}#2}
+ {\end{KFLTfloatflt at marginfloat}}
% \end{macrocode}
%
% \iffalse
@@ -21461,6 +21467,7 @@
% \pkg{keyfloat} is supported with minor adjustments.
%
% \changes{v0.20}{2017/01/16}{\pkg{keyfloat}: Added.}
+% \changes{v0.31}{2017/05/12}{\pkg{keyfloat}: Improved compatibility.}
%
% \codehtml
% \begin{macrocode}
@@ -21471,6 +21478,41 @@
% \begin{macrocode}
\AtBeginDocument{
% \end{macrocode}
+%
+% ^^A *8* use a virtual line width instead of \linewidth
+% ^^A% Modified to use \cs{LWR at minipagewidth} instead of \cs{linewidth}:
+% ^^A% \begin{macrocode}
+% ^^A\renewcommand*{\KFLT at findwidths}{%
+% ^^A\typeout{*** KFLT at findwidths start}% *8*
+% ^^A% \end{macrocode}
+% ^^A% Default to a box of full \cs{linewidth} minus the potential frame:
+% ^^A% \begin{macrocode}
+% ^^A\ifthenelse{\boolean{KFLT at ft}}% tight frame?
+% ^^A{\setlength{\KFLT at boxwidth}{\linewidth - 2\KFLTtightframewidth}}%
+% ^^A{% not tight frame
+% ^^A\ifthenelse{\boolean{KFLT at f}}% loose frame?
+% ^^A{\setlength{\KFLT at boxwidth}{\linewidth - 2\KFLTlooseframewidth}}%
+% ^^A{\setlength{\KFLT at boxwidth}{\linewidth}}% no frame
+% ^^A}% not tight frame
+% ^^A% \end{macrocode}
+% ^^A% Several width options exist. First see if width was given:
+% ^^A% \begin{macrocode}
+% ^^A\ifthenelse{\dimtest{\KFLT at w}{>}{0pt}}%
+% ^^A% \end{macrocode}
+% ^^A% Width was given:
+% ^^A% \begin{macrocode}
+% ^^A{\setlength{\KFLT at imagewidth}{\KFLT at w}}%
+% ^^A{% width not given
+% ^^A% \end{macrocode}
+% ^^A% Use full \cs{linewidth} or only a fraction:
+% ^^A% \begin{macrocode}
+% ^^A\ifcsempty{\KFLT at lw}%
+% ^^A{\setlength{\KFLT at imagewidth}{\KFLT at boxwidth}}%
+% ^^A{\setlength{\KFLT at imagewidth}{\KFLT at lw\KFLT at boxwidth}}%
+% ^^A}% width not given
+% ^^A\typeout{*** KFLT at findwidths end}% *8*
+% ^^A}
+% ^^A% \end{macrocode}
% \begin{macrocode}
@@ -21505,6 +21547,59 @@
% \begin{macrocode}
+\DeclareDocumentEnvironment{marginfigure}{o}
+ {\begin{KFLT at marginfloat}{figure}}
+ {\end{KFLT at marginfloat}}
+
+\DeclareDocumentEnvironment{margintable}{o}
+ {\begin{KFLT at marginfloat}{table}}
+ {\end{KFLT at marginfloat}}
+% \end{macrocode}
+
+
+% ^^A % Modified to vertically align minipage for \HTML\ output:
+% \begin{macrocode}
+\DeclareDocumentEnvironment{keywrap}{m +m}
+{%
+\begin{BlockClass}{marginblock}
+\setlength{\linewidth}{#1}
+#2%
+\end{BlockClass}
+}
+{%
+}
+% \end{macrocode}
+% ^^A \par%
+% ^^A \setlength{\KFLT at keywrapwidth}{\linewidth}%
+% ^^A \addtolength{\KFLT at keywrapwidth}{-#1}%
+% ^^A \addtolength{\KFLT at keywrapwidth}{-2em}%
+% ^^A \minipage[b]{\KFLT at keywrapwidth}%
+% ^^A %
+% ^^A \setlength{\parskip}{\KFLT at keywrapparskip}%
+% ^^A \setlength{\parindent}{\KFLT at keywrapparindent}%
+% ^^A \booltrue{KFLT at keywrap}%
+% ^^A }
+% ^^A {%
+% ^^A \par
+% ^^A \endminipage%
+% ^^A \hfill%
+% ^^A \begin{minipage}[b]{#1}%
+% ^^A \booltrue{KFLT at keywrap}%
+% ^^A #2%
+% ^^A \par
+% ^^A \unskip\vspace{\smallskipamount}
+% ^^A \end{minipage}%
+% ^^A \par
+% ^^A }
+
+% ^^A \BeforeBeginEnvironment{keywrap}{
+% ^^A \setlength{\KFLT at keywrapparskip}{\parskip}
+% ^^A \setlength{\KFLT at keywrapparindent}{\parindent}
+% ^^A }
+% ^^A % \end{macrocode}
+
+
+% \begin{macrocode}
}% AtBeginDocument
% \end{macrocode}
@@ -21515,6 +21610,7 @@
%
%
%
+% \clearpage
%
% \iffalse
%<*layout>
@@ -24064,7 +24160,7 @@
%
% Borrowed from the \pkg{lwarp} version of \pkg{keyfloat}:
% \begin{macrocode}
-\DeclareDocumentEnvironment{KFLT at marginfloat}{O{-1.2ex} m}
+\NewDocumentEnvironment{KFLTsidenotes at marginfloat}{O{-1.2ex} m}
{% start
\LWR at maybeincthisfloat%
\LWR at forcenewpage
@@ -24078,12 +24174,12 @@
}
\RenewDocumentEnvironment{marginfigure}{o}
- {\begin{KFLT at marginfloat}{figure}}
- {\end{KFLT at marginfloat}}
+ {\begin{KFLTsidenotes at marginfloat}{figure}}
+ {\end{KFLTsidenotes at marginfloat}}
\RenewDocumentEnvironment{margintable}{o}
- {\begin{KFLT at marginfloat}{table}}
- {\end{KFLT at marginfloat}}
+ {\begin{KFLTsidenotes at marginfloat}{table}}
+ {\end{KFLTsidenotes at marginfloat}}
% \end{macrocode}
%
% The following were changed by \pkg{sidenotes}, and now are
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty 2017-05-15 21:14:13 UTC (rev 44368)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty 2017-05-15 21:14:35 UTC (rev 44369)
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\LWR at ProvidesPackageDrop{floatflt}
-\DeclareDocumentEnvironment{KFLT at marginfloat}{O{-1.2ex} m}
+\NewDocumentEnvironment{KFLTfloatflt at marginfloat}{O{-1.2ex} m}
{% start
\LWR at maybeincthisfloat%
\LWR at forcenewpage
@@ -30,12 +30,12 @@
}
\DeclareDocumentEnvironment{floatingfigure}{o m}
- {\begin{KFLT at marginfloat}{figure}}
- {\end{KFLT at marginfloat}}
+ {\begin{KFLTfloatflt at marginfloat}{figure}}
+ {\end{KFLTfloatflt at marginfloat}}
\DeclareDocumentEnvironment{floatingtable}{o +m}
- {\begin{KFLT at marginfloat}{table}#2}
- {\end{KFLT at marginfloat}}
+ {\begin{KFLTfloatflt at marginfloat}{table}#2}
+ {\end{KFLTfloatflt at marginfloat}}
\endinput
%%
%% End of file `lwarp-floatflt.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty 2017-05-15 21:14:13 UTC (rev 44368)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty 2017-05-15 21:14:35 UTC (rev 44369)
@@ -46,6 +46,25 @@
\LWR at htmldivclassend{div}
}
+\DeclareDocumentEnvironment{marginfigure}{o}
+ {\begin{KFLT at marginfloat}{figure}}
+ {\end{KFLT at marginfloat}}
+
+\DeclareDocumentEnvironment{margintable}{o}
+ {\begin{KFLT at marginfloat}{table}}
+ {\end{KFLT at marginfloat}}
+
+\DeclareDocumentEnvironment{keywrap}{m +m}
+{%
+\begin{BlockClass}{marginblock}
+\setlength{\linewidth}{#1}
+#2%
+\end{BlockClass}
+}
+{%
+}
+
+
}% AtBeginDocument
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty 2017-05-15 21:14:13 UTC (rev 44368)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty 2017-05-15 21:14:35 UTC (rev 44369)
@@ -36,7 +36,7 @@
}
\LWR at startpars
}
-\DeclareDocumentEnvironment{KFLT at marginfloat}{O{-1.2ex} m}
+\NewDocumentEnvironment{KFLTsidenotes at marginfloat}{O{-1.2ex} m}
{% start
\LWR at maybeincthisfloat%
\LWR at forcenewpage
@@ -50,12 +50,12 @@
}
\RenewDocumentEnvironment{marginfigure}{o}
- {\begin{KFLT at marginfloat}{figure}}
- {\end{KFLT at marginfloat}}
+ {\begin{KFLTsidenotes at marginfloat}{figure}}
+ {\end{KFLTsidenotes at marginfloat}}
\RenewDocumentEnvironment{margintable}{o}
- {\begin{KFLT at marginfloat}{table}}
- {\end{KFLT at marginfloat}}
+ {\begin{KFLTsidenotes at marginfloat}{table}}
+ {\end{KFLTsidenotes at marginfloat}}
\renewenvironment{figure*}
{\@dblfloat{figure}}
{\end at dblfloat}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2017-05-15 21:14:13 UTC (rev 44368)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2017-05-15 21:14:35 UTC (rev 44369)
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2017/04/29 v0.30 Allows LaTeX to directly produce HTML5 output.]
+ [2017/05/15 v0.31 Allows LaTeX to directly produce HTML5 output.]
@@ -2286,7 +2286,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.30"
+printversion = "v0.31"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
More information about the tex-live-commits
mailing list