diff options
Diffstat (limited to 'Master')
17 files changed, 769 insertions, 93 deletions
diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index 66c14dbd928..15d4e9850a9 100644 --- a/Master/texmf-dist/doc/latex/lwarp/README.txt +++ b/Master/texmf-dist/doc/latex/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.63 README.txt +LaTeX lwarp package v0.64 README.txt Files included are: diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf Binary files differindex f34409c1961..f9d614878f9 100644 --- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf +++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua index 0220fe6e9ff..88153f04a7a 100755 --- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua +++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2018 Brian Dunn -printversion = "v0.63" +printversion = "v0.64" requiredconfversion = "1" -- also at *lwarpmk.conf function printhelp () diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx index 5ee422e42a3..2fca82da516 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{lwarp} -%<package> [2018/12/03 v0.63 Allows LaTeX to directly produce HTML5 output.] +%<package> [2018/12/08 v0.64 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -572,7 +572,8 @@ for \cs{hyperref}, etc., as it is neutralized for inclusion in \HTML\ \acro{URL} \pkg{lwarp} can also load \pkg{url}, but \pkg{url} should not be used at the same time as \pkg{hyperref}, since they both define the \cs{url} command. \pkg{lwarp} does not (yet) attempt to convert \pkg{url} links into hyperlinks -during \HTML\ output, nor does \pkg{url} create hyperlinks during print output. +during \HTML\ output, nor does the print version of \pkg{url} +create hyperlinks. When generating \HTML, \pkg{lwarp}'s emulation of \pkg{hyperref} does not \trouble[\pkg{backref}]{hyperref=\pkg{hyperref}>backref=\pkg{backref}} @@ -2561,7 +2562,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{26829} +% \CheckSum{27072} % % \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 @@ -2667,6 +2668,7 @@ This boolean may be tested by the user for later use. % \changes{v0.61}{2018/10/13}{\ 2018/10/13} % \changes{v0.62}{2018/11/19}{\ 2018/11/19} % \changes{v0.63}{2018/12/03}{\ 2018/12/03} +% \changes{v0.64}{2018/12/08}{\ PENDING} @@ -2866,6 +2868,22 @@ This boolean may be tested by the user for later use. % % \begin{description} % \needspace{2\baselineskip} +% \item[v0.64:] Koma-Script, Japanese, Chinese. +% \begin{itemize} +% \item Added \pkg{utarticle} and related classes. +% \margintag{Japanese} +% \item Improved \pkg{ujarticle} and related classes. +% \item Fix for \pkg{biblatex} with C\TeX\ and other classes. +% \margintag{Chinese} +% \item Fixes for \pkg{scrlayer}, \pkg{scrlayer-scrpage}. +% \margintag{Koma-Script} +% \item \pkg{addlines}: Updated to v0.3. +% \margintag{packages} +% \item Added \pkg{bsheaders}, +% \pkg{gmeometric}, \pkg{marginal}, +% \pkg{rmpage}, \pkg{scrpage2}. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.63:] \pkg{mdframed}, Chinese, Japanese, Korean % \begin{itemize} % \item Added \cs{linkhomename}: A user-definable name for the \UI{Home} link. @@ -4225,8 +4243,8 @@ This boolean may be tested by the user for later use. % % Classes: & \pkg{article}, \pkg{book}, \pkg{report}, % \pkg{scrartcl}, \pkg{scrbook}, \pkg{scrreprt}, \pkg{memoir}, C\TeX-related, -% \pkg{bxjsarticle} and related, \pkg{ltjsarticle} and relatex, -% \pkg{ujarticle} and related. \\ +% \pkg{bxjsarticle} and related, \pkg{ltjsarticle} and related, +% \pkg{ujarticle} and related, \pkg{utarticle} and related. \\ % % Koma-script: & \pkg{scrextend}, \pkg{scrhack}, \pkg{scrlayer}. % Others as listed below. \\ @@ -4247,6 +4265,7 @@ This boolean may be tested by the user for later use. % \pkg{ltjsarticle} and related, % \pkg{luatexja}, \pkg{luatexja-fontspec}, % \pkg{ujarticle} and related, +% \pkg{utarticle} and related, % \pkg{zxjatype}. \\ % % Korean: & \pkg{kotex}, \pkg{luatexko}, \pkg{xetexko}. \\ @@ -4256,16 +4275,18 @@ This boolean may be tested by the user for later use. % Page layout: & \pkg{2in1}, \pkg{2up}, \pkg{a4}, \pkg{a4wide}, \pkg{a5comb}, % \pkg{addlines}, \pkg{anysize}, \pkg{atbegshi}, % \pkg{blowup}, \pkg{booklet}, \pkg{bophook}, \pkg{bxpapersize}, -% \pkg{canoniclayout}, \pkg{clrdblpg}, +% \pkg{canoniclayout}, +% \pkg{changepage}, \pkg{chngpage}, \pkg{clrdblpg}, % \pkg{continue}, \pkg{draftcopy}, \pkg{draftfigure}, \pkg{draftwatermark}, % \pkg{ebook}, \pkg{everyshi}, % \pkg{fancyhdr}, \pkg{fancytabs}, \pkg{flippdf}, % \pkg{fullminipage}, \pkg{fullpage}, -% \pkg{fwlw}, \pkg{geometry}, \pkg{grid}, \pkg{grid-system}, \pkg{gridset}, +% \pkg{fwlw}, \pkg{geometry}, \pkg{gmeometric}, +% \pkg{grid}, \pkg{grid-system}, \pkg{gridset}, % \pkg{layaureo}, \pkg{leading}, % \pkg{ltxgrid}, \pkg{nccfancyhdr}, \pkg{notespages}, \pkg{pagegrid}, -% \pkg{pdfprivacy}, \pkg{pagesel}, \pkg{preview}, -% \pkg{scrlayer-scrpage}, \pkg{textarea}, \pkg{threadcol}, +% \pkg{pdfprivacy}, \pkg{pagesel}, \pkg{preview}, \pkg{rmpage}, +% \pkg{scrlayer-scrpage}, \pkg{scrpage2}, \pkg{textarea}, \pkg{threadcol}, % \pkg{thumb}, \pkg{thumbs}, \pkg{titleps}, \pkg{tocenter}, % \pkg{turnthepage}, \pkg{twoup}, \pkg{typearea}, \pkg{vmargin}, % \pkg{watermark}, \pkg{zwpagelayout}. @@ -4277,8 +4298,10 @@ This boolean may be tested by the user for later use. % Sectioning: & Adds \progcode{FileDepth} for splitting the \HTML\ output. % Files may be numbered sequentially or named according to section name. % Common short words and punctuation are removed from the filenames. -% \pkg{anonchap}, \pkg{fncychap}, \pkg{quotchap}, -% \pkg{section}, \pkg{sectionbreak}, \pkg{sectsty}, \pkg{titlesec}. \\ +% \pkg{anonchap}, \pkg{bsheaders}, \pkg{fncychap}, \pkg{quotchap}, +% \pkg{section}, \pkg{sectionbreak}, \pkg{sectsty}, \pkg{titlesec}. +% +% Tested to work as-is: \pkg{secdot}.\\ % % Table of contents, figures, tables: & Supported, with hyperlinks. % \pkg{multitoc}, \pkg{shorttoc}, \pkg{titletoc}, @@ -4310,7 +4333,7 @@ This boolean may be tested by the user for later use. % % \midrule % -% Margin notes: & \pkg{marginfit}, \pkg{marginfix}, \pkg{scrlayer-notecolumn}. \\ +% Margin notes: & \pkg{marginal}, \pkg{marginfit}, \pkg{marginfix}, \pkg{scrlayer-notecolumn}. \\ % % Footnotes: & Adds \progcode{FootnoteDepth} to print footnotes at section breaks. % \pkg{dblfnote}, @@ -7355,8 +7378,17 @@ This boolean may be tested by the user for later use. % % The following describes \cs{ForceHTMLPage} and \cs{ForceHTMLTOC}, % which may be used for \pkg{endnotes}, \pkg{glossaries}, \pkg{tocbibind}, -% and the index. See the following sections where applicable. +% bibliographies, and the index. +% See the following sections where applicable. % Continue here if interested in the reason for adding these commands to \pkg{lwarp}. +% \trouble{endnotes>\HTML\ page and \TOC} +% \trouble{glossaries=\pkg{glossaries}>\HTML\ page and \TOC} +% \trouble{bibliography>\HTML\ page and \TOC} +% \trouble{index>\HTML\ page and \TOC} +% \gindex{endnotes>\HTML\ page and \TOC} +% \gindex{glossaries=\pkg{glossaries}>\HTML\ page and \TOC} +% \gindex{bibliography>\HTML\ page and \TOC} +% \gindex{index>\HTML\ page and \TOC} % % Some packages use \cs{chapter*} or \cs{section*} to introduce reference % material such as notes or lists, often to be placed in the back matter of a book. @@ -10201,17 +10233,7 @@ For a possible alternative, see class(es) #2.} % \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@earlyclassloadnever{utarticle}{ujarticle} -\LWR@earlyclassloadnever{utbook}{ujbook} -\LWR@earlyclassloadnever{utreport}{ujreport} -% \end{macrocode} % \begin{macrocode} \LWR@earlyloadnever{ae}{cm-super, lmodern} \LWR@earlyloadnever{aecompl}{cm-super, lmodern} @@ -10229,7 +10251,7 @@ For a possible alternative, see class(es) #2.} % \end{macrocode} % \pkg{bxcjkatype} is based on \pkg{CJK}: % \begin{macrocode} -\LWR@earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle} +\LWR@earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle, utarticle} % \end{macrocode} % \pkg{hangul} is not in TeXLive, and is not tested: % \begin{macrocode} @@ -10303,6 +10325,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} @@ -10395,6 +10418,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{graphics}% pre-loaded by xunicode % \LWR@loadafter{graphicx}% pre-loaded by xunicode @@ -10512,6 +10536,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} @@ -10525,6 +10550,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} @@ -10599,7 +10625,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} @@ -12032,15 +12057,22 @@ For a possible alternative, see class(es) #2.} % or never at all. % % \changes{v0.63}{2018/12/02}{Added to reduce number of \filenm{lwarp-*} files.} +% \changes{v0.64}{2018/12/07}{Prevented \pkg{bitfield}, \pkg{doublespace}, +% \pkg{newthm}, \pkg{rplain}, \pkg{si}.} % \begin{macrocode} \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} % @@ -13541,12 +13573,16 @@ For a possible alternative, see class(es) #2.} \fi% \ifpdf }% latexmk % \end{macrocode} -% For \pkg{ujarticle} and related, using up\LaTeX\ and \prog{dvipdfmx}: +% For \pkg{ujarticle}, \pkg{utarticle}, and related, using up\LaTeX\ and \prog{dvipdfmx}: % \changes{v0.63}{2018/11/25}{\pkg{ujarticle} and related: Compile options.} +% \changes{v0.64}{2018/12/07}{\pkg{utarticle} and related: Added.} % \begin{macrocode} \@ifclassloaded{ujarticle}{\LWR@compileuplatex}{} \@ifclassloaded{ujbook}{\LWR@compileuplatex}{} \@ifclassloaded{ujreport}{\LWR@compileuplatex}{} +\@ifclassloaded{utarticle}{\LWR@compileuplatex}{} +\@ifclassloaded{utbook}{\LWR@compileuplatex}{} +\@ifclassloaded{utreport}{\LWR@compileuplatex}{} % \end{macrocode} % Only make the setting permanent if the original was empty: % \changes{v0.61}{2018/09/20}{Added \optn{PrintLatexCmd} option.} @@ -13751,7 +13787,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 */ @@ -16087,7 +16123,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 () @@ -20337,7 +20373,7 @@ end -- not --version % \changes{v0.38}{2017/08/21}{Added for \pkg{appendix}.} % % \begin{macrocode} -\def\@seccntformat#1{\csname the#1\endcsname\protect\quad} +\def\@seccntformat#1{\csname the#1\endcsname\quad} % \end{macrocode} % \end{macro} % @@ -20570,11 +20606,16 @@ end -- not --version \refstepcounter{#4}% % \end{macrocode} % Add main matter numbered \TOC\ entry with the \TOC\ name or the regular name: +% \changes{v0.64}{2018/12/07}{Support for \pkg{ujarticle and related.}} % \begin{macrocode} \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% @@ -20608,7 +20649,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}% {}% @@ -20621,9 +20662,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}}}% @@ -20696,6 +20736,53 @@ end -- not --version % \end{macro} +% \subsection{Pre- and post- sectioning names} + +% \begin{macro}{\prepartname} +% \begin{macro}{\postpartname} +% +% Usually null, but is used by \pkg{uj*} and \pkg{ut*} Japanese classes. +% \begin{macrocode} +\providecommand*{\prepartname}{} +\providecommand*{\postpartname}{} +% \end{macrocode} +% \end{macro} +% \end{macro} + +% \begin{macro}{\prechaptername} +% \begin{macro}{\postchaptername} +% +% Usually null, but is used by \pkg{uj*} and \pkg{ut*} Japanese classes. +% \begin{macrocode} +\providecommand*{\prechaptername}{} +\providecommand*{\postchaptername}{} +% \end{macrocode} +% \end{macro} +% \end{macro} + +% \begin{macro}{\presectionname} +% \begin{macro}{\postsectionname} +% +% Always null, but provided here for algorithmic simplicity in \cs{LWR@section}. +% \begin{macrocode} +\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 +% \end{macrocode} +% \end{macro} +% \end{macro} + % \subsection{\cs{section} and friends} @@ -20874,15 +20961,20 @@ end -- not --version % section name. % \changes{v0.52}{2018/04/01}{Fix: \cs{FileDepth} with non-utf8 encoding.} % \changes{v0.62}{2018/11/02}{Refactored.} +% \changes{v0.64}{2018/12/07}{Added \pkg{utarticle} and related.} % \begin{macrocode} \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% % \end{macrocode} % \end{macro} @@ -21169,9 +21261,9 @@ end -- not --version % \begin{macrocode} \overfullrule=0pt % \end{macrocode} -% Reduce chance of line overflow in verbatim environments: +% Reduce chance of line overflow when \HTML\ tags are added: % \begin{macrocode} -\LWR@print@scriptsize% +\LWR@print@footnotesize% % \end{macrocode} % In \PDF\ output, don't allow line breaks to interfere with \HTML\ tags: % \begin{macrocode} @@ -32981,8 +33073,9 @@ width:\LWR@printlength{\LWR@tempwidth}% % \begin{macro}{\quad} % Handles special minipage \& horizontal space interactions. +% \changes{v0.64}{2018/12/08}{Made robust.} % \begin{macrocode} -\renewcommand*{\quad}{% +\renewrobustcmd*{\quad}{% \LWR@minipagestoppars% \HTMLunicode{2001}% \LWR@minipagestartpars% @@ -32992,15 +33085,17 @@ width:\LWR@printlength{\LWR@tempwidth}% % \begin{macro}{\qquad} % Handles special minipage \& horizontal space interactions. +% \changes{v0.64}{2018/12/08}{Made robust.} % \begin{macrocode} -\renewcommand*{\qquad}{\quad\quad} +\renewrobustcmd*{\qquad}{\quad\quad} % \end{macrocode} % \end{macro} % \begin{macro}{\enskip} % Handles special minipage \& horizontal space interactions. +% \changes{v0.64}{2018/12/08}{Made robust.} % \begin{macrocode} -\renewcommand*{\enskip}{% +\renewrobustcmd*{\enskip}{% \LWR@minipagestoppars% \HTMLunicode{2000}% \LWR@minipagestartpars% @@ -33687,6 +33782,66 @@ width:\LWR@printlength{\LWR@tempwidth}% % \end{macrocode} +% \section{\pkg{ut*} classes} +% +% Load patches to \pkg{uj*} and \pkg{ut*} classes. +% +% \changes{v0.64}{2018/12/07}{\pkg{ujarticle} and related: Improved \cs{today}.} +% \changes{v0.64}{2018/12/07}{Added \pkg{utarticle} and related.} +% +% \codehtml +% \begin{macrocode} +\begin{warpHTML} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\LWR@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{macrocode} +% +% \begin{macrocode} +\end{warpHTML} +% \end{macrocode} + + % ^^A *ctex % \section{C\TeX patch} % @@ -34367,18 +34522,22 @@ width:\LWR@printlength{\LWR@tempwidth}% % \pkg{addlines} is emulated. % % \changes{v0.39}{2017/08/27}{\pkg{addlines}: Added.} +% \changes{v0.64}{2018/12/06}{\pkg{addlines}: Updated to v0.3.} % % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackageDrop{addlines} +\LWR@ProvidesPackageDrop{addlines}[2018/12/05] % \end{macrocode} % % \begin{macrocode} -\newcommand*\addlines[1][1]{} +\newcommand\addlines{\@ifstar\addlines@a\addlines@a} +\newcommand\addlines@a[1][1]{} \let\addline\addlines -\newcommand*\removelines[1][1]{} +\newcommand\removelines{\@ifstar\removelines@a\removelines@a} +\newcommand\removelines@a[1][1]{} \let\removeline\removelines +\newcommand\squeezepage[1][0]{} % \end{macrocode} % % \iffalse @@ -35445,7 +35604,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % \begin{macrocode} \newcommand{\simplechapter}[1][\@empty]{% \def\@chapcntformat##1{% - #1~\csname the##1\endcsname\simplechapterdelim\protect\quad% + #1~\csname the##1\endcsname\simplechapterdelim\quad% }% } @@ -36239,6 +36398,56 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % % % +% +% +% \iffalse +%<*biblatex> +% \fi +% +% \part{lwarp-biblatex.sty} +% +% \section{biblatex} +% +% \credits{Philipp Lehman} +% +% \DescribePackage{biblatex} +% When \pkg{biblatex} is used, modifications from \pkg{newfloat} may have to +% be undone. +% +% \changes{v0.64}{2018/12/08}{\pkg{biblatex}: Added patch for C\TeX.} +% +% \codehtml +% +% \begin{enumerate} +% \item \pkg{lwarp} uses \pkg{newfloat}. +% \item For classes with chapters which \pkg{newfloat} does not know about, +% such as C\TeX-related classes, \pkg{newfloat} may modify +% \cs{addtocontents}. +% \item \pkg{biblatex}, though, wants to patch \cs{addtocontents}, +% which causes an error if \cs{addtocontents} has been changed. +% \item Therefore, \cs{addtocontents} is restored to its original here, +% since \pkg{biblatex} is about to be loaded. +% \item This means that the \pkg{newfloat}'s \optn{chapterlistsgaps} +% option may no longer work. +% \end{enumerate} +% +% \begin{macrocode} +\ifdef{\newfloat@addtocontents@ORI}{ + \let\addtocontents\newfloat@addtocontents@ORI +}{} +% \end{macrocode} +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{biblatex} +% \end{macrocode} +% +% +% \iffalse +%</biblatex> +% \fi +% +% +% % \iffalse %<*bibunits> % \fi @@ -36872,6 +37081,32 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % % % \iffalse +%<*bsheaders> +% \fi +% +% \part{lwarp-bsheaders.sty} +% +% \section{bsheaders} +% +% \DescribePackage{bsheaders} +% \pkg{bsheaders} is ignored. +% +% \changes{v0.64}{2018/12/07}{\pkg{bsheaders}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{bsheaders}[1997/10/06] +% \end{macrocode} +% +% \iffalse +%</bsheaders> +% \fi +% +% +% +% +% \iffalse %<*bxpapersize> % \fi % @@ -43511,6 +43746,30 @@ solid \LWR@origpound\LWR@tempcolor ; % % % % +% \iffalse +%<*gmeometric> +% \fi +% +% \part{lwarp-gmeometric.sty} +% +% \section{gmeometric} +% +% \DescribePackage{gmeometric} +% \pkg{gmeometric} is ignored. +% +% \changes{v0.64}{2018/12/07}{\pkg{gmeometric}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{gmeometric} +% \end{macrocode} +% +% \iffalse +%</gmeometric> +% \fi +% +% % % % \iffalse @@ -47258,6 +47517,41 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % % % +% +% +% +% \iffalse +%<*marginal> +% \fi +% +% \part{lwarp-marginal.sty} +% +% \section{marginal} +% +% \DescribePackage{marginal} +% \pkg{marginal} is emulated. +% +% \changes{v0.64}{2018/127/07}{\pkg{marginal}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{marginal} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\showlostmarginals}{} +\newcommand*{\enlargefreelist}{} +\newcommand*{\onesidemarginals}{} +% \end{macrocode} +% +% \iffalse +%</marginal> +% \fi +% +% +% +% % \iffalse %<*marginfit> % \fi @@ -51882,6 +52176,34 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% +% \iffalse +%<*rmpage> +% \fi +% +% \part{lwarp-rmpage.sty} +% +% \section{rmpage} +% +% \DescribePackage{rmpage} +% \pkg{rmpage} is ignored. +% +% \changes{v0.64}{2018/12/07}{\pkg{rmpage}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{rmpage} +% \end{macrocode} +% +% \iffalse +%</rmpage> +% \fi +% +% +% +% +% % \iffalse %<*romanbar> % \fi @@ -52476,7 +52798,17 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \DeclareDocumentCommand{\automark}{s o m}{} \DeclareDocumentCommand{\manualmark}{}{} \DeclareDocumentCommand{\MakeMarkcase}{m}{#1} -\DeclareDocumentCommand{\GenericMarkFormat}{}{} +% \end{macrocode} +% \changes{v0.64}{2018/12/07}{\pkg{scrlayer}: Fixes.} +% \begin{macrocode} +\newcommand{\partmarkformat}{} +\if@chapter +\newcommand{\chaptermarkformat}{} +\fi +\newcommand{\sectionmarkformat}{} +\DeclareDocumentCommand{\GenericMarkFormat}{m}{} +% \end{macrocode} +% \begin{macrocode} \newcommand*{\@mkleft}[1]{} \newcommand*{\@mkright}[1]{} \newcommand*{\@mkdouble}[1]{} @@ -52578,17 +52910,22 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \NewDocumentCommand{\ofoot}{s o m}{} \NewDocumentCommand{\cfoot}{s o m}{} \NewDocumentCommand{\ifoot}{s o m}{} -\DeclareDocumentCommand{\automark}{s o m}{} -\DeclareDocumentCommand{\manualmark}{}{} \DeclareDocumentCommand{\MakeMarkcase}{m}{#1} -\DeclareDocumentCommand{\GenericMarkFormat}{}{} \newcommand*{\defpairofpagestyles}[3][]{} \newcommand*{\newpairofpagestyles}[3][]{} \newcommand*{\renewpairofpagestyles}[3][]{} \newcommand*{\providepairofpagestyles}[3][]{} -\newcommand*{\clearmainofpairofpagestyles} -\newcommand*{\clearplainofpairofpagestyles} -\newcommand*{\clearpairofpagestyles} +% \end{macrocode} +% \changes{v0.64}{2018/12/07}{\pkg{scrlayer-scrpage}: Fixes.} +% \begin{macrocode} +\newcommand*{\clearmainofpairofpagestyles}{} +\newcommand*{\clearplainofpairofpagestyles}{} +\newcommand*{\clearpairofpagestyles}{} +\newcommand*{\clearscrheadings}{} +\newcommand*{\clearscrheadfoot}{} +\newcommand*{\clearscrplain}{} +% \end{macrocode} +% \begin{macrocode} \NewDocumentCommand{\deftriplepagestyle}{m o o m m m m m m}{} \NewDocumentCommand{\newtriplepagestyle}{m o o m m m m m m}{} \NewDocumentCommand{\renewtriplepagestyle}{m o o m m m m m m}{} @@ -52607,6 +52944,79 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % \iffalse +%<*scrpage2> +% \fi +% +% \part{lwarp-scrpage2.sty} +% +% \section{scrpage2} +% +% \credits{Markus Kohm} +% +% \DescribePackage{scrpage2} +% \pkg{scrpage2} is emulated. +% +% \testthis +% +% \changes{v0.64}{2018/12/07}{\pkg{scrpage2}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{scrpage2} +% \end{macrocode} +% +% \begin{macrocode} +\@ifundefined{footheight}{\newlength\footheight}{} +\NewDocumentCommand{\lehead}{o m}{} +\NewDocumentCommand{\cehead}{o m}{} +\NewDocumentCommand{\rehead}{o m}{} +\NewDocumentCommand{\lohead}{o m}{} +\NewDocumentCommand{\cohead}{o m}{} +\NewDocumentCommand{\rohead}{o m}{} +\NewDocumentCommand{\lefoot}{o m}{} +\NewDocumentCommand{\cefoot}{o m}{} +\NewDocumentCommand{\refoot}{o m}{} +\NewDocumentCommand{\lofoot}{o m}{} +\NewDocumentCommand{\cofoot}{o m}{} +\NewDocumentCommand{\rofoot}{o m}{} +\NewDocumentCommand{\ohead}{o m}{} +\NewDocumentCommand{\chead}{o m}{} +\NewDocumentCommand{\ihead}{o m}{} +\NewDocumentCommand{\ofoot}{o m}{} +\NewDocumentCommand{\cfoot}{o m}{} +\NewDocumentCommand{\ifoot}{o m}{} +\DeclareDocumentCommand{\automark}{o m}{} +\DeclareDocumentCommand{\manualmark}{}{} +\DeclareDocumentCommand{\MakeMarkcase}{m}{#1} +\NewDocumentCommand{\deftripstyle}{m o o m m m m m m}{} +\NewDocumentCommand{\defpagestyle}{s m m m}{} +\NewDocumentCommand{\newpagestyle}{s m m m}{} +\NewDocumentCommand{\renewpagestyle}{s m m m}{} +\NewDocumentCommand{\providepagestyle}{s m m m}{} +\newcommand{\partmarkformat}{} +\if@chapter +\newcommand{\chaptermarkformat}{} +\fi +\newcommand{\sectionmarkformat}{} +\newcommand{\subsectionmarkformat}{} +\newcommand{\subsubsectionmarkformat}{} +\newcommand{\paragraphmarkformat}{} +\newcommand{\subparagraphmarkformat}{} + +\newcommand*{\clearscrheadings}{} +\newcommand*{\clearscrheadfoot}{} +\newcommand*{\clearscrplain}{} +% \end{macrocode} +% +% \iffalse +%</scrpage2> +% \fi +% +% +% +% +% \iffalse %<*section> % \fi % @@ -56467,7 +56877,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \begin{macrocode} \DeclareDocumentCommand{\simplechapter}{O{\@empty}}{% \def\@chapcntformat##1{% - #1~\csname the##1\endcsname\simplechapterdelim\protect\quad% + #1~\csname the##1\endcsname\simplechapterdelim\quad% }% } diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins index 6b3ded54a78..39873a0254b 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins @@ -65,6 +65,7 @@ version 2005/12/01 or later. \file{lwarp-axodraw2.sty}{\from{lwarp.dtx}{axodraw2}} \file{lwarp-backref.sty}{\from{lwarp.dtx}{backref}} \file{lwarp-balance.sty}{\from{lwarp.dtx}{balance}} +\file{lwarp-biblatex.sty}{\from{lwarp.dtx}{biblatex}} \file{lwarp-bibunits.sty}{\from{lwarp.dtx}{bibunits}} \file{lwarp-bigdelim.sty}{\from{lwarp.dtx}{bigdelim}} \file{lwarp-bigstrut.sty}{\from{lwarp.dtx}{bigstrut}} @@ -77,6 +78,7 @@ version 2005/12/01 or later. \file{lwarp-boxedminipage2e.sty}{\from{lwarp.dtx}{boxedminipage2e}} \file{lwarp-breakurl.sty}{\from{lwarp.dtx}{breakurl}} \file{lwarp-breqn.sty}{\from{lwarp.dtx}{breqn}} +\file{lwarp-bsheaders.sty}{\from{lwarp.dtx}{bsheaders}} \file{lwarp-bxpapersize.sty}{\from{lwarp.dtx}{bxpapersize}} \file{lwarp-bytefield.sty}{\from{lwarp.dtx}{bytefield}} \file{lwarp-cancel.sty}{\from{lwarp.dtx}{cancel}} @@ -168,6 +170,7 @@ version 2005/12/01 or later. \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-gmeometric.sty}{\from{lwarp.dtx}{gmeometric}} \file{lwarp-graphicx.sty}{\from{lwarp.dtx}{graphicx}} \file{lwarp-graphics.sty}{\from{lwarp.dtx}{graphics}} \file{lwarp-grffile.sty}{\from{lwarp.dtx}{grffile}} @@ -209,6 +212,7 @@ version 2005/12/01 or later. \file{lwarp-luatodonotes.sty}{\from{lwarp.dtx}{luatodonotes}} \file{lwarp-magaz.sty}{\from{lwarp.dtx}{magaz}} \file{lwarp-makeidx.sty}{\from{lwarp.dtx}{makeidx}} +\file{lwarp-marginal.sty}{\from{lwarp.dtx}{marginal}} \file{lwarp-marginfit.sty}{\from{lwarp.dtx}{marginfit}} \file{lwarp-marginfix.sty}{\from{lwarp.dtx}{marginfix}} \file{lwarp-marginnote.sty}{\from{lwarp.dtx}{marginnote}} @@ -277,6 +281,7 @@ version 2005/12/01 or later. \file{lwarp-relsize.sty}{\from{lwarp.dtx}{relsize}} \file{lwarp-repeatindex.sty}{\from{lwarp.dtx}{repeatindex}} \file{lwarp-resizegather.sty}{\from{lwarp.dtx}{resizegather}} +\file{lwarp-rmpage.sty}{\from{lwarp.dtx}{rmpage}} \file{lwarp-romanbar.sty}{\from{lwarp.dtx}{romanbar}} \file{lwarp-romanbarpagenumber.sty}{\from{lwarp.dtx}{romanbarpagenumber}} \file{lwarp-rotating.sty}{\from{lwarp.dtx}{rotating}} @@ -290,6 +295,7 @@ version 2005/12/01 or later. \file{lwarp-scrlayer.sty}{\from{lwarp.dtx}{scrlayer}} \file{lwarp-scrlayer-notecolumn.sty}{\from{lwarp.dtx}{scrlayer-notecolumn}} \file{lwarp-scrlayer-scrpage.sty}{\from{lwarp.dtx}{scrlayer-scrpage}} +\file{lwarp-scrpage2.sty}{\from{lwarp.dtx}{scrpage2}} \file{lwarp-section.sty}{\from{lwarp.dtx}{section}} \file{lwarp-sectionbreak.sty}{\from{lwarp.dtx}{sectionbreak}} \file{lwarp-sectsty.sty}{\from{lwarp.dtx}{sectsty}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty index 5d9a249d838..c053eefa08c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty @@ -15,11 +15,14 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{addlines} -\newcommand*\addlines[1][1]{} +\LWR@ProvidesPackageDrop{addlines}[2018/12/05] +\newcommand\addlines{\@ifstar\addlines@a\addlines@a} +\newcommand\addlines@a[1][1]{} \let\addline\addlines -\newcommand*\removelines[1][1]{} +\newcommand\removelines{\@ifstar\removelines@a\removelines@a} +\newcommand\removelines@a[1][1]{} \let\removeline\removelines +\newcommand\squeezepage[1][0]{} \endinput %% %% End of file `lwarp-addlines.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty index 32f32476404..b286738419d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty @@ -18,7 +18,7 @@ \LWR@ProvidesPackageDrop{anonchap} \newcommand{\simplechapter}[1][\@empty]{% \def\@chapcntformat##1{% - #1~\csname the##1\endcsname\simplechapterdelim\protect\quad% + #1~\csname the##1\endcsname\simplechapterdelim\quad% }% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty new file mode 100644 index 00000000000..2195151c4d7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-biblatex.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `biblatex') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\ifdef{\newfloat@addtocontents@ORI}{ + \let\addtocontents\newfloat@addtocontents@ORI +}{} +\LWR@ProvidesPackagePass{biblatex} +\endinput +%% +%% End of file `lwarp-biblatex.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bsheaders.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bsheaders.sty new file mode 100644 index 00000000000..975f27f81e8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bsheaders.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-bsheaders.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `bsheaders') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{bsheaders}[1997/10/06] +\endinput +%% +%% End of file `lwarp-bsheaders.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty new file mode 100644 index 00000000000..a12491c0900 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-gmeometric.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `gmeometric') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{gmeometric} +\endinput +%% +%% End of file `lwarp-gmeometric.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginal.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginal.sty new file mode 100644 index 00000000000..2ca7a484b01 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginal.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-marginal.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `marginal') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{marginal} +\newcommand*{\showlostmarginals}{} +\newcommand*{\enlargefreelist}{} +\newcommand*{\onesidemarginals}{} +\endinput +%% +%% End of file `lwarp-marginal.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty new file mode 100644 index 00000000000..0c510086198 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-rmpage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `rmpage') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{rmpage} +\endinput +%% +%% End of file `lwarp-rmpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty index 0d8a6abd786..da728c6b0e1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty @@ -35,17 +35,17 @@ \NewDocumentCommand{\ofoot}{s o m}{} \NewDocumentCommand{\cfoot}{s o m}{} \NewDocumentCommand{\ifoot}{s o m}{} -\DeclareDocumentCommand{\automark}{s o m}{} -\DeclareDocumentCommand{\manualmark}{}{} \DeclareDocumentCommand{\MakeMarkcase}{m}{#1} -\DeclareDocumentCommand{\GenericMarkFormat}{}{} \newcommand*{\defpairofpagestyles}[3][]{} \newcommand*{\newpairofpagestyles}[3][]{} \newcommand*{\renewpairofpagestyles}[3][]{} \newcommand*{\providepairofpagestyles}[3][]{} -\newcommand*{\clearmainofpairofpagestyles} -\newcommand*{\clearplainofpairofpagestyles} -\newcommand*{\clearpairofpagestyles} +\newcommand*{\clearmainofpairofpagestyles}{} +\newcommand*{\clearplainofpairofpagestyles}{} +\newcommand*{\clearpairofpagestyles}{} +\newcommand*{\clearscrheadings}{} +\newcommand*{\clearscrheadfoot}{} +\newcommand*{\clearscrplain}{} \NewDocumentCommand{\deftriplepagestyle}{m o o m m m m m m}{} \NewDocumentCommand{\newtriplepagestyle}{m o o m m m m m m}{} \NewDocumentCommand{\renewtriplepagestyle}{m o o m m m m m m}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty index ca9546729f3..90ceb7be7e9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty @@ -71,7 +71,12 @@ \DeclareDocumentCommand{\automark}{s o m}{} \DeclareDocumentCommand{\manualmark}{}{} \DeclareDocumentCommand{\MakeMarkcase}{m}{#1} -\DeclareDocumentCommand{\GenericMarkFormat}{}{} +\newcommand{\partmarkformat}{} +\if@chapter +\newcommand{\chaptermarkformat}{} +\fi +\newcommand{\sectionmarkformat}{} +\DeclareDocumentCommand{\GenericMarkFormat}{m}{} \newcommand*{\@mkleft}[1]{} \newcommand*{\@mkright}[1]{} \newcommand*{\@mkdouble}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty new file mode 100644 index 00000000000..12a5c2b3f5a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty @@ -0,0 +1,61 @@ +%% +%% This is file `lwarp-scrpage2.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `scrpage2') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{scrpage2} +\@ifundefined{footheight}{\newlength\footheight}{} +\NewDocumentCommand{\lehead}{o m}{} +\NewDocumentCommand{\cehead}{o m}{} +\NewDocumentCommand{\rehead}{o m}{} +\NewDocumentCommand{\lohead}{o m}{} +\NewDocumentCommand{\cohead}{o m}{} +\NewDocumentCommand{\rohead}{o m}{} +\NewDocumentCommand{\lefoot}{o m}{} +\NewDocumentCommand{\cefoot}{o m}{} +\NewDocumentCommand{\refoot}{o m}{} +\NewDocumentCommand{\lofoot}{o m}{} +\NewDocumentCommand{\cofoot}{o m}{} +\NewDocumentCommand{\rofoot}{o m}{} +\NewDocumentCommand{\ohead}{o m}{} +\NewDocumentCommand{\chead}{o m}{} +\NewDocumentCommand{\ihead}{o m}{} +\NewDocumentCommand{\ofoot}{o m}{} +\NewDocumentCommand{\cfoot}{o m}{} +\NewDocumentCommand{\ifoot}{o m}{} +\DeclareDocumentCommand{\automark}{o m}{} +\DeclareDocumentCommand{\manualmark}{}{} +\DeclareDocumentCommand{\MakeMarkcase}{m}{#1} +\NewDocumentCommand{\deftripstyle}{m o o m m m m m m}{} +\NewDocumentCommand{\defpagestyle}{s m m m}{} +\NewDocumentCommand{\newpagestyle}{s m m m}{} +\NewDocumentCommand{\renewpagestyle}{s m m m}{} +\NewDocumentCommand{\providepagestyle}{s m m m}{} +\newcommand{\partmarkformat}{} +\if@chapter +\newcommand{\chaptermarkformat}{} +\fi +\newcommand{\sectionmarkformat}{} +\newcommand{\subsectionmarkformat}{} +\newcommand{\subsubsectionmarkformat}{} +\newcommand{\paragraphmarkformat}{} +\newcommand{\subparagraphmarkformat}{} + +\newcommand*{\clearscrheadings}{} +\newcommand*{\clearscrheadfoot}{} +\newcommand*{\clearscrplain}{} +\endinput +%% +%% End of file `lwarp-scrpage2.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty index e7ded808202..6708e2e6a6a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty @@ -51,7 +51,7 @@ }{} \DeclareDocumentCommand{\simplechapter}{O{\@empty}}{% \def\@chapcntformat##1{% - #1~\csname the##1\endcsname\simplechapterdelim\protect\quad% + #1~\csname the##1\endcsname\simplechapterdelim\quad% }% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 0ad1c8aa5b0..919e949e4af 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2018/12/03 v0.63 Allows LaTeX to directly produce HTML5 output.] + [2018/12/08 v0.64 Allows LaTeX to directly produce HTML5 output.] @@ -129,9 +129,6 @@ or is superceded by another class. For a possible alternative, see class(es) #2.} }{}% } -\LWR@earlyclassloadnever{utarticle}{ujarticle} -\LWR@earlyclassloadnever{utbook}{ujbook} -\LWR@earlyclassloadnever{utreport}{ujreport} \LWR@earlyloadnever{ae}{cm-super, lmodern} \LWR@earlyloadnever{aecompl}{cm-super, lmodern} \LWR@earlyloadnever{aecc}{cm-super, lmodern} @@ -141,7 +138,7 @@ For a possible alternative, see class(es) #2.} \LWR@earlyloadnever{CJK}{ctex, xeCJK} \LWR@earlyloadnever{CJKutf8}{ctex, xeCJK} } -\LWR@earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle} +\LWR@earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle, utarticle} \LWR@earlyloadnever{hangul}{kotex, xetexko, luatexko} \LWR@earlyloadnever{fancyheadings}{fancyhdr} \LWR@earlyloadnever{glossary}{glossaries} @@ -192,6 +189,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{breakurl} \LWR@loadafter{breqn} +\LWR@loadafter{bsheaders} \LWR@loadafter{bxpapersize} \LWR@loadafter{bytefield} \LWR@loadafter{cancel} @@ -280,6 +278,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{fullwidth} \LWR@loadafter{fwlw} \LWR@notbxjsloadafter{geometry} +\LWR@loadafter{gmeometric} \LWR@loadafter{glossaries} \LWR@loadafter{glossary} \LWR@loadafter{grffile} @@ -389,6 +388,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{relsize} \LWR@loadafter{repeatindex} \LWR@loadafter{resizegather} +\LWR@loadafter{rmpage} \LWR@loadafter{romanbar} \LWR@loadafter{romanbarpagenumber} \LWR@loadafter{rotating} @@ -401,6 +401,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{scrlayer} \LWR@loadafter{scrlayer-notecolumn} \LWR@loadafter{scrlayer-scrpage} +\LWR@loadafter{scrpage2} \LWR@loadafter{section} \LWR@loadafter{sectionbreak} \LWR@loadafter{sectsty} @@ -468,7 +469,6 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{vpe} \LWR@loadafter{vwcol} \LWR@loadafter{wallpaper} -\LWR@loadafter{wasysym} \LWR@loadafter{watermark} \LWR@loadafter{widows-and-orphans} \LWR@loadafter{wrapfig} @@ -900,11 +900,16 @@ For a possible alternative, see class(es) #2.} \newcommand*{\LWR@checkloadfilename}[1]{% \LWR@checkloadnever{#1}{ae}{latinmodern} \LWR@checkloadnever{#1}{aecc}{latinmodern} +\LWR@checkloadnever{#1}{bitfield}{bytefield} \LWR@checkloadnever{#1}{boxedminipage}{boxedminipage2e} \LWR@checkloadnever{#1}{caption2}{caption} \LWR@checkloadnever{#1}{ccaption}{caption} +\LWR@checkloadnever{#1}{doublespace}{setspace} \LWR@checkloadnever{#1}{fancyheadings}{fancyhdr} \LWR@checkloadnever{#1}{glossary}{glossaries} +\LWR@checkloadnever{#1}{newthm}{ntheorem} +\LWR@checkloadnever{#1}{rplain}{fancyhdr} +\LWR@checkloadnever{#1}{si}{siunitx} \LWR@checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx} \LWR@checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol} \LWR@checkloadbefore{#1}{ctex} @@ -1576,6 +1581,9 @@ For a possible alternative, see class(es) #2.} \@ifclassloaded{ujarticle}{\LWR@compileuplatex}{} \@ifclassloaded{ujbook}{\LWR@compileuplatex}{} \@ifclassloaded{ujreport}{\LWR@compileuplatex}{} +\@ifclassloaded{utarticle}{\LWR@compileuplatex}{} +\@ifclassloaded{utbook}{\LWR@compileuplatex}{} +\@ifclassloaded{utreport}{\LWR@compileuplatex}{} \ifdefempty{\LWR@PrintLatexCmd}{ \def\LWR@PrintLatexCmd{\LWR@tempprintlatexcmd} }{} @@ -1672,7 +1680,7 @@ body { p {margin: 1.5ex 0em 1.5ex 0em ;} table p {margin: .5ex 0em .5ex 0em ;} -/* Holds a section number to add space between it and the name */ +/* Holds a section number */ span.sectionnumber { margin-right: 0em } /* Inserted in front of index lines */ @@ -3639,7 +3647,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- -- Copyright 2016-2018 Brian Dunn -printversion = "v0.63" +printversion = "v0.64" requiredconfversion = "1" -- also at *lwarpmk.conf function printhelp () @@ -5825,7 +5833,7 @@ end -- not --version } \newcounter{LWR@prevFileDepth} \setcounter{LWR@prevFileDepth}{\LWR@depthsubparagraph} -\def\@seccntformat#1{\csname the#1\endcsname\protect\quad} +\def\@seccntformat#1{\csname the#1\endcsname\quad} \newcommand*{\simplechapterdelim}{} \let\@chapcntformat\@seccntformat \let\@partcntformat\@seccntformat @@ -5919,7 +5927,11 @@ end -- not --version \LWR@traceinfo{LWR@section: about to addcontentsline}% \addcontentsline{toc}{#4}% {% - \protect\numberline{\@nameuse{the#4}}% + \protect\numberline{% + \@nameuse{pre#4name}% + \@nameuse{the#4}% + \@nameuse{post#4name}% + }% {% \ignorespaces% \IfValueTF{#2}{\LWR@isolate{#2}}{\LWR@isolate{#3}}\protect\relax% @@ -5944,7 +5956,7 @@ end -- not --version \ifthenelse{% \(\cnttest{\@nameuse{LWR@depth#4}}{<=}% {\value{secnumdepth}}\) \AND% - \(\cnttest{\@nameuse{LWR@depth#4}}{<=}{\LWR@depthpart}\)% + \(\cnttest{\@nameuse{LWR@depth#4}}{=}{\LWR@depthpart}\)% }% {\@partnameformat}% {}% @@ -5954,9 +5966,8 @@ end -- not --version }% {% \ifstrequal{#4}{part}% + {\protect\LWR@sectionnumber{\@partcntformat{#4}}}% {% - \protect\LWR@sectionnumber{\@partcntformat{#4}}% - }{% \ifstrequal{#4}{chapter}% {\protect\LWR@sectionnumber{\@chapcntformat{#4}}}% {\protect\LWR@sectionnumber{\@seccntformat{#4}}}% @@ -5995,6 +6006,28 @@ end -- not --version } +\providecommand*{\prepartname}{} +\providecommand*{\postpartname}{} + +\providecommand*{\prechaptername}{} +\providecommand*{\postchaptername}{} + +\providecommand*{\presectionname}{} +\let\postsectionname\presectionname + +\let\presubsectionname\presectionname +\let\postsubsectionname\postsectionname + +\let\presubsubsectionname\presectionname +\let\postsubsubsectionname\postsectionname + +\let\preparagraphname\presectionname +\let\postparagraphname\postsectionname + +\let\presubparagraphname\presectionname +\let\postsubparagraphname\postsectionname + + \newcommand{\part@preamble}{}% for koma-script \DeclareDocumentCommand{\part}{s o m}{% @@ -6095,13 +6128,17 @@ end -- not --version } \ifPDFTeX% pdflatex or dvi latex -\ifdefstring{\inputencodingname}{utf8}{% - \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash -}{% - \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen -}% + \ifdefstring{\inputencodingname}{utf8}{% + \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash + }{% + \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen + }% \else% - \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash + \ifpTeX + \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen + \else + \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash + \fi% \fi% \newcommand*{\HTMLTitleBeforeSection}{% @@ -6223,7 +6260,7 @@ end -- not --version \LWR@origonecolumn% \LWR@origpagestyle{empty}% \overfullrule=0pt -\LWR@print@scriptsize% +\LWR@print@footnotesize% \LWR@print@raggedright% \LetLtxMacro{\\}{\LWR@endofline}% \linespread{1.3}% @@ -11145,15 +11182,15 @@ width:\LWR@printlength{\LWR@tempwidth}% \ifbool{LWR@minipagethispar}{\LWR@stoppars}{}% } -\renewcommand*{\quad}{% +\renewrobustcmd*{\quad}{% \LWR@minipagestoppars% \HTMLunicode{2001}% \LWR@minipagestartpars% } -\renewcommand*{\qquad}{\quad\quad} +\renewrobustcmd*{\qquad}{\quad\quad} -\renewcommand*{\enskip}{% +\renewrobustcmd*{\enskip}{% \LWR@minipagestoppars% \HTMLunicode{2000}% \LWR@minipagestartpars% @@ -11430,6 +11467,49 @@ width:\LWR@printlength{\LWR@tempwidth}% \end{warpHTML} \begin{warpHTML} +\newcommand*{\LWR@patchujtclasses}{ + \let\tate\relax + \DeclareDocumentCommand{\rensuji}{m}{##1} + \def\@partnameformat{}% uj/t does not use \partname + \def\@partcntformat##1{% + \prepartname% + \csname the##1\endcsname% + \postpartname% + \quad% + } + \@ifundefined{chapter}{}{ + \def\@chapcntformat##1{% + \prechaptername% + \csname the##1\endcsname% + \postchaptername% + \quad% + } + } + \renewcommand{\thepart}{\@Roman\c@part} + \@ifundefined{chapter}{ + \renewcommand{\thesection}{\@arabic\c@section} + }{ + \renewcommand{\thechapter}{\@arabic\c@chapter} + \renewcommand{\thesection}{\thechapter.\@arabic\c@section} + } + \renewcommand{\thesubsection}{\thesection.\@arabic\c@subsection} + \renewcommand{\thesubsubsection}{% + \thesubsection.\@arabic\c@subsubsection} + \renewcommand{\theparagraph}{% + \thesubsubsection.\@arabic\c@paragraph} + \renewcommand{\thesubparagraph}{% + \theparagraph.\@arabic\c@subparagraph} +} + +\@ifclassloaded{ujarticle}{\LWR@patchujtclasses}{} +\@ifclassloaded{ujbook}{\LWR@patchujtclasses}{} +\@ifclassloaded{ujreport}{\LWR@patchujtclasses}{} +\@ifclassloaded{utarticle}{\LWR@patchujtclasses}{} +\@ifclassloaded{utbook}{\LWR@patchujtclasses}{} +\@ifclassloaded{utreport}{\LWR@patchujtclasses}{} +\end{warpHTML} + +\begin{warpHTML} \AtBeginDocument{ \@ifpackageloaded{ctexpatch}{% \def\@partcntformat#1{% |