From 962840188681e1d6f4aec0ebf07e05a70609325d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Apr 2018 23:01:08 +0000 Subject: lwarp (26apr18) git-svn-id: svn://tug.org/texlive/trunk@47491 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/lwarp/lwarp-ae.sty | 21 + Master/texmf-dist/tex/latex/lwarp/lwarp-aecc.sty | 21 + Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty | 6 +- Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty | 14 +- .../texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty | 25 ++ .../texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty | 10 +- .../texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty | 6 +- .../texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty | 21 + .../texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty | 12 +- .../texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty | 11 +- .../texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty | 40 ++ .../tex/latex/lwarp/lwarp-glossaries.sty | 27 ++ .../texmf-dist/tex/latex/lwarp/lwarp-gridset.sty | 29 ++ .../texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty | 102 ++--- .../texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty | 1 - .../texmf-dist/tex/latex/lwarp/lwarp-inputenx.sty | 25 ++ .../texmf-dist/tex/latex/lwarp/lwarp-listings.sty | 5 +- Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty | 34 ++ .../texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty | 28 +- .../texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty | 14 +- .../tex/latex/lwarp/lwarp-patch-memoir.sty | 186 +++++---- .../texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty | 6 +- Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-t1enc.sty | 21 + .../texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty | 4 + Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty | 33 +- Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty | 10 +- Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty | 7 +- .../texmf-dist/tex/latex/lwarp/lwarp-wasysym.sty | 21 + Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 435 ++++++++++++++------- 32 files changed, 843 insertions(+), 338 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-ae.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-aecc.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-gridset.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-inputenx.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-t1enc.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-wasysym.sty (limited to 'Master/texmf-dist/tex/latex/lwarp') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ae.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ae.sty new file mode 100644 index 00000000000..4a788f328dd --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ae.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-ae.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ae') +%% 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@loadnever{ae}{latinmodern} +\endinput +%% +%% End of file `lwarp-ae.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-aecc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-aecc.sty new file mode 100644 index 00000000000..c0f247f1b34 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-aecc.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-aecc.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `aecc') +%% 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@loadnever{aecc}{latinmodern} +\endinput +%% +%% End of file `lwarp-aecc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty index 81096981262..9bc05c9f0b1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty @@ -22,9 +22,11 @@ \LWR@traceinfo{Patching alltt.} \AtBeginEnvironment{alltt}{% \LWR@forcenewpage -\LWR@atbeginverbatim{3.5}{alltt}% +\LWR@atbeginverbatim{3}{alltt}% +} +\AfterEndEnvironment{alltt}{% + \LWR@afterendverbatim{2}% } -\AfterEndEnvironment{alltt}{\unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim} } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty index e6bd5b2d5c5..7704450d15c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty @@ -127,10 +127,22 @@ \def\@endtheorem{\endtrivlist\endBlockClass\@endpefalse } \AtBeginDocument{ +\@ifundefined{LWR@orig@openbox}{ +\LetLtxMacro\LWR@orig@openbox\openbox +\LetLtxMacro\LWR@orig@blacksquare\blacksquare +\LetLtxMacro\LWR@orig@Box\Box + \def\openbox{\text{\HTMLunicode{25A1}}}% UTF-8 white box \def\blacksquare{\text{\HTMLunicode{220E}}}% UTF-8 end-of-proof \def\Box{\text{\HTMLunicode{25A1}}}% UTF-8 white box -} + +\appto\LWR@restoreorigformatting{% +\LetLtxMacro\openbox\LWR@orig@openbox% +\LetLtxMacro\blacksquare\LWR@orig@blacksquare% +\LetLtxMacro\Box\LWR@orig@Box% +}% appto +}{}% @ifundefined +}% AtBeginDocument \renewenvironment{proof}[1][\proofname]{\par \LWR@forcenewpage% lwarp \BlockClass{amsthmproof}% lwarp diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty new file mode 100644 index 00000000000..7cec6e0ab88 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty @@ -0,0 +1,25 @@ +%% +%% This is file `lwarp-bibunits.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `bibunits') +%% 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{bibunits} + +\def\bu@bibdata{\BaseJobname} + +\endinput +%% +%% End of file `lwarp-bibunits.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty index 8e4fc48a8dd..80a8537c07e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty @@ -31,11 +31,11 @@ \newrobustcmd*{\burlalt}{% \begingroup% -\catcode`\#=12 -\catcode`\%=12 -\catcode`\&=12 -\catcode`\~=12 -\catcode`\_=12 +\catcode`\#=12% +\catcode`\%=12% +\catcode`\&=12% +\catcode`\~=12% +\catcode`\_=12% \LWR@burlaltb% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty index bd132c0499e..e334fa983e0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty @@ -15,7 +15,11 @@ %% 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@loadnever{chngpage}{changepage} + + +\LWR@ProvidesPackageDrop{chngpage} +\LWR@origRequirePackage{changepage} + \endinput %% %% End of file `lwarp-chngpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty new file mode 100644 index 00000000000..49874e1f151 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-clrdblpg.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `clrdblpg') +%% 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{clrdblpg} +\endinput +%% +%% End of file `lwarp-clrdblpg.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty index 92ddb4cf161..06a81b286fd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty @@ -131,24 +131,24 @@ \def\endLandscape{} \let\LWRFB@UseVerbatim\UseVerbatim \renewcommand*{\UseVerbatim}[1]{% -\LWR@atbeginverbatim{3.5}{Verbatim}% +\LWR@atbeginverbatim{3}{Verbatim}% \LWRFB@UseVerbatim{#1}% -\LWR@afterendverbatim% +\LWR@afterendverbatim{.5}% } \let\LWRFB@LUseVerbatim\LUseVerbatim \renewcommand*{\LUseVerbatim}[1]{% -\LWR@atbeginverbatim{3.5}{LVerbatim}% +\LWR@atbeginverbatim{3}{LVerbatim}% \noindent% \LWRFB@LUseVerbatim{#1}% -\LWR@afterendverbatim% +\LWR@afterendverbatim{.5}% } \def\@BUseVerbatim[#1]#2{% -\LWR@atbeginverbatim{3.5}{BVerbatim}% +\LWR@atbeginverbatim{3}{BVerbatim}% \LWRFB@UseVerbatim{#2}% -\LWR@afterendverbatim% +\LWR@afterendverbatim{.5}% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty index b83c7293347..5d687bc5e67 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -65,20 +65,20 @@ \renewcommand*{\FV@SingleFrameSep}{} \def\FV@BUseVerbatim#1{% - \LWR@atbeginverbatim[\LWR@FVstyle]{.5}{verbatim}% + \LWR@atbeginverbatim[\LWR@FVstyle]{0}{verbatim}% \FV@BVerbatimBegin#1\FV@BVerbatimEnd% - \LWR@afterendverbatim% + \LWR@afterendverbatim{0}% } \newcommand*{\LWR@FVstyle}{} \newcommand*{\LWR@fvstartnone}{% \LWR@traceinfo{fvstartnone}% -\LWR@atbeginverbatim[\LWR@FVstyle]{.5}{verbatim}% +\LWR@atbeginverbatim[\LWR@FVstyle]{0}{verbatim}% } \newcommand*{\LWR@fvendnone}{% \LWR@traceinfo{fvendnone}% -\LWR@afterendverbatim% +\LWR@afterendverbatim{0}% } \newcommand*{\LWR@fvstartsingle}{% @@ -226,8 +226,7 @@ solid \LWR@origpound\LWR@tempcolor ; % \AfterEndEnvironment{BVerbatim} {% -\leavevmode\par\LWR@origvspace{-\baselineskip}% -\LWR@afterendverbatim% +\LWR@afterendverbatim{0}% } } % \AfterEndPreamble diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty index 43ed388849f..c5843c0d90d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty @@ -16,7 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{fontspec} +\LWR@ProvidesPackageDrop{fontspec}[2017/11/09] \LWR@loadbefore{fontspec} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty new file mode 100644 index 00000000000..4b4e1ee7688 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty @@ -0,0 +1,40 @@ +%% +%% This is file `lwarp-forest.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `forest') +%% 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{forest} + +\BeforeBeginEnvironment{forest}{\begin{lateximage}[forest]} + +\AfterEndEnvironment{forest}{\end{lateximage}} + +\RenewDocumentCommand{\Forest}{s D(){} m}{% + \forest@config{#2}% + \IfBooleanTF{#1}{% + \PackageError{lwarp-forest}% + {Starred \Forest is not supported}% + {Lwarp uses an environment for images, but \Forest* cannot work in an environment.}% + \let\forest@next\forest@env% + }{\let\forest@next\forest@group@env}% + \begin{lateximage}[forest]% lwarp + \forest@next{#3}% + \end{lateximage}% lwarp +} + +\endinput +%% +%% End of file `lwarp-forest.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty index 746c0ce2704..bff36548dc9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty @@ -33,6 +33,33 @@ }% \@@glossaryseclabel } +\newcommand*{\LWR@comp@glossaryname}{\translate{Glossary}} + +\ifdefstrequal{\glossaryname}{\LWR@comp@glossaryname}{ + \translatelet\LWR@translatetemp{Glossary} + \edef\glossaryname{\LWR@translatetemp} +}{} + +\newcommand*{\LWR@comp@acronymname}{\translate{Acronym}} + +\ifdefstrequal{\acronymname}{\LWR@comp@acronymname}{ + \translatelet\LWR@translatetemp{Acronym} + \edef\acronymname{\LWR@translatetemp} +}{} + +\newcommand*{\LWR@comp@glssymbolsgroupname}{\translate{Symbols (glossaries)}} + +\ifdefstrequal{\glssymbolsgroupname}{\LWR@comp@glssymbolsgroupname}{ + \translatelet\LWR@translatetemp{Symbols (glossaries)} + \edef\glssymbolsgroupname{\LWR@translatetemp} +}{} + +\newcommand*{\LWR@comp@glsnumbersgroupname}{\translate{Numbers (glossaries)}} + +\ifdefstrequal{\glsnumbersgroupname}{\LWR@comp@glsnumbersgroupname}{ + \translatelet\LWR@translatetemp{Numbers (glossaries)} + \edef\glsnumbersgroupname{\LWR@translatetemp} +}{} \endinput %% %% End of file `lwarp-glossaries.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-gridset.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-gridset.sty new file mode 100644 index 00000000000..202281d9345 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-gridset.sty @@ -0,0 +1,29 @@ +%% +%% This is file `lwarp-gridset.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `gridset') +%% 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{gridset} +\newcommand*{\gridbase}{} +\newcommand*{\gridinterval}{} +\newcommand*{\savepos}[1]{} +\newcounter{gridcnt} +\newcommand*{\vskipnextgrid}{} +\newcommand*{\thegridinfo}[1]{} +\newcommand*{\theposinfo}[1]{} +\newcommand*{\theypos}[1]{} +\endinput +%% +%% End of file `lwarp-gridset.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index 51da8aac561..471402b46fc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -38,11 +38,11 @@ \newrobustcmd*{\hyperimage}{% \begingroup% -\catcode`\#=12 -\catcode`\%=12 -\catcode`\&=12 -\catcode`\~=12 -\catcode`\_=12 +\catcode`\#=12% +\catcode`\%=12% +\catcode`\&=12% +\catcode`\~=12% +\catcode`\_=12% \LWR@hyperimageb% } @@ -55,53 +55,57 @@ \newcommand*{\hyperdef}{% \begingroup% -\catcode`\#=12 -\catcode`\%=12 -\catcode`\&=12 -\catcode`\~=12 -\catcode`\_=12 +\catcode`\#=12% +\catcode`\%=12% +\catcode`\&=12% +\catcode`\~=12% +\catcode`\_=12% \LWR@hyperdefb% } -\NewDocumentCommand{\LWR@hyperrefbb}{m m m +m}{% -\def\LWR@templink{#1}% -\@onelevel@sanitize\LWR@templink% -\def\LWR@templinktwo{#2}% -\@onelevel@sanitize\LWR@templinktwo% -\def\LWR@templinkthree{#3}% -\@onelevel@sanitize\LWR@templinkthree% -\LWR@htmltag{a href="\LWR@templink\LWR@hashmark% - \LWR@templinktwo.\LWR@templinkthree"% -}% -#4% +\newcommand{\LWR@hyperreffinish}[1]{% +\begingroup% +\LetLtxMacro\ref\LWR@origref%{} syntax highlighting +#1% +\endgroup% \LWR@htmltag{/a}% +} + +\newcommand*{\LWR@hyperrefbb}[3]{% +\LWR@htmltag{% + a href="% + \detokenize\expandafter{#1}\LWR@hashmark% + \detokenize\expandafter{#2}.\detokenize\expandafter{#3}% + "% +}% \endgroup% +\LWR@hyperreffinish% } \newrobustcmd*{\LWR@hyperrefb}{% \begingroup% -\catcode`\#=12 -\catcode`\%=12 -\catcode`\&=12 -\catcode`\~=12 -\catcode`\_=12 +\catcode`\#=12% +\catcode`\%=12% +\catcode`\&=12% +\catcode`\~=12% +\catcode`\_=12% \LWR@hyperrefbb% } -\NewDocumentCommand{\LWR@hyperrefcb}{O{label} +m}{ + +\NewDocumentCommand{\LWR@hyperrefcb}{O{label}}{% \LWR@startref{#1}% -#2% -\LWR@htmltag{/a}% \endgroup% +\LWR@hyperreffinish% } \newcommand*{\LWR@hyperrefc}{% \begingroup% -\catcode`\#=12 -\catcode`\%=12 -\catcode`\&=12 -\catcode`\~=12 -\catcode`\_=12 +\catcode`\#=12% +\catcode`\%=12% +\catcode`\&=12% +\catcode`\~=12% +\catcode`\_=12% \LWR@hyperrefcb% } @@ -111,33 +115,33 @@ } \NewDocumentCommand{\LWR@hypertargetb}{m +m}{% -\label{#1}% +\label{LWR-ht-#1}% #2% \endgroup% } \newcommand*{\hypertarget}{% \begingroup% -\catcode`\#=12 -\catcode`\%=12 -\catcode`\&=12 -\catcode`\~=12 -\catcode`\_=12 +\catcode`\#=12% +\catcode`\%=12% +\catcode`\&=12% +\catcode`\~=12% +\catcode`\_=12% \LWR@hypertargetb% } -\DeclareDocumentCommand{\LWR@hyperlinkb}{m +m}{% -\hyperref[#1]{#2}% -\endgroup% +\DeclareDocumentCommand{\LWR@hyperlinkb}{m}{% +\LWR@hyperrefcb[LWR-ht-#1]% } -\newcommand*{\hyperlink}{% +\DeclareDocumentCommand{\hyperlink}{}{% +\LWR@ensuredoingapar% \begingroup% -\catcode`\#=12 -\catcode`\%=12 -\catcode`\&=12 -\catcode`\~=12 -\catcode`\_=12 +\catcode`\#=12% +\catcode`\%=12% +\catcode`\&=12% +\catcode`\~=12% +\catcode`\_=12% \LWR@hyperlinkb% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty index 305d0e4a4d0..3ff8e9246fb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. - \LWR@ProvidesPackageDrop{inputenc} \LWR@loadbefore{inputenc} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenx.sty new file mode 100644 index 00000000000..1af7e7e80df --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenx.sty @@ -0,0 +1,25 @@ +%% +%% This is file `lwarp-inputenx.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `inputenx') +%% 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{inputenx} + +\LWR@loadbefore{inputenx} + +\endinput +%% +%% End of file `lwarp-inputenx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index 2c9ddd47df3..58f2e42109c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -45,7 +45,7 @@ \LWR@traceinfo{About to create verbatim.}% \let\lsthk@EveryPar\relax% \LWR@forcenewpage -\LWR@atbeginverbatim{2.5}{programlisting}% +\LWR@atbeginverbatim{2}{programlisting}% \let\lsthk@EveryPar\LWR@origlsthkEveryPar% \else% @@ -55,8 +55,7 @@ \renewcommand*{\lst@DeInit}{% \lst@ifdisplaystyle% \let\lsthk@EveryPar\relax% - -\LWR@afterendverbatim% +\LWR@afterendverbatim{0}% \let\lsthk@EveryPar\LWR@origlsthkEveryPar% \else% \ifbool{LWR@verbtags}{\noindent\LWR@htmltag{/span}}{}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty new file mode 100644 index 00000000000..4f655ff9fbe --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty @@ -0,0 +1,34 @@ +%% +%% This is file `lwarp-magaz.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `magaz') +%% 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{magaz} +\newcommand\FirstLine[1]{% + \begingroup% + \FirstLineFont{% + \LWR@textcurrentcolor{% + \LWR@textcurrentfont{% + #1% + }% + }% + }% + \endgroup% +} + +\providecommand\FirstLineFont{\scshape} +\endinput +%% +%% End of file `lwarp-magaz.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty index 3c4019ca91c..4a372065d22 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty @@ -19,37 +19,37 @@ \LWR@ProvidesPackagePass{moreverb} \BeforeBeginEnvironment{verbatimtab}{% \LWR@forcenewpage -\LWR@atbeginverbatim{3.5}{Verbatim}% +\LWR@atbeginverbatim{3}{Verbatim}% } \AfterEndEnvironment{verbatimtab}{% -\LWR@afterendverbatim% +\LWR@afterendverbatim{1}% } \LetLtxMacro\LWRMV@orig@verbatimtabinput\@verbatimtabinput \renewcommand{\@verbatimtabinput}[2][]{% \LWR@forcenewpage -\LWR@atbeginverbatim{3.5}{Verbatim}% +\LWR@atbeginverbatim{3}{Verbatim}% \LWRMV@orig@verbatimtabinput[#1]{#2}% -\LWR@afterendverbatim% +\LWR@afterendverbatim{1}% } \BeforeBeginEnvironment{listing}{% \LWR@forcenewpage -\LWR@atbeginverbatim{3.5}{programlisting}% +\LWR@atbeginverbatim{3}{programlisting}% } \AfterEndEnvironment{listing}{% -\LWR@afterendverbatim% +\LWR@afterendverbatim{1}% } \BeforeBeginEnvironment{listingcont}{% \LWR@forcenewpage -\LWR@atbeginverbatim{3.5}{programlisting}% +\LWR@atbeginverbatim{3}{programlisting}% } \AfterEndEnvironment{listingcont}{% -\LWR@afterendverbatim% +\LWR@afterendverbatim{1}% } @@ -57,23 +57,21 @@ \renewcommand{\@listinginput}[3][]{ \LWR@forcenewpage -\LWR@atbeginverbatim{3.5}{programlisting}% -\LWRMV@@listinginput[#1]{#2}{#3} -\LWR@afterendverbatim% +\LWR@atbeginverbatim{3}{programlisting}% +\LWRMV@@listinginput[#1]{#2}{#3}% +\LWR@afterendverbatim{1}% } \renewenvironment*{boxedverbatim} { \LWR@forcenewpage -\LWR@atbeginverbatim{3.5}{boxedverbatim}% +\LWR@atbeginverbatim{3}{boxedverbatim}% \verbatim% } { \endverbatim% -\unskip% -\LWR@afterendverbatim% +\LWR@afterendverbatim{1}% } - \end{warpHTML} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty index 8487ef1e344..a74f58bf1a2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty @@ -16,7 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{nicefrac} +\LWR@ProvidesPackagePass{nicefrac}[1998/08/04] \LetLtxMacro\LWR@origUnitsNiceFrac\@UnitsNiceFrac \DeclareRobustCommand*{\@UnitsNiceFrac}[3][]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty index b584124920e..1f17398031e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty @@ -475,10 +475,22 @@ \newcommand{\qed}{\qquad\the\qedsymbol} \AtBeginDocument{ +\@ifundefined{LWR@orig@openbox}{ +\LetLtxMacro\LWR@orig@openbox\openbox +\LetLtxMacro\LWR@orig@blacksquare\blacksquare +\LetLtxMacro\LWR@orig@Box\Box + \def\openbox{\text{\HTMLunicode{25A1}}}% UTF-8 white box \def\blacksquare{\text{\HTMLunicode{220E}}}% UTF-8 end-of-proof \def\Box{\text{\HTMLunicode{25A1}}}% UTF-8 white box -} + +\appto\LWR@restoreorigformatting{% +\LetLtxMacro\openbox\LWR@orig@openbox% +\LetLtxMacro\blacksquare\LWR@orig@blacksquare% +\LetLtxMacro\Box\LWR@orig@Box% +}% appto +}{}% @ifundefined +}% AtBeginDocument \newcommand*{\thref}[1]{\cref{#1}} \endinput %% 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 0db069503aa..ab62119c547 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -218,6 +218,8 @@ \renewcommand*{\sloppybottom}{} \csletcs{titlingpage*}{titlingpage} \csletcs{endtitlingpage*}{endtitlingpage} +\let\titlingpageend\relax +\newcommand{\titlingpageend}[2]{} \let\andnext\and \renewcommand*{\thanksmarkstyle}[1]{} \renewcommand{\thanksfootmark}{% @@ -426,7 +428,7 @@ \let\memorigdbs\LWR@endofline \let\memorigpar\par \let\atcentercr\LWR@endofline -\renewcommand*{\flushleftright}{} + \renewcommand*{\linenottooshort}[1][]{} \renewcommand*{\russianpar}{} \renewcommand*{\lastlinerulefill}{} @@ -688,101 +690,20 @@ \renewcommand*{\FloatBlockAllowAbove}{} \renewcommand*{\FloatBlockAllowBelow}{} \renewcommand*{\setFloatBlockFor}{} -\renewcommand*{\captiondelim}[1]{\renewcommand*{\CaptionSeparator}{#1}} -\renewcommand*{\captionnamefont}[1]{} -\renewcommand*{\captiontitlefont}[1]{} -\renewcommand*{\captionstyle}[2][]{} -\renewcommand*{\centerlastline}{} -\renewcommand*{\hangcaption}{} -\renewcommand*{\indentcaption}[1]{} -\renewcommand*{\normalcaption}{} -\renewcommand*{\changecaptionwidth}{} -\DeclareDocumentCommand{\captionwidth}{m}{} -\renewcommand*{\normalcaptionwidth}{} -\renewcommand{\precaption}[1]{} -\renewcommand{\captiontitlefinal}[1]{} -\renewcommand{\postcaption}[1]{} -\renewcommand{\contcaption}[1]{% -\begin{LWR@figcaption}% later becomes \caption* -\csuse{\@captype name} \thechapter.\the\value{\@captype}\CaptionSeparator #1 -\end{LWR@figcaption} -} -\renewcommand{\legend}[1]{\begin{center}#1\\\end{center}} - -\renewcommand{\namedlegend}[2][]{ -\begin{center} -\csuse{fleg\@captype}\CaptionSeparator#2\\ -\end{center} -\csuse{flegtoc\@captype}{#1} -} +\renewcommand{\captiontitlefinal}[1]{} \renewcommand{\flegtable}{\tablename} \renewcommand{\flegfigure}{\figurename} \renewcommand{\flegtoctable}{} \renewcommand{\flegtocfigure}{} -\renewcommand{\newfixedcaption}[3][\caption]{% - \renewcommand{#2}{\def\@captype{#3}#1}} -\renewcommand{\renewfixedcaption}[3][\caption]{% - \renewcommand{#2}{\def\@captype{#3}#1}} -\renewcommand{\providefixedcaption}[3][\caption]{% - \providecommand{#2}{\def\@captype{#3}#1}} - -\renewcommand{\bitwonumcaption}[6][]{% -\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}% -\addtocounter{\@captype}{-1}% -\begingroup% -\csdef{\@captype name}{#4}% -\ifblank{#5}{\caption{#6}}{\caption[#5]{#6}}% -\endgroup% -\ifblank{#1}{}{\label{#1}}% -} - -\LetLtxMacro\bionenumcaption\bitwonumcaption% todo - -\renewcommand{\bicaption}[5][]{% -\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}% -\begin{LWR@figcaption}% later becomes \caption* -#4 \thechapter.\the\value{\@captype}\CaptionSeparator #5 -\end{LWR@figcaption} -\ifblank{#1}{}{\label{#1}}% -} - -\renewcommand{\bicontcaption}[3]{% -\contcaption{#1}% -\begingroup% -\csdef{\@captype name}{#2}% -\contcaption{#3}% -\endgroup% -} - -\renewcommand{\midbicaption}[1]{} - \renewcommand{\subcaption}[2][]{% \ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}% } -\RenewDocumentCommand{\subtop}{O{} O{} m}{% -\subfloat[#1][#2]{#3}% -} - -\RenewDocumentCommand{\subbottom}{O{} O{} m}{% -\subfloat[#1][#2]{#3}% -} - \renewcommand{\contsubcaption}{\ContinuedFloat\subcaption} -\renewcommand{\contsubtop}{% -\ContinuedFloat\addtocounter{\@captype}{1}% -\subtop} - -\renewcommand{\contsubbottom}{% -\ContinuedFloat\addtocounter{\@captype}{1}% -\subbottom} - -\renewcommand{\subconcluded}{} - \LetLtxMacro\subcaptionref\subref \renewcommand*{\tightsubcaptions}{} @@ -1047,6 +968,105 @@ \renewcommand*{\cleartoverso}{} \renewenvironment{vplace}[1][]{}{} +\renewcommand*{\captiondelim}[1]{\renewcommand*{\CaptionSeparator}{#1}} +\renewcommand*{\captionnamefont}[1]{} +\renewcommand*{\captiontitlefont}[1]{} +\renewcommand*{\flushleftright}{} +\renewcommand*{\centerlastline}{} +\renewcommand*{\captionstyle}[2][]{} +\DeclareDocumentCommand{\captionwidth}{m}{} +\renewcommand*{\changecaptionwidth}{} +\renewcommand*{\normalcaptionwidth}{} +\renewcommand*{\hangcaption}{} +\renewcommand*{\indentcaption}[1]{} +\renewcommand*{\normalcaption}{} +\renewcommand{\precaption}[1]{} +\renewcommand{\postcaption}[1]{} +\renewcommand{\midbicaption}[1]{} +\renewcommand{\contcaption}[1]{% +\begin{LWR@figcaption}% later becomes \caption* +\csuse{\@captype name} \thechapter.\the\value{\@captype}\CaptionSeparator #1 +\end{LWR@figcaption} +} + +\newlength{\abovelegendskip} +\setlength{\abovelegendskip}{0.5\baselineskip} +\newlength{\belowlegendskip} +\setlength{\belowlegendskip}{\abovelegendskip} + +\renewcommand{\legend}[1]{\begin{center}#1\\\end{center}} + +\renewcommand{\namedlegend}[2][]{ +\begin{center} +\csuse{fleg\@captype}\CaptionSeparator#2\\ +\end{center} +\csuse{flegtoc\@captype}{#1} +} + +\renewcommand{\newfixedcaption}[3][\caption]{% + \renewcommand{#2}{\def\@captype{#3}#1}} +\renewcommand{\renewfixedcaption}[3][\caption]{% + \renewcommand{#2}{\def\@captype{#3}#1}} +\renewcommand{\providefixedcaption}[3][\caption]{% + \providecommand{#2}{\def\@captype{#3}#1}} + +\renewcommand{\bitwonumcaption}[6][]{% +\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}% +\addtocounter{\@captype}{-1}% +\begingroup% +\csdef{\@captype name}{#4}% +\ifblank{#5}{\caption{#6}}{\caption[#5]{#6}}% +\endgroup% +\ifblank{#1}{}{\label{#1}}% +} + +\LetLtxMacro\bionenumcaption\bitwonumcaption% todo + +\renewcommand{\bicaption}[5][]{% +\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}% +\begin{LWR@figcaption}% later becomes \caption* +#4 \thechapter.\the\value{\@captype}\CaptionSeparator #5 +\end{LWR@figcaption} +\ifblank{#1}{}{\label{#1}}% +} + +\renewcommand{\bicontcaption}[3]{% +\contcaption{#1}% +\begingroup% +\csdef{\@captype name}{#2}% +\contcaption{#3}% +\endgroup% +} + +\RenewDocumentCommand{\subtop}{O{} O{} m}{% +\subfloat[#1][#2]{#3}% +} + +\RenewDocumentCommand{\subbottom}{O{} O{} m}{% +\subfloat[#1][#2]{#3}% +} + +\renewcommand{\contsubtop}{% +\ContinuedFloat\addtocounter{\@captype}{1}% +\subtop} + +\renewcommand{\contsubbottom}{% +\ContinuedFloat\addtocounter{\@captype}{1}% +\subbottom} + +\renewcommand{\subconcluded}{} + +\let\subfigure\subbottom +\let\subtable\subtop + +\let\contsubtable\contsubtop +\let\contsubfigure\contsubbottom +\newcommand{\newfloatentry}[4][\@empty]{TODO: newfloatentry} +\newcommand{\newfloatlist}[5][\@empty]{TODO: newfloatlist} +\newcommand{\newfloatenv}[4][\@empty]{TODO: newfloatenv} +\DeclareRobustCommand{\newfloatpagesoff}[1]{} +\DeclareRobustCommand{\newfloatpageson}[1]{} +\newcommand{\setnewfloatindents}[3]{} \newlistof{tableofcontents}{toc}{\contentsname} \newlistof{listoffigures}{lof}{\listfigurename} \newlistof{listoftables}{lot}{\listtablename} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty index 0437ea68732..508716b79f1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty @@ -19,9 +19,9 @@ \LWR@ProvidesPackageDrop{ragged2e} -\newcommand*{\Centering}{\centering} -\newcommand*{\RaggedLeft}{\raggedleft} -\newcommand*{\RaggedRight}{\raggedright} +\LetLtxMacro\Centering\centering +\LetLtxMacro\RaggedLeft\raggedleft +\LetLtxMacro\RaggedRight\raggedright \newcommand*{\justifying}{} \newlength{\CenteringLeftskip} \newlength{\RaggedLeftLeftskip} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty index 60801d79cea..8fd814288b4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty @@ -42,7 +42,7 @@ \newcommand{\ul}[1]{% \LWR@soulcolor{#1}{LWR@soululcolor}{uline}{text-decoration-color}% - {text-decoration:underline;text-decoration-skip;}% + {text-decoration:underline; text-decoration-skip: auto;}% } \newcommand{\st}[1]{ diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-t1enc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-t1enc.sty new file mode 100644 index 00000000000..3477890dca9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-t1enc.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-t1enc.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `t1enc') +%% 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@loadnever{t1enc}{fontenc, inputenc, inputenx} +\endinput +%% +%% End of file `lwarp-t1enc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty index 91dbf0aad1e..598d512b8ad 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty @@ -32,6 +32,7 @@ \let\LWR@origtextpeso\textpeso \let\LWR@origtextrecipe\textrecipe \let\LWR@origtextinterrobangdown\textinterrobangdown +\let\LWR@origtextperthousand\textperthousand \let\LWR@origtextpertenthousand\textpertenthousand \let\LWR@origtextbaht\textbaht \let\LWR@origtextdiscount\textdiscount @@ -66,6 +67,7 @@ \renewcommand*{\textpeso}{\HTMLunicode{20B1}} \renewcommand*{\textrecipe}{\HTMLunicode{211E}} \renewcommand*{\textinterrobangdown}{\HTMLunicode{2E18}} +\renewcommand*{\textperthousand}{\HTMLunicode{2030}} \renewcommand*{\textpertenthousand}{\HTMLunicode{2031}} \renewcommand*{\textbaht}{\HTMLunicode{0E3F}} \renewcommand*{\textdiscount}{\%} @@ -85,6 +87,7 @@ \renewcommand*{\textpeso}{₱} \renewcommand*{\textrecipe}{℞} \renewcommand*{\textinterrobangdown}{⸘} +\renewcommand*{\textperthousand}{‰} \renewcommand*{\textpertenthousand}{‱} \renewcommand*{\textbaht}{฿} \renewcommand*{\textdiscount}{\%} @@ -122,6 +125,7 @@ \let\textpeso\LWR@origtextpeso% \let\textrecipe\LWR@origtextrecipe% \let\textinterrobangdown\LWR@origtextinterrobangdown% +\let\textperthousand\LWR@origtextperthousand% \let\textpertenthousand\LWR@origtextpertenthousand% \let\textbaht\LWR@origtextbaht% \let\textdiscount\LWR@origtextdiscount% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty index ce142a3f2b9..0c90b0e23d7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty @@ -16,7 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{tikz} +\LWR@ProvidesPackagePass{tikz}[2015/08/07] \newboolean{LWR@tikzbabel} @@ -25,22 +25,35 @@ {\usetikzlibrary{babel}\booltrue{LWR@tikzbabel}} {\boolfalse{LWR@tikzbabel}} -\LetLtxMacro\LWR@origtikzpicture\tikzpicture - -\renewcommand*{\tikzpicture}[1][]{% +\preto\pgfpicture{% \begin{lateximage}% \ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0 {}% {\catcode`\$=3}% dollar sign is math shift - \LWR@origtikzpicture[#1]% } -\LetLtxMacro\LWR@origendtikzpicture\endtikzpicture +\appto\endpgfpicture{\end{lateximage}} -\renewcommand*{\endtikzpicture}{% - \LWR@origendtikzpicture% - \end{lateximage}% -} +\LetLtxMacro\pgfutil@minipage\LWR@origminipage +\let\pgfutil@endminipage\LWR@origendminipage + +\let\pgfutil@raggedleft\LWR@origraggedleft +\let\pgfutil@raggedright\LWR@origraggedright + +\def\pgfutil@font@tiny{\LWR@origtiny} +\def\pgfutil@font@scriptsize{\LWR@origscriptsize} +\def\pgfutil@font@footnotesize{\LWR@origfootnotesize} +\def\pgfutil@font@small{\LWR@origsmall} +\def\pgfutil@font@normalsize{\LWR@orignormalsize} +\def\pgfutil@font@large{\LWR@origlarge} +\def\pgfutil@font@Large{\LWR@origLarge} +\def\pgfutil@font@huge{\LWR@orighuge} +\def\pgfutil@font@Huge{\LWR@origHuge} + +\def\pgfutil@font@itshape{\LWR@origitshape} +\def\pgfutil@font@bfseries{\LWR@origbfseries} + +\def\pgfutil@font@normalfont{\LWR@orignormalfont} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty index 18cee7a2f34..bea41111982 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty @@ -20,14 +20,14 @@ \LetLtxMacro\LWR@ulemorigtextbf\textbf \NewDocumentCommand{\uline}{+m}{% \LWR@HTMLtextstyle% - {text-decoration:underline;text-decoration-skip}% + {text-decoration:underline; text-decoration-skip: auto}% {uline}{#1}% } \NewDocumentCommand{\uuline}{+m}{% \LWR@HTMLtextstyle% {% - text-decoration:underline;text-decoration-skip;% + text-decoration:underline; text-decoration-skip: auto;% text-decoration-style:double% }% {uuline}{#1}% @@ -36,7 +36,7 @@ \NewDocumentCommand{\uwave}{+m}{% \LWR@HTMLtextstyle% {% - text-decoration:underline;text-decoration-skip;% + text-decoration:underline; text-decoration-skip: auto;% text-decoration-style:wavy% }% {uwave}{#1}% @@ -58,7 +58,7 @@ \LWR@HTMLtextstyle% {% text-decoration:underline;% - text-decoration-skip;% + text-decoration-skip: auto;% text-decoration-style:dashed% }% {dashuline}{#1}% @@ -68,7 +68,7 @@ \LWR@HTMLtextstyle% {% text-decoration:underline;% - text-decoration-skip;% + text-decoration-skip: auto;% text-decoration-style:dotted% }% {dotuline}{#1}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty index db18fe54081..0604b36353e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty @@ -27,10 +27,11 @@ \setlength{\leftmargini}{\HTMLleftmargini} }{} \LWR@forcenewpage -\LWR@atbeginverbatim{3.5}{verse}% +\LWR@atbeginverbatim{3}{verse}% } -\AtEndEnvironment{verse}{ -\LWR@afterendverbatim +\AtEndEnvironment{verse}{% +\leavevmode% +\LWR@afterendverbatim{1}% } \ifdef{\poemtitle}{ \DeclareDocumentCommand{\@vstypeptitle}{m}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wasysym.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wasysym.sty new file mode 100644 index 00000000000..537ed6ff6e4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wasysym.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-wasysym.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `wasysym') +%% 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@loadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol} +\endinput +%% +%% End of file `lwarp-wasysym.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 7620ac5f591..2aad9949e19 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2018/04/01 v0.53 Allows LaTeX to directly produce HTML5 output.] + [2018/04/26 v0.55 Allows LaTeX to directly produce HTML5 output.] @@ -61,8 +61,11 @@ \fi \ifPDFTeX \RequirePackage[T1]{fontenc} + \@ifpackageloaded{inputenc}{}{ -\RequirePackage[utf8]{inputenc} + \@ifpackageloaded{inputenx}{}{ + \RequirePackage[utf8]{inputenc} + } } \fi @@ -144,9 +147,13 @@ \DeclareStringOption[\jobname]{BaseJobname} -\DeclareStringOption[english]{IndexLanguage} +\DeclareStringOption[english]{xindyLanguage} + +\DeclareStringOption[utf8]{xindyCodepage} + +\DeclareStringOption[lwarp.xdy]{xindyStyle} -\DeclareStringOption[lwarp.xdy]{xdyFilename} +\DeclareStringOption[UTF-8]{pdftotextEnc} \newbool{LWR@creatinglwarpmk} \boolfalse{LWR@creatinglwarpmk} @@ -242,6 +249,23 @@ Package(s) #2 may be useful instead} or is superceded by another package. For a possible alternative, see package(s) #2.} } +\newcommand*{\LWR@earlyloadnever}[2]{% +\@ifpackageloaded{#1}{% +\PackageError{lwarp} +{Package #1 is not supported by lwarp's HTML conversion. +Package(s) #2 may be useful instead} +{Package #1 might conflict with lwarp in some way, +or is superceded by another package. +For a possible alternative, see package(s) #2.} +}{}% +} +\LWR@earlyloadnever{ae}{lmodern} +\LWR@earlyloadnever{aecc}{lmodern} +\LWR@earlyloadnever{boxedminipage}{boxedminipage2e} +\LWR@earlyloadnever{caption2}{caption} +\LWR@earlyloadnever{fancyheadings}{fancyhdr} +\LWR@earlyloadnever{t1enc}{fontenc, inputenc, inputenx} +\LWR@earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol} \LWR@loadafter{a4} \LWR@loadafter{a4wide} \LWR@loadafter{a5comb} @@ -275,7 +299,6 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{bytefield} \LWR@loadafter{cancel} \LWR@loadafter{caption} -\LWR@notmemoirloadafter{ccaption} \LWR@loadafter{changebar} \LWR@notmemoirloadafter{changepage} \LWR@notmemoirloadafter{chngpage} @@ -337,6 +360,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{footnote} \LWR@loadafter{footnotehyper} \LWR@loadafter{footnpag} +\LWR@loadafter{forest} \LWR@loadafter{framed} \LWR@loadafter{ftnright} \LWR@loadafter{fullpage} @@ -346,6 +370,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{glossaries} \LWR@loadafter{grffile} \LWR@loadafter{grid} +\LWR@loadafter{gridset} \LWR@loadafter{hang} \LWR@loadafter{hanging} \LWR@loadafter{hypcap} @@ -371,6 +396,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{ltxtable} \LWR@loadafter{luacolor} \LWR@loadafter{luatodonotes} +\LWR@loadafter{magaz} \LWR@loadafter{marginfit} \LWR@loadafter{marginfix} \LWR@loadafter{marginnote} @@ -993,7 +1019,7 @@ top=1in,bottom=1in,% \let\LWR@origthispagestyle\thispagestyle \LetLtxMacro\LWR@origpagenumbering\pagenumbering -\LetLtxMacro{\LWR@origminipage}{\minipage} +\LetLtxMacro\LWR@origminipage\minipage \let\LWR@origendminipage\endminipage \LetLtxMacro{\LWR@origparbox}{\parbox} @@ -1112,8 +1138,10 @@ homehtmlfilename = "\HomeHTMLFilename"% } \immediate\write\LWR@quickfile{htmlfilename = "\HTMLFilename"} \immediate\write\LWR@quickfile{latexmk = "\ifbool{LWR@latexmk}{true}{false}"} -\immediate\write\LWR@quickfile{language = "\LWR@IndexLanguage"} -\immediate\write\LWR@quickfile{xdyfile = "\LWR@xdyFilename"} +\immediate\write\LWR@quickfile{xindylanguage = "\LWR@xindyLanguage"} +\immediate\write\LWR@quickfile{xindycodepage = "\LWR@xindyCodepage"} +\immediate\write\LWR@quickfile{xindystyle = "\LWR@xindyStyle"} +\immediate\write\LWR@quickfile{pdftotextenc = "\LWR@pdftotextEnc"} \immediate\closeout\LWR@quickfile \end{warpprint} @@ -1140,8 +1168,10 @@ homehtmlfilename = "\HomeHTMLFilename"% } \immediate\write\LWR@quickfile{htmlfilename = "\HTMLFilename"} \immediate\write\LWR@quickfile{latexmk = "\ifbool{LWR@latexmk}{true}{false}"} -\immediate\write\LWR@quickfile{language = "\LWR@IndexLanguage"} -\immediate\write\LWR@quickfile{xdyfile = "\LWR@xdyFilename"} +\immediate\write\LWR@quickfile{xindylanguage = "\LWR@xindyLanguage"} +\immediate\write\LWR@quickfile{xindycodepage = "\LWR@xindyCodepage"} +\immediate\write\LWR@quickfile{xindystyle = "\LWR@xindyStyle"} +\immediate\write\LWR@quickfile{pdftotextenc = "\LWR@pdftotextEnc"} \immediate\closeout\LWR@quickfile \end{warpprint} @@ -1240,12 +1270,12 @@ span.textcircled { border: 1px solid black ; border-radius: 1ex ; } span.underline { text-decoration: underline ; - text-decoration-skip ; + text-decoration-skip: auto ; } span.overline { text-decoration: overline ; - text-decoration-skip ; + text-decoration-skip: auto ; } /* for diagbox */ @@ -1284,12 +1314,9 @@ div.diagboxW { top: .5em; } -span.attribution { - margin-left: 1em ; font-size: 80% ; font-variant: small-caps; -} - -span.citetitle { - margin-left: 1em ; font-size: 80% ; font-style: oblique; +div.attribution p { + text-align: right ; + font-size: 80% } span.poemtitle { @@ -1376,24 +1403,24 @@ div.epigraphsource p, div.dictumauthor p { padding: .5ex 0ex 0ex 0ex ; margin: 0 div.dictumauthor { font-style:italic } /* lettrine package: */ -span.lettrine { font-size: 3ex ; float: left ; } +span.lettrine { font-size: 4ex ; float: left ; } span.lettrinetext { font-variant: small-caps ; } /* ulem and soul packages: */ span.uline { text-decoration: underline ; - text-decoration-skip ; + text-decoration-skip: auto ; } span.uuline { text-decoration: underline ; - text-decoration-skip ; + text-decoration-skip: auto ; text-decoration-style: double ; } span.uwave { text-decoration: underline ; - text-decoration-skip ; + text-decoration-skip: auto ; text-decoration-style: wavy ; } @@ -1407,13 +1434,13 @@ span.xout { span.dashuline { text-decoration: underline ; - text-decoration-skip ; + text-decoration-skip: auto ; text-decoration-style: dashed ; } span.dotuline { text-decoration: underline ; - text-decoration-skip ; + text-decoration-skip: auto ; text-decoration-style: dotted ; } @@ -2917,9 +2944,10 @@ nav.botnavigation { /* ( --- Start of project.css --- ) */ /* ( --- A sample project-specific CSS file for lwarp --- ) */ -/* Load default lwarp settings: */ +/* Uncomment one of the following: */ @import url("lwarp.css") ; -/* or lwarp_formal.css, lwarp_sagebrush.css */ +/* @import url("lwarp_formal.css") ; */ +/* @import url("lwarp_sagebrush.css") ; */ /* Project-specific CSS setting follow here. */ /* . . . */ @@ -3075,7 +3103,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX- -- Print the usage of the lwarpmk command: -printversion = "v0.53" +printversion = "v0.55" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -3120,8 +3148,10 @@ sourcename = "projectname" (the source-code filename w/o .tex) homehtmlfilename = "index" (or perhaps the project name) htmlfilename = "" (or "projectname" - filename prefix) latexmk = "false" (or "true" to use latexmk to build PDFs) -languge = "english" (use a language supported by xindy) -xdyfile = "lwarp.xdy" (or a custom file based on lwarp.xdy) +xindylanguge = "english" (use a language supported by xindy) +xindycodepage = "utf8" (use a codepage supported by xindy) +xindystyle = "lwarp.xdy" (or a custom file based on lwarp.xdy) +pdftotextenc = "UTF-8" (use an encoding supported by pdftotext) -- Filenames must contain only letters, numbers, underscore, or dash. Values must be in "quotes". @@ -3168,17 +3198,24 @@ function loadconf () local conffile = "lwarpmk.conf" -- Optional configuration filename: if ( arg[2] ~= nil ) then conffile = arg[2]..".lwarpmkconf" end --- Default language: -language = "english" --- Default xdyfile: -xdyfile = "lwarp.xdy" +-- Default xindy language: +xindylanguage = "english" +-- Default xindy codepage: +xindycodepage = "utf8" +-- Default xindystyle: +xindystyle = "lwarp.xdy" +-- Default pdftotext encoding: +pdftotextenc = "UTF-8" -- Verify the file exists: if (lfs.attributes(conffile,"mode")==nil) then -- file not exists print ("lwarpmk: ===") - print ("lwarpmk: " .. conffile .." does not exist.") + print ("lwarpmk: File \"" .. conffile .."\" does not exist.") + print ("lwarpmk: Move to the project's source directory,") + print ("lwarpmk: recompile using pdflatex, xelatex, or lualatex,") + print ("lwarpmk: then try using lwarpmk again.") if ( arg[2] ~= nil ) then - print ("lwarpmk: " .. arg[2] .. " does not appear to be a project name.\n") + print ("lwarpmk: (\"" .. arg[2] .. "\" does not appear to be a project name.)") end print ("lwarpmk: ===") printhelp () ; @@ -3223,8 +3260,10 @@ elseif ( cvarname == "sourcename" ) then sourcename = cvalue elseif ( cvarname == "homehtmlfilename" ) then homehtmlfilename = cvalue elseif ( cvarname == "htmlfilename" ) then htmlfilename = cvalue elseif ( cvarname == "latexmk" ) then latexmk = cvalue -elseif ( cvarname == "language" ) then language = cvalue -elseif ( cvarname == "xdyfile" ) then xdyfile = cvalue +elseif ( cvarname == "xindylanguage" ) then xindylanguage = cvalue +elseif ( cvarname == "xindycodepage" ) then xindycodepage = cvalue +elseif ( cvarname == "xindystyle" ) then xindystyle = cvalue +elseif ( cvarname == "pdftotextenc" ) then pdftotextenc = cvalue else print ("lwarpmk: ===") print ("lwarpmk: " .. linenum .. " : " .. line ) ; @@ -3278,13 +3317,13 @@ elseif opsystem=="Windows" then -- For Windows else print ( "lwarpmk: Select Unix or Windows for opsystem" ) end --- for Windows --- set xindycmd according to pdflatex vs xelatex/lualatex: +-- set xindycmd, glossarycmd according to pdflatex vs xelatex/lualatex: if ( latexname == "pdflatex" ) then - xindycmd = "texindy -C utf8" - glossarycmd = "xindy -C utf8" + xindycmd = "texindy " + glossarycmd = "xindy " else - xindycmd = "xindy -M texindy -C utf8" - glossarycmd = "xindy -C utf8" + xindycmd = "xindy -M texindy " + glossarycmd = "xindy " end end -- loadconf @@ -3353,7 +3392,7 @@ function pdftohtml () -- Convert to text: print ("lwarpmk: Converting " .. sourcename .."_html.pdf to " .. sourcename .. "_html.html") -os.execute("pdftotext -enc UTF-8 -nopgbrk -layout " +os.execute("pdftotext -enc " .. pdftotextenc .. " -nopgbrk -layout " .. sourcename .. "_html.pdf " .. sourcename .. "_html.html") -- Split the result into individual HTML files: splitfile (homehtmlfilename .. ".html" , sourcename .. "_html.html") @@ -3374,33 +3413,96 @@ os.execute ( rmname .. " *.aux " .. ) end --- Create lateximages based on lateximages.txt: -function createlateximages () -print ("lwarpmk: Creating lateximages.") -local limagesfile = io.open("lateximages.txt", "r") -if ( limagesfile == nil ) then +-- Error if the HTML document does not exist. +-- The lateximages are drawn from the HTML PDF verison of the document, +-- so "lwarpmk html" must be done before "lwarpmk limages". +function checkhtmlpdfexists () +local htmlpdffile = io.open(sourcename .. "_html.pdf", "r") +if ( htmlpdffile == nil ) then + print ("") + print ("lwarpmk: ===") + print ("lwarpmk: The HTML version of the document does not exist.") + print ("lwarpmk: Enter \"lwarpmk html\" to compile the HTML version.") + print ("lwarpmk: ===") + os.exit(1) +end +io.close (htmlpdffile) +end -- checkhtmlpdfexists + +-- Warning of a missing lateximages.txt file: +function warnlimages () print ("lwarpmk: ===") print ("lwarpmk: \"lateximages.txt\" does not exist.") print ("lwarpmk: Your project does not use SVG math or other lateximages,") print ("lwarpmk: or the file has been deleted somehow.") - print ("lwarpmk: Use \"lwarpmk html\" to recompile your project,") + print ("lwarpmk: Use \"lwarpmk html\" to recompile your project") print ("lwarpmk: and recreate \"lateximages.txt\".") print ("lwarpmk: If your project does not use SVG math or other lateximages,") print ("lwarpmk: then \"lateximages.txt\" will never exist, and") print ("lwarpmk: \"lwarpmk limages\" will not be necessary.") print ("lwarpmk: ===") +end -- warnlimages + +-- Check lateximages.txt to see if need to recompile first. +-- If any entry has a page number of zero, then there were incorrect images. +function checklimages () +print ("lwarpmk: Checking for a valid lateximages.txt file.") +local limagesfile = io.open("lateximages.txt", "r") +if ( limagesfile == nil ) then + warnlimages () + os.exit(1) +end +-- Track warning to recompile if find a page 0 +local pagezerowarning = false +-- Scan lateximages.txt +for line in limagesfile:lines() do + -- lwimgpage is the page number in the PDF which has the image + -- lwimghash is true if this filename is a hash + -- lwimgname is the lateximage filename root to assign for the image + i,j,lwimgpage,lwimghash,lwimgname = string.find (line,"|(.*)|(.*)|(.*)|") + -- For each entry: + if ( (i~=nil) ) then + -- If the page number is 0, image references are incorrect + -- and must recompile the soure document: + if ( lwimgpage == "0" ) then + pagezerowarning = true + end + end -- if i~=nil +end -- do +if ( pagezerowarning ) then + print ("") + print ("lwarpmk: ===") + print ("lwarpmk: The document must be recompiled before creating the lateximages.") + print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.") + print ("lwarpmk: ===") + os.exit(1) ; +end -- pagezerowarning +end -- checklateximages + +-- Create lateximages based on lateximages.txt: +function createlateximages () +-- See if the document must be recompiled first: +checklimages () +-- See if the print version exists: +checkhtmlpdfexists () +-- Attempt to create the lateximages: +print ("lwarpmk: Creating lateximages.") +local limagesfile = io.open("lateximages.txt", "r") +if ( limagesfile == nil ) then + warnlateximages () os.exit(1) end -- Create the lateximages directory, ignore error if already exists err = os.execute("mkdir lateximages") --- For Windows, create lwarp_one_limage.cmd: +-- For Windows, create lwarp_one_limage.cmd from lwarp_one_limage.txt: if opsystem=="Windows" then err = os.execute ( cpname .. " lwarp_one_limage.txt lwarp_one_limage.cmd" ) if ( err ~= 0 ) then print ("lwarpmk: ===") - print ("lwarpmk: File error trying to copy to lwarp_one_limage.cmd") + print ("lwarpmk: File error trying to copy") + print (" lwarp_one_limage.txt to lwarp_one_limage.cmd") print ("lwarpmk: ===") os.exit(1) ; end @@ -3500,6 +3602,10 @@ end -- not page 0 end -- not nil end -- do io.close(limagesfile) +print ( "lwarpmk limages: ===") +print ( "lwarpmk limages: Wait a moment for the images to complete" ) +print ( "lwarpmk limages: before reloading the page." ) +print ( "lwarpmk limages: ===") print ( "lwarpmk limages: done" ) if ( pagezerowarning == true ) then print ( "lwarpmk limages: WARNING: Images will be incorrect." ) @@ -3519,8 +3625,9 @@ err=os.execute ( "latexmk -pdf -dvi- -ps- -recorder " .. opquote .. "$makeindex = q/" -- $ .. xindycmd - .. " -M " .. xdyfile - .. " -L " .. language .. " /" + .. " -M " .. xindystyle + .. " -C " .. xindycodepage + .. " -L " .. xindylanguage .. " /" .. opquote .. " -pdflatex=\"" .. latexname .." %O %S\" " .. sourcename..fsuffix ..".tex" ) ; @@ -3583,8 +3690,9 @@ loadconf () print ("lwarpmk: Processing the index.") os.execute( xindycmd - .. " -M " .. xdyfile - .. " -L " .. language + .. " -M " .. xindystyle + .. " -C " .. xindycodepage + .. " -L " .. xindylanguage .. " " .. sourcename .. ".idx") print ("lwarpmk: Forcing an update of " .. sourcename ..".tex.") refreshdate () @@ -3599,7 +3707,10 @@ elseif arg[1] == "printglossary" then loadconf () print ("lwarpmk: Processing the glossary.") -os.execute(glossarycmd .. " -L " .. language .. " -I xindy -M " .. sourcename .. +os.execute(glossarycmd .. + " -L " .. xindylanguage .. + " -C " .. xindycodepage .. + " -I xindy -M " .. sourcename .. " -t " .. sourcename .. ".glg -o " .. sourcename .. ".gls " .. sourcename .. ".glo") print ("lwarpmk: Forcing an update of " .. sourcename ..".tex.") @@ -3654,8 +3765,9 @@ loadconf () print ("lwarpmk: Processing the index.") os.execute( xindycmd - .. " -M " .. xdyfile - .. " -L " .. language + .. " -M " .. xindystyle + .. " -L " .. xindylanguage + .. " -C " .. xindycodepage .. " " .. sourcename .. "_html.idx" ) print ("lwarpmk: Forcing an update of " .. sourcename ..".tex.") @@ -3671,7 +3783,10 @@ elseif arg[1] == "htmlglossary" then loadconf () print ("lwarpmk: Processing the glossary.") -os.execute(glossarycmd .. " -L " .. language .. " -I xindy -M " ..sourcename .. +os.execute(glossarycmd .. + " -L " .. xindylanguage .. + " -C " .. xindycodepage .. + " -I xindy -M " ..sourcename .. "_html -t " .. sourcename .. "_html.glg -o " ..sourcename .. "_html.gls " ..sourcename .. "_html.glo") @@ -3739,8 +3854,8 @@ elseif (arg[1] == "-h" ) or (arg[1] == "--help") then printusage () else -print ("lwarpmk: Unknown command \""..arg[1].."\".\n") printhelp () +print ("\nlwarpmk: ****** Unknown command \""..arg[1].."\". ******\n") end end -- not --version @@ -4043,6 +4158,7 @@ end -- not --version \begin{warpHTML} \newcommand{\LWR@forcenewpage}{% +\LWR@traceinfo{LWR@forcenewpage}% \ifinner\else% \LWR@stoppars\LWR@orignewpage\LWR@startpars% \fi% @@ -4886,6 +5002,7 @@ end -- not --version \LWR@stoppars \LWR@htmltag{/body}\LWR@orignewline \LWR@htmltag{/html}\LWR@orignewline +\LWR@traceinfo{LWR@newhtmlfile: about to LWR@orignewpage} \LWR@orignewpage \addtocounter{LWR@htmlfilenumber}{1}% @@ -5329,6 +5446,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \edef\HTMLFilename{\detokenize\expandafter{\LWR@strresult}} \LWR@origonecolumn% \LWR@origpagestyle{empty}% +\overfullrule=0pt \LWR@origscriptsize% \LWR@origraggedright% \LetLtxMacro{\\}{\LWR@endofline}% @@ -5339,9 +5457,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \setlength{\belowcaptionskip}{0ex} \setlength{\abovecaptionskip}{0ex} \renewcommand{\ps@plain}{} -\renewcommand*{\centering}{} -\renewcommand*{\raggedleft}{} -\renewcommand*{\raggedright}{} \LetLtxMacro{\LWR@origtabular}{\tabular} \LetLtxMacro{\LWR@origendtabular}{\endtabular} \LetLtxMacro{\tabular}{\LWR@tabular} @@ -5640,45 +5755,19 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \begin{warpHTML} -\ifPDFTeX% -\ifdefstring{\inputencodingname}{utf8}{% \newcommand{\attribution}[1]{% - \InlineClass{attribution}{—\,#1}% emdash -} -}{ -\newcommand{\attribution}[1]{% - \InlineClass{attribution}{---\,#1}% -} -} -\else% -\newcommand{\attribution}[1]{% - \InlineClass{attribution}{—\,#1}% emdash + \begin{BlockClass}{attribution} + #1 + \end{BlockClass} } -\fi% \end{warpHTML} \begin{warpprint} -\newcommand{\attribution}[1]{\textsc{---\,#1}} -\end{warpprint} - -\begin{warpHTML} -\ifPDFTeX% -\ifdefstring{\inputencodingname}{utf8}{% -\newcommand{\citetitle}[1]{% - \InlineClass{citetitle}{—\,#1}% -}% -}{ -\newcommand{\citetitle}[1]{% - \InlineClass{citetitle}{---\,#1}% -}% +\newcommand{\attribution}[1]{ + \begin{flushright} + \unskip + #1 + \end{flushright}% } -\else% -\newcommand{\citetitle}[1]{% - \InlineClass{citetitle}{—\,#1}% -}% -\fi% -\end{warpHTML} -\begin{warpprint} -\newcommand{\citetitle}[1]{\textsl{---\,#1}} \end{warpprint} @@ -5699,6 +5788,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \end{warpHTML} +\begin{warpHTML} +\renewenvironment{verse} + {\let\\\newline% lwarp + \list{}{\itemsep \z@ + \itemindent -1.5em% + \listparindent\itemindent + \rightmargin \leftmargin + \advance\leftmargin 1.5em}% + \item\relax} + {\endlist} +\end{warpHTML} \begin{warpall} \newlength{\HTMLvleftskip} @@ -5729,22 +5829,23 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@htmltag{pre class="#3" \ifthenelse{\equal{#1}{}}{}{style="#1"}% }% - \unskip\LWR@origvspace*{-#2\baselineskip}% \LWR@orignewline% pre + \leavevmode\unskip\LWR@origvspace*{-#2\baselineskip}% }{}% \begingroup% -\LWR@orignormalsize% \LWR@origttfamily% +\LWR@origsmall% \LWR@restoreoriglists% \LWR@FBcancel% \LetLtxMacro{\hspace}{\LWR@orighspace}% } -\newcommand*{\LWR@afterendverbatim}{% - +\newcommand*{\LWR@afterendverbatim}[1]{% \endgroup% -\ifbool{LWR@verbtags}{\noindent\LWR@htmltag{/pre} - +\par% +\ifbool{LWR@verbtags}{% + \LWR@origvspace*{-#1\baselineskip}% + \noindent\LWR@htmltag{/pre}\LWR@orignewline% pre }{}% \LWR@startpars% } @@ -5753,20 +5854,19 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \renewcommand{\verbatim@input}[2]{% \ifbool{LWR@verbtags}{\LWR@forcenewpage}{}% -\LWR@atbeginverbatim{3.5}{Verbatim}% +\LWR@atbeginverbatim{2.5}{Verbatim}% \LWRV@origverbatim@input{#1}{#2}% -\unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim% +\LWR@afterendverbatim{1.5}% } \AfterEndPreamble{ \LWR@traceinfo{Patching verbatim.} \AtBeginEnvironment{verbatim}{% \LWR@forcenewpage% -\LWR@atbeginverbatim{.5}{verbatim}% -\unskip\LWR@origvspace*{-1.5\baselineskip}% +\LWR@atbeginverbatim{2.5}{verbatim}% } \AfterEndEnvironment{verbatim}{% - \unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim% + \LWR@afterendverbatim{1}% } } @@ -5775,13 +5875,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \renewcommand*{\tabbing}{% \LWR@forcenewpage% -\LWR@atbeginverbatim{3.5}{tabbing}% +\LWR@atbeginverbatim{3}{tabbing}% \LWR@origtabbing% } \renewcommand*{\endtabbing}{% \LWR@origendtabbing% - \unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim% + \LWR@afterendverbatim{1}% } \AtBeginDocument{ \appto\LWR@restoreorigformatting{% @@ -7254,6 +7354,7 @@ rowspan="#2" % \global\boolfalse{LWR@exitingtabular}% \global\boolfalse{LWR@tabularmutemods}% \global\booltrue{LWR@intabularmetadata}% +\LWR@traceinfo{LWR@tabular: About to LWR@forecenewpage.}% \LWR@forcenewpage \LWR@htmlblocktag{table}% \LWR@parsetablecols{#2}% @@ -7563,11 +7664,11 @@ autopage-\theLWR@currentautosec% \newrobustcmd*{\href}{% \begingroup% -\catcode`\#=12 -\catcode`\%=12 -\catcode`\&=12 -\catcode`\~=12 -\catcode`\_=12 +\catcode`\#=12% +\catcode`\%=12% +\catcode`\&=12% +\catcode`\~=12% +\catcode`\_=12% \LWR@hrefb% } @@ -7581,11 +7682,11 @@ autopage-\theLWR@currentautosec% \newrobustcmd*{\nolinkurl}{% \begingroup% -\catcode`\#=12 -\catcode`\%=12 -\catcode`\&=12 -\catcode`\~=12 -\catcode`\_=12 +\catcode`\#=12% +\catcode`\%=12% +\catcode`\&=12% +\catcode`\~=12% +\catcode`\_=12% \LWR@nolinkurlb% } @@ -7599,11 +7700,11 @@ autopage-\theLWR@currentautosec% \newrobustcmd*{\url}{% \begingroup% -\catcode`\#=12 -\catcode`\%=12 -\catcode`\&=12 -\catcode`\~=12 -\catcode`\_=12 +\catcode`\#=12% +\catcode`\%=12% +\catcode`\&=12% +\catcode`\~=12% +\catcode`\_=12% \LWR@urlb% } @@ -7642,10 +7743,19 @@ autopage-\theLWR@currentautosec% === begin #1 === }{}% +\LWR@futurenonspacelet\LWR@mynexttoken\LWR@floatalignment% +} +\AtBeginDocument{ +\@ifpackageloaded{tocbasic}{ +\appto\figure@atbegin{% +\LWR@futurenonspacelet\LWR@mynexttoken\LWR@floatalignment% +} +}{} } \let\@float\LWR@floatbegin \let\@dblfloat\LWR@floatbegin \newcommand*{\LWR@floatend}{% +\LWR@endfloatalignment% \ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{% === end === @@ -7683,6 +7793,28 @@ autopage-\theLWR@currentautosec% \newcommand*{\@captype}{} +\newcommand*{\LWR@floatalignmentname}{} + +\newcommand*{\LWR@floatalignment}{% +\ifdefstrequal{\LWR@mynexttoken}{\centering}{% + \center% + \renewcommand*{\LWR@floatalignmentname}{center}% +}{}% +\ifdefstrequal{\LWR@mynexttoken}{\raggedright}{% + \flushleft% + \renewcommand*{\LWR@floatalignmentname}{flushleft}% +}{}% +\ifdefstrequal{\LWR@mynexttoken}{\raggedleft}{% + \flushright% + \renewcommand*{\LWR@floatalignmentname}{flushright}% +}{}% +} + +\newcommand*{\LWR@endfloatalignment}{% +\ifdefvoid{\LWR@floatalignmentname}{}{\csuse{end\LWR@floatalignmentname}}% +\renewcommand*{\LWR@floatalignmentname}{}% +} + \AtBeginDocument{\providecommand*{\CaptionSeparator}{:~}} @@ -7774,7 +7906,7 @@ autopage-\theLWR@currentautosec% \renewcommand*{\addcontentsline}[3]{% \ifstrequal{#1}{toc}{}{% not TOC \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% - {} + {}% {\LWR@newautoidanchor}% \ifcsvoid{ext@#2}{\csdef{ext@#2}{#1}}{}% \addtocontents{\@nameuse{ext@#2}}{% @@ -7939,8 +8071,8 @@ autopage-\theLWR@currentautosec% \LWR@htmlrefsectionfilename{autopage-#4}\LWR@origpound\LWR@origmbox{autosec-#4}% }{#3}{toc#2}% \LWR@stoppars% -} -{} +}% +{}% \LWR@traceinfo{hypertoc done}% } @@ -8071,8 +8203,9 @@ autopage-\theLWR@currentautosec% \if@filesw \immediate\write\@auxout{\string\bibdata{#1}}% \fi + \begingroup% \@input@{\BaseJobname.bbl}% lwarp - \DeclareDocumentCommand{\etalchar}{m}{\textsuperscript{#1}}% lwarp + \endgroup% } \renewcommand{\@biblabel}[1]{[#1]\quad} \AtBeginDocument{ @@ -8091,11 +8224,7 @@ autopage-\theLWR@currentautosec% \endgroup \LWR@em@after\egroup } -\DeclareDocumentCommand{\etalchar}{m}{\textsuperscript{#1}} }% \AtBeginEnvironment{thebibliography} -\BeforeBeginEnvironment{thebibliography}{% -\DeclareDocumentCommand{\etalchar}{m}{\textsuperscript{#1}} -}% \BeforeBeginEnvironment }% \AtBeginDocument \end{warpHTML} @@ -8195,11 +8324,11 @@ autopage-\theLWR@currentautosec% \let\makebox\LWR@origmakebox% \let\fbox\LWRprint@fbox% \let\fboxBlock\LWRprint@fbox% -\LetLtxMacro{\fminipage}{\LWRprint@fminipage}% -\LetLtxMacro{\endfminipage}{\endLWRprint@fminipage}% -\LetLtxMacro{\minipage}{\LWR@origminipage}% +\LetLtxMacro\fminipage\LWRprint@fminipage% +\LetLtxMacro\endfminipage\endLWRprint@fminipage% +\LetLtxMacro\minipage\LWR@origminipage% \let\endminipage\LWR@origendminipage% -\LetLtxMacro{\parbox}{\LWR@origparbox}% +\LetLtxMacro\parbox\LWR@origparbox% \let\TeX\LWR@origTeX% \let\LaTeX\LWR@origLaTeX% \let\LaTeXe\LWR@origLaTeXe% @@ -9053,7 +9182,7 @@ autopage-\theLWR@currentautosec% \begin{warpall} -\newcommand*{\LateximageFontSizeName}{large} +\newcommand*{\LateximageFontSizeName}{normalsize} \newcommand*{\LateximageFontScale}{.75} @@ -9325,6 +9454,25 @@ autopage-\theLWR@currentautosec% } {\endBlockClass} + +\renewcommand*{\centering}{% +\ifbool{HTMLDebugComments}{% + \LWR@htmlcomment{centering}% +}{}% +} + +\renewcommand*{\raggedleft}{% +\ifbool{HTMLDebugComments}{% + \LWR@htmlcomment{raggedleft}% +}{}% +} + +\renewcommand*{\raggedright}{% +\ifbool{HTMLDebugComments}{% + \LWR@htmlcomment{raggedright}% +}{}% +} + \renewcommand{\leftline}[1]{\begin{flushleft}#1\end{flushleft}} \renewcommand{\centerline}[1]{\begin{center}#1\end{center}} @@ -9655,6 +9803,7 @@ autopage-\theLWR@currentautosec% \boolfalse{LWR@minipagethispar} \RenewDocumentEnvironment{minipage}{O{t} o O{t} m} {% +\LWR@traceinfo{minipage}% \begingroup \setlength{\LWR@minipagewidth}{#4}% \ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}{% @@ -9733,6 +9882,7 @@ autopage-\theLWR@currentautosec% \LWR@startpars% \ifbool{FormatWP}{\newline}{}% \global\booltrue{LWR@minipagethispar}% +\LWR@traceinfo{LWR@minipage: done}% } \RenewDocumentCommand{\parbox}{O{t} o O{t} m +m} { @@ -9984,7 +10134,7 @@ width:\LWR@printlength{\LWR@tempwidth}% \DeclareRobustCommand{\LWR@HTMLtextstyle}[3]{##3}% \def\(##1\){}% \def\[##1\]{}% -\RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{} +\RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{}% \let\texorpdfstring\relax% \newcommand{\texorpdfstring}[2]{##2}% } @@ -10046,13 +10196,13 @@ width:\LWR@printlength{\LWR@tempwidth}% \renewcommand{\underline}[1]{% \LWR@HTMLtextstyle% - {text-decoration:underline;text-decoration-skip}% + {text-decoration:underline; text-decoration-skip: auto}% {underline}{#1}% } \newcommand{\LWR@overline}[1]{% \LWR@HTMLtextstyle% - {text-decoration:overline;text-decoration-skip}% + {text-decoration:overline; text-decoration-skip: auto}% {overline}{#1}% } @@ -10245,7 +10395,10 @@ width:\LWR@printlength{\LWR@tempwidth}% \begin{warpHTML} \DeclareDocumentCommand{\phantomsection}{}{% +\begingroup% +\boolfalse{LWR@forcinghtmltoc}% \section*{}% +\endgroup% } \end{warpHTML} -- cgit v1.2.3