diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 126 |
1 files changed, 103 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 0ad1c8aa5b0..919e949e4af 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2018/12/03 v0.63 Allows LaTeX to directly produce HTML5 output.] + [2018/12/08 v0.64 Allows LaTeX to directly produce HTML5 output.] @@ -129,9 +129,6 @@ or is superceded by another class. For a possible alternative, see class(es) #2.} }{}% } -\LWR@earlyclassloadnever{utarticle}{ujarticle} -\LWR@earlyclassloadnever{utbook}{ujbook} -\LWR@earlyclassloadnever{utreport}{ujreport} \LWR@earlyloadnever{ae}{cm-super, lmodern} \LWR@earlyloadnever{aecompl}{cm-super, lmodern} \LWR@earlyloadnever{aecc}{cm-super, lmodern} @@ -141,7 +138,7 @@ For a possible alternative, see class(es) #2.} \LWR@earlyloadnever{CJK}{ctex, xeCJK} \LWR@earlyloadnever{CJKutf8}{ctex, xeCJK} } -\LWR@earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle} +\LWR@earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle, utarticle} \LWR@earlyloadnever{hangul}{kotex, xetexko, luatexko} \LWR@earlyloadnever{fancyheadings}{fancyhdr} \LWR@earlyloadnever{glossary}{glossaries} @@ -192,6 +189,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{breakurl} \LWR@loadafter{breqn} +\LWR@loadafter{bsheaders} \LWR@loadafter{bxpapersize} \LWR@loadafter{bytefield} \LWR@loadafter{cancel} @@ -280,6 +278,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{fullwidth} \LWR@loadafter{fwlw} \LWR@notbxjsloadafter{geometry} +\LWR@loadafter{gmeometric} \LWR@loadafter{glossaries} \LWR@loadafter{glossary} \LWR@loadafter{grffile} @@ -389,6 +388,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{relsize} \LWR@loadafter{repeatindex} \LWR@loadafter{resizegather} +\LWR@loadafter{rmpage} \LWR@loadafter{romanbar} \LWR@loadafter{romanbarpagenumber} \LWR@loadafter{rotating} @@ -401,6 +401,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{scrlayer} \LWR@loadafter{scrlayer-notecolumn} \LWR@loadafter{scrlayer-scrpage} +\LWR@loadafter{scrpage2} \LWR@loadafter{section} \LWR@loadafter{sectionbreak} \LWR@loadafter{sectsty} @@ -468,7 +469,6 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{vpe} \LWR@loadafter{vwcol} \LWR@loadafter{wallpaper} -\LWR@loadafter{wasysym} \LWR@loadafter{watermark} \LWR@loadafter{widows-and-orphans} \LWR@loadafter{wrapfig} @@ -900,11 +900,16 @@ For a possible alternative, see class(es) #2.} \newcommand*{\LWR@checkloadfilename}[1]{% \LWR@checkloadnever{#1}{ae}{latinmodern} \LWR@checkloadnever{#1}{aecc}{latinmodern} +\LWR@checkloadnever{#1}{bitfield}{bytefield} \LWR@checkloadnever{#1}{boxedminipage}{boxedminipage2e} \LWR@checkloadnever{#1}{caption2}{caption} \LWR@checkloadnever{#1}{ccaption}{caption} +\LWR@checkloadnever{#1}{doublespace}{setspace} \LWR@checkloadnever{#1}{fancyheadings}{fancyhdr} \LWR@checkloadnever{#1}{glossary}{glossaries} +\LWR@checkloadnever{#1}{newthm}{ntheorem} +\LWR@checkloadnever{#1}{rplain}{fancyhdr} +\LWR@checkloadnever{#1}{si}{siunitx} \LWR@checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx} \LWR@checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol} \LWR@checkloadbefore{#1}{ctex} @@ -1576,6 +1581,9 @@ For a possible alternative, see class(es) #2.} \@ifclassloaded{ujarticle}{\LWR@compileuplatex}{} \@ifclassloaded{ujbook}{\LWR@compileuplatex}{} \@ifclassloaded{ujreport}{\LWR@compileuplatex}{} +\@ifclassloaded{utarticle}{\LWR@compileuplatex}{} +\@ifclassloaded{utbook}{\LWR@compileuplatex}{} +\@ifclassloaded{utreport}{\LWR@compileuplatex}{} \ifdefempty{\LWR@PrintLatexCmd}{ \def\LWR@PrintLatexCmd{\LWR@tempprintlatexcmd} }{} @@ -1672,7 +1680,7 @@ body { p {margin: 1.5ex 0em 1.5ex 0em ;} table p {margin: .5ex 0em .5ex 0em ;} -/* Holds a section number to add space between it and the name */ +/* Holds a section number */ span.sectionnumber { margin-right: 0em } /* Inserted in front of index lines */ @@ -3639,7 +3647,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- -- Copyright 2016-2018 Brian Dunn -printversion = "v0.63" +printversion = "v0.64" requiredconfversion = "1" -- also at *lwarpmk.conf function printhelp () @@ -5825,7 +5833,7 @@ end -- not --version } \newcounter{LWR@prevFileDepth} \setcounter{LWR@prevFileDepth}{\LWR@depthsubparagraph} -\def\@seccntformat#1{\csname the#1\endcsname\protect\quad} +\def\@seccntformat#1{\csname the#1\endcsname\quad} \newcommand*{\simplechapterdelim}{} \let\@chapcntformat\@seccntformat \let\@partcntformat\@seccntformat @@ -5919,7 +5927,11 @@ end -- not --version \LWR@traceinfo{LWR@section: about to addcontentsline}% \addcontentsline{toc}{#4}% {% - \protect\numberline{\@nameuse{the#4}}% + \protect\numberline{% + \@nameuse{pre#4name}% + \@nameuse{the#4}% + \@nameuse{post#4name}% + }% {% \ignorespaces% \IfValueTF{#2}{\LWR@isolate{#2}}{\LWR@isolate{#3}}\protect\relax% @@ -5944,7 +5956,7 @@ end -- not --version \ifthenelse{% \(\cnttest{\@nameuse{LWR@depth#4}}{<=}% {\value{secnumdepth}}\) \AND% - \(\cnttest{\@nameuse{LWR@depth#4}}{<=}{\LWR@depthpart}\)% + \(\cnttest{\@nameuse{LWR@depth#4}}{=}{\LWR@depthpart}\)% }% {\@partnameformat}% {}% @@ -5954,9 +5966,8 @@ end -- not --version }% {% \ifstrequal{#4}{part}% + {\protect\LWR@sectionnumber{\@partcntformat{#4}}}% {% - \protect\LWR@sectionnumber{\@partcntformat{#4}}% - }{% \ifstrequal{#4}{chapter}% {\protect\LWR@sectionnumber{\@chapcntformat{#4}}}% {\protect\LWR@sectionnumber{\@seccntformat{#4}}}% @@ -5995,6 +6006,28 @@ end -- not --version } +\providecommand*{\prepartname}{} +\providecommand*{\postpartname}{} + +\providecommand*{\prechaptername}{} +\providecommand*{\postchaptername}{} + +\providecommand*{\presectionname}{} +\let\postsectionname\presectionname + +\let\presubsectionname\presectionname +\let\postsubsectionname\postsectionname + +\let\presubsubsectionname\presectionname +\let\postsubsubsectionname\postsectionname + +\let\preparagraphname\presectionname +\let\postparagraphname\postsectionname + +\let\presubparagraphname\presectionname +\let\postsubparagraphname\postsectionname + + \newcommand{\part@preamble}{}% for koma-script \DeclareDocumentCommand{\part}{s o m}{% @@ -6095,13 +6128,17 @@ end -- not --version } \ifPDFTeX% pdflatex or dvi latex -\ifdefstring{\inputencodingname}{utf8}{% - \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash -}{% - \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen -}% + \ifdefstring{\inputencodingname}{utf8}{% + \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash + }{% + \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen + }% \else% - \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash + \ifpTeX + \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen + \else + \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash + \fi% \fi% \newcommand*{\HTMLTitleBeforeSection}{% @@ -6223,7 +6260,7 @@ end -- not --version \LWR@origonecolumn% \LWR@origpagestyle{empty}% \overfullrule=0pt -\LWR@print@scriptsize% +\LWR@print@footnotesize% \LWR@print@raggedright% \LetLtxMacro{\\}{\LWR@endofline}% \linespread{1.3}% @@ -11145,15 +11182,15 @@ width:\LWR@printlength{\LWR@tempwidth}% \ifbool{LWR@minipagethispar}{\LWR@stoppars}{}% } -\renewcommand*{\quad}{% +\renewrobustcmd*{\quad}{% \LWR@minipagestoppars% \HTMLunicode{2001}% \LWR@minipagestartpars% } -\renewcommand*{\qquad}{\quad\quad} +\renewrobustcmd*{\qquad}{\quad\quad} -\renewcommand*{\enskip}{% +\renewrobustcmd*{\enskip}{% \LWR@minipagestoppars% \HTMLunicode{2000}% \LWR@minipagestartpars% @@ -11430,6 +11467,49 @@ width:\LWR@printlength{\LWR@tempwidth}% \end{warpHTML} \begin{warpHTML} +\newcommand*{\LWR@patchujtclasses}{ + \let\tate\relax + \DeclareDocumentCommand{\rensuji}{m}{##1} + \def\@partnameformat{}% uj/t does not use \partname + \def\@partcntformat##1{% + \prepartname% + \csname the##1\endcsname% + \postpartname% + \quad% + } + \@ifundefined{chapter}{}{ + \def\@chapcntformat##1{% + \prechaptername% + \csname the##1\endcsname% + \postchaptername% + \quad% + } + } + \renewcommand{\thepart}{\@Roman\c@part} + \@ifundefined{chapter}{ + \renewcommand{\thesection}{\@arabic\c@section} + }{ + \renewcommand{\thechapter}{\@arabic\c@chapter} + \renewcommand{\thesection}{\thechapter.\@arabic\c@section} + } + \renewcommand{\thesubsection}{\thesection.\@arabic\c@subsection} + \renewcommand{\thesubsubsection}{% + \thesubsection.\@arabic\c@subsubsection} + \renewcommand{\theparagraph}{% + \thesubsubsection.\@arabic\c@paragraph} + \renewcommand{\thesubparagraph}{% + \theparagraph.\@arabic\c@subparagraph} +} + +\@ifclassloaded{ujarticle}{\LWR@patchujtclasses}{} +\@ifclassloaded{ujbook}{\LWR@patchujtclasses}{} +\@ifclassloaded{ujreport}{\LWR@patchujtclasses}{} +\@ifclassloaded{utarticle}{\LWR@patchujtclasses}{} +\@ifclassloaded{utbook}{\LWR@patchujtclasses}{} +\@ifclassloaded{utreport}{\LWR@patchujtclasses}{} +\end{warpHTML} + +\begin{warpHTML} \AtBeginDocument{ \@ifpackageloaded{ctexpatch}{% \def\@partcntformat#1{% |