From 130fb6350db2aad61eca882f23ed963d1ea31821 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 13 Oct 2018 21:03:22 +0000 Subject: lwarp (13oct18) git-svn-id: svn://tug.org/texlive/trunk@48904 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/lwarp/lwarp-chkfloat.sty | 21 ++ .../texmf-dist/tex/latex/lwarp/lwarp-cmdtrack.sty | 22 ++ .../tex/latex/lwarp/lwarp-copyrightbox.sty | 37 +++ .../texmf-dist/tex/latex/lwarp/lwarp-dprogress.sty | 21 ++ Master/texmf-dist/tex/latex/lwarp/lwarp-epsfig.sty | 37 +++ .../texmf-dist/tex/latex/lwarp/lwarp-graphics.sty | 56 +++-- .../tex/latex/lwarp/lwarp-lua-visual-debug.sty | 21 ++ .../tex/latex/lwarp/lwarp-patch-memoir.sty | 2 +- .../tex/latex/lwarp/lwarp-pdfprivacy.sty | 21 ++ .../texmf-dist/tex/latex/lwarp/lwarp-preview.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty | 26 +++ .../texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty | 36 +++ Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty | 34 +++ .../texmf-dist/tex/latex/lwarp/lwarp-refcheck.sty | 30 +++ .../texmf-dist/tex/latex/lwarp/lwarp-register.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-srcltx.sty | 30 +++ Master/texmf-dist/tex/latex/lwarp/lwarp-srctex.sty | 22 ++ .../tex/latex/lwarp/lwarp-supertabular.sty | 12 +- .../texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty | 29 +++ .../texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty | 22 ++ .../texmf-dist/tex/latex/lwarp/lwarp-twoup-gen.sty | 23 -- Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty | 21 ++ Master/texmf-dist/tex/latex/lwarp/lwarp-vpe.sty | 21 ++ Master/texmf-dist/tex/latex/lwarp/lwarp-xbmks.sty | 26 +++ Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty | 8 +- Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 255 +++++++++++++-------- 28 files changed, 695 insertions(+), 146 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-chkfloat.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-cmdtrack.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-dprogress.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-epsfig.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-lua-visual-debug.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-refcheck.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-srcltx.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-srctex.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty delete mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-twoup-gen.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-vpe.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-xbmks.sty (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chkfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chkfloat.sty new file mode 100644 index 00000000000..a968a684153 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chkfloat.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-chkfloat.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `chkfloat') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{chkfloat}[2012/08/19] +\endinput +%% +%% End of file `lwarp-chkfloat.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cmdtrack.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cmdtrack.sty new file mode 100644 index 00000000000..dcc408da858 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cmdtrack.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-cmdtrack.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `cmdtrack') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{cmdtrack}[2012/12/18] +\newcommand{\untrack}[1]{} +\endinput +%% +%% End of file `lwarp-cmdtrack.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty new file mode 100644 index 00000000000..9101bab3510 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty @@ -0,0 +1,37 @@ +%% +%% This is file `lwarp-copyrightbox.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `copyrightbox') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{copyrightbox} +\newcommand{\copyrightbox}[3][r]{% +\begin{BlockClass}[ + display: inline-flex; + flex-direction: column ; +]{copyrightbox} +\begin{BlockClass}{copyrightboxcontents} +#2 +\end{BlockClass} +\begin{BlockClass}{copyrightboxnote} +#3 +\end{BlockClass} +\end{BlockClass} +} + +\newcommand{\CRB@setcopyrightfont}{} +\newcommand{\CRB@setcopyrightparagraphstyle}{} +\endinput +%% +%% End of file `lwarp-copyrightbox.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dprogress.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dprogress.sty new file mode 100644 index 00000000000..6969df462c5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dprogress.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-dprogress.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `dprogress') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{dprogress}[2008/02/21] +\endinput +%% +%% End of file `lwarp-dprogress.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epsfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epsfig.sty new file mode 100644 index 00000000000..31838f231b1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epsfig.sty @@ -0,0 +1,37 @@ +%% +%% This is file `lwarp-epsfig.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `epsfig') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{epsfig}[2017/06/25] +\RequirePackage{graphics} + +\define@key{igraph}{file}{% + \xdef\LWR@epsfig@filename{#1}% +} + +\define@key{igraph}{figure}{% + \xdef\LWR@epsfig@filename{#1}% +} + +\define@key{igraph}{prolog}{} + +\define@key{igraph}{silent}[]{} +\newcommand{\epsfig}[1]{\includegraphics[#1]{\LWR@epsfig@filename}} + +\newcommand{\psfig}[1]{\includegraphics[#1]{\LWR@epsfig@filename}} +\endinput +%% +%% End of file `lwarp-epsfig.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 9c3588bb24a..69b99f40359 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -25,9 +25,21 @@ \DeclareGraphicsRule{.svg}{svg}{.svg}{} \DeclareGraphicsRule{.SVG}{svg}{.SVG}{} } +\ifpdf \appto\LWR@restoreorigformatting{% \DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% } +\else% \ifpdf + \ifXeTeX +\appto\LWR@restoreorigformatting{% +\DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% +} + \else +\appto\LWR@restoreorigformatting{% +\DeclareGraphicsExtensions{.eps,.EPS,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% +} + \fi +\fi \newlength{\LWR@igwidth} @@ -81,14 +93,15 @@ }{}% end of length > 0pt } \define@key{igraph}{origin}[c]{% -\renewcommand*{\LWR@igorigin}{#1}% + \renewcommand*{\LWR@igorigin}{#1}% } \define@key{igraph}{angle}{\renewcommand*{\LWR@igangle}{#1}} \define@key{igraph}{class}{\renewcommand*{\LWR@igclass}{#1}} \define@key{igraph}{scale}{% -\renewcommand*{\LWR@igxscale}{#1}% -\renewcommand*{\LWR@igyscale}{#1}} + \renewcommand*{\LWR@igxscale}{#1}% + \renewcommand*{\LWR@igyscale}{#1}% +} \define@key{igraph}{bb}{} \define@key{igraph}{bbllx}{} \define@key{igraph}{bblly}{} @@ -152,7 +165,6 @@ \NewDocumentCommand{\LWR@includegraphicsb}{s o o m} {% -\LWR@traceinfo{LWR@includegraphicsb #4}% \LWR@origtilde \LWR@orignewline% \begingroup% \ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}% @@ -165,17 +177,6 @@ \setlength{\textheight}{9in}% }% }{}% -\begingroup% -\LetLtxMacro\Gin@setfile\LWR@HTML@Gin@setfile% -\edef\LWR@tempone{#4}% -\StrSubstitute{\LWR@tempone}{.pdf}{.svg}[\LWR@tempone]% -\StrSubstitute{\LWR@tempone}{.PDF}{.SVG}[\LWR@tempone]% -\LWR@replaceEPSSVG% -\xdef\LWR@parsedfilename{\LWR@tempone}% -\Ginclude@graphics{\detokenize\expandafter{\LWR@tempone}}% -\endgroup% -\filename@parse{\LWR@parsedfilename}% -\LWR@traceinfo{LWR@parsedfilename is \LWR@parsedfilename}% \large% \setlength{\LWR@igwidth}{0pt}% \setlength{\LWR@igheight}{0pt}% @@ -191,9 +192,34 @@ {\setkeys{igraph}{#2}}% {\setkeys{igraph}{}}% }% +\begingroup% +\LetLtxMacro\Gin@setfile\LWR@HTML@Gin@setfile% +\edef\LWR@tempone{#4}% +\StrSubstitute{\LWR@tempone}{.pdf}{.svg}[\LWR@tempone]% +\StrSubstitute{\LWR@tempone}{.PDF}{.SVG}[\LWR@tempone]% +\LWR@replaceEPSSVG% +\xdef\LWR@parsedfilename{\LWR@tempone}% +\Ginclude@graphics{\detokenize\expandafter{\LWR@tempone}}% +\endgroup% +\filename@parse{\LWR@parsedfilename}% +\LWR@traceinfo{LWR@parsedfilename is \LWR@parsedfilename}% \ifbool{FormatWP}{% \begingroup% + \ifpdf + \appto\LWR@restoreorigformatting{% \DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% + } + \else% \ifpdf + \ifXeTeX + \appto\LWR@restoreorigformatting{% + \DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% + } + \else + \appto\LWR@restoreorigformatting{% + \DeclareGraphicsExtensions{.eps,.EPS,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% + } + \fi + \fi \define@key{Gin}{angle}{}% \IfBooleanTF{#1}% {% starred diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-visual-debug.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-visual-debug.sty new file mode 100644 index 00000000000..3872412b869 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-visual-debug.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-lua-visual-debug.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `lua-visual-debug') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{lua-visual-debug}[2016/05/30] +\endinput +%% +%% End of file `lwarp-lua-visual-debug.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty index ab523f89d1c..303de2f3ddc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -944,7 +944,7 @@ \catcode`\_=12% \renewcommand*{\makeindex}[1][\BaseJobname]{% \if@filesw - \def\index{\@bsphack% + \def\gindex{\@bsphack% \@ifnextchar [{\@index}{\@index[\BaseJobname]}} \def\specialindex{\@bsphack\@spindex}% \makememindexhook diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty new file mode 100644 index 00000000000..f684a064c12 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-pdfprivacy.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pdfprivacy') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{pdfprivacy} +\endinput +%% +%% End of file `lwarp-pdfprivacy.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty index 81a125c75b7..59eb7d8302d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty @@ -15,7 +15,7 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{preview} +\LWR@ProvidesPackageDrop{preview}[2017/04/24] \newenvironment{preview}{}{} \newenvironment{nopreview}{}{} \NewDocumentCommand{\PreviewMacro}{s o o +m}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty new file mode 100644 index 00000000000..7675d28fa32 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-psfrag.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `psfrag') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{psfrag}[1998/04/11] +\BeforeBeginEnvironment{psfrags}{% + \begin{lateximage}[(-psfrags-~\packagediagramname)]% +} + +\AfterEndEnvironment{psfrags}{\end{lateximage}} +\endinput +%% +%% End of file `lwarp-psfrag.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty new file mode 100644 index 00000000000..9255b80026f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty @@ -0,0 +1,36 @@ +%% +%% This is file `lwarp-psfragx.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `psfragx') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{psfragx}[2012/05/02] +\def\pfx@includegraphicx#1#2{% + \begin{lateximage}[(-psfragx-~\packagediagramname)]% + \mbox{\pfx@overpix{#1}{#2}\endpfx@overpix}% + \end{lateximage}% +} + +\def\@@@overpix[#1]<#2>[#3]#4{% + \begin{lateximage}[(-psfragx-~\packagediagramname)]% + \pfx@overpix{#1,ovpfgd={#2},ovpbgd={#3}}{#4}% +} + +\def\endoverpix{% + \endpfx@overpix% + \end{lateximage}% +} +\endinput +%% +%% End of file `lwarp-psfragx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty new file mode 100644 index 00000000000..0331ae1e622 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty @@ -0,0 +1,34 @@ +%% +%% This is file `lwarp-pstool.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pstool') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{pstool} +\renewcommand\pstool@alwaysprocess[3][]{% + \begin{lateximage}[(-pstool-~\packagediagramname)]% + \includegraphics{#2.pdf}% + \end{lateximage}% +} +\LetLtxMacro\pstool@neverprocess\pstool@alwaysprocess +\LetLtxMacro\pstool@maybeprocess\pstool@alwaysprocess + +\renewcommand\pstool@@psfragfig[4]{% + \begin{lateximage}[(-pstool-~\packagediagramname)]% + \includegraphics{#2.pdf}% + \end{lateximage}% +} +\endinput +%% +%% End of file `lwarp-pstool.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-refcheck.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-refcheck.sty new file mode 100644 index 00000000000..42baddb8d3f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-refcheck.sty @@ -0,0 +1,30 @@ +%% +%% This is file `lwarp-refcheck.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `refcheck') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{refcheck}[2013/02/14] +\def\showrefnames{} +\def\norefnames{} +\def\showcitenames{} +\def\nocitenames{} +\def\setonmsgs{} +\def\setoffmsgs{} +\def\checkunlbld{} +\def\ignoreunlbld{} +\newcommand*{\refcheckxrdoc}[2][]{} +\endinput +%% +%% End of file `lwarp-refcheck.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty index 7ecce7475af..f4b75be1e6f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty @@ -20,7 +20,7 @@ \xpatchcmd{\register} {\centering} - {\begin{center}\begin{lateximage}[-register-~\packagediagramname]} + {\begin{center}\begin{lateximage}[(-register-~\packagediagramname)]} {} {\LWR@patcherror{register}{register}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-srcltx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-srcltx.sty new file mode 100644 index 00000000000..97db520f2bc --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-srcltx.sty @@ -0,0 +1,30 @@ +%% +%% This is file `lwarp-srcltx.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `srcltx') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{srcltx}[2006/11/12] +\newif\ifSRCOK \SRCOKfalse +\newcommand*\srcIncludeHook[1]{} +\newcommand*\srcInputHook[1]{} +\newcommand*\MainFile{} +\def\MainFile{\jobname.tex} +\newcommand*\CurrentInput{} +\gdef\CurrentInput{\MainFile} +\newcommand\Input{} +\let\Input\input +\endinput +%% +%% End of file `lwarp-srcltx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-srctex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-srctex.sty new file mode 100644 index 00000000000..3f09d98ea8a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-srctex.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-srctex.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `srctex') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{srctex}[2006/11/12] +\LWR@origRequirePackage{lwarp-srcltx} +\endinput +%% +%% End of file `lwarp-srctex.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty index 8bb138caf45..e25733f35e9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty @@ -32,14 +32,16 @@ \newcommand{\tablelasttail}[1]{% \long\gdef\LWRST@lasttail{#1}% } - \newcommand{\tablecaption}[2][]{% - \long\gdef\LWRST@caption{\caption[#1]{#2}}% + \long\gdef\LWRST@caption{% + \ifblank{#1}% + {\caption{#2}}% + {\caption[#1]{#2}}% + }% } \let\topcaption\tablecaption \let\bottomcaption\tablecaption - \newcommand*{\LWRST@caption}{} \newcommand*{\shrinkheight}[1]{} @@ -47,7 +49,7 @@ \NewDocumentEnvironment{supertabular}{s o m} {% \LWR@traceinfo{supertabular}% -\table% +\begin{table}% \LWRST@caption% \begin{tabular}{#3}% \TabularMacro\ifdefvoid{\LWRST@firsthead}% @@ -62,7 +64,7 @@ \LWRST@lasttail% }% \end{tabular}% -\endtable% +\end{table}% \LWR@traceinfo{supertabular done}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty index 4630ec117a8..ceb690c16bb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty @@ -19,7 +19,7 @@ \LWR@ProvidesPackagePass{textcomp} \AtBeginDocument{ -\ifPDFTeX +\ifPDFTeX% pdflatex or dvi latex \newcommand*{\LWR@HTML@textdegree}{\HTMLentity{deg}} \newcommand*{\LWR@HTML@textcelsius}{\HTMLunicode{2103}} \newcommand*{\LWR@HTML@textohm}{\HTMLunicode{2126}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty new file mode 100644 index 00000000000..4fe1c937c0c --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty @@ -0,0 +1,29 @@ +%% +%% This is file `lwarp-thinsp.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `thinsp') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{thinsp} +\AtBeginDocument{ +\let\thinthinspace\relax% defined by some packages +\newcommand*{\thinthinspace}{\thinspace} +} + +\newcommand*{\stretchthinspace}{\thinspace} +\newcommand*{\stretchthinthinspace}{\thinthinspace} +\newcommand*{\stretchnegthinspace}{\negthinspace} +\endinput +%% +%% End of file `lwarp-thinsp.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty new file mode 100644 index 00000000000..3318a6466ab --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-threadcol.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `threadcol') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{threadcol} +\newcommand{\setthreadname}[1]{} +\endinput +%% +%% End of file `lwarp-threadcol.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup-gen.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup-gen.sty deleted file mode 100644 index 783ddc54a22..00000000000 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup-gen.sty +++ /dev/null @@ -1,23 +0,0 @@ -%% -%% This is file `lwarp-twoup-gen.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% lwarp.dtx (with options: `twoup-gen') -%% This is a generated file. -%% Copyright 2016-2018 Brian Dunn -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{twoup-gen} - -\LWR@origRequirePackage{lwarp-2up} -\endinput -%% -%% End of file `lwarp-twoup-gen.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty new file mode 100644 index 00000000000..cb7be20ccfc --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-uspace.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `uspace') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{uspace} +\endinput +%% +%% End of file `lwarp-uspace.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vpe.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vpe.sty new file mode 100644 index 00000000000..9ff3ad3874b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vpe.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-vpe.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `vpe') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{vpe}[2012/04/18] +\endinput +%% +%% End of file `lwarp-vpe.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xbmks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xbmks.sty new file mode 100644 index 00000000000..94ca52be2b5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xbmks.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-xbmks.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `xbmks') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{xbmks}[2018/07/04] +\newcommand{\xbmksetup}[1]{} +\NewDocumentCommand{\pdfbookmarkx}{o m o m}{} +\NewDocumentCommand{\currentpdfbookmarkx}{m o m}{} +\NewDocumentCommand{\subpdfbookmarkx}{m o m}{} +\NewDocumentCommand{\belowpdfbookmarkx}{m o m}{} +\endinput +%% +%% End of file `lwarp-xbmks.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty index 274a299126a..6679cc98a77 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty @@ -27,7 +27,7 @@ \NewDocumentCommand{\LWR@HTML@keyboard}{ O{}m } { \begin{lateximage}* - [-xpiano-~\packagediagramname{}: \detokenize\expandafter{#2}] + [(-xpiano-~\packagediagramname{}: \detokenize\expandafter{#2})] [\detokenize\expandafter{#1}] \xpiano_keyboard:nn { #1 } { #2 } \end{lateximage} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty index 0906997a27a..42393ec23a6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty @@ -37,14 +37,16 @@ \newcommand{\tablelasttail}[1]{% \long\gdef\LWRXT@lasttail{#1}% } - \newcommand{\tablecaption}[2][]{% - \long\gdef\LWRXT@caption{\caption[#1]{#2}}% + \long\gdef\LWRXT@caption{% + \ifblank{#1}% + {\caption{#2}}% + {\caption[#1]{#2}}% + }% } \let\topcaption\tablecaption \let\bottomcaption\tablecaption - \newcommand*{\LWRXT@caption}{} \newcommand*{\shrinkheight}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 8f664fc5138..38d80c02841 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,8 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2018/09/19 v0.60 Allows LaTeX to directly produce HTML5 output.] + [2018/10/13 v0.61 Allows LaTeX to directly produce HTML5 output.] + @@ -46,7 +47,7 @@ {Lwarp must find the macros pdfmdfivesum or mdfivesum.} } -\ifPDFTeX +\ifPDFTeX% pdflatex or dvi latex \let\LWR@mdfive\pdfmdfivesum \fi @@ -61,7 +62,7 @@ \@ifundefined{mdfivesum}{} {\let\LWR@mdfive\mdfivesum} \fi -\ifPDFTeX +\ifPDFTeX% pdflatex or dvi latex \RequirePackage[T1]{fontenc} \@ifpackageloaded{inputenc}{}{ @@ -74,7 +75,7 @@ \newunicodechar{⨯}{\texttimes} -\ifPDFTeX +\ifPDFTeX% pdflatex or dvi latex \newunicodechar{ff}{ff}% the first arguments are ligatures \newunicodechar{fi}{fi} \newunicodechar{fl}{fl} @@ -102,6 +103,23 @@ \RequirePackage{ifplatform}% sense op-system platform \RequirePackage{letltxmacro} +\let\LWRpercent\@percentchar +\catcode`\$=12 +\def\LWRdollar{$} +\catcode`\$=3 +\catcode`\&=12 +\def\LWRamp{&} +\catcode`\&=4 +\catcode`\&=0 +&catcode`&\=12 +&def&LWRbackslash{\} +&catcode`&\=0 +\catcode`\&=4 +\catcode`\#=12 +\def\LWRhash{#} +\catcode`\#=6 +\def\LWRopquote{'} +\def\LWRopseq{\space\LWRamp\LWRamp\space\space} \newbool{usingOSWindows} \boolfalse{usingOSWindows} @@ -113,6 +131,8 @@ { \booltrue{usingOSWindows} \renewcommand*{\OSPathSymbol}{\@backslashchar} +\def\LWRopquote{"} +\def\LWRopseq{\space\LWRamp\space\space} } \ifwindows \LWR@setOSWindows @@ -122,6 +142,8 @@ \RequirePackage{kvoptions} \SetupKeyvalOptions{family=LWR,prefix=LWR@} +\newcommand{\lwarpsetup}[1]{\setkeys{LWR}{#1}} + \newbool{warpingprint} \newbool{warpingHTML} \newbool{mathjax} @@ -181,6 +203,10 @@ \DeclareStringOption[]{HTMLFilename} +\DeclareStringOption[]{PrintLatexCmd} + +\DeclareStringOption[]{HTMLLatexCmd} + \DeclareStringOption[]{PrintIndexCmd} \DeclareStringOption[]{HTMLIndexCmd} @@ -329,8 +355,9 @@ or is superceded by another package. For a possible alternative, see package(s) #2.} }{}% } -\LWR@earlyloadnever{ae}{lmodern} -\LWR@earlyloadnever{aecc}{lmodern} +\LWR@earlyloadnever{ae}{cm-super, lmodern} +\LWR@earlyloadnever{aecompl}{cm-super, lmodern} +\LWR@earlyloadnever{aecc}{cm-super, lmodern} \LWR@earlyloadnever{boxedminipage}{boxedminipage2e} \LWR@earlyloadnever{caption2}{caption} \LWR@earlyloadnever{fancyheadings}{fancyhdr} @@ -397,10 +424,13 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{chemgreek} \LWR@loadafter{chemmacros} \LWR@loadafter{chemnum} +\LWR@loadafter{chkfloat} \LWR@loadafter{cite} +\LWR@loadafter{cmdtrack} \LWR@loadafter{color} \LWR@loadafter{colortbl} \LWR@loadafter{continue} +\LWR@loadafter{copyrightbox} \LWR@notmemoirloadafter{crop} \LWR@loadafter{cuted} \LWR@loadafter{cutwin} @@ -408,6 +438,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{dblfnote} \LWR@notmemoirloadafter{dcolumn} \LWR@loadafter{diagbox} +\LWR@loadafter{dprogress} \LWR@loadafter{draftcopy} \LWR@loadafter{draftfigure} \LWR@loadafter{draftwatermark} @@ -421,6 +452,7 @@ For a possible alternative, see package(s) #2.} \LWR@notmemoirloadafter{enumerate} \LWR@loadafter{enumitem} \LWR@notmemoirloadafter{epigraph} +\LWR@loadafter{epsfig} \LWR@loadafter{epstopdf} \LWR@loadafter{epstopdf-base} \LWR@loadafter{errata} @@ -498,6 +530,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{ltxgrid} \LWR@loadafter{ltxtable} \LWR@loadafter{lua-check-hyphen} +\LWR@loadafter{lua-visual-debug} \LWR@loadafter{luacolor} \LWR@loadafter{luatodonotes} \LWR@loadafter{magaz} @@ -541,6 +574,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{pdfrender} \LWR@loadafter{pdflscape} \LWR@loadafter{pdfpages} +\LWR@loadafter{pdfprivacy} \LWR@loadafter{pdfsync} \LWR@loadafter{pdftricks} \LWR@loadafter{pdfx} @@ -550,12 +584,16 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{prelim2e} \LWR@loadafter{prettyref} \LWR@loadafter{preview} +\LWR@loadafter{psfrag} +\LWR@loadafter{psfragx} \LWR@loadafter{pst-eps} +\LWR@loadafter{pstool} \LWR@loadafter{pstricks} \LWR@loadafter{quotchap} \LWR@loadafter{quoting} \LWR@loadafter{ragged2e} \LWR@loadafter{realscripts} +\LWR@loadafter{refcheck} \LWR@loadafter{register} \LWR@loadafter{relsize} \LWR@loadafter{repeatindex} @@ -586,6 +624,8 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{soulpos} \LWR@loadafter{soulutf8} \LWR@loadafter{splitidx} +\LWR@loadafter{srcltx} +\LWR@loadafter{srctex} \LWR@loadafter{stabular} \LWR@loadafter{stfloats} \LWR@loadafter{subfig} @@ -599,6 +639,8 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{textfit} \LWR@loadafter{textpos} \LWR@loadafter{theorem} +\LWR@loadafter{thinsp} +\LWR@loadafter{threadcol} \LWR@loadafter{threeparttable} \LWR@loadafter{thumb} \LWR@loadafter{thumbs} @@ -617,23 +659,25 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{trimclip} \LWR@loadafter{trivfloat} \LWR@loadafter{turnthepage} -\LWR@loadafter{twoup-gen} \LWR@loadafter{ulem} \LWR@loadafter{underscore} \LWR@loadafter{units} \LWR@loadafter{upref} \LWR@loadafter{url} +\LWR@loadafter{uspace} \LWR@loadafter{varioref}% no lwarp package provided \LWR@notmemoirloadafter{verse} \LWR@loadafter{vertbars} \LWR@loadafter{vmargin} \LWR@loadafter{vowel} +\LWR@loadafter{vpe} \LWR@loadafter{vwcol} \LWR@loadafter{wallpaper} \LWR@loadafter{wasysym} \LWR@loadafter{watermark} \LWR@loadafter{widows-and-orphans} \LWR@loadafter{wrapfig} +\LWR@loadafter{xbmks} \LWR@loadafter{xcolor} \LWR@loadafter{xellipsis} \LWR@loadafter{xfrac} @@ -716,8 +760,6 @@ top=1in,bottom=1in,% \RequirePackage{xifthen} -\RequirePackage{xstring} - \RequirePackage{verbatim} \RequirePackage{calc} @@ -731,6 +773,8 @@ top=1in,bottom=1in,% \begin{warpall} +\RequirePackage{xstring} + \RequirePackage{environ} \end{warpall} @@ -813,6 +857,17 @@ top=1in,bottom=1in,% \LWR@lookforpackagename{7}% \LWR@lookforpackagename{8}% \LWR@lookforpackagename{9}% +\LWR@lookforpackagename{10}% +\LWR@lookforpackagename{11}% +\LWR@lookforpackagename{12}% +\LWR@lookforpackagename{13}% +\LWR@lookforpackagename{14}% +\LWR@lookforpackagename{15}% +\LWR@lookforpackagename{16}% +\LWR@lookforpackagename{17}% +\LWR@lookforpackagename{18}% +\LWR@lookforpackagename{19}% +\LWR@lookforpackagename{20}% \IfValueTF{#1}% {% options given \IfValueTF{#3}% version given? @@ -940,7 +995,6 @@ top=1in,bottom=1in,% \end{warpHTML} - \begin{warpall} \newbool{LWR@tracinglwarp} @@ -1117,6 +1171,7 @@ top=1in,bottom=1in,% \chardef\LWR@origpound=`\# \let\LWR@origcomma\, \let\LWR@origthinspace\thinspace +\let\LWR@orignegthinspace\negthinspace \let\LWR@origtilde~ \let\LWR@origenskip\enskip \let\LWR@origquad\quad @@ -1212,7 +1267,7 @@ top=1in,bottom=1in,% \begin{warpHTML} \AtBeginDocument{ \LetLtxMacro\LWR@origt\t -\ifPDFTeX +\ifPDFTeX% pdflatex or dvi latex \LetLtxMacro\LWR@origequalaccent\= \LetLtxMacro\LWR@origdotaccent\. \LetLtxMacro\LWR@origu\u @@ -1230,7 +1285,7 @@ top=1in,bottom=1in,% \fi \def\LWR@t#1#2{#1\HTMLunicode{0361}#2} \renewcommand*{\t}[1]{\LWR@t#1} -\ifPDFTeX +\ifPDFTeX% pdflatex or dvi latex \newcommand*{\LWR@restoreorigaccents}{% \LetLtxMacro\=\LWR@origequalaccent% \LetLtxMacro\.\LWR@origdotaccent% @@ -1251,11 +1306,22 @@ top=1in,bottom=1in,% + +\excludecomment{LWRwriteconf} \begin{warpprint} -\typeout{lwarp: generating configuration files} +\fullexpandarg% +\IfSubStr*{\jobname}{-pstool} + { + \typeout{lwarp: jobname with -pstool is found,}% + \typeout{lwarp: \space\space not generating configuration files.}% + } + { + \typeout{lwarp: generating configuration files} + \includecomment{LWRwriteconf} + } \end{warpprint} -\begin{warpprint} +\begin{LWRwriteconf} \immediate\openout\LWR@quickfile=\jobname_html.tex \immediate\write\LWR@quickfile{% \detokenize{\PassOptionsToPackage}% @@ -1265,28 +1331,12 @@ top=1in,bottom=1in,% \detokenize{\input}\string{\jobname.tex\string }% } \immediate\closeout\LWR@quickfile -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \newcommand*{\LWR@lwarpconfversion}{1}% also in lwarpmk.lua -\catcode`\$=12 -\def\LWR@dollarchar{$} -\catcode`\$=3 -\catcode`\&=12 -\def\LWR@ampersand{&} -\catcode`\&=4 -\ifbool{usingOSWindows}{ - \def\LWR@opquote{"} -}{ - \def\LWR@opquote{'} -} -\ifbool{usingOSWindows}{ - \def\LWR@opsequence{\LWR@ampersand} -}{ - \def\LWR@opsequence{\LWR@ampersand\LWR@ampersand} -} \ifshellescape \def\LWR@shellescapecmd{--shell-escape } \else @@ -1296,7 +1346,7 @@ top=1in,bottom=1in,% #1 \LWR@shellescapecmd \jobname#2% } \newcommand*{\LWR@addcompilecmd}[2]{% - \space \LWR@opsequence \space\space + \LWRopseq #1 \jobname#2% } \newcommand*{\LWR@unknownengine}{% @@ -1306,9 +1356,9 @@ top=1in,bottom=1in,% } \newcommand*{\LWR@latexmkvar}[2]{% -e - \LWR@opquote% - \LWR@dollarchar #1=q/#2/% - \LWR@opquote + \LWRopquote% + \LWRdollar #1=q/#2/% + \LWRopquote } \newcommand*{\LWR@latexmkcmd}[1]{% latexmk \space \LWR@shellescapecmd \space #1 \space @@ -1358,53 +1408,53 @@ top=1in,bottom=1in,% } \fi \fi% \ifpdf - \def\LWR@printlatexcmd{\LWR@latexcmd \space \jobname} - \def\LWR@HTMLlatexcmd{\LWR@latexcmd \space \jobname_html} + \def\LWR@tempprintlatexcmd{\LWR@latexcmd \space \jobname} + \def\LWR@tempHTMLlatexcmd{\LWR@latexcmd \space \jobname_html} }% latexmk {% not latexmk \ifpdf \ifPDFTeX - \def\LWR@printlatexcmd{\LWR@compilecmd{pdflatex}{}} - \def\LWR@HTMLlatexcmd{\LWR@compilecmd{pdflatex}{_html}} + \def\LWR@tempprintlatexcmd{\LWR@compilecmd{pdflatex}{}} + \def\LWR@tempHTMLlatexcmd{\LWR@compilecmd{pdflatex}{_html}} \else \ifLuaTeX - \def\LWR@printlatexcmd{\LWR@compilecmd{lualatex}{}} - \def\LWR@HTMLlatexcmd{\LWR@compilecmd{lualatex}{_html}} + \def\LWR@tempprintlatexcmd{\LWR@compilecmd{lualatex}{}} + \def\LWR@tempHTMLlatexcmd{\LWR@compilecmd{lualatex}{_html}} \else \LWR@unknownengine \fi \fi \else% \ifpdf \ifXeTeX - \def\LWR@printlatexcmd{\LWR@compilecmd{xelatex}{}} - \def\LWR@HTMLlatexcmd{\LWR@compilecmd{xelatex}{_html}} + \def\LWR@tempprintlatexcmd{\LWR@compilecmd{xelatex}{}} + \def\LWR@tempHTMLlatexcmd{\LWR@compilecmd{xelatex}{_html}} \else \ifbool{LWR@dvipdfm}{ - \def\LWR@printlatexcmd{% + \def\LWR@tempprintlatexcmd{% \LWR@compilecmd{latex}{} \LWR@addcompilecmd{dvipdfm}{} } - \def\LWR@HTMLlatexcmd{% + \def\LWR@tempHTMLlatexcmd{% \LWR@compilecmd{latex}{_html} \LWR@addcompilecmd{dvipdfm}{_html} } }{ \ifbool{LWR@dvipdfmx}{ - \def\LWR@printlatexcmd{% + \def\LWR@tempprintlatexcmd{% \LWR@compilecmd{latex}{} \LWR@addcompilecmd{dvipdfmx}{} } - \def\LWR@HTMLlatexcmd{% + \def\LWR@tempHTMLlatexcmd{% \LWR@compilecmd{latex}{_html} \LWR@addcompilecmd{dvipdfmx}{_html} } }{% dvips - \def\LWR@printlatexcmd{% + \def\LWR@tempprintlatexcmd{% \LWR@compilecmd{latex}{} \LWR@addcompilecmd{dvips}{} \LWR@addcompilecmd{ps2pdf}{}.ps } - \def\LWR@HTMLlatexcmd{% + \def\LWR@tempHTMLlatexcmd{% \LWR@compilecmd{latex}{_html} \LWR@addcompilecmd{dvips}{_html} \LWR@addcompilecmd{ps2pdf}{_html}.ps @@ -1414,7 +1464,13 @@ top=1in,bottom=1in,% \fi% \ifXeTeX \fi% \ifpdf }% latexmk -\newcommand{\LWR@writeconf}[1]{% + \ifdefempty{\LWR@PrintLatexCmd}{ + \def\LWR@PrintLatexCmd{\LWR@tempprintlatexcmd} + }{} + \ifdefempty{\LWR@HTMLLatexCmd}{ + \def\LWR@HTMLLatexCmd{\LWR@tempHTMLlatexcmd} + }{} +\newcommand{\LWR@writeconf}[1]{ \ifcsdef{LWR@quickfile}{}{\newwrite{\LWR@quickfile}} \immediate\openout\LWR@quickfile=#1 \immediate\write\LWR@quickfile{confversion = [[\LWR@lwarpconfversion]]} @@ -1427,8 +1483,8 @@ top=1in,bottom=1in,% \immediate\write\LWR@quickfile{homehtmlfilename = [[\HomeHTMLFilename]]} \immediate\write\LWR@quickfile{htmlfilename = [[\HTMLFilename]]} \immediate\write\LWR@quickfile{latexmk = [[\ifbool{LWR@latexmk}{true}{false}]]} -\immediate\write\LWR@quickfile{printlatexcmd = [[\LWR@printlatexcmd]]} -\immediate\write\LWR@quickfile{HTMLlatexcmd = [[\LWR@HTMLlatexcmd]]} +\immediate\write\LWR@quickfile{printlatexcmd = [[\LWR@PrintLatexCmd]]} +\immediate\write\LWR@quickfile{HTMLlatexcmd = [[\LWR@HTMLLatexCmd]]} \immediate\write\LWR@quickfile{printindexcmd = [[\LWR@PrintIndexCmd]]} \immediate\write\LWR@quickfile{HTMLindexcmd = [[\LWR@HTMLIndexCmd]]} \immediate\write\LWR@quickfile{latexmkindexcmd = [[\LWR@LatexmkIndexCmd]]} @@ -1438,22 +1494,22 @@ top=1in,bottom=1in,% } -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \AtBeginDocument{\LWR@writeconf{lwarpmk.conf}} -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \AtBeginDocument{\LWR@writeconf{\jobname.lwarpmkconf}} -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \begin{filecontents*}{lwarp.css} /* CSS stylesheet for the LaTeX lwarp package @@ -1681,6 +1737,11 @@ div.epigraph p, div.dictum p { padding: .5ex ; margin: 0ex ;} div.epigraphsource p, div.dictumauthor p { padding: .5ex 0ex 0ex 0ex ; margin: 0ex ;} div.dictumauthor { font-style:italic } +/* copyrightbox package */ +div.copyrightbox { margin: .5ex .5em } +div.copyrightbox p {margin: 0px .5em ; padding: 0px} +div.copyrightboxnote {text-align: left ; font-size: 60%} + /* lettrine package: */ span.lettrine { font-size: 4ex ; float: left ; } span.lettrinetext { font-variant: small-caps ; } @@ -1818,6 +1879,7 @@ div.titlepage { } .footnotes { + text-align: left ; font-size: .85em ; margin: 3ex 2em 0ex 2em ; border-top: 1px solid silver ; @@ -2272,6 +2334,8 @@ figure.subfigure, figure.subtable { figcaption .minipage { margin:0 ; padding: 0 } div.minipage figure { border: none ; box-shadow: none ; } +div.minipage figure.table { margin: 0ex } +div.minipage div.footnotes { margin: 1ex 2em 0ex 2em } div.floatrow { text-align: center; } @@ -2834,10 +2898,10 @@ nav.botnavigation { display:none; } nav.botnavigation { display:block } } \end{filecontents*} -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \begin{filecontents*}{lwarp_sagebrush.css} @import url("lwarp.css") ; @@ -3067,10 +3131,10 @@ nav.sidetoc a:hover { } \end{filecontents*} -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \begin{filecontents*}{lwarp_formal.css} @import url("lwarp.css") ; @@ -3267,10 +3331,10 @@ nav.botnavigation { border-top: 1px solid black ; } \end{filecontents*} -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \begin{filecontents*}{sample_project.css} /* ( --- Start of project.css --- ) */ /* ( --- A sample project-specific CSS file for lwarp --- ) */ @@ -3285,10 +3349,10 @@ nav.botnavigation { /* ( --- End of project.css --- ) */ \end{filecontents*} -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \begin{filecontents*}{lwarp.ist} preamble "\\begin{theindex} @@ -3310,10 +3374,10 @@ delim_r "} -- \\hyperindexref{" delim_t "}" page_compositor "." \end{filecontents*} -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \begin{filecontents*}{lwarp.xdy} (require "tex/inputenc/latin.xdy") (merge-rule "\\PS *" "Postscript") @@ -3336,9 +3400,9 @@ page_compositor "." "see" "seealso")) \end{filecontents*} -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \begin{filecontents*}{lwarp_one_limage.txt} @echo off pdfseparate -f %1 -l %1 %4_html.pdf lateximages\lateximagetemp-%%d.pdf @@ -3348,10 +3412,10 @@ del lateximages\%3.pdf del lateximages\lateximagetemp-%1.pdf exit \end{filecontents*} -\end{warpprint} +\end{LWRwriteconf} -\begin{warpprint} +\begin{LWRwriteconf} \begin{filecontents*}{lwarp_mathjax.txt} @@ -3460,7 +3524,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- --> \end{filecontents*} -\end{warpprint} +\end{LWRwriteconf} \begin{LWR@createlwarpmk} @@ -3469,7 +3533,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- -- Copyright 2016-2018 Brian Dunn -printversion = "v0.60" +printversion = "v0.61" requiredconfversion = "1" -- also at *lwarpmk.conf function printhelp () @@ -4448,12 +4512,12 @@ end -- not --version \begin{warpall} \newbool{LWR@dynamicmath} \boolfalse{LWR@dynamicmath} -\newcommand{\StartDynamicMath}{% -\LWR@traceinfo{StartDynamicMath}% +\newcommand{\inlinemathother}{% +\LWR@traceinfo{inlinemathother}% \booltrue{LWR@dynamicmath}% } -\newcommand{\StopDynamicMath}{% -\LWR@traceinfo{StopDynamicMath}% +\newcommand{\inlinemathnormal}{% +\LWR@traceinfo{inlinemathnormal}% \boolfalse{LWR@dynamicmath}% } \end{warpall} @@ -5413,7 +5477,7 @@ end -- not --version \StrSubstitute{\LWR@thisnewfilename}{----}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{---}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{--}{-}[\LWR@thisnewfilename] -\ifPDFTeX% +\ifPDFTeX% pdflatex or dvi latex \ifdefstring{\inputencodingname}{utf8}{% \StrSubstitute{\LWR@thisnewfilename}{—}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{–}{-}[\LWR@thisnewfilename] @@ -5520,7 +5584,7 @@ end -- not --version \LWR@stoppars -\ifPDFTeX% +\ifPDFTeX% pdflatex or dvi latex \ifdefstring{\inputencodingname}{utf8}{% \LWR@filestart{ — #1}% there is an EMdash in front of the #1 }{ @@ -6685,6 +6749,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% } \newcommand*{\LWR@closetabledatacell}{% +\LWR@stoppars% \global\booltrue{LWR@intabularmetadata}% \ifbool{LWR@exitingtabular}{}% {% not exiting tabular @@ -8767,7 +8832,7 @@ autopage-\theLWR@currentautosec% \NewDocumentCommand{\listof}{m +m}{% \@ifundefined{l@#1}{% - \csdef{l@#1}[2]{\hypertocfloat{1}{#1}{\@nameuse{ext@#1}}{##1}{##2}}% + \csdef{l@#1}##1##2{\hypertocfloat{1}{#1}{\@nameuse{ext@#1}}{##1}{##2}}% }{}% \LWR@subtableofcontents{\@nameuse{ext@#1}}{#2} \expandafter\newwrite\csname tf@\csname ext@#1\endcsname\endcsname @@ -8945,15 +9010,15 @@ autopage-\theLWR@currentautosec% } \newcommand{\LWR@hyperindexrefnullified}{% -\renewcommand{\emph}[1]{\LWR@HTMLemph{\LWR@doindexentry{##1}}}% -\renewcommand{\textbf}[1]{\LWR@HTMLtextbf{\LWR@doindexentry{##1}}}% -\renewcommand{\textrm}[1]{\LWR@HTMLtextrm{\LWR@doindexentry{##1}}}% -\renewcommand{\textsf}[1]{\LWR@HTMLtextsf{\LWR@doindexentry{##1}}}% -\renewcommand{\texttt}[1]{\LWR@HTMLtexttt{\LWR@doindexentry{##1}}}% -\renewcommand{\textup}[1]{\LWR@HTMLtextup{\LWR@doindexentry{##1}}}% -\renewcommand{\textsc}[1]{\LWR@HTMLtextsc{\LWR@doindexentry{##1}}}% -\renewcommand{\textit}[1]{\LWR@HTMLtextit{\LWR@doindexentry{##1}}}% -\renewcommand{\textsl}[1]{\LWR@HTMLtextsl{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\emph}[1]{\LWR@HTMLemph{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textbf}[1]{\LWR@HTMLtextbf{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textrm}[1]{\LWR@HTMLtextrm{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textsf}[1]{\LWR@HTMLtextsf{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\texttt}[1]{\LWR@HTMLtexttt{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textup}[1]{\LWR@HTMLtextup{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textsc}[1]{\LWR@HTMLtextsc{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textit}[1]{\LWR@HTMLtextit{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textsl}[1]{\LWR@HTMLtextsl{\LWR@doindexentry{##1}}}% } \newcommand{\hyperindexref}[1]{% @@ -9023,6 +9088,7 @@ autopage-\theLWR@currentautosec% \let\hfilneg\LWR@orighfilneg% \let\,\LWR@origcomma% disable HTML short unbreakable space \let\thinspace\LWR@origthinspace% disable HTML short unbreakable space +\let\negthinspace\LWR@orignegthinspace% disable HTML negative short unbreakable space \let\textellipsis\LWR@origtextellipsis% \let\textless\LWR@origtextless% \let\textgreater\LWR@origtextgreater% @@ -10725,14 +10791,13 @@ width:\LWR@printlength{\LWR@tempwidth}% \begin{warpHTML} - - +\AtBeginDocument{ \renewrobustcmd*{\,}{\HTMLunicode{202f}} % HTML thin non-breakable space \renewrobustcmd*{\thinspace}{\HTMLunicode{202f}} % HTML thin non-breakable space - +\renewrobustcmd*{\negthinspace}{\HTMLunicode{202f}} % HTML thin non-breakable space \renewrobustcmd*{~}{\HTMLentity{nbsp}} - \renewrobustcmd*{\textellipsis}{\HTMLunicode{2026}} +} \newrobustcmd*{\LWR@HTML@normalsize}{} \LWR@formatted{normalsize} -- cgit v1.2.3