texlive[49479] trunk: lwarp (22dec18)
commits+karl at tug.org
commits+karl at tug.org
Sat Dec 22 22:54:16 CET 2018
Revision: 49479
http://tug.org/svn/texlive?view=revision&revision=49479
Author: karl
Date: 2018-12-22 22:54:16 +0100 (Sat, 22 Dec 2018)
Log Message:
-----------
lwarp (22dec18)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2018-12-22 21:54:16 UTC (rev 49479)
@@ -2,7 +2,7 @@
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.64"
+printversion = "v0.65"
requiredconfversion = "1" -- also at *lwarpmk.conf
function printhelp ()
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2018-12-22 21:54:16 UTC (rev 49479)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.64 README.txt
+LaTeX lwarp package v0.65 README.txt
Files included are:
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2018-12-22 21:54:16 UTC (rev 49479)
@@ -2,7 +2,7 @@
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.64"
+printversion = "v0.65"
requiredconfversion = "1" -- also at *lwarpmk.conf
function printhelp ()
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2018-12-22 21:54:16 UTC (rev 49479)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2018/12/08 v0.64 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2018/12/22 v0.65 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -1522,7 +1522,7 @@
\cs{includegraphics} accepts \optn{width} and \optn{height},
\margintag{options}
\optn{origin}, \optn{rotate} and \optn{scale},
-plus a new \optn{class} key.
+plus new \optn{class} and \optn{alt} keys.
With \HTML\ output, \cs{includegraphics} accepts an optional
\margintag{\HTML\ class}
@@ -1530,6 +1530,11 @@
the \HTML\ output will include that class for the image.
The class is ignored for print output.
+Likewise, the \cs{includegraphics} \optn{alt} key adds an \HTML\ \attribute{alt} tag to
+\margintag{\HTML\ \attribute{alt} tags}
+an image, and is ignored for print output. If not assigned, each
+image is given an \attribute{alt} tag of ``\optn{(image)}''.
+
\cs{rotatebox} accepts the optional \optn{origin} key.
\margintag{\cs{rotatebox}}
@@ -2562,7 +2567,7 @@
%<*package>
% \fi
%
-% \CheckSum{27072}
+% \CheckSum{27403}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -2668,7 +2673,8 @@
% \changes{v0.61}{2018/10/13}{\ 2018/10/13}
% \changes{v0.62}{2018/11/19}{\ 2018/11/19}
% \changes{v0.63}{2018/12/03}{\ 2018/12/03}
-% \changes{v0.64}{2018/12/08}{\ PENDING}
+% \changes{v0.64}{2018/12/08}{\ 2018/12/08}
+% \changes{v0.65}{2018/12/22}{\ 2018/12/22}
@@ -2868,6 +2874,39 @@
%
% \begin{description}
% \needspace{2\baselineskip}
+% \item[v0.65:] \CSS\ layout, \attribute{alt} tags, Japanese. PENDING
+% \begin{itemize}
+% \item Moved the side\TOC\ to the left side,
+% \margintag{page layout}
+% allowing improved \CSS\ for margin notes.
+% \item Improved page layout \CSS.
+% \item \pkg{graphicx} \cs{includegraphics}: Added the \optn{alt} key
+% \margintag{image \attribute{alt} tags}
+% to assign an \attribute{alt} tag to an image. Default is ``\optn{(image)}'',
+% assigned to pass validation.
+% \item Detects and causes an error
+% \margintag{duplicate \HTML\ files}
+% if duplicate \HTML\ file names are generated,
+% caused by identical or similar sectioning names.
+% \item Fix for \env{tabular*}.
+% \margintag{fixes}
+% \item Fix for tabular border colors.
+% \item Fixes \cs{quad}, \cs{enskip}, and figure captions to pass validation.
+% \item Added \pkg{ltj*} classes,
+% \margintag{Japanese}
+% \pkg{bounddvi}, \pkg{gentombow}, \pkg{lltjext}, \pkg{plarydshln},
+% \pkg{plext}, \pkg{plextarydshln},
+% \pkg{plextcolortbl}, \pkg{pxatbegshi},
+% \pkg{pxeveryshi}, \pkg{pxftnright}, \pkg{pxjahyper}, \pkg{tascmac}.
+% \item Verified to work with \pkg{plarray}, \pkg{plautopatch},
+% \pkg{plextarray}, \pkg{plextdelarray}, \pkg{pxgentombow},
+% \pkg{plsiunitx}, \pkg{pxpdfpages}, \pkg{pxpgfrcs}, \pkg{pxpgfmark}.
+% \item Added support for \pkg{fontspec} \cs{textsi} and \cs{sishape}.
+% \margintag{packages}
+% \item Added \pkg{multicol}'s \cs{docolaction}.
+% \item Added \pkg{embrac}, \pkg{footnoterange}, \pkg{multicolrule}, \pkg{versonotes}.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.64:] Koma-Script, Japanese, Chinese.
% \begin{itemize}
% \item Added \pkg{utarticle} and related classes.
@@ -4235,7 +4274,7 @@
%
% \midrule
%
-% Engines: & \DVI\ \LaTeX, pdf\LaTeX, \XeLaTeX, \LuaLaTeX, p\LaTeX, up\LaTeX \\
+% Engines: & \DVI\ \LaTeX, pdf\LaTeX, \XeLaTeX, \LuaLaTeX, up\LaTeX \\
%
% Compiling: & \pkg{latexmk}, \pkg{perltex}, \pkg{pythontex}, \prog{make}, etc. \\
%
@@ -4242,9 +4281,8 @@
% \midrule
%
% Classes: & \pkg{article}, \pkg{book}, \pkg{report},
-% \pkg{scrartcl}, \pkg{scrbook}, \pkg{scrreprt}, \pkg{memoir}, C\TeX-related,
-% \pkg{bxjsarticle} and related, \pkg{ltjsarticle} and related,
-% \pkg{ujarticle} and related, \pkg{utarticle} and related. \\
+% \pkg{scrartcl}, \pkg{scrbook}, \pkg{scrreprt}, \pkg{memoir},
+% CJK-related as listed below. \\
%
% Koma-script: & \pkg{scrextend}, \pkg{scrhack}, \pkg{scrlayer}.
% Others as listed below. \\
@@ -4260,13 +4298,18 @@
% \pkg{upzhkinsoku},
% \pkg{xpinyin}, \pkg{zhlineskip}, \pkg{zhspacing}. \\
%
-% Japanese: & p\LaTeX, up\LaTeX,
+% Japanese: & up\LaTeX, Lua\TeX-ja, \pkg{gentombow}, \pkg{lltjext},
+% \pkg{plarray}, \pkg{plarydshln}, \pkg{plautopatch},
+% \pkg{plext}, \pkg{plextarray}, \pkg{plextarydshln},
+% \pkg{plextcolortbl}, \pkg{plextdelarray}, \pkg{pxatbegshi},
+% \pkg{pxeveryshi}, \pkg{pxftnright}, \pkg{pxgentombow},
+% \pkg{pxjahyper}, \pkg{pxpdfpages}, \pkg{pxpgfrcs}, \pkg{pxpgfmark},
+% \pkg{tascmac}, \pkg{zxjatype}.
% \pkg{bxjsarticle} and related,
% \pkg{ltjsarticle} and related,
% \pkg{luatexja}, \pkg{luatexja-fontspec},
% \pkg{ujarticle} and related,
-% \pkg{utarticle} and related,
-% \pkg{zxjatype}. \\
+% \pkg{utarticle} and related. \\
%
% Korean: & \pkg{kotex}, \pkg{luatexko}, \pkg{xetexko}. \\
%
@@ -4274,7 +4317,7 @@
%
% Page layout: & \pkg{2in1}, \pkg{2up}, \pkg{a4}, \pkg{a4wide}, \pkg{a5comb},
% \pkg{addlines}, \pkg{anysize}, \pkg{atbegshi},
-% \pkg{blowup}, \pkg{booklet}, \pkg{bophook}, \pkg{bxpapersize},
+% \pkg{blowup}, \pkg{booklet}, \pkg{bophook}, \pkg{bounddvi}, \pkg{bxpapersize},
% \pkg{canoniclayout},
% \pkg{changepage}, \pkg{chngpage}, \pkg{clrdblpg},
% \pkg{continue}, \pkg{draftcopy}, \pkg{draftfigure}, \pkg{draftwatermark},
@@ -4333,15 +4376,18 @@
%
% \midrule
%
-% Margin notes: & \pkg{marginal}, \pkg{marginfit}, \pkg{marginfix}, \pkg{scrlayer-notecolumn}. \\
+% Margin notes: & \pkg{marginal}, \pkg{marginfit}, \pkg{marginfix},
+% \pkg{scrlayer-notecolumn}, \pkg{versonotes}. \\
%
% Footnotes: & Adds \progcode{FootnoteDepth} to print footnotes at section breaks.
% \pkg{dblfnote},
% \pkg{endheads}, \pkg{endnotes}, \pkg{fnbreak}, \pkg{fnpos},
-% \pkg{footmisc}, \pkg{footnote}, \pkg{footnpag},
+% \pkg{footmisc}, \pkg{footnote}, \pkg{footnoterange}, \pkg{footnpag},
% \pkg{marginnote}, \pkg{nccfoots}, \pkg{pagenote},
-% \pkg{parnotes}, \pkg{pfnote}, \pkg{sidenote}. \\
+% \pkg{parnotes}, \pkg{pfnote}, \pkg{sidenote}.
%
+% Tested to work as-is: \pkg{fixfoot}. \\
+%
% \midrule
%
% Math: & Converted to \SVG\ images with \HTML\ \element{alt} tags containing the
@@ -4409,9 +4455,6 @@
% Tested to work as-is:
% \pkg{eepic}, \pkg{tikz-3dplot}. \\
%
-%
-%
-%
% \midrule
%
% \pkg{xcolor}: & \textcolor{DarkGreen}{Full package color names}, any color models,
@@ -4442,7 +4485,7 @@
% Frames: & \pkg{boxedminipage2e}, \pkg{fancybox}, \pkg{framed}, \pkg{mdframed},
% \pkg{shadow}, \pkg{vertbars}. \\
%
-% Multi-columns: & \pkg{adjmulticol}, \pkg{multicol}, \pkg{vwcol}. \\
+% Multi-columns: & \pkg{adjmulticol}, \pkg{multicol}, \pkg{multicolrule}, \pkg{vwcol}. \\
%
% Margins: & \pkg{fullwidth}, \pkg{hanging}, \pkg{midpage}. \\
%
@@ -4453,7 +4496,8 @@
% Direct formatting: & \cs{emph}, \cs{textsuperscript},
% \cs{textbf}, etc are supported.
% \cs{bfseries}, etc.\ are only supported in some cases.
-% \pkg{cancel}, \pkg{ellipsis}, \pkg{hyphenat}, \pkg{lettrine}, \pkg{lips},
+% \pkg{cancel}, \pkg{ellipsis}, \pkg{embrac}, \pkg{enparen},
+% \pkg{hyphenat}, \pkg{lettrine}, \pkg{lips},
% \pkg{lua-check-hyphen}, \pkg{luacolor},
% \pkg{magaz}, \pkg{nowidow}, \pkg{pdfrender}, \pkg{realscripts}, \pkg{relsize},
% \pkg{scalefnt}, \pkg{soul}, \pkg{soulpos}, \pkg{soulutf8},
@@ -4539,7 +4583,7 @@
% \midrule
%
% Working as-is: &
-% Various utility, calculation, file, and text-only packags, such as
+% Various utility, calculation, file, and text-only packages, such as
% \pkg{calc},
% \pkg{fileerr},
% \pkg{somedefs},
@@ -9061,8 +9105,8 @@
% For use with \prog{LibreOffice Writer}, it is recommended to:
% \margintag{TOC, LOF, LOT}
% \begin{enumerate}[nosep]
-% \item Set \cs{booltrue}\{FormatWP\}.
-% \item Set \cs{booltrue}\{WPMarkTOC\} and \cs{boolfalse}\{WPMarkLOFT\}.
+% \item Set |\booltrue{FormatWP}|
+% \item Set |\booltrue{WPMarkTOC}| and |\boolfalse{WPMarkLOFT}|
% \item Use \pkg{lwarp} to generate the \HTML\ document.
% \item Copy/paste from the \HTML\ document into an empty \prog{LibreOffice Writer} document.
% \item Manually insert a \brand{LibreOffice} \acro{TOC} in the \brand{LibreOffice} document.
@@ -10054,11 +10098,11 @@
\newcommand*{\LWR at loadafter}[1]{%
\@ifpackageloaded{#1}
{
-\PackageError{lwarp}
-{Package #1, or one which uses #1, must be loaded after lwarp}
-{Move \detokenize{\usepackage}{#1} after \detokenize{\usepackage}{lwarp}.
-Package #1 may also be loaded by something else, which must also be moved
-after lwarp.}
+ \PackageError{lwarp}
+ {Package #1, or one which uses #1, must be loaded after lwarp}
+ {Move \detokenize{\usepackage}{#1} after \detokenize{\usepackage}{lwarp}.
+ Package #1 may also be loaded by something else, which must also be moved
+ after lwarp.}
}
{}
}
@@ -10080,33 +10124,25 @@
% \end{macro}
-% \begin{macro}{\LWR at notbxjsloadafter} \marg{packagename} \quad
-% Error if not a \pkg{bxjs*} class and this package was loaded before \pkg{lwarp}.
-%
-% \changes{v0.63}{2018/11/24}{Added.}
-% \begin{macrocode}
-\LetLtxMacro\LWR at notbxjsloadafter\LWR at loadafter
-
-\@ifclassloaded{bxjsarticle}{\renewcommand*{\LWR at notbxjsloadafter}[1]{}}{}
-\@ifclassloaded{bxjsbook}{\renewcommand*{\LWR at notbxjsloadafter}[1]{}}{}
-\@ifclassloaded{bxjsreport}{\renewcommand*{\LWR at notbxjsloadafter}[1]{}}{}
-\@ifclassloaded{bxjsslide}{\renewcommand*{\LWR at notbxjsloadafter}[1]{}}{}
-% \end{macrocode}
-% \end{macro}
-
-
-% \begin{macro}{\LWR at notltjsloadafter} \marg{packagename} \quad
+% \begin{macro}{\LWR at notltjloadafter} \marg{packagename} \quad
% Error if not a \pkg{ltjs*} class and this package was loaded before \pkg{lwarp}.
%
% \changes{v0.63}{2018/11/24}{Added.}
+% \changes{v0.63}{2018/12/20}{Added more classes.}
% \begin{macrocode}
-\LetLtxMacro\LWR at notltjsloadafter\LWR at loadafter
+\LetLtxMacro\LWR at notltjloadafter\LWR at loadafter
-\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR at notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR at notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR at notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjspf}{\renewcommand*{\LWR at notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjsiyou}{\renewcommand*{\LWR at notltjsloadafter}[1]{}}{}
+\@ifclassloaded{ltjarticle}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjbook}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjreport}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjspf}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjskiyou}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjtarticle}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjtbook}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjtreport}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
% \end{macrocode}
% \end{macro}
@@ -10233,8 +10269,15 @@
% \changes{v0.54}{2018/04/06}{Added early check for disallowed packages.}
% \changes{v0.54}{2018/09/26}{Never load \pkg{aecompl}.}
% \changes{v0.62}{2018/11/18}{Added early checks for \pkg{CJK}, \pkg{CJKutf8}.}
+% \changes{v0.65}{2018/12/15}{Added early checks for \pkg{jarticle}, \pkg{tarticle}, and related.}
%
% \begin{macrocode}
+\LWR at earlyclassloadnever{jarticle}{ujarticle}
+\LWR at earlyclassloadnever{jbook}{ujbook}
+\LWR at earlyclassloadnever{jreport}{ujreport}
+\LWR at earlyclassloadnever{tarticle}{utarticle}
+\LWR at earlyclassloadnever{tbook}{utbook}
+\LWR at earlyclassloadnever{treport}{utreport}
\LWR at earlyloadnever{ae}{cm-super, lmodern}
\LWR at earlyloadnever{aecompl}{cm-super, lmodern}
\LWR at earlyloadnever{aecc}{cm-super, lmodern}
@@ -10251,7 +10294,7 @@
% \end{macrocode}
% \pkg{bxcjkatype} is based on \pkg{CJK}:
% \begin{macrocode}
-\LWR at earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle, utarticle}
+\LWR at earlyloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
% \end{macrocode}
% \pkg{hangul} is not in TeXLive, and is not tested:
% \begin{macrocode}
@@ -10321,6 +10364,7 @@
\LWR at loadafter{bookmark}
\LWR at notmemoirloadafter{booktabs}
\LWR at loadafter{bophook}
+\LWR at loadafter{bounddvi}
\LWR at loadafter{boxedminipage}
\LWR at loadafter{boxedminipage2e}
\LWR at loadafter{breakurl}
@@ -10366,6 +10410,7 @@
\LWR at loadafter{easy-todo}
\LWR at loadafter{ebook}
\LWR at loadafter{ellipsis}
+\LWR at loadafter{embrac}
\LWR at loadafter{emptypage}
\LWR at loadafter{endfloat}
\LWR at loadafter{endheads}
@@ -10409,6 +10454,7 @@
\LWR at loadafter{footmisc}
\LWR at loadafter{footnote}
\LWR at loadafter{footnotehyper}
+\LWR at loadafter{footnoterange}
\LWR at loadafter{footnpag}
\LWR at loadafter{forest}
\LWR at loadafter{framed}
@@ -10417,7 +10463,8 @@
\LWR at loadafter{fullpage}
\LWR at loadafter{fullwidth}
\LWR at loadafter{fwlw}
-\LWR at notbxjsloadafter{geometry}
+\LWR at loadafter{gentombow}
+% geometry is always loaded by lwarp, and lwarp-geometry is AtBeginDocument
\LWR at loadafter{gmeometric}
\LWR at loadafter{glossaries}
% \LWR at loadafter{graphics}% pre-loaded by xunicode
@@ -10480,6 +10527,7 @@
% morewrites must be loaded before lwarp
\LWR at notmemoirloadafter{mparhack}
%\LWR at loadafter{multicol}% loaded by ltxdoc
+\LWR at loadafter{multicolrule}
\LWR at loadafter{multirow}
\LWR at loadafter{multitoc}
\LWR at loadafter{musicography}
@@ -10519,6 +10567,12 @@
\LWR at loadafter{pfnote}
\LWR at loadafter{phfqit}
\LWR at loadafter{placeins}
+\LWR at loadafter{plarray}
+\LWR at loadafter{plarydshln}
+\LWR at loadafter{plextarray}
+\LWR at loadafter{plextarydshln}
+\LWR at loadafter{plcolortbl}
+\LWR at loadafter{plextdelarray}
\LWR at loadafter{prelim2e}
\LWR at loadafter{prettyref}
\LWR at loadafter{preview}
@@ -10527,6 +10581,10 @@
\LWR at loadafter{pst-eps}
\LWR at loadafter{pstool}
\LWR at loadafter{pstricks}
+% \LWR at loadafter{pxatbegshi}% may be used by morewrites
+\LWR at loadafter{pxeveryshi}
+\LWR at loadafter{pxftnright}
+\LWR at loadafter{pxjahyper}
\LWR at loadafter{quotchap}
\LWR at loadafter{quoting}
\LWR at loadafter{ragged2e}
@@ -10543,7 +10601,7 @@
\LWR at loadafter{rotfloat}
\LWR at loadafter{rviewport}
\LWR at loadafter{savetrees}
-% \LWR at loadafter{scalefnt}% loaded by babel-french
+% scalefnt is loaded by babel-french
\LWR at loadafter{schemata}
\LWR at loadafter{scrextend}
\LWR at loadafter{scrhack}
@@ -10570,7 +10628,7 @@
\LWR at loadafter{srcltx}
\LWR at loadafter{srctex}
\LWR at loadafter{stabular}
-\LWR at notltjsloadafter{stfloats}
+\LWR at notltjloadafter{stfloats}
\LWR at loadafter{subfig}
\LWR at loadafter{subfigure}
\LWR at loadafter{supertabular}
@@ -10578,6 +10636,7 @@
\LWR at loadafter{tabls}
\LWR at notmemoirloadafter{tabularx}
\LWR at loadafter{tabulary}
+\LWR at loadafter{tascmac}
\LWR at loadafter{textarea}
% \LWR at loadafter{textcomp}% maybe before lwarp with font packages
\LWR at loadafter{textfit}
@@ -10619,6 +10678,7 @@
\LWR at loadafter{uspace}
\LWR at loadafter{varioref}% no lwarp package provided
\LWR at notmemoirloadafter{verse}
+\LWR at loadafter{versonotes}
\LWR at loadafter{vertbars}
\LWR at loadafter{vmargin}
\LWR at loadafter{vowel}
@@ -11743,11 +11803,15 @@
% \codehtml
% \begin{macrocode}
\begin{warpHTML}
+% \end{macrocode}
+%
+% \begin{macrocode}
\RequirePackage{geometry}
% \end{macrocode}
%
-% Avoid option conflict by changing settings after package load:
+% Avoid class and option conflict by changing settings after package load:
% \changes{v0.63}{2018/11/24}{\pkg{geometry}: Fix for \pkg{bxjs*} classes.}
+% \changes{v0.65}{2018/12/21}{\pkg{geometry}: Fix for \pkg{bxjs*} classes.}
% \begin{macrocode}
\geometry{
paperheight=190in,%
@@ -11755,9 +11819,16 @@
left=2in,right=6in,%
top=1in,bottom=1in,%
}
+% \end{macrocode}
+%
+% \pkg{ltjtarticle} and other classes may require these to be reset by \pkg{lwarp}:
+% \begin{macrocode}
+\setlength{\textheight}{0.8\paperheight}
+\setlength{\textwidth}{0.7\paperwidth}
\@twosidefalse
\@mparswitchfalse
+
\end{warpHTML}
% \end{macrocode}
@@ -12059,6 +12130,8 @@
% \changes{v0.63}{2018/12/02}{Added to reduce number of \filenm{lwarp-*} files.}
% \changes{v0.64}{2018/12/07}{Prevented \pkg{bitfield}, \pkg{doublespace},
% \pkg{newthm}, \pkg{rplain}, \pkg{si}.}
+%
+% The following should never be loaded:
% \begin{macrocode}
\newcommand*{\LWR at checkloadfilename}[1]{%
\LWR at checkloadnever{#1}{ae}{latinmodern}
@@ -12075,7 +12148,11 @@
\LWR at checkloadnever{#1}{si}{siunitx}
\LWR at checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx}
\LWR at checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
+% \end{macrocode}
%
+% ^^A *loadbefore
+% The following should only be loaded before \pkg{lwarp}:
+% \begin{macrocode}
\LWR at checkloadbefore{#1}{ctex}
\LWR at checkloadbefore{#1}{fontspec}
\LWR at checkloadbefore{#1}{inputenc}
@@ -12087,6 +12164,7 @@
\LWR at checkloadbefore{#1}{morewrites}
\LWR at checkloadbefore{#1}{newclude}
\LWR at checkloadbefore{#1}{newunicodechar}
+\LWR at checkloadbefore{#1}{plext}
\LWR at checkloadbefore{#1}{xeCJK}
\LWR at checkloadbefore{#1}{xetexko}
\LWR at checkloadbefore{#1}{zxjatype}
@@ -12860,7 +12938,7 @@
% \DescribeBoolean{WPMarkFloats} \DescribeDefault{false}
% \describeWPMarkFloats
% \footnote{Perhaps some day word processors will have \HTML\ import options
-% for identifying \element{figure} and \element{figcaption} tags
+% for identifying \element{figure} and caption tags
% for figures and tables.}
% \gindex{word processor>HTML conversion settings}
% \gindex{HTML>conversion settings>word processor}
@@ -13051,6 +13129,16 @@
\LetLtxMacro\LWR at origupshape\upshape
\LetLtxMacro\LWR at origslshape\slshape
\LetLtxMacro\LWR at origscshape\scshape
+% \end{macrocode}
+% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.}
+% \begin{macrocode}
+\@ifundefined{sishape}{
+ \LetLtxMacro\LWR at origsishape\scshape
+}{
+ \LetLtxMacro\LWR at origsishape\sishape
+}
+% \end{macrocode}
+% \begin{macrocode}
\LetLtxMacro\LWR at origitshape\itshape
\LetLtxMacro\LWR at origem\em
\LetLtxMacro\LWR at orignormalfont\normalfont
@@ -13729,6 +13817,10 @@
% \changes{v0.62}{2018/11/02}{\filenm{lwarp.css}: Added \CSS\ for \pkg{xfrac}, \pkg{nicefrac}.}
% \changes{v0.63}{2018/11/30}{\filenm{lwarp.css}: Added \CSS\ for vertical writing.}
% \changes{v0.63}{2018/12/01}{\filenm{lwarp.css}: Improved \CSS\ for \pkg{mdframed}.}
+% \changes{v0.65}{2018/12/09}{\filenm{lwarp.css}: Improved \CSS\ for quotations.}
+% \changes{v0.65}{2018/12/09}{\filenm{lwarp.css}: Side\TOC to left for improved \cs{marginpar}s.}
+% \changes{v0.65}{2018/12/09}{\filenm{lwarp.css}: Added \cs{sishape}, \cs{textsi}.}
+% \changes{v0.65}{2018/12/18}{\filenm{lwarp.css}: Improved \CSS\ for page layout.}
%
% ^^A *lwarp.css
%
@@ -13817,6 +13909,12 @@
font-variant-numeric: oldstyle-nums ;
}
+span.textsi, div.textsi {
+ font-style: italic ;
+ font-variant: small-caps;
+ font-variant-numeric: oldstyle-nums ;
+}
+
span.textsl, div.textsl { font-style: oblique; }
span.textup, div.textup {
@@ -13908,24 +14006,30 @@
}
blockquote {
- margin-left: 0px ;
- margin-right: 0px ;
+ display: block ;
+ margin-left: 2em ;
+ margin-right: 2em ;
}
+blockquotation {
+ display: block ;
+ margin-left: 2em ;
+ margin-right: 2em ;
+}
+
/* quotchap is for the quotchap package */
div.quotchap {
- font-style: oblique ;
- overflow-x: auto ;
- margin-left: 2em ;
- margin-right: 2em ;
+ display: block ;
+ font-style: oblique ;
+ overflow-x: auto ;
+ margin-left: 2em ;
+ margin-right: 2em ;
}
-blockquote p, div.quotchap p {
- line-height: 1.5;
+blockquote p, blockquotation p, div.quotchap p {
+ line-height: 1.5;
text-align: left ;
font-size: .85em ;
- margin-left: 3em ;
- margin-right: 3em ;
}
/* qauthor is for the quotchap package */
@@ -13942,19 +14046,6 @@
text-align: right ;
}
-blockquotation {
- margin-left: 0px ;
- margin-right: 0px ;
-}
-
-blockquotation p {
- line-height: 1.5;
- text-align: left ;
- font-size: .85em ;
- margin-left: 3em ;
- margin-right: 3em ;
-}
-
div.epigraph, div.dictum {
line-height: 1.2;
text-align: left ;
@@ -14085,7 +14176,6 @@
text-align: left ;
}
-/* Title of the file */
h1 {
margin: 0ex 0em 0ex 0em ;
line-height: 1.3;
@@ -14092,7 +14182,6 @@
text-align: center ;
}
-/* Part */
h2 {
margin: 1ex 0em 1ex 0em ;
line-height: 1.3;
@@ -14099,25 +14188,21 @@
text-align: center ;
}
-/* Chapter */
h3 {
margin: 3ex 0em 1ex 0em ;
line-height: 1.3;
}
-/* Section */
h4 {
margin: 3ex 0em 1ex 0em ;
line-height: 1.3;
}
-/* Sub-Section */
h5 {
margin: 3ex 0em 1ex 0em ;
line-height: 1.3;
}
-/* Sub-Sub-Section */
h6 {
margin: 3ex 0em 1ex 0em ;
line-height: 1.3;
@@ -14136,15 +14221,16 @@
}
.marginpar, .marginparblock {
- max-width:50%;
- float:right;
- text-align:left;
+ max-width: 50%;
+ float: right ;
+ clear: both ;
+ text-align: left ;
margin: 1ex 0.5em 1ex 1em ;
padding: 1ex 0.5em 1ex 0.5em ;
font-size: 85% ;
border-top: 1px solid silver ;
border-bottom: 1px solid silver ;
- overflow-x: auto;
+ overflow-x: auto ;
}
.marginpar br { margin-bottom: 2ex ; }
@@ -14172,7 +14258,16 @@
div.marginparblock br
{ margin-bottom: 2ex ; }
+div.bodycontainer {
+ float: left ;
+ width: 80% ;
+}
+div.bodywithoutsidetoc div.bodycontainer {
+ float: none ;
+ width: 100% ;
+}
+
section.textbody div.footnotes{
margin: 3ex 2em 0ex 2em ;
border-bottom: 2px solid silver ;
@@ -14598,7 +14693,7 @@
display: inline-block ; margin: 3ex 1em 3ex 1em ;
}
-figcaption .minipage { margin:0 ; padding: 0 }
+div.figurecaption .minipage { margin:0 ; padding: 0 }
div.minipage figure { border: none ; box-shadow: none ; }
div.minipage figure.table { margin: 0ex }
@@ -14611,7 +14706,7 @@
div.floatfoot { font-size: .85em ;
border-top: 1px solid silver ; line-height: 1.2 ; }
-figcaption , .lstlistingtitle {
+div.figurecaption , .lstlistingtitle {
font-size: .85em ;
text-align: center ;
font-weight: bold ;
@@ -14619,7 +14714,7 @@
margin-bottom: 1ex ;
}
-figure.subfigure figcaption, figure.subtable figcaption {
+figure.subfigure div.figurecaption, figure.subtable div.figurecaption {
border-bottom: none ; background: none ;
}
@@ -14631,7 +14726,7 @@
}
/* For a \RawCaption inside a minipage inside a figure's floatrow: */
-figure div.floatrow div.minipage figcaption {
+figure div.floatrow div.minipage div.figurecaption {
border: none ;
background: none ;
}
@@ -14653,7 +14748,7 @@
box-shadow: none ;
}
-figure.ruled figcaption, figure.boxruled figcaption {
+figure.ruled div.figurecaption, figure.boxruled div.figurecaption {
border-top: 1px solid silver ;
border-bottom: 1px solid silver ;
}
@@ -14859,7 +14954,7 @@
margin: 0 ;
border-bottom: 1px solid silver ;
border-top: 1px solid silver ;
- clear:right ;
+ clear:both ;
}
nav.botnavigation{
@@ -14869,29 +14964,27 @@
margin: 0 ;
border-top: 1px solid silver ;
border-bottom: 1px solid silver ;
- clear:right ;
+ clear:both ;
}
-header{
+header {
line-height: 1.2 ;
font-size: 1em ;
-/* border-bottom: 2px solid silver ; */
+ border-bottom: 1px solid silver ;
margin: 0px ;
- padding: 0ex 1em 0ex 1em ;
- text-align:center ;
+ padding: 2ex 1em 2ex 1em ;
+ text-align:left ;
}
-header p {margin:0ex;padding:4ex 0em 2ex 0em ;text-align:center;}
-
-footer{
+footer {
font-size: .85em ;
line-height: 1.2 ;
margin-top: 1ex ;
- border-top: 2px solid silver ;
+ border-top: 1px solid silver ;
padding: 2ex 1em 2ex 1em ;
- clear:right ;
+ clear:both ;
text-align:left ;
}
@@ -14913,25 +15006,23 @@
}
-
-nav.sidetoc {
+/* The -1px right margin compensates for the 1px right border. */
+/* Without this -1px margin, the body container appears below instead */
+/* of floating to the side. */
+div.sidetoccontainer {
font-family: "DejaVu Serif", "Bitstream Vera Serif",
"Lucida Bright", Georgia, serif;
- float:right ;
+ float: left ;
width: 20%;
- border-left: 1px solid silver;
- border-top: 1px solid silver;
+ margin: 0pt -1px 3ex 0pt ;
+ border-right: 1px solid silver;
border-bottom: 1px solid silver;
-/* border-top: 2px solid #808080 ; */
background: #FAF7F4 ;
- padding: 2ex 0em 2ex 1em ;
- margin: 0ex 0em 2ex 1em ;
font-size:.9em ;
- border-radius: 20px 0px 0px 20px ;
- }
+ border-radius: 0px 0px 20px 0px ;
+}
div.sidetoccontents {
-/* border-top: 1px solid silver ; */
overflow-y: auto ;
width: 100% ;
text-align: left ;
@@ -15162,12 +15253,13 @@
nav.topnavigation { display:none; }
nav.botnavigation { display:none; }
- at media screen and (max-width: 45em) {
-/* nav.sidetoc {display:none;} */
- nav.sidetoc {
+/* Only display the sidetoc's webpage title if a small screen */
+span.sidetocthetitle { display: none }
+
+ at media screen and (max-width: 50em) {
+ div.sidetoccontainer {
float: none ;
width: 100% ;
- margin: 5ex 0px 5ex 0px ;
padding: 0 ;
border-radius: 0 ;
border-bottom: 1px solid black ;
@@ -15174,8 +15266,9 @@
border-top: 1px solid black ;
box-shadow: none ;
}
-/* nav.topnavigation { display:block } */
+ span.sidetocthetitle { display: inline }
nav.botnavigation { display:block }
+ div.bodycontainer { width: 100% }
.marginpar {
max-width: 100%;
float: none;
@@ -15191,21 +15284,24 @@
"Liberation Serif", "Nimbus Roman No 9 L",
"FreeSerif", "Hoefler Text", Times, "Times New Roman", serif;
}
- nav.sidetoc { display:none; }
+ div.sidetoccontainer { display:none; }
nav.topnavigation { display: none; }
nav.botnavigation { display: none; }
+ div.bodycontainer { width: 100% }
}
@media handheld {
- nav.sidetoc { display:none; }
+ div.sidetoccontainer { display:none; }
nav.topnavigation { display:block }
nav.botnavigation { display:block }
+ div.bodycontainer { width: 100% }
}
@media projection {
- nav.sidetoc { display:none; }
+ div.sidetoccontainer { display:none; }
nav.topnavigation { display:block }
nav.botnavigation { display:block }
+ div.bodycontainer { width: 100% }
}
\end{filecontents*}
% \end{Verbatim}% for syntax highlighting
@@ -15224,6 +15320,8 @@
% If used, this must be present both when compiling the project
% and also when distributing the \HTML\ files.
%
+% \changes{v0.65}{2018/12/09}{\filenm{lwarp\_sagebrush.css}: Side\TOC to left for improved \cs{marginpar}s.}
+%
% ^^A *lwarp_sagebrush.css
%
% \codeconfig
@@ -15262,12 +15360,12 @@
h1 {
border-bottom: 1px solid #304070;
- border-top: 2px solid #304070;
+/* border-top: 2px solid #304070; */
}
h2 {
border-bottom: 1px solid #304070;
- border-top: 2px solid #304070;
+/* border-top: 2px solid #304070; */
background-color: #F7F7F0 ;
background-image: linear-gradient(to bottom, #F7F7F0, #DAD0C0);
}
@@ -15389,7 +15487,7 @@
margin: 0ex ;
}
-figure.figure .minipage, figcaption .minipage { border: none; }
+figure.figure .minipage, div.figurecaption .minipage { border: none; }
div.marginblock div.minipage ,
div.marginparblock div.minipage
@@ -15409,7 +15507,7 @@
}
/*
-figcaption {
+div.figurecaption {
border-top: 1px solid silver ;
border-bottom: 1px solid silver ;
background-color: #e8e8e8 ;
@@ -15453,11 +15551,10 @@
-nav.sidetoc {
+div.sidetoccontainer {
background-color: #F7F7F0 ;
background-image: linear-gradient(to bottom, #F7F7F0, #C0C0C0);
box-shadow: 3px 3px 3px #808080 ;
- border-radius: 0px 0px 0px 20px ;
}
div.sidetoctitle {color: #304070 ; }
@@ -15470,7 +15567,7 @@
@media screen and (max-width: 45em) {
- nav.sidetoc { border-radius: 0 ; }
+ div.sidetoccontainer { border-radius: 0 ; }
}
@@ -15492,6 +15589,7 @@
% and also when distributing the \HTML\ files.
%
% \changes{v0.62}{2018/11/10}{\filenm{lwarp\_formal.css}: Fix: Font for verse.}
+% \changes{v0.65}{2018/12/09}{\filenm{lwarp\_formal.css}: Side\TOC to left for improved \cs{marginpar}s.}
%
% ^^A *lwarp_formal.css
%
@@ -15545,7 +15643,7 @@
background-color: #fffcf5 ;
background-image: none ;
border-bottom: 1px solid #808080;
- border-top: 2px solid #808080;
+/* border-top: 2px solid #808080; */
}
div.abstracttitle {
@@ -15632,7 +15730,7 @@
}
-figcaption , .lstlisting {
+div.figurecaption , .lstlisting {
border: none ;
/* border-top: 1px solid silver ; */
/* border-bottom: 1px solid silver ; */
@@ -15664,13 +15762,12 @@
"Times New Roman", serif;
}
-nav.sidetoc {
+div.sidetoccontainer {
font-family: "Linux Libertine O", "Hoefler Text", "Garamond",
"Bembo", "Janson", "TeX Gyre Pagella", "Palatino",
"Liberation Serif", "Nimbus Roman No 9 L", "FreeSerif", Times,
"Times New Roman", serif;
background-image: linear-gradient(to bottom, #fffcf5, #C0C0C0);
- border-radius: 0px 0px 0px 20px ;
}
div.sidetoctitle{
@@ -15687,7 +15784,6 @@
background-color: #e0e0e0 ;
background-image: linear-gradient(to bottom, #fffcf5, #b0b0b0);
padding: 2ex 1em 2ex 1em ;
- clear:right ;
text-align:left ;
}
@@ -16123,7 +16219,7 @@
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.64"
+printversion = "v0.65"
requiredconfversion = "1" -- also at *lwarpmk.conf
function printhelp ()
@@ -18544,8 +18640,11 @@
\ifbool{FormatWP}%
{%
\addtocounter{LWR at thisautoidWP}{1}%
+% \end{macrocode}
+% \changes{v0.65}{2018/12/21}{Fix space between class and id.}
+% \begin{macrocode}
\LWR at htmltag{%
- div class=\textquotedbl#3\textquotedbl % space
+ div class=\textquotedbl#3\textquotedbl\ % space
id=\textquotedbl%
\LWR at print@mbox{autoidWP-\arabic{LWR at thisautoidWP}}%
\textquotedbl%
@@ -19675,10 +19774,11 @@
% Convert blanks into dashes, removes short words,
% store result in \\ |\LWR at thisfilename|.
%
-% Be sure that this does not result in filename collisions!
-% \trouble[filename collision]{filename>collision}
+% Be sure that this does not result in duplicate filenames!
+% \trouble[duplicate filename]{filename>duplicate}
+% \trouble{duplcate filename}
+% \trouble{sectioning>duplicate name}
% Use the optional \TOC\ caption entry parameter for formatting.
-% \trouble[section names]{sectioning>names}
% Remember to \cs{protect} \LaTeX\ commands which appear in
% section names and \TOC\ captions.
% \begin{macrocode}
@@ -19789,9 +19889,9 @@
\StrSubstitute{\LWR at thisnewfilename}{–}{-}[\LWR at thisnewfilename]
\fi%
% \end{macrocode}
-% Return the result:
+% Return the global result:
% \begin{macrocode}
-\global\let\LWR at thisfilename\LWR at thisnewfilename% return a global result
+\global\let\LWR at thisfilename\LWR at thisnewfilename%
\endgroup%
\LWR at traceinfo{LWR at filenamenoblanks: result is \LWR at thisfilename}%
}
@@ -19979,15 +20079,18 @@
% At the bottom of the ending file:
+% \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.}
% \begin{macrocode}
\LWR at htmlelementclassend{section}{textbody}
+\LWR at htmlelementclassend{div}{bodycontainer}
+\LWR at htmlelementclassend{div}{bodyandsidetoc}
\LWR at printpendingfootnotes
% \end{macrocode}
%
+%
% No footer between files if \EPUB:
-%
% \begin{macrocode}
\ifbool{FormatEPUB}
{}
@@ -20000,6 +20103,7 @@
}
% \end{macrocode}
%
+%
% No bottom navigation if are finishing the home page or
% formatting for \EPUB\ or a word-processor.
% \begin{macrocode}
@@ -20018,17 +20122,62 @@
\addtocounter{LWR at htmlfilenumber}{1}%
% \end{macrocode}
-
-% If using a filename, create a version without blanks.
+%
+%
+% If using a filename based on section name, create a version without blanks.
% The filename without blanks will be placed into \cs{LWR at thisfilename}.
+% Duplicates will be detected using MD5 hashes.
+%
% If not using a filename, the file number will be used instead.
+%
% \changes{v0.12}{2016/03/13}{Bugfix: \TOC\ with numbered files.}
+% \changes{v0.65}{2018/12/21}{Error if duplicate file name.}
% \begin{macrocode}
\ifbool{FileSectionNames}%
-{\LWR at filenamenoblanks{#1}}
+{%
+% \end{macrocode}
+% Convert the section name to a filename with blanks and common words removed.
+% The resulting filename is in \cs{LWR at thisfilename}.
+% \begin{macrocode}
+ \LWR at filenamenoblanks{#1}%
+% \end{macrocode}
+% Create a macro name from the MD5 hash of the file name.
+% \begin{macrocode}
+ \edef\LWR at hashedname{\LWR at mdfive{\LWR at thisfilename}}%
+% \end{macrocode}
+% If the macro name is not yet defined, this filename is unique.
+% \begin{macrocode}
+ \ifcsundef{LWR at filename\LWR at hashedname}{%
+% \end{macrocode}
+% If the filename is unique, create a macro using the hashed name,
+% to be used to test for additional duplicates in the future.
+% \begin{macrocode}
+ \csdef{LWR at filename\LWR at hashedname}{}%
+ }{%
+% \end{macrocode}
+% If the filename is not unique, create an error.
+% \begin{macrocode}
+ \PackageError{lwarp}
+ {
+ Section name ``#1'', at the line number listed below,
+ generates the filename ``\LWR at thisfilename'',
+ which appears to be a duplicate%
+ }
+ {
+ Look for another section of the same type with a similar
+ or identical name.
+ (Lwarp sanitizes most symbols and common short words
+ when generating file names, and this may cause a conflict.)
+ }
+ }
+}
+% \end{macrocode}
+% If using file numbers instead of names, the name is set to the next file number.
+% \begin{macrocode}
{\renewcommand*{\LWR at thisfilename}{\arabic{LWR at htmlfilenumber}}}
% \end{macrocode}
-
+%
+%
% Include an \HTML\ comment to instruct lwarpmk
% where to split the files apart.
% Uses pipe-separated fields for |split_html.gawk|.
@@ -20048,7 +20197,8 @@
}
\endgroup%
% \end{macrocode}
-
+%
+%
% At the top of the starting file:
% \begin{macrocode}
\LWR at stoppars
@@ -20068,6 +20218,7 @@
\LWR at newautopagelabel{LWR at latestautopage}%
% \end{macrocode}
%
+%
% No navigation between files if formatting for an \EPUB\ or word processor:
% \begin{macrocode}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
@@ -20076,6 +20227,7 @@
% \end{macrocode}
%
+%
% No header if between files if formatting for an \EPUB\ or word processor:
% \begin{macrocode}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
@@ -20090,15 +20242,13 @@
% \end{macrocode}
%
-% Print title only if there is one.
-% Skip if formatting for an \EPUB\ or word processor:
+%
+% The container for the sidetoc and text body:
% \begin{macrocode}
-\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
-{}
-{\ifcsvoid{thetitle}{}{\LWR at printthetitle}}
-
+\LWR at htmlelementclass{div}{bodyandsidetoc}
% \end{macrocode}
%
+%
% No side\TOC\ if formatting for an \EPUB\ or word processor:
% \begin{macrocode}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
@@ -20107,12 +20257,29 @@
% \end{macrocode}
%
+%
% Start of the \element{textbody}:
+% \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.}
% \begin{macrocode}
+\LWR at htmlelementclass{div}{bodycontainer}
\LWR at htmlelementclass{section}{textbody}
% \end{macrocode}
%
+%
+% Print title only if there is one.
+% Skip if formatting for an \EPUB\ or word processor:
+% \begin{macrocode}
+\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}%
+ {}%
+ {%
+ \ifcsvoid{thetitle}{}{%
+ \LWR at printthetitle%
+ }%
+ }%
+% \end{macrocode}
+%
+%
% Keep paragraph tags disabled for now:
% \begin{macrocode}
\LWR at stoppars
@@ -20455,6 +20622,10 @@
% \begin{macrocode}
\global\boolfalse{LWR at minipagethispar}%
% \end{macrocode}
+%
+%
+%
+%
% Start a new \HTML\ file unless starred,
% and if is a shallow sectioning depth.
%
@@ -20500,11 +20671,11 @@
% \end{macrocode}
% If no optional entry
% \begin{macrocode}
- {\LWR at newhtmlfile{#3}}%
+ {\LWR at newhtmlfile{#3}}%
% \end{macrocode}
% If yes an optional entry
% \begin{macrocode}
- {\LWR at newhtmlfile{#2}}%
+ {\LWR at newhtmlfile{#2}}%
}% new file
% \end{macrocode}
% Else: No new \HTML\ file:
@@ -20515,14 +20686,14 @@
% \begin{macrocode}
\LWR at traceinfo{LWR at section: not a new HTML file, about to LWR at orignewpage}%
\LWR at orignewpage%
+}% not new file
-}% not new file
% \end{macrocode}
% Remember this section's name for \cs{nameref}:
% \begin{macrocode}
\IfValueT{#3}{%
-\LWR at traceinfo{LWR at section: about to LWR at setlatestname}%
-\IfValueTF{#2}{\LWR at setlatestname{#2}}{\LWR at setlatestname{#3}}%
+ \LWR at traceinfo{LWR at section: about to LWR at setlatestname}%
+ \IfValueTF{#2}{\LWR at setlatestname{#2}}{\LWR at setlatestname{#3}}%
}%
% \end{macrocode}
% Print an opening comment with the level and the name;
@@ -20987,7 +21158,7 @@
\newcommand*{\HTMLTitleBeforeSection}{%
\def\theHTMLTitleSection{%
\theHTMLTitle\theHTMLTitleSeparator\theHTMLSection%
- }
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -21000,7 +21171,7 @@
\newcommand*{\HTMLTitleAfterSection}{%
\def\theHTMLTitleSection{%
\theHTMLSection\theHTMLTitleSeparator\theHTMLTitle%
- }
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -21300,13 +21471,6 @@
% so that they won't be over-written by some other package.
% \changes{v0.13}{2016/03/23}{\cs{up} and \cs{fup}}
%
-% Tabular:
-% \begin{macrocode}
-\LetLtxMacro\LWR at origtabular\tabular
-\LetLtxMacro\LWR at origendtabular\endtabular
-\LetLtxMacro\tabular\LWR at tabular
-\LetLtxMacro\endtabular\endLWR at tabular
-% \end{macrocode}
% Float captions:
% \begin{macrocode}
\let\LWR at origcaption\caption
@@ -21353,8 +21517,13 @@
\LWR at firstpagetop
\LWR at stoppars
\LWR at htmltag{/header}\LWR at orignewline
+% \end{macrocode}
+% \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.}
+% \begin{macrocode}
+\LWR at htmlelementclass{div}{bodywithoutsidetoc}
+\LWR at htmlelementclass{div}{bodycontainer}
\LWR at traceinfo{LWR at lwarpStart: Generating textbody.}
-\LWR at htmltag{section class=\textquotedbl{}textbody\textquotedbl}
+\LWR at htmlelementclass{section}{textbody}
% \end{macrocode}
%
% Patch the |itemize|, |enumerate|, and |description| environments and \cs{item}.
@@ -21448,8 +21617,11 @@
% At the bottom of the ending file:
% Close the textbody:
+% \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.}
% \begin{macrocode}
\LWR at htmlelementclassend{section}{textbody}
+\LWR at htmlelementclassend{div}{bodycontainer}
+\LWR at htmlelementclassend{div}{bodyandsidetoc}
% \end{macrocode}
% Print any pending footnotes:
% \begin{macrocode}
@@ -21768,12 +21940,12 @@
% \begin{macro}{\printtitle}
% \begin{macrocode}
\newcommand*{\printtitle}
-{
-\LWR at stoppars
-\LWR at htmltag{\LWR at tagtitle}%
-\@title%
-\LWR at htmltag{\LWR at tagtitleend}
-\LWR at startpars
+{%
+ \LWR at stoppars%
+ \LWR at htmltag{\LWR at tagtitle}%
+ \@title%
+ \LWR at htmltag{\LWR at tagtitleend}%
+ \LWR at startpars%
}
% \end{macrocode}
% \end{macro}
@@ -21783,12 +21955,12 @@
% used to title each \HTML\ page.
% \begin{macrocode}
\newcommand*{\LWR at printthetitle}
-{
-\LWR at stoppars
-\LWR at htmltag{\LWR at tagtitle}%
-\thetitle%
-\LWR at htmltag{\LWR at tagtitleend}
-\LWR at startpars
+{%
+ \LWR at stoppars%
+ \LWR at htmltag{\LWR at tagtitle}%
+ \thetitle%
+ \LWR at htmltag{\LWR at tagtitleend}%
+ \LWR at startpars%
}
% \end{macrocode}
% \end{macro}
@@ -22038,30 +22210,30 @@
%
% \begin{macrocode}
\DeclareDocumentCommand{\@maketitle}{}{%
- \LWR at stoppars\LWR at htmltag{\LWR at tagtitle}
- \@title
- \LWR at htmltag{\LWR at tagtitleend}\LWR at startpars
- \begin{BlockClass}{author}
+ \LWR at stoppars\LWR at htmltag{\LWR at tagtitle}%
+ \@title%
+ \LWR at htmltag{\LWR at tagtitleend}\LWR at startpars%
+ \begin{BlockClass}{author}%
% \end{macrocode}
% For \pkg{IEEEtran} class:
% \changes{v0.48}{2018/02/04}{Fix: Errors with \pkg{IEEEtran} class.}
% \begin{macrocode}
- \renewcommand*{\cr}{}
- \renewcommand*{\crcr}{}
- \renewcommand*{\noalign}{}
+ \renewcommand*{\cr}{}%
+ \renewcommand*{\crcr}{}%
+ \renewcommand*{\noalign}{}%
% \end{macrocode}
% \begin{macrocode}
- \renewcommand{\and}{
- \end{BlockClass}
- \begin{BlockClass}{oneauthor}
- }
- \begin{BlockClass}{oneauthor}
- \@author
- \end{BlockClass}
- \end{BlockClass}
- \begin{BlockClass}{titledate}
- \@date
- \end{BlockClass}
+ \renewcommand{\and}{%
+ \end{BlockClass}%
+ \begin{BlockClass}{oneauthor}%
+ }%
+ \begin{BlockClass}{oneauthor}%
+ \@author%
+ \end{BlockClass}%
+ \end{BlockClass}%
+ \begin{BlockClass}{titledate}%
+ \@date%
+ \end{BlockClass}%
}
% \end{macrocode}
% \end{macro}
@@ -25185,22 +25357,22 @@
\ifdefstring{\LWR at tempone}{tvertbarl}{%
\LWR at tdaddstyle%
border-left: 1px solid % space
- \LWR at origpound\LWR at vertruleHTMLcolor%
+ \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarldouble}{%
\LWR at tdaddstyle%
border-left: 4px double % space
- \LWR at origpound\LWR at vertruleHTMLcolor%
+ \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarldash}{%
\LWR at tdaddstyle%
border-left: 1px dashed % space
- \LWR at origpound\LWR at vertruleHTMLcolor%
+ \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarldoubledash}{%
\LWR at tdaddstyle%
border-left: 2px dashed % space
- \LWR at origpound\LWR at vertruleHTMLcolor%
+ \LWR at vertruleHTMLcolor%
}{}%
}{}%
% \end{macrocode}
@@ -25214,19 +25386,19 @@
% Add a custom style if a vertical bar was requested:
% \begin{macrocode}
\LWR at tdaddstyle%
- border-right: 1px solid \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 1px solid \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarrdouble}{%
\LWR at tdaddstyle%
- border-right: 4px double \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 4px double \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarrdash}{%
\LWR at tdaddstyle%
- border-right: 1px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 1px dashed \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarrdoubledash}{%
\LWR at tdaddstyle%
- border-right: 2px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 2px dashed \LWR at vertruleHTMLcolor%
}{}%
}%
}
@@ -25538,19 +25710,19 @@
% \begin{macrocode}
\ifnumcomp{\value{LWR at mcolvertbarsl}}{=}{1}{%
\LWR at tdaddstyle%
- border-left: 1px solid \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-left: 1px solid \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsl}}{>}{1}{%
\LWR at tdaddstyle%
- border-left: 4px double \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-left: 4px double \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsldash}}{=}{1}{%
\LWR at tdaddstyle%
- border-left: 1px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-left: 1px dashed \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsldash}}{>}{1}{%
\LWR at tdaddstyle%
- border-left: 2px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-left: 2px dashed \LWR at vertruleHTMLcolor%
}{}%
% \end{macrocode}
% Right side:
@@ -25557,19 +25729,19 @@
% \begin{macrocode}
\ifnumcomp{\value{LWR at mcolvertbarsr}}{=}{1}{%
\LWR at tdaddstyle%
- border-right: 1px solid \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 1px solid \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsr}}{>}{1}{%
\LWR at tdaddstyle%
- border-right: 4px double \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 4px double \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsrdash}}{=}{1}{%
\LWR at tdaddstyle%
- border-right: 1px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 1px dashed \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsrdash}}{>}{1}{%
\LWR at tdaddstyle%
- border-right: 2px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 2px dashed \LWR at vertruleHTMLcolor%
}{}%
}%
}
@@ -26518,20 +26690,21 @@
% \end{macro}
%
-% \begin{environment}{LWR at tabular} \oarg{vertposition} \marg{colspecs}
+% \begin{environment}{tabular} |<direction>| \oarg{vertposition} \marg{colspecs}
%
-% The new tabular environment will be \cs{let} in \cs{LWR at LwarpStart},
-% since \pkg{siunitx} might redefine tabular in the user's document.
+% The |<direction>| is from \pkg{plext} for Japanese documents, and is ignored.
%
% \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.}
% \changes{v0.36}{2017/08/16}{Fix for \pkg{babel-french}.}
+% \changes{v0.65}{2018/12/15}{Added support for \pkg{plext}.}
+% \changes{v0.65}{2018/12/16}{Fix: \env{tabular*}.}
%
% \begin{macrocode}
\StartDefiningTabulars
-\newenvironment*{LWR at tabular}[2][]
+\NewDocumentCommand{\LWR at HTML@@tabular}{d<> o m}
{%
-\LWR at traceinfo{LWR at tabular started}%
+\LWR at traceinfo{LWR at HTML@@tabular started}%
\addtocounter{LWR at tabulardepth}{1}%
% \end{macrocode}
% Not yet started a table row:
@@ -26564,13 +26737,13 @@
% Create the |table| tag:
% \begin{macrocode}
\global\booltrue{LWR at intabularmetadata}%
-\LWR at traceinfo{LWR at tabular: About to LWR at forecenewpage.}%
+\LWR at traceinfo{LWR@@tabular: About to LWR at forecenewpage.}%
\LWR at forcenewpage
\LWR at htmlblocktag{table}%
% \end{macrocode}
% Parse the table columns:
% \begin{macrocode}
-\LWR at parsetablecols{#2}%
+\LWR at parsetablecols{#3}%
% \end{macrocode}
% Table col spec is: \cs{LWR at tablecolspec} which is a string of |llccrr|, etc.
%
@@ -26605,12 +26778,17 @@
\gdef\LWR at cellHTMLcolor{}%
\@rowcolors%
% \end{macrocode}
+%
% The vertical rules are set to the color active at the start of the tabular.
% \cs{arrayrulecolor} will then affect horizontal rules inside the tabular,
% but not the vertical rules.
+% \changes{v0.65}{2018/12/19}{Fix: Rule color.}
% \begin{macrocode}
-\edef\LWR at vertruleHTMLcolor{\LWR at ruleHTMLcolor}%
+\ifdefvoid{\LWR at ruleHTMLcolor}%
+ {\edef\LWR at vertruleHTMLcolor{black}}%
+ {\edef\LWR at vertruleHTMLcolor{\LWR at origpound\LWR at ruleHTMLcolor}}%
% \end{macrocode}
+%
% Tracking the depth of cell color \element{div}s:
% \begin{macrocode}
\setcounter{LWR at cellcolordepth}{0}%
@@ -26622,7 +26800,7 @@
%
% The optional parameter for \cs{hline} supports the \pkg{tabls} package.
% \begin{macrocode}
-\LWR at traceinfo{LWR at tabular: redefining macros}%
+\LWR at traceinfo{LWR@@HTML at tabular: redefining macros}%
\LetLtxMacro\noalign\LWR at tabularnoalign%
\LetLtxMacro\hline\LWR at HTMLhline%
\LetLtxMacro\cline\LWR at HTMLcline%
@@ -26692,14 +26870,18 @@
% \end{macrocode}
% Look ahead for a possible table data cell:
% \begin{macrocode}
-\LWR at traceinfo{LWR at tabular: about to LWR at getmynexttoken}%
+\LWR at traceinfo{LWR@@HTML at tabular: about to LWR at getmynexttoken}%
\LWR at getmynexttoken%
}%
% \end{macrocode}
+%
+%
+%
% Ending the environment:
% \begin{macrocode}
+\newcommand*{\LWR at HTML@endtabular}
{%
-\LWR at traceinfo{LWR at tabular ending}%
+\LWR at traceinfo{LWR at HTML@endtabular}%
% \end{macrocode}
% Unnest one level of tabular paragraph handling:
% \changes{v0.46}{2018/01/18}{Fix: Tabular empty lines.}
@@ -26743,11 +26925,24 @@
% \begin{macrocode}
\protected\gdef&{\LWR at origampmacro}%
\StopDefiningTabulars%
-\LWR at traceinfo{LWR at tabular finished ending}%
+\LWR at traceinfo{LWR at HTML@endtabular finished}%
}
+\csletcs{LWR at HTML@endtabular*}{LWR at HTML@endtabular}
+
\StopDefiningTabulars
% \end{macrocode}
+%
+% \pkg{siunitx} may redefine \env{tabular}, so set the following later:
+% \begin{macrocode}
+\AtBeginDocument{
+ \LetLtxMacro\LWR at origendtabular\endtabular
+ \csletcs{LWR at origendtabular*}{endtabular*}
+ \LWR at formatted{@tabular}
+ \LWR at formatted{endtabular}
+ \LWR at formatted{endtabular*}
+}
+% \end{macrocode}
% \end{environment}
% \begin{macrocode}
@@ -27811,26 +28006,25 @@
% \begin{environment}{LWR at figcaption}
-% \qquad Encapsulates a caption inside \element{figcaption},
-% and if |FormatWP| then also a \element{div} with an italic style.
+%
+% An \HTML\ \element{figcaption} is not allowed in places where
+% \LaTeX\ does allow a figure caption, such as inside a \env{longtable}
+% where the tabular has already started, or inside a \env{center} environment.
+% Therefore, a \element{div} of class \attribute{figurecaption} is used
+% instead.
% \changes{v0.42}{2017/10/20}{If \progcode{FormatWP} forces italic captions.}
+% \changes{v0.65}{2018/12/21}{Uses \element{figurecaption} instead of \element{figcaption}.}
% \begin{macrocode}
\newenvironment*{LWR at figcaption}
-{%
- \LWR at traceinfo{LWR at figcaption env start}%
- \LWR at htmlblocktag{figcaption}%
- \ifbool{FormatWP}{%
- \begin{BlockClass}[font-style:italic]{italic}
- \LWR at print@vspace*{\baselineskip}
- }{}%
- \LWR at traceinfo{LWR at figcaption env start: done}%
-}
-{%
- \LWR at traceinfo{LWR at figcaption env end}%
- \ifbool{FormatWP}{\end{BlockClass}}{}%
- \LWR at htmlblocktag{/figcaption}%
- \LWR at traceinfo{LWR at figcaption env end: done}%
-}
+ {
+ \ifbool{FormatWP}{%
+ \BlockClass[font-style:italic]{figurecaption}
+% \LWR at print@vspace*{\baselineskip}
+ }{
+ \BlockClass{figurecaption}
+ }%
+ }
+ {\endBlockClass}
% \end{macrocode}
% \end{environment}
%
@@ -27856,7 +28050,7 @@
% No need for a |minipage| or \cs{parbox} inside the caption:
% \begin{macrocode}
\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
-\RenewDocumentCommand{\parbox}{O{t} o O{t} m +m}{##5}%
+\RenewDocumentCommand{\parbox}{O{t} O{} O{t} m +m}{##5}%
% \end{macrocode}
% Enclose the original caption code inside an \HTML\ tag:
% \begin{macrocode}
@@ -28230,7 +28424,7 @@
% \begin{docsidebar}[CSS related to sideTOC:]
% \raggedright
% \begin{description}[parsep=0ex]
-% \item [|nav.sidetoc|:] The entire side\TOC.
+% \item [|div.sidetoccontainer|:] The entire side\TOC.
% \item [|div.sidetoctitle|:] The title.
% \item [|div.sidetoccontents|:] The table of contents.
% \end{description}
@@ -28282,6 +28476,7 @@
% \end{macrocode}
% The entire side\TOC\ is placed into a |nav| of class |sidetoc|.
% \begin{macrocode}
+\LWR at htmlelementclass{div}{sidetoccontainer}
\LWR at htmlelementclass{nav}{sidetoc}
\setcounter{tocdepth}{\value{SideTOCDepth}}
@@ -28291,6 +28486,7 @@
% contain paragraphs.
% \begin{macrocode}
\begin{BlockClass}{sidetoctitle}
+\ifcsvoid{thetitle}{}{\InlineClass{sidetocthetitle}{\thetitle}\par}
\sidetocname
\end{BlockClass}
% \end{macrocode}
@@ -28302,6 +28498,7 @@
\LWR at myshorttoc{sidetoc}
\end{BlockClass}
\LWR at htmlelementclassend{nav}{sidetoc}
+\LWR at htmlelementclassend{div}{sidetoccontainer}
}
% \end{macrocode}
% \end{macro}
@@ -28645,6 +28842,7 @@
%
% \changes{v0.58}{2018/06/17}{Adds support for \cs{see}, \cs{seealso}, \cs{emph}, \cs{textbf}, etc.}
% \changes{v0.61}{2018/09/27}{Made robust,}
+% \changes{v0.65}{2018/12/09}{Added \cs{textsi}.}
% \begin{macrocode}
\newcommand{\LWR at hyperindexrefnullified}{%
\renewrobustcmd{\emph}[1]{\LWR at HTML@emph{\LWR at doindexentry{##1}}}%
@@ -28654,6 +28852,7 @@
\renewrobustcmd{\texttt}[1]{\LWR at HTML@texttt{\LWR at doindexentry{##1}}}%
\renewrobustcmd{\textup}[1]{\LWR at HTML@textup{\LWR at doindexentry{##1}}}%
\renewrobustcmd{\textsc}[1]{\LWR at HTML@textsc{\LWR at doindexentry{##1}}}%
+\renewrobustcmd{\textsi}[1]{\LWR at HTML@textsi{\LWR at doindexentry{##1}}}%
\renewrobustcmd{\textit}[1]{\LWR at HTML@textit{\LWR at doindexentry{##1}}}%
\renewrobustcmd{\textsl}[1]{\LWR at HTML@textsl{\LWR at doindexentry{##1}}}%
}
@@ -28863,6 +29062,12 @@
\LetLtxMacro\upshape\LWR at origupshape%
\LetLtxMacro\slshape\LWR at origslshape%
\LetLtxMacro\scshape\LWR at origscshape%
+% \end{macrocode}
+% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.}
+% \begin{macrocode}
+\LetLtxMacro\sishape\LWR at origsishape%
+% \end{macrocode}
+% \begin{macrocode}
\LetLtxMacro\itshape\LWR at origitshape%
\LetLtxMacro\em\LWR at origem%
\LetLtxMacro\normalfont\LWR at orignormalfont%
@@ -28877,10 +29082,20 @@
\let\enskip\LWR at origenskip%
\let\quad\LWR at origquad%
\let\qquad\LWR at origqquad%
-\LetLtxMacro\tabular\LWR at origtabular%
+% \end{macrocode}
+%
+% \cs{endtabular} must be restored to its original,
+% instead of relying on \pkg{lwarp}'s \cs{LWR at formatted} mechanism:
+% \changes{v0.65}{2018/12/16}{Fix: \env{tabular*}.}
+% \begin{macrocode}
\LetLtxMacro\endtabular\LWR at origendtabular%
+\csletcs{endtabular*}{LWR at origendtabular*}%
+% \end{macrocode}
+% \begin{macrocode}
\LetLtxMacro\noalign\LWR at orignoalign%
\LetLtxMacro\hline\LWR at orighline%
+% \end{macrocode}
+% \begin{macrocode}
\let\newline\LWR at orignewline%
\LetLtxMacro\includegraphics\LWR at origincludegraphics%
\let\TeX\LWR at origTeX%
@@ -31045,12 +31260,20 @@
% \end{macrocode}
%
%
-% If was loaded before \pkg{lwarp}, load the \pkg{lwarp} version as well.
+% If the given package was loaded before or by \pkg{lwarp},
+% load the \pkg{lwarp} version as well.
% \begin{macro}{\LWR at PreloadedPackage} \marg{packagename}
% \changes{v0.62}{2018/11/17}{Added.}
+% \changes{v0.65}{2018/12/21}{\cs{AtBeginDocument} to avoid option clashes.}
% \begin{macrocode}
\newcommand*{\LWR at PreloadedPackage}[1]{%
-\@ifpackageloaded{#1}{\LWR at origRequirePackage{lwarp-#1}}{}
+ \@ifpackageloaded{#1}%
+ {%
+ \AtBeginDocument{
+ \LWR at origRequirePackage{lwarp-#1}%
+ }
+ }%
+ {}%
}
% \end{macrocode}
% \end{macro}
@@ -31086,7 +31309,27 @@
\LWR at PreloadedPackage{xetexko-vertical}
% \end{macrocode}
+% \pkg{geometry} is preloaded by \pkg{lwarp}, and perhaps by various classes.
% \begin{macrocode}
+\LWR at PreloadedPackage{geometry}
+% \end{macrocode}
+
+% \pkg{plext} is preloaded by some CJK classes.
+% \begin{macrocode}
+\LWR at PreloadedPackage{plext}
+% \end{macrocode}
+
+% \pkg{stfloats} is preloaded by \pkg{ltj*} classes.
+% \begin{macrocode}
+\LWR at PreloadedPackage{stfloats}
+% \end{macrocode}
+
+% \pkg{lltjext} is preloaded by \pkg{ltj*} classes.
+% \begin{macrocode}
+\LWR at PreloadedPackage{lltjext}
+% \end{macrocode}
+
+% \begin{macrocode}
\end{warpHTML}
% \end{macrocode}
@@ -31159,9 +31402,11 @@
% \codeprint
%
% For print output, accept and then discard the new |class| key:
+% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
% \begin{macrocode}
\begin{warpprint}
\define at key{Gin}{class}{}
+\define at key{Gin}{alt}{}
% \end{macrocode}
%
% Print-mode additions for the \pkg{overpic} package.
@@ -31769,6 +32014,7 @@
% \oarg{inner vert position} \marg{width}
% \changes{v0.18}{2016/05/17}{Fix: \cs{linewidth}, \cs{textwidth}, \cs{textheight} inside a minipage.}
% \changes{v0.57}{2018/05/28}{Improved print/\HTML\ output selection.}
+% \changes{v0.65}{2018/12/17}{Refactored to later allow Japanese \textless{}t/y\textgreater{} argument.}
%
% The vertical positions may be 'c', 't', or 'b'.
% The inner position may also be 's'.
@@ -31777,7 +32023,7 @@
% 6\texttimes{}9 inch text area.
%
% \begin{macrocode}
-\NewDocumentEnvironment{LWR at HTML@minipage}{O{t} o O{t} m}
+\NewDocumentEnvironment{LWR at HTML@sub at minipage}{m m m m}
{%
\LWR at traceinfo{minipage}%
% \end{macrocode}
@@ -31812,7 +32058,7 @@
% Compute height:
% \begin{macrocode}
\setlength{\LWR at minipageheight}{\textheight}% default unless specified
-\IfValueT{#2}{\setlength{\LWR at minipageheight}{#2}}%
+\ifblank{#2}{}{\setlength{\LWR at minipageheight}{#2}}%
% \end{macrocode}
% Track nesting depth:
% \begin{macrocode}
@@ -31863,7 +32109,7 @@
{width:\LWR at printlength{\LWR at minipagewidth} ; }%
}%
\LWR at traceinfo{minipage: about to print the height}%
-\IfValueT{#2}{height:\LWR at printlength{\LWR at minipageheight} ; }%
+\ifblank{#2}{}{height:\LWR at printlength{\LWR at minipageheight} ; }%
"}%
% \end{macrocode}
% Finish with an empty line to start the contents on a new line.
@@ -31942,6 +32188,10 @@
\LWR at traceinfo{LWR at minipage: done}%
}
+\NewDocumentEnvironment{LWR at HTML@minipage}{O{t} O{} O{t} m}
+ {\LWR at HTML@sub at minipage{#1}{#2}{#3}{#4}}
+ {\endLWR at HTML@sub at minipage}
+
\LWR at formattedenv{minipage}
% \end{macrocode}
% \end{environment}
@@ -31959,7 +32209,7 @@
%
% \changes{v0.57}{2018/05/28}{Improved print/\HTML\ output selection.}
% \begin{macrocode}
-\NewDocumentCommand{\LWR at HTML@parbox}{O{t} o O{t} m +m}
+\NewDocumentCommand{\LWR at HTML@parbox}{O{t} O{} O{t} m +m}
{
\LWR at traceinfo{parbox of width #4}%
\begin{minipage}[#1][#2][#3]{#4}%
@@ -32443,6 +32693,29 @@
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\textsi} \marg{text}
+% \changes{v0.65}{2018/12/09}{Added.}
+% \begin{macrocode}
+\@ifundefined{textsi}{
+ \LetLtxMacro\LWR at print@textsi\LWR at print@textsc
+}{}
+
+\DeclareRobustCommand{\LWR at HTML@textsi}[1]{%
+ {%
+ \sishape%
+ \InlineClass(
+ font-style: italic;
+ font-variant: small-caps ;
+ font-variant-numeric: oldstyle-nums ;
+ ){textsi}{#1}%
+ }%
+}
+\LWR at formatted{textsi}
+
+\DeclareRobustCommand{\LWR at null@textsi}[1]{#1}
+% \end{macrocode}
+% \end{macro}
+
% \begin{macro}{\textsl} \marg{text}
% \begin{macrocode}
\DeclareRobustCommand{\LWR at HTML@textsl}[1]{%
@@ -32501,6 +32774,7 @@
% \changes{v0.40}{2017/09/21}{Fix: Long arguments for expandable command.}
% \changes{v0.43}{2017/10/31}{Fix: Nullify dollar inside filesnames.}
% \changes{v0.48}{2018/02/04}{Fix: \cs{newline} in title.}
+% \changes{v0.65}{2018/12/09}{Added \cs{textsi}.}
% \begin{macrocode}
\newcommand*{\LWR at nullfonts}{%
\LetLtxMacro\emph\LWR at null@emph%
@@ -32512,6 +32786,7 @@
\LetLtxMacro\textup\LWR at null@textup%
\LetLtxMacro\textit\LWR at null@textit%
\LetLtxMacro\textsc\LWR at null@textsc%
+\LetLtxMacro\textsi\LWR at null@textsi%
\LetLtxMacro\textsl\LWR at null@textsl%
\LetLtxMacro\textnormal\LWR at null@textnormal%
\LetLtxMacro\rmfamily\LWR at null@rmfamily%
@@ -32522,6 +32797,12 @@
\LetLtxMacro\upshape\LWR at null@upshape%
\LetLtxMacro\slshape\LWR at null@slshape%
\LetLtxMacro\scshape\LWR at null@scshape%
+% \end{macrocode}
+% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.}
+% \begin{macrocode}
+\LetLtxMacro\sishape\LWR at null@sishape%
+% \end{macrocode}
+% \begin{macrocode}
\LetLtxMacro\itshape\LWR at null@itshape%
\LetLtxMacro\normalfont\LWR at null@normalfont%
\LetLtxMacro\em\LWR at null@em%
@@ -32682,6 +32963,17 @@
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\sishape}
+% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.}
+% \begin{macrocode}
+\@ifundefined{sishape}{
+ \newrobustcmd*{\sishape}{\renewcommand*{\LWR at f@shape}{si}}
+}{
+ \renewrobustcmd*{\sishape}{\renewcommand*{\LWR at f@shape}{si}}
+}
+% \end{macrocode}
+% \end{macro}
+
% \begin{macro}{\slshape}
% \changes{v0.62}{2018/11/11}{Added.}
% \begin{macrocode}
@@ -33073,11 +33365,13 @@
% \begin{macro}{\quad}
% Handles special minipage \& horizontal space interactions.
+% Uses |2003 EM SPACE| to pass validation.
% \changes{v0.64}{2018/12/08}{Made robust.}
+% \changes{v0.65}{2018/12/22}{Changed to Unicode EM SPACE.}
% \begin{macrocode}
\renewrobustcmd*{\quad}{%
\LWR at minipagestoppars%
-\HTMLunicode{2001}%
+\HTMLunicode{2003}%
\LWR at minipagestartpars%
}
% \end{macrocode}
@@ -33094,10 +33388,11 @@
% \begin{macro}{\enskip}
% Handles special minipage \& horizontal space interactions.
% \changes{v0.64}{2018/12/08}{Made robust.}
+% \changes{v0.65}{2018/12/22}{Changed to Unicode EN SPACE.}
% \begin{macrocode}
\renewrobustcmd*{\enskip}{%
\LWR at minipagestoppars%
-\HTMLunicode{2000}%
+\HTMLunicode{2002}%
\LWR at minipagestartpars%
}
% \end{macrocode}
@@ -33735,34 +34030,15 @@
% \end{macrocode}
-% \section{\pkg{bxjs*} classes}
-%
-% Load patches to \pkg{bxjs*} classes.
-%
-% \changes{v0.63}{2018/11/24}{\pkg{bxjs*}: Added.}
-%
-% \codehtml
-% \begin{macrocode}
-\begin{warpHTML}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\@ifclassloaded{bxjsarticle}{\RequirePackage{lwarp-geometry}}{}
-\@ifclassloaded{bxjsbook}{\RequirePackage{lwarp-geometry}}{}
-\@ifclassloaded{bxjsreport}{\RequirePackage{lwarp-geometry}}{}
-\@ifclassloaded{bxjsslide}{\RequirePackage{lwarp-geometry}}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\end{warpHTML}
-% \end{macrocode}
-% \section{\pkg{ltjs*} classes}
+% \section{\pkg{ut*} classes}
%
-% Load patches to \pkg{ltjs*} classes.
+% Load patches to \pkg{uj*} and \pkg{ut*} classes, as well as \pkg{ltj*} classes.
%
-% \changes{v0.63}{2018/11/24}{\pkg{ltjs*}: Added.}
+% \changes{v0.64}{2018/12/07}{\pkg{ujarticle} and related: Improved \cs{today}.}
+% \changes{v0.64}{2018/12/07}{Added \pkg{utarticle} and related.}
+% \changes{v0.65}{2018/12/15}{Fix for \cs{rensuji}.}
%
% \codehtml
% \begin{macrocode}
@@ -33770,35 +34046,14 @@
% \end{macrocode}
%
% \begin{macrocode}
-\@ifclassloaded{ltjsarticle}{\RequirePackage{lwarp-stfloats}}{}
-\@ifclassloaded{ltjsbook}{\RequirePackage{lwarp-stfloats}}{}
-\@ifclassloaded{ltjsreport}{\RequirePackage{lwarp-stfloats}}{}
-\@ifclassloaded{ltjspf}{\RequirePackage{lwarp-stfloats}}{}
-\@ifclassloaded{ltjsiyou}{\RequirePackage{lwarp-stfloats}}{}
+\newcommand*{\LWR at patchujtclasses}{
% \end{macrocode}
%
+% \pkg{uj/t} does not use \cs{partname}
% \begin{macrocode}
-\end{warpHTML}
+ \def\@partnameformat{}
% \end{macrocode}
-
-
-% \section{\pkg{ut*} classes}
-%
-% Load patches to \pkg{uj*} and \pkg{ut*} classes.
-%
-% \changes{v0.64}{2018/12/07}{\pkg{ujarticle} and related: Improved \cs{today}.}
-% \changes{v0.64}{2018/12/07}{Added \pkg{utarticle} and related.}
-%
-% \codehtml
% \begin{macrocode}
-\begin{warpHTML}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\newcommand*{\LWR at patchujtclasses}{
- \let\tate\relax
- \DeclareDocumentCommand{\rensuji}{m}{##1}
- \def\@partnameformat{}% uj/t does not use \partname
\def\@partcntformat##1{%
\prepartname%
\csname the##1\endcsname%
@@ -33813,6 +34068,9 @@
\quad%
}
}
+% \end{macrocode}
+% Use decimal points instead of centered dots:
+% \begin{macrocode}
\renewcommand{\thepart}{\@Roman\c at part}
\@ifundefined{chapter}{
\renewcommand{\thesection}{\@arabic\c at section}
@@ -33827,6 +34085,15 @@
\thesubsubsection.\@arabic\c at paragraph}
\renewcommand{\thesubparagraph}{%
\theparagraph.\@arabic\c at subparagraph}
+ \@ifundefined{chapter}{
+ \renewcommand{\thefigure}{\@arabic\c at figure}
+ \renewcommand{\thetable}{\@arabic\c at table}
+ }{
+ \renewcommand{\thefigure}{%
+ \ifnum\c at chapter>\z@\thechapter.\fi\@arabic\c at figure}
+ \renewcommand{\thetable}{%
+ \ifnum\c at chapter>\z@\thechapter.\fi\@arabic\c at table}
+ }
}
\@ifclassloaded{ujarticle}{\LWR at patchujtclasses}{}
@@ -33835,6 +34102,17 @@
\@ifclassloaded{utarticle}{\LWR at patchujtclasses}{}
\@ifclassloaded{utbook}{\LWR at patchujtclasses}{}
\@ifclassloaded{utreport}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjarticle}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjbook}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjreport}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjsarticle}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjsbook}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjsreport}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjskiyou}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjspf}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjtarticle}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjtbook}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjtreport}{\LWR at patchujtclasses}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -35729,6 +36007,8 @@
%
%
%
+%
+%
% \iffalse
%<*array>
% \fi
@@ -35740,12 +36020,15 @@
% \DescribePackage{array}
% \pkg{array} is used as-is for print output, and emulated for \HTML.
%
+% \pkg{plarray} and \pkg{plextarray} do not affect \cs{firsthline} or
+% \cs{lasthline}, and so are not affected by the following.
+%
% \changes{v0.45}{2017/12/03}{\pkg{array}: Added.}
% \changes{v0.58}{2018/06/07}{\pkg{array}: Improved print/\HTML\ output selection.}
%
% \codehtml
%
-% Remove the dummy macros:
+% Remove the default nullfied macros:
% \begin{macrocode}
\let\firsthline\relax
\let\lasthline\relax
@@ -35767,6 +36050,9 @@
%
%
%
+%
+%
+%
% \iffalse
%<*arydshln>
% \fi
@@ -35820,9 +36106,10 @@
\newcommand*{\nodashgapcolor}{}
% \end{macrocode}
%
+%
% In a \env{lateximage}, revert to solid vertical rules:
% \begin{macrocode}
-\appto\LWR at restoreorigformatting{
+\appto\LWR at restoreorigformatting{%
\newcolumntype{:}{|}%
\newcolumntype{;}[1]{|}%
\LetLtxMacro\hdashline\hline%
@@ -35890,6 +36177,8 @@
%
%
%
+%
+%
% \iffalse
%<*asymptote>
% \fi
@@ -36880,6 +37169,32 @@
%
%
% \iffalse
+%<*bounddvi>
+% \fi
+%
+% \part{lwarp-bounddvi.sty}
+%
+% \section{bounddvi}
+%
+% \DescribePackage{bounddvi}
+% \pkg{bounddvi} is ignored.
+%
+% \changes{v0.65}{2018/12/18}{\pkg{bounddvi}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{bounddvi}
+% \end{macrocode}
+%
+% \iffalse
+%</bounddvi>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*boxedminipage2e>
% \fi
@@ -39498,7 +39813,7 @@
%
% \codehtml
%
-% A few placeholder definitions are forgotten first:
+% A placeholder definition is forgotten first:
% \begin{macrocode}
\let\rowcolor\relax
@@ -39520,7 +39835,7 @@
\LWR at addtabularcellcolor%
}
-\LWR at formatted{columncolor}
+\AtBeginDocument{\LWR at formatted{columncolor}}
% \end{macrocode}
% \end{noindmacro}
%
@@ -39538,7 +39853,7 @@
\LWR at getmynexttoken%
}
-\LWR at expandableformatted{rowcolor}
+\AtBeginDocument{\LWR at expandableformatted{rowcolor}}
% \end{macrocode}
% \end{noindmacro}
%
@@ -39552,7 +39867,7 @@
\LWR at addtabularcellcolor%
}
-\LWR at formatted{cellcolor}
+\AtBeginDocument{\LWR at formatted{cellcolor}}
% \end{macrocode}
% \end{noindmacro}
@@ -39567,7 +39882,7 @@
\convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
}
-\LWR at expandableformatted{arrayrulecolor}
+\AtBeginDocument{\LWR at expandableformatted{arrayrulecolor}}
% \end{macrocode}
% \end{noindmacro}
@@ -39582,7 +39897,7 @@
\LWR at getmynexttoken%
}
-\LWR at expandableformatted{arrayrulecolornexttoken}
+\AtBeginDocument{\LWR at expandableformatted{arrayrulecolornexttoken}}
% \end{macrocode}
% \end{noindmacro}
@@ -39592,7 +39907,7 @@
% \begin{macrocode}
\newcommand{\LWR at HTML@doublerulesepcolor}[2][named]{}
-\LWR at expandableformatted{doublerulesepcolor}
+\AtBeginDocument{\LWR at expandableformatted{doublerulesepcolor}}
% \end{macrocode}
% \end{noindmacro}
@@ -39602,7 +39917,7 @@
% \begin{macrocode}
\newcommand{\LWR at HTML@doublerulesepcolornexttoken}[2][named]{\LWR at getmynexttoken}
-\LWR at expandableformatted{doublerulesepcolornexttoken}
+\AtBeginDocument{\LWR at expandableformatted{doublerulesepcolornexttoken}}
% \end{macrocode}
% \end{noindmacro}
@@ -40322,8 +40637,68 @@
%
%
%
+% \iffalse
+%<*embrac>
+% \fi
%
+% \part{lwarp-embrac.sty}
+%
+% \section{embrac}
+%
+% \credits{Clemens Niederberger}
+%
+% \DescribePackage{embrac}
+% \pkg{embrac} is nullfied for \HTML\, and used as-is for print.
+%
+% \changes{v0.65}{2018/12/10}{\pkg{embrac}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{embrac}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\LetLtxMacro\LWR at orig@HTML at emph\LWR at HTML@emph
+\RenewDocumentCommand{\LWR at HTML@emph}{s m}{\LWR at orig@HTML at emph{#2}}
+
+\LetLtxMacro\LWR at orig@HTML at textit\LWR at HTML@textit
+\RenewDocumentCommand{\LWR at HTML@textit}{s m}{\LWR at orig@HTML at textit{#2}}
+
+\LetLtxMacro\LWR at orig@HTML at textsl\LWR at HTML@textsl
+\RenewDocumentCommand{\LWR at HTML@textsl}{s m}{\LWR at orig@HTML at textsl{#2}}
+
+\ifxetexorluatex
+ \LetLtxMacro\LWR at orig@HTML at textsi\LWR at HTML@textsi
+ \RenewDocumentCommand{\LWR at HTML@textsi}{s m}{%
+ \LWR at orig@HTML at textsi{#2}}
+\fi
+
+\AtBeginDocument{
+ \LWR at formatted{emph}
+ \LWR at formatted{textit}
+ \LWR at formatted{textsl}
+ \ifxetexorluatex
+ \LWR at formatted{textsi}
+ \fi
+}
+
+\newcommand{\LWR at HTML@EmbracOff}{}
+\LWR at formatted{EmbracOff}
+
+\newcommand{\LWR at HTML@EmbracOn}{}
+\LWR at formatted{EmbracOn}
+% \end{macrocode}
+%
% \iffalse
+%</embrac>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*emptypage>
% \fi
@@ -41022,8 +41397,6 @@
%
%
%
-%
-%
% \iffalse
%<*everyshi>
% \fi
@@ -41057,8 +41430,6 @@
%
%
%
-%
-%
% \iffalse
%<*extramarks>
% \fi
@@ -43205,9 +43576,40 @@
%
%
%
+% \iffalse
+%<*footnoterange>
+% \fi
%
+% \part{lwarp-footnoterange.sty}
%
+% \section{footnoterange}
+%
+% \credits{H.-Martin Münch}
+%
+% \DescribePackage{footnoterange}
+% \pkg{footnoterange} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.65}{2018/12/10}{\pkg{footnoterange}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{footnoterange}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\csletcs{footnoterange}{footnoterange*}
+\csletcs{endfootnoterange}{endfootnoterange*}
+% \end{macrocode}
+%
% \iffalse
+%</footnoterange>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*footnpag>
% \fi
%
@@ -43610,8 +44012,42 @@
%
%
%
+% \iffalse
+%<*gentombow>
+% \fi
%
+% \part{lwarp-gentombow.sty}
+%
+% \section{gentombow}
+%
+% \DescribePackage{gentombow}
+% \pkg{gentombow} is ignored.
+%
+% \changes{v0.65}{2018/12/18}{\pkg{gentombow}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{gentombow}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand{\settombowbanner}[1]{}
+\newcommand{\settombowbannerfont}[1]{}
+\newcommand{\settombowwidth}[1]{}
+\newcommand{\settombowbleed}[1]{}
+\newcommand{\settombowcolor}[1]{}
+% \end{macrocode}
+%
% \iffalse
+%</gentombow>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*geometry>
% \fi
@@ -43628,12 +44064,12 @@
% \changes{v0.22}{2017/03/01}{\pkg{geometry}: Nullified commands.}
%
% \codehtml
-
+%
% Discard all options for \pkg{lwarp-geometry}:
% \begin{macrocode}
\LWR at ProvidesPackageDrop{geometry}
% \end{macrocode}
-
+%
% \begin{macrocode}
\renewcommand*{\geometry}[1]{}
\renewcommand*{\newgeometry}[1]{}
@@ -43641,7 +44077,7 @@
\renewcommand*{\savegeometry}[1]{}
\renewcommand*{\loadgeometry}[1]{}
% \end{macrocode}
-
+%
% \iffalse
%</geometry>
% \fi
@@ -43853,6 +44289,10 @@
\newcommand*{\LWR at igyscale}{1}
\newcommand*{\LWR at igclass}{inlineimage}
% \end{macrocode}
+% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
+% \begin{macrocode}
+\newcommand*{\LWR at igalt}{(image)}
+% \end{macrocode}
% Set the actions of each of the key/value combinations for
% \cs{includegraphics}. Many are ignored.
@@ -43936,8 +44376,14 @@
% Handle class key:
% \begin{macrocode}
\define at key{igraph}{class}{\renewcommand*{\LWR at igclass}{#1}}
-
% \end{macrocode}
+%
+% Handle alt key:
+% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
+% \begin{macrocode}
+\define at key{igraph}{alt}{\renewcommand*{\LWR at igalt}{#1}}
+% \end{macrocode}
+%
% ^^A \define at key{igraph}{xscale}{\renewcommand*{\LWR at igxscale}{#1}}
% ^^A \define at key{igraph}{yscale}{\renewcommand*{\LWR at igyscale}{#1}}
% It appears that \pkg{graphicx} does not have separate keys for
@@ -44060,9 +44506,11 @@
% Define the new class key for the print-mode version of \cs{includegraphics},
% which is enabled inside a \env{lateximage}.
% \changes{v0.42}{2017/10/24}{\pkg{includegraphics}: Fix: Class key.}
+% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
% \begin{macrocode}
\AtBeginDocument{
\define at key{Gin}{class}{}
+\define at key{Gin}{alt}{}
}
% \end{macrocode}
@@ -44154,6 +44602,10 @@
\renewcommand*{\LWR at igyscale}{1}%
\renewcommand*{\LWR at igclass}{inlineimage}%
% \end{macrocode}
+% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
+% \begin{macrocode}
+\renewcommand*{\LWR at igalt}{(image)}%
+% \end{macrocode}
%
% If |#3| is empty, only one optional argument was given, thus \pkg{graphicx} syntax:
% \begin{macrocode}
@@ -44308,9 +44760,11 @@
" \LWR at orignewline%
}{}%
% \end{macrocode}
-% Set the class:
+% Set the class and alt tag:
+% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
% \begin{macrocode}
\LWR at origtilde{} class="\LWR at igclass" \LWR at orignewline%
+\LWR at origtilde{} alt="\LWR at igalt" \LWR at orignewline%
}% end of image tags
}% end of href
% \end{macrocode}
@@ -46924,8 +47378,77 @@
%
%
%
+% \iffalse
+%<*lltjext>
+% \fi
%
+% \part{lwarp-lltjext.sty}
+%
+% \section{lltjext}
+%
+% \credits{The Lua\TeX-ja project team}
+%
+% \DescribePackage{lltjext}
+% \pkg{lltjext} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.65}{2018/12/21}{\pkg{lltjext}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{lltjext}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\protected\def\yoko{%
+ \directlua{luatexja.direction.set_list_direction(4, 'yoko')}%
+}
+\protected\def\tate{\yoko}
+\protected\def\dtou{\yoko}
+\protected\def\utod{\yoko}
+
+\define at key[ltj]{japaram}{direction}{}
+
+\yoko
+
+\DeclareExpandableDocumentCommand{\rensuji}{s o m}{#3}
+
+\DeclareDocumentCommand{\layoutfloat}{d() o m}{}
+
+\DeclareDocumentCommand{\DeclareLayoutCaption}{m d<> d() o}{}
+
+\LetLtxMacro\pcaption\caption
+
+\DeclareDocumentCommand{\layoutcaption}{d<> d() o}{}
+
+\let\captiondir\relax
+\RenewDocumentEnvironment{LWR at HTML@minipage}{d<> O{t} O{} O{t} m}
+ {\LWR at HTML@sub at minipage{#2}{#3}{#4}{#5}}
+ {\endLWR at HTML@sub at minipage}
+
+\RenewDocumentCommand{\LWR at HTML@parbox}{d<> O{t} O{} O{t} m +m}
+{
+\LWR at traceinfo{parbox of width #4}%
+\begin{minipage}[#2][#3][#4]{#5}%
+#6
+\end{minipage}%
+}
+
+\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{%
+\booltrue{LWR at minipagefullwidth}%
+\parbox{#2}{#4}%
+}
+% \end{macrocode}
+%
% \iffalse
+%</lltjext>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*longtable>
% \fi
@@ -46968,9 +47491,9 @@
\caption at LT@setup%
\booltrue{LWR at starredlongtable}%
\let\captionlistentry\LWR at LTcaptionlistentry%
-\LWR at tabular{#2}
+\tabular{#2}
}
-{\endLWR at tabular\LWR at floatend}
+{\endtabular\LWR at floatend}
\newenvironment{longtable}[2][]{%
\LWR at floatbegin{table}%
@@ -46980,10 +47503,9 @@
\caption at LT@setup%
\refstepcounter{\LTcaptype}%
\let\captionlistentry\LWR at LTcaptionlistentry%
-\LWR at tabular{#2}
+\tabular{#2}
}
-{\endLWR at tabular\LWR at floatend}
-
+{\endtabular\LWR at floatend}
% \end{macrocode}
% \end{environment}
@@ -48883,6 +49405,13 @@
\newlength{\multicolovershoot}
\newlength{\multicolundershoot}
% \end{macrocode}
+%
+% \changes{v0.65}{2018/12/15}{\pkg{multicol}: Added \cs{docolaction}.}
+% \begin{macrocode}
+\NewDocumentCommand{\docolaction}{s o m m m}{%
+ \IfValueTF{#2}{#2}{#3}%
+}
+% \end{macrocode}
% \begin{macrocode}
\end{warpHTML}
@@ -48896,9 +49425,41 @@
%
%
%
+% \iffalse
+%<*multicolrule>
+% \fi
%
+% \part{lwarp-multicolrule.sty}
%
+% \section{multicolrule}
+%
+% \DescribePackage{multicolrule}
+% \pkg{multicolrule} is ignored.
+%
+% \changes{v0.65}{2018/12/21}{\pkg{multicolrule}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\RequirePackage{multicol}
+
+\LWR at ProvidesPackageDrop{multicolrule}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\SetMCRule}[1]{}
+% \end{macrocode}
+%
% \iffalse
+%</multicolrule>
+% \fi
+%
+%
+%
+%
+%
+%
+% \iffalse
%<*multirow>
% \fi
@@ -50784,7 +51345,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\NewDocumentCommand{\pbox}{O{t} o O{t} m +m}{%
+\NewDocumentCommand{\pbox}{O{t} O{} O{t} m +m}{%
\booltrue{LWR at minipagefullwidth}%
\parbox[#1][#2][#3]{#4}{#5}%
}
@@ -50871,9 +51432,6 @@
\LWR at ProvidesPackageDrop{pdflscape}
% \end{macrocode}
%
-% \begin{macrocode}
-% \end{macrocode}
-%
% \iffalse
%</pdflscape>
% \fi
@@ -51359,9 +51917,171 @@
%
%
%
+% \iffalse
+%<*plarydshln>
+% \fi
%
+% \part{lwarp-plarydshln.sty}
%
+% \section{plarydshln}
+%
+% \DescribePackage{plarydshln}
+% \pkg{plarydshln} is emulated by \pkg{lwarp-arydshln}.
+%
+% \changes{v0.65}{2018/12/17}{\pkg{plarydshln}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{plarydshln}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\LWR at origRequirePackage{lwarp-arydshln}
+% \end{macrocode}
+%
% \iffalse
+%</plarydshln>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
+%<*plext>
+% \fi
+%
+% \part{lwarp-plext.sty}
+%
+% \section{plext}
+%
+% \DescribePackage{plext}
+% \pkg{plext} is preloaded by \pkg{jtarticle} and related classes.
+%
+% \changes{v0.65}{2017/08/27}{\pkg{plext}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at loadbefore{plext}
+
+\LWR at ProvidesPackagePass{plext}[2017/07/21]
+% \end{macrocode}
+%
+% ^^A *8* if \cs{layoutfloat}, frame the next float
+% \begin{macrocode}
+\let\tate\relax
+
+\DeclareExpandableDocumentCommand{\rensuji}{s o m}{#3}
+
+% \layoutfloat(width,height)[pos]#4
+\DeclareDocumentCommand{\layoutfloat}{d() o m}{}
+
+% \DeclareLayoutCaption{type} <dir>(width)[pos1pos2]
+\DeclareDocumentCommand{\DeclareLayoutCaption}{m d<> d() o}{}
+
+\LetLtxMacro\pcaption\caption
+
+% \layoutcaption<dir>(width)[pos]
+\DeclareDocumentCommand{\layoutcaption}{d<> d() o}{}
+
+\let\captiondir\relax
+% \end{macrocode}
+%
+% Add the optional |<t/y>| direction:
+% \begin{macrocode}
+\RenewDocumentEnvironment{LWR at HTML@minipage}{d<> O{t} O{} O{t} m}
+ {\LWR at HTML@sub at minipage{#2}{#3}{#4}{#5}}
+ {\endLWR at HTML@sub at minipage}
+
+\RenewDocumentCommand{\LWR at HTML@parbox}{d<> O{t} O{} O{t} m +m}
+{
+\LWR at traceinfo{parbox of width #4}%
+\begin{minipage}[#2][#3][#4]{#5}%
+#6
+\end{minipage}%
+}
+
+% \pbox <t/y> [width] [l/r] {contents}
+\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{%
+\booltrue{LWR at minipagefullwidth}%
+\parbox{#2}{#4}%
+}
+% \end{macrocode}
+%
+% \env{picture}, as modified by \pkg{pext},
+% is encapsulated by the \pkg{lwarp} core.
+%
+% \iffalse
+%</plext>
+% \fi
+%
+%
+%
+%
+% \iffalse
+%<*plextarydshln>
+% \fi
+%
+% \part{lwarp-plextarydshln.sty}
+%
+% \section{plextarydshln}
+%
+% \DescribePackage{plextarydshln}
+% \pkg{plextarydshln} is emulated by \pkg{lwarp-arydshln}.
+%
+% \changes{v0.65}{2018/12/17}{\pkg{plextarydshln}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{plextarydshln}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\LWR at origRequirePackage{lwarp-arydshln}
+% \end{macrocode}
+%
+% \iffalse
+%</plextarydshln>
+% \fi
+%
+%
+%
+%
+% \iffalse
+%<*plextcolortbl>
+% \fi
+%
+% \part{lwarp-plextcolortbl.sty}
+%
+% \section{plextcolortbl}
+%
+% \DescribePackage{plextcolortbl}
+% \pkg{plextcolortbl} is emulated by \pkg{lwarp-arydshln}.
+%
+% \changes{v0.65}{2018/12/17}{\pkg{plextcolortbl}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{plextcolortbl}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\LWR at origRequirePackage{lwarp-colortbl}
+% \end{macrocode}
+%
+% \iffalse
+%</plextcolortbl>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*prelim2e>
% \fi
%
@@ -51667,7 +52387,123 @@
%
%
%
+%
% \iffalse
+%<*pxatbegshi>
+% \fi
+%
+% \part{lwarp-pxatbegshi.sty}
+%
+% \section{pxatbegshi}
+%
+% \DescribePackage{pxatbegshi}
+% \pkg{pxatbegshi} is ignored.
+%
+% \changes{v0.65}{2018/12/17}{\pkg{pxatbegshi}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{pxatbegshi}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\LWR at origRequirePackage{lwarp-atbegshi}
+% \end{macrocode}
+%
+% \iffalse
+%</pxatbegshi>
+% \fi
+%
+%
+%
+% \iffalse
+%<*pxeveryshi>
+% \fi
+%
+% \part{lwarp-pxeveryshi.sty}
+%
+% \section{pxeveryshi}
+%
+% \DescribePackage{pxeveryshi}
+% \pkg{pxeveryshi} is ignored.
+%
+% \changes{v0.65}{2018/12/17}{\pkg{pxeveryshi}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{pxeveryshi}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\LWR at origRequirePackage{lwarp-everyshi}
+% \end{macrocode}
+%
+% \iffalse
+%</pxeveryshi>
+% \fi
+%
+%
+%
+%
+% \iffalse
+%<*pxftnright>
+% \fi
+%
+% \part{lwarp-pxftnright.sty}
+%
+% \section{pxftnright}
+%
+% \DescribePackage{pxftnright}
+% \pkg{pxftnright} is ignored.
+%
+% \changes{v0.65}{2018/12/17}{\pkg{pxftnright}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{pxftnright}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\LWR at origRequirePackage{lwarp-ftnright}
+% \end{macrocode}
+%
+% \iffalse
+%</pxftnright>
+% \fi
+%
+%
+%
+%
+% \iffalse
+%<*pxjahyper>
+% \fi
+%
+% \part{lwarp-pxjahyper.sty}
+%
+% \section{pxjahyper}
+%
+% \DescribePackage{pxjahyper}
+% \pkg{pxjahyper} is ignored.
+%
+% \changes{v0.65}{2018/12/15}{\pkg{pxjahyper}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{pxjahyper}
+% \end{macrocode}
+%
+% \iffalse
+%</pxjahyper>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*quotchap>
% \fi
%
@@ -54367,7 +55203,7 @@
% \pkg{stfloats} is ignored.
%
% \changes{v0.48}{2018/02/07}{\pkg{stfloats}: Added.}
-% \changes{v0.63}{2018/11/24}{\pkg{stfloats}: Adapted to \pkg{ltjs*} classes.}
+% \changes{v0.63}{2018/11/24}{\pkg{stfloats}: Adapted to \pkg{ltj*} classes.}
%
% \codehtml
%
@@ -54375,7 +55211,7 @@
\LWR at ProvidesPackageDrop{stfloats}
% \end{macrocode}
%
-% \pkg{stfloats} may have been preloaded by a \pkg{ltjs*} class.
+% \pkg{stfloats} may have been preloaded by a \pkg{ltj*} class.
%
% The following are provided in case they have not yet been defined:
% \begin{macrocode}
@@ -55010,7 +55846,114 @@
%
%
%
+%
+%
% \iffalse
+%<*tascmac>
+% \fi
+%
+% \part{lwarp-tascmac.sty}
+%
+% \section{tascmac}
+%
+% \DescribePackage{tascmac}
+% \pkg{tascmac} is ignored.
+%
+% \changes{v0.65}{2018/12/21}{\pkg{tascmac}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{tascmac}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newenvironment*{boxnote}
+ {
+ \BlockClass[
+ padding: .5ex ;
+ border: 1px solid black ;
+ border-top: 1px dashed black ;
+ ]{boxnote}
+ }
+ {\endBlockClass}
+
+\newenvironment*{screen}[1][]
+ {
+ \BlockClass[
+ padding: .5ex ;
+ border: 1px solid gray ;
+ border-radius: 8pt
+ ]{boxnote}
+ }
+ {\endBlockClass}
+
+\newenvironment*{itembox}[2][]
+ {
+ \BlockClass[
+ padding: .5ex ;
+ border: 1px solid gray ;
+ border-radius: 8pt
+ ]{boxnote}
+ \InlineClass{itemboxtitle}{#2}\par
+ }
+ {\endBlockClass}
+
+\newenvironment*{shadebox}
+ {
+ \BlockClass[
+ padding: .5ex ;
+ border: 1px solid black ;
+ box-shadow: 3px 3px 3px \#808080 ;
+ ]{boxnote}
+ }
+ {\endBlockClass}
+
+\newcommand*{\mask}[2]{%
+ \InlineClass[background: lightgray]{mask}{#1}%
+}
+
+\newcommand*{\maskbox}[5]{%
+ \InlineClass[background: lightgray]{mask}{#5}%
+}
+
+\newcommand*{\Maskbox}[6]{%
+ \InlineClass[
+ background: lightgray ;
+ border: #5 solid black
+ ]{mask}{#6}%
+}
+
+\newcommand*{\keytop}[2][]{%
+ \InlineClass[%
+ padding: .2ex ;
+ border: 1px solid black ;
+ border-radius: .7ex ;
+ ]{keytop}{#2}%
+}
+
+\def\yen{\HTMLunicode{00A5}}
+
+\def\return{\HTMLunicode{23CE}}
+
+\def\Return{\HTMLunicode{23CE}}
+
+\def\ascii{ASCII Corporation}
+
+\def\Ascii{ASCII Corporation}
+
+\def\ASCII{ASCII Corporation}
+% \end{macrocode}
+%
+% \iffalse
+%</tascmac>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*textarea>
% \fi
%
@@ -56669,27 +57612,27 @@
\DeclareDocumentCommand{\@maketitle}{}{%
\maketitlehooka
{
- \LWR at stoppars\LWR at htmltag{\LWR at tagtitle}
- \@bspretitle \@title \@bsposttitle
- \LWR at htmltag{\LWR at tagtitleend}\LWR at startpars
+ \LWR at stoppars\LWR at htmltag{\LWR at tagtitle}%
+ \@bspretitle \@title \@bsposttitle%
+ \LWR at htmltag{\LWR at tagtitleend}\LWR at startpars%
}
\maketitlehookb
{
\begin{BlockClass}{author}
- \renewcommand{\and}{
- \end{BlockClass}
- \begin{BlockClass}{oneauthor}
+ \renewcommand{\and}{%
+ \end{BlockClass}%
+ \begin{BlockClass}{oneauthor}%
}
- \begin{BlockClass}{oneauthor}
- \@bspreauthor \@author \@bspostauthor
- \end{BlockClass}
- \end{BlockClass}
+ \begin{BlockClass}{oneauthor}%
+ \@bspreauthor \@author \@bspostauthor%
+ \end{BlockClass}%
+ \end{BlockClass}%
}
\maketitlehookc
{
- \begin{BlockClass}{titledate}
- \@bspredate \@date \@bspostdate
- \end{BlockClass}
+ \begin{BlockClass}{titledate}%
+ \@bspredate \@date \@bspostdate%
+ \end{BlockClass}%
}
\maketitlehookd
}
@@ -58362,7 +59305,44 @@
%
%
%
+%
% \iffalse
+%<*versonotes>
+% \fi
+%
+% \part{lwarp-versonotes.sty}
+%
+% \section{versonotes}
+%
+% \credits{Norman Gray}
+%
+% \DescribePackage{versonotes}
+% \pkg{versonotes} is emulated.
+%
+% \changes{v0.65}{2018/12/10}{\pkg{versonotes}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{versonotes}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand{\versonote}[1]{\marginpar{#1}}
+\newdimen\versotextwidth
+\newdimen\versoleftmargin
+\newcommand*{\versolayout}{}
+% \end{macrocode}
+%
+% \iffalse
+%</versonotes>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*vertbars>
% \fi
%
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2018-12-22 21:54:16 UTC (rev 49479)
@@ -75,6 +75,7 @@
\file{lwarp-bookmark.sty}{\from{lwarp.dtx}{bookmark}}
\file{lwarp-booktabs.sty}{\from{lwarp.dtx}{booktabs}}
\file{lwarp-bophook.sty}{\from{lwarp.dtx}{bophook}}
+\file{lwarp-bounddvi.sty}{\from{lwarp.dtx}{bounddvi}}
\file{lwarp-boxedminipage2e.sty}{\from{lwarp.dtx}{boxedminipage2e}}
\file{lwarp-breakurl.sty}{\from{lwarp.dtx}{breakurl}}
\file{lwarp-breqn.sty}{\from{lwarp.dtx}{breqn}}
@@ -119,6 +120,7 @@
\file{lwarp-easy-todo.sty}{\from{lwarp.dtx}{easy-todo}}
\file{lwarp-ebook.sty}{\from{lwarp.dtx}{ebook}}
\file{lwarp-ellipsis.sty}{\from{lwarp.dtx}{ellipsis}}
+\file{lwarp-embrac.sty}{\from{lwarp.dtx}{embrac}}
\file{lwarp-emptypage.sty}{\from{lwarp.dtx}{emptypage}}
\file{lwarp-endfloat.sty}{\from{lwarp.dtx}{endfloat}}
\file{lwarp-endheads.sty}{\from{lwarp.dtx}{endheads}}
@@ -160,6 +162,7 @@
\file{lwarp-footmisc.sty}{\from{lwarp.dtx}{footmisc}}
\file{lwarp-footnote.sty}{\from{lwarp.dtx}{footnote}}
\file{lwarp-footnotehyper.sty}{\from{lwarp.dtx}{footnotehyper}}
+\file{lwarp-footnoterange.sty}{\from{lwarp.dtx}{footnoterange}}
\file{lwarp-fontenc.sty}{\from{lwarp.dtx}{fontenc}}
\file{lwarp-footnpag.sty}{\from{lwarp.dtx}{footnpag}}
\file{lwarp-framed.sty}{\from{lwarp.dtx}{framed}}
@@ -168,6 +171,7 @@
\file{lwarp-fullpage.sty}{\from{lwarp.dtx}{fullpage}}
\file{lwarp-fullwidth.sty}{\from{lwarp.dtx}{fullwidth}}
\file{lwarp-fwlw.sty}{\from{lwarp.dtx}{fwlw}}
+\file{lwarp-gentombow.sty}{\from{lwarp.dtx}{gentombow}}
\file{lwarp-geometry.sty}{\from{lwarp.dtx}{geometry}}
\file{lwarp-glossaries.sty}{\from{lwarp.dtx}{glossaries}}
\file{lwarp-gmeometric.sty}{\from{lwarp.dtx}{gmeometric}}
@@ -200,6 +204,7 @@
\file{lwarp-lineno.sty}{\from{lwarp.dtx}{lineno}}
\file{lwarp-lips.sty}{\from{lwarp.dtx}{lips}}
\file{lwarp-listings.sty}{\from{lwarp.dtx}{listings}}
+\file{lwarp-lltjext.sty}{\from{lwarp.dtx}{lltjext}}
\file{lwarp-longtable.sty}{\from{lwarp.dtx}{longtable}}
\file{lwarp-lscape.sty}{\from{lwarp.dtx}{lscape}}
\file{lwarp-ltablex.sty}{\from{lwarp.dtx}{ltablex}}
@@ -228,6 +233,7 @@
\file{lwarp-moreverb.sty}{\from{lwarp.dtx}{moreverb}}
\file{lwarp-mparhack.sty}{\from{lwarp.dtx}{mparhack}}
\file{lwarp-multicol.sty}{\from{lwarp.dtx}{multicol}}
+\file{lwarp-multicolrule.sty}{\from{lwarp.dtx}{multicolrule}}
\file{lwarp-multirow.sty}{\from{lwarp.dtx}{multirow}}
\file{lwarp-multitoc.sty}{\from{lwarp.dtx}{multitoc}}
\file{lwarp-musicography.sty}{\from{lwarp.dtx}{musicography}}
@@ -264,6 +270,10 @@
\file{lwarp-pfnote.sty}{\from{lwarp.dtx}{pfnote}}
\file{lwarp-phfqit.sty}{\from{lwarp.dtx}{phfqit}}
\file{lwarp-placeins.sty}{\from{lwarp.dtx}{placeins}}
+\file{lwarp-plarydshln.sty}{\from{lwarp.dtx}{plarydshln}}
+\file{lwarp-plext.sty}{\from{lwarp.dtx}{plext}}
+\file{lwarp-plextarydshln.sty}{\from{lwarp.dtx}{plextarydshln}}
+\file{lwarp-plextcolorbl.sty}{\from{lwarp.dtx}{plextcolortbl}}
\file{lwarp-prelim2e.sty}{\from{lwarp.dtx}{prelim2e}}
\file{lwarp-prettyref.sty}{\from{lwarp.dtx}{prettyref}}
\file{lwarp-preview.sty}{\from{lwarp.dtx}{preview}}
@@ -272,6 +282,10 @@
\file{lwarp-pst-eps.sty}{\from{lwarp.dtx}{pst-eps}}
\file{lwarp-pstool.sty}{\from{lwarp.dtx}{pstool}}
\file{lwarp-pstricks.sty}{\from{lwarp.dtx}{pstricks}}
+\file{lwarp-pxatbegshi.sty}{\from{lwarp.dtx}{pxatbegshi}}
+\file{lwarp-pxeveryshi.sty}{\from{lwarp.dtx}{pxeveryshi}}
+\file{lwarp-pxftnright.sty}{\from{lwarp.dtx}{pxftnright}}
+\file{lwarp-pxjahyper.sty}{\from{lwarp.dtx}{pxjahyper}}
\file{lwarp-quotchap.sty}{\from{lwarp.dtx}{quotchap}}
\file{lwarp-quoting.sty}{\from{lwarp.dtx}{quoting}}
\file{lwarp-ragged2e.sty}{\from{lwarp.dtx}{ragged2e}}
@@ -323,6 +337,7 @@
\file{lwarp-tabls.sty}{\from{lwarp.dtx}{tabls}}
\file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}}
\file{lwarp-tabulary.sty}{\from{lwarp.dtx}{tabulary}}
+\file{lwarp-tascmac.sty}{\from{lwarp.dtx}{tascmac}}
\file{lwarp-textarea.sty}{\from{lwarp.dtx}{textarea}}
\file{lwarp-textcomp.sty}{\from{lwarp.dtx}{textcomp}}
\file{lwarp-textfit.sty}{\from{lwarp.dtx}{textfit}}
@@ -361,6 +376,7 @@
\file{lwarp-url.sty}{\from{lwarp.dtx}{url}}
\file{lwarp-uspace.sty}{\from{lwarp.dtx}{uspace}}
\file{lwarp-verse.sty}{\from{lwarp.dtx}{verse}}
+\file{lwarp-versonotes.sty}{\from{lwarp.dtx}{versonotes}}
\file{lwarp-vertbars.sty}{\from{lwarp.dtx}{vertbars}}
\file{lwarp-vmargin.sty}{\from{lwarp.dtx}{vmargin}}
\file{lwarp-vowel.sty}{\from{lwarp.dtx}{vowel}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -34,7 +34,7 @@
\newcommand*{\ADLnoshorthanded}{}
\newcommand*{\dashgapcolor}[2][]{}
\newcommand*{\nodashgapcolor}{}
-\appto\LWR at restoreorigformatting{
+\appto\LWR at restoreorigformatting{%
\newcolumntype{:}{|}%
\newcolumntype{;}[1]{|}%
\LetLtxMacro\hdashline\hline%
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-bounddvi.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `bounddvi')
+%% 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 at ProvidesPackageDrop{bounddvi}
+\endinput
+%%
+%% End of file `lwarp-bounddvi.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -23,25 +23,25 @@
\LWR at addtabularcellcolor%
}
-\LWR at formatted{columncolor}
+\AtBeginDocument{\LWR at formatted{columncolor}}
\NewDocumentCommand{\LWR at HTML@rowcolor}{O{named} m o o}{%
\convertcolorspec{#1}{#2}{HTML}\LWR at rowHTMLcolor%
\LWR at getmynexttoken%
}
-\LWR at expandableformatted{rowcolor}
+\AtBeginDocument{\LWR at expandableformatted{rowcolor}}
\NewDocumentCommand{\LWR at HTML@cellcolor}{O{named} m o o}{%
\convertcolorspec{#1}{#2}{HTML}\LWR at cellHTMLcolor%
\LWR at addtabularcellcolor%
}
-\LWR at formatted{cellcolor}
+\AtBeginDocument{\LWR at formatted{cellcolor}}
\newcommand{\LWR at HTML@arrayrulecolor}[2][named]{%
\convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
}
-\LWR at expandableformatted{arrayrulecolor}
+\AtBeginDocument{\LWR at expandableformatted{arrayrulecolor}}
\newcommand{\LWR at HTML@arrayrulecolornexttoken}[2][named]{%
\convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
@@ -48,15 +48,15 @@
\LWR at getmynexttoken%
}
-\LWR at expandableformatted{arrayrulecolornexttoken}
+\AtBeginDocument{\LWR at expandableformatted{arrayrulecolornexttoken}}
\newcommand{\LWR at HTML@doublerulesepcolor}[2][named]{}
-\LWR at expandableformatted{doublerulesepcolor}
+\AtBeginDocument{\LWR at expandableformatted{doublerulesepcolor}}
\newcommand{\LWR at HTML@doublerulesepcolornexttoken}[2][named]{\LWR at getmynexttoken}
-\LWR at expandableformatted{doublerulesepcolornexttoken}
+\AtBeginDocument{\LWR at expandableformatted{doublerulesepcolornexttoken}}
\endinput
%%
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,50 @@
+%%
+%% This is file `lwarp-embrac.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `embrac')
+%% 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 at ProvidesPackagePass{embrac}
+\LetLtxMacro\LWR at orig@HTML at emph\LWR at HTML@emph
+\RenewDocumentCommand{\LWR at HTML@emph}{s m}{\LWR at orig@HTML at emph{#2}}
+
+\LetLtxMacro\LWR at orig@HTML at textit\LWR at HTML@textit
+\RenewDocumentCommand{\LWR at HTML@textit}{s m}{\LWR at orig@HTML at textit{#2}}
+
+\LetLtxMacro\LWR at orig@HTML at textsl\LWR at HTML@textsl
+\RenewDocumentCommand{\LWR at HTML@textsl}{s m}{\LWR at orig@HTML at textsl{#2}}
+
+\ifxetexorluatex
+ \LetLtxMacro\LWR at orig@HTML at textsi\LWR at HTML@textsi
+ \RenewDocumentCommand{\LWR at HTML@textsi}{s m}{%
+ \LWR at orig@HTML at textsi{#2}}
+\fi
+
+\AtBeginDocument{
+ \LWR at formatted{emph}
+ \LWR at formatted{textit}
+ \LWR at formatted{textsl}
+ \ifxetexorluatex
+ \LWR at formatted{textsi}
+ \fi
+}
+
+\newcommand{\LWR at HTML@EmbracOff}{}
+\LWR at formatted{EmbracOff}
+
+\newcommand{\LWR at HTML@EmbracOn}{}
+\LWR at formatted{EmbracOn}
+\endinput
+%%
+%% End of file `lwarp-embrac.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,23 @@
+%%
+%% This is file `lwarp-footnoterange.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `footnoterange')
+%% 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 at ProvidesPackagePass{footnoterange}
+\csletcs{footnoterange}{footnoterange*}
+\csletcs{endfootnoterange}{endfootnoterange*}
+\endinput
+%%
+%% End of file `lwarp-footnoterange.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,26 @@
+%%
+%% This is file `lwarp-gentombow.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `gentombow')
+%% 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 at ProvidesPackageDrop{gentombow}
+\newcommand{\settombowbanner}[1]{}
+\newcommand{\settombowbannerfont}[1]{}
+\newcommand{\settombowwidth}[1]{}
+\newcommand{\settombowbleed}[1]{}
+\newcommand{\settombowcolor}[1]{}
+\endinput
+%%
+%% End of file `lwarp-gentombow.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -17,15 +17,12 @@
%% version 2005/12/01 or later.
-
\LWR at ProvidesPackageDrop{geometry}
-
\renewcommand*{\geometry}[1]{}
\renewcommand*{\newgeometry}[1]{}
\renewcommand*{\restoregeometry}{}
\renewcommand*{\savegeometry}[1]{}
\renewcommand*{\loadgeometry}[1]{}
-
\endinput
%%
%% End of file `lwarp-geometry.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -51,6 +51,7 @@
\newcommand*{\LWR at igxscale}{1}
\newcommand*{\LWR at igyscale}{1}
\newcommand*{\LWR at igclass}{inlineimage}
+\newcommand*{\LWR at igalt}{(image)}
\define at key{igraph}{width}{%
\setlength{\LWR at igwidth}{#1}%
@@ -97,7 +98,7 @@
}
\define at key{igraph}{angle}{\renewcommand*{\LWR at igangle}{#1}}
\define at key{igraph}{class}{\renewcommand*{\LWR at igclass}{#1}}
-
+\define at key{igraph}{alt}{\renewcommand*{\LWR at igalt}{#1}}
\define at key{igraph}{scale}{%
\renewcommand*{\LWR at igxscale}{#1}%
\renewcommand*{\LWR at igyscale}{#1}%
@@ -149,6 +150,7 @@
\AtBeginDocument{
\define at key{Gin}{class}{}
+\define at key{Gin}{alt}{}
}
\AtBeginDocument{
@@ -187,6 +189,7 @@
\renewcommand*{\LWR at igxscale}{1}%
\renewcommand*{\LWR at igyscale}{1}%
\renewcommand*{\LWR at igclass}{inlineimage}%
+\renewcommand*{\LWR at igalt}{(image)}%
\IfValueF{#3}{%
\IfValueTF{#2}%
{\setkeys{igraph}{#2}}%
@@ -306,6 +309,7 @@
" \LWR at orignewline%
}{}%
\LWR at origtilde{} class="\LWR at igclass" \LWR at orignewline%
+\LWR at origtilde{} alt="\LWR at igalt" \LWR at orignewline%
}% end of image tags
}% end of href
\endgroup
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,59 @@
+%%
+%% This is file `lwarp-lltjext.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `lltjext')
+%% 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 at ProvidesPackagePass{lltjext}
+\protected\def\yoko{%
+ \directlua{luatexja.direction.set_list_direction(4, 'yoko')}%
+}
+\protected\def\tate{\yoko}
+\protected\def\dtou{\yoko}
+\protected\def\utod{\yoko}
+
+\define at key[ltj]{japaram}{direction}{}
+
+\yoko
+
+\DeclareExpandableDocumentCommand{\rensuji}{s o m}{#3}
+
+\DeclareDocumentCommand{\layoutfloat}{d() o m}{}
+
+\DeclareDocumentCommand{\DeclareLayoutCaption}{m d<> d() o}{}
+
+\LetLtxMacro\pcaption\caption
+
+\DeclareDocumentCommand{\layoutcaption}{d<> d() o}{}
+
+\let\captiondir\relax
+\RenewDocumentEnvironment{LWR at HTML@minipage}{d<> O{t} O{} O{t} m}
+ {\LWR at HTML@sub at minipage{#2}{#3}{#4}{#5}}
+ {\endLWR at HTML@sub at minipage}
+
+\RenewDocumentCommand{\LWR at HTML@parbox}{d<> O{t} O{} O{t} m +m}
+{
+\LWR at traceinfo{parbox of width #4}%
+\begin{minipage}[#2][#3][#4]{#5}%
+#6
+\end{minipage}%
+}
+
+\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{%
+\booltrue{LWR at minipagefullwidth}%
+\parbox{#2}{#4}%
+}
+\endinput
+%%
+%% End of file `lwarp-lltjext.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -27,9 +27,9 @@
\caption at LT@setup%
\booltrue{LWR at starredlongtable}%
\let\captionlistentry\LWR at LTcaptionlistentry%
-\LWR at tabular{#2}
+\tabular{#2}
}
-{\endLWR at tabular\LWR at floatend}
+{\endtabular\LWR at floatend}
\newenvironment{longtable}[2][]{%
\LWR at floatbegin{table}%
@@ -39,11 +39,10 @@
\caption at LT@setup%
\refstepcounter{\LTcaptype}%
\let\captionlistentry\LWR at LTcaptionlistentry%
-\LWR at tabular{#2}
+\tabular{#2}
}
-{\endLWR at tabular\LWR at floatend}
+{\endtabular\LWR at floatend}
-
\newcounter{LTchunksize}
\def\endhead{\LWR at tabularendofline}% throws away options //[dim] and //*
\def\endfirsthead{\LWR at tabularendofline}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -47,6 +47,9 @@
\newcounter{unbalance}
\newlength{\multicolovershoot}
\newlength{\multicolundershoot}
+\NewDocumentCommand{\docolaction}{s o m m m}{%
+ \IfValueTF{#2}{#2}{#3}%
+}
\end{warpHTML}
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,24 @@
+%%
+%% This is file `lwarp-multicolrule.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `multicolrule')
+%% 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.
+\RequirePackage{multicol}
+
+\LWR at ProvidesPackageDrop{multicolrule}
+\newcommand*{\SetMCRule}[1]{}
+\endinput
+%%
+%% End of file `lwarp-multicolrule.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\LWR at ProvidesPackageDrop{pbox}
-\NewDocumentCommand{\pbox}{O{t} o O{t} m +m}{%
+\NewDocumentCommand{\pbox}{O{t} O{} O{t} m +m}{%
\booltrue{LWR at minipagefullwidth}%
\parbox[#1][#2][#3]{#4}{#5}%
}
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-plarydshln.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `plarydshln')
+%% 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 at ProvidesPackageDrop{plarydshln}
+\LWR at origRequirePackage{lwarp-arydshln}
+\endinput
+%%
+%% End of file `lwarp-plarydshln.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,52 @@
+%%
+%% This is file `lwarp-plext.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `plext')
+%% 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 at loadbefore{plext}
+
+\LWR at ProvidesPackagePass{plext}[2017/07/21]
+\let\tate\relax
+
+\DeclareExpandableDocumentCommand{\rensuji}{s o m}{#3}
+
+\DeclareDocumentCommand{\layoutfloat}{d() o m}{}
+
+\DeclareDocumentCommand{\DeclareLayoutCaption}{m d<> d() o}{}
+
+\LetLtxMacro\pcaption\caption
+
+\DeclareDocumentCommand{\layoutcaption}{d<> d() o}{}
+
+\let\captiondir\relax
+\RenewDocumentEnvironment{LWR at HTML@minipage}{d<> O{t} O{} O{t} m}
+ {\LWR at HTML@sub at minipage{#2}{#3}{#4}{#5}}
+ {\endLWR at HTML@sub at minipage}
+
+\RenewDocumentCommand{\LWR at HTML@parbox}{d<> O{t} O{} O{t} m +m}
+{
+\LWR at traceinfo{parbox of width #4}%
+\begin{minipage}[#2][#3][#4]{#5}%
+#6
+\end{minipage}%
+}
+
+\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{%
+\booltrue{LWR at minipagefullwidth}%
+\parbox{#2}{#4}%
+}
+\endinput
+%%
+%% End of file `lwarp-plext.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-plextarydshln.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `plextarydshln')
+%% 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 at ProvidesPackageDrop{plextarydshln}
+\LWR at origRequirePackage{lwarp-arydshln}
+\endinput
+%%
+%% End of file `lwarp-plextarydshln.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-plextcolorbl.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `plextcolortbl')
+%% 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 at ProvidesPackageDrop{plextcolortbl}
+\LWR at origRequirePackage{lwarp-colortbl}
+\endinput
+%%
+%% End of file `lwarp-plextcolorbl.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-pxatbegshi.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pxatbegshi')
+%% 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 at ProvidesPackageDrop{pxatbegshi}
+\LWR at origRequirePackage{lwarp-atbegshi}
+\endinput
+%%
+%% End of file `lwarp-pxatbegshi.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-pxeveryshi.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pxeveryshi')
+%% 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 at ProvidesPackageDrop{pxeveryshi}
+\LWR at origRequirePackage{lwarp-everyshi}
+\endinput
+%%
+%% End of file `lwarp-pxeveryshi.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-pxftnright.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pxftnright')
+%% 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 at ProvidesPackageDrop{pxftnright}
+\LWR at origRequirePackage{lwarp-ftnright}
+\endinput
+%%
+%% End of file `lwarp-pxftnright.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-pxjahyper.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pxjahyper')
+%% 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 at ProvidesPackageDrop{pxjahyper}
+\endinput
+%%
+%% End of file `lwarp-pxjahyper.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,96 @@
+%%
+%% This is file `lwarp-tascmac.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `tascmac')
+%% 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 at ProvidesPackageDrop{tascmac}
+\newenvironment*{boxnote}
+ {
+ \BlockClass[
+ padding: .5ex ;
+ border: 1px solid black ;
+ border-top: 1px dashed black ;
+ ]{boxnote}
+ }
+ {\endBlockClass}
+
+\newenvironment*{screen}[1][]
+ {
+ \BlockClass[
+ padding: .5ex ;
+ border: 1px solid gray ;
+ border-radius: 8pt
+ ]{boxnote}
+ }
+ {\endBlockClass}
+
+\newenvironment*{itembox}[2][]
+ {
+ \BlockClass[
+ padding: .5ex ;
+ border: 1px solid gray ;
+ border-radius: 8pt
+ ]{boxnote}
+ \InlineClass{itemboxtitle}{#2}\par
+ }
+ {\endBlockClass}
+
+\newenvironment*{shadebox}
+ {
+ \BlockClass[
+ padding: .5ex ;
+ border: 1px solid black ;
+ box-shadow: 3px 3px 3px \#808080 ;
+ ]{boxnote}
+ }
+ {\endBlockClass}
+
+\newcommand*{\mask}[2]{%
+ \InlineClass[background: lightgray]{mask}{#1}%
+}
+
+\newcommand*{\maskbox}[5]{%
+ \InlineClass[background: lightgray]{mask}{#5}%
+}
+
+\newcommand*{\Maskbox}[6]{%
+ \InlineClass[
+ background: lightgray ;
+ border: #5 solid black
+ ]{mask}{#6}%
+}
+
+\newcommand*{\keytop}[2][]{%
+ \InlineClass[%
+ padding: .2ex ;
+ border: 1px solid black ;
+ border-radius: .7ex ;
+ ]{keytop}{#2}%
+}
+
+\def\yen{\HTMLunicode{00A5}}
+
+\def\return{\HTMLunicode{23CE}}
+
+\def\Return{\HTMLunicode{23CE}}
+
+\def\ascii{ASCII Corporation}
+
+\def\Ascii{ASCII Corporation}
+
+\def\ASCII{ASCII Corporation}
+\endinput
+%%
+%% End of file `lwarp-tascmac.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -74,27 +74,27 @@
\DeclareDocumentCommand{\@maketitle}{}{%
\maketitlehooka
{
- \LWR at stoppars\LWR at htmltag{\LWR at tagtitle}
- \@bspretitle \@title \@bsposttitle
- \LWR at htmltag{\LWR at tagtitleend}\LWR at startpars
+ \LWR at stoppars\LWR at htmltag{\LWR at tagtitle}%
+ \@bspretitle \@title \@bsposttitle%
+ \LWR at htmltag{\LWR at tagtitleend}\LWR at startpars%
}
\maketitlehookb
{
\begin{BlockClass}{author}
- \renewcommand{\and}{
- \end{BlockClass}
- \begin{BlockClass}{oneauthor}
+ \renewcommand{\and}{%
+ \end{BlockClass}%
+ \begin{BlockClass}{oneauthor}%
}
- \begin{BlockClass}{oneauthor}
- \@bspreauthor \@author \@bspostauthor
- \end{BlockClass}
- \end{BlockClass}
+ \begin{BlockClass}{oneauthor}%
+ \@bspreauthor \@author \@bspostauthor%
+ \end{BlockClass}%
+ \end{BlockClass}%
}
\maketitlehookc
{
- \begin{BlockClass}{titledate}
- \@bspredate \@date \@bspostdate
- \end{BlockClass}
+ \begin{BlockClass}{titledate}%
+ \@bspredate \@date \@bspostdate%
+ \end{BlockClass}%
}
\maketitlehookd
}
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -0,0 +1,25 @@
+%%
+%% This is file `lwarp-versonotes.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `versonotes')
+%% 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 at ProvidesPackageDrop{versonotes}
+\newcommand{\versonote}[1]{\marginpar{#1}}
+\newdimen\versotextwidth
+\newdimen\versoleftmargin
+\newcommand*{\versolayout}{}
+\endinput
+%%
+%% End of file `lwarp-versonotes.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2018-12-22 21:53:22 UTC (rev 49478)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2018-12-22 21:54:16 UTC (rev 49479)
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2018/12/08 v0.64 Allows LaTeX to directly produce HTML5 output.]
+ [2018/12/22 v0.65 Allows LaTeX to directly produce HTML5 output.]
@@ -50,11 +50,11 @@
\newcommand*{\LWR at loadafter}[1]{%
\@ifpackageloaded{#1}
{
-\PackageError{lwarp}
-{Package #1, or one which uses #1, must be loaded after lwarp}
-{Move \detokenize{\usepackage}{#1} after \detokenize{\usepackage}{lwarp}.
-Package #1 may also be loaded by something else, which must also be moved
-after lwarp.}
+ \PackageError{lwarp}
+ {Package #1, or one which uses #1, must be loaded after lwarp}
+ {Move \detokenize{\usepackage}{#1} after \detokenize{\usepackage}{lwarp}.
+ Package #1 may also be loaded by something else, which must also be moved
+ after lwarp.}
}
{}
}
@@ -63,21 +63,20 @@
{\newcommand*{\LWR at notmemoirloadafter}[1]{}}
{\LetLtxMacro\LWR at notmemoirloadafter\LWR at loadafter}
-\LetLtxMacro\LWR at notbxjsloadafter\LWR at loadafter
+\LetLtxMacro\LWR at notltjloadafter\LWR at loadafter
-\@ifclassloaded{bxjsarticle}{\renewcommand*{\LWR at notbxjsloadafter}[1]{}}{}
-\@ifclassloaded{bxjsbook}{\renewcommand*{\LWR at notbxjsloadafter}[1]{}}{}
-\@ifclassloaded{bxjsreport}{\renewcommand*{\LWR at notbxjsloadafter}[1]{}}{}
-\@ifclassloaded{bxjsslide}{\renewcommand*{\LWR at notbxjsloadafter}[1]{}}{}
+\@ifclassloaded{ltjarticle}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjbook}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjreport}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjspf}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjskiyou}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjtarticle}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjtbook}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjtreport}{\renewcommand*{\LWR at notltjloadafter}[1]{}}{}
-\LetLtxMacro\LWR at notltjsloadafter\LWR at loadafter
-
-\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR at notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR at notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR at notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjspf}{\renewcommand*{\LWR at notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjsiyou}{\renewcommand*{\LWR at notltjsloadafter}[1]{}}{}
-
\newcommand*{\LWR at loadbefore}[1]{%
\@ifpackageloaded{#1}
{}
@@ -129,6 +128,12 @@
For a possible alternative, see class(es) #2.}
}{}%
}
+\LWR at earlyclassloadnever{jarticle}{ujarticle}
+\LWR at earlyclassloadnever{jbook}{ujbook}
+\LWR at earlyclassloadnever{jreport}{ujreport}
+\LWR at earlyclassloadnever{tarticle}{utarticle}
+\LWR at earlyclassloadnever{tbook}{utbook}
+\LWR at earlyclassloadnever{treport}{utreport}
\LWR at earlyloadnever{ae}{cm-super, lmodern}
\LWR at earlyloadnever{aecompl}{cm-super, lmodern}
\LWR at earlyloadnever{aecc}{cm-super, lmodern}
@@ -138,7 +143,7 @@
\LWR at earlyloadnever{CJK}{ctex, xeCJK}
\LWR at earlyloadnever{CJKutf8}{ctex, xeCJK}
}
-\LWR at earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle, utarticle}
+\LWR at earlyloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
\LWR at earlyloadnever{hangul}{kotex, xetexko, luatexko}
\LWR at earlyloadnever{fancyheadings}{fancyhdr}
\LWR at earlyloadnever{glossary}{glossaries}
@@ -185,6 +190,7 @@
\LWR at loadafter{bookmark}
\LWR at notmemoirloadafter{booktabs}
\LWR at loadafter{bophook}
+\LWR at loadafter{bounddvi}
\LWR at loadafter{boxedminipage}
\LWR at loadafter{boxedminipage2e}
\LWR at loadafter{breakurl}
@@ -228,6 +234,7 @@
\LWR at loadafter{easy-todo}
\LWR at loadafter{ebook}
\LWR at loadafter{ellipsis}
+\LWR at loadafter{embrac}
\LWR at loadafter{emptypage}
\LWR at loadafter{endfloat}
\LWR at loadafter{endheads}
@@ -269,6 +276,7 @@
\LWR at loadafter{footmisc}
\LWR at loadafter{footnote}
\LWR at loadafter{footnotehyper}
+\LWR at loadafter{footnoterange}
\LWR at loadafter{footnpag}
\LWR at loadafter{forest}
\LWR at loadafter{framed}
@@ -277,7 +285,7 @@
\LWR at loadafter{fullpage}
\LWR at loadafter{fullwidth}
\LWR at loadafter{fwlw}
-\LWR at notbxjsloadafter{geometry}
+\LWR at loadafter{gentombow}
\LWR at loadafter{gmeometric}
\LWR at loadafter{glossaries}
\LWR at loadafter{glossary}
@@ -334,6 +342,7 @@
\LWR at loadafter{morefloats}
\LWR at notmemoirloadafter{moreverb}
\LWR at notmemoirloadafter{mparhack}
+\LWR at loadafter{multicolrule}
\LWR at loadafter{multirow}
\LWR at loadafter{multitoc}
\LWR at loadafter{musicography}
@@ -371,6 +380,12 @@
\LWR at loadafter{pfnote}
\LWR at loadafter{phfqit}
\LWR at loadafter{placeins}
+\LWR at loadafter{plarray}
+\LWR at loadafter{plarydshln}
+\LWR at loadafter{plextarray}
+\LWR at loadafter{plextarydshln}
+\LWR at loadafter{plcolortbl}
+\LWR at loadafter{plextdelarray}
\LWR at loadafter{prelim2e}
\LWR at loadafter{prettyref}
\LWR at loadafter{preview}
@@ -379,6 +394,9 @@
\LWR at loadafter{pst-eps}
\LWR at loadafter{pstool}
\LWR at loadafter{pstricks}
+\LWR at loadafter{pxeveryshi}
+\LWR at loadafter{pxftnright}
+\LWR at loadafter{pxjahyper}
\LWR at loadafter{quotchap}
\LWR at loadafter{quoting}
\LWR at loadafter{ragged2e}
@@ -421,7 +439,7 @@
\LWR at loadafter{srcltx}
\LWR at loadafter{srctex}
\LWR at loadafter{stabular}
-\LWR at notltjsloadafter{stfloats}
+\LWR at notltjloadafter{stfloats}
\LWR at loadafter{subfig}
\LWR at loadafter{subfigure}
\LWR at loadafter{supertabular}
@@ -429,6 +447,7 @@
\LWR at loadafter{tabls}
\LWR at notmemoirloadafter{tabularx}
\LWR at loadafter{tabulary}
+\LWR at loadafter{tascmac}
\LWR at loadafter{textarea}
\LWR at loadafter{textfit}
\LWR at loadafter{textpos}
@@ -463,6 +482,7 @@
\LWR at loadafter{uspace}
\LWR at loadafter{varioref}% no lwarp package provided
\LWR at notmemoirloadafter{verse}
+\LWR at loadafter{versonotes}
\LWR at loadafter{vertbars}
\LWR at loadafter{vmargin}
\LWR at loadafter{vowel}
@@ -800,9 +820,12 @@
left=2in,right=6in,%
top=1in,bottom=1in,%
}
+\setlength{\textheight}{0.8\paperheight}
+\setlength{\textwidth}{0.7\paperwidth}
\@twosidefalse
\@mparswitchfalse
+
\end{warpHTML}
\begin{warpall}
@@ -923,6 +946,7 @@
\LWR at checkloadbefore{#1}{morewrites}
\LWR at checkloadbefore{#1}{newclude}
\LWR at checkloadbefore{#1}{newunicodechar}
+\LWR at checkloadbefore{#1}{plext}
\LWR at checkloadbefore{#1}{xeCJK}
\LWR at checkloadbefore{#1}{xetexko}
\LWR at checkloadbefore{#1}{zxjatype}
@@ -1311,6 +1335,11 @@
\LetLtxMacro\LWR at origupshape\upshape
\LetLtxMacro\LWR at origslshape\slshape
\LetLtxMacro\LWR at origscshape\scshape
+\@ifundefined{sishape}{
+ \LetLtxMacro\LWR at origsishape\scshape
+}{
+ \LetLtxMacro\LWR at origsishape\sishape
+}
\LetLtxMacro\LWR at origitshape\itshape
\LetLtxMacro\LWR at origem\em
\LetLtxMacro\LWR at orignormalfont\normalfont
@@ -1710,6 +1739,12 @@
font-variant-numeric: oldstyle-nums ;
}
+span.textsi, div.textsi {
+ font-style: italic ;
+ font-variant: small-caps;
+ font-variant-numeric: oldstyle-nums ;
+}
+
span.textsl, div.textsl { font-style: oblique; }
span.textup, div.textup {
@@ -1797,24 +1832,30 @@
}
blockquote {
- margin-left: 0px ;
- margin-right: 0px ;
+ display: block ;
+ margin-left: 2em ;
+ margin-right: 2em ;
}
+blockquotation {
+ display: block ;
+ margin-left: 2em ;
+ margin-right: 2em ;
+}
+
/* quotchap is for the quotchap package */
div.quotchap {
- font-style: oblique ;
- overflow-x: auto ;
- margin-left: 2em ;
- margin-right: 2em ;
+ display: block ;
+ font-style: oblique ;
+ overflow-x: auto ;
+ margin-left: 2em ;
+ margin-right: 2em ;
}
-blockquote p, div.quotchap p {
- line-height: 1.5;
+blockquote p, blockquotation p, div.quotchap p {
+ line-height: 1.5;
text-align: left ;
font-size: .85em ;
- margin-left: 3em ;
- margin-right: 3em ;
}
/* qauthor is for the quotchap package */
@@ -1831,19 +1872,6 @@
text-align: right ;
}
-blockquotation {
- margin-left: 0px ;
- margin-right: 0px ;
-}
-
-blockquotation p {
- line-height: 1.5;
- text-align: left ;
- font-size: .85em ;
- margin-left: 3em ;
- margin-right: 3em ;
-}
-
div.epigraph, div.dictum {
line-height: 1.2;
text-align: left ;
@@ -1967,7 +1995,6 @@
text-align: left ;
}
-/* Title of the file */
h1 {
margin: 0ex 0em 0ex 0em ;
line-height: 1.3;
@@ -1974,7 +2001,6 @@
text-align: center ;
}
-/* Part */
h2 {
margin: 1ex 0em 1ex 0em ;
line-height: 1.3;
@@ -1981,25 +2007,21 @@
text-align: center ;
}
-/* Chapter */
h3 {
margin: 3ex 0em 1ex 0em ;
line-height: 1.3;
}
-/* Section */
h4 {
margin: 3ex 0em 1ex 0em ;
line-height: 1.3;
}
-/* Sub-Section */
h5 {
margin: 3ex 0em 1ex 0em ;
line-height: 1.3;
}
-/* Sub-Sub-Section */
h6 {
margin: 3ex 0em 1ex 0em ;
line-height: 1.3;
@@ -2017,15 +2039,16 @@
}
.marginpar, .marginparblock {
- max-width:50%;
- float:right;
- text-align:left;
+ max-width: 50%;
+ float: right ;
+ clear: both ;
+ text-align: left ;
margin: 1ex 0.5em 1ex 1em ;
padding: 1ex 0.5em 1ex 0.5em ;
font-size: 85% ;
border-top: 1px solid silver ;
border-bottom: 1px solid silver ;
- overflow-x: auto;
+ overflow-x: auto ;
}
.marginpar br { margin-bottom: 2ex ; }
@@ -2053,6 +2076,16 @@
div.marginparblock br
{ margin-bottom: 2ex ; }
+div.bodycontainer {
+ float: left ;
+ width: 80% ;
+}
+
+div.bodywithoutsidetoc div.bodycontainer {
+ float: none ;
+ width: 100% ;
+}
+
section.textbody div.footnotes{
margin: 3ex 2em 0ex 2em ;
border-bottom: 2px solid silver ;
@@ -2456,7 +2489,7 @@
display: inline-block ; margin: 3ex 1em 3ex 1em ;
}
-figcaption .minipage { margin:0 ; padding: 0 }
+div.figurecaption .minipage { margin:0 ; padding: 0 }
div.minipage figure { border: none ; box-shadow: none ; }
div.minipage figure.table { margin: 0ex }
@@ -2469,7 +2502,7 @@
div.floatfoot { font-size: .85em ;
border-top: 1px solid silver ; line-height: 1.2 ; }
-figcaption , .lstlistingtitle {
+div.figurecaption , .lstlistingtitle {
font-size: .85em ;
text-align: center ;
font-weight: bold ;
@@ -2477,7 +2510,7 @@
margin-bottom: 1ex ;
}
-figure.subfigure figcaption, figure.subtable figcaption {
+figure.subfigure div.figurecaption, figure.subtable div.figurecaption {
border-bottom: none ; background: none ;
}
@@ -2489,7 +2522,7 @@
}
/* For a \RawCaption inside a minipage inside a figure's floatrow: */
-figure div.floatrow div.minipage figcaption {
+figure div.floatrow div.minipage div.figurecaption {
border: none ;
background: none ;
}
@@ -2510,7 +2543,7 @@
box-shadow: none ;
}
-figure.ruled figcaption, figure.boxruled figcaption {
+figure.ruled div.figurecaption, figure.boxruled div.figurecaption {
border-top: 1px solid silver ;
border-bottom: 1px solid silver ;
}
@@ -2704,7 +2737,7 @@
margin: 0 ;
border-bottom: 1px solid silver ;
border-top: 1px solid silver ;
- clear:right ;
+ clear:both ;
}
nav.botnavigation{
@@ -2714,27 +2747,25 @@
margin: 0 ;
border-top: 1px solid silver ;
border-bottom: 1px solid silver ;
- clear:right ;
+ clear:both ;
}
-header{
+header {
line-height: 1.2 ;
font-size: 1em ;
-/* border-bottom: 2px solid silver ; */
+ border-bottom: 1px solid silver ;
margin: 0px ;
- padding: 0ex 1em 0ex 1em ;
- text-align:center ;
+ padding: 2ex 1em 2ex 1em ;
+ text-align:left ;
}
-header p {margin:0ex;padding:4ex 0em 2ex 0em ;text-align:center;}
-
-footer{
+footer {
font-size: .85em ;
line-height: 1.2 ;
margin-top: 1ex ;
- border-top: 2px solid silver ;
+ border-top: 1px solid silver ;
padding: 2ex 1em 2ex 1em ;
- clear:right ;
+ clear:both ;
text-align:left ;
}
@@ -2753,24 +2784,23 @@
border: none ;
}
-nav.sidetoc {
+/* The -1px right margin compensates for the 1px right border. */
+/* Without this -1px margin, the body container appears below instead */
+/* of floating to the side. */
+div.sidetoccontainer {
font-family: "DejaVu Serif", "Bitstream Vera Serif",
"Lucida Bright", Georgia, serif;
- float:right ;
+ float: left ;
width: 20%;
- border-left: 1px solid silver;
- border-top: 1px solid silver;
+ margin: 0pt -1px 3ex 0pt ;
+ border-right: 1px solid silver;
border-bottom: 1px solid silver;
-/* border-top: 2px solid #808080 ; */
background: #FAF7F4 ;
- padding: 2ex 0em 2ex 1em ;
- margin: 0ex 0em 2ex 1em ;
font-size:.9em ;
- border-radius: 20px 0px 0px 20px ;
- }
+ border-radius: 0px 0px 20px 0px ;
+}
div.sidetoccontents {
-/* border-top: 1px solid silver ; */
overflow-y: auto ;
width: 100% ;
text-align: left ;
@@ -2985,12 +3015,13 @@
nav.topnavigation { display:none; }
nav.botnavigation { display:none; }
- at media screen and (max-width: 45em) {
-/* nav.sidetoc {display:none;} */
- nav.sidetoc {
+/* Only display the sidetoc's webpage title if a small screen */
+span.sidetocthetitle { display: none }
+
+ at media screen and (max-width: 50em) {
+ div.sidetoccontainer {
float: none ;
width: 100% ;
- margin: 5ex 0px 5ex 0px ;
padding: 0 ;
border-radius: 0 ;
border-bottom: 1px solid black ;
@@ -2997,8 +3028,9 @@
border-top: 1px solid black ;
box-shadow: none ;
}
-/* nav.topnavigation { display:block } */
+ span.sidetocthetitle { display: inline }
nav.botnavigation { display:block }
+ div.bodycontainer { width: 100% }
.marginpar {
max-width: 100%;
float: none;
@@ -3014,21 +3046,24 @@
"Liberation Serif", "Nimbus Roman No 9 L",
"FreeSerif", "Hoefler Text", Times, "Times New Roman", serif;
}
- nav.sidetoc { display:none; }
+ div.sidetoccontainer { display:none; }
nav.topnavigation { display: none; }
nav.botnavigation { display: none; }
+ div.bodycontainer { width: 100% }
}
@media handheld {
- nav.sidetoc { display:none; }
+ div.sidetoccontainer { display:none; }
nav.topnavigation { display:block }
nav.botnavigation { display:block }
+ div.bodycontainer { width: 100% }
}
@media projection {
- nav.sidetoc { display:none; }
+ div.sidetoccontainer { display:none; }
nav.topnavigation { display:block }
nav.botnavigation { display:block }
+ div.bodycontainer { width: 100% }
}
\end{filecontents*}
\end{LWRwriteconf}
@@ -3065,12 +3100,12 @@
h1 {
border-bottom: 1px solid #304070;
- border-top: 2px solid #304070;
+/* border-top: 2px solid #304070; */
}
h2 {
border-bottom: 1px solid #304070;
- border-top: 2px solid #304070;
+/* border-top: 2px solid #304070; */
background-color: #F7F7F0 ;
background-image: linear-gradient(to bottom, #F7F7F0, #DAD0C0);
}
@@ -3186,7 +3221,7 @@
margin: 0ex ;
}
-figure.figure .minipage, figcaption .minipage { border: none; }
+figure.figure .minipage, div.figurecaption .minipage { border: none; }
div.marginblock div.minipage ,
div.marginparblock div.minipage
@@ -3206,7 +3241,7 @@
}
/*
-figcaption {
+div.figurecaption {
border-top: 1px solid silver ;
border-bottom: 1px solid silver ;
background-color: #e8e8e8 ;
@@ -3244,11 +3279,10 @@
background-image: linear-gradient(to bottom, #F7F7F0, #b0b8b0);
}
-nav.sidetoc {
+div.sidetoccontainer {
background-color: #F7F7F0 ;
background-image: linear-gradient(to bottom, #F7F7F0, #C0C0C0);
box-shadow: 3px 3px 3px #808080 ;
- border-radius: 0px 0px 0px 20px ;
}
div.sidetoctitle {color: #304070 ; }
@@ -3260,7 +3294,7 @@
}
@media screen and (max-width: 45em) {
- nav.sidetoc { border-radius: 0 ; }
+ div.sidetoccontainer { border-radius: 0 ; }
}
\end{filecontents*}
@@ -3310,7 +3344,7 @@
background-color: #fffcf5 ;
background-image: none ;
border-bottom: 1px solid #808080;
- border-top: 2px solid #808080;
+/* border-top: 2px solid #808080; */
}
div.abstracttitle {
@@ -3394,7 +3428,7 @@
/* border-bottom: 1px solid silver; */
}
-figcaption , .lstlisting {
+div.figurecaption , .lstlisting {
border: none ;
/* border-top: 1px solid silver ; */
/* border-bottom: 1px solid silver ; */
@@ -3425,13 +3459,12 @@
"Times New Roman", serif;
}
-nav.sidetoc {
+div.sidetoccontainer {
font-family: "Linux Libertine O", "Hoefler Text", "Garamond",
"Bembo", "Janson", "TeX Gyre Pagella", "Palatino",
"Liberation Serif", "Nimbus Roman No 9 L", "FreeSerif", Times,
"Times New Roman", serif;
background-image: linear-gradient(to bottom, #fffcf5, #C0C0C0);
- border-radius: 0px 0px 0px 20px ;
}
div.sidetoctitle{
@@ -3448,7 +3481,6 @@
background-color: #e0e0e0 ;
background-image: linear-gradient(to bottom, #fffcf5, #b0b0b0);
padding: 2ex 1em 2ex 1em ;
- clear:right ;
text-align:left ;
}
@@ -3647,7 +3679,7 @@
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.64"
+printversion = "v0.65"
requiredconfversion = "1" -- also at *lwarpmk.conf
function printhelp ()
@@ -5155,7 +5187,7 @@
{%
\addtocounter{LWR at thisautoidWP}{1}%
\LWR at htmltag{%
- div class=\textquotedbl#3\textquotedbl % space
+ div class=\textquotedbl#3\textquotedbl\ % space
id=\textquotedbl%
\LWR at print@mbox{autoidWP-\arabic{LWR at thisautoidWP}}%
\textquotedbl%
@@ -5639,7 +5671,7 @@
\StrSubstitute{\LWR at thisnewfilename}{—}{-}[\LWR at thisnewfilename]
\StrSubstitute{\LWR at thisnewfilename}{–}{-}[\LWR at thisnewfilename]
\fi%
-\global\let\LWR at thisfilename\LWR at thisnewfilename% return a global result
+\global\let\LWR at thisfilename\LWR at thisnewfilename%
\endgroup%
\LWR at traceinfo{LWR at filenamenoblanks: result is \LWR at thisfilename}%
}
@@ -5704,6 +5736,8 @@
\LWR at htmlelementclassend{section}{textbody}
+\LWR at htmlelementclassend{div}{bodycontainer}
+\LWR at htmlelementclassend{div}{bodyandsidetoc}
\LWR at printpendingfootnotes
@@ -5727,11 +5761,28 @@
\LWR at orignewpage
\addtocounter{LWR at htmlfilenumber}{1}%
-
\ifbool{FileSectionNames}%
-{\LWR at filenamenoblanks{#1}}
+{%
+ \LWR at filenamenoblanks{#1}%
+ \edef\LWR at hashedname{\LWR at mdfive{\LWR at thisfilename}}%
+ \ifcsundef{LWR at filename\LWR at hashedname}{%
+ \csdef{LWR at filename\LWR at hashedname}{}%
+ }{%
+ \PackageError{lwarp}
+ {
+ Section name ``#1'', at the line number listed below,
+ generates the filename ``\LWR at thisfilename'',
+ which appears to be a duplicate%
+ }
+ {
+ Look for another section of the same type with a similar
+ or identical name.
+ (Lwarp sanitizes most symbols and common short words
+ when generating file names, and this may cause a conflict.)
+ }
+ }
+}
{\renewcommand*{\LWR at thisfilename}{\arabic{LWR at htmlfilenumber}}}
-
\LWR at traceinfo{LWR at newhtmlfile: about to print start file}%
\begingroup%
\LWR at nullfonts%
@@ -5740,7 +5791,6 @@
\LWR at htmlsectionfilename{\LWR at thisfilename}|%
}
\endgroup%
-
\LWR at stoppars
\LWR at filestart[#1]
@@ -5761,16 +5811,21 @@
\LWR at htmlelementend{header}
}
+\LWR at htmlelementclass{div}{bodyandsidetoc}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
{}
-{\ifcsvoid{thetitle}{}{\LWR at printthetitle}}
-
-\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
-{}
{\LWR at sidetoc}
+\LWR at htmlelementclass{div}{bodycontainer}
\LWR at htmlelementclass{section}{textbody}
+\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}%
+ {}%
+ {%
+ \ifcsvoid{thetitle}{}{%
+ \LWR at printthetitle%
+ }%
+ }%
\LWR at stoppars
\LWR at customizeMathJax
@@ -5869,17 +5924,17 @@
{% new file
\LWR at traceinfo{LWR at section: new HTML file}%
\IfNoValueTF{#2}%
- {\LWR at newhtmlfile{#3}}%
- {\LWR at newhtmlfile{#2}}%
+ {\LWR at newhtmlfile{#3}}%
+ {\LWR at newhtmlfile{#2}}%
}% new file
{% not new file
\LWR at traceinfo{LWR at section: not a new HTML file, about to LWR at orignewpage}%
\LWR at orignewpage%
+}% not new file
-}% not new file
\IfValueT{#3}{%
-\LWR at traceinfo{LWR at section: about to LWR at setlatestname}%
-\IfValueTF{#2}{\LWR at setlatestname{#2}}{\LWR at setlatestname{#3}}%
+ \LWR at traceinfo{LWR at section: about to LWR at setlatestname}%
+ \IfValueTF{#2}{\LWR at setlatestname{#2}}{\LWR at setlatestname{#3}}%
}%
\ifbool{HTMLDebugComments}{%
@@ -6144,13 +6199,13 @@
\newcommand*{\HTMLTitleBeforeSection}{%
\def\theHTMLTitleSection{%
\theHTMLTitle\theHTMLTitleSeparator\theHTMLSection%
- }
+ }%
}
\newcommand*{\HTMLTitleAfterSection}{%
\def\theHTMLTitleSection{%
\theHTMLSection\theHTMLTitleSeparator\theHTMLTitle%
- }
+ }%
}
\HTMLTitleBeforeSection
@@ -6270,10 +6325,6 @@
\setlength{\belowcaptionskip}{0ex}
\setlength{\abovecaptionskip}{0ex}
\renewcommand{\ps at plain}{}
-\LetLtxMacro\LWR at origtabular\tabular
-\LetLtxMacro\LWR at origendtabular\endtabular
-\LetLtxMacro\tabular\LWR at tabular
-\LetLtxMacro\endtabular\endLWR at tabular
\let\LWR at origcaption\caption
\let\LWR at origltx@label\ltx at label
\let\ltx at label\LWR at htmlmathlabel
@@ -6296,8 +6347,10 @@
\LWR at firstpagetop
\LWR at stoppars
\LWR at htmltag{/header}\LWR at orignewline
+\LWR at htmlelementclass{div}{bodywithoutsidetoc}
+\LWR at htmlelementclass{div}{bodycontainer}
\LWR at traceinfo{LWR at lwarpStart: Generating textbody.}
-\LWR at htmltag{section class=\textquotedbl{}textbody\textquotedbl}
+\LWR at htmlelementclass{section}{textbody}
\LWR at patchlists
\catcode`\$=\active
\immediate\write\@mainaux{\catcode`\string$\active}%
@@ -6328,6 +6381,8 @@
\LWR at closeprevious{\LWR at depthfinished}
\LWR at htmlelementclassend{section}{textbody}
+\LWR at htmlelementclassend{div}{bodycontainer}
+\LWR at htmlelementclassend{div}{bodyandsidetoc}
\LWR at printpendingfootnotes
\LWR at htmlelement{footer}
@@ -6390,20 +6445,20 @@
\begin{warpHTML}
\newcommand*{\printtitle}
-{
-\LWR at stoppars
-\LWR at htmltag{\LWR at tagtitle}%
-\@title%
-\LWR at htmltag{\LWR at tagtitleend}
-\LWR at startpars
+{%
+ \LWR at stoppars%
+ \LWR at htmltag{\LWR at tagtitle}%
+ \@title%
+ \LWR at htmltag{\LWR at tagtitleend}%
+ \LWR at startpars%
}
\newcommand*{\LWR at printthetitle}
-{
-\LWR at stoppars
-\LWR at htmltag{\LWR at tagtitle}%
-\thetitle%
-\LWR at htmltag{\LWR at tagtitleend}
-\LWR at startpars
+{%
+ \LWR at stoppars%
+ \LWR at htmltag{\LWR at tagtitle}%
+ \thetitle%
+ \LWR at htmltag{\LWR at tagtitleend}%
+ \LWR at startpars%
}
\newcommand*{\printauthor}{
@@ -6486,24 +6541,24 @@
\global\let\and\relax
}
\DeclareDocumentCommand{\@maketitle}{}{%
- \LWR at stoppars\LWR at htmltag{\LWR at tagtitle}
- \@title
- \LWR at htmltag{\LWR at tagtitleend}\LWR at startpars
- \begin{BlockClass}{author}
- \renewcommand*{\cr}{}
- \renewcommand*{\crcr}{}
- \renewcommand*{\noalign}{}
- \renewcommand{\and}{
- \end{BlockClass}
- \begin{BlockClass}{oneauthor}
- }
- \begin{BlockClass}{oneauthor}
- \@author
- \end{BlockClass}
- \end{BlockClass}
- \begin{BlockClass}{titledate}
- \@date
- \end{BlockClass}
+ \LWR at stoppars\LWR at htmltag{\LWR at tagtitle}%
+ \@title%
+ \LWR at htmltag{\LWR at tagtitleend}\LWR at startpars%
+ \begin{BlockClass}{author}%
+ \renewcommand*{\cr}{}%
+ \renewcommand*{\crcr}{}%
+ \renewcommand*{\noalign}{}%
+ \renewcommand{\and}{%
+ \end{BlockClass}%
+ \begin{BlockClass}{oneauthor}%
+ }%
+ \begin{BlockClass}{oneauthor}%
+ \@author%
+ \end{BlockClass}%
+ \end{BlockClass}%
+ \begin{BlockClass}{titledate}%
+ \@date%
+ \end{BlockClass}%
}
\newcommand*{\LWR at titlingmaketitle}{%
@@ -7792,22 +7847,22 @@
\ifdefstring{\LWR at tempone}{tvertbarl}{%
\LWR at tdaddstyle%
border-left: 1px solid % space
- \LWR at origpound\LWR at vertruleHTMLcolor%
+ \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarldouble}{%
\LWR at tdaddstyle%
border-left: 4px double % space
- \LWR at origpound\LWR at vertruleHTMLcolor%
+ \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarldash}{%
\LWR at tdaddstyle%
border-left: 1px dashed % space
- \LWR at origpound\LWR at vertruleHTMLcolor%
+ \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarldoubledash}{%
\LWR at tdaddstyle%
border-left: 2px dashed % space
- \LWR at origpound\LWR at vertruleHTMLcolor%
+ \LWR at vertruleHTMLcolor%
}{}%
}{}%
\edef\LWR at tempone{%
@@ -7815,19 +7870,19 @@
}%
\ifdefstring{\LWR at tempone}{tvertbarr}{%
\LWR at tdaddstyle%
- border-right: 1px solid \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 1px solid \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarrdouble}{%
\LWR at tdaddstyle%
- border-right: 4px double \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 4px double \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarrdash}{%
\LWR at tdaddstyle%
- border-right: 1px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 1px dashed \LWR at vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR at tempone}{tvertbarrdoubledash}{%
\LWR at tdaddstyle%
- border-right: 2px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 2px dashed \LWR at vertruleHTMLcolor%
}{}%
}%
}
@@ -7988,35 +8043,35 @@
\ifbool{LWR at tabularmutemods}{}{%
\ifnumcomp{\value{LWR at mcolvertbarsl}}{=}{1}{%
\LWR at tdaddstyle%
- border-left: 1px solid \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-left: 1px solid \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsl}}{>}{1}{%
\LWR at tdaddstyle%
- border-left: 4px double \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-left: 4px double \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsldash}}{=}{1}{%
\LWR at tdaddstyle%
- border-left: 1px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-left: 1px dashed \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsldash}}{>}{1}{%
\LWR at tdaddstyle%
- border-left: 2px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-left: 2px dashed \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsr}}{=}{1}{%
\LWR at tdaddstyle%
- border-right: 1px solid \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 1px solid \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsr}}{>}{1}{%
\LWR at tdaddstyle%
- border-right: 4px double \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 4px double \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsrdash}}{=}{1}{%
\LWR at tdaddstyle%
- border-right: 1px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 1px dashed \LWR at vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR at mcolvertbarsrdash}}{>}{1}{%
\LWR at tdaddstyle%
- border-right: 2px dashed \LWR at origpound\LWR at vertruleHTMLcolor%
+ border-right: 2px dashed \LWR at vertruleHTMLcolor%
}{}%
}%
}
@@ -8422,9 +8477,9 @@
\StartDefiningTabulars
-\newenvironment*{LWR at tabular}[2][]
+\NewDocumentCommand{\LWR at HTML@@tabular}{d<> o m}
{%
-\LWR at traceinfo{LWR at tabular started}%
+\LWR at traceinfo{LWR at HTML@@tabular started}%
\addtocounter{LWR at tabulardepth}{1}%
\global\boolfalse{LWR at startedrow}%
\setcounter{LWR at hlines}{0}%
@@ -8435,10 +8490,10 @@
\global\boolfalse{LWR at exitingtabular}%
\global\boolfalse{LWR at tabularmutemods}%
\global\booltrue{LWR at intabularmetadata}%
-\LWR at traceinfo{LWR at tabular: About to LWR at forecenewpage.}%
+\LWR at traceinfo{LWR@@tabular: About to LWR at forecenewpage.}%
\LWR at forcenewpage
\LWR at htmlblocktag{table}%
-\LWR at parsetablecols{#2}%
+\LWR at parsetablecols{#3}%
\LWR at stoppars%
\setcounter{LWR at tableLaTeXcolindex}{1}%
\global\boolfalse{LWR at tabularcelladded}%
@@ -8450,9 +8505,11 @@
\gdef\LWR at rowHTMLcolor{}%
\gdef\LWR at cellHTMLcolor{}%
\@rowcolors%
-\edef\LWR at vertruleHTMLcolor{\LWR at ruleHTMLcolor}%
+\ifdefvoid{\LWR at ruleHTMLcolor}%
+ {\edef\LWR at vertruleHTMLcolor{black}}%
+ {\edef\LWR at vertruleHTMLcolor{\LWR at origpound\LWR at ruleHTMLcolor}}%
\setcounter{LWR at cellcolordepth}{0}%
-\LWR at traceinfo{LWR at tabular: redefining macros}%
+\LWR at traceinfo{LWR@@HTML at tabular: redefining macros}%
\LetLtxMacro\noalign\LWR at tabularnoalign%
\LetLtxMacro\hline\LWR at HTMLhline%
\LetLtxMacro\cline\LWR at HTMLcline%
@@ -8496,11 +8553,12 @@
\StartDefiningTabulars%
\protected\gdef&{\LWR at tabularampersand}%
\addtocounter{LWR at tabularpardepth}{1}%
-\LWR at traceinfo{LWR at tabular: about to LWR at getmynexttoken}%
+\LWR at traceinfo{LWR@@HTML at tabular: about to LWR at getmynexttoken}%
\LWR at getmynexttoken%
}%
+\newcommand*{\LWR at HTML@endtabular}
{%
-\LWR at traceinfo{LWR at tabular ending}%
+\LWR at traceinfo{LWR at HTML@endtabular}%
\addtocounter{LWR at tabularpardepth}{-1}%
\ifboolexpr{%
test {%
@@ -8527,10 +8585,19 @@
\addtocounter{LWR at tabulardepth}{-1}%
\protected\gdef&{\LWR at origampmacro}%
\StopDefiningTabulars%
-\LWR at traceinfo{LWR at tabular finished ending}%
+\LWR at traceinfo{LWR at HTML@endtabular finished}%
}
+\csletcs{LWR at HTML@endtabular*}{LWR at HTML@endtabular}
+
\StopDefiningTabulars
+\AtBeginDocument{
+ \LetLtxMacro\LWR at origendtabular\endtabular
+ \csletcs{LWR at origendtabular*}{endtabular*}
+ \LWR at formatted{@tabular}
+ \LWR at formatted{endtabular}
+ \LWR at formatted{endtabular*}
+}
\end{warpHTML}
@@ -8911,21 +8978,14 @@
\setcounter{LWR at latestautopage}{1}
\newenvironment*{LWR at figcaption}
-{%
- \LWR at traceinfo{LWR at figcaption env start}%
- \LWR at htmlblocktag{figcaption}%
- \ifbool{FormatWP}{%
- \begin{BlockClass}[font-style:italic]{italic}
- \LWR at print@vspace*{\baselineskip}
- }{}%
- \LWR at traceinfo{LWR at figcaption env start: done}%
-}
-{%
- \LWR at traceinfo{LWR at figcaption env end}%
- \ifbool{FormatWP}{\end{BlockClass}}{}%
- \LWR at htmlblocktag{/figcaption}%
- \LWR at traceinfo{LWR at figcaption env end: done}%
-}
+ {
+ \ifbool{FormatWP}{%
+ \BlockClass[font-style:italic]{figurecaption}
+ }{
+ \BlockClass{figurecaption}
+ }%
+ }
+ {\endBlockClass}
\newcommand*{\LWR at HTML@caption at begin}[1]
{
\LWR at traceinfo{LWR at HTML@caption at begin}%
@@ -8932,7 +8992,7 @@
\begingroup%
\@setpar{\LWR at closeparagraph\@@par}%
\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
-\RenewDocumentCommand{\parbox}{O{t} o O{t} m +m}{##5}%
+\RenewDocumentCommand{\parbox}{O{t} O{} O{t} m +m}{##5}%
\LWR at figcaption%
\LWR at traceinfo{LWR at HTML@caption at begin: about to LWR at origcaption@begin}%
\LWR at print@caption at begin{#1}%
@@ -9112,11 +9172,13 @@
\LWR at forcenewpage
\LWR at stoppars
+\LWR at htmlelementclass{div}{sidetoccontainer}
\LWR at htmlelementclass{nav}{sidetoc}
\setcounter{tocdepth}{\value{SideTOCDepth}}
\begin{BlockClass}{sidetoctitle}
+\ifcsvoid{thetitle}{}{\InlineClass{sidetocthetitle}{\thetitle}\par}
\sidetocname
\end{BlockClass}
\begin{BlockClass}{sidetoccontents}
@@ -9125,6 +9187,7 @@
\LWR at myshorttoc{sidetoc}
\end{BlockClass}
\LWR at htmlelementclassend{nav}{sidetoc}
+\LWR at htmlelementclassend{div}{sidetoccontainer}
}
@@ -9274,6 +9337,7 @@
\renewrobustcmd{\texttt}[1]{\LWR at HTML@texttt{\LWR at doindexentry{##1}}}%
\renewrobustcmd{\textup}[1]{\LWR at HTML@textup{\LWR at doindexentry{##1}}}%
\renewrobustcmd{\textsc}[1]{\LWR at HTML@textsc{\LWR at doindexentry{##1}}}%
+\renewrobustcmd{\textsi}[1]{\LWR at HTML@textsi{\LWR at doindexentry{##1}}}%
\renewrobustcmd{\textit}[1]{\LWR at HTML@textit{\LWR at doindexentry{##1}}}%
\renewrobustcmd{\textsl}[1]{\LWR at HTML@textsl{\LWR at doindexentry{##1}}}%
}
@@ -9357,6 +9421,7 @@
\LetLtxMacro\upshape\LWR at origupshape%
\LetLtxMacro\slshape\LWR at origslshape%
\LetLtxMacro\scshape\LWR at origscshape%
+\LetLtxMacro\sishape\LWR at origsishape%
\LetLtxMacro\itshape\LWR at origitshape%
\LetLtxMacro\em\LWR at origem%
\LetLtxMacro\normalfont\LWR at orignormalfont%
@@ -9371,8 +9436,8 @@
\let\enskip\LWR at origenskip%
\let\quad\LWR at origquad%
\let\qquad\LWR at origqquad%
-\LetLtxMacro\tabular\LWR at origtabular%
\LetLtxMacro\endtabular\LWR at origendtabular%
+\csletcs{endtabular*}{LWR at origendtabular*}%
\LetLtxMacro\noalign\LWR at orignoalign%
\LetLtxMacro\hline\LWR at orighline%
\let\newline\LWR at orignewline%
@@ -10291,7 +10356,13 @@
\begin{warpHTML}
\newcommand*{\LWR at PreloadedPackage}[1]{%
-\@ifpackageloaded{#1}{\LWR at origRequirePackage{lwarp-#1}}{}
+ \@ifpackageloaded{#1}%
+ {%
+ \AtBeginDocument{
+ \LWR at origRequirePackage{lwarp-#1}%
+ }
+ }%
+ {}%
}
\LWR at PreloadedPackage{textcomp}
@@ -10304,6 +10375,14 @@
\LWR at PreloadedPackage{xetexko-vertical}
+\LWR at PreloadedPackage{geometry}
+
+\LWR at PreloadedPackage{plext}
+
+\LWR at PreloadedPackage{stfloats}
+
+\LWR at PreloadedPackage{lltjext}
+
\end{warpHTML}
@@ -10338,6 +10417,7 @@
\begin{warpprint}
\define at key{Gin}{class}{}
+\define at key{Gin}{alt}{}
\AtBeginDocument{
\@ifpackageloaded{overpic}{
\newcommand*{\overpicfontsize}{12}
@@ -10596,7 +10676,7 @@
\begin{warpHTML}
\newbool{LWR at minipagethispar}
\boolfalse{LWR at minipagethispar}
-\NewDocumentEnvironment{LWR at HTML@minipage}{O{t} o O{t} m}
+\NewDocumentEnvironment{LWR at HTML@sub at minipage}{m m m m}
{%
\LWR at traceinfo{minipage}%
\begingroup
@@ -10610,7 +10690,7 @@
}{}%
\LWR at traceinfo{computed width is \LWR at printlength{\LWR at minipagewidth}}%
\setlength{\LWR at minipageheight}{\textheight}% default unless specified
-\IfValueT{#2}{\setlength{\LWR at minipageheight}{#2}}%
+\ifblank{#2}{}{\setlength{\LWR at minipageheight}{#2}}%
\addtocounter{LWR at minipagedepth}{1}%
\ifbool{FormatWP}{\newline}{}%
\LWR at stoppars%
@@ -10641,7 +10721,7 @@
{width:\LWR at printlength{\LWR at minipagewidth} ; }%
}%
\LWR at traceinfo{minipage: about to print the height}%
-\IfValueT{#2}{height:\LWR at printlength{\LWR at minipageheight} ; }%
+\ifblank{#2}{}{height:\LWR at printlength{\LWR at minipageheight} ; }%
"}%
\setlength{\linewidth}{#4}% the original width
@@ -10683,8 +10763,12 @@
\LWR at traceinfo{LWR at minipage: done}%
}
+\NewDocumentEnvironment{LWR at HTML@minipage}{O{t} O{} O{t} m}
+ {\LWR at HTML@sub at minipage{#1}{#2}{#3}{#4}}
+ {\endLWR at HTML@sub at minipage}
+
\LWR at formattedenv{minipage}
-\NewDocumentCommand{\LWR at HTML@parbox}{O{t} o O{t} m +m}
+\NewDocumentCommand{\LWR at HTML@parbox}{O{t} O{} O{t} m +m}
{
\LWR at traceinfo{parbox of width #4}%
\begin{minipage}[#1][#2][#3]{#4}%
@@ -10925,6 +11009,24 @@
\DeclareRobustCommand{\LWR at null@textsc}[1]{#1}
+\@ifundefined{textsi}{
+ \LetLtxMacro\LWR at print@textsi\LWR at print@textsc
+}{}
+
+\DeclareRobustCommand{\LWR at HTML@textsi}[1]{%
+ {%
+ \sishape%
+ \InlineClass(
+ font-style: italic;
+ font-variant: small-caps ;
+ font-variant-numeric: oldstyle-nums ;
+ ){textsi}{#1}%
+ }%
+}
+\LWR at formatted{textsi}
+
+\DeclareRobustCommand{\LWR at null@textsi}[1]{#1}
+
\DeclareRobustCommand{\LWR at HTML@textsl}[1]{%
{%
\slshape%
@@ -10962,6 +11064,7 @@
\LetLtxMacro\textup\LWR at null@textup%
\LetLtxMacro\textit\LWR at null@textit%
\LetLtxMacro\textsc\LWR at null@textsc%
+\LetLtxMacro\textsi\LWR at null@textsi%
\LetLtxMacro\textsl\LWR at null@textsl%
\LetLtxMacro\textnormal\LWR at null@textnormal%
\LetLtxMacro\rmfamily\LWR at null@rmfamily%
@@ -10972,6 +11075,7 @@
\LetLtxMacro\upshape\LWR at null@upshape%
\LetLtxMacro\slshape\LWR at null@slshape%
\LetLtxMacro\scshape\LWR at null@scshape%
+\LetLtxMacro\sishape\LWR at null@sishape%
\LetLtxMacro\itshape\LWR at null@itshape%
\LetLtxMacro\normalfont\LWR at null@normalfont%
\LetLtxMacro\em\LWR at null@em%
@@ -11045,6 +11149,12 @@
\renewrobustcmd*{\scshape}{\renewcommand*{\LWR at f@shape}{sc}}
+\@ifundefined{sishape}{
+ \newrobustcmd*{\sishape}{\renewcommand*{\LWR at f@shape}{si}}
+}{
+ \renewrobustcmd*{\sishape}{\renewcommand*{\LWR at f@shape}{si}}
+}
+
\renewrobustcmd*{\slshape}{\renewcommand*{\LWR at f@shape}{sl}}
\renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape}
@@ -11184,7 +11294,7 @@
\renewrobustcmd*{\quad}{%
\LWR at minipagestoppars%
-\HTMLunicode{2001}%
+\HTMLunicode{2003}%
\LWR at minipagestartpars%
}
@@ -11192,7 +11302,7 @@
\renewrobustcmd*{\enskip}{%
\LWR at minipagestoppars%
-\HTMLunicode{2000}%
+\HTMLunicode{2002}%
\LWR at minipagestartpars%
}
@@ -11452,25 +11562,8 @@
\end{warpHTML}
\begin{warpHTML}
-\@ifclassloaded{bxjsarticle}{\RequirePackage{lwarp-geometry}}{}
-\@ifclassloaded{bxjsbook}{\RequirePackage{lwarp-geometry}}{}
-\@ifclassloaded{bxjsreport}{\RequirePackage{lwarp-geometry}}{}
-\@ifclassloaded{bxjsslide}{\RequirePackage{lwarp-geometry}}{}
-\end{warpHTML}
-
-\begin{warpHTML}
-\@ifclassloaded{ltjsarticle}{\RequirePackage{lwarp-stfloats}}{}
-\@ifclassloaded{ltjsbook}{\RequirePackage{lwarp-stfloats}}{}
-\@ifclassloaded{ltjsreport}{\RequirePackage{lwarp-stfloats}}{}
-\@ifclassloaded{ltjspf}{\RequirePackage{lwarp-stfloats}}{}
-\@ifclassloaded{ltjsiyou}{\RequirePackage{lwarp-stfloats}}{}
-\end{warpHTML}
-
-\begin{warpHTML}
\newcommand*{\LWR at patchujtclasses}{
- \let\tate\relax
- \DeclareDocumentCommand{\rensuji}{m}{##1}
- \def\@partnameformat{}% uj/t does not use \partname
+ \def\@partnameformat{}
\def\@partcntformat##1{%
\prepartname%
\csname the##1\endcsname%
@@ -11499,6 +11592,15 @@
\thesubsubsection.\@arabic\c at paragraph}
\renewcommand{\thesubparagraph}{%
\theparagraph.\@arabic\c at subparagraph}
+ \@ifundefined{chapter}{
+ \renewcommand{\thefigure}{\@arabic\c at figure}
+ \renewcommand{\thetable}{\@arabic\c at table}
+ }{
+ \renewcommand{\thefigure}{%
+ \ifnum\c at chapter>\z@\thechapter.\fi\@arabic\c at figure}
+ \renewcommand{\thetable}{%
+ \ifnum\c at chapter>\z@\thechapter.\fi\@arabic\c at table}
+ }
}
\@ifclassloaded{ujarticle}{\LWR at patchujtclasses}{}
@@ -11507,6 +11609,17 @@
\@ifclassloaded{utarticle}{\LWR at patchujtclasses}{}
\@ifclassloaded{utbook}{\LWR at patchujtclasses}{}
\@ifclassloaded{utreport}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjarticle}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjbook}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjreport}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjsarticle}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjsbook}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjsreport}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjskiyou}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjspf}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjtarticle}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjtbook}{\LWR at patchujtclasses}{}
+\@ifclassloaded{ltjtreport}{\LWR at patchujtclasses}{}
\end{warpHTML}
\begin{warpHTML}
More information about the tex-live-commits
mailing list