lwarp (10dec18)

git-svn-id: svn://tug.org/texlive/trunk@49377 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 295 insertions, 35 deletions

diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty
index 5d9a249d838..c053eefa08c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty
@@ -15,11 +15,14 @@
 %%   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{addlines}
-\newcommand*\addlines[1][1]{}
+\LWR@ProvidesPackageDrop{addlines}[2018/12/05]
+\newcommand\addlines{\@ifstar\addlines@a\addlines@a}
+\newcommand\addlines@a[1][1]{}
 \let\addline\addlines
-\newcommand*\removelines[1][1]{}
+\newcommand\removelines{\@ifstar\removelines@a\removelines@a}
+\newcommand\removelines@a[1][1]{}
 \let\removeline\removelines
+\newcommand\squeezepage[1][0]{}
 \endinput
 %%
 %% End of file `lwarp-addlines.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
index 32f32476404..b286738419d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
@@ -18,7 +18,7 @@
 \LWR@ProvidesPackageDrop{anonchap}
 \newcommand{\simplechapter}[1][\@empty]{%
     \def\@chapcntformat##1{%
-        #1~\csname the##1\endcsname\simplechapterdelim\protect\quad%
+        #1~\csname the##1\endcsname\simplechapterdelim\quad%
     }%
 }
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty
new file mode 100644
index 00000000000..2195151c4d7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty
@@ -0,0 +1,24 @@
+%%
+%% This is file `lwarp-biblatex.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `biblatex')
+%% 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.
+\ifdef{\newfloat@addtocontents@ORI}{
+    \let\addtocontents\newfloat@addtocontents@ORI
+}{}
+\LWR@ProvidesPackagePass{biblatex}
+\endinput
+%%
+%% End of file `lwarp-biblatex.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bsheaders.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bsheaders.sty
new file mode 100644
index 00000000000..975f27f81e8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bsheaders.sty
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-bsheaders.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `bsheaders')
+%% 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{bsheaders}[1997/10/06]
+\endinput
+%%
+%% End of file `lwarp-bsheaders.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty
new file mode 100644
index 00000000000..a12491c0900
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-gmeometric.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `gmeometric')
+%% 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{gmeometric}
+\endinput
+%%
+%% End of file `lwarp-gmeometric.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginal.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginal.sty
new file mode 100644
index 00000000000..2ca7a484b01
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginal.sty
@@ -0,0 +1,24 @@
+%%
+%% This is file `lwarp-marginal.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `marginal')
+%% 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{marginal}
+\newcommand*{\showlostmarginals}{}
+\newcommand*{\enlargefreelist}{}
+\newcommand*{\onesidemarginals}{}
+\endinput
+%%
+%% End of file `lwarp-marginal.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty
new file mode 100644
index 00000000000..0c510086198
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-rmpage.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `rmpage')
+%% 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{rmpage}
+\endinput
+%%
+%% End of file `lwarp-rmpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
index 0d8a6abd786..da728c6b0e1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
@@ -35,17 +35,17 @@
 \NewDocumentCommand{\ofoot}{s o m}{}
 \NewDocumentCommand{\cfoot}{s o m}{}
 \NewDocumentCommand{\ifoot}{s o m}{}
-\DeclareDocumentCommand{\automark}{s o m}{}
-\DeclareDocumentCommand{\manualmark}{}{}
 \DeclareDocumentCommand{\MakeMarkcase}{m}{#1}
-\DeclareDocumentCommand{\GenericMarkFormat}{}{}
 \newcommand*{\defpairofpagestyles}[3][]{}
 \newcommand*{\newpairofpagestyles}[3][]{}
 \newcommand*{\renewpairofpagestyles}[3][]{}
 \newcommand*{\providepairofpagestyles}[3][]{}
-\newcommand*{\clearmainofpairofpagestyles}
-\newcommand*{\clearplainofpairofpagestyles}
-\newcommand*{\clearpairofpagestyles}
+\newcommand*{\clearmainofpairofpagestyles}{}
+\newcommand*{\clearplainofpairofpagestyles}{}
+\newcommand*{\clearpairofpagestyles}{}
+\newcommand*{\clearscrheadings}{}
+\newcommand*{\clearscrheadfoot}{}
+\newcommand*{\clearscrplain}{}
 \NewDocumentCommand{\deftriplepagestyle}{m o o m m m m m m}{}
 \NewDocumentCommand{\newtriplepagestyle}{m o o m m m m m m}{}
 \NewDocumentCommand{\renewtriplepagestyle}{m o o m m m m m m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
index ca9546729f3..90ceb7be7e9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
@@ -71,7 +71,12 @@
 \DeclareDocumentCommand{\automark}{s o m}{}
 \DeclareDocumentCommand{\manualmark}{}{}
 \DeclareDocumentCommand{\MakeMarkcase}{m}{#1}
-\DeclareDocumentCommand{\GenericMarkFormat}{}{}
+\newcommand{\partmarkformat}{}
+\if@chapter
+\newcommand{\chaptermarkformat}{}
+\fi
+\newcommand{\sectionmarkformat}{}
+\DeclareDocumentCommand{\GenericMarkFormat}{m}{}
 \newcommand*{\@mkleft}[1]{}
 \newcommand*{\@mkright}[1]{}
 \newcommand*{\@mkdouble}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty
new file mode 100644
index 00000000000..12a5c2b3f5a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty
@@ -0,0 +1,61 @@
+%%
+%% This is file `lwarp-scrpage2.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `scrpage2')
+%% 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{scrpage2}
+\@ifundefined{footheight}{\newlength\footheight}{}
+\NewDocumentCommand{\lehead}{o m}{}
+\NewDocumentCommand{\cehead}{o m}{}
+\NewDocumentCommand{\rehead}{o m}{}
+\NewDocumentCommand{\lohead}{o m}{}
+\NewDocumentCommand{\cohead}{o m}{}
+\NewDocumentCommand{\rohead}{o m}{}
+\NewDocumentCommand{\lefoot}{o m}{}
+\NewDocumentCommand{\cefoot}{o m}{}
+\NewDocumentCommand{\refoot}{o m}{}
+\NewDocumentCommand{\lofoot}{o m}{}
+\NewDocumentCommand{\cofoot}{o m}{}
+\NewDocumentCommand{\rofoot}{o m}{}
+\NewDocumentCommand{\ohead}{o m}{}
+\NewDocumentCommand{\chead}{o m}{}
+\NewDocumentCommand{\ihead}{o m}{}
+\NewDocumentCommand{\ofoot}{o m}{}
+\NewDocumentCommand{\cfoot}{o m}{}
+\NewDocumentCommand{\ifoot}{o m}{}
+\DeclareDocumentCommand{\automark}{o m}{}
+\DeclareDocumentCommand{\manualmark}{}{}
+\DeclareDocumentCommand{\MakeMarkcase}{m}{#1}
+\NewDocumentCommand{\deftripstyle}{m o o m m m m m m}{}
+\NewDocumentCommand{\defpagestyle}{s m m m}{}
+\NewDocumentCommand{\newpagestyle}{s m m m}{}
+\NewDocumentCommand{\renewpagestyle}{s m m m}{}
+\NewDocumentCommand{\providepagestyle}{s m m m}{}
+\newcommand{\partmarkformat}{}
+\if@chapter
+\newcommand{\chaptermarkformat}{}
+\fi
+\newcommand{\sectionmarkformat}{}
+\newcommand{\subsectionmarkformat}{}
+\newcommand{\subsubsectionmarkformat}{}
+\newcommand{\paragraphmarkformat}{}
+\newcommand{\subparagraphmarkformat}{}
+
+\newcommand*{\clearscrheadings}{}
+\newcommand*{\clearscrheadfoot}{}
+\newcommand*{\clearscrplain}{}
+\endinput
+%%
+%% End of file `lwarp-scrpage2.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
index e7ded808202..6708e2e6a6a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
@@ -51,7 +51,7 @@
 }{}
 \DeclareDocumentCommand{\simplechapter}{O{\@empty}}{%
     \def\@chapcntformat##1{%
-        #1~\csname the##1\endcsname\simplechapterdelim\protect\quad%
+        #1~\csname the##1\endcsname\simplechapterdelim\quad%
     }%
 }
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 0ad1c8aa5b0..919e949e4af 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/03 v0.63  Allows LaTeX to directly produce HTML5 output.]
+    [2018/12/08 v0.64  Allows LaTeX to directly produce HTML5 output.]
 
 
 
@@ -129,9 +129,6 @@ or is superceded by another class.
 For a possible alternative, see class(es) #2.}
 }{}%
 }
-\LWR@earlyclassloadnever{utarticle}{ujarticle}
-\LWR@earlyclassloadnever{utbook}{ujbook}
-\LWR@earlyclassloadnever{utreport}{ujreport}
 \LWR@earlyloadnever{ae}{cm-super, lmodern}
 \LWR@earlyloadnever{aecompl}{cm-super, lmodern}
 \LWR@earlyloadnever{aecc}{cm-super, lmodern}
@@ -141,7 +138,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}
+\LWR@earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle, utarticle}
 \LWR@earlyloadnever{hangul}{kotex, xetexko, luatexko}
 \LWR@earlyloadnever{fancyheadings}{fancyhdr}
 \LWR@earlyloadnever{glossary}{glossaries}
@@ -192,6 +189,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{boxedminipage2e}
 \LWR@loadafter{breakurl}
 \LWR@loadafter{breqn}
+\LWR@loadafter{bsheaders}
 \LWR@loadafter{bxpapersize}
 \LWR@loadafter{bytefield}
 \LWR@loadafter{cancel}
@@ -280,6 +278,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{fullwidth}
 \LWR@loadafter{fwlw}
 \LWR@notbxjsloadafter{geometry}
+\LWR@loadafter{gmeometric}
 \LWR@loadafter{glossaries}
 \LWR@loadafter{glossary}
 \LWR@loadafter{grffile}
@@ -389,6 +388,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{relsize}
 \LWR@loadafter{repeatindex}
 \LWR@loadafter{resizegather}
+\LWR@loadafter{rmpage}
 \LWR@loadafter{romanbar}
 \LWR@loadafter{romanbarpagenumber}
 \LWR@loadafter{rotating}
@@ -401,6 +401,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{scrlayer}
 \LWR@loadafter{scrlayer-notecolumn}
 \LWR@loadafter{scrlayer-scrpage}
+\LWR@loadafter{scrpage2}
 \LWR@loadafter{section}
 \LWR@loadafter{sectionbreak}
 \LWR@loadafter{sectsty}
@@ -468,7 +469,6 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{vpe}
 \LWR@loadafter{vwcol}
 \LWR@loadafter{wallpaper}
-\LWR@loadafter{wasysym}
 \LWR@loadafter{watermark}
 \LWR@loadafter{widows-and-orphans}
 \LWR@loadafter{wrapfig}
@@ -900,11 +900,16 @@ For a possible alternative, see class(es) #2.}
 \newcommand*{\LWR@checkloadfilename}[1]{%
 \LWR@checkloadnever{#1}{ae}{latinmodern}
 \LWR@checkloadnever{#1}{aecc}{latinmodern}
+\LWR@checkloadnever{#1}{bitfield}{bytefield}
 \LWR@checkloadnever{#1}{boxedminipage}{boxedminipage2e}
 \LWR@checkloadnever{#1}{caption2}{caption}
 \LWR@checkloadnever{#1}{ccaption}{caption}
+\LWR@checkloadnever{#1}{doublespace}{setspace}
 \LWR@checkloadnever{#1}{fancyheadings}{fancyhdr}
 \LWR@checkloadnever{#1}{glossary}{glossaries}
+\LWR@checkloadnever{#1}{newthm}{ntheorem}
+\LWR@checkloadnever{#1}{rplain}{fancyhdr}
+\LWR@checkloadnever{#1}{si}{siunitx}
 \LWR@checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx}
 \LWR@checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
 \LWR@checkloadbefore{#1}{ctex}
@@ -1576,6 +1581,9 @@ For a possible alternative, see class(es) #2.}
 \@ifclassloaded{ujarticle}{\LWR@compileuplatex}{}
 \@ifclassloaded{ujbook}{\LWR@compileuplatex}{}
 \@ifclassloaded{ujreport}{\LWR@compileuplatex}{}
+\@ifclassloaded{utarticle}{\LWR@compileuplatex}{}
+\@ifclassloaded{utbook}{\LWR@compileuplatex}{}
+\@ifclassloaded{utreport}{\LWR@compileuplatex}{}
 \ifdefempty{\LWR@PrintLatexCmd}{
     \def\LWR@PrintLatexCmd{\LWR@tempprintlatexcmd}
 }{}
@@ -1672,7 +1680,7 @@ body {
 p {margin: 1.5ex 0em 1.5ex 0em ;}
 table p {margin: .5ex 0em .5ex 0em ;}
 
-/* Holds a section number to add space between it and the name */
+/* Holds a section number */
 span.sectionnumber { margin-right: 0em }
 
 /* Inserted in front of index lines */
@@ -3639,7 +3647,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-
 
 -- Copyright 2016-2018 Brian Dunn
 
-printversion = "v0.63"
+printversion = "v0.64"
 requiredconfversion = "1" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -5825,7 +5833,7 @@ end -- not --version
 }
 \newcounter{LWR@prevFileDepth}
 \setcounter{LWR@prevFileDepth}{\LWR@depthsubparagraph}
-\def\@seccntformat#1{\csname the#1\endcsname\protect\quad}
+\def\@seccntformat#1{\csname the#1\endcsname\quad}
 \newcommand*{\simplechapterdelim}{}
 \let\@chapcntformat\@seccntformat
 \let\@partcntformat\@seccntformat
@@ -5919,7 +5927,11 @@ end -- not --version
             \LWR@traceinfo{LWR@section: about to addcontentsline}%
             \addcontentsline{toc}{#4}%
             {%
-                 \protect\numberline{\@nameuse{the#4}}%
+                \protect\numberline{%
+                    \@nameuse{pre#4name}%
+                    \@nameuse{the#4}%
+                    \@nameuse{post#4name}%
+                }%
                 {%
                     \ignorespaces%
                     \IfValueTF{#2}{\LWR@isolate{#2}}{\LWR@isolate{#3}}\protect\relax%
@@ -5944,7 +5956,7 @@ end -- not --version
         \ifthenelse{%
             \(\cnttest{\@nameuse{LWR@depth#4}}{<=}%
                 {\value{secnumdepth}}\) \AND%
-            \(\cnttest{\@nameuse{LWR@depth#4}}{<=}{\LWR@depthpart}\)%
+            \(\cnttest{\@nameuse{LWR@depth#4}}{=}{\LWR@depthpart}\)%
         }%
         {\@partnameformat}%
         {}%
@@ -5954,9 +5966,8 @@ end -- not --version
         }%
         {%
             \ifstrequal{#4}{part}%
+            {\protect\LWR@sectionnumber{\@partcntformat{#4}}}%
             {%
-                \protect\LWR@sectionnumber{\@partcntformat{#4}}%
-            }{%
                 \ifstrequal{#4}{chapter}%
                     {\protect\LWR@sectionnumber{\@chapcntformat{#4}}}%
                     {\protect\LWR@sectionnumber{\@seccntformat{#4}}}%
@@ -5995,6 +6006,28 @@ end -- not --version
 }
 
 
+\providecommand*{\prepartname}{}
+\providecommand*{\postpartname}{}
+
+\providecommand*{\prechaptername}{}
+\providecommand*{\postchaptername}{}
+
+\providecommand*{\presectionname}{}
+\let\postsectionname\presectionname
+
+\let\presubsectionname\presectionname
+\let\postsubsectionname\postsectionname
+
+\let\presubsubsectionname\presectionname
+\let\postsubsubsectionname\postsectionname
+
+\let\preparagraphname\presectionname
+\let\postparagraphname\postsectionname
+
+\let\presubparagraphname\presectionname
+\let\postsubparagraphname\postsectionname
+
+
 \newcommand{\part@preamble}{}% for koma-script
 
 \DeclareDocumentCommand{\part}{s o m}{%
@@ -6095,13 +6128,17 @@ end -- not --version
 }
 
 \ifPDFTeX% pdflatex or dvi latex
-\ifdefstring{\inputencodingname}{utf8}{%
-    \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash
-}{%
-    \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen
-}%
+    \ifdefstring{\inputencodingname}{utf8}{%
+        \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash
+    }{%
+        \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen
+    }%
 \else%
-    \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash
+    \ifpTeX
+        \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen
+    \else
+        \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash
+    \fi%
 \fi%
 
 \newcommand*{\HTMLTitleBeforeSection}{%
@@ -6223,7 +6260,7 @@ end -- not --version
 \LWR@origonecolumn%
 \LWR@origpagestyle{empty}%
 \overfullrule=0pt
-\LWR@print@scriptsize%
+\LWR@print@footnotesize%
 \LWR@print@raggedright%
 \LetLtxMacro{\\}{\LWR@endofline}%
 \linespread{1.3}%
@@ -11145,15 +11182,15 @@ width:\LWR@printlength{\LWR@tempwidth}%
 \ifbool{LWR@minipagethispar}{\LWR@stoppars}{}%
 }
 
-\renewcommand*{\quad}{%
+\renewrobustcmd*{\quad}{%
 \LWR@minipagestoppars%
 \HTMLunicode{2001}%
 \LWR@minipagestartpars%
 }
 
-\renewcommand*{\qquad}{\quad\quad}
+\renewrobustcmd*{\qquad}{\quad\quad}
 
-\renewcommand*{\enskip}{%
+\renewrobustcmd*{\enskip}{%
 \LWR@minipagestoppars%
 \HTMLunicode{2000}%
 \LWR@minipagestartpars%
@@ -11430,6 +11467,49 @@ width:\LWR@printlength{\LWR@tempwidth}%
 \end{warpHTML}
 
 \begin{warpHTML}
+\newcommand*{\LWR@patchujtclasses}{
+    \let\tate\relax
+    \DeclareDocumentCommand{\rensuji}{m}{##1}
+    \def\@partnameformat{}% uj/t does not use \partname
+    \def\@partcntformat##1{%
+        \prepartname%
+        \csname the##1\endcsname%
+        \postpartname%
+        \quad%
+    }
+    \@ifundefined{chapter}{}{
+        \def\@chapcntformat##1{%
+            \prechaptername%
+            \csname the##1\endcsname%
+            \postchaptername%
+            \quad%
+        }
+    }
+    \renewcommand{\thepart}{\@Roman\c@part}
+    \@ifundefined{chapter}{
+        \renewcommand{\thesection}{\@arabic\c@section}
+    }{
+        \renewcommand{\thechapter}{\@arabic\c@chapter}
+        \renewcommand{\thesection}{\thechapter.\@arabic\c@section}
+    }
+    \renewcommand{\thesubsection}{\thesection.\@arabic\c@subsection}
+    \renewcommand{\thesubsubsection}{%
+    \thesubsection.\@arabic\c@subsubsection}
+    \renewcommand{\theparagraph}{%
+    \thesubsubsection.\@arabic\c@paragraph}
+    \renewcommand{\thesubparagraph}{%
+    \theparagraph.\@arabic\c@subparagraph}
+}
+
+\@ifclassloaded{ujarticle}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ujbook}{\LWR@patchujtclasses}{}
+\@ifclassloaded{ujreport}{\LWR@patchujtclasses}{}
+\@ifclassloaded{utarticle}{\LWR@patchujtclasses}{}
+\@ifclassloaded{utbook}{\LWR@patchujtclasses}{}
+\@ifclassloaded{utreport}{\LWR@patchujtclasses}{}
+\end{warpHTML}
+
+\begin{warpHTML}
 \AtBeginDocument{
     \@ifpackageloaded{ctexpatch}{%
         \def\@partcntformat#1{%