summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-22 21:54:16 +0000
committerKarl Berry <karl@freefriends.org>2018-12-22 21:54:16 +0000
commitbe95bc2cf6a3578a498f124d737244329dec915f (patch)
tree83de3ec924982d7c0dfde313d2739da16d460357 /Master/texmf-dist/tex/latex/lwarp
parent21815a36ebddface42a990b639b4d9493666f756 (diff)
lwarp (22dec18)
git-svn-id: svn://tug.org/texlive/trunk@49479 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty21
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty14
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty50
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty23
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty26
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty3
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty59
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty9
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty3
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty24
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty22
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty52
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty22
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty22
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty22
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty22
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty22
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty21
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty96
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty26
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty25
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty555
25 files changed, 897 insertions, 252 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty
index 2cd4f89df93..4eb5247ed4d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty
@@ -34,7 +34,7 @@
\newcommand*{\ADLnoshorthanded}{}
\newcommand*{\dashgapcolor}[2][]{}
\newcommand*{\nodashgapcolor}{}
-\appto\LWR@restoreorigformatting{
+\appto\LWR@restoreorigformatting{%
\newcolumntype{:}{|}%
\newcolumntype{;}[1]{|}%
\LetLtxMacro\hdashline\hline%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty
new file mode 100644
index 00000000000..581346e43f9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty
@@ -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@ProvidesPackageDrop{bounddvi}
+\endinput
+%%
+%% End of file `lwarp-bounddvi.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty
index 1f9a65b90c3..58afb3fbfc7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty
@@ -23,40 +23,40 @@
\LWR@addtabularcellcolor%
}
-\LWR@formatted{columncolor}
+\AtBeginDocument{\LWR@formatted{columncolor}}
\NewDocumentCommand{\LWR@HTML@rowcolor}{O{named} m o o}{%
\convertcolorspec{#1}{#2}{HTML}\LWR@rowHTMLcolor%
\LWR@getmynexttoken%
}
-\LWR@expandableformatted{rowcolor}
+\AtBeginDocument{\LWR@expandableformatted{rowcolor}}
\NewDocumentCommand{\LWR@HTML@cellcolor}{O{named} m o o}{%
\convertcolorspec{#1}{#2}{HTML}\LWR@cellHTMLcolor%
\LWR@addtabularcellcolor%
}
-\LWR@formatted{cellcolor}
+\AtBeginDocument{\LWR@formatted{cellcolor}}
\newcommand{\LWR@HTML@arrayrulecolor}[2][named]{%
\convertcolorspec{#1}{#2}{HTML}\LWR@ruleHTMLcolor%
}
-\LWR@expandableformatted{arrayrulecolor}
+\AtBeginDocument{\LWR@expandableformatted{arrayrulecolor}}
\newcommand{\LWR@HTML@arrayrulecolornexttoken}[2][named]{%
\convertcolorspec{#1}{#2}{HTML}\LWR@ruleHTMLcolor%
\LWR@getmynexttoken%
}
-\LWR@expandableformatted{arrayrulecolornexttoken}
+\AtBeginDocument{\LWR@expandableformatted{arrayrulecolornexttoken}}
\newcommand{\LWR@HTML@doublerulesepcolor}[2][named]{}
-\LWR@expandableformatted{doublerulesepcolor}
+\AtBeginDocument{\LWR@expandableformatted{doublerulesepcolor}}
\newcommand{\LWR@HTML@doublerulesepcolornexttoken}[2][named]{\LWR@getmynexttoken}
-\LWR@expandableformatted{doublerulesepcolornexttoken}
+\AtBeginDocument{\LWR@expandableformatted{doublerulesepcolornexttoken}}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty
new file mode 100644
index 00000000000..52cfac3a7e9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty
@@ -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@ProvidesPackagePass{embrac}
+\LetLtxMacro\LWR@orig@HTML@emph\LWR@HTML@emph
+\RenewDocumentCommand{\LWR@HTML@emph}{s m}{\LWR@orig@HTML@emph{#2}}
+
+\LetLtxMacro\LWR@orig@HTML@textit\LWR@HTML@textit
+\RenewDocumentCommand{\LWR@HTML@textit}{s m}{\LWR@orig@HTML@textit{#2}}
+
+\LetLtxMacro\LWR@orig@HTML@textsl\LWR@HTML@textsl
+\RenewDocumentCommand{\LWR@HTML@textsl}{s m}{\LWR@orig@HTML@textsl{#2}}
+
+\ifxetexorluatex
+ \LetLtxMacro\LWR@orig@HTML@textsi\LWR@HTML@textsi
+ \RenewDocumentCommand{\LWR@HTML@textsi}{s m}{%
+ \LWR@orig@HTML@textsi{#2}}
+\fi
+
+\AtBeginDocument{
+ \LWR@formatted{emph}
+ \LWR@formatted{textit}
+ \LWR@formatted{textsl}
+ \ifxetexorluatex
+ \LWR@formatted{textsi}
+ \fi
+}
+
+\newcommand{\LWR@HTML@EmbracOff}{}
+\LWR@formatted{EmbracOff}
+
+\newcommand{\LWR@HTML@EmbracOn}{}
+\LWR@formatted{EmbracOn}
+\endinput
+%%
+%% End of file `lwarp-embrac.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty
new file mode 100644
index 00000000000..985e91bc31a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty
@@ -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@ProvidesPackagePass{footnoterange}
+\csletcs{footnoterange}{footnoterange*}
+\csletcs{endfootnoterange}{endfootnoterange*}
+\endinput
+%%
+%% End of file `lwarp-footnoterange.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty
new file mode 100644
index 00000000000..2753e214f08
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty
@@ -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@ProvidesPackageDrop{gentombow}
+\newcommand{\settombowbanner}[1]{}
+\newcommand{\settombowbannerfont}[1]{}
+\newcommand{\settombowwidth}[1]{}
+\newcommand{\settombowbleed}[1]{}
+\newcommand{\settombowcolor}[1]{}
+\endinput
+%%
+%% End of file `lwarp-gentombow.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
index 89d84bb1892..431cb3bc2f1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
@@ -17,15 +17,12 @@
%% version 2005/12/01 or later.
-
\LWR@ProvidesPackageDrop{geometry}
-
\renewcommand*{\geometry}[1]{}
\renewcommand*{\newgeometry}[1]{}
\renewcommand*{\restoregeometry}{}
\renewcommand*{\savegeometry}[1]{}
\renewcommand*{\loadgeometry}[1]{}
-
\endinput
%%
%% End of file `lwarp-geometry.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
index 1c71e905add..497baad7b2b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
@@ -51,6 +51,7 @@
\newcommand*{\LWR@igxscale}{1}
\newcommand*{\LWR@igyscale}{1}
\newcommand*{\LWR@igclass}{inlineimage}
+\newcommand*{\LWR@igalt}{(image)}
\define@key{igraph}{width}{%
\setlength{\LWR@igwidth}{#1}%
@@ -97,7 +98,7 @@
}
\define@key{igraph}{angle}{\renewcommand*{\LWR@igangle}{#1}}
\define@key{igraph}{class}{\renewcommand*{\LWR@igclass}{#1}}
-
+\define@key{igraph}{alt}{\renewcommand*{\LWR@igalt}{#1}}
\define@key{igraph}{scale}{%
\renewcommand*{\LWR@igxscale}{#1}%
\renewcommand*{\LWR@igyscale}{#1}%
@@ -149,6 +150,7 @@
\AtBeginDocument{
\define@key{Gin}{class}{}
+\define@key{Gin}{alt}{}
}
\AtBeginDocument{
@@ -187,6 +189,7 @@
\renewcommand*{\LWR@igxscale}{1}%
\renewcommand*{\LWR@igyscale}{1}%
\renewcommand*{\LWR@igclass}{inlineimage}%
+\renewcommand*{\LWR@igalt}{(image)}%
\IfValueF{#3}{%
\IfValueTF{#2}%
{\setkeys{igraph}{#2}}%
@@ -306,6 +309,7 @@ img src="%
" \LWR@orignewline%
}{}%
\LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline%
+\LWR@origtilde{} alt="\LWR@igalt" \LWR@orignewline%
}% end of image tags
}% end of href
\endgroup
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty
new file mode 100644
index 00000000000..bdf82bd9dfe
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty
@@ -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@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@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@HTML@minipage}{d<> O{t} O{} O{t} m}
+ {\LWR@HTML@sub@minipage{#2}{#3}{#4}{#5}}
+ {\endLWR@HTML@sub@minipage}
+
+\RenewDocumentCommand{\LWR@HTML@parbox}{d<> O{t} O{} O{t} m +m}
+{
+\LWR@traceinfo{parbox of width #4}%
+\begin{minipage}[#2][#3][#4]{#5}%
+#6
+\end{minipage}%
+}
+
+\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{%
+\booltrue{LWR@minipagefullwidth}%
+\parbox{#2}{#4}%
+}
+\endinput
+%%
+%% End of file `lwarp-lltjext.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
index 4b81417ad5f..28213a5da06 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
@@ -27,9 +27,9 @@
\caption@LT@setup%
\booltrue{LWR@starredlongtable}%
\let\captionlistentry\LWR@LTcaptionlistentry%
-\LWR@tabular{#2}
+\tabular{#2}
}
-{\endLWR@tabular\LWR@floatend}
+{\endtabular\LWR@floatend}
\newenvironment{longtable}[2][]{%
\LWR@floatbegin{table}%
@@ -39,10 +39,9 @@
\caption@LT@setup%
\refstepcounter{\LTcaptype}%
\let\captionlistentry\LWR@LTcaptionlistentry%
-\LWR@tabular{#2}
+\tabular{#2}
}
-{\endLWR@tabular\LWR@floatend}
-
+{\endtabular\LWR@floatend}
\newcounter{LTchunksize}
\def\endhead{\LWR@tabularendofline}% throws away options //[dim] and //*
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
index 82035621c47..abc18b3f5a4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
@@ -47,6 +47,9 @@
\newcounter{unbalance}
\newlength{\multicolovershoot}
\newlength{\multicolundershoot}
+\NewDocumentCommand{\docolaction}{s o m m m}{%
+ \IfValueTF{#2}{#2}{#3}%
+}
\end{warpHTML}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty
new file mode 100644
index 00000000000..c63ab76d721
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty
@@ -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@ProvidesPackageDrop{multicolrule}
+\newcommand*{\SetMCRule}[1]{}
+\endinput
+%%
+%% End of file `lwarp-multicolrule.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
index a5029cc2283..a90e26875aa 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\LWR@ProvidesPackageDrop{pbox}
-\NewDocumentCommand{\pbox}{O{t} o O{t} m +m}{%
+\NewDocumentCommand{\pbox}{O{t} O{} O{t} m +m}{%
\booltrue{LWR@minipagefullwidth}%
\parbox[#1][#2][#3]{#4}{#5}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty
new file mode 100644
index 00000000000..4cfbe279aef
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty
@@ -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@ProvidesPackageDrop{plarydshln}
+\LWR@origRequirePackage{lwarp-arydshln}
+\endinput
+%%
+%% End of file `lwarp-plarydshln.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty
new file mode 100644
index 00000000000..0087362c6d1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty
@@ -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@loadbefore{plext}
+
+\LWR@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@HTML@minipage}{d<> O{t} O{} O{t} m}
+ {\LWR@HTML@sub@minipage{#2}{#3}{#4}{#5}}
+ {\endLWR@HTML@sub@minipage}
+
+\RenewDocumentCommand{\LWR@HTML@parbox}{d<> O{t} O{} O{t} m +m}
+{
+\LWR@traceinfo{parbox of width #4}%
+\begin{minipage}[#2][#3][#4]{#5}%
+#6
+\end{minipage}%
+}
+
+\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{%
+\booltrue{LWR@minipagefullwidth}%
+\parbox{#2}{#4}%
+}
+\endinput
+%%
+%% End of file `lwarp-plext.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty
new file mode 100644
index 00000000000..7d5764be332
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty
@@ -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@ProvidesPackageDrop{plextarydshln}
+\LWR@origRequirePackage{lwarp-arydshln}
+\endinput
+%%
+%% End of file `lwarp-plextarydshln.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty
new file mode 100644
index 00000000000..ec4666377ea
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty
@@ -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@ProvidesPackageDrop{plextcolortbl}
+\LWR@origRequirePackage{lwarp-colortbl}
+\endinput
+%%
+%% End of file `lwarp-plextcolorbl.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty
new file mode 100644
index 00000000000..380864b6896
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty
@@ -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@ProvidesPackageDrop{pxatbegshi}
+\LWR@origRequirePackage{lwarp-atbegshi}
+\endinput
+%%
+%% End of file `lwarp-pxatbegshi.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty
new file mode 100644
index 00000000000..fb38713fbe7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty
@@ -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@ProvidesPackageDrop{pxeveryshi}
+\LWR@origRequirePackage{lwarp-everyshi}
+\endinput
+%%
+%% End of file `lwarp-pxeveryshi.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty
new file mode 100644
index 00000000000..a6cdc9a7048
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty
@@ -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@ProvidesPackageDrop{pxftnright}
+\LWR@origRequirePackage{lwarp-ftnright}
+\endinput
+%%
+%% End of file `lwarp-pxftnright.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty
new file mode 100644
index 00000000000..593f13417dd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty
@@ -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@ProvidesPackageDrop{pxjahyper}
+\endinput
+%%
+%% End of file `lwarp-pxjahyper.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty
new file mode 100644
index 00000000000..5ab7326d0ea
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty
@@ -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@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'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
index e34b3820fd0..daf3c4db07d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
@@ -74,27 +74,27 @@
\DeclareDocumentCommand{\@maketitle}{}{%
\maketitlehooka
{
- \LWR@stoppars\LWR@htmltag{\LWR@tagtitle}
- \@bspretitle \@title \@bsposttitle
- \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars
+ \LWR@stoppars\LWR@htmltag{\LWR@tagtitle}%
+ \@bspretitle \@title \@bsposttitle%
+ \LWR@htmltag{\LWR@tagtitleend}\LWR@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
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
new file mode 100644
index 00000000000..8a57f3f6c1a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
@@ -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@ProvidesPackageDrop{versonotes}
+\newcommand{\versonote}[1]{\marginpar{#1}}
+\newdimen\versotextwidth
+\newdimen\versoleftmargin
+\newcommand*{\versolayout}{}
+\endinput
+%%
+%% End of file `lwarp-versonotes.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 919e949e4af..83ca291fcb5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2018/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@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,20 +63,19 @@ after lwarp.}
{\newcommand*{\LWR@notmemoirloadafter}[1]{}}
{\LetLtxMacro\LWR@notmemoirloadafter\LWR@loadafter}
-\LetLtxMacro\LWR@notbxjsloadafter\LWR@loadafter
-
-\@ifclassloaded{bxjsarticle}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{}
-\@ifclassloaded{bxjsbook}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{}
-\@ifclassloaded{bxjsreport}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{}
-\@ifclassloaded{bxjsslide}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{}
+\LetLtxMacro\LWR@notltjloadafter\LWR@loadafter
-\LetLtxMacro\LWR@notltjsloadafter\LWR@loadafter
-
-\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjspf}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{}
-\@ifclassloaded{ltjsiyou}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{}
+\@ifclassloaded{ltjarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjspf}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjskiyou}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjtarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjtbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
+\@ifclassloaded{ltjtreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{}
\newcommand*{\LWR@loadbefore}[1]{%
\@ifpackageloaded{#1}
@@ -129,6 +128,12 @@ or is superceded by another class.
For a possible alternative, see class(es) #2.}
}{}%
}
+\LWR@earlyclassloadnever{jarticle}{ujarticle}
+\LWR@earlyclassloadnever{jbook}{ujbook}
+\LWR@earlyclassloadnever{jreport}{ujreport}
+\LWR@earlyclassloadnever{tarticle}{utarticle}
+\LWR@earlyclassloadnever{tbook}{utbook}
+\LWR@earlyclassloadnever{treport}{utreport}
\LWR@earlyloadnever{ae}{cm-super, lmodern}
\LWR@earlyloadnever{aecompl}{cm-super, lmodern}
\LWR@earlyloadnever{aecc}{cm-super, lmodern}
@@ -138,7 +143,7 @@ For a possible alternative, see class(es) #2.}
\LWR@earlyloadnever{CJK}{ctex, xeCJK}
\LWR@earlyloadnever{CJKutf8}{ctex, xeCJK}
}
-\LWR@earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle, utarticle}
+\LWR@earlyloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
\LWR@earlyloadnever{hangul}{kotex, xetexko, luatexko}
\LWR@earlyloadnever{fancyheadings}{fancyhdr}
\LWR@earlyloadnever{glossary}{glossaries}
@@ -185,6 +190,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{bookmark}
\LWR@notmemoirloadafter{booktabs}
\LWR@loadafter{bophook}
+\LWR@loadafter{bounddvi}
\LWR@loadafter{boxedminipage}
\LWR@loadafter{boxedminipage2e}
\LWR@loadafter{breakurl}
@@ -228,6 +234,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{easy-todo}
\LWR@loadafter{ebook}
\LWR@loadafter{ellipsis}
+\LWR@loadafter{embrac}
\LWR@loadafter{emptypage}
\LWR@loadafter{endfloat}
\LWR@loadafter{endheads}
@@ -269,6 +276,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{footmisc}
\LWR@loadafter{footnote}
\LWR@loadafter{footnotehyper}
+\LWR@loadafter{footnoterange}
\LWR@loadafter{footnpag}
\LWR@loadafter{forest}
\LWR@loadafter{framed}
@@ -277,7 +285,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{fullpage}
\LWR@loadafter{fullwidth}
\LWR@loadafter{fwlw}
-\LWR@notbxjsloadafter{geometry}
+\LWR@loadafter{gentombow}
\LWR@loadafter{gmeometric}
\LWR@loadafter{glossaries}
\LWR@loadafter{glossary}
@@ -334,6 +342,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{morefloats}
\LWR@notmemoirloadafter{moreverb}
\LWR@notmemoirloadafter{mparhack}
+\LWR@loadafter{multicolrule}
\LWR@loadafter{multirow}
\LWR@loadafter{multitoc}
\LWR@loadafter{musicography}
@@ -371,6 +380,12 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{pfnote}
\LWR@loadafter{phfqit}
\LWR@loadafter{placeins}
+\LWR@loadafter{plarray}
+\LWR@loadafter{plarydshln}
+\LWR@loadafter{plextarray}
+\LWR@loadafter{plextarydshln}
+\LWR@loadafter{plcolortbl}
+\LWR@loadafter{plextdelarray}
\LWR@loadafter{prelim2e}
\LWR@loadafter{prettyref}
\LWR@loadafter{preview}
@@ -379,6 +394,9 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{pst-eps}
\LWR@loadafter{pstool}
\LWR@loadafter{pstricks}
+\LWR@loadafter{pxeveryshi}
+\LWR@loadafter{pxftnright}
+\LWR@loadafter{pxjahyper}
\LWR@loadafter{quotchap}
\LWR@loadafter{quoting}
\LWR@loadafter{ragged2e}
@@ -421,7 +439,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{srcltx}
\LWR@loadafter{srctex}
\LWR@loadafter{stabular}
-\LWR@notltjsloadafter{stfloats}
+\LWR@notltjloadafter{stfloats}
\LWR@loadafter{subfig}
\LWR@loadafter{subfigure}
\LWR@loadafter{supertabular}
@@ -429,6 +447,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{tabls}
\LWR@notmemoirloadafter{tabularx}
\LWR@loadafter{tabulary}
+\LWR@loadafter{tascmac}
\LWR@loadafter{textarea}
\LWR@loadafter{textfit}
\LWR@loadafter{textpos}
@@ -463,6 +482,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{uspace}
\LWR@loadafter{varioref}% no lwarp package provided
\LWR@notmemoirloadafter{verse}
+\LWR@loadafter{versonotes}
\LWR@loadafter{vertbars}
\LWR@loadafter{vmargin}
\LWR@loadafter{vowel}
@@ -800,9 +820,12 @@ For a possible alternative, see class(es) #2.}
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 @@ For a possible alternative, see class(es) #2.}
\LWR@checkloadbefore{#1}{morewrites}
\LWR@checkloadbefore{#1}{newclude}
\LWR@checkloadbefore{#1}{newunicodechar}
+\LWR@checkloadbefore{#1}{plext}
\LWR@checkloadbefore{#1}{xeCJK}
\LWR@checkloadbefore{#1}{xetexko}
\LWR@checkloadbefore{#1}{zxjatype}
@@ -1311,6 +1335,11 @@ For a possible alternative, see class(es) #2.}
\LetLtxMacro\LWR@origupshape\upshape
\LetLtxMacro\LWR@origslshape\slshape
\LetLtxMacro\LWR@origscshape\scshape
+\@ifundefined{sishape}{
+ \LetLtxMacro\LWR@origsishape\scshape
+}{
+ \LetLtxMacro\LWR@origsishape\sishape
+}
\LetLtxMacro\LWR@origitshape\itshape
\LetLtxMacro\LWR@origem\em
\LetLtxMacro\LWR@orignormalfont\normalfont
@@ -1710,6 +1739,12 @@ span.textsc, div.textsc {
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 @@ pre.tabbing {
}
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 @@ div.qauthor p {
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,39 +1995,33 @@ div.minisec {
text-align: left ;
}
-/* Title of the file */
h1 {
margin: 0ex 0em 0ex 0em ;
line-height: 1.3;
text-align: center ;
}
-/* Part */
h2 {
margin: 1ex 0em 1ex 0em ;
line-height: 1.3;
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 @@ div.titlepage {
}
.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.marginblock br ,
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 @@ figure.subfigure, figure.subtable {
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.floatrow figure { display: inline-block ; margin: 1ex 2% ; }
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 @@ figcaption , .lstlistingtitle {
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 @@ div.nonfloatcaption {
}
/* 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 @@ figure.ruled {
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 @@ nav.topnavigation{
margin: 0 ;
border-bottom: 1px solid silver ;
border-top: 1px solid silver ;
- clear:right ;
+ clear:both ;
}
nav.botnavigation{
@@ -2714,27 +2747,25 @@ nav.botnavigation{
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 @@ img.lateximage{
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,20 +3015,22 @@ Based on spacing demonstrated by the metafont package.
nav.topnavigation { display:none; }
nav.botnavigation { display:none; }
-@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 }
+
+@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 ;
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 @@ nav.botnavigation { display:none; }
"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 { /* title of the entire website, used on each page */
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 @@ div.fboxBlock div.minipage { box-shadow: none ; }
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 @@ figure figure {
}
/*
-figcaption {
+div.figurecaption {
border-top: 1px solid silver ;
border-bottom: 1px solid silver ;
background-color: #e8e8e8 ;
@@ -3244,11 +3279,10 @@ footer{
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 @@ nav.sidetoc a:hover {
}
@media screen and (max-width: 45em) {
- nav.sidetoc { border-radius: 0 ; }
+ div.sidetoccontainer { border-radius: 0 ; }
}
\end{filecontents*}
@@ -3310,7 +3344,7 @@ h1, h2 {
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 @@ figure {
/* 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 @@ nav.toc, nav.lof, nav.lot, nav.lol {
"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 @@ footer{
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 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.64"
+printversion = "v0.65"
requiredconfversion = "1" -- also at *lwarpmk.conf
function printhelp ()
@@ -5155,7 +5187,7 @@ end -- not --version
{%
\addtocounter{LWR@thisautoidWP}{1}%
\LWR@htmltag{%
- div class=\textquotedbl#3\textquotedbl % space
+ div class=\textquotedbl#3\textquotedbl\ % space
id=\textquotedbl%
\LWR@print@mbox{autoidWP-\arabic{LWR@thisautoidWP}}%
\textquotedbl%
@@ -5639,7 +5671,7 @@ end -- not --version
\StrSubstitute{\LWR@thisnewfilename}{—}{-}[\LWR@thisnewfilename]
\StrSubstitute{\LWR@thisnewfilename}{–}{-}[\LWR@thisnewfilename]
\fi%
-\global\let\LWR@thisfilename\LWR@thisnewfilename% return a global result
+\global\let\LWR@thisfilename\LWR@thisnewfilename%
\endgroup%
\LWR@traceinfo{LWR@filenamenoblanks: result is \LWR@thisfilename}%
}
@@ -5704,6 +5736,8 @@ end -- not --version
\LWR@htmlelementclassend{section}{textbody}
+\LWR@htmlelementclassend{div}{bodycontainer}
+\LWR@htmlelementclassend{div}{bodyandsidetoc}
\LWR@printpendingfootnotes
@@ -5727,11 +5761,28 @@ end -- not --version
\LWR@orignewpage
\addtocounter{LWR@htmlfilenumber}{1}%
-
\ifbool{FileSectionNames}%
-{\LWR@filenamenoblanks{#1}}
+{%
+ \LWR@filenamenoblanks{#1}%
+ \edef\LWR@hashedname{\LWR@mdfive{\LWR@thisfilename}}%
+ \ifcsundef{LWR@filename\LWR@hashedname}{%
+ \csdef{LWR@filename\LWR@hashedname}{}%
+ }{%
+ \PackageError{lwarp}
+ {
+ Section name ``#1'', at the line number listed below,
+ generates the filename ``\LWR@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@thisfilename}{\arabic{LWR@htmlfilenumber}}}
-
\LWR@traceinfo{LWR@newhtmlfile: about to print start file}%
\begingroup%
\LWR@nullfonts%
@@ -5740,7 +5791,6 @@ end -- not --version
\LWR@htmlsectionfilename{\LWR@thisfilename}|%
}
\endgroup%
-
\LWR@stoppars
\LWR@filestart[#1]
@@ -5761,16 +5811,21 @@ end -- not --version
\LWR@htmlelementend{header}
}
-\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
-{}
-{\ifcsvoid{thetitle}{}{\LWR@printthetitle}}
-
+\LWR@htmlelementclass{div}{bodyandsidetoc}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
{}
{\LWR@sidetoc}
+\LWR@htmlelementclass{div}{bodycontainer}
\LWR@htmlelementclass{section}{textbody}
+\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}%
+ {}%
+ {%
+ \ifcsvoid{thetitle}{}{%
+ \LWR@printthetitle%
+ }%
+ }%
\LWR@stoppars
\LWR@customizeMathJax
@@ -5869,17 +5924,17 @@ end -- not --version
{% new file
\LWR@traceinfo{LWR@section: new HTML file}%
\IfNoValueTF{#2}%
- {\LWR@newhtmlfile{#3}}%
- {\LWR@newhtmlfile{#2}}%
+ {\LWR@newhtmlfile{#3}}%
+ {\LWR@newhtmlfile{#2}}%
}% new file
{% not new file
\LWR@traceinfo{LWR@section: not a new HTML file, about to LWR@orignewpage}%
\LWR@orignewpage%
-
}% not new file
+
\IfValueT{#3}{%
-\LWR@traceinfo{LWR@section: about to LWR@setlatestname}%
-\IfValueTF{#2}{\LWR@setlatestname{#2}}{\LWR@setlatestname{#3}}%
+ \LWR@traceinfo{LWR@section: about to LWR@setlatestname}%
+ \IfValueTF{#2}{\LWR@setlatestname{#2}}{\LWR@setlatestname{#3}}%
}%
\ifbool{HTMLDebugComments}{%
@@ -6144,13 +6199,13 @@ end -- not --version
\newcommand*{\HTMLTitleBeforeSection}{%
\def\theHTMLTitleSection{%
\theHTMLTitle\theHTMLTitleSeparator\theHTMLSection%
- }
+ }%
}
\newcommand*{\HTMLTitleAfterSection}{%
\def\theHTMLTitleSection{%
\theHTMLSection\theHTMLTitleSeparator\theHTMLTitle%
- }
+ }%
}
\HTMLTitleBeforeSection
@@ -6270,10 +6325,6 @@ end -- not --version
\setlength{\belowcaptionskip}{0ex}
\setlength{\abovecaptionskip}{0ex}
\renewcommand{\ps@plain}{}
-\LetLtxMacro\LWR@origtabular\tabular
-\LetLtxMacro\LWR@origendtabular\endtabular
-\LetLtxMacro\tabular\LWR@tabular
-\LetLtxMacro\endtabular\endLWR@tabular
\let\LWR@origcaption\caption
\let\LWR@origltx@label\ltx@label
\let\ltx@label\LWR@htmlmathlabel
@@ -6296,8 +6347,10 @@ end -- not --version
\LWR@firstpagetop
\LWR@stoppars
\LWR@htmltag{/header}\LWR@orignewline
+\LWR@htmlelementclass{div}{bodywithoutsidetoc}
+\LWR@htmlelementclass{div}{bodycontainer}
\LWR@traceinfo{LWR@lwarpStart: Generating textbody.}
-\LWR@htmltag{section class=\textquotedbl{}textbody\textquotedbl}
+\LWR@htmlelementclass{section}{textbody}
\LWR@patchlists
\catcode`\$=\active
\immediate\write\@mainaux{\catcode`\string$\active}%
@@ -6328,6 +6381,8 @@ end -- not --version
\LWR@closeprevious{\LWR@depthfinished}
\LWR@htmlelementclassend{section}{textbody}
+\LWR@htmlelementclassend{div}{bodycontainer}
+\LWR@htmlelementclassend{div}{bodyandsidetoc}
\LWR@printpendingfootnotes
\LWR@htmlelement{footer}
@@ -6390,20 +6445,20 @@ end -- not --version
\begin{warpHTML}
\newcommand*{\printtitle}
-{
-\LWR@stoppars
-\LWR@htmltag{\LWR@tagtitle}%
-\@title%
-\LWR@htmltag{\LWR@tagtitleend}
-\LWR@startpars
+{%
+ \LWR@stoppars%
+ \LWR@htmltag{\LWR@tagtitle}%
+ \@title%
+ \LWR@htmltag{\LWR@tagtitleend}%
+ \LWR@startpars%
}
\newcommand*{\LWR@printthetitle}
-{
-\LWR@stoppars
-\LWR@htmltag{\LWR@tagtitle}%
-\thetitle%
-\LWR@htmltag{\LWR@tagtitleend}
-\LWR@startpars
+{%
+ \LWR@stoppars%
+ \LWR@htmltag{\LWR@tagtitle}%
+ \thetitle%
+ \LWR@htmltag{\LWR@tagtitleend}%
+ \LWR@startpars%
}
\newcommand*{\printauthor}{
@@ -6486,24 +6541,24 @@ end -- not --version
\global\let\and\relax
}
\DeclareDocumentCommand{\@maketitle}{}{%
- \LWR@stoppars\LWR@htmltag{\LWR@tagtitle}
- \@title
- \LWR@htmltag{\LWR@tagtitleend}\LWR@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@stoppars\LWR@htmltag{\LWR@tagtitle}%
+ \@title%
+ \LWR@htmltag{\LWR@tagtitleend}\LWR@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@titlingmaketitle}{%
@@ -7792,22 +7847,22 @@ end -- not --version
\ifdefstring{\LWR@tempone}{tvertbarl}{%
\LWR@tdaddstyle%
border-left: 1px solid % space
- \LWR@origpound\LWR@vertruleHTMLcolor%
+ \LWR@vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR@tempone}{tvertbarldouble}{%
\LWR@tdaddstyle%
border-left: 4px double % space
- \LWR@origpound\LWR@vertruleHTMLcolor%
+ \LWR@vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR@tempone}{tvertbarldash}{%
\LWR@tdaddstyle%
border-left: 1px dashed % space
- \LWR@origpound\LWR@vertruleHTMLcolor%
+ \LWR@vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR@tempone}{tvertbarldoubledash}{%
\LWR@tdaddstyle%
border-left: 2px dashed % space
- \LWR@origpound\LWR@vertruleHTMLcolor%
+ \LWR@vertruleHTMLcolor%
}{}%
}{}%
\edef\LWR@tempone{%
@@ -7815,19 +7870,19 @@ end -- not --version
}%
\ifdefstring{\LWR@tempone}{tvertbarr}{%
\LWR@tdaddstyle%
- border-right: 1px solid \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-right: 1px solid \LWR@vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR@tempone}{tvertbarrdouble}{%
\LWR@tdaddstyle%
- border-right: 4px double \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-right: 4px double \LWR@vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR@tempone}{tvertbarrdash}{%
\LWR@tdaddstyle%
- border-right: 1px dashed \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-right: 1px dashed \LWR@vertruleHTMLcolor%
}{}%
\ifdefstring{\LWR@tempone}{tvertbarrdoubledash}{%
\LWR@tdaddstyle%
- border-right: 2px dashed \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-right: 2px dashed \LWR@vertruleHTMLcolor%
}{}%
}%
}
@@ -7988,35 +8043,35 @@ end -- not --version
\ifbool{LWR@tabularmutemods}{}{%
\ifnumcomp{\value{LWR@mcolvertbarsl}}{=}{1}{%
\LWR@tdaddstyle%
- border-left: 1px solid \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-left: 1px solid \LWR@vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR@mcolvertbarsl}}{>}{1}{%
\LWR@tdaddstyle%
- border-left: 4px double \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-left: 4px double \LWR@vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR@mcolvertbarsldash}}{=}{1}{%
\LWR@tdaddstyle%
- border-left: 1px dashed \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-left: 1px dashed \LWR@vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR@mcolvertbarsldash}}{>}{1}{%
\LWR@tdaddstyle%
- border-left: 2px dashed \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-left: 2px dashed \LWR@vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR@mcolvertbarsr}}{=}{1}{%
\LWR@tdaddstyle%
- border-right: 1px solid \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-right: 1px solid \LWR@vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR@mcolvertbarsr}}{>}{1}{%
\LWR@tdaddstyle%
- border-right: 4px double \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-right: 4px double \LWR@vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR@mcolvertbarsrdash}}{=}{1}{%
\LWR@tdaddstyle%
- border-right: 1px dashed \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-right: 1px dashed \LWR@vertruleHTMLcolor%
}{}%
\ifnumcomp{\value{LWR@mcolvertbarsrdash}}{>}{1}{%
\LWR@tdaddstyle%
- border-right: 2px dashed \LWR@origpound\LWR@vertruleHTMLcolor%
+ border-right: 2px dashed \LWR@vertruleHTMLcolor%
}{}%
}%
}
@@ -8422,9 +8477,9 @@ rowspan="#2" %
\StartDefiningTabulars
-\newenvironment*{LWR@tabular}[2][]
+\NewDocumentCommand{\LWR@HTML@@tabular}{d<> o m}
{%
-\LWR@traceinfo{LWR@tabular started}%
+\LWR@traceinfo{LWR@HTML@@tabular started}%
\addtocounter{LWR@tabulardepth}{1}%
\global\boolfalse{LWR@startedrow}%
\setcounter{LWR@hlines}{0}%
@@ -8435,10 +8490,10 @@ rowspan="#2" %
\global\boolfalse{LWR@exitingtabular}%
\global\boolfalse{LWR@tabularmutemods}%
\global\booltrue{LWR@intabularmetadata}%
-\LWR@traceinfo{LWR@tabular: About to LWR@forecenewpage.}%
+\LWR@traceinfo{LWR@@tabular: About to LWR@forecenewpage.}%
\LWR@forcenewpage
\LWR@htmlblocktag{table}%
-\LWR@parsetablecols{#2}%
+\LWR@parsetablecols{#3}%
\LWR@stoppars%
\setcounter{LWR@tableLaTeXcolindex}{1}%
\global\boolfalse{LWR@tabularcelladded}%
@@ -8450,9 +8505,11 @@ rowspan="#2" %
\gdef\LWR@rowHTMLcolor{}%
\gdef\LWR@cellHTMLcolor{}%
\@rowcolors%
-\edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor}%
+\ifdefvoid{\LWR@ruleHTMLcolor}%
+ {\edef\LWR@vertruleHTMLcolor{black}}%
+ {\edef\LWR@vertruleHTMLcolor{\LWR@origpound\LWR@ruleHTMLcolor}}%
\setcounter{LWR@cellcolordepth}{0}%
-\LWR@traceinfo{LWR@tabular: redefining macros}%
+\LWR@traceinfo{LWR@@HTML@tabular: redefining macros}%
\LetLtxMacro\noalign\LWR@tabularnoalign%
\LetLtxMacro\hline\LWR@HTMLhline%
\LetLtxMacro\cline\LWR@HTMLcline%
@@ -8496,11 +8553,12 @@ rowspan="#2" %
\StartDefiningTabulars%
\protected\gdef&{\LWR@tabularampersand}%
\addtocounter{LWR@tabularpardepth}{1}%
-\LWR@traceinfo{LWR@tabular: about to LWR@getmynexttoken}%
+\LWR@traceinfo{LWR@@HTML@tabular: about to LWR@getmynexttoken}%
\LWR@getmynexttoken%
}%
+\newcommand*{\LWR@HTML@endtabular}
{%
-\LWR@traceinfo{LWR@tabular ending}%
+\LWR@traceinfo{LWR@HTML@endtabular}%
\addtocounter{LWR@tabularpardepth}{-1}%
\ifboolexpr{%
test {%
@@ -8527,10 +8585,19 @@ rowspan="#2" %
\addtocounter{LWR@tabulardepth}{-1}%
\protected\gdef&{\LWR@origampmacro}%
\StopDefiningTabulars%
-\LWR@traceinfo{LWR@tabular finished ending}%
+\LWR@traceinfo{LWR@HTML@endtabular finished}%
}
+\csletcs{LWR@HTML@endtabular*}{LWR@HTML@endtabular}
+
\StopDefiningTabulars
+\AtBeginDocument{
+ \LetLtxMacro\LWR@origendtabular\endtabular
+ \csletcs{LWR@origendtabular*}{endtabular*}
+ \LWR@formatted{@tabular}
+ \LWR@formatted{endtabular}
+ \LWR@formatted{endtabular*}
+}
\end{warpHTML}
@@ -8911,28 +8978,21 @@ autopage-\theLWR@currentautosec%
\setcounter{LWR@latestautopage}{1}
\newenvironment*{LWR@figcaption}
-{%
- \LWR@traceinfo{LWR@figcaption env start}%
- \LWR@htmlblocktag{figcaption}%
- \ifbool{FormatWP}{%
- \begin{BlockClass}[font-style:italic]{italic}
- \LWR@print@vspace*{\baselineskip}
- }{}%
- \LWR@traceinfo{LWR@figcaption env start: done}%
-}
-{%
- \LWR@traceinfo{LWR@figcaption env end}%
- \ifbool{FormatWP}{\end{BlockClass}}{}%
- \LWR@htmlblocktag{/figcaption}%
- \LWR@traceinfo{LWR@figcaption env end: done}%
-}
+ {
+ \ifbool{FormatWP}{%
+ \BlockClass[font-style:italic]{figurecaption}
+ }{
+ \BlockClass{figurecaption}
+ }%
+ }
+ {\endBlockClass}
\newcommand*{\LWR@HTML@caption@begin}[1]
{
\LWR@traceinfo{LWR@HTML@caption@begin}%
\begingroup%
\@setpar{\LWR@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@figcaption%
\LWR@traceinfo{LWR@HTML@caption@begin: about to LWR@origcaption@begin}%
\LWR@print@caption@begin{#1}%
@@ -9112,11 +9172,13 @@ autopage-\theLWR@currentautosec%
\LWR@forcenewpage
\LWR@stoppars
+\LWR@htmlelementclass{div}{sidetoccontainer}
\LWR@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 @@ autopage-\theLWR@currentautosec%
\LWR@myshorttoc{sidetoc}
\end{BlockClass}
\LWR@htmlelementclassend{nav}{sidetoc}
+\LWR@htmlelementclassend{div}{sidetoccontainer}
}
@@ -9274,6 +9337,7 @@ autopage-\theLWR@currentautosec%
\renewrobustcmd{\texttt}[1]{\LWR@HTML@texttt{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textup}[1]{\LWR@HTML@textup{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textsc}[1]{\LWR@HTML@textsc{\LWR@doindexentry{##1}}}%
+\renewrobustcmd{\textsi}[1]{\LWR@HTML@textsi{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textit}[1]{\LWR@HTML@textit{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textsl}[1]{\LWR@HTML@textsl{\LWR@doindexentry{##1}}}%
}
@@ -9357,6 +9421,7 @@ autopage-\theLWR@currentautosec%
\LetLtxMacro\upshape\LWR@origupshape%
\LetLtxMacro\slshape\LWR@origslshape%
\LetLtxMacro\scshape\LWR@origscshape%
+\LetLtxMacro\sishape\LWR@origsishape%
\LetLtxMacro\itshape\LWR@origitshape%
\LetLtxMacro\em\LWR@origem%
\LetLtxMacro\normalfont\LWR@orignormalfont%
@@ -9371,8 +9436,8 @@ autopage-\theLWR@currentautosec%
\let\enskip\LWR@origenskip%
\let\quad\LWR@origquad%
\let\qquad\LWR@origqquad%
-\LetLtxMacro\tabular\LWR@origtabular%
\LetLtxMacro\endtabular\LWR@origendtabular%
+\csletcs{endtabular*}{LWR@origendtabular*}%
\LetLtxMacro\noalign\LWR@orignoalign%
\LetLtxMacro\hline\LWR@orighline%
\let\newline\LWR@orignewline%
@@ -10291,7 +10356,13 @@ autopage-\theLWR@currentautosec%
\begin{warpHTML}
\newcommand*{\LWR@PreloadedPackage}[1]{%
-\@ifpackageloaded{#1}{\LWR@origRequirePackage{lwarp-#1}}{}
+ \@ifpackageloaded{#1}%
+ {%
+ \AtBeginDocument{
+ \LWR@origRequirePackage{lwarp-#1}%
+ }
+ }%
+ {}%
}
\LWR@PreloadedPackage{textcomp}
@@ -10304,6 +10375,14 @@ autopage-\theLWR@currentautosec%
\LWR@PreloadedPackage{xetexko-vertical}
+\LWR@PreloadedPackage{geometry}
+
+\LWR@PreloadedPackage{plext}
+
+\LWR@PreloadedPackage{stfloats}
+
+\LWR@PreloadedPackage{lltjext}
+
\end{warpHTML}
@@ -10338,6 +10417,7 @@ autopage-\theLWR@currentautosec%
\begin{warpprint}
\define@key{Gin}{class}{}
+\define@key{Gin}{alt}{}
\AtBeginDocument{
\@ifpackageloaded{overpic}{
\newcommand*{\overpicfontsize}{12}
@@ -10596,7 +10676,7 @@ autopage-\theLWR@currentautosec%
\begin{warpHTML}
\newbool{LWR@minipagethispar}
\boolfalse{LWR@minipagethispar}
-\NewDocumentEnvironment{LWR@HTML@minipage}{O{t} o O{t} m}
+\NewDocumentEnvironment{LWR@HTML@sub@minipage}{m m m m}
{%
\LWR@traceinfo{minipage}%
\begingroup
@@ -10610,7 +10690,7 @@ autopage-\theLWR@currentautosec%
}{}%
\LWR@traceinfo{computed width is \LWR@printlength{\LWR@minipagewidth}}%
\setlength{\LWR@minipageheight}{\textheight}% default unless specified
-\IfValueT{#2}{\setlength{\LWR@minipageheight}{#2}}%
+\ifblank{#2}{}{\setlength{\LWR@minipageheight}{#2}}%
\addtocounter{LWR@minipagedepth}{1}%
\ifbool{FormatWP}{\newline}{}%
\LWR@stoppars%
@@ -10641,7 +10721,7 @@ autopage-\theLWR@currentautosec%
{width:\LWR@printlength{\LWR@minipagewidth} ; }%
}%
\LWR@traceinfo{minipage: about to print the height}%
-\IfValueT{#2}{height:\LWR@printlength{\LWR@minipageheight} ; }%
+\ifblank{#2}{}{height:\LWR@printlength{\LWR@minipageheight} ; }%
"}%
\setlength{\linewidth}{#4}% the original width
@@ -10683,8 +10763,12 @@ autopage-\theLWR@currentautosec%
\LWR@traceinfo{LWR@minipage: done}%
}
+\NewDocumentEnvironment{LWR@HTML@minipage}{O{t} O{} O{t} m}
+ {\LWR@HTML@sub@minipage{#1}{#2}{#3}{#4}}
+ {\endLWR@HTML@sub@minipage}
+
\LWR@formattedenv{minipage}
-\NewDocumentCommand{\LWR@HTML@parbox}{O{t} o O{t} m +m}
+\NewDocumentCommand{\LWR@HTML@parbox}{O{t} O{} O{t} m +m}
{
\LWR@traceinfo{parbox of width #4}%
\begin{minipage}[#1][#2][#3]{#4}%
@@ -10925,6 +11009,24 @@ width:\LWR@printlength{\LWR@tempwidth}%
\DeclareRobustCommand{\LWR@null@textsc}[1]{#1}
+\@ifundefined{textsi}{
+ \LetLtxMacro\LWR@print@textsi\LWR@print@textsc
+}{}
+
+\DeclareRobustCommand{\LWR@HTML@textsi}[1]{%
+ {%
+ \sishape%
+ \InlineClass(
+ font-style: italic;
+ font-variant: small-caps ;
+ font-variant-numeric: oldstyle-nums ;
+ ){textsi}{#1}%
+ }%
+}
+\LWR@formatted{textsi}
+
+\DeclareRobustCommand{\LWR@null@textsi}[1]{#1}
+
\DeclareRobustCommand{\LWR@HTML@textsl}[1]{%
{%
\slshape%
@@ -10962,6 +11064,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
\LetLtxMacro\textup\LWR@null@textup%
\LetLtxMacro\textit\LWR@null@textit%
\LetLtxMacro\textsc\LWR@null@textsc%
+\LetLtxMacro\textsi\LWR@null@textsi%
\LetLtxMacro\textsl\LWR@null@textsl%
\LetLtxMacro\textnormal\LWR@null@textnormal%
\LetLtxMacro\rmfamily\LWR@null@rmfamily%
@@ -10972,6 +11075,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
\LetLtxMacro\upshape\LWR@null@upshape%
\LetLtxMacro\slshape\LWR@null@slshape%
\LetLtxMacro\scshape\LWR@null@scshape%
+\LetLtxMacro\sishape\LWR@null@sishape%
\LetLtxMacro\itshape\LWR@null@itshape%
\LetLtxMacro\normalfont\LWR@null@normalfont%
\LetLtxMacro\em\LWR@null@em%
@@ -11045,6 +11149,12 @@ width:\LWR@printlength{\LWR@tempwidth}%
\renewrobustcmd*{\scshape}{\renewcommand*{\LWR@f@shape}{sc}}
+\@ifundefined{sishape}{
+ \newrobustcmd*{\sishape}{\renewcommand*{\LWR@f@shape}{si}}
+}{
+ \renewrobustcmd*{\sishape}{\renewcommand*{\LWR@f@shape}{si}}
+}
+
\renewrobustcmd*{\slshape}{\renewcommand*{\LWR@f@shape}{sl}}
\renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape}
@@ -11184,7 +11294,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
\renewrobustcmd*{\quad}{%
\LWR@minipagestoppars%
-\HTMLunicode{2001}%
+\HTMLunicode{2003}%
\LWR@minipagestartpars%
}
@@ -11192,7 +11302,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
\renewrobustcmd*{\enskip}{%
\LWR@minipagestoppars%
-\HTMLunicode{2000}%
+\HTMLunicode{2002}%
\LWR@minipagestartpars%
}
@@ -11452,25 +11562,8 @@ width:\LWR@printlength{\LWR@tempwidth}%
\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@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 @@ width:\LWR@printlength{\LWR@tempwidth}%
\thesubsubsection.\@arabic\c@paragraph}
\renewcommand{\thesubparagraph}{%
\theparagraph.\@arabic\c@subparagraph}
+ \@ifundefined{chapter}{
+ \renewcommand{\thefigure}{\@arabic\c@figure}
+ \renewcommand{\thetable}{\@arabic\c@table}
+ }{
+ \renewcommand{\thefigure}{%
+ \ifnum\c@chapter>\z@\thechapter.\fi\@arabic\c@figure}
+ \renewcommand{\thetable}{%
+ \ifnum\c@chapter>\z@\thechapter.\fi\@arabic\c@table}
+ }
}
\@ifclassloaded{ujarticle}{\LWR@patchujtclasses}{}
@@ -11507,6 +11609,17 @@ width:\LWR@printlength{\LWR@tempwidth}%
\@ifclassloaded{utarticle}{\LWR@patchujtclasses}{}
\@ifclassloaded{utbook}{\LWR@patchujtclasses}{}
\@ifclassloaded{utreport}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjarticle}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjbook}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjreport}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjsarticle}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjsbook}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjsreport}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjskiyou}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjspf}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjtarticle}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjtbook}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ltjtreport}{\LWR@patchujtclasses}{}
\end{warpHTML}
\begin{warpHTML}