texlive[49318] trunk: lwarp (4dec18)

commits+karl at tug.org commits+karl at tug.org
Wed Dec 5 00:10:56 CET 2018


Revision: 49318
          http://tug.org/svn/texlive?view=revision&revision=49318
Author:   karl
Date:     2018-12-05 00:10:56 +0100 (Wed, 05 Dec 2018)
Log Message:
-----------
lwarp (4dec18)

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-CJK.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty

Added Paths:
-----------
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty

Removed Paths:
-------------
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ae.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-aecc.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption2.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ctex.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyheadings.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-glossary.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenx.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-morewrites.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-t1enc.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wasysym.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xeCJK.sty

Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua	2018-12-04 23:10:56 UTC (rev 49318)
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2018 Brian Dunn
 
-printversion = "v0.62"
+printversion = "v0.63"
 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-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,5 +1,5 @@
 
-LaTeX lwarp package v0.62   README.txt
+LaTeX lwarp package v0.63   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-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua	2018-12-04 23:10:56 UTC (rev 49318)
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2018 Brian Dunn
 
-printversion = "v0.62"
+printversion = "v0.63"
 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-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx	2018-12-04 23:10:56 UTC (rev 49318)
@@ -16,7 +16,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{lwarp}
-%<package>    [2018/11/19 v0.62  Allows LaTeX to directly produce HTML5 output.]
+%<package>    [2018/12/03 v0.63  Allows LaTeX to directly produce HTML5 output.]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -196,6 +196,7 @@
 \newcommand{\thinbrspace}{\hspace{.16667em}\penalty\exhyphenpenalty\hspace{0pt}}
 \newrobustcmd{\Dash}{\unskip\thinspace\textemdash\thinbrspace}
 \newrobustcmd{\dash}{\unskip\thinspace\mbox{--}\thinbrspace}
+\newrobustcmd{\Slash}{\unskip\thinspace/\thinbrspace}
 
 
 \newcommand{\ItemDescribeMacro}[1]{%
@@ -356,7 +357,9 @@
 \newcommand{\spslash}{\unskip\kern.085em/\hspace{.085em}\penalty\exhyphenpenalty\hspace{0pt}}
 
 \makeatletter
-\newcommand*{\rulebreak}{\bigskip\hfill\rule[.7ex]{.3\linewidth}{.4pt}\hspace*{\fill}\bigskip\@afterheading}
+\newcommand*{\rulebreak}{%
+    \bigskip\hfill\rule[.7ex]{.3\linewidth}{.4pt}\hspace*{\fill}\bigskip\@afterheading%
+}
 \makeatother
 
 \newcommand{\DescribeDefault}[1]{\margintag{\footnotesize \textgreen{Default: \texttt{#1}}}}
@@ -2218,11 +2221,17 @@
 \margintag{theoremtitlefont}
 in braces in the \pkg{mdframed} source.
 
-Footnotes are currently placed at the bottom of the \HTML\ page.
-\margintag{footnotes}
-
 \optn{userdefinedwidth} and \optn{align} are currently ignored.
 \margintag{ignored options}
+
+Environments created or encapsulated by \pkg{mdframed} are enclosed in a
+\margintag{\CSS\ classes}
+\element{div} of class \attribute{mdframed}, and also
+class \attribute{md<environmentname>} for new environments.
+
+Frame titles are placed in a \element{div} of class |mdframedtitle|.
+Subtitles are in a \element{div} of class |mdframedsubtitle|,
+and likewise for subsubtitles.
 }
 
 \newcommand{\limitscaption}{%
@@ -2552,7 +2561,7 @@
 %<*package>
 % \fi
 %
-% \CheckSum{26573}
+% \CheckSum{26829}
 %
 % \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
@@ -2657,6 +2666,7 @@
 % \changes{v0.60}{2018/09/19}{\ 2018/09/19}
 % \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}
 
 
 
@@ -2856,8 +2866,37 @@
 %
 % \begin{description}
 % \needspace{2\baselineskip}
-% \item[v0.62:] MiK\TeX\ docs, \HTML\ title, C\TeX\, \pkg{xeCJK}, \pkg{bitpattern}.
+% \item[v0.63:] \pkg{mdframed}, Chinese, Japanese, Korean
 %   \begin{itemize}
+%       \item Added \cs{linkhomename}: A user-definable name for the \UI{Home} link.
+%       \margintag{localization}
+%       \item Documented \cs{sidetocname}: A user-definable name for the side\TOC.
+%       \item Fix: \cs{LinkHome} for print output.
+%       \margintag{fixes}
+%       \item Moved package load checks to the \pkg{lwarp} core
+%       \margintag{optimizations}
+%           to reduce the number of \filenm{lwarp-*} files.
+%       \item \pkg{mdframed}: Fix with \pkg{amsthm}, improved titles and font control.
+%       \margintag{packages}
+%           Improved rule widths.
+%       \item Fixes for \pkg{xeCJK}.
+%       \margintag{Chinese}
+%       \item Added \pkg{xpinyin}, \pkg{zhlineskip}.
+%       \item Verified to work with \pkg{cjkpunct}, \pkg{upzhkinsoku}, \pkg{zhspacing}.
+%       \item Verified to work with \pkg{zxjatype}, \pkg{luatexja}, \pkg{luatexja-fontspec}.
+%       \margintag{Japanese}
+%       \item Added \pkg{bxjsarticle} and related classes.
+%       \item Added \pkg{ltjsarticle} and related classes.
+%       \item Added p\LaTeX, up\LaTeX, \pkg{ujarticle} and related classes.
+%       \item Prevented \pkg{utarticle} and related classes.
+%       \item Prevented \pkg{bxcjkatype}.
+%       \item Verified to work with \pkg{kotex}, \pkg{xetexko}, \pkg{luatexko}.
+%       \margintag{Korean}
+%   \end{itemize}
+%
+% \needspace{2\baselineskip}
+% \item[v0.62:] MiK\TeX\ docs, \HTML\ title, C\TeX, \pkg{xeCJK}, \pkg{bitpattern}.
+%   \begin{itemize}
 %       \item Docs: Setting a \UTF-8 locale.  See \cref{sec:utf8locale}.
 %           \margintag{docs}
 %       \item MiK\TeX: Docs for \prog{MiKTeX Console} and \pkg{miktex-poppler-bin}.
@@ -2878,6 +2917,9 @@
 %       \item Fixes for \cs{includgraphics} filename, and with \bool{FormatWP}.
 %       \item Fix: \CSS\ for \cs{textup}.
 %       \item Fix: Added \cs{slshape}.
+%       \item Added \pkg{ctex} package and related classes, \pkg{xeCJK}.
+%       \margintag{Chinese}
+%       \item Prevented \pkg{CJK}, \pkg{CJKutf8} unless \pkg{xeCJK}, \pkg{ctex} are used.
 %       \item \pkg{chemfig}: Docs for new macro \cs{polymerdelim}.
 %           \margintag{packages}
 %       \item \pkg{asymptote}: Docs for compilation.
@@ -2890,8 +2932,6 @@
 %       \item \pkg{textcomp} and \pkg{xunicode}: Fix conflicts with \cs{textcircled}.
 %       \item \pkg{ulem}: Improved compatibility with \pkg{CJKulem}, \env{lateximage}.
 %       \item MathJax and \pkg{siunitx}: Removed inoperable extension.
-%       \item Added \pkg{ctex} package and related classes, \pkg{xeCJK}.
-%       \item Prevented \pkg{CJK}, \pkg{CJKutf8} unless \pkg{xeCJK}, \pkg{ctex} are used.
 %       \item Added \pkg{bitpattern}, \pkg{pdfcomment},
 %           \pkg{pdfmarginpar}, \pkg{tram}, \pkg{unitsdef}, \pkg{xechangebar}.
 %       \item Added \pkg{musicography}, \pkg{octave}, \pkg{semantic-markup}.
@@ -4177,7 +4217,7 @@
 %
 % \midrule
 %
-% Engines: & \DVI\ \LaTeX, pdf\LaTeX, \XeLaTeX, \LuaLaTeX \\
+% Engines: & \DVI\ \LaTeX, pdf\LaTeX, \XeLaTeX, \LuaLaTeX, p\LaTeX, up\LaTeX \\
 %
 % Compiling: & \pkg{latexmk}, \pkg{perltex}, \pkg{pythontex}, \prog{make}, etc. \\
 %
@@ -4184,7 +4224,9 @@
 % \midrule
 %
 % Classes: & \pkg{article}, \pkg{book}, \pkg{report},
-%   \pkg{scrartcl}, \pkg{scrbook}, \pkg{scrreprt}, \pkg{memoir}, C\TeX-related. \\
+%   \pkg{scrartcl}, \pkg{scrbook}, \pkg{scrreprt}, \pkg{memoir}, C\TeX-related,
+%       \pkg{bxjsarticle} and related, \pkg{ltjsarticle} and relatex,
+%       \pkg{ujarticle} and related. \\
 %
 % Koma-script: & \pkg{scrextend}, \pkg{scrhack}, \pkg{scrlayer}.
 %   Others as listed below. \\
@@ -4191,8 +4233,24 @@
 %
 % Memoir: & \pkg{memhfixc} \\
 %
-% Languages: & \pkg{babel}, \pkg{ctex}, \pkg{polyglossia}, \pkg{xeCJK}. \\
+% \midrule
 %
+% Languages: & \pkg{babel}, \pkg{polyglossia}.
+%       \pkg{cjkpunct}, \pkg{xeCJK}.\\
+%
+% Chinese: & C\TeX, \pkg{ctex},
+%       \pkg{upzhkinsoku},
+%       \pkg{xpinyin}, \pkg{zhlineskip}, \pkg{zhspacing}. \\
+%
+% Japanese: & p\LaTeX, up\LaTeX, 
+%       \pkg{bxjsarticle} and related,
+%       \pkg{ltjsarticle} and related,
+%       \pkg{luatexja}, \pkg{luatexja-fontspec},
+%       \pkg{ujarticle} and related,
+%       \pkg{zxjatype}. \\
+%
+% Korean: & \pkg{kotex}, \pkg{luatexko}, \pkg{xetexko}. \\
+%
 % \midrule
 %
 % Page layout: & \pkg{2in1}, \pkg{2up}, \pkg{a4}, \pkg{a4wide}, \pkg{a5comb},
@@ -5912,6 +5970,7 @@
 % \begin{table}
 % \caption{\pkg{lwarp} package options\label{tab:options}}
 % \centering
+% \renewcommand{\arraystretch}{1.2}
 % \begin{tabular}{>{\ttfamily}lp{3.25in}}
 % Option & Description \\ \midrule
 % mathsvg & Show math using \SVG\ images. \\
@@ -6257,11 +6316,16 @@
 % \label{tab:htmlsettings}
 % \begin{tabular}{>{\ttfamily}lp{3in}}
 % \toprule
-% Option & Description \\ \midrule
+% Macro \Slash Cntr \Slash Bool & Description \\ \midrule
+% \cs{linkhomename} & Name of the link to the homepage. \\
+% \midrule
 % SideTOCDepth & Sectioning depth of the side\TOC. \\
+% \cs{sidetocname} & Name of the side\TOC. \\
+% \midrule
 % FileDepth & Sectioning depth of the file splits. \\
 % CombineHigherDepths & Combine higher section levels. \\
 % FileSectionNames & Use section names for file names, else use numbers. \\
+% \midrule
 % FootnoteDepth & Sectioning depth of footnotes. \\
 % \midrule
 % \cs{abstractname} & The name of the abstract. \\
@@ -6360,6 +6424,10 @@
 %
 %   \begin{description}
 %
+% \ItemDescribeMacro{\linkhomename} \DescribeDefault{Home}
+%   Name of the link to the home page.  Paragraphs are allowed.
+% \changes{v0.63}{2018/11/29}{Docs: \cs{linkhomename}.}
+%
 % \ItemDescribeCounter{tocdepth} Sectioning depth of the table of contents.
 %   See \cref{sec:stackdepths} for a list of \LaTeX{} stack depths.
 %
@@ -6394,6 +6462,10 @@
 %       \trouble{HTML>inaccessible pages}
 %       \trouble{sectioning>missing}
 %
+% \ItemDescribeMacro{\sidetocname} \DescribeDefault{Contents}
+%   Name of the side\TOC.  Paragraphs are allowed.
+% \changes{v0.63}{2018/11/29}{Docs: \cs{sidetocname}.}
+%
 % \ItemDescribeCounter{FileDepth}  \DescribeDefault{-5}
 %   Sectioning depth of file splits.
 %   Defaults to -5, causing the entire \HTML\ website to be one single file.
@@ -6459,12 +6531,6 @@
 %   so the rest of the filename must be sufficiently unique to avoid name collisions.
 %   \gindex{file>unique names}
 %
-%   If \pkg{ctex} or its related classes are used,
-%   \trouble[\pkg{ctex}]{ctex=\pkg{ctex}>FileSectionNames=\bool{FileSectionNames}}
-%   \trouble{HTML>FileSectionNames=\bool{FileSectionNames}}
-%   \trouble{filename>ctex=\pkg{ctex}}
-%   \bool{FileSectionNames} is forced |false| to avoid spaces in the section names.
-%
 % \ItemDescribeCounter{FootnoteDepth} \DescribeDefault{3}
 %   Determines where to place pending footnotes.
 %   |3| places footnotes before each break down to the \cs{subsubsection} level.
@@ -9862,6 +9928,7 @@
 %
 % Detects \XeTeX{} and \LuaLaTeX:
 % \gindex{Xe\LaTeX>detection}\gindex{Lua\LaTeX>detection}
+%
 %    \begin{macrocode}
 \RequirePackage{iftex}
 \newif\ifxetexorluatex
@@ -9882,7 +9949,682 @@
 \RequirePackage{ifpdf}
 %    \end{macrocode}
 %
+% \changes{v0.63}{2018/11/25}{Added p\TeX support.}
 %
+%    \begin{macrocode}
+\RequirePackage{ifptex}
+%    \end{macrocode}
+%
+%
+%
+% \section{Early package requirements}
+%
+% \DescribePackage{etoolbox}
+% Provides \cs{ifbool} and other functions.
+%
+% \DescribePackage{xpatch}
+% Patches macros with optional arguments.
+%    \begin{macrocode}
+\RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc.
+\RequirePackage{xpatch}
+%    \end{macrocode}
+
+
+% \DescribePackage{ifplatform}
+% Provides \cs{ifwindows} to try to automatically detect
+% \brand{Windows} OS.
+%
+%    \begin{macrocode}
+\RequirePackage{ifplatform}% sense op-system platform
+%    \end{macrocode}
+%
+%
+%
+%
+% \DescribePackage{letltxmacro}
+%
+%    \begin{macrocode}
+\RequirePackage{letltxmacro}
+%    \end{macrocode}
+%
+%
+%
+% \section{Package load order}
+%
+% \changes{v0.21}{2017/02/22}{Add: Errors for misplaced packages.}
+%
+%
+% Several packages must never be used with \pkg{lwarp},
+% others should only be loaded before \pkg{lwarp},
+% and others should only be loaded after.
+% The \pkg{lwarp} core checks most of these cases.
+% In some \filenm{lwarp-*} packages, \cs{LWR at loadbefore} is used to trigger an error
+% if they are loaded after \pkg{lwarp}, while additional code provides necessary
+% patches for when they are loaded before.
+%
+% Packages which must be loaded after \pkg{lwarp} are enfoced by
+% a large number of \cs{LWR at loadafter} statements, below.
+% Some packages are emulated by \pkg{memoir}, and so these are tested by
+% \cs{LWR at notmemoirloadafter}, which does not cause an error if \pkg{memoir} is used.
+%
+% \cs{LWR at checkloadfilename} is used to check each filename to see if
+% it must never be loaded, or must always be loaded before \pkg{lwarp}.
+%
+%
+% \subsection{Tests of package load order}
+%
+% \begin{macro}{\LWR at loadafter} \marg{packagename} \quad
+% Error if this package was loaded before \pkg{lwarp}.
+%
+% \label{sec:loadafter}
+%
+%    \begin{macrocode}
+\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.}
+}
+{}
+}
+%    \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR at notmemoirloadafter} \marg{packagename} \quad
+% Error if not \pkg{memoir} class and this package was loaded before \pkg{lwarp}.
+%
+% \pkg{memoir} emulates many packages, and pretends that they have already been loaded.
+%
+% \changes{v0.45}{2017/12/03}{Added.}
+%    \begin{macrocode}
+\@ifclassloaded{memoir}
+{\newcommand*{\LWR at notmemoirloadafter}[1]{}}
+{\LetLtxMacro\LWR at notmemoirloadafter\LWR at loadafter}
+%    \end{macrocode}
+% \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
+% Error if not a \pkg{ltjs*} class and this package was loaded before \pkg{lwarp}.
+%
+% \changes{v0.63}{2018/11/24}{Added.}
+%    \begin{macrocode}
+\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]{}}{}
+%    \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR at loadbefore} \marg{packagename} \quad
+% Error if this package is loaded after \pkg{lwarp}.
+%
+% \changes{v0.33}{2017/07/06}{Fix: No \cs{PackageError} if already loaded.}
+%
+%    \begin{macrocode}
+\newcommand*{\LWR at loadbefore}[1]{%
+\@ifpackageloaded{#1}
+{}
+{
+\PackageError{lwarp}
+{Package #1 must be loaded before lwarp}
+{Move \detokenize{\usepackage}{#1} before \detokenize{\usepackage}{lwarp}.}
+}
+}
+%    \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR at checkloadbefore}
+%   \marg{thispackagename} \marg{packagename}
+%
+% If package names match, error if it is loaded after \pkg{lwarp}.
+%
+% \changes{v0.63}{2018/12/02}{Added.}
+%
+%    \begin{macrocode}
+\newcommand*{\LWR at checkloadbefore}[2]{%
+    \edef\LWR at tempone{#1}%
+    \ifdefstring{\LWR at tempone}{#2}{%
+        \LWR at loadbefore{#1}%
+    }{}%
+}
+%    \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR at loadnever} \marg{badpackagename} \marg{replacementpkgnames}
+%
+% The first packages is not supported, so tell the user to use the second instead.
+%
+% \changes{v0.25}{2017/03/16}{Added the ability to prevent conflicting packages.}
+%
+%    \begin{macrocode}
+\newcommand*{\LWR at loadnever}[2]{%
+\PackageError{lwarp}
+{Package #1 is not supported by lwarp's HTML conversion.
+Package(s) #2 may be useful instead}
+{Package #1 might conflict with lwarp in some way,
+or is superceded by another package.
+For a possible alternative, see package(s) #2.}
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\LWR at checkloadnever}
+%       \marg{thispackagename} \marg{badpackagename} \marg{replacementpkgnames}
+%
+% If this package name is the bad packagename, suggest the replacements instead.
+%
+% \changes{v0.63}{2018/12/01}{Added.}
+%
+%    \begin{macrocode}
+\newcommand*{\LWR at checkloadnever}[3]{%
+    \edef\LWR at tempone{#1}%
+    \ifdefstring{\LWR at tempone}{#2}{%
+        \LWR at loadnever{#2}{#3}%
+    }{}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\LWR at earlyloadnever} \marg{badpackagename} \marg{replacementpkgname}
+%
+% The first package is not supported, so tell the user to use the second instead.
+% This version checks immediately for packages which may have been loaded before \pkg{lwarp}.
+%
+% \changes{v0.54}{2018/04/06}{Added.}
+%
+%    \begin{macrocode}
+\newcommand*{\LWR at earlyloadnever}[2]{%
+\@ifpackageloaded{#1}{%
+\PackageError{lwarp}
+{Package #1 is not supported by lwarp's HTML conversion.
+Package(s) #2 may be useful instead}
+{Package #1 might conflict with lwarp in some way,
+or is superceded by another package.
+For a possible alternative, see package(s) #2.}
+}{}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\LWR at earlyclassloadnever} \marg{badclassname} \marg{replacementclassname}
+%
+% The first class is not supported, so tell the user to use the second instead.
+% This version checks immediately for classes which may have been loaded before \pkg{lwarp}.
+%
+% \changes{v0.63}{2018/11/25}{Added.}
+%
+%    \begin{macrocode}
+\newcommand*{\LWR at earlyclassloadnever}[2]{%
+\@ifclassloaded{#1}{%
+\PackageError{lwarp}
+{Class #1 is not supported by lwarp's HTML conversion.
+Class(es) #2 may be useful instead}
+{Class #1 might conflict with lwarp in some way,
+or is superceded by another class.
+For a possible alternative, see class(es) #2.}
+}{}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{Error for disallowed packages and classes loaded before lwarp}
+% \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.63}{2018/11/25}{\pkg{utarticle}, etc.: Not allowed.}
+%
+% \pkg{ujarticle} and related are supported by \pkg{lwarp}, but
+% \pkg{utarticle} and related use vertical Japanese text, which is not
+% read correctly by \prog{pdftotext}.  These may be supported in the future if
+% a way is found to undo the changes used for vertical text.
+%    \begin{macrocode}
+\LWR at earlyclassloadnever{utarticle}{ujarticle}
+\LWR at earlyclassloadnever{utbook}{ujbook}
+\LWR at earlyclassloadnever{utreport}{ujreport}
+%    \end{macrocode}
+%    \begin{macrocode}
+\LWR at earlyloadnever{ae}{cm-super, lmodern}
+\LWR at earlyloadnever{aecompl}{cm-super, lmodern}
+\LWR at earlyloadnever{aecc}{cm-super, lmodern}
+\LWR at earlyloadnever{boxedminipage}{boxedminipage2e}
+\LWR at earlyloadnever{caption2}{caption}
+% \LWR at earlyloadnever{ccaption}{caption}% might be preloaded by memoir
+%    \end{macrocode}
+% The older \pkg{CJK} and \pkg{CJKutf8} only work with \pkg{xeCJK}:
+%    \begin{macrocode}
+\@ifpackageloaded{xeCJK}{}{
+    \LWR at earlyloadnever{CJK}{ctex, xeCJK}
+    \LWR at earlyloadnever{CJKutf8}{ctex, xeCJK}
+}
+%    \end{macrocode}
+% \pkg{bxcjkatype} is based on \pkg{CJK}:
+%    \begin{macrocode}
+\LWR at earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle}
+%    \end{macrocode}
+% \pkg{hangul} is not in TeXLive, and is not tested:
+%    \begin{macrocode}
+\LWR at earlyloadnever{hangul}{kotex, xetexko, luatexko}
+%    \end{macrocode}
+% Others:
+%    \begin{macrocode}
+\LWR at earlyloadnever{fancyheadings}{fancyhdr}
+\LWR at earlyloadnever{glossary}{glossaries}
+\LWR at earlyloadnever{t1enc}{fontenc, inputenc, inputenx}
+\LWR at earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
+%    \end{macrocode}
+%
+%
+% \subsection{Enforcing package loading after \pkg{lwarp}}
+%
+% Packages which should only be loaded after \pkg{lwarp} are tested
+% here to trip an error of they have already been loaded.
+%
+% \changes{v0.25}{2017/03/16}{Fix: Allows XE\LaTeX\ and
+%   \LuaLaTeX\ to preload graphics and graphicx.}
+% \changes{v0.45}{2017/12/03}{Allows \pkg{memoir}'s preloaded packages.}
+% \changes{v0.58}{2018/06/21}{Fix: \pkg{memoir} and \pkg{ccaption}.}
+%
+% The following packages must be loaded after \pkg{lwarp}:
+% ^^A *loadafter
+%    \begin{macrocode}
+\LWR at loadafter{2in1}
+\LWR at loadafter{2up}
+\LWR at loadafter{a4}
+\LWR at loadafter{a4wide}
+\LWR at loadafter{a5comb}
+\LWR at notmemoirloadafter{abstract}
+\LWR at loadafter{accsupp}
+\LWR at loadafter{acro}
+\LWR at loadafter{acronym}
+\LWR at loadafter{adjmulticol}
+\LWR at loadafter{addlines}
+\LWR at loadafter{ae}
+\LWR at loadafter{aecc}
+\LWR at loadafter{afterpage}
+\LWR at loadafter{algorithm2e}
+\LWR at loadafter{algorithmicx}
+\LWR at loadafter{alltt}
+\LWR at loadafter{amsmath}
+\LWR at loadafter{amsthm}
+\LWR at loadafter{anonchap}
+\LWR at loadafter{anysize}
+\LWR at notmemoirloadafter{appendix}
+\LWR at loadafter{arabicfront}
+\LWR at notmemoirloadafter{array}
+\LWR at loadafter{arydshln}
+\LWR at loadafter{asymptote}
+% \LWR at loadafter{atbegshi}% used by morewrites
+\LWR at loadafter{attachfile}
+\LWR at loadafter{attachfile2}
+\LWR at loadafter{authblk}
+\LWR at loadafter{axessibility}
+\LWR at loadafter{axodraw2}
+\LWR at loadafter{backref}
+\LWR at loadafter{balance}
+\LWR at loadafter{bigdelim}
+\LWR at loadafter{bigstrut}
+\LWR at loadafter{bitpattern}
+\LWR at loadafter{blowup}
+\LWR at loadafter{booklet}
+\LWR at loadafter{bookmark}
+\LWR at notmemoirloadafter{booktabs}
+\LWR at loadafter{bophook}
+\LWR at loadafter{boxedminipage}
+\LWR at loadafter{boxedminipage2e}
+\LWR at loadafter{breakurl}
+\LWR at loadafter{breqn}
+\LWR at loadafter{bxpapersize}
+\LWR at loadafter{bytefield}
+\LWR at loadafter{cancel}
+\LWR at loadafter{canoniclayout}
+\LWR at loadafter{caption}
+\LWR at loadafter{caption2}
+\LWR at loadafter{cases}
+% \LWR at loadafter{ccaption}% may be preloaded by memoir
+\LWR at loadafter{changebar}
+\LWR at notmemoirloadafter{changepage}
+\LWR at notmemoirloadafter{chngpage}
+\LWR at loadafter{chappg}
+\LWR at loadafter{chapterbib}
+\LWR at loadafter{chemfig}
+\LWR at loadafter{chemformula}
+\LWR at loadafter{chemgreek}
+\LWR at loadafter{chemmacros}
+\LWR at loadafter{chemnum}
+\LWR at loadafter{chkfloat}
+\LWR at loadafter{cite}
+\LWR at loadafter{cmdtrack}
+\LWR at loadafter{color}
+\LWR at loadafter{colortbl}
+\LWR at loadafter{continue}
+\LWR at loadafter{copyrightbox}
+\LWR at notmemoirloadafter{crop}
+% ctex must be loaded before lwarp
+\LWR at loadafter{cuted}
+\LWR at loadafter{cutwin}
+\LWR at loadafter{dblfloatfix}
+\LWR at loadafter{dblfnote}
+\LWR at notmemoirloadafter{dcolumn}
+\LWR at loadafter{diagbox}
+\LWR at loadafter{dprogress}
+\LWR at loadafter{draftcopy}
+\LWR at loadafter{draftfigure}
+\LWR at loadafter{draftwatermark}
+\LWR at loadafter{easy-todo}
+\LWR at loadafter{ebook}
+\LWR at loadafter{ellipsis}
+\LWR at loadafter{emptypage}
+\LWR at loadafter{endfloat}
+\LWR at loadafter{endheads}
+\LWR at loadafter{endnotes}
+\LWR at notmemoirloadafter{enumerate}
+\LWR at loadafter{enumitem}
+\LWR at notmemoirloadafter{epigraph}
+\LWR at loadafter{epsfig}
+\LWR at loadafter{epstopdf}
+\LWR at loadafter{epstopdf-base}
+\LWR at loadafter{errata}
+\LWR at loadafter{eso-pic}
+\LWR at loadafter{everypage}
+\LWR at loadafter{everyshi}
+\LWR at loadafter{extramarks}
+\LWR at loadafter{fancybox}
+\LWR at loadafter{fancyhdr}
+\LWR at loadafter{fancyheadings}
+\LWR at loadafter{fancyref}
+\LWR at loadafter{fancytabs}
+\LWR at loadafter{fancyvrb}
+\LWR at loadafter{figcaps}
+\LWR at loadafter{figsize}
+\LWR at loadafter{fix2col}
+\LWR at loadafter{fixme}
+\LWR at loadafter{fixmetodonotes}
+\LWR at loadafter{flafter}
+\LWR at loadafter{flippdf}
+\LWR at loadafter{float}
+\LWR at loadafter{floatflt}
+\LWR at loadafter{floatpag}
+\LWR at loadafter{floatrow}
+\LWR at loadafter{fltrace}
+\LWR at loadafter{flushend}
+\LWR at loadafter{fnbreak}
+\LWR at loadafter{fncychap}
+\LWR at loadafter{fnlineno}
+\LWR at loadafter{fnpos}
+% fontenc must be loaded before lwarp
+% fontspec must be loaded before lwarp
+\LWR at loadafter{footmisc}
+\LWR at loadafter{footnote}
+\LWR at loadafter{footnotehyper}
+\LWR at loadafter{footnpag}
+\LWR at loadafter{forest}
+\LWR at loadafter{framed}
+\LWR at loadafter{ftnright}
+\LWR at loadafter{fullminipage}
+\LWR at loadafter{fullpage}
+\LWR at loadafter{fullwidth}
+\LWR at loadafter{fwlw}
+\LWR at notbxjsloadafter{geometry}
+\LWR at loadafter{glossaries}
+% \LWR at loadafter{graphics}% pre-loaded by xunicode
+% \LWR at loadafter{graphicx}% pre-loaded by xunicode
+\LWR at loadafter{glossary}
+\LWR at loadafter{grffile}
+\LWR at loadafter{grid}
+\LWR at loadafter{grid-system}
+\LWR at loadafter{gridset}
+\LWR at loadafter{hang}
+\LWR at loadafter{hanging}
+\LWR at loadafter{hypcap}
+\LWR at loadafter{hypdestopt}
+\LWR at loadafter{hypernat}
+\LWR at loadafter{hyperref}
+\LWR at loadafter{hyperxmp}
+\LWR at loadafter{hyphenat}
+\LWR at loadafter{idxlayout}
+\LWR at loadafter{ifoddpage}
+\LWR at loadafter{imakeidx}
+\LWR at loadafter{indentfirst}
+\LWR at notmemoirloadafter{index}
+% inputenc must be loaded before lwarp
+% inputenx must be loaded before lwarp
+\LWR at loadafter{intopdf}
+\LWR at loadafter{keyfloat}
+\LWR at loadafter{layaureo}
+\LWR at loadafter{layout}
+\LWR at loadafter{leading}
+\LWR at loadafter{letterspace}
+\LWR at loadafter{lettrine}
+\LWR at loadafter{lineno}
+\LWR at loadafter{lips}
+\LWR at loadafter{listings}
+\LWR at loadafter{longtable}
+\LWR at loadafter{lscape}
+\LWR at loadafter{ltablex}
+\LWR at loadafter{ltcaption}
+\LWR at loadafter{ltxgrid}
+\LWR at loadafter{ltxtable}
+\LWR at loadafter{lua-check-hyphen}
+\LWR at loadafter{lua-visual-debug}
+\LWR at loadafter{luacolor}
+\LWR at loadafter{luatodonotes}
+\LWR at loadafter{magaz}
+\LWR at notmemoirloadafter{makeidx}
+\LWR at loadafter{marginfit}
+\LWR at loadafter{marginfix}
+\LWR at loadafter{marginnote}
+\LWR at loadafter{mcaption}
+\LWR at loadafter{mdframed}
+\LWR at loadafter{memhfixc}
+\LWR at loadafter{metalogo}
+\LWR at loadafter{mhchem}
+\LWR at loadafter{microtype}
+\LWR at loadafter{midfloat}
+\LWR at loadafter{midpage}
+\LWR at loadafter{morefloats}
+\LWR at notmemoirloadafter{moreverb}
+% morewrites must be loaded before lwarp
+\LWR at notmemoirloadafter{mparhack}
+%\LWR at loadafter{multicol}% loaded by ltxdoc
+\LWR at loadafter{multirow}
+\LWR at loadafter{multitoc}
+\LWR at loadafter{musicography}
+\LWR at loadafter{nameref}
+\LWR at loadafter{natbib}
+\LWR at notmemoirloadafter{nccfancyhdr}
+\LWR at notmemoirloadafter{needspace}
+% newclude must be loaded before lwarp
+\LWR at loadafter{newtxmath}
+% newunicodechar must be loaded before lwarp
+\LWR at notmemoirloadafter{nextpage}
+\LWR at loadafter{nicefrac}
+\LWR at loadafter{nonfloat}
+\LWR at loadafter{nonumonpart}
+\LWR at loadafter{nopageno}
+\LWR at loadafter{notespages}
+\LWR at loadafter{nowidow}
+\LWR at loadafter{ntheorem}
+\LWR at loadafter{octave}
+\LWR at loadafter{overpic}
+\LWR at loadafter{pagegrid}
+\LWR at notmemoirloadafter{pagenote}
+\LWR at loadafter{pagesel}
+\LWR at loadafter{paralist}
+\LWR at loadafter{parnotes}
+\LWR at notmemoirloadafter{parskip}
+\LWR at loadafter{pbox}
+\LWR at loadafter{pdfcomment}
+\LWR at loadafter{pdflscape}
+\LWR at loadafter{pdfmarginpar}
+\LWR at loadafter{pdfpages}
+\LWR at loadafter{pdfprivacy}
+\LWR at loadafter{pdfrender}
+\LWR at loadafter{pdfsync}
+\LWR at loadafter{pdftricks}
+\LWR at loadafter{pdfx}
+\LWR at loadafter{pfnote}
+\LWR at loadafter{phfqit}
+\LWR at loadafter{placeins}
+\LWR at loadafter{prelim2e}
+\LWR at loadafter{prettyref}
+\LWR at loadafter{preview}
+\LWR at loadafter{psfrag}
+\LWR at loadafter{psfragx}
+\LWR at loadafter{pst-eps}
+\LWR at loadafter{pstool}
+\LWR at loadafter{pstricks}
+\LWR at loadafter{quotchap}
+\LWR at loadafter{quoting}
+\LWR at loadafter{ragged2e}
+\LWR at loadafter{realscripts}
+\LWR at loadafter{refcheck}
+\LWR at loadafter{register}
+\LWR at loadafter{relsize}
+\LWR at loadafter{repeatindex}
+\LWR at loadafter{resizegather}
+\LWR at loadafter{romanbar}
+\LWR at loadafter{romanbarpagenumber}
+\LWR at loadafter{rotating}
+\LWR at loadafter{rotfloat}
+\LWR at loadafter{rviewport}
+\LWR at loadafter{savetrees}
+% \LWR at loadafter{scalefnt}% loaded by babel-french
+\LWR at loadafter{schemata}
+\LWR at loadafter{scrextend}
+\LWR at loadafter{scrhack}
+\LWR at loadafter{scrlayer}
+\LWR at loadafter{scrlayer-notecolumn}
+\LWR at loadafter{scrlayer-scrpage}
+\LWR at loadafter{section}
+\LWR at loadafter{sectionbreak}
+\LWR at loadafter{sectsty}
+\LWR at loadafter{semantic-markup}
+\LWR at notmemoirloadafter{setspace}
+\LWR at loadafter{shadow}
+\LWR at notmemoirloadafter{showidx}
+\LWR at loadafter{showkeys}
+\LWR at loadafter{sidecap}
+\LWR at loadafter{sidenotes}
+\LWR at loadafter{SIunits}
+\LWR at loadafter{siunitx}
+\LWR at loadafter{soul}
+\LWR at loadafter{soulpos}
+\LWR at loadafter{soulutf8}
+\LWR at loadafter{splitidx}
+\LWR at loadafter{srcltx}
+\LWR at loadafter{srctex}
+\LWR at loadafter{stabular}
+\LWR at notltjsloadafter{stfloats}
+\LWR at loadafter{subfig}
+\LWR at loadafter{subfigure}
+\LWR at loadafter{supertabular}
+\LWR at loadafter{t1inc}
+\LWR at loadafter{tabls}
+\LWR at notmemoirloadafter{tabularx}
+\LWR at loadafter{tabulary}
+\LWR at loadafter{textarea}
+% \LWR at loadafter{textcomp}% maybe before lwarp with font packages
+\LWR at loadafter{textfit}
+\LWR at loadafter{textpos}
+\LWR at loadafter{theorem}
+\LWR at loadafter{thinsp}
+\LWR at loadafter{threadcol}
+\LWR at loadafter{threeparttable}
+\LWR at loadafter{thumb}
+\LWR at loadafter{thumbs}
+\LWR at loadafter{tikz}
+\LWR at loadafter{titleps}
+\LWR at loadafter{titlesec}
+\LWR at loadafter{titletoc}
+\LWR at notmemoirloadafter{titling}
+% \LWR at loadafter{tocbasic}% preloaded by koma-script classes
+\LWR at notmemoirloadafter{tocbibind}
+\LWR at loadafter{tocenter}
+\LWR at notmemoirloadafter{tocloft}
+\LWR at loadafter{tocstyle}
+\LWR at loadafter{todo}
+\LWR at loadafter{todonotes}
+\LWR at loadafter{tram}
+\LWR at loadafter{transparent}
+\LWR at loadafter{trimclip}
+\LWR at loadafter{trivfloat}
+\LWR at loadafter{turnthepage}
+\LWR at loadafter{twoup}
+%    \end{macrocode}
+% \changes{v0.44}{2017/11/19}{Adjustment for \pkg{koma-script}.}
+%    \begin{macrocode}
+% \LWR at loadafter{typearea}% preloaded by koma-script classes
+% \LWR at loadafter{ulem}% preloaded by ctexart and related classes
+\LWR at loadafter{underscore}
+\LWR at loadafter{units}
+\LWR at loadafter{unitsdef}
+\LWR at loadafter{upref}
+\LWR at loadafter{url}
+\LWR at loadafter{uspace}
+\LWR at loadafter{varioref}% no lwarp package provided
+\LWR at notmemoirloadafter{verse}
+\LWR at loadafter{vertbars}
+\LWR at loadafter{vmargin}
+\LWR at loadafter{vowel}
+\LWR at loadafter{vpe}
+\LWR at loadafter{vwcol}
+\LWR at loadafter{wallpaper}
+\LWR at loadafter{wasysym}
+\LWR at loadafter{watermark}
+\LWR at loadafter{widows-and-orphans}
+\LWR at loadafter{wrapfig}
+\LWR at loadafter{xbmks}
+\LWR at loadafter{xcolor}
+\LWR at loadafter{xechangebar}
+\LWR at loadafter{xellipsis}
+% xetexko-vertical must be loaded before lwarp
+\LWR at loadafter{xfrac}
+\LWR at loadafter{xltabular}
+\LWR at loadafter{xltxtra}
+\LWR at loadafter{xmpincl}
+\LWR at loadafter{xpiano}
+\LWR at loadafter{xpinyin}
+\LWR at loadafter{xtab}
+% xunicode must be loaded before lwarp
+\LWR at loadafter{xurl}
+\LWR at loadafter{xy}
+\LWR at loadafter{zwpagelayout}
+%    \end{macrocode}
+%
+%
+%
+%
+%
 % \section{MD5 hashing}
 %
 % The MD5 hash is used for \env{lateximage} filenames for \SVG\ math.
@@ -9893,16 +10635,24 @@
 {No MD5 macro was found.}
 {Lwarp must find the macros pdfmdfivesum or mdfivesum.}
 }
-
-\ifPDFTeX% pdflatex or dvi latex
+%    \end{macrocode}
+%
+% The default for pdf\LaTeX, \DVI\LaTeX, up\LaTeX, etc:
+% \changes{v0.63}{2018/11/30}{Fix: Default \cs{LWR at mdfive}.}
+%    \begin{macrocode}
 \let\LWR at mdfive\pdfmdfivesum
-\fi
-
+%    \end{macrocode}
+%
+% For \LuaLaTeX:
+%    \begin{macrocode}
 \ifLuaTeX
 \RequirePackage{pdftexcmds}
 \let\LWR at mdfive\pdf at mdfivesum
 \fi
-
+%    \end{macrocode}
+%
+% For \XeLaTeX:
+%    \begin{macrocode}
 \ifXeTeX
 \@ifundefined{pdffivesum}{}
     {\let\LWR at mdfive\pdfmdfivesum}
@@ -9923,17 +10673,31 @@
 %
 % \changes{v0.44}{2017/11/16}{If pdfLaTeX, require T1 and \acro{UTF}-8 encoding.}
 % \changes{v0.52}{2018/03/26}{If pdfLaTeX, allow other input encoding.}
+% \changes{v0.63}{2018/11/25}{p\TeX: Encoding.}
 %
+% \begin{macro}{\LWR at pdfencoding}
+% Sets \optn{T1}, and also \optn{utf8} if not already set.
 %    \begin{macrocode}
-\ifPDFTeX% pdflatex or dvi latex
-\RequirePackage[T1]{fontenc}
+\newcommand*{\LWR at pdfencoding}{%
+    \RequirePackage[T1]{fontenc}
 
-\@ifpackageloaded{inputenc}{}{
-    \@ifpackageloaded{inputenx}{}{
-        \RequirePackage[utf8]{inputenc}
+    \@ifpackageloaded{inputenc}{}{
+        \@ifpackageloaded{inputenx}{}{
+            \RequirePackage[utf8]{inputenc}
+        }
     }
 }
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+\ifPDFTeX% pdflatex or dvi latex
+    \LWR at pdfencoding
 \fi
+
+\ifpTeX
+    \LWR at pdfencoding
+\fi
 %    \end{macrocode}
 %
 %
@@ -9952,7 +10716,11 @@
 % The first arguments of \cs{newunicodechar} below are text ligatures in
 % the source code, even though they are not printed in the following
 % listing.
+%
+% \changes{v0.63}{2018/11/25}{p\TeX: No \pkg{newunicodechar}.}
 %    \begin{macrocode}
+\ifpTeX
+\else
 \RequirePackage{newunicodechar}
 
 \newunicodechar{⨯}{\texttimes}
@@ -9965,13 +10733,26 @@
 \newunicodechar{ffl}{ffl}
 \newunicodechar{—}{---}
 \newunicodechar{–}{--}
+\fi
+
+\fi
 %    \end{macrocode}
+%
+%
+% \section{Upright quotes}
+%
 % In PDF\TeX, preserve upright quotes in verbatim text.
 % \pkg{upquote} also loads \pkg{textcomp}.
+%
+% \changes{v0.63}{2018/11/25}{p\TeX: Load \pkg{upquote}.}
 %    \begin{macrocode}
+\ifPDFTeX
 \RequirePackage{upquote}
-\else
 \fi
+
+\ifpTeX
+    \RequirePackage{upquote}
+\fi
 %    \end{macrocode}
 %
 %
@@ -10022,52 +10803,24 @@
 %   characters, especially when written to a file.
 %
 % \changes{v0.62}{2018/11/17}{Added.}
+% \changes{v0.63}{2018/11/24}{Fix for \pkg{xeCJK}.}
 %
 %    \begin{macrocode}
+\newcommand{\LWR at isolate}[1]{#1}%
+
 \@ifpackageloaded{ctexpatch}{
-    \newcommand{\LWR at isolate}[1]{\null#1\null}%
-}{
-    \newcommand{\LWR at isolate}[1]{#1}%
-}
+    \renewcommand{\LWR at isolate}[1]{\null#1\null}%
+}{}
+
+\@ifpackageloaded{xeCJK}{
+    \renewcommand{\LWR at isolate}[1]{\null#1\null}%
+}{}
 %    \end{macrocode}
 % \end{macro}
 %
 %
 %
-% \section{Early package requirements}
 %
-% \DescribePackage{etoolbox}
-% Provides \cs{ifbool} and other functions.
-%
-% \DescribePackage{xpatch}
-% Patches macros with optional arguments.
-%    \begin{macrocode}
-\RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc.
-\RequirePackage{xpatch}
-%    \end{macrocode}
-
-
-% \DescribePackage{ifplatform}
-% Provides \cs{ifwindows} to try to automatically detect
-% \brand{Windows} OS.
-%
-%    \begin{macrocode}
-\RequirePackage{ifplatform}% sense op-system platform
-%    \end{macrocode}
-%
-%
-%
-%
-% \DescribePackage{letltxmacro}
-% Used to redefine \cs{textbf} and friends.
-%
-%    \begin{macrocode}
-\RequirePackage{letltxmacro}
-%    \end{macrocode}
-%
-
-
-
 % \section{Operating-System portability}
 % \label{sec:OSportability}
 % \changes{v0.11}{2016/03/11}{Added section: Operating-System portability.}
@@ -10768,529 +11521,9 @@
 %
 %
 %
-%
-%
-% \section{Package load order}
-%
-% \changes{v0.21}{2017/02/22}{Add: Errors for misplaced packages.}
 
 
-% Several packages should only be loaded before \pkg{lwarp}, and
-% most others should only be loaded after.
-%
-% Packages which should only be loaded before \pkg{lwarp} have their own
-%	\begin{sourcedisplay}
-%	|lwarp-<packagename>.sty|
-%	\end{sourcedisplay}
-% which use \cs{LWR at loadbefore} to trigger an error if they are loaded after
-% \pkg{lwarp}.
-% Examples include \pkg{fontspec}, \pkg{inputenc}, \pkg{inputenx}, \pkg{fontenc},
-% and \pkg{newunicodechar}.
-%
-% Most packages should be loaded after \pkg{lwarp}.  This is enfoced by
-% a large number of \cs{LWR at loadafter} statements, below.
-%
-% Some packages are emulated by \pkg{memoir}, and so these are tested by
-% \cs{LWR at notmemoirloadafter}, which does not cause an error if \pkg{memoir} is used.
-%
-%
-% \subsection{Tests of package load order}
-%
-% \begin{macro}{\LWR at loadafter} \marg{packagename} \quad
-% Error if this package was loaded before \pkg{lwarp}.
-%
-% \label{sec:loadafter}
-%
-%    \begin{macrocode}
-\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.}
-}
-{}
-}
-%    \end{macrocode}
-% \end{macro}
 
-% \begin{macro}{\LWR at notmemoirloadafter} \marg{packagename} \quad
-% Error if not \pkg{memoir} class and this package was loaded before \pkg{lwarp}.
-%
-% \pkg{memoir} emulates many packages, and pretends that they have already been loaded.
-%
-% \changes{v0.45}{2017/12/03}{Added.}
-%    \begin{macrocode}
-\@ifclassloaded{memoir}
-{\newcommand*{\LWR at notmemoirloadafter}[1]{}}
-{\LetLtxMacro\LWR at notmemoirloadafter\LWR at loadafter}
-%    \end{macrocode}
-% \end{macro}
-
-
-% \begin{macro}{\LWR at loadbefore} \marg{packagename} \quad
-% Error if this package is loaded after \pkg{lwarp}.
-%
-% \changes{v0.33}{2017/07/06}{Fix: No \cs{PackageError} if already loaded.}
-%
-%    \begin{macrocode}
-\newcommand*{\LWR at loadbefore}[1]{%
-\@ifpackageloaded{#1}
-{}
-{
-\PackageError{lwarp}
-{Package #1 must be loaded before lwarp}
-{Move \detokenize{\usepackage}{#1} before \detokenize{\usepackage}{lwarp}.}
-}
-}
-%    \end{macrocode}
-% \end{macro}
-
-
-% \begin{macro}{\LWR at loadnever} \marg{badpackagename} \marg{replacementpkgname}
-%
-% The first packages is not supported, so tell the user to use the second instead.
-%
-% \changes{v0.25}{2017/03/16}{Added the ability to prevent conflicting packages.}
-%
-%    \begin{macrocode}
-\newcommand*{\LWR at loadnever}[2]{%
-\PackageError{lwarp}
-{Package #1 is not supported by lwarp's HTML conversion.
-Package(s) #2 may be useful instead}
-{Package #1 might conflict with lwarp in some way,
-or is superceded by another package.
-For a possible alternative, see package(s) #2.}
-}
-%    \end{macrocode}
-% \end{macro}
-%
-%
-% \begin{macro}{\LWR at earlyloadnever} \marg{badpackagename} \marg{replacementpkgname}
-%
-% The first packages is not supported, so tell the user to use the second instead.
-% This version checks immediately for packages which may have been loaded before \pkg{lwarp}.
-%
-% \changes{v0.54}{2018/04/06}{Added.}
-%
-%    \begin{macrocode}
-\newcommand*{\LWR at earlyloadnever}[2]{%
-\@ifpackageloaded{#1}{%
-\PackageError{lwarp}
-{Package #1 is not supported by lwarp's HTML conversion.
-Package(s) #2 may be useful instead}
-{Package #1 might conflict with lwarp in some way,
-or is superceded by another package.
-For a possible alternative, see package(s) #2.}
-}{}%
-}
-%    \end{macrocode}
-% \end{macro}
-%
-%
-% \subsection{Error for disallowed packages loaded before lwarp}
-% \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}.}
-%
-%    \begin{macrocode}
-\LWR at earlyloadnever{ae}{cm-super, lmodern}
-\LWR at earlyloadnever{aecompl}{cm-super, lmodern}
-\LWR at earlyloadnever{aecc}{cm-super, lmodern}
-\LWR at earlyloadnever{boxedminipage}{boxedminipage2e}
-\LWR at earlyloadnever{caption2}{caption}
-% \LWR at earlyloadnever{ccaption}{caption}% might be preloaded by memoir
-\@ifpackageloaded{xeCJK}{}{
-    \LWR at earlyloadnever{CJK}{ctex, xeCJK}
-    \LWR at earlyloadnever{CJKutf8}{ctex, xeCJK}
-}
-\LWR at earlyloadnever{fancyheadings}{fancyhdr}
-\LWR at earlyloadnever{glossary}{glossaries}
-\LWR at earlyloadnever{t1enc}{fontenc, inputenc, inputenx}
-\LWR at earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
-%    \end{macrocode}
-%
-%
-% \subsection{Enforcing package loading after \pkg{lwarp}}
-%
-% Packages which should only be loaded after \pkg{lwarp} are tested
-% here to trip an error of they have already been loaded.
-%
-% \changes{v0.25}{2017/03/16}{Fix: Allows XE\LaTeX\ and
-%	\LuaLaTeX\ to preload graphics and graphicx.}
-% \changes{v0.45}{2017/12/03}{Allows \pkg{memoir}'s preloaded packages.}
-% \changes{v0.58}{2018/06/21}{Fix: \pkg{memoir} and \pkg{ccaption}.}
-%
-% The following packages must be loaded after \pkg{lwarp}:
-% ^^A *loadafter
-%    \begin{macrocode}
-\LWR at loadafter{2in1}
-\LWR at loadafter{2up}
-\LWR at loadafter{a4}
-\LWR at loadafter{a4wide}
-\LWR at loadafter{a5comb}
-\LWR at notmemoirloadafter{abstract}
-\LWR at loadafter{accsupp}
-\LWR at loadafter{acro}
-\LWR at loadafter{acronym}
-\LWR at loadafter{adjmulticol}
-\LWR at loadafter{addlines}
-\LWR at loadafter{ae}
-\LWR at loadafter{aecc}
-\LWR at loadafter{afterpage}
-\LWR at loadafter{algorithm2e}
-\LWR at loadafter{algorithmicx}
-\LWR at loadafter{alltt}
-\LWR at loadafter{amsmath}
-\LWR at loadafter{amsthm}
-\LWR at loadafter{anonchap}
-\LWR at loadafter{anysize}
-\LWR at notmemoirloadafter{appendix}
-\LWR at loadafter{arabicfront}
-\LWR at notmemoirloadafter{array}
-\LWR at loadafter{arydshln}
-\LWR at loadafter{asymptote}
-% \LWR at loadafter{atbegshi}% used by morewrites
-\LWR at loadafter{attachfile}
-\LWR at loadafter{attachfile2}
-\LWR at loadafter{authblk}
-\LWR at loadafter{axessibility}
-\LWR at loadafter{axodraw2}
-\LWR at loadafter{backref}
-\LWR at loadafter{balance}
-\LWR at loadafter{bigdelim}
-\LWR at loadafter{bigstrut}
-\LWR at loadafter{bitpattern}
-\LWR at loadafter{blowup}
-\LWR at loadafter{booklet}
-\LWR at loadafter{bookmark}
-\LWR at notmemoirloadafter{booktabs}
-\LWR at loadafter{bophook}
-\LWR at loadafter{boxedminipage}
-\LWR at loadafter{boxedminipage2e}
-\LWR at loadafter{breakurl}
-\LWR at loadafter{breqn}
-\LWR at loadafter{bxpapersize}
-\LWR at loadafter{bytefield}
-\LWR at loadafter{cancel}
-\LWR at loadafter{canoniclayout}
-\LWR at loadafter{caption}
-\LWR at loadafter{caption2}
-\LWR at loadafter{cases}
-% \LWR at loadafter{ccaption}% may be preloaded by memoir
-\LWR at loadafter{changebar}
-\LWR at notmemoirloadafter{changepage}
-\LWR at notmemoirloadafter{chngpage}
-\LWR at loadafter{chappg}
-\LWR at loadafter{chapterbib}
-\LWR at loadafter{chemfig}
-\LWR at loadafter{chemformula}
-\LWR at loadafter{chemgreek}
-\LWR at loadafter{chemmacros}
-\LWR at loadafter{chemnum}
-\LWR at loadafter{chkfloat}
-\LWR at loadafter{cite}
-\LWR at loadafter{cmdtrack}
-\LWR at loadafter{color}
-\LWR at loadafter{colortbl}
-\LWR at loadafter{continue}
-\LWR at loadafter{copyrightbox}
-\LWR at notmemoirloadafter{crop}
-% ctex must be loaded before lwarp
-\LWR at loadafter{cuted}
-\LWR at loadafter{cutwin}
-\LWR at loadafter{dblfloatfix}
-\LWR at loadafter{dblfnote}
-\LWR at notmemoirloadafter{dcolumn}
-\LWR at loadafter{diagbox}
-\LWR at loadafter{dprogress}
-\LWR at loadafter{draftcopy}
-\LWR at loadafter{draftfigure}
-\LWR at loadafter{draftwatermark}
-\LWR at loadafter{easy-todo}
-\LWR at loadafter{ebook}
-\LWR at loadafter{ellipsis}
-\LWR at loadafter{emptypage}
-\LWR at loadafter{endfloat}
-\LWR at loadafter{endheads}
-\LWR at loadafter{endnotes}
-\LWR at notmemoirloadafter{enumerate}
-\LWR at loadafter{enumitem}
-\LWR at notmemoirloadafter{epigraph}
-\LWR at loadafter{epsfig}
-\LWR at loadafter{epstopdf}
-\LWR at loadafter{epstopdf-base}
-\LWR at loadafter{errata}
-\LWR at loadafter{eso-pic}
-\LWR at loadafter{everypage}
-\LWR at loadafter{everyshi}
-\LWR at loadafter{extramarks}
-\LWR at loadafter{fancybox}
-\LWR at loadafter{fancyhdr}
-\LWR at loadafter{fancyheadings}
-\LWR at loadafter{fancyref}
-\LWR at loadafter{fancytabs}
-\LWR at loadafter{fancyvrb}
-\LWR at loadafter{figcaps}
-\LWR at loadafter{figsize}
-\LWR at loadafter{fix2col}
-\LWR at loadafter{fixme}
-\LWR at loadafter{fixmetodonotes}
-\LWR at loadafter{flafter}
-\LWR at loadafter{flippdf}
-\LWR at loadafter{float}
-\LWR at loadafter{floatflt}
-\LWR at loadafter{floatpag}
-\LWR at loadafter{floatrow}
-\LWR at loadafter{fltrace}
-\LWR at loadafter{flushend}
-\LWR at loadafter{fnbreak}
-\LWR at loadafter{fncychap}
-\LWR at loadafter{fnlineno}
-\LWR at loadafter{fnpos}
-% fontenc must be loaded before lwarp
-% fontspec must be loaded before lwarp
-\LWR at loadafter{footmisc}
-\LWR at loadafter{footnote}
-\LWR at loadafter{footnotehyper}
-\LWR at loadafter{footnpag}
-\LWR at loadafter{forest}
-\LWR at loadafter{framed}
-\LWR at loadafter{ftnright}
-\LWR at loadafter{fullminipage}
-\LWR at loadafter{fullpage}
-\LWR at loadafter{fullwidth}
-\LWR at loadafter{fwlw}
-\LWR at loadafter{geometry}
-\LWR at loadafter{glossaries}
-% \LWR at loadafter{graphics}% pre-loaded by xunicode
-% \LWR at loadafter{graphicx}% pre-loaded by xunicode
-\LWR at loadafter{glossary}
-\LWR at loadafter{grffile}
-\LWR at loadafter{grid}
-\LWR at loadafter{grid-system}
-\LWR at loadafter{gridset}
-\LWR at loadafter{hang}
-\LWR at loadafter{hanging}
-\LWR at loadafter{hypcap}
-\LWR at loadafter{hypdestopt}
-\LWR at loadafter{hypernat}
-\LWR at loadafter{hyperref}
-\LWR at loadafter{hyperxmp}
-\LWR at loadafter{hyphenat}
-\LWR at loadafter{idxlayout}
-\LWR at loadafter{ifoddpage}
-\LWR at loadafter{imakeidx}
-\LWR at loadafter{indentfirst}
-\LWR at notmemoirloadafter{index}
-% inputenc must be loaded before lwarp
-% inputenx must be loaded before lwarp
-\LWR at loadafter{intopdf}
-\LWR at loadafter{keyfloat}
-\LWR at loadafter{layaureo}
-\LWR at loadafter{layout}
-\LWR at loadafter{leading}
-\LWR at loadafter{letterspace}
-\LWR at loadafter{lettrine}
-\LWR at loadafter{lineno}
-\LWR at loadafter{lips}
-\LWR at loadafter{listings}
-\LWR at loadafter{longtable}
-\LWR at loadafter{lscape}
-\LWR at loadafter{ltablex}
-\LWR at loadafter{ltcaption}
-\LWR at loadafter{ltxgrid}
-\LWR at loadafter{ltxtable}
-\LWR at loadafter{lua-check-hyphen}
-\LWR at loadafter{lua-visual-debug}
-\LWR at loadafter{luacolor}
-\LWR at loadafter{luatodonotes}
-\LWR at loadafter{magaz}
-\LWR at notmemoirloadafter{makeidx}
-\LWR at loadafter{marginfit}
-\LWR at loadafter{marginfix}
-\LWR at loadafter{marginnote}
-\LWR at loadafter{mcaption}
-\LWR at loadafter{mdframed}
-\LWR at loadafter{memhfixc}
-\LWR at loadafter{metalogo}
-\LWR at loadafter{mhchem}
-\LWR at loadafter{microtype}
-\LWR at loadafter{midfloat}
-\LWR at loadafter{midpage}
-\LWR at loadafter{morefloats}
-\LWR at notmemoirloadafter{moreverb}
-% morewrites must be loaded before lwarp
-\LWR at notmemoirloadafter{mparhack}
-%\LWR at loadafter{multicol}% loaded by ltxdoc
-\LWR at loadafter{multirow}
-\LWR at loadafter{multitoc}
-\LWR at loadafter{musicography}
-\LWR at loadafter{nameref}
-\LWR at loadafter{natbib}
-\LWR at notmemoirloadafter{nccfancyhdr}
-\LWR at notmemoirloadafter{needspace}
-% newclude must be loaded before lwarp
-\LWR at loadafter{newtxmath}
-% newunicodechar must be loaded before lwarp
-\LWR at notmemoirloadafter{nextpage}
-\LWR at loadafter{nicefrac}
-\LWR at loadafter{nonfloat}
-\LWR at loadafter{nonumonpart}
-\LWR at loadafter{nopageno}
-\LWR at loadafter{notespages}
-\LWR at loadafter{nowidow}
-\LWR at loadafter{ntheorem}
-\LWR at loadafter{octave}
-\LWR at loadafter{overpic}
-\LWR at loadafter{pagegrid}
-\LWR at notmemoirloadafter{pagenote}
-\LWR at loadafter{pagesel}
-\LWR at loadafter{paralist}
-\LWR at loadafter{parnotes}
-\LWR at notmemoirloadafter{parskip}
-\LWR at loadafter{pbox}
-\LWR at loadafter{pdfcomment}
-\LWR at loadafter{pdflscape}
-\LWR at loadafter{pdfmarginpar}
-\LWR at loadafter{pdfpages}
-\LWR at loadafter{pdfprivacy}
-\LWR at loadafter{pdfrender}
-\LWR at loadafter{pdfsync}
-\LWR at loadafter{pdftricks}
-\LWR at loadafter{pdfx}
-\LWR at loadafter{pfnote}
-\LWR at loadafter{phfqit}
-\LWR at loadafter{placeins}
-\LWR at loadafter{prelim2e}
-\LWR at loadafter{prettyref}
-\LWR at loadafter{preview}
-\LWR at loadafter{psfrag}
-\LWR at loadafter{psfragx}
-\LWR at loadafter{pst-eps}
-\LWR at loadafter{pstool}
-\LWR at loadafter{pstricks}
-\LWR at loadafter{quotchap}
-\LWR at loadafter{quoting}
-\LWR at loadafter{ragged2e}
-\LWR at loadafter{realscripts}
-\LWR at loadafter{refcheck}
-\LWR at loadafter{register}
-\LWR at loadafter{relsize}
-\LWR at loadafter{repeatindex}
-\LWR at loadafter{resizegather}
-\LWR at loadafter{romanbar}
-\LWR at loadafter{romanbarpagenumber}
-\LWR at loadafter{rotating}
-\LWR at loadafter{rotfloat}
-\LWR at loadafter{rviewport}
-\LWR at loadafter{savetrees}
-% \LWR at loadafter{scalefnt}% loaded by babel-french
-\LWR at loadafter{schemata}
-\LWR at loadafter{scrextend}
-\LWR at loadafter{scrhack}
-\LWR at loadafter{scrlayer}
-\LWR at loadafter{scrlayer-notecolumn}
-\LWR at loadafter{scrlayer-scrpage}
-\LWR at loadafter{section}
-\LWR at loadafter{sectionbreak}
-\LWR at loadafter{sectsty}
-\LWR at loadafter{semantic-markup}
-\LWR at notmemoirloadafter{setspace}
-\LWR at loadafter{shadow}
-\LWR at notmemoirloadafter{showidx}
-\LWR at loadafter{showkeys}
-\LWR at loadafter{sidecap}
-\LWR at loadafter{sidenotes}
-\LWR at loadafter{SIunits}
-\LWR at loadafter{siunitx}
-\LWR at loadafter{soul}
-\LWR at loadafter{soulpos}
-\LWR at loadafter{soulutf8}
-\LWR at loadafter{splitidx}
-\LWR at loadafter{srcltx}
-\LWR at loadafter{srctex}
-\LWR at loadafter{stabular}
-\LWR at loadafter{stfloats}
-\LWR at loadafter{subfig}
-\LWR at loadafter{subfigure}
-\LWR at loadafter{supertabular}
-\LWR at loadafter{t1inc}
-\LWR at loadafter{tabls}
-\LWR at notmemoirloadafter{tabularx}
-\LWR at loadafter{tabulary}
-\LWR at loadafter{textarea}
-% \LWR at loadafter{textcomp}% maybe before lwarp with font packages
-\LWR at loadafter{textfit}
-\LWR at loadafter{textpos}
-\LWR at loadafter{theorem}
-\LWR at loadafter{thinsp}
-\LWR at loadafter{threadcol}
-\LWR at loadafter{threeparttable}
-\LWR at loadafter{thumb}
-\LWR at loadafter{thumbs}
-\LWR at loadafter{tikz}
-\LWR at loadafter{titleps}
-\LWR at loadafter{titlesec}
-\LWR at loadafter{titletoc}
-\LWR at notmemoirloadafter{titling}
-% \LWR at loadafter{tocbasic}% preloaded by koma-script classes
-\LWR at notmemoirloadafter{tocbibind}
-\LWR at loadafter{tocenter}
-\LWR at notmemoirloadafter{tocloft}
-\LWR at loadafter{tocstyle}
-\LWR at loadafter{todo}
-\LWR at loadafter{todonotes}
-\LWR at loadafter{tram}
-\LWR at loadafter{transparent}
-\LWR at loadafter{trimclip}
-\LWR at loadafter{trivfloat}
-\LWR at loadafter{turnthepage}
-\LWR at loadafter{twoup}
-%    \end{macrocode}
-% \changes{v0.44}{2017/11/19}{Adjustment for \pkg{koma-script}.}
-%    \begin{macrocode}
-% \LWR at loadafter{typearea}% preloaded by koma-script classes
-% \LWR at loadafter{ulem}% preloaded by ctexart and related classes
-\LWR at loadafter{underscore}
-\LWR at loadafter{units}
-\LWR at loadafter{unitsdef}
-\LWR at loadafter{upref}
-\LWR at loadafter{url}
-\LWR at loadafter{uspace}
-\LWR at loadafter{varioref}% no lwarp package provided
-\LWR at notmemoirloadafter{verse}
-\LWR at loadafter{vertbars}
-\LWR at loadafter{vmargin}
-\LWR at loadafter{vowel}
-\LWR at loadafter{vpe}
-\LWR at loadafter{vwcol}
-\LWR at loadafter{wallpaper}
-\LWR at loadafter{wasysym}
-\LWR at loadafter{watermark}
-\LWR at loadafter{widows-and-orphans}
-\LWR at loadafter{wrapfig}
-\LWR at loadafter{xbmks}
-\LWR at loadafter{xcolor}
-\LWR at loadafter{xechangebar}
-\LWR at loadafter{xellipsis}
-\LWR at loadafter{xfrac}
-\LWR at loadafter{xltabular}
-\LWR at loadafter{xltxtra}
-\LWR at loadafter{xmpincl}
-\LWR at loadafter{xpiano}
-\LWR at loadafter{xtab}
-% xunicode must be loaded before lwarp
-\LWR at loadafter{xurl}
-\LWR at loadafter{xy}
-\LWR at loadafter{zwpagelayout}
-%    \end{macrocode}
-
-
-
-
 % ^^A *required
 % \section{Required packages}
 % \label{sec:requiredpackages}
@@ -11485,10 +11718,19 @@
 % \codehtml
 %    \begin{macrocode}
 \begin{warpHTML}
-\RequirePackage[paperheight=190in,paperwidth=20in,%
-left=2in,right=6in,%
-top=1in,bottom=1in,%
-]{geometry}
+\RequirePackage{geometry}
+%    \end{macrocode}
+%
+% Avoid option conflict by changing settings after package load:
+% \changes{v0.63}{2018/11/24}{\pkg{geometry}: Fix for \pkg{bxjs*} classes.}
+%    \begin{macrocode}
+\geometry{
+    paperheight=190in,%
+    paperwidth=20in,%
+    left=2in,right=6in,%
+    top=1in,bottom=1in,%
+}
+
 \@twosidefalse
 \@mparswitchfalse
 \end{warpHTML}
@@ -11578,7 +11820,11 @@
 % \DescribePackage{everyhook}
 %
 % \pkg{everyhook} is used to patch paragraph handling.
+%
+% \changes{v0.63}{2018/11/29}{\pkg{everyhook}: Fix for \pkg{bxjs*} classes.}
 %    \begin{macrocode}
+\@ifundefined{bxjs at everypar}{}{\let\everypar\bxjs at everypar}
+
 \RequirePackage{everyhook}
 \end{warpHTML}
 %    \end{macrocode}
@@ -11780,6 +12026,41 @@
 % \end{macro}
 
 
+% ^^A *checkload
+% \begin{macro}{\LWR at checkloadfilename} \marg{filename}
+% Checks if this filename should be loaded after \pkg{lwarp},
+% or never at all.
+%
+% \changes{v0.63}{2018/12/02}{Added to reduce number of \filenm{lwarp-*} files.}
+%    \begin{macrocode}
+\newcommand*{\LWR at checkloadfilename}[1]{%
+\LWR at checkloadnever{#1}{ae}{latinmodern}
+\LWR at checkloadnever{#1}{aecc}{latinmodern}
+\LWR at checkloadnever{#1}{boxedminipage}{boxedminipage2e}
+\LWR at checkloadnever{#1}{caption2}{caption}
+\LWR at checkloadnever{#1}{ccaption}{caption}
+\LWR at checkloadnever{#1}{fancyheadings}{fancyhdr}
+\LWR at checkloadnever{#1}{glossary}{glossaries}
+\LWR at checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx}
+\LWR at checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
+%
+\LWR at checkloadbefore{#1}{ctex}
+\LWR at checkloadbefore{#1}{fontspec}
+\LWR at checkloadbefore{#1}{inputenc}
+\LWR at checkloadbefore{#1}{inputenx}
+\LWR at checkloadbefore{#1}{kotex}
+\LWR at checkloadbefore{#1}{luatexja}
+\LWR at checkloadbefore{#1}{luatexja-fontspec}
+\LWR at checkloadbefore{#1}{luatexko}
+\LWR at checkloadbefore{#1}{morewrites}
+\LWR at checkloadbefore{#1}{newclude}
+\LWR at checkloadbefore{#1}{newunicodechar}
+\LWR at checkloadbefore{#1}{xeCJK}
+\LWR at checkloadbefore{#1}{xetexko}
+\LWR at checkloadbefore{#1}{zxjatype}
+}
+%    \end{macrocode}
+% \end{macro}
 
 % \begin{macro}{\LWR at findword} \oarg{1: separator} \marg{2: list}
 %								\marg{3: index} \oarg{4: destination}
@@ -11817,10 +12098,14 @@
 % See if the package name was found:
 %    \begin{macrocode}
 \IfStrEq{\LWR at strresulttwo}{}%
-{%
-}% no filename
-{% yes filename
+{}% no filename
+{% yes filename was found
 %    \end{macrocode}
+% Check if the package should be loaded before \pkg{lwarp},
+% or never at all:
+%    \begin{macrocode}
+\LWR at checkloadfilename{\LWR at strresulttwo}%
+%    \end{macrocode}
 % If found, and if an \pkg{lwarp}-equivalent name exists, use |lwarp-|* instead.
 %    \begin{macrocode}
     \IfFileExists{lwarp-\LWR at strresulttwo.sty}%
@@ -13068,6 +13353,25 @@
 % \end{macro}
 %
 %
+% \begin{macro}{\LWR at compileuplatex}
+%   Sets compile options for up\LaTeX\ with \pkg{ujarticle} or related classes.
+% \changes{v0.63}{2018/11/25}{Added.}
+%    \begin{macrocode}
+\newcommand*{\LWR at compileuplatex}{
+    \def\LWR at tempprintlatexcmd{%
+        \LWR at compilecmd{uplatex}{}
+        \LWR at addcompilecmd{dvipdfmx}{}
+    }
+    \def\LWR at tempHTMLlatexcmd{%
+        \LWR at compilecmd{uplatex}{_html}
+        \LWR at addcompilecmd{dvipdfmx}{_html}
+    }
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+%
 % \begin{macro}{\LWR at PrintLatexCmd}
 % \begin{macro}{\LWR at HTMLLatexCmd}
 %
@@ -13237,16 +13541,23 @@
     \fi% \ifpdf
 }% latexmk
 %    \end{macrocode}
+% For \pkg{ujarticle} and related, using up\LaTeX\ and \prog{dvipdfmx}:
+% \changes{v0.63}{2018/11/25}{\pkg{ujarticle} and related: Compile options.}
+%    \begin{macrocode}
+\@ifclassloaded{ujarticle}{\LWR at compileuplatex}{}
+\@ifclassloaded{ujbook}{\LWR at compileuplatex}{}
+\@ifclassloaded{ujreport}{\LWR at compileuplatex}{}
+%    \end{macrocode}
 % Only make the setting permanent if the original was empty:
 % \changes{v0.61}{2018/09/20}{Added \optn{PrintLatexCmd} option.}
 % \changes{v0.61}{2018/09/20}{Added \optn{HTMLLatexCmd} option.}
 %    \begin{macrocode}
-    \ifdefempty{\LWR at PrintLatexCmd}{
-        \def\LWR at PrintLatexCmd{\LWR at tempprintlatexcmd}
-    }{}
-    \ifdefempty{\LWR at HTMLLatexCmd}{
-        \def\LWR at HTMLLatexCmd{\LWR at tempHTMLlatexcmd}
-    }{}
+\ifdefempty{\LWR at PrintLatexCmd}{
+    \def\LWR at PrintLatexCmd{\LWR at tempprintlatexcmd}
+}{}
+\ifdefempty{\LWR at HTMLLatexCmd}{
+    \def\LWR at HTMLLatexCmd{\LWR at tempHTMLlatexcmd}
+}{}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -13380,6 +13691,8 @@
 % \changes{v0.62}{2018/11/02}{\filenm{lwarp.css}: Reduced margins in titlepage.}
 % \changes{v0.62}{2018/11/02}{\filenm{lwarp.css}: Fixed \CSS\ for \cs{textup}.}
 % \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}.}
 %
 % ^^A *lwarp.css
 %
@@ -13498,6 +13811,12 @@
     text-decoration-skip: auto ;
 }
 
+
+/* for vertical text: */
+div.verticalrl { writing-mode: vertical-rl }
+div.horizontaltb { writing-mode: horizontal-tb }
+
+
 /* for diagbox */
 div.diagboxtitleN { border-bottom: 1px solid gray }
 div.diagboxtitleS { border-top: 1px solid gray }
@@ -14066,12 +14385,8 @@
 
 
 .mdframed {
-/*     padding: 0ex ; */
-/*    border: 1px solid blafck; */
-/*      border-radius: 0px ; */
     padding: 0ex ;
-    margin: 3ex 5% 3ex 5% ;
-/*   display: inline-block ; */
+    margin: 2ex 0em 2ex 0em ;
 }
 
 .mdframed p { padding: 0ex .5em 0ex .5em ; }
@@ -14079,20 +14394,17 @@
 .mdframed dl { padding: 0ex .5em 0ex .5em ; }
 
 .mdframedtitle {
-    padding: .5em ;
+    padding: .5ex 0pt 0pt 0pt ;
+    border-radius: 10pt 10pt 0pt 0pt ;
     display: block ;
-    font-size: 130% ;
     margin-bottom: 1ex ;
 }
 
 .mdframedsubtitle {
-    padding: 0ex .5em 0ex .5em ;
     display: block ;
-    font-size: 115% ;
 }
 
 .mdframedsubsubtitle {
-    padding: 0ex .5em 0ex .5em ;
     display: block ;
 }
 
@@ -14099,7 +14411,6 @@
 .mdtheorem {
     padding: 0ex .5em 0ex .5em ;
     margin: 3ex 5% 3ex 5% ;
-/*   display: inline-block ; */
 }
 
 
@@ -15776,7 +16087,7 @@
 -- Copyright 2016-2018 Brian Dunn
 
 
-printversion = "v0.62"
+printversion = "v0.63"
 requiredconfversion = "1" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -17313,22 +17624,81 @@
 
 % \section{Homepage link}
 
+% \codeall
+%    \begin{macrocode}
+\begin{warpall}
+%    \end{macrocode}
+
+
+% \begin{macro}{\linkhomename}
+% Holds the default name for the home link.
+%
+% \changes{v0.63}{2018/11/29}{Added.}
+%    \begin{macrocode}
+\newcommand{\linkhomename}{Home}
+%    \end{macrocode}
+% \end{macro}
+
+%    \begin{macrocode}
+\end{warpall}
+%    \end{macrocode}
+
+
 % \codehtml
 %    \begin{macrocode}
 \begin{warpHTML}
 %    \end{macrocode}
 
-
 % \begin{macro}{\LinkHome}
 % May be used wherever you wish to place a link back to the homepage.
 % The filename must be detokenized for underscores.
 %    \begin{macrocode}
 \newcommand*{\LinkHome}{%
-\LWR at subhyperrefclass{\HomeHTMLFilename.html}{Home}{linkhome}%
+\LWR at subhyperrefclass{\HomeHTMLFilename.html}{\linkhomename}{linkhome}%
 }
 %    \end{macrocode}
 % \end{macro}
 
+%    \begin{macrocode}
+\end{warpHTML}
+%    \end{macrocode}
+
+
+% \codeprint
+%    \begin{macrocode}
+\begin{warpprint}
+%    \end{macrocode}
+
+% \begin{macro}{\LinkHome}
+% May be used wherever you wish to place a link back to the homepage.
+% For print output, if \pkg{hyperref} is available a hyperlink to the first page
+% is used, named by \cs{linkhomename}.
+% If \pkg{hyperref} is not available, a pageref is used instead.
+% \changes{v0.63}{2018/11/29}{Fix: Print version.}
+%    \begin{macrocode}
+\AtBeginDocument{
+\@ifundefined{hyperref}{
+    \newcommand*{\LinkHome}{\linkhomename\ --- page \pageref{page-LWRfirstpage}}
+}{
+    \newcommand*{\LinkHome}{\hyperref[page-LWRfirstpage]{\linkhomename}}
+}
+}
+
+\AfterEndPreamble{\label{page-LWRfirstpage}}
+%    \end{macrocode}
+% \end{macro}
+
+%    \begin{macrocode}
+\end{warpprint}
+%    \end{macrocode}
+
+
+
+% \codehtml
+%    \begin{macrocode}
+\begin{warpHTML}
+%    \end{macrocode}
+
 % \begin{macro}{\LWR at topnavigation}
 %
 % Creates a link to the homepage at the top of the page for use when the window is too
@@ -17799,6 +18169,7 @@
 % \begin{macro}{\LWR at htmlopencomment}
 % \begin{macro}{\LWR at htmlclosecomment}
 % \changes{v0.47}{2018/01/25}{Add \cs{mbox} to prevent line breaks.}
+% \changes{v0.63}{2018/11/30}{Fix: Break ligature for \pkg{luatexko}.}
 %    \begin{macrocode}
 \newcommand*{\LWR at htmlopencomment}{%
 {%
@@ -17806,7 +18177,7 @@
 \begingroup%
 \LWR at FBcancel%
 \ifmmode\else\protect\LWR at origttfamily\fi%
-\LWR at print@mbox{\LWR at origtextless{}!{-}{-}}%
+\LWR at print@mbox{\LWR at origtextless{}!-\/-}%
 \endgroup%
 }%
 }
@@ -17817,7 +18188,7 @@
 \begingroup%
 \LWR at FBcancel%
 \ifmmode\else\protect\LWR at origttfamily\fi%
-\LWR at print@mbox{{-}{-}\LWR at origtextgreater}%
+\LWR at print@mbox{-\/-\LWR at origtextgreater}%
 \endgroup%
 }%
 }
@@ -17868,15 +18239,27 @@
 %
 % The trailing spaces allow more places for a line break.
 %
+% The use of \cs{textquotedbl} instead of |"| provides improved
+% compatibility with \pkg{xeCJK}.
+%
 % \changes{v0.20}{2017/01/17}{Factored code.}
 % \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.}
+% \changes{v0.63}{2018/11/24}{Fix for \pkg{xeCJK}.}
 %
 %    \begin{macrocode}
 \NewDocumentCommand{\LWR at subhtmlelementclass}{m O{} m}{%
 \LWR at traceinfo{LWR at subhtmlelementclass !#1!#2!#3!}%
 \ifblank{#2}%
-{\LWR at htmltag{#1 class="#3"}}% empty option
-{\LWR at htmltag{#1 class="#3" style="#2"}}% non-empty option
+{% empty option
+    \LWR at htmltag{#1 class=\textquotedbl#3\textquotedbl}%
+}%
+{% non-empty option
+    \LWR at htmltag{%
+        #1 % space
+        class=\textquotedbl#3\textquotedbl\ % space
+        style=\textquotedbl#2\textquotedbl%
+    }%
+}%
 \LWR at traceinfo{LWR at subhtmlelementclass done}%
 }
 %    \end{macrocode}
@@ -18099,9 +18482,13 @@
 % Low-level interface for \element{div} classes with an automatic float ID.
 % These are often used when |\ifbool{FormatWP}|.
 %
+% The use of \cs{textquotedbl} instead of |"| provides improved
+% compatibility with \pkg{xeCJK}.
+%
 % \changes{v0.42}{2017/10/26}{Added to factor code.}
 % \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
 % \changes{v0.57}{2018/05/28}{Improved print/\HTML\ output selection.}
+% \changes{v0.63}{2018/11/24}{Fix for \pkg{xeCJK}.}
 %
 % \codeprint
 %    \begin{macrocode}
@@ -18122,15 +18509,17 @@
 {%
     \addtocounter{LWR at thisautoidWP}{1}%
     \LWR at htmltag{%
-        div class="#3" %
-        id="\LWR at print@mbox{autoidWP-\arabic{LWR at thisautoidWP}}"%
-        \ifblank{#1}{}{ style="#1"}%
+        div class=\textquotedbl#3\textquotedbl % space
+        id=\textquotedbl%
+            \LWR at print@mbox{autoidWP-\arabic{LWR at thisautoidWP}}%
+        \textquotedbl%
+        \ifblank{#1}{}{ style=\textquotedbl#1\textquotedbl}%
     }%
 }% FormatWP
 {% not FormatWP
     \LWR at htmltag{%
-        div class="#3"%
-        \ifblank{#2}{}{ style="#2"}%
+        div class=\textquotedbl#3\textquotedbl%
+        \ifblank{#2}{}{ style=\textquotedbl#2\textquotedbl}%
     }%
 }% not FormatWP
 \LWR at startpars%
@@ -18465,7 +18854,7 @@
 %    \begin{macrocode}
         \PushPreHook{par}{\LWR at openparagraph}%
 %    \end{macrocode}
-%	At the end of each paragraph, generate closing tag and do regular |/par| actions:
+%	At the end of each paragraph, generate closing tag then do regular |/par| actions:
 %    \begin{macrocode}
         \let\par\LWR at closeparagraph
 
@@ -19881,9 +20270,13 @@
 %
 % Create an autosection tag.
 % \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
+% \changes{v0.63}{2018/11/24}{Fix for \pkg{xeCJK}.}
 %    \begin{macrocode}
 \newcommand*{\LWR at createautosec}[1]{%
-\LWR at htmltag{#1 id="\LWR at print@mbox{autosec-\arabic{page}}"}%
+\LWR at htmltag{%
+    #1 % space
+    id=\textquotedbl\LWR at print@mbox{autosec-\arabic{page}}\textquotedbl%
+}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -20581,7 +20974,9 @@
 %    \end{macrocode}
 % The language is user-adjustable:
 %    \begin{macrocode}
-\LWR at htmltag{html lang="\LWR at currentHTMLLanguage"}\LWR at orignewline
+\LWR at htmltag{%
+    html lang=\textquotedbl\LWR at currentHTMLLanguage\textquotedbl%
+}\LWR at orignewline
 %    \end{macrocode}
 % Start of the meta data:
 %    \begin{macrocode}
@@ -20589,7 +20984,9 @@
 %    \end{macrocode}
 % Charset is fixed at UTF-8:
 %    \begin{macrocode}
-\LWR at htmltag{meta charset="UTF-8" /}\LWR at orignewline
+\LWR at htmltag{%
+    meta charset=\textquotedbl{}UTF-8\textquotedbl\ /%
+}\LWR at orignewline
 %    \end{macrocode}
 %
 % Author:
@@ -20597,7 +20994,12 @@
 %    \begin{macrocode}
 \ifthenelse{\equal{\theHTMLAuthor}{}}%
 {}%
-{\LWR at htmltag{meta name="author" content="\theHTMLAuthor" /}\LWR at orignewline}%
+{%
+    \LWR at htmltag{%
+        meta name=\textquotedbl{}author\textquotedbl\ % space
+        content=\textquotedbl\theHTMLAuthor\textquotedbl\ /%
+    }\LWR at orignewline%
+}%
 %    \end{macrocode}
 %
 % \pkg{lwarp} is the generator:
@@ -20605,15 +21007,19 @@
 % \gindex{generator>HTML meta tag}
 % \gindex{meta tag, HTML>generator}
 %    \begin{macrocode}
-\LWR at htmltag{meta name="generator" content="LaTeX lwarp package" /}%
-    \LWR at orignewline
+\LWR at htmltag{%
+    meta % space
+    name=\textquotedbl{}generator\textquotedbl\ % space
+    content=\textquotedbl{}LaTeX lwarp package\textquotedbl\ /%
+}\LWR at orignewline%
 %    \end{macrocode}
 % If there is a description, add it now:
 %    \begin{macrocode}
 \ifdefempty{\LWR at currentHTMLDescription}{}{%
-\LWR at htmltag{%
-meta name="description" content="\LWR at currentHTMLDescription" /}%
-    \LWR at orignewline
+    \LWR at htmltag{%
+        meta name=\textquotedbl{}description\textquotedbl\ % space
+        content=\textquotedbl\LWR at currentHTMLDescription\textquotedbl\ /%
+    }\LWR at orignewline
 }%
 %    \end{macrocode}
 % Mobile-friendly viewport:
@@ -20621,17 +21027,24 @@
 % \gindex{viewport>HTML meta tag}
 % \gindex{meta tag, HTML>viewport}
 %    \begin{macrocode}
-\LWR at htmltag{meta name="viewport" %
-content="width=device-width, initial-scale=1.0" /}%
-    \LWR at orignewline
+\LWR at htmltag{%
+    meta % space
+    name=\textquotedbl{}viewport\textquotedbl\ % space
+    content=\textquotedbl{}width=device-width, initial-scale=1.0\textquotedbl\ /%
+}\LWR at orignewline
 %    \end{macrocode}
 % IE patch:
+% \changes{v0.63}{2018/11/30}{Fix: Break ligature for \pkg{luatexko}.}
 %    \begin{macrocode}
-\LWR at htmltag{!{-}{-}[if lt IE 9]}\LWR at orignewline
+\LWR at htmltag{!-\/-[if lt IE 9]}\LWR at orignewline
 \LWR at htmltag{%
-script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"}%
+    script % space
+    src=\textquotedbl{}%
+        http://html5shiv.googlecode.com/svn/trunk/html5.js%
+    \textquotedbl%
+}%
 \LWR at htmltag{/script}\LWR at orignewline
-\LWR at htmltag{![endif]{-}{-}}\LWR at orignewline
+\LWR at htmltag{![endif]-\/-}\LWR at orignewline
 %    \end{macrocode}
 % The page's title, if there is one.  
 % A section name is also added if given.
@@ -20651,7 +21064,11 @@
 % The page's stylesheet:
 %    \begin{macrocode}
 \LWR at htmltag{%
-link rel="stylesheet" type="text/css" href="\LWR at currentcss" /}%
+    link % space
+    rel=\textquotedbl{}stylesheet\textquotedbl\ % space
+    type=\textquotedbl{}text/css\textquotedbl\ % space
+    href=\textquotedbl\LWR at currentcss\textquotedbl\ /%
+}%
 \LWR at orignewline
 %    \end{macrocode}
 % Optional \brand{MathJax} support.  The \HTML\ tags must be turned off
@@ -20710,10 +21127,14 @@
 
 
 % \begin{macro}{\LWR at LwarpStart}
+% Executed at the beginning of the entire document.
+%
+% The use of \cs{textquotedbl} instead of |"| improves compatibility with \pkg{xeCJK}.
+%
 % \changes{v0.19}{2016/06/01}{Enabled \textbackslash\textbackslash{} equal to \cs{newline}.}
 % \changes{v0.21}{2017/02/22}{Changed \filenm{lateximages} to a \filenm{.txt} file.}
 % \changes{v0.28}{2017/04/09}{\progcode{FormatWordProcessor} forces single-file output.}
-% Executed at the beginning of the entire document.
+% \changes{v0.63}{2018/11/24}{Fixes for \pkg{xeCJK}.}
 %    \begin{macrocode}
 \catcode`\$=\active
 \newcommand*{\LWR at LwarpStart}
@@ -20841,7 +21262,7 @@
 \LWR at stoppars
 \LWR at htmltag{/header}\LWR at orignewline
 \LWR at traceinfo{LWR at lwarpStart: Generating textbody.}
-\LWR at htmltag{section class="textbody"}
+\LWR at htmltag{section class=\textquotedbl{}textbody\textquotedbl}
 %    \end{macrocode}
 %
 % Patch the |itemize|, |enumerate|, and |description| environments and \cs{item}.
@@ -21889,7 +22310,10 @@
 %
 % Encloses a verbatim environment with the given \CSS\ class.
 %
+% The use of \cs{textquotedbl} instead of |"| improves compatibility with \pkg{xeCJK}.
+%
 % \changes{v0.51}{2018/03/17}{Adds vertical offset.}
+% \changes{v0.63}{2018/11/24}{Fix for \pkg{xeCJK}.}
 %    \begin{macrocode}
 \newcommand*{\LWR at atbeginverbatim}[3][]
 {%
@@ -21907,8 +22331,8 @@
 % as loading the \brand{MathJax} script.
 %    \begin{macrocode}
 \ifbool{LWR at verbtags}{%
-    \LWR at htmltag{pre class="#3"
-        \ifthenelse{\equal{#1}{}}{}{style="#1"}%
+    \LWR at htmltag{pre class=\textquotedbl#3\textquotedbl%
+        \ifthenelse{\equal{#1}{}}{}{ style=\textquotedbl#1\textquotedbl}%
     }%
     \LWR at orignewline% pre
     \leavevmode\unskip\LWR at print@vspace*{-#2\baselineskip}%
@@ -30565,7 +30989,12 @@
 \LWR at PreloadedPackage{ulem}
 %    \end{macrocode}
 
+% \pkg{xetexko-vertical} may be preloaded by \pkg{xetexko}.
 %    \begin{macrocode}
+\LWR at PreloadedPackage{xetexko-vertical}
+%    \end{macrocode}
+
+%    \begin{macrocode}
 \end{warpHTML}
 %    \end{macrocode}
 
@@ -33211,6 +33640,53 @@
 %    \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}
+%
+% Load patches to \pkg{ltjs*} classes.
+%
+% \changes{v0.63}{2018/11/24}{\pkg{ltjs*}: Added.}
+%
+% \codehtml
+%    \begin{macrocode}
+\begin{warpHTML}
+%    \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}}{}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\end{warpHTML}
+%    \end{macrocode}
+
+
 % ^^A *ctex
 % \section{C\TeX patch}
 %
@@ -33911,57 +34387,9 @@
 %
 %
 %
-% \iffalse
-%<*ae>
-% \fi
 %
-% \part{lwarp-ae.sty}
 %
-% \section{ae}
-%
-% \DescribePackage{ae}
-% \pkg{ae} does not work with \prog{pdftotext}, and is superceded by \pkg{latinmodern}.
-%
-% \changes{v0.54}{2018/04/06}{\pkg{ae}: Prevented.}
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at loadnever{ae}{latinmodern}
-%    \end{macrocode}
-%
 % \iffalse
-%</ae>
-% \fi
-%
-%
-%
-%
-% \iffalse
-%<*aecc>
-% \fi
-%
-% \part{lwarp-aecc.sty}
-%
-% \section{aecc}
-%
-% \DescribePackage{aecc}
-% \pkg{aecc} does not work with \prog{pdftotext}, and is superceded by \pkg{latinmodern}.
-%
-% \changes{v0.54}{2018/04/06}{\pkg{aecc}: Prevented.}
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at loadnever{aecc}{latinmodern}
-%    \end{macrocode}
-%
-% \iffalse
-%</aecc>
-% \fi
-%
-%
-%
-%
-% \iffalse
 %<*afterpage>
 % \fi
 %
@@ -34782,7 +35210,22 @@
 %
 % \codehtml
 %
+% \pkg{amsthm} must be loaded before \pkg{mdframed}:
+% \changes{v0.63}{2018/12/01}{\pkg{amsthm}, \pkg{mdframed}: Fix for enforced load order.}
 %    \begin{macrocode}
+\@ifpackageloaded{mdframed}{
+    \PackageError{lwarp}
+    {Package mdframed must be loaded after package amsthm.}
+    {%
+        Move \detokenize{\usepackage}{amsthm} before \detokenize{\usepackage}{mdframed}.
+        Package amsthm may be loaded by something else, which must also be moved
+        before mdframed.%
+    }
+}
+{}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \LWR at ProvidesPackagePass{amsthm}
 %    \end{macrocode}
 
@@ -36227,33 +36670,7 @@
 %
 %
 %
-%
 % \iffalse
-%<*boxedminipage>
-% \fi
-%
-% \part{lwarp-boxedminipage.sty}
-%
-% \section{boxedminipage}
-%
-% \DescribePackage{boxedminipage}
-% \pkg{boxedminipage} is superceded by \pkg{boxedminipage2e}.
-%
-% \changes{v0.34}{2017/07/26}{\pkg{boxedminipage}: Prevented.}
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at loadnever{boxedminipage}{boxedminipage2e}
-%    \end{macrocode}
-%
-% \iffalse
-%</boxedminipage>
-% \fi
-%
-%
-%
-%
-% \iffalse
 %<*boxedminipage2e>
 % \fi
 
@@ -36810,33 +37227,10 @@
 %
 %
 %
-% \iffalse
-%<*caption2>
-% \fi
 %
-% \part{lwarp-caption2.sty}
 %
-% \section{caption2}
 %
-% \DescribePackage{caption2}
-% \pkg{caption2} is not used.
-% The user is recommended to use \pkg{caption} instead.
-%
-% \changes{v0.38}{2017/08/22}{\pkg{caption2}: Prevented.}
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at loadnever{caption2}{caption}
-%    \end{macrocode}
-%
 % \iffalse
-%</caption2>
-% \fi
-%
-%
-%
-%
-% \iffalse
 %<*cases>
 % \fi
 %
@@ -36893,36 +37287,7 @@
 %
 %
 %
-%
-%
 % \iffalse
-%<*ccaption>
-% \fi
-
-% \part{lwarp-ccaption.sty}
-
-% \section{ccaption}
-%
-% \DescribePackage{ccaption}
-% \pkg{ccaption} is not used.
-% The user is recommended to use \pkg{caption} instead.
-
-% \changes{v0.25}{2017/03/16}{\pkg{ccaption}: Prevented.}
-
-% \codehtml
-%    \begin{macrocode}
-\LWR at loadnever{ccaption}{caption}
-%    \end{macrocode}
-
-
-% \iffalse
-%</ccaption>
-% \fi
-%
-%
-%
-%
-% \iffalse
 %<*changebar>
 % \fi
 %
@@ -38751,8 +39116,10 @@
 % \codehtml
 %    \begin{macrocode}
 \@ifpackageloaded{xeCJK}{}{
-    \LWR at loadnever{CJK}{ctex}
+    \LWR at loadnever{CJK}{ctex, xeCJK}
 }
+
+\LWR at ProvidesPackagePass{CJK}
 %    \end{macrocode}
 %
 % \iffalse
@@ -38773,13 +39140,15 @@
 % \DescribePackage{CJKutf8}
 % \pkg{CJKutf8} does not work with \pkg{lwarp} unless called from \pkg{ctex}.
 %
-% \changes{v0.62}{2018/11/18}{\pkg{CJK}: Prevented unless \pkg{xeCJK}.}
+% \changes{v0.62}{2018/11/18}{\pkg{CJKutf8}: Prevented unless \pkg{xeCJK}.}
 %
 % \codehtml
 %    \begin{macrocode}
 \@ifpackageloaded{xeCJK}{}{
-    \LWR at loadnever{CJKutf8}{ctex}
+    \LWR at loadnever{CJKutf8}{ctex, xeCJK}
 }
+
+\LWR at ProvidesPackagePass{CJKutf8}
 %    \end{macrocode}
 %
 % \iffalse
@@ -39131,46 +39500,8 @@
 %
 %
 %
-% \iffalse
-%<*ctex>
-% \fi
 %
-% \part{lwarp-ctex.sty}
-%
-% \section{ctex}
-%
-% \DescribePackage{ctex}
-% Error if \pkg{ctex} is loaded after \pkg{lwarp}.
-%
-% Load \pkg{ctex} before \pkg{lwarp} so that \pkg{lwarp}
-% can take control of the sectioning commands.
-% The \pkg{ctex} \optn{heading} option is then ignored.
-%
-% Ref: \url{http://bbs.ctex.org/forum.php?mod=viewthread&tid=155890}
-%
-%
-% \changes{v0.62}{2018/11/17}{\pkg{ctex}: Added.}
-%
-% Discard all options for \pkg{lwarp-ctex}:
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at ProvidesPackageDrop{ctex}[2018-05-02]
-%    \end{macrocode}
-
-%    \begin{macrocode}
-\LWR at loadbefore{ctex}
-%    \end{macrocode}
-
 % \iffalse
-%</ctex>
-% \fi
-%
-%
-%
-%
-%
-% \iffalse
 %<*cuted>
 % \fi
 %
@@ -39984,6 +40315,7 @@
 % \pkg{enumitem} is supported with minor adjustments.
 %
 % \changes{v0.34}{2017/07/27}{\pkg{enumitem}: Added, no longer required.}
+% \changes{v0.63}{2018/12/02}{\pkg{emumitem}: Nullifiy \cs{DrawEnumitemLabel}.}
 %
 % \codehtml
 %    \begin{macrocode}
@@ -40005,13 +40337,15 @@
 % the new environment.  Renewed lists already have their actions assigned, and
 % thus need no changes.
 %    \begin{macrocode}
-\let\LWR at orignewlist\newlist
+\let\LWR at enumitem@orignewlist\newlist
 
 \renewcommand*{\newlist}[3]{%
-\LWR at orignewlist{#1}{#2}{#3}%
+\LWR at enumitem@orignewlist{#1}{#2}{#3}%
 \AtBeginEnvironment{#1}{\@nameuse{LWR@#2start}}%
 \AtEndEnvironment{#1}{\@nameuse{LWR@#2end}}%
 }
+
+\def\DrawEnumitemLabel{}
 %    \end{macrocode}
 
 
@@ -40803,32 +41137,11 @@
 %
 %
 %
-% \iffalse
-%<*fancyheadings>
-% \fi
 %
-% \part{lwarp-fancyheadings.sty}
 %
-% \section{fancyheadings}
 %
-% \DescribePackage{fancyheadings}
-% \pkg{fancyheadings} is superceded by \pkg{fancyhdr}.
 %
-% \changes{v0.48}{2018/02/07}{\pkg{fancyheadings}: Prevented.}
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at loadnever{fancyheadings}{fancyhdr}
-%    \end{macrocode}
-%
 % \iffalse
-%</fancyheadings>
-% \fi
-%
-%
-%
-%
-% \iffalse
 %<*fancyhdr>
 % \fi
 
@@ -42476,40 +42789,6 @@
 %
 %
 % \iffalse
-%<*fontspec>
-% \fi
-%
-% \part{lwarp-fontspec.sty}
-%
-% \section{fontspec}
-%
-% \DescribePackage{fontspec}
-% Error if \pkg{fontspec} is loaded after \pkg{lwarp}.
-%
-% \changes{v0.21}{2017/02/22}{\pkg{fontspec}: Added.}
-%
-
-% Discard all options for \pkg{lwarp-fontspec}:
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at ProvidesPackageDrop{fontspec}[2017/11/09]
-%    \end{macrocode}
-
-%    \begin{macrocode}
-\LWR at loadbefore{fontspec}
-%    \end{macrocode}
-
-% \iffalse
-%</fontspec>
-% \fi
-%
-%
-%
-%
-%
-%
-% \iffalse
 %<*footmisc>
 % \fi
 %
@@ -43233,32 +43512,8 @@
 %
 %
 %
-% \iffalse
-%<*glossary>
-% \fi
 %
-% \part{lwarp-glossary.sty}
-%
-% \section{glossary}
-%
-% \DescribePackage{glossary}
-% \pkg{glossary} is superceded by \pkg{glossaries}.
-%
-% \changes{v0.57}{2018/05/16}{\pkg{glossary}: Prevented.}
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at loadnever{glossary}{glossaries}
-%    \end{macrocode}
-%
 % \iffalse
-%</glossary>
-% \fi
-%
-%
-%
-%
-% \iffalse
 %<*graphics>
 % \fi
 
@@ -45490,70 +45745,7 @@
 %
 %
 %
-%
 % \iffalse
-%<*inputenc>
-% \fi
-%
-% \part{lwarp-inputenc.sty}
-%
-% \section{inputenc}
-%
-% \DescribePackage{inputenc}
-% Error if \pkg{inputenc} is loaded after \pkg{lwarp}.
-%
-% \changes{v0.21}{2017/02/22}{\pkg{inputenc}: Added.}
-%
-
-% \codehtml
-%
-%    \begin{macrocode}
-\LWR at ProvidesPackageDrop{inputenc}
-%    \end{macrocode}
-
-%    \begin{macrocode}
-\LWR at loadbefore{inputenc}
-%    \end{macrocode}
-
-% \iffalse
-%</inputenc>
-% \fi
-%
-%
-%
-%
-% \iffalse
-%<*inputenx>
-% \fi
-%
-% \part{lwarp-inputenx.sty}
-%
-% \section{inputenx}
-%
-% \DescribePackage{inputenx}
-% Error if \pkg{inputenx} is loaded after \pkg{lwarp}.
-%
-% \changes{v0.54}{2018/04/10}{\pkg{inputenx}: Added.}
-%
-
-% \codehtml
-%
-%    \begin{macrocode}
-\LWR at ProvidesPackageDrop{inputenx}
-%    \end{macrocode}
-
-%    \begin{macrocode}
-\LWR at loadbefore{inputenx}
-%    \end{macrocode}
-
-% \iffalse
-%</inputenx>
-% \fi
-%
-%
-%
-%
-% \iffalse
 %<*intopdf>
 % \fi
 %
@@ -47240,14 +47432,6 @@
 %
 % \limitsmdframed
 %
-% Environments created or encapsulated by \pkg{mdframed} are enclosed in a
-% \margintag{\CSS\ classes}
-% \element{div} of class |md<environmentname>|, or |mdframed| otherwise.
-%
-% Frame titles are placed into a \element{span} of class |mdframedtitle|.
-% Subtitles are in a \element{span} of class |mdframedsubtitle|,
-% and likewise for subsubtitles.
-%
 % Pre-existing hooks are used to patch extra functions before and after the frames.
 %
 %
@@ -47261,11 +47445,6 @@
 %    \end{macrocode}
 %
 %
-% \pkg{amsthm} must be loaded before \pkg{mdframed}
-%    \begin{macrocode}
-\LWR at origRequirePackage{amsthm}
-%    \end{macrocode}
-%
 % Do not require \tikz{} or pstricks:
 %    \begin{macrocode}
 \LWR at origRequirePackage[framemethod=none]{mdframed}
@@ -47341,9 +47520,12 @@
 % \begin{noindmacro}{\LWR at mdfprintlength} \marg{mdflengthkey}
 %
 % Given the \pkg{mdframed} key, print the length.
+%
+% \changes{v0.63}{2018/12/02}{\pkg{mdframed}: Avoid thin rules.}
 %    \begin{macrocode}
 \newcommand*{\LWR at mdfprintlength}[1]{%
-\LWR at printlength{\@nameuse{mdf@#1 at length}}
+\LWR at forceminwidth{\@nameuse{mdf@#1 at length}}%
+\LWR at printlength{\LWR at atleastonept}%
 }
 %    \end{macrocode}
 % \end{noindmacro}
@@ -47364,9 +47546,15 @@
 %    \begin{macrocode}
 \LWR at stoppars%
 %    \end{macrocode}
-% Open a \element{div} and with custom |class| and custom |style|:
+% Open a \element{div} and with custom \attribute{class} and custom \attribute{style}.
+% A \env{BlockClass} environment is not used because this \element{div} is
+% created by the \pkg{mdframed} \optn{startcode} and \optn{endcode} settings,
+% which do not properly nest the \element{div} inside the \env{mdframed} environment.
 %    \begin{macrocode}
-\LWR at htmltagc{div class="\LWR at mdthisenv" \LWR at orignewline
+\LWR at htmltagc{div class="%
+mdframed%
+\ifdefstring{\LWR at mdthisenv}{mdframed}{}{ \LWR at mdthisenv}%
+" \LWR at orignewline
 style=" \LWR at orignewline
 %    \end{macrocode}
 % Convert and print the background color:
@@ -47412,6 +47600,7 @@
 %    \end{macrocode}
 % \end{noindmacro}
 %
+%
 % \begin{noindmacro}{\LWR at mdframedend}
 % Actions after an mdframe ends.
 %
@@ -47504,21 +47693,17 @@
 %
 % \begin{noindmacro}{\mdfframedtitleenv} \marg{title}
 %
-% Encapsulation of the original which places the title
-% inside a \element{span} of class |mdframedtitle|:
+% Place the title inside a \element{div} of class \attribute{mdframedtitle}:
 %    \begin{macrocode}
-\LetLtxMacro\LWR at origmdfframedtitleenv\mdfframedtitleenv
-
 \newlength{\LWR at titleroundcorner}
 
 \renewrobustcmd\mdfframedtitleenv[1]{%
 \LWR at traceinfo{LWR at mdframedtitleenv start}%
-% \LWR at origmdfframedtitleenv{%
 %    \end{macrocode}
-% Open a \element{span} with a custom |class| and custom |style|:
+% Open a \element{div} with a custom |class| and custom |style|:
+% \changes{v0.63}{2018/12/01}{Improved titles.}
 %    \begin{macrocode}
-\LWR at htmltagc{span class="mdframedtitle" \LWR at orignewline
-style=" \LWR at orignewline
+\begin{BlockClass}[%
 %    \end{macrocode}
 % Convert and print the title background color:
 %    \begin{macrocode}
@@ -47546,24 +47731,18 @@
 % ^^A     0pt 0pt
 % ^^A     \LWR at orignewline
 % ^^A    \end{macrocode}
-% Finish the custom style and the opening span tag:
+% Finish the custom style and the opening \element{div} tag:
 %    \begin{macrocode}
-" \LWR at orignewline
-}% span
+]{mdframedtitle}%
 %    \end{macrocode}
-% Restrict paragraph tags inside a span:
+% Print the title inside the \element{div}:
+% \changes{v0.63}{2018/12/02}{\pkg{mdframed}: Improved font control.}
 %    \begin{macrocode}
-\begin{LWR at nestspan}%
+\mdf at frametitlefont{\LWR at textcurrentfont{#1}}%
 %    \end{macrocode}
-% Print the title inside the span:
+% Close the \element{div}:
 %    \begin{macrocode}
-#1%
-%    \end{macrocode}
-% Closee the span and unnest the paragraph tag restriction:
-%    \begin{macrocode}
-\LWR at htmltagc{/span}%
-\end{LWR at nestspan}%
-% }
+\end{BlockClass}%
 \LWR at traceinfo{LWR at mdframedtitleenv end}%
 }
 %    \end{macrocode}
@@ -47575,7 +47754,7 @@
 %
 % Common code for \cs{LWR at mdfsubtitle} and \cs{LWR at mdfsubsubtitle}.
 %
-% Encapsulate the subtitle inside a \element{span} of class |mdframedsubtitle|:
+% Encapsulate the subtitle inside a \element{div} of class |mdframedsubtitle|:
 %    \begin{macrocode}
 \NewDocumentCommand{\LWR at mdfsubtitlecommon}{m o m}
 {% the following empty line is required
@@ -47582,17 +47761,11 @@
 
 \LWR at traceinfo{LWR at mdframedsubtitlecommon start}%
 %    \end{macrocode}
-% Special handling for mdframed:
-% Subtitles have \cs{par}s around them,
-% so temporarily disable them here.
+% Open a \element{div} with a custom \attribute{class} and custom \attribute{style}:
+% \changes{v0.63}{2018/12/01}{Improved titles.}
 %    \begin{macrocode}
-\let\par\LWR at origpar%
+\begin{BlockClass}[%
 %    \end{macrocode}
-% Open a \element{span} with a custom |class| and custom |style|:
-%    \begin{macrocode}
-\LWR at htmltagc{span class="mdframed#1title"
-style=" \LWR at orignewline
-%    \end{macrocode}
 % Convert and print the background color:
 %    \begin{macrocode}
 background:
@@ -47619,25 +47792,20 @@
     ; \LWR at orignewline
 }{}%
 %    \end{macrocode}
-% Finish the custom style and the opening span tag:
+% Finish the custom style and the opening \element{div} tag:
 %    \begin{macrocode}
-"}% span
+]{mdframed#1title}%
 %    \end{macrocode}
-% Restrict paragraph tags inside a span:
-%    \begin{macrocode}
-\begin{LWR at nestspan}%
-%    \end{macrocode}
 % Perform the original subtitle action:
+% \changes{v0.63}{2018/12/02}{\pkg{mdframed}: Improved font control.}
 %    \begin{macrocode}
 \IfNoValueTF{#2}
-{\@nameuse{LWR at origmdf#1title}{#3}}%
-{\@nameuse{LWR at origmdf#1title}[#2]{#3}}%
+{\@nameuse{LWR at origmdf#1title}{\csuse{mdf@#1titlefont}{\LWR at textcurrentfont{#3}}}}%
+{\@nameuse{LWR at origmdf#1title}[#2]{\csuse{mdf@#1titlefont}{\LWR at textcurrentfont{#3}}}}%
 %    \end{macrocode}
-% Close the span and unnest the paragraph tag restriction:
+% Close the \element{div}:
 %    \begin{macrocode}
-\LWR at htmltagc{/span}% the following empty line is required
-\end{LWR at nestspan}% must follow the /span or an extra <p> appears
-
+\end{BlockClass}%
 \LWR at traceinfo{LWR at mdframedsubtitlecommon end}%
 }
 %    \end{macrocode}
@@ -47709,6 +47877,7 @@
 % Modified from the original to remember the environment.
 %
 % \changes{v0.34}{2017/08/05}{\pkg{mdframed}: Improved \env{mdtheorem} patch.}
+% \changes{v0.63}{2018/12/02}{\pkg{mdframed}: Improved font control.}
 %
 %    \begin{macrocode}
 \DeclareDocumentCommand{\mdtheorem}{ O{} m o m o }%
@@ -47729,7 +47898,7 @@
              \def\@temptitle{\mdf at theoremseparator%
                              \mdf at theoremspace%
                              \mdf at theoremtitlefont%
-                             ##1}%
+                             \LWR at textcurrentfont{##1}}% lwarp
              \mdf at thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}%
              }%
           \begin{mdframed}[#1,frametitle={\strut#4\ \csname the#2\endcsname%
@@ -47754,7 +47923,7 @@
              \def\@temptitle{\mdf at theoremseparator%
                              \mdf at theoremspace%
                              \mdf at theoremtitlefont%
-                             ##1}%
+                             \LWR at textcurrentfont{##1}}% lwarp
              \mdf at thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}%
              }
           \begin{mdframed}[#1,frametitle={\strut#4\ \csname the#2\endcsname%
@@ -47767,7 +47936,7 @@
              \def\@temptitle{\mdf at theoremseparator%
                              \mdf at theoremspace%
                              \mdf at theoremtitlefont%
-                             ##1}%
+                             \LWR at textcurrentfont{##1}}% lwarp
              \mdf at thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}%
              }%
           \begin{mdframed}[#1,frametitle={\strut#4\@temptitle}]}%
@@ -47784,7 +47953,7 @@
              \def\@temptitle{\mdf at theoremseparator%
                              \mdf at theoremspace%
                              \mdf at theoremtitlefont%
-                             ##1}%
+                             \LWR at textcurrentfont{##1}}% lwarp
              \mdf at thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}%
              }
           \begin{mdframed}[#1,frametitle={\strut#4\ \csname the#2\endcsname%
@@ -47803,8 +47972,8 @@
 % \end{noindmacro}
 %
 %
-% \begin{noindmacro}{\newmdtheoremenv} \oarg{mdframed-options} \marg{envname}
-%        \oarg{numberedlike} \marg{caption} \oarg{within}
+% \begin{noindmacro}{\newmdtheoremenv} \oarg{1: mdframed-options} \marg{2: envname}
+%        \oarg{3: numberedlike} \marg{4: caption} \oarg{5: within}
 %
 % Modified from the original to remember the environment.
 %    \begin{macrocode}
@@ -48167,7 +48336,9 @@
 % \changes{v0.47}{2018/01/26}{\pkg{midpage}: Fix: Line wrap at \HTML\ hyphen.}
 %    \begin{macrocode}
 \newenvironment{midpage}
-{\begin{BlockClass}[\LWR at print@mbox{margin-top:6ex} ; \LWR at print@mbox{margin-bottom:6ex}]{midpage}}
+{\begin{BlockClass}[%
+    \LWR at print@mbox{margin-top:6ex} ; \LWR at print@mbox{margin-bottom:6ex}%
+]{midpage}}
 {\end{BlockClass}}
 %    \end{macrocode}
 %
@@ -48322,43 +48493,7 @@
 %
 %
 %
-%
 % \iffalse
-%<*morewrites>
-% \fi
-%
-% \part{lwarp-morewrites.sty}
-%
-% \section{morewrites}
-%
-% \DescribePackage{morewrites}
-% Error if \pkg{morewrites} is loaded after \pkg{lwarp}.
-%
-% \changes{v0.42}{2017/10/19}{\pkg{morewrites}: Added.}
-%
-
-% Discard all options for \pkg{lwarp-morewrites}:
-
-% \codehtml
-%
-%    \begin{macrocode}
-\LWR at ProvidesPackageDrop{morewrites}
-%    \end{macrocode}
-
-%    \begin{macrocode}
-\LWR at loadbefore{morewrites}
-%    \end{macrocode}
-
-% \iffalse
-%</morewrites>
-% \fi
-%
-%
-%
-%
-%
-%
-% \iffalse
 %<*mparhack>
 % \fi
 %
@@ -48385,7 +48520,6 @@
 %
 %
 %
-%
 % \iffalse
 %<*multicol>
 % \fi
@@ -48989,73 +49123,6 @@
 %
 %
 % \iffalse
-%<*newclude>
-% \fi
-%
-% \part{lwarp-newclude.sty}
-%
-% \section{newclude}
-%
-% \DescribePackage{newclude}
-% Error if \pkg{newclude} is loaded after \pkg{lwarp}.
-%
-% \changes{v0.21}{2017/02/22}{\pkg{newclude}: Added.}
-%
-
-% Discard all options for \pkg{lwarp-newclude}:
-
-% \codehtml
-%    \begin{macrocode}
-\LWR at ProvidesPackageDrop{newclude}
-%    \end{macrocode}
-
-%    \begin{macrocode}
-\LWR at loadbefore{newclude}
-%    \end{macrocode}
-
-% \iffalse
-%</newclude>
-% \fi
-%
-%
-%
-%
-%
-%
-%
-% \iffalse
-%<*newunicodechar>
-% \fi
-%
-% \part{lwarp-newunicodechar.sty}
-%
-% \section{newunicodechar}
-%
-% \DescribePackage{newunicodechar}
-% Error if \pkg{newunicodechar} is loaded after \pkg{lwarp}.
-%
-% \changes{v0.21}{2017/02/22}{\pkg{newunicodechar}: Added.}
-%
-
-% Discard all options for \pkg{lwarp-newunicodechar}:
-
-% \codehtml
-%    \begin{macrocode}
-\LWR at ProvidesPackageDrop{newunicodechar}
-%    \end{macrocode}
-
-%    \begin{macrocode}
-\LWR at loadbefore{newunicodechar}
-%    \end{macrocode}
-
-% \iffalse
-%</newunicodechar>
-% \fi
-%
-%
-%
-%
-% \iffalse
 %<*nextpage>
 % \fi
 
@@ -53890,6 +53957,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.}
 %
 % \codehtml
 %
@@ -53897,13 +53965,24 @@
 \LWR at ProvidesPackageDrop{stfloats}
 %    \end{macrocode}
 %
+% \pkg{stfloats} may have been preloaded by a \pkg{ltjs*} class.
+%
+% The following are provided in case they have not yet been defined:
 %    \begin{macrocode}
-\newcommand*{\fnbelowfloat}{}
-\newcommand*{\fnunderfloat}{}
-\newcommand*{\setbaselinefloat}{}
-\newcommand*{\setbaselinefixed}{}
+\providecommand*{\fnbelowfloat}{}
+\providecommand*{\fnunderfloat}{}
+\providecommand*{\setbaselinefloat}{}
+\providecommand*{\setbaselinefixed}{}
 %    \end{macrocode}
 %
+% Nullified for \HTML:
+%    \begin{macrocode}
+\renewcommand*{\fnbelowfloat}{}
+\renewcommand*{\fnunderfloat}{}
+\renewcommand*{\setbaselinefloat}{}
+\renewcommand*{\setbaselinefixed}{}
+%    \end{macrocode}
+%
 % \iffalse
 %</stfloats>
 % \fi
@@ -54397,31 +54476,8 @@
 %
 %
 %
-% \iffalse
-%<*t1enc>
-% \fi
 %
-% \part{lwarp-t1enc.sty}
-%
-% \section{t1enc}
-%
-% \DescribePackage{t1enc}
-% \pkg{t1enc} does not work with \pkg{lwarp}.
-%
-% \changes{v0.54}{2018/04/10}{\pkg{t1enc}: Prevented.}
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at loadnever{t1enc}{fontenc, inputenc, inputenx}
-%    \end{macrocode}
-%
 % \iffalse
-%</t1enc>
-% \fi
-%
-%
-%
-% \iffalse
 %<*tabls>
 % \fi
 %
@@ -58261,31 +58317,8 @@
 %
 %
 %
-% \iffalse
-%<*wasysym>
-% \fi
 %
-% \part{lwarp-wasysym.sty}
-%
-% \section{wasysym}
-%
-% \DescribePackage{wasysym}
-% \pkg{wasysym} does not work with \prog{pdftotext}.
-%
-% \changes{v0.54}{2018/04/09}{\pkg{wasysym}: Prevented.}
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at loadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
-%    \end{macrocode}
-%
 % \iffalse
-%</wasysym>
-% \fi
-%
-%
-%
-% \iffalse
 %<*watermark>
 % \fi
 %
@@ -59182,40 +59215,6 @@
 %
 %
 % \iffalse
-%<*xeCJK>
-% \fi
-%
-% \part{lwarp-xeCJK.sty}
-%
-% \section{xeCJK}
-%
-% \DescribePackage{xeCJK}
-% Error if \pkg{xeCJK} is loaded after \pkg{lwarp}.
-%
-% Load \pkg{xeCJK} before \pkg{lwarp} so that \pkg{lwarp}
-% can take control of the sectioning commands.
-%
-% \changes{v0.62}{2018/11/18}{\pkg{xeCJK}: Added.}
-%
-% Discard all options for \pkg{lwarp-xeCJK}:
-%
-% \codehtml
-%    \begin{macrocode}
-\LWR at ProvidesPackageDrop{xeCJK}
-%    \end{macrocode}
-
-%    \begin{macrocode}
-\LWR at loadbefore{xeCJK}
-%    \end{macrocode}
-
-% \iffalse
-%</xeCJK>
-% \fi
-%
-%
-%
-%
-% \iffalse
 %<*xellipsis>
 % \fi
 %
@@ -59278,6 +59277,43 @@
 %
 %
 % \iffalse
+%<*xetexko-vertical>
+% \fi
+%
+% \part{lwarp-xetexko-vertical.sty}
+%
+% \section{xetexko-vertical}
+%
+% \credits{Dohyun Kim}
+%
+% \DescribePackage{xetexko-vertical}
+% \pkg{xetexko-vertical} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.20}{2017/01/11}{\pkg{xetexko-vertical}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR at loadbefore{xetexko-vertical}
+
+\LWR at ProvidesPackagePass{xetexko-vertical}[2018/04/06]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\renewcommand{\verticaltypesetting}{}
+\renewenvironment{vertical}[1]{\BlockClass{verticalrl}}{\endBlockClass}
+\renewenvironment{horizontal}[1]{\BlockClass{horizontaltb}}{\endBlockClass}
+\renewcommand{\vertlatin}[1]{#1}
+%    \end{macrocode}
+%
+% \iffalse
+%</xetexko-vertical>
+% \fi
+%
+%
+%
+%
+% \iffalse
 %<*xfrac>
 % \fi
 
@@ -59637,8 +59673,47 @@
 %
 %
 %
+% \iffalse
+%<*xpinyin>
+% \fi
 %
+% \part{lwarp-xpinyin.sty}
+%
+% \section{xpinyin}
+%
+% \credits{Soben Lee}
+%
+% \DescribePackage{xpinyin}
+% \pkg{xpinyin} is partly supported.
+% \cs{xpinyin} and \env{pinyinscope} are nullified, but \cs{pinyin} works.
+%
+% \changes{v0.63}{2018/12/03}{\pkg{xpinyin}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR at ProvidesPackagePass{xpinyin}[2018/01/28]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RenewDocumentEnvironment{pinyinscope}{O{}}{}{}
+
+\RenewDocumentCommand{\xpinyin}{s O{} m}{%
+    \IfBooleanTF{#1}{#3}{\@firstoftwo#3}%
+}
+
+\RenewDocumentCommand{\enablepinyin}{}{}
+%    \end{macrocode}
+%
 % \iffalse
+%</xpinyin>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
 %<*xtab>
 % \fi
 
@@ -59870,6 +59945,38 @@
 %
 %
 % \iffalse
+%<*zhlineskip>
+% \fi
+%
+% \part{lwarp-zhlineskip.sty}
+%
+% \section{zhlineskip}
+%
+% \DescribePackage{zhlineskip}
+% \pkg{zhlineskip} is ignored.
+%
+% \changes{v0.63}{2018/12/02}{\pkg{zhlineskip}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR at ProvidesPackageDrop{zhlineskip}[2018/11/30]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\newcommand*\SetTextEnvironmentSinglespace[1]{}
+\newcommand*\RestoreTextEnvironmentLeading{}
+\newcommand*\SetMathEnvironmentSinglespace[1]{}
+\newcommand*\RestoreMathEnvironmentLeading{}
+%    \end{macrocode}
+%
+% \iffalse
+%</zhlineskip>
+% \fi
+%
+%
+%
+% \iffalse
 %<*zwpagelayout>
 % \fi
 %

Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins	2018-12-04 23:10:56 UTC (rev 49318)
@@ -44,8 +44,6 @@
 \file{lwarp-acronym.sty}{\from{lwarp.dtx}{acronym}}
 \file{lwarp-adjmulticol.sty}{\from{lwarp.dtx}{adjmulticol}}
 \file{lwarp-addlines.sty}{\from{lwarp.dtx}{addlines}}
-\file{lwarp-ae.sty}{\from{lwarp.dtx}{ae}}
-\file{lwarp-aecc.sty}{\from{lwarp.dtx}{aecc}}
 \file{lwarp-afterpage.sty}{\from{lwarp.dtx}{afterpage}}
 \file{lwarp-algorithm2e.sty}{\from{lwarp.dtx}{algorithm2e}}
 \file{lwarp-algorithmicx.sty}{\from{lwarp.dtx}{algorithmicx}}
@@ -76,7 +74,6 @@
 \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-boxedminipage.sty}{\from{lwarp.dtx}{boxedminipage}}
 \file{lwarp-boxedminipage2e.sty}{\from{lwarp.dtx}{boxedminipage2e}}
 \file{lwarp-breakurl.sty}{\from{lwarp.dtx}{breakurl}}
 \file{lwarp-breqn.sty}{\from{lwarp.dtx}{breqn}}
@@ -85,9 +82,7 @@
 \file{lwarp-cancel.sty}{\from{lwarp.dtx}{cancel}}
 \file{lwarp-canoniclayout.sty}{\from{lwarp.dtx}{canoniclayout}}
 \file{lwarp-caption.sty}{\from{lwarp.dtx}{caption}}
-\file{lwarp-caption2.sty}{\from{lwarp.dtx}{caption2}}
 \file{lwarp-cases.sty}{\from{lwarp.dtx}{cases}}
-\file{lwarp-ccaption.sty}{\from{lwarp.dtx}{ccaption}}
 \file{lwarp-changebar.sty}{\from{lwarp.dtx}{changebar}}
 \file{lwarp-changepage.sty}{\from{lwarp.dtx}{changepage}}
 \file{lwarp-chngpage.sty}{\from{lwarp.dtx}{chngpage}}
@@ -109,7 +104,6 @@
 \file{lwarp-continue.sty}{\from{lwarp.dtx}{continue}}
 \file{lwarp-copyrightbox.sty}{\from{lwarp.dtx}{copyrightbox}}
 \file{lwarp-crop.sty}{\from{lwarp.dtx}{crop}}
-\file{lwarp-ctex.sty}{\from{lwarp.dtx}{ctex}}
 \file{lwarp-cuted.sty}{\from{lwarp.dtx}{cuted}}
 \file{lwarp-cutwin.sty}{\from{lwarp.dtx}{cutwin}}
 \file{lwarp-dblfloatfix.sty}{\from{lwarp.dtx}{dblfloatfix}}
@@ -139,7 +133,6 @@
 \file{lwarp-everyshi.sty}{\from{lwarp.dtx}{everyshi}}
 \file{lwarp-extramarks.sty}{\from{lwarp.dtx}{extramarks}}
 \file{lwarp-fancybox.sty}{\from{lwarp.dtx}{fancybox}}
-\file{lwarp-fancyheadings.sty}{\from{lwarp.dtx}{fancyheadings}}
 \file{lwarp-fancyhdr.sty}{\from{lwarp.dtx}{fancyhdr}}
 \file{lwarp-fancyref.sty}{\from{lwarp.dtx}{fancyref}}
 \file{lwarp-fancytabs.sty}{\from{lwarp.dtx}{fancytabs}}
@@ -166,7 +159,6 @@
 \file{lwarp-footnote.sty}{\from{lwarp.dtx}{footnote}}
 \file{lwarp-footnotehyper.sty}{\from{lwarp.dtx}{footnotehyper}}
 \file{lwarp-fontenc.sty}{\from{lwarp.dtx}{fontenc}}
-\file{lwarp-fontspec.sty}{\from{lwarp.dtx}{fontspec}}
 \file{lwarp-footnpag.sty}{\from{lwarp.dtx}{footnpag}}
 \file{lwarp-framed.sty}{\from{lwarp.dtx}{framed}}
 \file{lwarp-ftnright.sty}{\from{lwarp.dtx}{ftnright}}
@@ -176,7 +168,6 @@
 \file{lwarp-fwlw.sty}{\from{lwarp.dtx}{fwlw}}
 \file{lwarp-geometry.sty}{\from{lwarp.dtx}{geometry}}
 \file{lwarp-glossaries.sty}{\from{lwarp.dtx}{glossaries}}
-\file{lwarp-glossary.sty}{\from{lwarp.dtx}{glossary}}
 \file{lwarp-graphicx.sty}{\from{lwarp.dtx}{graphicx}}
 \file{lwarp-graphics.sty}{\from{lwarp.dtx}{graphics}}
 \file{lwarp-grffile.sty}{\from{lwarp.dtx}{grffile}}
@@ -196,8 +187,6 @@
 \file{lwarp-imakeidx.sty}{\from{lwarp.dtx}{imakeidx}}
 \file{lwarp-indentfirst.sty}{\from{lwarp.dtx}{indentfirst}}
 \file{lwarp-index.sty}{\from{lwarp.dtx}{index}}
-\file{lwarp-inputenc.sty}{\from{lwarp.dtx}{inputenc}}
-\file{lwarp-inputenx.sty}{\from{lwarp.dtx}{inputenx}}
 \file{lwarp-intopdf.sty}{\from{lwarp.dtx}{intopdf}}
 \file{lwarp-keyfloat.sty}{\from{lwarp.dtx}{keyfloat}}
 \file{lwarp-layaureo.sty}{\from{lwarp.dtx}{layaureo}}
@@ -233,7 +222,6 @@
 \file{lwarp-midpage.sty}{\from{lwarp.dtx}{midpage}}
 \file{lwarp-morefloats.sty}{\from{lwarp.dtx}{morefloats}}
 \file{lwarp-moreverb.sty}{\from{lwarp.dtx}{moreverb}}
-\file{lwarp-morewrites.sty}{\from{lwarp.dtx}{morewrites}}
 \file{lwarp-mparhack.sty}{\from{lwarp.dtx}{mparhack}}
 \file{lwarp-multicol.sty}{\from{lwarp.dtx}{multicol}}
 \file{lwarp-multirow.sty}{\from{lwarp.dtx}{multirow}}
@@ -243,8 +231,6 @@
 \file{lwarp-natbib.sty}{\from{lwarp.dtx}{natbib}}
 \file{lwarp-nccfancyhdr.sty}{\from{lwarp.dtx}{nccfancyhdr}}
 \file{lwarp-needspace.sty}{\from{lwarp.dtx}{needspace}}
-\file{lwarp-newclude.sty}{\from{lwarp.dtx}{newclude}}
-\file{lwarp-newunicodechar.sty}{\from{lwarp.dtx}{newunicodechar}}
 \file{lwarp-nextpage.sty}{\from{lwarp.dtx}{nextpage}}
 \file{lwarp-nicefrac.sty}{\from{lwarp.dtx}{nicefrac}}
 \file{lwarp-nonfloat.sty}{\from{lwarp.dtx}{nonfloat}}
@@ -328,7 +314,6 @@
 \file{lwarp-subfigure.sty}{\from{lwarp.dtx}{subfigure}}
 \file{lwarp-supertabular.sty}{\from{lwarp.dtx}{supertabular}}
 \file{lwarp-syntonly.sty}{\from{lwarp.dtx}{syntonly}}
-\file{lwarp-t1enc.sty}{\from{lwarp.dtx}{t1enc}}
 \file{lwarp-tabls.sty}{\from{lwarp.dtx}{tabls}}
 \file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}}
 \file{lwarp-tabulary.sty}{\from{lwarp.dtx}{tabulary}}
@@ -376,7 +361,6 @@
 \file{lwarp-vpe.sty}{\from{lwarp.dtx}{vpe}}
 \file{lwarp-vwcol.sty}{\from{lwarp.dtx}{vwcol}}
 \file{lwarp-wallpaper.sty}{\from{lwarp.dtx}{wallpaper}}
-\file{lwarp-wasysym.sty}{\from{lwarp.dtx}{wasysym}}
 \file{lwarp-watermark.sty}{\from{lwarp.dtx}{watermark}}
 \file{lwarp-widows-and-orphans.sty}{\from{lwarp.dtx}{widows-and-orphans}}
 \file{lwarp-wrapfig.sty}{\from{lwarp.dtx}{wrapfig}}
@@ -383,17 +367,19 @@
 \file{lwarp-xbmks.sty}{\from{lwarp.dtx}{xbmks}}
 \file{lwarp-xcolor.sty}{\from{lwarp.dtx}{xcolor}}
 \file{lwarp-xechangebar.sty}{\from{lwarp.dtx}{xechangebar}}
-\file{lwarp-xeCJK.sty}{\from{lwarp.dtx}{xeCJK}}
 \file{lwarp-xellipsis.sty}{\from{lwarp.dtx}{xellipsis}}
+\file{lwarp-xetexko-vertical.sty}{\from{lwarp.dtx}{xetexko-vertical}}
 \file{lwarp-xfrac.sty}{\from{lwarp.dtx}{xfrac}}
 \file{lwarp-xltabular.sty}{\from{lwarp.dtx}{xltabular}}
 \file{lwarp-xltxtra.sty}{\from{lwarp.dtx}{xltxtra}}
 \file{lwarp-xmpincl.sty}{\from{lwarp.dtx}{xmpincl}}
 \file{lwarp-xpiano.sty}{\from{lwarp.dtx}{xpiano}}
+\file{lwarp-xpinyin.sty}{\from{lwarp.dtx}{xpinyin}}
 \file{lwarp-xtab.sty}{\from{lwarp.dtx}{xtab}}
 \file{lwarp-xunicode.sty}{\from{lwarp.dtx}{xunicode}}
 \file{lwarp-xurl.sty}{\from{lwarp.dtx}{xurl}}
 \file{lwarp-xy.sty}{\from{lwarp.dtx}{xy}}
+\file{lwarp-zhlineskip.sty}{\from{lwarp.dtx}{zhlineskip}}
 \file{lwarp-zwpagelayout.sty}{\from{lwarp.dtx}{zwpagelayout}}
 \file{lwarp-patch-komascript.sty}{\from{lwarp.dtx}{patch-komascript}}
 \file{lwarp-patch-memoir.sty}{\from{lwarp.dtx}{patch-memoir}}

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -16,8 +16,10 @@
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
 \@ifpackageloaded{xeCJK}{}{
-    \LWR at loadnever{CJK}{ctex}
+    \LWR at loadnever{CJK}{ctex, xeCJK}
 }
+
+\LWR at ProvidesPackagePass{CJK}
 \endinput
 %%
 %% End of file `lwarp-CJK.sty'.

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -16,8 +16,10 @@
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
 \@ifpackageloaded{xeCJK}{}{
-    \LWR at loadnever{CJKutf8}{ctex}
+    \LWR at loadnever{CJKutf8}{ctex, xeCJK}
 }
+
+\LWR at ProvidesPackagePass{CJKutf8}
 \endinput
 %%
 %% End of file `lwarp-CJKutf8.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ae.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ae.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ae.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,21 +0,0 @@
-%%
-%% This is file `lwarp-ae.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `ae')
-%% This is a generated file.
-%% Copyright 2016-2018 Brian Dunn
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-\LWR at loadnever{ae}{latinmodern}
-\endinput
-%%
-%% End of file `lwarp-ae.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-aecc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-aecc.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-aecc.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,21 +0,0 @@
-%%
-%% This is file `lwarp-aecc.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `aecc')
-%% This is a generated file.
-%% Copyright 2016-2018 Brian Dunn
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-\LWR at loadnever{aecc}{latinmodern}
-\endinput
-%%
-%% End of file `lwarp-aecc.sty'.

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -17,6 +17,16 @@
 %% version 2005/12/01 or later.
 
 
+\@ifpackageloaded{mdframed}{
+    \PackageError{lwarp}
+    {Package mdframed must be loaded after package amsthm.}
+    {%
+        Move \detokenize{\usepackage}{amsthm} before \detokenize{\usepackage}{mdframed}.
+        Package amsthm may be loaded by something else, which must also be moved
+        before mdframed.%
+    }
+}
+{}
 \LWR at ProvidesPackagePass{amsthm}
 
 \newcommand{\LWR at newtheoremstyle}{plain}

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,21 +0,0 @@
-%%
-%% This is file `lwarp-boxedminipage.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `boxedminipage')
-%% 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 loadnever{boxedminipage}{boxedminipage2e}
-\endinput
-%%
-%% End of file `lwarp-boxedminipage.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption2.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption2.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption2.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,21 +0,0 @@
-%%
-%% This is file `lwarp-caption2.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `caption2')
-%% 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 loadnever{caption2}{caption}
-\endinput
-%%
-%% End of file `lwarp-caption2.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,26 +0,0 @@
-%%
-%% This is file `lwarp-ccaption.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `ccaption')
-%% 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 loadnever{ccaption}{caption}
-
-\endinput
-%%
-%% End of file `lwarp-ccaption.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ctex.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ctex.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,24 +0,0 @@
-%%
-%% This is file `lwarp-ctex.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `ctex')
-%% 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{ctex}[2018-05-02]
-
-\LWR at loadbefore{ctex}
-
-\endinput
-%%
-%% End of file `lwarp-ctex.sty'.

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -18,14 +18,16 @@
 \LWR at ProvidesPackagePass{enumitem}
 \begin{warpHTML}
 
-\let\LWR at orignewlist\newlist
+\let\LWR at enumitem@orignewlist\newlist
 
 \renewcommand*{\newlist}[3]{%
-\LWR at orignewlist{#1}{#2}{#3}%
+\LWR at enumitem@orignewlist{#1}{#2}{#3}%
 \AtBeginEnvironment{#1}{\@nameuse{LWR@#2start}}%
 \AtEndEnvironment{#1}{\@nameuse{LWR@#2end}}%
 }
 
+\def\DrawEnumitemLabel{}
+
 \end{warpHTML}
 
 \endinput

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyheadings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyheadings.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyheadings.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,21 +0,0 @@
-%%
-%% This is file `lwarp-fancyheadings.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `fancyheadings')
-%% 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 loadnever{fancyheadings}{fancyhdr}
-\endinput
-%%
-%% End of file `lwarp-fancyheadings.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,25 +0,0 @@
-%%
-%% This is file `lwarp-fontspec.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `fontspec')
-%% 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{fontspec}[2017/11/09]
-
-\LWR at loadbefore{fontspec}
-
-\endinput
-%%
-%% End of file `lwarp-fontspec.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-glossary.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-glossary.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-glossary.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,21 +0,0 @@
-%%
-%% This is file `lwarp-glossary.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `glossary')
-%% 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 loadnever{glossary}{glossaries}
-\endinput
-%%
-%% End of file `lwarp-glossary.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,25 +0,0 @@
-%%
-%% This is file `lwarp-inputenc.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `inputenc')
-%% 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{inputenc}
-
-\LWR at loadbefore{inputenc}
-
-\endinput
-%%
-%% End of file `lwarp-inputenc.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenx.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenx.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,25 +0,0 @@
-%%
-%% This is file `lwarp-inputenx.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `inputenx')
-%% This is a generated file.
-%% Copyright 2016-2018 Brian Dunn
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-
-\LWR at ProvidesPackageDrop{inputenx}
-
-\LWR at loadbefore{inputenx}
-
-\endinput
-%%
-%% End of file `lwarp-inputenx.sty'.

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -20,7 +20,6 @@
 \RequirePackage{xcolor}% for \convertcolorspec
 
 \LWR at ProvidesPackageDrop{mdframed}
-\LWR at origRequirePackage{amsthm}
 \LWR at origRequirePackage[framemethod=none]{mdframed}
 \AtBeginDocument{
 \def\mdf at trivlist#1{%
@@ -47,12 +46,16 @@
 }
 
 \newcommand*{\LWR at mdfprintlength}[1]{%
-\LWR at printlength{\@nameuse{mdf@#1 at length}}
+\LWR at forceminwidth{\@nameuse{mdf@#1 at length}}%
+\LWR at printlength{\LWR at atleastonept}%
 }
 \newcommand*{\LWR at mdframedstart}{%
 \LWR at traceinfo{LWR at mdframedstart start}%
 \LWR at stoppars%
-\LWR at htmltagc{div class="\LWR at mdthisenv" \LWR at orignewline
+\LWR at htmltagc{div class="%
+mdframed%
+\ifdefstring{\LWR at mdthisenv}{mdframed}{}{ \LWR at mdthisenv}%
+" \LWR at orignewline
 style=" \LWR at orignewline
 background: \LWR at mdfprintcolor{backgroundcolor} ; \LWR at orignewline
 border: \LWR at mdfprintlength{linewidth} solid
@@ -116,14 +119,11 @@
 \renewrobustcmd*\mdf at footnoteoutput{%
     \LWR at printpendingmpfootnotes%
 }
-\LetLtxMacro\LWR at origmdfframedtitleenv\mdfframedtitleenv
-
 \newlength{\LWR at titleroundcorner}
 
 \renewrobustcmd\mdfframedtitleenv[1]{%
 \LWR at traceinfo{LWR at mdframedtitleenv start}%
-\LWR at htmltagc{span class="mdframedtitle" \LWR at orignewline
-style=" \LWR at orignewline
+\begin{BlockClass}[%
 background:
 \LWR at mdfprintcolor{frametitlebackgroundcolor}
 ; \LWR at orignewline
@@ -134,12 +134,9 @@
     \LWR at mdfprintcolor{frametitlerulecolor}
     ; \LWR at orignewline
 }{}%
-" \LWR at orignewline
-}% span
-\begin{LWR at nestspan}%
-#1%
-\LWR at htmltagc{/span}%
-\end{LWR at nestspan}%
+]{mdframedtitle}%
+\mdf at frametitlefont{\LWR at textcurrentfont{#1}}%
+\end{BlockClass}%
 \LWR at traceinfo{LWR at mdframedtitleenv end}%
 }
 \NewDocumentCommand{\LWR at mdfsubtitlecommon}{m o m}
@@ -146,9 +143,7 @@
 {% the following empty line is required
 
 \LWR at traceinfo{LWR at mdframedsubtitlecommon start}%
-\let\par\LWR at origpar%
-\LWR at htmltagc{span class="mdframed#1title"
-style=" \LWR at orignewline
+\begin{BlockClass}[%
 background:
 \LWR at mdfprintcolor{#1titlebackgroundcolor}
 ; \LWR at orignewline
@@ -166,14 +161,11 @@
     \LWR at mdfprintcolor{#1titlebelowlinecolor}
     ; \LWR at orignewline
 }{}%
-"}% span
-\begin{LWR at nestspan}%
+]{mdframed#1title}%
 \IfNoValueTF{#2}
-{\@nameuse{LWR at origmdf#1title}{#3}}%
-{\@nameuse{LWR at origmdf#1title}[#2]{#3}}%
-\LWR at htmltagc{/span}% the following empty line is required
-\end{LWR at nestspan}% must follow the /span or an extra <p> appears
-
+{\@nameuse{LWR at origmdf#1title}{\csuse{mdf@#1titlefont}{\LWR at textcurrentfont{#3}}}}%
+{\@nameuse{LWR at origmdf#1title}[#2]{\csuse{mdf@#1titlefont}{\LWR at textcurrentfont{#3}}}}%
+\end{BlockClass}%
 \LWR at traceinfo{LWR at mdframedsubtitlecommon end}%
 }
 \newcommand*{\LWR at mdfsubtitle}{%
@@ -218,7 +210,7 @@
              \def\@temptitle{\mdf at theoremseparator%
                              \mdf at theoremspace%
                              \mdf at theoremtitlefont%
-                             ##1}%
+                             \LWR at textcurrentfont{##1}}% lwarp
              \mdf at thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}%
              }%
           \begin{mdframed}[#1,frametitle={\strut#4\ \csname the#2\endcsname%
@@ -243,7 +235,7 @@
              \def\@temptitle{\mdf at theoremseparator%
                              \mdf at theoremspace%
                              \mdf at theoremtitlefont%
-                             ##1}%
+                             \LWR at textcurrentfont{##1}}% lwarp
              \mdf at thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}%
              }
           \begin{mdframed}[#1,frametitle={\strut#4\ \csname the#2\endcsname%
@@ -256,7 +248,7 @@
              \def\@temptitle{\mdf at theoremseparator%
                              \mdf at theoremspace%
                              \mdf at theoremtitlefont%
-                             ##1}%
+                             \LWR at textcurrentfont{##1}}% lwarp
              \mdf at thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}%
              }%
           \begin{mdframed}[#1,frametitle={\strut#4\@temptitle}]}%
@@ -273,7 +265,7 @@
              \def\@temptitle{\mdf at theoremseparator%
                              \mdf at theoremspace%
                              \mdf at theoremtitlefont%
-                             ##1}%
+                             \LWR at textcurrentfont{##1}}% lwarp
              \mdf at thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}%
              }
           \begin{mdframed}[#1,frametitle={\strut#4\ \csname the#2\endcsname%

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -17,7 +17,9 @@
 %% version 2005/12/01 or later.
 \LWR at ProvidesPackageDrop{midpage}
 \newenvironment{midpage}
-{\begin{BlockClass}[\LWR at print@mbox{margin-top:6ex} ; \LWR at print@mbox{margin-bottom:6ex}]{midpage}}
+{\begin{BlockClass}[%
+    \LWR at print@mbox{margin-top:6ex} ; \LWR at print@mbox{margin-bottom:6ex}%
+]{midpage}}
 {\end{BlockClass}}
 \endinput
 %%

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-morewrites.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-morewrites.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-morewrites.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,26 +0,0 @@
-%%
-%% This is file `lwarp-morewrites.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `morewrites')
-%% 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{morewrites}
-
-\LWR at loadbefore{morewrites}
-
-\endinput
-%%
-%% End of file `lwarp-morewrites.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,26 +0,0 @@
-%%
-%% This is file `lwarp-newclude.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `newclude')
-%% 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{newclude}
-
-\LWR at loadbefore{newclude}
-
-\endinput
-%%
-%% End of file `lwarp-newclude.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,26 +0,0 @@
-%%
-%% This is file `lwarp-newunicodechar.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `newunicodechar')
-%% 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{newunicodechar}
-
-\LWR at loadbefore{newunicodechar}
-
-\endinput
-%%
-%% End of file `lwarp-newunicodechar.sty'.

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -16,10 +16,14 @@
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
 \LWR at ProvidesPackageDrop{stfloats}
-\newcommand*{\fnbelowfloat}{}
-\newcommand*{\fnunderfloat}{}
-\newcommand*{\setbaselinefloat}{}
-\newcommand*{\setbaselinefixed}{}
+\providecommand*{\fnbelowfloat}{}
+\providecommand*{\fnunderfloat}{}
+\providecommand*{\setbaselinefloat}{}
+\providecommand*{\setbaselinefixed}{}
+\renewcommand*{\fnbelowfloat}{}
+\renewcommand*{\fnunderfloat}{}
+\renewcommand*{\setbaselinefloat}{}
+\renewcommand*{\setbaselinefixed}{}
 \endinput
 %%
 %% End of file `lwarp-stfloats.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-t1enc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-t1enc.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-t1enc.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,21 +0,0 @@
-%%
-%% This is file `lwarp-t1enc.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `t1enc')
-%% This is a generated file.
-%% Copyright 2016-2018 Brian Dunn
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-\LWR at loadnever{t1enc}{fontenc, inputenc, inputenx}
-\endinput
-%%
-%% End of file `lwarp-t1enc.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wasysym.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wasysym.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wasysym.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,21 +0,0 @@
-%%
-%% This is file `lwarp-wasysym.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `wasysym')
-%% This is a generated file.
-%% Copyright 2016-2018 Brian Dunn
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-\LWR at loadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
-\endinput
-%%
-%% End of file `lwarp-wasysym.sty'.

Deleted: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xeCJK.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xeCJK.sty	2018-12-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xeCJK.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -1,24 +0,0 @@
-%%
-%% This is file `lwarp-xeCJK.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lwarp.dtx  (with options: `xeCJK')
-%% 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{xeCJK}
-
-\LWR at loadbefore{xeCJK}
-
-\endinput
-%%
-%% End of file `lwarp-xeCJK.sty'.

Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -0,0 +1,27 @@
+%%
+%% This is file `lwarp-xetexko-vertical.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `xetexko-vertical')
+%% 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{xetexko-vertical}
+
+\LWR at ProvidesPackagePass{xetexko-vertical}[2018/04/06]
+\renewcommand{\verticaltypesetting}{}
+\renewenvironment{vertical}[1]{\BlockClass{verticalrl}}{\endBlockClass}
+\renewenvironment{horizontal}[1]{\BlockClass{horizontaltb}}{\endBlockClass}
+\renewcommand{\vertlatin}[1]{#1}
+\endinput
+%%
+%% End of file `lwarp-xetexko-vertical.sty'.


Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -0,0 +1,28 @@
+%%
+%% This is file `lwarp-xpinyin.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `xpinyin')
+%% 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{xpinyin}[2018/01/28]
+\RenewDocumentEnvironment{pinyinscope}{O{}}{}{}
+
+\RenewDocumentCommand{\xpinyin}{s O{} m}{%
+    \IfBooleanTF{#1}{#3}{\@firstoftwo#3}%
+}
+
+\RenewDocumentCommand{\enablepinyin}{}{}
+\endinput
+%%
+%% End of file `lwarp-xpinyin.sty'.


Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -0,0 +1,25 @@
+%%
+%% This is file `lwarp-zhlineskip.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `zhlineskip')
+%% 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{zhlineskip}[2018/11/30]
+\newcommand*\SetTextEnvironmentSinglespace[1]{}
+\newcommand*\RestoreTextEnvironmentLeading{}
+\newcommand*\SetMathEnvironmentSinglespace[1]{}
+\newcommand*\RestoreMathEnvironmentLeading{}
+\endinput
+%%
+%% End of file `lwarp-zhlineskip.sty'.


Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.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-04 23:09:17 UTC (rev 49317)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty	2018-12-04 23:10:56 UTC (rev 49318)
@@ -17,7 +17,7 @@
 %% version 2005/12/01 or later.
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{lwarp}
-    [2018/11/19 v0.62  Allows LaTeX to directly produce HTML5 output.]
+    [2018/12/03 v0.63  Allows LaTeX to directly produce HTML5 output.]
 
 
 
@@ -41,278 +41,12 @@
 \fi
 
 \RequirePackage{ifpdf}
-\newcommand{\LWR at mdfive}[1]{%
-\PackageError{lwarp}
-{No MD5 macro was found.}
-{Lwarp must find the macros pdfmdfivesum or mdfivesum.}
-}
-
-\ifPDFTeX% pdflatex or dvi latex
-\let\LWR at mdfive\pdfmdfivesum
-\fi
-
-\ifLuaTeX
-\RequirePackage{pdftexcmds}
-\let\LWR at mdfive\pdf at mdfivesum
-\fi
-
-\ifXeTeX
-\@ifundefined{pdffivesum}{}
-    {\let\LWR at mdfive\pdfmdfivesum}
-\@ifundefined{mdfivesum}{}
-    {\let\LWR at mdfive\mdfivesum}
-\fi
-\ifPDFTeX% pdflatex or dvi latex
-\RequirePackage[T1]{fontenc}
-
-\@ifpackageloaded{inputenc}{}{
-    \@ifpackageloaded{inputenx}{}{
-        \RequirePackage[utf8]{inputenc}
-    }
-}
-\fi
-\RequirePackage{newunicodechar}
-
-\newunicodechar{⨯}{\texttimes}
-
-\ifPDFTeX% pdflatex or dvi latex
-\newunicodechar{ff}{ff}% the first arguments are ligatures
-\newunicodechar{fi}{fi}
-\newunicodechar{fl}{fl}
-\newunicodechar{ffi}{ffi}
-\newunicodechar{ffl}{ffl}
-\newunicodechar{—}{---}
-\newunicodechar{–}{--}
-\RequirePackage{upquote}
-\else
-\fi
-\newcommand*\LWR at providelength[1]{%
-    \ifdeflength{#1}{}{\newlength{#1}}%
-}
-\newcommand*{\LWR at convertto}[2]{\strip at pt\dimexpr #2*65536/\number\dimexpr 1#1}
-
-\newcommand*{\LWR at patcherror}[2]{%
-\PackageError{lwarp}
-{Unable to patch package #1, macro #2}
-{Please contact the author of the lwarp package.}
-}
-\@ifpackageloaded{ctexpatch}{
-    \newcommand{\LWR at isolate}[1]{\null#1\null}%
-}{
-    \newcommand{\LWR at isolate}[1]{#1}%
-}
+\RequirePackage{ifptex}
 \RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc.
 \RequirePackage{xpatch}
 
 \RequirePackage{ifplatform}% sense op-system platform
 \RequirePackage{letltxmacro}
-
-\let\LWRpercent\@percentchar
-\catcode`\$=12
-\def\LWRdollar{$}
-\catcode`\$=3
-\catcode`\&=12
-\def\LWRamp{&}
-\catcode`\&=4
-\catcode`\&=0
-&catcode`&\=12
-&def&LWRbackslash{\}
-&catcode`&\=0
-\catcode`\&=4
-\catcode`\#=12
-\def\LWRhash{#}
-\catcode`\#=6
-\def\LWRopquote{'}
-\def\LWRopseq{\space\LWRamp\LWRamp\space\space}
-\newbool{usingOSWindows}
-\boolfalse{usingOSWindows}
-
-
-\newcommand*{\OSPathSymbol}{/}
-
-
-\newcommand*{\LWR at setOSWindows}
-{
-\booltrue{usingOSWindows}
-\renewcommand*{\OSPathSymbol}{\@backslashchar}
-\def\LWRopquote{"}
-\def\LWRopseq{\space\LWRamp\space\space}
-}
-\ifwindows
-\LWR at setOSWindows
-\fi
-
-
-\RequirePackage{kvoptions}
-\SetupKeyvalOptions{family=LWR,prefix=LWR@}
-
-\newcommand{\lwarpsetup}[1]{\setkeys{LWR}{#1}}
-
-\newbool{warpingprint}
-\newbool{warpingHTML}
-\newbool{mathjax}
-\newbool{LWR at origmathjax}
-\booltrue{warpingprint}%
-\boolfalse{warpingHTML}%
-\boolfalse{mathjax}%
-\DeclareVoidOption{warpprint}{%
-\PackageInfo{lwarp}{Using option 'warpprint'}
-\booltrue{warpingprint}%
-\boolfalse{warpingHTML}%
-}
-
-\DeclareVoidOption{warpHTML}{%
-\PackageInfo{lwarp}{Using option 'warpHTML'}%
-\booltrue{warpingHTML}%
-\boolfalse{warpingprint}%
-}
-
-\DeclareVoidOption{mathsvg}{%
-\PackageInfo{lwarp}{Using option 'mathsvg'}
-\boolfalse{mathjax}%
-\boolfalse{LWR at origmathjax}%
-}
-\DeclareVoidOption{mathjax}{%
-\PackageInfo{lwarp}{Using option 'mathjax'}
-\booltrue{mathjax}%
-\booltrue{LWR at origmathjax}%
-}
-
-
-\DeclareStringOption[\jobname]{BaseJobname}
-
-\DeclareStringOption[lwarp.ist]{makeindexStyle}
-
-\DeclareStringOption[lwarp.xdy]{xindyStyle}
-
-\DeclareStringOption[english]{xindyLanguage}
-
-\DeclareStringOption[utf8]{xindyCodepage}
-
-\DeclareStringOption[UTF-8]{pdftotextEnc}
-
-\newbool{LWR at creatinglwarpmk}
-\boolfalse{LWR at creatinglwarpmk}
-
-\DeclareVoidOption{lwarpmk}{
-\PackageInfo{lwarp}{Using option 'lwarpmk'}
-\booltrue{LWR at creatinglwarpmk}
-}
-
-\DeclareVoidOption{OSWindows}{
-\PackageInfo{lwarp}{Using option 'OSWindows'}
-\LWR at setOSWindows
-}
-
-\DeclareStringOption[]{HomeHTMLFilename}
-
-\DeclareStringOption[]{HTMLFilename}
-
-\DeclareStringOption[]{PrintLatexCmd}
-
-\DeclareStringOption[]{HTMLLatexCmd}
-
-\DeclareStringOption[]{PrintIndexCmd}
-
-\DeclareStringOption[]{HTMLIndexCmd}
-
-\DeclareStringOption[]{LatexmkIndexCmd}
-
-\DeclareBoolOption[false]{makeindex}
-
-\DeclareBoolOption[false]{xindy}
-
-\DeclareStringOption[makeglossaries]{GlossaryCmd}
-
-\DeclareBoolOption[false]{latexmk}
-
-\DeclareBoolOption[false]{dvips}
-
-\DeclareBoolOption[false]{dvipdfm}
-
-\DeclareBoolOption[false]{dvipdfmx}
-
-\ProcessKeyvalOptions*\relax
-
-\providecommand*{\BaseJobname}{\LWR at BaseJobname}
-
-\ifcsempty{LWR at HomeHTMLFilename}{
-\newcommand*{\HomeHTMLFilename}{\BaseJobname}
-}{
-\csedef{HomeHTMLFilename}{\LWR at HomeHTMLFilename}
-}
-
-\csedef{HTMLFilename}{\LWR at HTMLFilename}
-\ifdefempty{\LWR at PrintIndexCmd}{
-    \renewcommand{\LWR at PrintIndexCmd}{%
-        makeindex  -s \LWR at makeindexStyle \space  \jobname.idx%
-    }
-    \ifbool{LWR at xindy}{
-        \renewcommand{\LWR at PrintIndexCmd}{%
-            xindy
-            -M \LWR at xindyStyle \space
-            -L \LWR at xindyLanguage \space
-            -C \LWR at xindyCodepage \space
-            \jobname.idx%
-        }
-    }{}
-}{}
-
-\ifdefempty{\LWR at HTMLIndexCmd}{
-    \renewcommand{\LWR at HTMLIndexCmd}{%
-        makeindex  -s \LWR at makeindexStyle \space  \jobname_html.idx%
-    }
-    \ifbool{LWR at xindy}{
-        \renewcommand{\LWR at HTMLIndexCmd}{%
-            xindy
-            -M \LWR at xindyStyle \space
-            -L \LWR at xindyLanguage \space
-            -C \LWR at xindyCodepage \space
-            \jobname_html.idx%
-        }
-    }{}
-}{}
-
-\ifdefempty{\LWR at LatexmkIndexCmd}{
-    \renewcommand{\LWR at LatexmkIndexCmd}{%
-        makeindex  -s \LWR at makeindexStyle%
-    }
-    \ifbool{LWR at xindy}{
-        \renewcommand{\LWR at LatexmkIndexCmd}{%
-            xindy
-            -M \LWR at xindyStyle \space
-            -L \LWR at xindyLanguage \space
-            -C \LWR at xindyCodepage%
-        }
-    }{}
-}{}
-\newcommand{\warpprintonly}[1]{\ifbool{warpingprint}{#1}{}}
-\newcommand{\warpHTMLonly}[1]{\ifbool{warpingHTML}{#1}{}}
-\RequirePackage{comment}
-
-\ifbool{warpingHTML}{
-\def\DefaultCutFileName{\def\CommentCutFile{comment_html.cut}}
-}{}
-
-\ifbool{warpingprint}{
-\def\DefaultCutFileName{\def\CommentCutFile{comment_print.cut}}
-}{}
-
-\includecomment{warpall}
-
-\ifbool{warpingHTML}
-{\includecomment{warpHTML}}
-{\excludecomment{warpHTML}}%
-
-\ifbool{warpingprint}
-{\includecomment{warpprint}}
-{\excludecomment{warpprint}}
-
-
-\ifbool{LWR at creatinglwarpmk}
-{\includecomment{LWR at createlwarpmk}}
-{\excludecomment{LWR at createlwarpmk}}
-
 \newcommand*{\LWR at loadafter}[1]{%
 \@ifpackageloaded{#1}
 {
@@ -329,6 +63,21 @@
 {\newcommand*{\LWR at notmemoirloadafter}[1]{}}
 {\LetLtxMacro\LWR at notmemoirloadafter\LWR at loadafter}
 
+\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]{}}{}
+
+\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}
 {}
@@ -339,6 +88,13 @@
 }
 }
 
+\newcommand*{\LWR at checkloadbefore}[2]{%
+    \edef\LWR at tempone{#1}%
+    \ifdefstring{\LWR at tempone}{#2}{%
+        \LWR at loadbefore{#1}%
+    }{}%
+}
+
 \newcommand*{\LWR at loadnever}[2]{%
 \PackageError{lwarp}
 {Package #1 is not supported by lwarp's HTML conversion.
@@ -347,6 +103,12 @@
 or is superceded by another package.
 For a possible alternative, see package(s) #2.}
 }
+\newcommand*{\LWR at checkloadnever}[3]{%
+    \edef\LWR at tempone{#1}%
+    \ifdefstring{\LWR at tempone}{#2}{%
+        \LWR at loadnever{#2}{#3}%
+    }{}%
+}
 \newcommand*{\LWR at earlyloadnever}[2]{%
 \@ifpackageloaded{#1}{%
 \PackageError{lwarp}
@@ -357,6 +119,19 @@
 For a possible alternative, see package(s) #2.}
 }{}%
 }
+\newcommand*{\LWR at earlyclassloadnever}[2]{%
+\@ifclassloaded{#1}{%
+\PackageError{lwarp}
+{Class #1 is not supported by lwarp's HTML conversion.
+Class(es) #2 may be useful instead}
+{Class #1 might conflict with lwarp in some way,
+or is superceded by another class.
+For a possible alternative, see class(es) #2.}
+}{}%
+}
+\LWR at earlyclassloadnever{utarticle}{ujarticle}
+\LWR at earlyclassloadnever{utbook}{ujbook}
+\LWR at earlyclassloadnever{utreport}{ujreport}
 \LWR at earlyloadnever{ae}{cm-super, lmodern}
 \LWR at earlyloadnever{aecompl}{cm-super, lmodern}
 \LWR at earlyloadnever{aecc}{cm-super, lmodern}
@@ -366,6 +141,8 @@
     \LWR at earlyloadnever{CJK}{ctex, xeCJK}
     \LWR at earlyloadnever{CJKutf8}{ctex, xeCJK}
 }
+\LWR at earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle}
+\LWR at earlyloadnever{hangul}{kotex, xetexko, luatexko}
 \LWR at earlyloadnever{fancyheadings}{fancyhdr}
 \LWR at earlyloadnever{glossary}{glossaries}
 \LWR at earlyloadnever{t1enc}{fontenc, inputenc, inputenx}
@@ -502,7 +279,7 @@
 \LWR at loadafter{fullpage}
 \LWR at loadafter{fullwidth}
 \LWR at loadafter{fwlw}
-\LWR at loadafter{geometry}
+\LWR at notbxjsloadafter{geometry}
 \LWR at loadafter{glossaries}
 \LWR at loadafter{glossary}
 \LWR at loadafter{grffile}
@@ -643,7 +420,7 @@
 \LWR at loadafter{srcltx}
 \LWR at loadafter{srctex}
 \LWR at loadafter{stabular}
-\LWR at loadafter{stfloats}
+\LWR at notltjsloadafter{stfloats}
 \LWR at loadafter{subfig}
 \LWR at loadafter{subfigure}
 \LWR at loadafter{supertabular}
@@ -704,12 +481,293 @@
 \LWR at loadafter{xltxtra}
 \LWR at loadafter{xmpincl}
 \LWR at loadafter{xpiano}
+\LWR at loadafter{xpinyin}
 \LWR at loadafter{xtab}
 \LWR at loadafter{xurl}
 \LWR at loadafter{xy}
 \LWR at loadafter{zwpagelayout}
+\newcommand{\LWR at mdfive}[1]{%
+\PackageError{lwarp}
+{No MD5 macro was found.}
+{Lwarp must find the macros pdfmdfivesum or mdfivesum.}
+}
+\let\LWR at mdfive\pdfmdfivesum
+\ifLuaTeX
+\RequirePackage{pdftexcmds}
+\let\LWR at mdfive\pdf at mdfivesum
+\fi
+\ifXeTeX
+\@ifundefined{pdffivesum}{}
+    {\let\LWR at mdfive\pdfmdfivesum}
+\@ifundefined{mdfivesum}{}
+    {\let\LWR at mdfive\mdfivesum}
+\fi
+\newcommand*{\LWR at pdfencoding}{%
+    \RequirePackage[T1]{fontenc}
 
+    \@ifpackageloaded{inputenc}{}{
+        \@ifpackageloaded{inputenx}{}{
+            \RequirePackage[utf8]{inputenc}
+        }
+    }
+}
+\ifPDFTeX% pdflatex or dvi latex
+    \LWR at pdfencoding
+\fi
 
+\ifpTeX
+    \LWR at pdfencoding
+\fi
+\ifpTeX
+\else
+\RequirePackage{newunicodechar}
+
+\newunicodechar{⨯}{\texttimes}
+
+\ifPDFTeX% pdflatex or dvi latex
+\newunicodechar{ff}{ff}% the first arguments are ligatures
+\newunicodechar{fi}{fi}
+\newunicodechar{fl}{fl}
+\newunicodechar{ffi}{ffi}
+\newunicodechar{ffl}{ffl}
+\newunicodechar{—}{---}
+\newunicodechar{–}{--}
+\fi
+
+\fi
+\ifPDFTeX
+\RequirePackage{upquote}
+\fi
+
+\ifpTeX
+    \RequirePackage{upquote}
+\fi
+\newcommand*\LWR at providelength[1]{%
+    \ifdeflength{#1}{}{\newlength{#1}}%
+}
+\newcommand*{\LWR at convertto}[2]{\strip at pt\dimexpr #2*65536/\number\dimexpr 1#1}
+
+\newcommand*{\LWR at patcherror}[2]{%
+\PackageError{lwarp}
+{Unable to patch package #1, macro #2}
+{Please contact the author of the lwarp package.}
+}
+\newcommand{\LWR at isolate}[1]{#1}%
+
+\@ifpackageloaded{ctexpatch}{
+    \renewcommand{\LWR at isolate}[1]{\null#1\null}%
+}{}
+
+\@ifpackageloaded{xeCJK}{
+    \renewcommand{\LWR at isolate}[1]{\null#1\null}%
+}{}
+\let\LWRpercent\@percentchar
+\catcode`\$=12
+\def\LWRdollar{$}
+\catcode`\$=3
+\catcode`\&=12
+\def\LWRamp{&}
+\catcode`\&=4
+\catcode`\&=0
+&catcode`&\=12
+&def&LWRbackslash{\}
+&catcode`&\=0
+\catcode`\&=4
+\catcode`\#=12
+\def\LWRhash{#}
+\catcode`\#=6
+\def\LWRopquote{'}
+\def\LWRopseq{\space\LWRamp\LWRamp\space\space}
+\newbool{usingOSWindows}
+\boolfalse{usingOSWindows}
+
+
+\newcommand*{\OSPathSymbol}{/}
+
+
+\newcommand*{\LWR at setOSWindows}
+{
+\booltrue{usingOSWindows}
+\renewcommand*{\OSPathSymbol}{\@backslashchar}
+\def\LWRopquote{"}
+\def\LWRopseq{\space\LWRamp\space\space}
+}
+\ifwindows
+\LWR at setOSWindows
+\fi
+
+
+\RequirePackage{kvoptions}
+\SetupKeyvalOptions{family=LWR,prefix=LWR@}
+
+\newcommand{\lwarpsetup}[1]{\setkeys{LWR}{#1}}
+
+\newbool{warpingprint}
+\newbool{warpingHTML}
+\newbool{mathjax}
+\newbool{LWR at origmathjax}
+\booltrue{warpingprint}%
+\boolfalse{warpingHTML}%
+\boolfalse{mathjax}%
+\DeclareVoidOption{warpprint}{%
+\PackageInfo{lwarp}{Using option 'warpprint'}
+\booltrue{warpingprint}%
+\boolfalse{warpingHTML}%
+}
+
+\DeclareVoidOption{warpHTML}{%
+\PackageInfo{lwarp}{Using option 'warpHTML'}%
+\booltrue{warpingHTML}%
+\boolfalse{warpingprint}%
+}
+
+\DeclareVoidOption{mathsvg}{%
+\PackageInfo{lwarp}{Using option 'mathsvg'}
+\boolfalse{mathjax}%
+\boolfalse{LWR at origmathjax}%
+}
+\DeclareVoidOption{mathjax}{%
+\PackageInfo{lwarp}{Using option 'mathjax'}
+\booltrue{mathjax}%
+\booltrue{LWR at origmathjax}%
+}
+
+
+\DeclareStringOption[\jobname]{BaseJobname}
+
+\DeclareStringOption[lwarp.ist]{makeindexStyle}
+
+\DeclareStringOption[lwarp.xdy]{xindyStyle}
+
+\DeclareStringOption[english]{xindyLanguage}
+
+\DeclareStringOption[utf8]{xindyCodepage}
+
+\DeclareStringOption[UTF-8]{pdftotextEnc}
+
+\newbool{LWR at creatinglwarpmk}
+\boolfalse{LWR at creatinglwarpmk}
+
+\DeclareVoidOption{lwarpmk}{
+\PackageInfo{lwarp}{Using option 'lwarpmk'}
+\booltrue{LWR at creatinglwarpmk}
+}
+
+\DeclareVoidOption{OSWindows}{
+\PackageInfo{lwarp}{Using option 'OSWindows'}
+\LWR at setOSWindows
+}
+
+\DeclareStringOption[]{HomeHTMLFilename}
+
+\DeclareStringOption[]{HTMLFilename}
+
+\DeclareStringOption[]{PrintLatexCmd}
+
+\DeclareStringOption[]{HTMLLatexCmd}
+
+\DeclareStringOption[]{PrintIndexCmd}
+
+\DeclareStringOption[]{HTMLIndexCmd}
+
+\DeclareStringOption[]{LatexmkIndexCmd}
+
+\DeclareBoolOption[false]{makeindex}
+
+\DeclareBoolOption[false]{xindy}
+
+\DeclareStringOption[makeglossaries]{GlossaryCmd}
+
+\DeclareBoolOption[false]{latexmk}
+
+\DeclareBoolOption[false]{dvips}
+
+\DeclareBoolOption[false]{dvipdfm}
+
+\DeclareBoolOption[false]{dvipdfmx}
+
+\ProcessKeyvalOptions*\relax
+
+\providecommand*{\BaseJobname}{\LWR at BaseJobname}
+
+\ifcsempty{LWR at HomeHTMLFilename}{
+\newcommand*{\HomeHTMLFilename}{\BaseJobname}
+}{
+\csedef{HomeHTMLFilename}{\LWR at HomeHTMLFilename}
+}
+
+\csedef{HTMLFilename}{\LWR at HTMLFilename}
+\ifdefempty{\LWR at PrintIndexCmd}{
+    \renewcommand{\LWR at PrintIndexCmd}{%
+        makeindex  -s \LWR at makeindexStyle \space  \jobname.idx%
+    }
+    \ifbool{LWR at xindy}{
+        \renewcommand{\LWR at PrintIndexCmd}{%
+            xindy
+            -M \LWR at xindyStyle \space
+            -L \LWR at xindyLanguage \space
+            -C \LWR at xindyCodepage \space
+            \jobname.idx%
+        }
+    }{}
+}{}
+
+\ifdefempty{\LWR at HTMLIndexCmd}{
+    \renewcommand{\LWR at HTMLIndexCmd}{%
+        makeindex  -s \LWR at makeindexStyle \space  \jobname_html.idx%
+    }
+    \ifbool{LWR at xindy}{
+        \renewcommand{\LWR at HTMLIndexCmd}{%
+            xindy
+            -M \LWR at xindyStyle \space
+            -L \LWR at xindyLanguage \space
+            -C \LWR at xindyCodepage \space
+            \jobname_html.idx%
+        }
+    }{}
+}{}
+
+\ifdefempty{\LWR at LatexmkIndexCmd}{
+    \renewcommand{\LWR at LatexmkIndexCmd}{%
+        makeindex  -s \LWR at makeindexStyle%
+    }
+    \ifbool{LWR at xindy}{
+        \renewcommand{\LWR at LatexmkIndexCmd}{%
+            xindy
+            -M \LWR at xindyStyle \space
+            -L \LWR at xindyLanguage \space
+            -C \LWR at xindyCodepage%
+        }
+    }{}
+}{}
+\newcommand{\warpprintonly}[1]{\ifbool{warpingprint}{#1}{}}
+\newcommand{\warpHTMLonly}[1]{\ifbool{warpingHTML}{#1}{}}
+\RequirePackage{comment}
+
+\ifbool{warpingHTML}{
+\def\DefaultCutFileName{\def\CommentCutFile{comment_html.cut}}
+}{}
+
+\ifbool{warpingprint}{
+\def\DefaultCutFileName{\def\CommentCutFile{comment_print.cut}}
+}{}
+
+\includecomment{warpall}
+
+\ifbool{warpingHTML}
+{\includecomment{warpHTML}}
+{\excludecomment{warpHTML}}%
+
+\ifbool{warpingprint}
+{\includecomment{warpprint}}
+{\excludecomment{warpprint}}
+
+
+\ifbool{LWR at creatinglwarpmk}
+{\includecomment{LWR at createlwarpmk}}
+{\excludecomment{LWR at createlwarpmk}}
+
+
 \begin{warpHTML}
 \ifxetexorluatex
 \@ifpackageloaded{fontspec}{}{
@@ -735,10 +793,14 @@
 \end{warpHTML}
 
 \begin{warpHTML}
-\RequirePackage[paperheight=190in,paperwidth=20in,%
-left=2in,right=6in,%
-top=1in,bottom=1in,%
-]{geometry}
+\RequirePackage{geometry}
+\geometry{
+    paperheight=190in,%
+    paperwidth=20in,%
+    left=2in,right=6in,%
+    top=1in,bottom=1in,%
+}
+
 \@twosidefalse
 \@mparswitchfalse
 \end{warpHTML}
@@ -760,6 +822,8 @@
 
 \RequirePackage{gettitlestring}
 
+\@ifundefined{bxjs at everypar}{}{\let\everypar\bxjs at everypar}
+
 \RequirePackage{everyhook}
 \end{warpHTML}
 
@@ -833,6 +897,32 @@
 
 \newcommand*{\LWR at parsedrequirepackagenames}{}
 
+\newcommand*{\LWR at checkloadfilename}[1]{%
+\LWR at checkloadnever{#1}{ae}{latinmodern}
+\LWR at checkloadnever{#1}{aecc}{latinmodern}
+\LWR at checkloadnever{#1}{boxedminipage}{boxedminipage2e}
+\LWR at checkloadnever{#1}{caption2}{caption}
+\LWR at checkloadnever{#1}{ccaption}{caption}
+\LWR at checkloadnever{#1}{fancyheadings}{fancyhdr}
+\LWR at checkloadnever{#1}{glossary}{glossaries}
+\LWR at checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx}
+\LWR at checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
+\LWR at checkloadbefore{#1}{ctex}
+\LWR at checkloadbefore{#1}{fontspec}
+\LWR at checkloadbefore{#1}{inputenc}
+\LWR at checkloadbefore{#1}{inputenx}
+\LWR at checkloadbefore{#1}{kotex}
+\LWR at checkloadbefore{#1}{luatexja}
+\LWR at checkloadbefore{#1}{luatexja-fontspec}
+\LWR at checkloadbefore{#1}{luatexko}
+\LWR at checkloadbefore{#1}{morewrites}
+\LWR at checkloadbefore{#1}{newclude}
+\LWR at checkloadbefore{#1}{newunicodechar}
+\LWR at checkloadbefore{#1}{xeCJK}
+\LWR at checkloadbefore{#1}{xetexko}
+\LWR at checkloadbefore{#1}{zxjatype}
+}
+
 \newcommand*\LWR at findword[3][,]{%
     \StrBetween[#3,\numexpr#3+1]{#1#2#1}{#1}{#1}%
 }
@@ -840,9 +930,9 @@
 \LWR at findword{\LWR at requirepackagenames}{#1}[\LWR at strresult]%
 \StrSubstitute[100]{\LWR at strresult}{ }{}[\LWR at strresulttwo]%
 \IfStrEq{\LWR at strresulttwo}{}%
-{%
-}% no filename
-{% yes filename
+{}% no filename
+{% yes filename was found
+\LWR at checkloadfilename{\LWR at strresulttwo}%
     \IfFileExists{lwarp-\LWR at strresulttwo.sty}%
     {% lwarp-* file found
         \ifdefvoid{\LWR at parsedrequirepackagenames}{%
@@ -1383,6 +1473,16 @@
         \@percentchar S%
     }
 }
+\newcommand*{\LWR at compileuplatex}{
+    \def\LWR at tempprintlatexcmd{%
+        \LWR at compilecmd{uplatex}{}
+        \LWR at addcompilecmd{dvipdfmx}{}
+    }
+    \def\LWR at tempHTMLlatexcmd{%
+        \LWR at compilecmd{uplatex}{_html}
+        \LWR at addcompilecmd{dvipdfmx}{_html}
+    }
+}
 \ifbool{LWR at latexmk}{
     \ifpdf
         \ifPDFTeX
@@ -1473,12 +1573,15 @@
         \fi% \ifXeTeX
     \fi% \ifpdf
 }% latexmk
-    \ifdefempty{\LWR at PrintLatexCmd}{
-        \def\LWR at PrintLatexCmd{\LWR at tempprintlatexcmd}
-    }{}
-    \ifdefempty{\LWR at HTMLLatexCmd}{
-        \def\LWR at HTMLLatexCmd{\LWR at tempHTMLlatexcmd}
-    }{}
+\@ifclassloaded{ujarticle}{\LWR at compileuplatex}{}
+\@ifclassloaded{ujbook}{\LWR at compileuplatex}{}
+\@ifclassloaded{ujreport}{\LWR at compileuplatex}{}
+\ifdefempty{\LWR at PrintLatexCmd}{
+    \def\LWR at PrintLatexCmd{\LWR at tempprintlatexcmd}
+}{}
+\ifdefempty{\LWR at HTMLLatexCmd}{
+    \def\LWR at HTMLLatexCmd{\LWR at tempHTMLlatexcmd}
+}{}
 \newcommand{\LWR at writeconf}[1]{
 \ifcsdef{LWR at quickfile}{}{\newwrite{\LWR at quickfile}}
 \immediate\openout\LWR at quickfile=#1
@@ -1629,6 +1732,10 @@
     text-decoration-skip: auto ;
 }
 
+/* for vertical text: */
+div.verticalrl { writing-mode: vertical-rl }
+div.horizontaltb { writing-mode: horizontal-tb }
+
 /* for diagbox */
 div.diagboxtitleN { border-bottom: 1px solid gray }
 div.diagboxtitleS { border-top: 1px solid gray }
@@ -2173,12 +2280,8 @@
 }
 
 .mdframed {
-/*     padding: 0ex ; */
-/*    border: 1px solid blafck; */
-/*      border-radius: 0px ; */
     padding: 0ex ;
-    margin: 3ex 5% 3ex 5% ;
-/*   display: inline-block ; */
+    margin: 2ex 0em 2ex 0em ;
 }
 
 .mdframed p { padding: 0ex .5em 0ex .5em ; }
@@ -2186,20 +2289,17 @@
 .mdframed dl { padding: 0ex .5em 0ex .5em ; }
 
 .mdframedtitle {
-    padding: .5em ;
+    padding: .5ex 0pt 0pt 0pt ;
+    border-radius: 10pt 10pt 0pt 0pt ;
     display: block ;
-    font-size: 130% ;
     margin-bottom: 1ex ;
 }
 
 .mdframedsubtitle {
-    padding: 0ex .5em 0ex .5em ;
     display: block ;
-    font-size: 115% ;
 }
 
 .mdframedsubsubtitle {
-    padding: 0ex .5em 0ex .5em ;
     display: block ;
 }
 
@@ -2206,7 +2306,6 @@
 .mdtheorem {
     padding: 0ex .5em 0ex .5em ;
     margin: 3ex 5% 3ex 5% ;
-/*   display: inline-block ; */
 }
 
 /* framed package */
@@ -3540,7 +3639,7 @@
 
 -- Copyright 2016-2018 Brian Dunn
 
-printversion = "v0.62"
+printversion = "v0.63"
 requiredconfversion = "1" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -4635,12 +4734,36 @@
 \end{warpHTML}
 
 
+\begin{warpall}
+
+\newcommand{\linkhomename}{Home}
+
+\end{warpall}
+
 \begin{warpHTML}
 
 \newcommand*{\LinkHome}{%
-\LWR at subhyperrefclass{\HomeHTMLFilename.html}{Home}{linkhome}%
+\LWR at subhyperrefclass{\HomeHTMLFilename.html}{\linkhomename}{linkhome}%
 }
 
+\end{warpHTML}
+
+\begin{warpprint}
+
+\AtBeginDocument{
+\@ifundefined{hyperref}{
+    \newcommand*{\LinkHome}{\linkhomename\ --- page \pageref{page-LWRfirstpage}}
+}{
+    \newcommand*{\LinkHome}{\hyperref[page-LWRfirstpage]{\linkhomename}}
+}
+}
+
+\AfterEndPreamble{\label{page-LWRfirstpage}}
+
+\end{warpprint}
+
+\begin{warpHTML}
+
 \newcommand*{\LWR at topnavigation}{
 \LWR at htmlelementclassline{nav}{topnavigation}{\LinkHome}
 }
@@ -4874,7 +4997,7 @@
 \begingroup%
 \LWR at FBcancel%
 \ifmmode\else\protect\LWR at origttfamily\fi%
-\LWR at print@mbox{\LWR at origtextless{}!{-}{-}}%
+\LWR at print@mbox{\LWR at origtextless{}!-\/-}%
 \endgroup%
 }%
 }
@@ -4884,7 +5007,7 @@
 \begingroup%
 \LWR at FBcancel%
 \ifmmode\else\protect\LWR at origttfamily\fi%
-\LWR at print@mbox{{-}{-}\LWR at origtextgreater}%
+\LWR at print@mbox{-\/-\LWR at origtextgreater}%
 \endgroup%
 }%
 }
@@ -4909,8 +5032,16 @@
 \NewDocumentCommand{\LWR at subhtmlelementclass}{m O{} m}{%
 \LWR at traceinfo{LWR at subhtmlelementclass !#1!#2!#3!}%
 \ifblank{#2}%
-{\LWR at htmltag{#1 class="#3"}}% empty option
-{\LWR at htmltag{#1 class="#3" style="#2"}}% non-empty option
+{% empty option
+    \LWR at htmltag{#1 class=\textquotedbl#3\textquotedbl}%
+}%
+{% non-empty option
+    \LWR at htmltag{%
+        #1 % space
+        class=\textquotedbl#3\textquotedbl\ % space
+        style=\textquotedbl#2\textquotedbl%
+    }%
+}%
 \LWR at traceinfo{LWR at subhtmlelementclass done}%
 }
 
@@ -5016,15 +5147,17 @@
 {%
     \addtocounter{LWR at thisautoidWP}{1}%
     \LWR at htmltag{%
-        div class="#3" %
-        id="\LWR at print@mbox{autoidWP-\arabic{LWR at thisautoidWP}}"%
-        \ifblank{#1}{}{ style="#1"}%
+        div class=\textquotedbl#3\textquotedbl % space
+        id=\textquotedbl%
+            \LWR at print@mbox{autoidWP-\arabic{LWR at thisautoidWP}}%
+        \textquotedbl%
+        \ifblank{#1}{}{ style=\textquotedbl#1\textquotedbl}%
     }%
 }% FormatWP
 {% not FormatWP
     \LWR at htmltag{%
-        div class="#3"%
-        \ifblank{#2}{}{ style="#2"}%
+        div class=\textquotedbl#3\textquotedbl%
+        \ifblank{#2}{}{ style=\textquotedbl#2\textquotedbl}%
     }%
 }% not FormatWP
 \LWR at startpars%
@@ -5675,7 +5808,10 @@
 }
 
 \newcommand*{\LWR at createautosec}[1]{%
-\LWR at htmltag{#1 id="\LWR at print@mbox{autosec-\arabic{page}}"}%
+\LWR at htmltag{%
+    #1 % space
+    id=\textquotedbl\LWR at print@mbox{autosec-\arabic{page}}\textquotedbl%
+}%
 }
 
 \NewDocumentCommand{\LWR at pushoneclose}{m m}{%
@@ -5994,27 +6130,46 @@
 \LWR at nullfonts%
 \edef\theHTMLSection{#1}%
 \LWR at htmltag{!DOCTYPE html}\LWR at orignewline
-\LWR at htmltag{html lang="\LWR at currentHTMLLanguage"}\LWR at orignewline
+\LWR at htmltag{%
+    html lang=\textquotedbl\LWR at currentHTMLLanguage\textquotedbl%
+}\LWR at orignewline
 \LWR at htmltag{head}\LWR at orignewline
-\LWR at htmltag{meta charset="UTF-8" /}\LWR at orignewline
+\LWR at htmltag{%
+    meta charset=\textquotedbl{}UTF-8\textquotedbl\ /%
+}\LWR at orignewline
 \ifthenelse{\equal{\theHTMLAuthor}{}}%
 {}%
-{\LWR at htmltag{meta name="author" content="\theHTMLAuthor" /}\LWR at orignewline}%
-\LWR at htmltag{meta name="generator" content="LaTeX lwarp package" /}%
-    \LWR at orignewline
+{%
+    \LWR at htmltag{%
+        meta name=\textquotedbl{}author\textquotedbl\ % space
+        content=\textquotedbl\theHTMLAuthor\textquotedbl\ /%
+    }\LWR at orignewline%
+}%
+\LWR at htmltag{%
+    meta % space
+    name=\textquotedbl{}generator\textquotedbl\ % space
+    content=\textquotedbl{}LaTeX lwarp package\textquotedbl\ /%
+}\LWR at orignewline%
 \ifdefempty{\LWR at currentHTMLDescription}{}{%
+    \LWR at htmltag{%
+        meta name=\textquotedbl{}description\textquotedbl\ % space
+        content=\textquotedbl\LWR at currentHTMLDescription\textquotedbl\ /%
+    }\LWR at orignewline
+}%
 \LWR at htmltag{%
-meta name="description" content="\LWR at currentHTMLDescription" /}%
-    \LWR at orignewline
+    meta % space
+    name=\textquotedbl{}viewport\textquotedbl\ % space
+    content=\textquotedbl{}width=device-width, initial-scale=1.0\textquotedbl\ /%
+}\LWR at orignewline
+\LWR at htmltag{!-\/-[if lt IE 9]}\LWR at orignewline
+\LWR at htmltag{%
+    script % space
+    src=\textquotedbl{}%
+        http://html5shiv.googlecode.com/svn/trunk/html5.js%
+    \textquotedbl%
 }%
-\LWR at htmltag{meta name="viewport" %
-content="width=device-width, initial-scale=1.0" /}%
-    \LWR at orignewline
-\LWR at htmltag{!{-}{-}[if lt IE 9]}\LWR at orignewline
-\LWR at htmltag{%
-script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"}%
 \LWR at htmltag{/script}\LWR at orignewline
-\LWR at htmltag{![endif]{-}{-}}\LWR at orignewline
+\LWR at htmltag{![endif]-\/-}\LWR at orignewline
 \ifthenelse{\equal{\theHTMLTitle}{}}%
 {}%
 {%
@@ -6025,7 +6180,11 @@
     \LWR at htmltag{/title}\LWR at orignewline%
 }%
 \LWR at htmltag{%
-link rel="stylesheet" type="text/css" href="\LWR at currentcss" /}%
+    link % space
+    rel=\textquotedbl{}stylesheet\textquotedbl\ % space
+    type=\textquotedbl{}text/css\textquotedbl\ % space
+    href=\textquotedbl\LWR at currentcss\textquotedbl\ /%
+}%
 \LWR at orignewline
 \ifbool{mathjax}%
 {%
@@ -6101,7 +6260,7 @@
 \LWR at stoppars
 \LWR at htmltag{/header}\LWR at orignewline
 \LWR at traceinfo{LWR at lwarpStart: Generating textbody.}
-\LWR at htmltag{section class="textbody"}
+\LWR at htmltag{section class=\textquotedbl{}textbody\textquotedbl}
 \LWR at patchlists
 \catcode`\$=\active
 \immediate\write\@mainaux{\catcode`\string$\active}%
@@ -6443,8 +6602,8 @@
 \setlength{\parskip}{0ex}%
 \LWR at stoppars%
 \ifbool{LWR at verbtags}{%
-    \LWR at htmltag{pre class="#3"
-        \ifthenelse{\equal{#1}{}}{}{style="#1"}%
+    \LWR at htmltag{pre class=\textquotedbl#3\textquotedbl%
+        \ifthenelse{\equal{#1}{}}{}{ style=\textquotedbl#1\textquotedbl}%
     }%
     \LWR at orignewline% pre
     \leavevmode\unskip\LWR at print@vspace*{-#2\baselineskip}%
@@ -10106,6 +10265,8 @@
 
 \LWR at PreloadedPackage{ulem}
 
+\LWR at PreloadedPackage{xetexko-vertical}
+
 \end{warpHTML}
 
 
@@ -11254,6 +11415,21 @@
 \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}
 \AtBeginDocument{
     \@ifpackageloaded{ctexpatch}{%
         \def\@partcntformat#1{%



More information about the tex-live-commits mailing list