diff options
author | Karl Berry <karl@freefriends.org> | 2018-12-22 21:54:16 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-12-22 21:54:16 +0000 |
commit | be95bc2cf6a3578a498f124d737244329dec915f (patch) | |
tree | 83de3ec924982d7c0dfde313d2739da16d460357 /Master/texmf-dist | |
parent | 21815a36ebddface42a990b639b4d9493666f756 (diff) |
lwarp (22dec18)
git-svn-id: svn://tug.org/texlive/trunk@49479 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
30 files changed, 2242 insertions, 601 deletions
diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index 15d4e9850a9..3a07e25a376 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.64 README.txt +LaTeX lwarp package v0.65 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 f9d614878f9..0f56931497c 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 88153f04a7a..aa7b01c66e9 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.64" +printversion = "v0.65" 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 2fca82da516..67e54f5c022 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/08 v0.64 Allows LaTeX to directly produce HTML5 output.] +%<package> [2018/12/22 v0.65 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -1522,7 +1522,7 @@ Do not use the \optn{scale} option, since it is not well supported by \HTML\ bro \cs{includegraphics} accepts \optn{width} and \optn{height}, \margintag{options} \optn{origin}, \optn{rotate} and \optn{scale}, -plus a new \optn{class} key. +plus new \optn{class} and \optn{alt} keys. With \HTML\ output, \cs{includegraphics} accepts an optional \margintag{\HTML\ class} @@ -1530,6 +1530,11 @@ With \HTML\ output, \cs{includegraphics} accepts an optional the \HTML\ output will include that class for the image. The class is ignored for print output. +Likewise, the \cs{includegraphics} \optn{alt} key adds an \HTML\ \attribute{alt} tag to +\margintag{\HTML\ \attribute{alt} tags} +an image, and is ignored for print output. If not assigned, each +image is given an \attribute{alt} tag of ``\optn{(image)}''. + \cs{rotatebox} accepts the optional \optn{origin} key. \margintag{\cs{rotatebox}} @@ -2562,7 +2567,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{27072} +% \CheckSum{27403} % % \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 @@ -2668,7 +2673,8 @@ 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} +% \changes{v0.64}{2018/12/08}{\ 2018/12/08} +% \changes{v0.65}{2018/12/22}{\ 2018/12/22} @@ -2868,6 +2874,39 @@ This boolean may be tested by the user for later use. % % \begin{description} % \needspace{2\baselineskip} +% \item[v0.65:] \CSS\ layout, \attribute{alt} tags, Japanese. PENDING +% \begin{itemize} +% \item Moved the side\TOC\ to the left side, +% \margintag{page layout} +% allowing improved \CSS\ for margin notes. +% \item Improved page layout \CSS. +% \item \pkg{graphicx} \cs{includegraphics}: Added the \optn{alt} key +% \margintag{image \attribute{alt} tags} +% to assign an \attribute{alt} tag to an image. Default is ``\optn{(image)}'', +% assigned to pass validation. +% \item Detects and causes an error +% \margintag{duplicate \HTML\ files} +% if duplicate \HTML\ file names are generated, +% caused by identical or similar sectioning names. +% \item Fix for \env{tabular*}. +% \margintag{fixes} +% \item Fix for tabular border colors. +% \item Fixes \cs{quad}, \cs{enskip}, and figure captions to pass validation. +% \item Added \pkg{ltj*} classes, +% \margintag{Japanese} +% \pkg{bounddvi}, \pkg{gentombow}, \pkg{lltjext}, \pkg{plarydshln}, +% \pkg{plext}, \pkg{plextarydshln}, +% \pkg{plextcolortbl}, \pkg{pxatbegshi}, +% \pkg{pxeveryshi}, \pkg{pxftnright}, \pkg{pxjahyper}, \pkg{tascmac}. +% \item Verified to work with \pkg{plarray}, \pkg{plautopatch}, +% \pkg{plextarray}, \pkg{plextdelarray}, \pkg{pxgentombow}, +% \pkg{plsiunitx}, \pkg{pxpdfpages}, \pkg{pxpgfrcs}, \pkg{pxpgfmark}. +% \item Added support for \pkg{fontspec} \cs{textsi} and \cs{sishape}. +% \margintag{packages} +% \item Added \pkg{multicol}'s \cs{docolaction}. +% \item Added \pkg{embrac}, \pkg{footnoterange}, \pkg{multicolrule}, \pkg{versonotes}. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.64:] Koma-Script, Japanese, Chinese. % \begin{itemize} % \item Added \pkg{utarticle} and related classes. @@ -4235,16 +4274,15 @@ This boolean may be tested by the user for later use. % % \midrule % -% Engines: & \DVI\ \LaTeX, pdf\LaTeX, \XeLaTeX, \LuaLaTeX, p\LaTeX, up\LaTeX \\ +% Engines: & \DVI\ \LaTeX, pdf\LaTeX, \XeLaTeX, \LuaLaTeX, up\LaTeX \\ % % Compiling: & \pkg{latexmk}, \pkg{perltex}, \pkg{pythontex}, \prog{make}, etc. \\ % % \midrule % % 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 related, -% \pkg{ujarticle} and related, \pkg{utarticle} and related. \\ +% \pkg{scrartcl}, \pkg{scrbook}, \pkg{scrreprt}, \pkg{memoir}, +% CJK-related as listed below. \\ % % Koma-script: & \pkg{scrextend}, \pkg{scrhack}, \pkg{scrlayer}. % Others as listed below. \\ @@ -4260,13 +4298,18 @@ This boolean may be tested by the user for later use. % \pkg{upzhkinsoku}, % \pkg{xpinyin}, \pkg{zhlineskip}, \pkg{zhspacing}. \\ % -% Japanese: & p\LaTeX, up\LaTeX, +% Japanese: & up\LaTeX, Lua\TeX-ja, \pkg{gentombow}, \pkg{lltjext}, +% \pkg{plarray}, \pkg{plarydshln}, \pkg{plautopatch}, +% \pkg{plext}, \pkg{plextarray}, \pkg{plextarydshln}, +% \pkg{plextcolortbl}, \pkg{plextdelarray}, \pkg{pxatbegshi}, +% \pkg{pxeveryshi}, \pkg{pxftnright}, \pkg{pxgentombow}, +% \pkg{pxjahyper}, \pkg{pxpdfpages}, \pkg{pxpgfrcs}, \pkg{pxpgfmark}, +% \pkg{tascmac}, \pkg{zxjatype}. % \pkg{bxjsarticle} and related, % \pkg{ltjsarticle} and related, % \pkg{luatexja}, \pkg{luatexja-fontspec}, % \pkg{ujarticle} and related, -% \pkg{utarticle} and related, -% \pkg{zxjatype}. \\ +% \pkg{utarticle} and related. \\ % % Korean: & \pkg{kotex}, \pkg{luatexko}, \pkg{xetexko}. \\ % @@ -4274,7 +4317,7 @@ 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{blowup}, \pkg{booklet}, \pkg{bophook}, \pkg{bounddvi}, \pkg{bxpapersize}, % \pkg{canoniclayout}, % \pkg{changepage}, \pkg{chngpage}, \pkg{clrdblpg}, % \pkg{continue}, \pkg{draftcopy}, \pkg{draftfigure}, \pkg{draftwatermark}, @@ -4333,14 +4376,17 @@ This boolean may be tested by the user for later use. % % \midrule % -% Margin notes: & \pkg{marginal}, \pkg{marginfit}, \pkg{marginfix}, \pkg{scrlayer-notecolumn}. \\ +% Margin notes: & \pkg{marginal}, \pkg{marginfit}, \pkg{marginfix}, +% \pkg{scrlayer-notecolumn}, \pkg{versonotes}. \\ % % Footnotes: & Adds \progcode{FootnoteDepth} to print footnotes at section breaks. % \pkg{dblfnote}, % \pkg{endheads}, \pkg{endnotes}, \pkg{fnbreak}, \pkg{fnpos}, -% \pkg{footmisc}, \pkg{footnote}, \pkg{footnpag}, +% \pkg{footmisc}, \pkg{footnote}, \pkg{footnoterange}, \pkg{footnpag}, % \pkg{marginnote}, \pkg{nccfoots}, \pkg{pagenote}, -% \pkg{parnotes}, \pkg{pfnote}, \pkg{sidenote}. \\ +% \pkg{parnotes}, \pkg{pfnote}, \pkg{sidenote}. +% +% Tested to work as-is: \pkg{fixfoot}. \\ % % \midrule % @@ -4409,9 +4455,6 @@ This boolean may be tested by the user for later use. % Tested to work as-is: % \pkg{eepic}, \pkg{tikz-3dplot}. \\ % -% -% -% % \midrule % % \pkg{xcolor}: & \textcolor{DarkGreen}{Full package color names}, any color models, @@ -4442,7 +4485,7 @@ This boolean may be tested by the user for later use. % Frames: & \pkg{boxedminipage2e}, \pkg{fancybox}, \pkg{framed}, \pkg{mdframed}, % \pkg{shadow}, \pkg{vertbars}. \\ % -% Multi-columns: & \pkg{adjmulticol}, \pkg{multicol}, \pkg{vwcol}. \\ +% Multi-columns: & \pkg{adjmulticol}, \pkg{multicol}, \pkg{multicolrule}, \pkg{vwcol}. \\ % % Margins: & \pkg{fullwidth}, \pkg{hanging}, \pkg{midpage}. \\ % @@ -4453,7 +4496,8 @@ This boolean may be tested by the user for later use. % Direct formatting: & \cs{emph}, \cs{textsuperscript}, % \cs{textbf}, etc are supported. % \cs{bfseries}, etc.\ are only supported in some cases. -% \pkg{cancel}, \pkg{ellipsis}, \pkg{hyphenat}, \pkg{lettrine}, \pkg{lips}, +% \pkg{cancel}, \pkg{ellipsis}, \pkg{embrac}, \pkg{enparen}, +% \pkg{hyphenat}, \pkg{lettrine}, \pkg{lips}, % \pkg{lua-check-hyphen}, \pkg{luacolor}, % \pkg{magaz}, \pkg{nowidow}, \pkg{pdfrender}, \pkg{realscripts}, \pkg{relsize}, % \pkg{scalefnt}, \pkg{soul}, \pkg{soulpos}, \pkg{soulutf8}, @@ -4539,7 +4583,7 @@ This boolean may be tested by the user for later use. % \midrule % % Working as-is: & -% Various utility, calculation, file, and text-only packags, such as +% Various utility, calculation, file, and text-only packages, such as % \pkg{calc}, % \pkg{fileerr}, % \pkg{somedefs}, @@ -9061,8 +9105,8 @@ This boolean may be tested by the user for later use. % For use with \prog{LibreOffice Writer}, it is recommended to: % \margintag{TOC, LOF, LOT} % \begin{enumerate}[nosep] -% \item Set \cs{booltrue}\{FormatWP\}. -% \item Set \cs{booltrue}\{WPMarkTOC\} and \cs{boolfalse}\{WPMarkLOFT\}. +% \item Set |\booltrue{FormatWP}| +% \item Set |\booltrue{WPMarkTOC}| and |\boolfalse{WPMarkLOFT}| % \item Use \pkg{lwarp} to generate the \HTML\ document. % \item Copy/paste from the \HTML\ document into an empty \prog{LibreOffice Writer} document. % \item Manually insert a \brand{LibreOffice} \acro{TOC} in the \brand{LibreOffice} document. @@ -10054,11 +10098,11 @@ This boolean may be tested by the user for later use. \newcommand*{\LWR@loadafter}[1]{% \@ifpackageloaded{#1} { -\PackageError{lwarp} -{Package #1, or one which uses #1, must be loaded after lwarp} -{Move \detokenize{\usepackage}{#1} after \detokenize{\usepackage}{lwarp}. -Package #1 may also be loaded by something else, which must also be moved -after lwarp.} + \PackageError{lwarp} + {Package #1, or one which uses #1, must be loaded after lwarp} + {Move \detokenize{\usepackage}{#1} after \detokenize{\usepackage}{lwarp}. + Package #1 may also be loaded by something else, which must also be moved + after lwarp.} } {} } @@ -10080,33 +10124,25 @@ after lwarp.} % \end{macro} -% \begin{macro}{\LWR@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@notbxjsloadafter\LWR@loadafter - -\@ifclassloaded{bxjsarticle}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{} -\@ifclassloaded{bxjsbook}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{} -\@ifclassloaded{bxjsreport}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{} -\@ifclassloaded{bxjsslide}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{} -% \end{macrocode} -% \end{macro} - - -% \begin{macro}{\LWR@notltjsloadafter} \marg{packagename} \quad +% \begin{macro}{\LWR@notltjloadafter} \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.} +% \changes{v0.63}{2018/12/20}{Added more classes.} % \begin{macrocode} -\LetLtxMacro\LWR@notltjsloadafter\LWR@loadafter +\LetLtxMacro\LWR@notltjloadafter\LWR@loadafter -\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{} -\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{} -\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{} -\@ifclassloaded{ltjspf}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{} -\@ifclassloaded{ltjsiyou}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{} +\@ifclassloaded{ltjarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjspf}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjskiyou}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjtarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjtbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjtreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} % \end{macrocode} % \end{macro} @@ -10233,8 +10269,15 @@ 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.65}{2018/12/15}{Added early checks for \pkg{jarticle}, \pkg{tarticle}, and related.} % % \begin{macrocode} +\LWR@earlyclassloadnever{jarticle}{ujarticle} +\LWR@earlyclassloadnever{jbook}{ujbook} +\LWR@earlyclassloadnever{jreport}{ujreport} +\LWR@earlyclassloadnever{tarticle}{utarticle} +\LWR@earlyclassloadnever{tbook}{utbook} +\LWR@earlyclassloadnever{treport}{utreport} \LWR@earlyloadnever{ae}{cm-super, lmodern} \LWR@earlyloadnever{aecompl}{cm-super, lmodern} \LWR@earlyloadnever{aecc}{cm-super, lmodern} @@ -10251,7 +10294,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, utarticle} +\LWR@earlyloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle} % \end{macrocode} % \pkg{hangul} is not in TeXLive, and is not tested: % \begin{macrocode} @@ -10321,6 +10364,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{bookmark} \LWR@notmemoirloadafter{booktabs} \LWR@loadafter{bophook} +\LWR@loadafter{bounddvi} \LWR@loadafter{boxedminipage} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{breakurl} @@ -10366,6 +10410,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{easy-todo} \LWR@loadafter{ebook} \LWR@loadafter{ellipsis} +\LWR@loadafter{embrac} \LWR@loadafter{emptypage} \LWR@loadafter{endfloat} \LWR@loadafter{endheads} @@ -10409,6 +10454,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{footmisc} \LWR@loadafter{footnote} \LWR@loadafter{footnotehyper} +\LWR@loadafter{footnoterange} \LWR@loadafter{footnpag} \LWR@loadafter{forest} \LWR@loadafter{framed} @@ -10417,7 +10463,8 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{fullpage} \LWR@loadafter{fullwidth} \LWR@loadafter{fwlw} -\LWR@notbxjsloadafter{geometry} +\LWR@loadafter{gentombow} +% geometry is always loaded by lwarp, and lwarp-geometry is AtBeginDocument \LWR@loadafter{gmeometric} \LWR@loadafter{glossaries} % \LWR@loadafter{graphics}% pre-loaded by xunicode @@ -10480,6 +10527,7 @@ For a possible alternative, see class(es) #2.} % morewrites must be loaded before lwarp \LWR@notmemoirloadafter{mparhack} %\LWR@loadafter{multicol}% loaded by ltxdoc +\LWR@loadafter{multicolrule} \LWR@loadafter{multirow} \LWR@loadafter{multitoc} \LWR@loadafter{musicography} @@ -10519,6 +10567,12 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{pfnote} \LWR@loadafter{phfqit} \LWR@loadafter{placeins} +\LWR@loadafter{plarray} +\LWR@loadafter{plarydshln} +\LWR@loadafter{plextarray} +\LWR@loadafter{plextarydshln} +\LWR@loadafter{plcolortbl} +\LWR@loadafter{plextdelarray} \LWR@loadafter{prelim2e} \LWR@loadafter{prettyref} \LWR@loadafter{preview} @@ -10527,6 +10581,10 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{pst-eps} \LWR@loadafter{pstool} \LWR@loadafter{pstricks} +% \LWR@loadafter{pxatbegshi}% may be used by morewrites +\LWR@loadafter{pxeveryshi} +\LWR@loadafter{pxftnright} +\LWR@loadafter{pxjahyper} \LWR@loadafter{quotchap} \LWR@loadafter{quoting} \LWR@loadafter{ragged2e} @@ -10543,7 +10601,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{rotfloat} \LWR@loadafter{rviewport} \LWR@loadafter{savetrees} -% \LWR@loadafter{scalefnt}% loaded by babel-french +% scalefnt is loaded by babel-french \LWR@loadafter{schemata} \LWR@loadafter{scrextend} \LWR@loadafter{scrhack} @@ -10570,7 +10628,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{srcltx} \LWR@loadafter{srctex} \LWR@loadafter{stabular} -\LWR@notltjsloadafter{stfloats} +\LWR@notltjloadafter{stfloats} \LWR@loadafter{subfig} \LWR@loadafter{subfigure} \LWR@loadafter{supertabular} @@ -10578,6 +10636,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{tabls} \LWR@notmemoirloadafter{tabularx} \LWR@loadafter{tabulary} +\LWR@loadafter{tascmac} \LWR@loadafter{textarea} % \LWR@loadafter{textcomp}% maybe before lwarp with font packages \LWR@loadafter{textfit} @@ -10619,6 +10678,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{uspace} \LWR@loadafter{varioref}% no lwarp package provided \LWR@notmemoirloadafter{verse} +\LWR@loadafter{versonotes} \LWR@loadafter{vertbars} \LWR@loadafter{vmargin} \LWR@loadafter{vowel} @@ -11743,11 +11803,15 @@ For a possible alternative, see class(es) #2.} % \codehtml % \begin{macrocode} \begin{warpHTML} +% \end{macrocode} +% +% \begin{macrocode} \RequirePackage{geometry} % \end{macrocode} % -% Avoid option conflict by changing settings after package load: +% Avoid class and option conflict by changing settings after package load: % \changes{v0.63}{2018/11/24}{\pkg{geometry}: Fix for \pkg{bxjs*} classes.} +% \changes{v0.65}{2018/12/21}{\pkg{geometry}: Fix for \pkg{bxjs*} classes.} % \begin{macrocode} \geometry{ paperheight=190in,% @@ -11755,9 +11819,16 @@ For a possible alternative, see class(es) #2.} left=2in,right=6in,% top=1in,bottom=1in,% } +% \end{macrocode} +% +% \pkg{ltjtarticle} and other classes may require these to be reset by \pkg{lwarp}: +% \begin{macrocode} +\setlength{\textheight}{0.8\paperheight} +\setlength{\textwidth}{0.7\paperwidth} \@twosidefalse \@mparswitchfalse + \end{warpHTML} % \end{macrocode} @@ -12059,6 +12130,8 @@ For a possible alternative, see class(es) #2.} % \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}.} +% +% The following should never be loaded: % \begin{macrocode} \newcommand*{\LWR@checkloadfilename}[1]{% \LWR@checkloadnever{#1}{ae}{latinmodern} @@ -12075,7 +12148,11 @@ For a possible alternative, see class(es) #2.} \LWR@checkloadnever{#1}{si}{siunitx} \LWR@checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx} \LWR@checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol} +% \end{macrocode} % +% ^^A *loadbefore +% The following should only be loaded before \pkg{lwarp}: +% \begin{macrocode} \LWR@checkloadbefore{#1}{ctex} \LWR@checkloadbefore{#1}{fontspec} \LWR@checkloadbefore{#1}{inputenc} @@ -12087,6 +12164,7 @@ For a possible alternative, see class(es) #2.} \LWR@checkloadbefore{#1}{morewrites} \LWR@checkloadbefore{#1}{newclude} \LWR@checkloadbefore{#1}{newunicodechar} +\LWR@checkloadbefore{#1}{plext} \LWR@checkloadbefore{#1}{xeCJK} \LWR@checkloadbefore{#1}{xetexko} \LWR@checkloadbefore{#1}{zxjatype} @@ -12860,7 +12938,7 @@ For a possible alternative, see class(es) #2.} % \DescribeBoolean{WPMarkFloats} \DescribeDefault{false} % \describeWPMarkFloats % \footnote{Perhaps some day word processors will have \HTML\ import options -% for identifying \element{figure} and \element{figcaption} tags +% for identifying \element{figure} and caption tags % for figures and tables.} % \gindex{word processor>HTML conversion settings} % \gindex{HTML>conversion settings>word processor} @@ -13051,6 +13129,16 @@ For a possible alternative, see class(es) #2.} \LetLtxMacro\LWR@origupshape\upshape \LetLtxMacro\LWR@origslshape\slshape \LetLtxMacro\LWR@origscshape\scshape +% \end{macrocode} +% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.} +% \begin{macrocode} +\@ifundefined{sishape}{ + \LetLtxMacro\LWR@origsishape\scshape +}{ + \LetLtxMacro\LWR@origsishape\sishape +} +% \end{macrocode} +% \begin{macrocode} \LetLtxMacro\LWR@origitshape\itshape \LetLtxMacro\LWR@origem\em \LetLtxMacro\LWR@orignormalfont\normalfont @@ -13729,6 +13817,10 @@ For a possible alternative, see class(es) #2.} % \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}.} +% \changes{v0.65}{2018/12/09}{\filenm{lwarp.css}: Improved \CSS\ for quotations.} +% \changes{v0.65}{2018/12/09}{\filenm{lwarp.css}: Side\TOC to left for improved \cs{marginpar}s.} +% \changes{v0.65}{2018/12/09}{\filenm{lwarp.css}: Added \cs{sishape}, \cs{textsi}.} +% \changes{v0.65}{2018/12/18}{\filenm{lwarp.css}: Improved \CSS\ for page layout.} % % ^^A *lwarp.css % @@ -13817,6 +13909,12 @@ span.textsc, div.textsc { font-variant-numeric: oldstyle-nums ; } +span.textsi, div.textsi { + font-style: italic ; + font-variant: small-caps; + font-variant-numeric: oldstyle-nums ; +} + span.textsl, div.textsl { font-style: oblique; } span.textup, div.textup { @@ -13908,24 +14006,30 @@ pre.tabbing { } blockquote { - margin-left: 0px ; - margin-right: 0px ; + display: block ; + margin-left: 2em ; + margin-right: 2em ; +} + +blockquotation { + display: block ; + margin-left: 2em ; + margin-right: 2em ; } /* quotchap is for the quotchap package */ div.quotchap { - font-style: oblique ; - overflow-x: auto ; - margin-left: 2em ; - margin-right: 2em ; + display: block ; + font-style: oblique ; + overflow-x: auto ; + margin-left: 2em ; + margin-right: 2em ; } -blockquote p, div.quotchap p { - line-height: 1.5; +blockquote p, blockquotation p, div.quotchap p { + line-height: 1.5; text-align: left ; font-size: .85em ; - margin-left: 3em ; - margin-right: 3em ; } /* qauthor is for the quotchap package */ @@ -13942,19 +14046,6 @@ div.qauthor p { text-align: right ; } -blockquotation { - margin-left: 0px ; - margin-right: 0px ; -} - -blockquotation p { - line-height: 1.5; - text-align: left ; - font-size: .85em ; - margin-left: 3em ; - margin-right: 3em ; -} - div.epigraph, div.dictum { line-height: 1.2; text-align: left ; @@ -14085,39 +14176,33 @@ div.minisec { text-align: left ; } -/* Title of the file */ h1 { margin: 0ex 0em 0ex 0em ; line-height: 1.3; text-align: center ; } -/* Part */ h2 { margin: 1ex 0em 1ex 0em ; line-height: 1.3; text-align: center ; } -/* Chapter */ h3 { margin: 3ex 0em 1ex 0em ; line-height: 1.3; } -/* Section */ h4 { margin: 3ex 0em 1ex 0em ; line-height: 1.3; } -/* Sub-Section */ h5 { margin: 3ex 0em 1ex 0em ; line-height: 1.3; } -/* Sub-Sub-Section */ h6 { margin: 3ex 0em 1ex 0em ; line-height: 1.3; @@ -14136,15 +14221,16 @@ div.titlepage { } .marginpar, .marginparblock { - max-width:50%; - float:right; - text-align:left; + max-width: 50%; + float: right ; + clear: both ; + text-align: left ; margin: 1ex 0.5em 1ex 1em ; padding: 1ex 0.5em 1ex 0.5em ; font-size: 85% ; border-top: 1px solid silver ; border-bottom: 1px solid silver ; - overflow-x: auto; + overflow-x: auto ; } .marginpar br { margin-bottom: 2ex ; } @@ -14172,6 +14258,15 @@ div.marginblock br , div.marginparblock br { margin-bottom: 2ex ; } +div.bodycontainer { + float: left ; + width: 80% ; +} + +div.bodywithoutsidetoc div.bodycontainer { + float: none ; + width: 100% ; +} section.textbody div.footnotes{ margin: 3ex 2em 0ex 2em ; @@ -14598,7 +14693,7 @@ figure.subfigure, figure.subtable { display: inline-block ; margin: 3ex 1em 3ex 1em ; } -figcaption .minipage { margin:0 ; padding: 0 } +div.figurecaption .minipage { margin:0 ; padding: 0 } div.minipage figure { border: none ; box-shadow: none ; } div.minipage figure.table { margin: 0ex } @@ -14611,7 +14706,7 @@ div.floatrow figure { display: inline-block ; margin: 1ex 2% ; } div.floatfoot { font-size: .85em ; border-top: 1px solid silver ; line-height: 1.2 ; } -figcaption , .lstlistingtitle { +div.figurecaption , .lstlistingtitle { font-size: .85em ; text-align: center ; font-weight: bold ; @@ -14619,7 +14714,7 @@ figcaption , .lstlistingtitle { margin-bottom: 1ex ; } -figure.subfigure figcaption, figure.subtable figcaption { +figure.subfigure div.figurecaption, figure.subtable div.figurecaption { border-bottom: none ; background: none ; } @@ -14631,7 +14726,7 @@ div.nonfloatcaption { } /* For a \RawCaption inside a minipage inside a figure's floatrow: */ -figure div.floatrow div.minipage figcaption { +figure div.floatrow div.minipage div.figurecaption { border: none ; background: none ; } @@ -14653,7 +14748,7 @@ figure.ruled { box-shadow: none ; } -figure.ruled figcaption, figure.boxruled figcaption { +figure.ruled div.figurecaption, figure.boxruled div.figurecaption { border-top: 1px solid silver ; border-bottom: 1px solid silver ; } @@ -14859,7 +14954,7 @@ nav.topnavigation{ margin: 0 ; border-bottom: 1px solid silver ; border-top: 1px solid silver ; - clear:right ; + clear:both ; } nav.botnavigation{ @@ -14869,29 +14964,27 @@ nav.botnavigation{ margin: 0 ; border-top: 1px solid silver ; border-bottom: 1px solid silver ; - clear:right ; + clear:both ; } -header{ +header { line-height: 1.2 ; font-size: 1em ; -/* border-bottom: 2px solid silver ; */ + border-bottom: 1px solid silver ; margin: 0px ; - padding: 0ex 1em 0ex 1em ; - text-align:center ; + padding: 2ex 1em 2ex 1em ; + text-align:left ; } -header p {margin:0ex;padding:4ex 0em 2ex 0em ;text-align:center;} - -footer{ +footer { font-size: .85em ; line-height: 1.2 ; margin-top: 1ex ; - border-top: 2px solid silver ; + border-top: 1px solid silver ; padding: 2ex 1em 2ex 1em ; - clear:right ; + clear:both ; text-align:left ; } @@ -14913,25 +15006,23 @@ img.lateximage{ } - -nav.sidetoc { +/* The -1px right margin compensates for the 1px right border. */ +/* Without this -1px margin, the body container appears below instead */ +/* of floating to the side. */ +div.sidetoccontainer { font-family: "DejaVu Serif", "Bitstream Vera Serif", "Lucida Bright", Georgia, serif; - float:right ; + float: left ; width: 20%; - border-left: 1px solid silver; - border-top: 1px solid silver; + margin: 0pt -1px 3ex 0pt ; + border-right: 1px solid silver; border-bottom: 1px solid silver; -/* border-top: 2px solid #808080 ; */ background: #FAF7F4 ; - padding: 2ex 0em 2ex 1em ; - margin: 0ex 0em 2ex 1em ; font-size:.9em ; - border-radius: 20px 0px 0px 20px ; - } + border-radius: 0px 0px 20px 0px ; +} div.sidetoccontents { -/* border-top: 1px solid silver ; */ overflow-y: auto ; width: 100% ; text-align: left ; @@ -15162,20 +15253,22 @@ Based on spacing demonstrated by the metafont package. nav.topnavigation { display:none; } nav.botnavigation { display:none; } -@media screen and (max-width: 45em) { -/* nav.sidetoc {display:none;} */ - nav.sidetoc { +/* Only display the sidetoc's webpage title if a small screen */ +span.sidetocthetitle { display: none } + +@media screen and (max-width: 50em) { + div.sidetoccontainer { float: none ; width: 100% ; - margin: 5ex 0px 5ex 0px ; padding: 0 ; border-radius: 0 ; border-bottom: 1px solid black ; border-top: 1px solid black ; box-shadow: none ; } -/* nav.topnavigation { display:block } */ + span.sidetocthetitle { display: inline } nav.botnavigation { display:block } + div.bodycontainer { width: 100% } .marginpar { max-width: 100%; float: none; @@ -15191,21 +15284,24 @@ nav.botnavigation { display:none; } "Liberation Serif", "Nimbus Roman No 9 L", "FreeSerif", "Hoefler Text", Times, "Times New Roman", serif; } - nav.sidetoc { display:none; } + div.sidetoccontainer { display:none; } nav.topnavigation { display: none; } nav.botnavigation { display: none; } + div.bodycontainer { width: 100% } } @media handheld { - nav.sidetoc { display:none; } + div.sidetoccontainer { display:none; } nav.topnavigation { display:block } nav.botnavigation { display:block } + div.bodycontainer { width: 100% } } @media projection { - nav.sidetoc { display:none; } + div.sidetoccontainer { display:none; } nav.topnavigation { display:block } nav.botnavigation { display:block } + div.bodycontainer { width: 100% } } \end{filecontents*} % \end{Verbatim}% for syntax highlighting @@ -15224,6 +15320,8 @@ nav.botnavigation { display:none; } % If used, this must be present both when compiling the project % and also when distributing the \HTML\ files. % +% \changes{v0.65}{2018/12/09}{\filenm{lwarp\_sagebrush.css}: Side\TOC to left for improved \cs{marginpar}s.} +% % ^^A *lwarp_sagebrush.css % % \codeconfig @@ -15262,12 +15360,12 @@ h1 { /* title of the entire website, used on each page */ h1 { border-bottom: 1px solid #304070; - border-top: 2px solid #304070; +/* border-top: 2px solid #304070; */ } h2 { border-bottom: 1px solid #304070; - border-top: 2px solid #304070; +/* border-top: 2px solid #304070; */ background-color: #F7F7F0 ; background-image: linear-gradient(to bottom, #F7F7F0, #DAD0C0); } @@ -15389,7 +15487,7 @@ div.fboxBlock div.minipage { box-shadow: none ; } margin: 0ex ; } -figure.figure .minipage, figcaption .minipage { border: none; } +figure.figure .minipage, div.figurecaption .minipage { border: none; } div.marginblock div.minipage , div.marginparblock div.minipage @@ -15409,7 +15507,7 @@ figure figure { } /* -figcaption { +div.figurecaption { border-top: 1px solid silver ; border-bottom: 1px solid silver ; background-color: #e8e8e8 ; @@ -15453,11 +15551,10 @@ footer{ -nav.sidetoc { +div.sidetoccontainer { background-color: #F7F7F0 ; background-image: linear-gradient(to bottom, #F7F7F0, #C0C0C0); box-shadow: 3px 3px 3px #808080 ; - border-radius: 0px 0px 0px 20px ; } div.sidetoctitle {color: #304070 ; } @@ -15470,7 +15567,7 @@ nav.sidetoc a:hover { @media screen and (max-width: 45em) { - nav.sidetoc { border-radius: 0 ; } + div.sidetoccontainer { border-radius: 0 ; } } @@ -15492,6 +15589,7 @@ nav.sidetoc a:hover { % and also when distributing the \HTML\ files. % % \changes{v0.62}{2018/11/10}{\filenm{lwarp\_formal.css}: Fix: Font for verse.} +% \changes{v0.65}{2018/12/09}{\filenm{lwarp\_formal.css}: Side\TOC to left for improved \cs{marginpar}s.} % % ^^A *lwarp_formal.css % @@ -15545,7 +15643,7 @@ h1, h2 { background-color: #fffcf5 ; background-image: none ; border-bottom: 1px solid #808080; - border-top: 2px solid #808080; +/* border-top: 2px solid #808080; */ } div.abstracttitle { @@ -15632,7 +15730,7 @@ figure { } -figcaption , .lstlisting { +div.figurecaption , .lstlisting { border: none ; /* border-top: 1px solid silver ; */ /* border-bottom: 1px solid silver ; */ @@ -15664,13 +15762,12 @@ nav.toc, nav.lof, nav.lot, nav.lol { "Times New Roman", serif; } -nav.sidetoc { +div.sidetoccontainer { font-family: "Linux Libertine O", "Hoefler Text", "Garamond", "Bembo", "Janson", "TeX Gyre Pagella", "Palatino", "Liberation Serif", "Nimbus Roman No 9 L", "FreeSerif", Times, "Times New Roman", serif; background-image: linear-gradient(to bottom, #fffcf5, #C0C0C0); - border-radius: 0px 0px 0px 20px ; } div.sidetoctitle{ @@ -15687,7 +15784,6 @@ footer{ background-color: #e0e0e0 ; background-image: linear-gradient(to bottom, #fffcf5, #b0b0b0); padding: 2ex 1em 2ex 1em ; - clear:right ; text-align:left ; } @@ -16123,7 +16219,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- -- Copyright 2016-2018 Brian Dunn -printversion = "v0.64" +printversion = "v0.65" requiredconfversion = "1" -- also at *lwarpmk.conf function printhelp () @@ -18544,8 +18640,11 @@ end -- not --version \ifbool{FormatWP}% {% \addtocounter{LWR@thisautoidWP}{1}% +% \end{macrocode} +% \changes{v0.65}{2018/12/21}{Fix space between class and id.} +% \begin{macrocode} \LWR@htmltag{% - div class=\textquotedbl#3\textquotedbl % space + div class=\textquotedbl#3\textquotedbl\ % space id=\textquotedbl% \LWR@print@mbox{autoidWP-\arabic{LWR@thisautoidWP}}% \textquotedbl% @@ -19675,10 +19774,11 @@ end -- not --version % Convert blanks into dashes, removes short words, % store result in \\ |\LWR@thisfilename|. % -% Be sure that this does not result in filename collisions! -% \trouble[filename collision]{filename>collision} +% Be sure that this does not result in duplicate filenames! +% \trouble[duplicate filename]{filename>duplicate} +% \trouble{duplcate filename} +% \trouble{sectioning>duplicate name} % Use the optional \TOC\ caption entry parameter for formatting. -% \trouble[section names]{sectioning>names} % Remember to \cs{protect} \LaTeX\ commands which appear in % section names and \TOC\ captions. % \begin{macrocode} @@ -19789,9 +19889,9 @@ end -- not --version \StrSubstitute{\LWR@thisnewfilename}{–}{-}[\LWR@thisnewfilename] \fi% % \end{macrocode} -% Return the result: +% Return the global result: % \begin{macrocode} -\global\let\LWR@thisfilename\LWR@thisnewfilename% return a global result +\global\let\LWR@thisfilename\LWR@thisnewfilename% \endgroup% \LWR@traceinfo{LWR@filenamenoblanks: result is \LWR@thisfilename}% } @@ -19979,15 +20079,18 @@ end -- not --version % At the bottom of the ending file: +% \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.} % \begin{macrocode} \LWR@htmlelementclassend{section}{textbody} +\LWR@htmlelementclassend{div}{bodycontainer} +\LWR@htmlelementclassend{div}{bodyandsidetoc} \LWR@printpendingfootnotes % \end{macrocode} % -% No footer between files if \EPUB: % +% No footer between files if \EPUB: % \begin{macrocode} \ifbool{FormatEPUB} {} @@ -20000,6 +20103,7 @@ end -- not --version } % \end{macrocode} % +% % No bottom navigation if are finishing the home page or % formatting for \EPUB\ or a word-processor. % \begin{macrocode} @@ -20018,17 +20122,62 @@ end -- not --version \addtocounter{LWR@htmlfilenumber}{1}% % \end{macrocode} - -% If using a filename, create a version without blanks. +% +% +% If using a filename based on section name, create a version without blanks. % The filename without blanks will be placed into \cs{LWR@thisfilename}. +% Duplicates will be detected using MD5 hashes. +% % If not using a filename, the file number will be used instead. +% % \changes{v0.12}{2016/03/13}{Bugfix: \TOC\ with numbered files.} +% \changes{v0.65}{2018/12/21}{Error if duplicate file name.} % \begin{macrocode} \ifbool{FileSectionNames}% -{\LWR@filenamenoblanks{#1}} +{% +% \end{macrocode} +% Convert the section name to a filename with blanks and common words removed. +% The resulting filename is in \cs{LWR@thisfilename}. +% \begin{macrocode} + \LWR@filenamenoblanks{#1}% +% \end{macrocode} +% Create a macro name from the MD5 hash of the file name. +% \begin{macrocode} + \edef\LWR@hashedname{\LWR@mdfive{\LWR@thisfilename}}% +% \end{macrocode} +% If the macro name is not yet defined, this filename is unique. +% \begin{macrocode} + \ifcsundef{LWR@filename\LWR@hashedname}{% +% \end{macrocode} +% If the filename is unique, create a macro using the hashed name, +% to be used to test for additional duplicates in the future. +% \begin{macrocode} + \csdef{LWR@filename\LWR@hashedname}{}% + }{% +% \end{macrocode} +% If the filename is not unique, create an error. +% \begin{macrocode} + \PackageError{lwarp} + { + Section name ``#1'', at the line number listed below, + generates the filename ``\LWR@thisfilename'', + which appears to be a duplicate% + } + { + Look for another section of the same type with a similar + or identical name. + (Lwarp sanitizes most symbols and common short words + when generating file names, and this may cause a conflict.) + } + } +} +% \end{macrocode} +% If using file numbers instead of names, the name is set to the next file number. +% \begin{macrocode} {\renewcommand*{\LWR@thisfilename}{\arabic{LWR@htmlfilenumber}}} % \end{macrocode} - +% +% % Include an \HTML\ comment to instruct lwarpmk % where to split the files apart. % Uses pipe-separated fields for |split_html.gawk|. @@ -20048,7 +20197,8 @@ end -- not --version } \endgroup% % \end{macrocode} - +% +% % At the top of the starting file: % \begin{macrocode} \LWR@stoppars @@ -20068,6 +20218,7 @@ end -- not --version \LWR@newautopagelabel{LWR@latestautopage}% % \end{macrocode} % +% % No navigation between files if formatting for an \EPUB\ or word processor: % \begin{macrocode} \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} @@ -20076,6 +20227,7 @@ end -- not --version % \end{macrocode} % +% % No header if between files if formatting for an \EPUB\ or word processor: % \begin{macrocode} \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} @@ -20090,15 +20242,13 @@ end -- not --version % \end{macrocode} % -% Print title only if there is one. -% Skip if formatting for an \EPUB\ or word processor: +% +% The container for the sidetoc and text body: % \begin{macrocode} -\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} -{} -{\ifcsvoid{thetitle}{}{\LWR@printthetitle}} - +\LWR@htmlelementclass{div}{bodyandsidetoc} % \end{macrocode} % +% % No side\TOC\ if formatting for an \EPUB\ or word processor: % \begin{macrocode} \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} @@ -20107,12 +20257,29 @@ end -- not --version % \end{macrocode} % +% % Start of the \element{textbody}: +% \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.} % \begin{macrocode} +\LWR@htmlelementclass{div}{bodycontainer} \LWR@htmlelementclass{section}{textbody} % \end{macrocode} % +% +% Print title only if there is one. +% Skip if formatting for an \EPUB\ or word processor: +% \begin{macrocode} +\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}% + {}% + {% + \ifcsvoid{thetitle}{}{% + \LWR@printthetitle% + }% + }% +% \end{macrocode} +% +% % Keep paragraph tags disabled for now: % \begin{macrocode} \LWR@stoppars @@ -20455,6 +20622,10 @@ end -- not --version % \begin{macrocode} \global\boolfalse{LWR@minipagethispar}% % \end{macrocode} +% +% +% +% % Start a new \HTML\ file unless starred, % and if is a shallow sectioning depth. % @@ -20500,11 +20671,11 @@ end -- not --version % \end{macrocode} % If no optional entry % \begin{macrocode} - {\LWR@newhtmlfile{#3}}% + {\LWR@newhtmlfile{#3}}% % \end{macrocode} % If yes an optional entry % \begin{macrocode} - {\LWR@newhtmlfile{#2}}% + {\LWR@newhtmlfile{#2}}% }% new file % \end{macrocode} % Else: No new \HTML\ file: @@ -20515,14 +20686,14 @@ end -- not --version % \begin{macrocode} \LWR@traceinfo{LWR@section: not a new HTML file, about to LWR@orignewpage}% \LWR@orignewpage% - }% not new file + % \end{macrocode} % Remember this section's name for \cs{nameref}: % \begin{macrocode} \IfValueT{#3}{% -\LWR@traceinfo{LWR@section: about to LWR@setlatestname}% -\IfValueTF{#2}{\LWR@setlatestname{#2}}{\LWR@setlatestname{#3}}% + \LWR@traceinfo{LWR@section: about to LWR@setlatestname}% + \IfValueTF{#2}{\LWR@setlatestname{#2}}{\LWR@setlatestname{#3}}% }% % \end{macrocode} % Print an opening comment with the level and the name; @@ -20987,7 +21158,7 @@ end -- not --version \newcommand*{\HTMLTitleBeforeSection}{% \def\theHTMLTitleSection{% \theHTMLTitle\theHTMLTitleSeparator\theHTMLSection% - } + }% } % \end{macrocode} % \end{macro} @@ -21000,7 +21171,7 @@ end -- not --version \newcommand*{\HTMLTitleAfterSection}{% \def\theHTMLTitleSection{% \theHTMLSection\theHTMLTitleSeparator\theHTMLTitle% - } + }% } % \end{macrocode} % \end{macro} @@ -21300,13 +21471,6 @@ end -- not --version % so that they won't be over-written by some other package. % \changes{v0.13}{2016/03/23}{\cs{up} and \cs{fup}} % -% Tabular: -% \begin{macrocode} -\LetLtxMacro\LWR@origtabular\tabular -\LetLtxMacro\LWR@origendtabular\endtabular -\LetLtxMacro\tabular\LWR@tabular -\LetLtxMacro\endtabular\endLWR@tabular -% \end{macrocode} % Float captions: % \begin{macrocode} \let\LWR@origcaption\caption @@ -21353,8 +21517,13 @@ end -- not --version \LWR@firstpagetop \LWR@stoppars \LWR@htmltag{/header}\LWR@orignewline +% \end{macrocode} +% \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.} +% \begin{macrocode} +\LWR@htmlelementclass{div}{bodywithoutsidetoc} +\LWR@htmlelementclass{div}{bodycontainer} \LWR@traceinfo{LWR@lwarpStart: Generating textbody.} -\LWR@htmltag{section class=\textquotedbl{}textbody\textquotedbl} +\LWR@htmlelementclass{section}{textbody} % \end{macrocode} % % Patch the |itemize|, |enumerate|, and |description| environments and \cs{item}. @@ -21448,8 +21617,11 @@ end -- not --version % At the bottom of the ending file: % Close the textbody: +% \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.} % \begin{macrocode} \LWR@htmlelementclassend{section}{textbody} +\LWR@htmlelementclassend{div}{bodycontainer} +\LWR@htmlelementclassend{div}{bodyandsidetoc} % \end{macrocode} % Print any pending footnotes: % \begin{macrocode} @@ -21768,12 +21940,12 @@ end -- not --version % \begin{macro}{\printtitle} % \begin{macrocode} \newcommand*{\printtitle} -{ -\LWR@stoppars -\LWR@htmltag{\LWR@tagtitle}% -\@title% -\LWR@htmltag{\LWR@tagtitleend} -\LWR@startpars +{% + \LWR@stoppars% + \LWR@htmltag{\LWR@tagtitle}% + \@title% + \LWR@htmltag{\LWR@tagtitleend}% + \LWR@startpars% } % \end{macrocode} % \end{macro} @@ -21783,12 +21955,12 @@ end -- not --version % used to title each \HTML\ page. % \begin{macrocode} \newcommand*{\LWR@printthetitle} -{ -\LWR@stoppars -\LWR@htmltag{\LWR@tagtitle}% -\thetitle% -\LWR@htmltag{\LWR@tagtitleend} -\LWR@startpars +{% + \LWR@stoppars% + \LWR@htmltag{\LWR@tagtitle}% + \thetitle% + \LWR@htmltag{\LWR@tagtitleend}% + \LWR@startpars% } % \end{macrocode} % \end{macro} @@ -22038,30 +22210,30 @@ end -- not --version % % \begin{macrocode} \DeclareDocumentCommand{\@maketitle}{}{% - \LWR@stoppars\LWR@htmltag{\LWR@tagtitle} - \@title - \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars - \begin{BlockClass}{author} + \LWR@stoppars\LWR@htmltag{\LWR@tagtitle}% + \@title% + \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars% + \begin{BlockClass}{author}% % \end{macrocode} % For \pkg{IEEEtran} class: % \changes{v0.48}{2018/02/04}{Fix: Errors with \pkg{IEEEtran} class.} % \begin{macrocode} - \renewcommand*{\cr}{} - \renewcommand*{\crcr}{} - \renewcommand*{\noalign}{} + \renewcommand*{\cr}{}% + \renewcommand*{\crcr}{}% + \renewcommand*{\noalign}{}% % \end{macrocode} % \begin{macrocode} - \renewcommand{\and}{ - \end{BlockClass} - \begin{BlockClass}{oneauthor} - } - \begin{BlockClass}{oneauthor} - \@author - \end{BlockClass} - \end{BlockClass} - \begin{BlockClass}{titledate} - \@date - \end{BlockClass} + \renewcommand{\and}{% + \end{BlockClass}% + \begin{BlockClass}{oneauthor}% + }% + \begin{BlockClass}{oneauthor}% + \@author% + \end{BlockClass}% + \end{BlockClass}% + \begin{BlockClass}{titledate}% + \@date% + \end{BlockClass}% } % \end{macrocode} % \end{macro} @@ -25185,22 +25357,22 @@ end -- not --version \ifdefstring{\LWR@tempone}{tvertbarl}{% \LWR@tdaddstyle% border-left: 1px solid % space - \LWR@origpound\LWR@vertruleHTMLcolor% + \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarldouble}{% \LWR@tdaddstyle% border-left: 4px double % space - \LWR@origpound\LWR@vertruleHTMLcolor% + \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarldash}{% \LWR@tdaddstyle% border-left: 1px dashed % space - \LWR@origpound\LWR@vertruleHTMLcolor% + \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarldoubledash}{% \LWR@tdaddstyle% border-left: 2px dashed % space - \LWR@origpound\LWR@vertruleHTMLcolor% + \LWR@vertruleHTMLcolor% }{}% }{}% % \end{macrocode} @@ -25214,19 +25386,19 @@ end -- not --version % Add a custom style if a vertical bar was requested: % \begin{macrocode} \LWR@tdaddstyle% - border-right: 1px solid \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 1px solid \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarrdouble}{% \LWR@tdaddstyle% - border-right: 4px double \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 4px double \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarrdash}{% \LWR@tdaddstyle% - border-right: 1px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 1px dashed \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarrdoubledash}{% \LWR@tdaddstyle% - border-right: 2px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 2px dashed \LWR@vertruleHTMLcolor% }{}% }% } @@ -25538,38 +25710,38 @@ end -- not --version % \begin{macrocode} \ifnumcomp{\value{LWR@mcolvertbarsl}}{=}{1}{% \LWR@tdaddstyle% - border-left: 1px solid \LWR@origpound\LWR@vertruleHTMLcolor% + border-left: 1px solid \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsl}}{>}{1}{% \LWR@tdaddstyle% - border-left: 4px double \LWR@origpound\LWR@vertruleHTMLcolor% + border-left: 4px double \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsldash}}{=}{1}{% \LWR@tdaddstyle% - border-left: 1px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-left: 1px dashed \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsldash}}{>}{1}{% \LWR@tdaddstyle% - border-left: 2px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-left: 2px dashed \LWR@vertruleHTMLcolor% }{}% % \end{macrocode} % Right side: % \begin{macrocode} \ifnumcomp{\value{LWR@mcolvertbarsr}}{=}{1}{% \LWR@tdaddstyle% - border-right: 1px solid \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 1px solid \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsr}}{>}{1}{% \LWR@tdaddstyle% - border-right: 4px double \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 4px double \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsrdash}}{=}{1}{% \LWR@tdaddstyle% - border-right: 1px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 1px dashed \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsrdash}}{>}{1}{% \LWR@tdaddstyle% - border-right: 2px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 2px dashed \LWR@vertruleHTMLcolor% }{}% }% } @@ -26518,20 +26690,21 @@ rowspan="#2" % % \end{macro} % -% \begin{environment}{LWR@tabular} \oarg{vertposition} \marg{colspecs} +% \begin{environment}{tabular} |<direction>| \oarg{vertposition} \marg{colspecs} % -% The new tabular environment will be \cs{let} in \cs{LWR@LwarpStart}, -% since \pkg{siunitx} might redefine tabular in the user's document. +% The |<direction>| is from \pkg{plext} for Japanese documents, and is ignored. % % \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.} % \changes{v0.36}{2017/08/16}{Fix for \pkg{babel-french}.} +% \changes{v0.65}{2018/12/15}{Added support for \pkg{plext}.} +% \changes{v0.65}{2018/12/16}{Fix: \env{tabular*}.} % % \begin{macrocode} \StartDefiningTabulars -\newenvironment*{LWR@tabular}[2][] +\NewDocumentCommand{\LWR@HTML@@tabular}{d<> o m} {% -\LWR@traceinfo{LWR@tabular started}% +\LWR@traceinfo{LWR@HTML@@tabular started}% \addtocounter{LWR@tabulardepth}{1}% % \end{macrocode} % Not yet started a table row: @@ -26564,13 +26737,13 @@ rowspan="#2" % % Create the |table| tag: % \begin{macrocode} \global\booltrue{LWR@intabularmetadata}% -\LWR@traceinfo{LWR@tabular: About to LWR@forecenewpage.}% +\LWR@traceinfo{LWR@@tabular: About to LWR@forecenewpage.}% \LWR@forcenewpage \LWR@htmlblocktag{table}% % \end{macrocode} % Parse the table columns: % \begin{macrocode} -\LWR@parsetablecols{#2}% +\LWR@parsetablecols{#3}% % \end{macrocode} % Table col spec is: \cs{LWR@tablecolspec} which is a string of |llccrr|, etc. % @@ -26605,12 +26778,17 @@ rowspan="#2" % \gdef\LWR@cellHTMLcolor{}% \@rowcolors% % \end{macrocode} +% % The vertical rules are set to the color active at the start of the tabular. % \cs{arrayrulecolor} will then affect horizontal rules inside the tabular, % but not the vertical rules. +% \changes{v0.65}{2018/12/19}{Fix: Rule color.} % \begin{macrocode} -\edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor}% +\ifdefvoid{\LWR@ruleHTMLcolor}% + {\edef\LWR@vertruleHTMLcolor{black}}% + {\edef\LWR@vertruleHTMLcolor{\LWR@origpound\LWR@ruleHTMLcolor}}% % \end{macrocode} +% % Tracking the depth of cell color \element{div}s: % \begin{macrocode} \setcounter{LWR@cellcolordepth}{0}% @@ -26622,7 +26800,7 @@ rowspan="#2" % % % The optional parameter for \cs{hline} supports the \pkg{tabls} package. % \begin{macrocode} -\LWR@traceinfo{LWR@tabular: redefining macros}% +\LWR@traceinfo{LWR@@HTML@tabular: redefining macros}% \LetLtxMacro\noalign\LWR@tabularnoalign% \LetLtxMacro\hline\LWR@HTMLhline% \LetLtxMacro\cline\LWR@HTMLcline% @@ -26692,14 +26870,18 @@ rowspan="#2" % % \end{macrocode} % Look ahead for a possible table data cell: % \begin{macrocode} -\LWR@traceinfo{LWR@tabular: about to LWR@getmynexttoken}% +\LWR@traceinfo{LWR@@HTML@tabular: about to LWR@getmynexttoken}% \LWR@getmynexttoken% }% % \end{macrocode} +% +% +% % Ending the environment: % \begin{macrocode} +\newcommand*{\LWR@HTML@endtabular} {% -\LWR@traceinfo{LWR@tabular ending}% +\LWR@traceinfo{LWR@HTML@endtabular}% % \end{macrocode} % Unnest one level of tabular paragraph handling: % \changes{v0.46}{2018/01/18}{Fix: Tabular empty lines.} @@ -26743,11 +26925,24 @@ rowspan="#2" % % \begin{macrocode} \protected\gdef&{\LWR@origampmacro}% \StopDefiningTabulars% -\LWR@traceinfo{LWR@tabular finished ending}% +\LWR@traceinfo{LWR@HTML@endtabular finished}% } +\csletcs{LWR@HTML@endtabular*}{LWR@HTML@endtabular} + \StopDefiningTabulars % \end{macrocode} +% +% \pkg{siunitx} may redefine \env{tabular}, so set the following later: +% \begin{macrocode} +\AtBeginDocument{ + \LetLtxMacro\LWR@origendtabular\endtabular + \csletcs{LWR@origendtabular*}{endtabular*} + \LWR@formatted{@tabular} + \LWR@formatted{endtabular} + \LWR@formatted{endtabular*} +} +% \end{macrocode} % \end{environment} % \begin{macrocode} @@ -27811,26 +28006,25 @@ autopage-\theLWR@currentautosec% % \begin{environment}{LWR@figcaption} -% \qquad Encapsulates a caption inside \element{figcaption}, -% and if |FormatWP| then also a \element{div} with an italic style. +% +% An \HTML\ \element{figcaption} is not allowed in places where +% \LaTeX\ does allow a figure caption, such as inside a \env{longtable} +% where the tabular has already started, or inside a \env{center} environment. +% Therefore, a \element{div} of class \attribute{figurecaption} is used +% instead. % \changes{v0.42}{2017/10/20}{If \progcode{FormatWP} forces italic captions.} +% \changes{v0.65}{2018/12/21}{Uses \element{figurecaption} instead of \element{figcaption}.} % \begin{macrocode} \newenvironment*{LWR@figcaption} -{% - \LWR@traceinfo{LWR@figcaption env start}% - \LWR@htmlblocktag{figcaption}% - \ifbool{FormatWP}{% - \begin{BlockClass}[font-style:italic]{italic} - \LWR@print@vspace*{\baselineskip} - }{}% - \LWR@traceinfo{LWR@figcaption env start: done}% -} -{% - \LWR@traceinfo{LWR@figcaption env end}% - \ifbool{FormatWP}{\end{BlockClass}}{}% - \LWR@htmlblocktag{/figcaption}% - \LWR@traceinfo{LWR@figcaption env end: done}% -} + { + \ifbool{FormatWP}{% + \BlockClass[font-style:italic]{figurecaption} +% \LWR@print@vspace*{\baselineskip} + }{ + \BlockClass{figurecaption} + }% + } + {\endBlockClass} % \end{macrocode} % \end{environment} % @@ -27856,7 +28050,7 @@ autopage-\theLWR@currentautosec% % No need for a |minipage| or \cs{parbox} inside the caption: % \begin{macrocode} \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}% -\RenewDocumentCommand{\parbox}{O{t} o O{t} m +m}{##5}% +\RenewDocumentCommand{\parbox}{O{t} O{} O{t} m +m}{##5}% % \end{macrocode} % Enclose the original caption code inside an \HTML\ tag: % \begin{macrocode} @@ -28230,7 +28424,7 @@ autopage-\theLWR@currentautosec% % \begin{docsidebar}[CSS related to sideTOC:] % \raggedright % \begin{description}[parsep=0ex] -% \item [|nav.sidetoc|:] The entire side\TOC. +% \item [|div.sidetoccontainer|:] The entire side\TOC. % \item [|div.sidetoctitle|:] The title. % \item [|div.sidetoccontents|:] The table of contents. % \end{description} @@ -28282,6 +28476,7 @@ autopage-\theLWR@currentautosec% % \end{macrocode} % The entire side\TOC\ is placed into a |nav| of class |sidetoc|. % \begin{macrocode} +\LWR@htmlelementclass{div}{sidetoccontainer} \LWR@htmlelementclass{nav}{sidetoc} \setcounter{tocdepth}{\value{SideTOCDepth}} @@ -28291,6 +28486,7 @@ autopage-\theLWR@currentautosec% % contain paragraphs. % \begin{macrocode} \begin{BlockClass}{sidetoctitle} +\ifcsvoid{thetitle}{}{\InlineClass{sidetocthetitle}{\thetitle}\par} \sidetocname \end{BlockClass} % \end{macrocode} @@ -28302,6 +28498,7 @@ autopage-\theLWR@currentautosec% \LWR@myshorttoc{sidetoc} \end{BlockClass} \LWR@htmlelementclassend{nav}{sidetoc} +\LWR@htmlelementclassend{div}{sidetoccontainer} } % \end{macrocode} % \end{macro} @@ -28645,6 +28842,7 @@ autopage-\theLWR@currentautosec% % % \changes{v0.58}{2018/06/17}{Adds support for \cs{see}, \cs{seealso}, \cs{emph}, \cs{textbf}, etc.} % \changes{v0.61}{2018/09/27}{Made robust,} +% \changes{v0.65}{2018/12/09}{Added \cs{textsi}.} % \begin{macrocode} \newcommand{\LWR@hyperindexrefnullified}{% \renewrobustcmd{\emph}[1]{\LWR@HTML@emph{\LWR@doindexentry{##1}}}% @@ -28654,6 +28852,7 @@ autopage-\theLWR@currentautosec% \renewrobustcmd{\texttt}[1]{\LWR@HTML@texttt{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textup}[1]{\LWR@HTML@textup{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textsc}[1]{\LWR@HTML@textsc{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textsi}[1]{\LWR@HTML@textsi{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textit}[1]{\LWR@HTML@textit{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textsl}[1]{\LWR@HTML@textsl{\LWR@doindexentry{##1}}}% } @@ -28863,6 +29062,12 @@ autopage-\theLWR@currentautosec% \LetLtxMacro\upshape\LWR@origupshape% \LetLtxMacro\slshape\LWR@origslshape% \LetLtxMacro\scshape\LWR@origscshape% +% \end{macrocode} +% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.} +% \begin{macrocode} +\LetLtxMacro\sishape\LWR@origsishape% +% \end{macrocode} +% \begin{macrocode} \LetLtxMacro\itshape\LWR@origitshape% \LetLtxMacro\em\LWR@origem% \LetLtxMacro\normalfont\LWR@orignormalfont% @@ -28877,10 +29082,20 @@ autopage-\theLWR@currentautosec% \let\enskip\LWR@origenskip% \let\quad\LWR@origquad% \let\qquad\LWR@origqquad% -\LetLtxMacro\tabular\LWR@origtabular% +% \end{macrocode} +% +% \cs{endtabular} must be restored to its original, +% instead of relying on \pkg{lwarp}'s \cs{LWR@formatted} mechanism: +% \changes{v0.65}{2018/12/16}{Fix: \env{tabular*}.} +% \begin{macrocode} \LetLtxMacro\endtabular\LWR@origendtabular% +\csletcs{endtabular*}{LWR@origendtabular*}% +% \end{macrocode} +% \begin{macrocode} \LetLtxMacro\noalign\LWR@orignoalign% \LetLtxMacro\hline\LWR@orighline% +% \end{macrocode} +% \begin{macrocode} \let\newline\LWR@orignewline% \LetLtxMacro\includegraphics\LWR@origincludegraphics% \let\TeX\LWR@origTeX% @@ -31045,12 +31260,20 @@ autopage-\theLWR@currentautosec% % \end{macrocode} % % -% If was loaded before \pkg{lwarp}, load the \pkg{lwarp} version as well. +% If the given package was loaded before or by \pkg{lwarp}, +% load the \pkg{lwarp} version as well. % \begin{macro}{\LWR@PreloadedPackage} \marg{packagename} % \changes{v0.62}{2018/11/17}{Added.} +% \changes{v0.65}{2018/12/21}{\cs{AtBeginDocument} to avoid option clashes.} % \begin{macrocode} \newcommand*{\LWR@PreloadedPackage}[1]{% -\@ifpackageloaded{#1}{\LWR@origRequirePackage{lwarp-#1}}{} + \@ifpackageloaded{#1}% + {% + \AtBeginDocument{ + \LWR@origRequirePackage{lwarp-#1}% + } + }% + {}% } % \end{macrocode} % \end{macro} @@ -31086,6 +31309,26 @@ autopage-\theLWR@currentautosec% \LWR@PreloadedPackage{xetexko-vertical} % \end{macrocode} +% \pkg{geometry} is preloaded by \pkg{lwarp}, and perhaps by various classes. +% \begin{macrocode} +\LWR@PreloadedPackage{geometry} +% \end{macrocode} + +% \pkg{plext} is preloaded by some CJK classes. +% \begin{macrocode} +\LWR@PreloadedPackage{plext} +% \end{macrocode} + +% \pkg{stfloats} is preloaded by \pkg{ltj*} classes. +% \begin{macrocode} +\LWR@PreloadedPackage{stfloats} +% \end{macrocode} + +% \pkg{lltjext} is preloaded by \pkg{ltj*} classes. +% \begin{macrocode} +\LWR@PreloadedPackage{lltjext} +% \end{macrocode} + % \begin{macrocode} \end{warpHTML} % \end{macrocode} @@ -31159,9 +31402,11 @@ autopage-\theLWR@currentautosec% % \codeprint % % For print output, accept and then discard the new |class| key: +% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.} % \begin{macrocode} \begin{warpprint} \define@key{Gin}{class}{} +\define@key{Gin}{alt}{} % \end{macrocode} % % Print-mode additions for the \pkg{overpic} package. @@ -31769,6 +32014,7 @@ autopage-\theLWR@currentautosec% % \oarg{inner vert position} \marg{width} % \changes{v0.18}{2016/05/17}{Fix: \cs{linewidth}, \cs{textwidth}, \cs{textheight} inside a minipage.} % \changes{v0.57}{2018/05/28}{Improved print/\HTML\ output selection.} +% \changes{v0.65}{2018/12/17}{Refactored to later allow Japanese \textless{}t/y\textgreater{} argument.} % % The vertical positions may be 'c', 't', or 'b'. % The inner position may also be 's'. @@ -31777,7 +32023,7 @@ autopage-\theLWR@currentautosec% % 6\texttimes{}9 inch text area. % % \begin{macrocode} -\NewDocumentEnvironment{LWR@HTML@minipage}{O{t} o O{t} m} +\NewDocumentEnvironment{LWR@HTML@sub@minipage}{m m m m} {% \LWR@traceinfo{minipage}% % \end{macrocode} @@ -31812,7 +32058,7 @@ autopage-\theLWR@currentautosec% % Compute height: % \begin{macrocode} \setlength{\LWR@minipageheight}{\textheight}% default unless specified -\IfValueT{#2}{\setlength{\LWR@minipageheight}{#2}}% +\ifblank{#2}{}{\setlength{\LWR@minipageheight}{#2}}% % \end{macrocode} % Track nesting depth: % \begin{macrocode} @@ -31863,7 +32109,7 @@ autopage-\theLWR@currentautosec% {width:\LWR@printlength{\LWR@minipagewidth} ; }% }% \LWR@traceinfo{minipage: about to print the height}% -\IfValueT{#2}{height:\LWR@printlength{\LWR@minipageheight} ; }% +\ifblank{#2}{}{height:\LWR@printlength{\LWR@minipageheight} ; }% "}% % \end{macrocode} % Finish with an empty line to start the contents on a new line. @@ -31942,6 +32188,10 @@ autopage-\theLWR@currentautosec% \LWR@traceinfo{LWR@minipage: done}% } +\NewDocumentEnvironment{LWR@HTML@minipage}{O{t} O{} O{t} m} + {\LWR@HTML@sub@minipage{#1}{#2}{#3}{#4}} + {\endLWR@HTML@sub@minipage} + \LWR@formattedenv{minipage} % \end{macrocode} % \end{environment} @@ -31959,7 +32209,7 @@ autopage-\theLWR@currentautosec% % % \changes{v0.57}{2018/05/28}{Improved print/\HTML\ output selection.} % \begin{macrocode} -\NewDocumentCommand{\LWR@HTML@parbox}{O{t} o O{t} m +m} +\NewDocumentCommand{\LWR@HTML@parbox}{O{t} O{} O{t} m +m} { \LWR@traceinfo{parbox of width #4}% \begin{minipage}[#1][#2][#3]{#4}% @@ -32443,6 +32693,29 @@ width:\LWR@printlength{\LWR@tempwidth}% % \end{macrocode} % \end{macro} +% \begin{macro}{\textsi} \marg{text} +% \changes{v0.65}{2018/12/09}{Added.} +% \begin{macrocode} +\@ifundefined{textsi}{ + \LetLtxMacro\LWR@print@textsi\LWR@print@textsc +}{} + +\DeclareRobustCommand{\LWR@HTML@textsi}[1]{% + {% + \sishape% + \InlineClass( + font-style: italic; + font-variant: small-caps ; + font-variant-numeric: oldstyle-nums ; + ){textsi}{#1}% + }% +} +\LWR@formatted{textsi} + +\DeclareRobustCommand{\LWR@null@textsi}[1]{#1} +% \end{macrocode} +% \end{macro} + % \begin{macro}{\textsl} \marg{text} % \begin{macrocode} \DeclareRobustCommand{\LWR@HTML@textsl}[1]{% @@ -32501,6 +32774,7 @@ width:\LWR@printlength{\LWR@tempwidth}% % \changes{v0.40}{2017/09/21}{Fix: Long arguments for expandable command.} % \changes{v0.43}{2017/10/31}{Fix: Nullify dollar inside filesnames.} % \changes{v0.48}{2018/02/04}{Fix: \cs{newline} in title.} +% \changes{v0.65}{2018/12/09}{Added \cs{textsi}.} % \begin{macrocode} \newcommand*{\LWR@nullfonts}{% \LetLtxMacro\emph\LWR@null@emph% @@ -32512,6 +32786,7 @@ width:\LWR@printlength{\LWR@tempwidth}% \LetLtxMacro\textup\LWR@null@textup% \LetLtxMacro\textit\LWR@null@textit% \LetLtxMacro\textsc\LWR@null@textsc% +\LetLtxMacro\textsi\LWR@null@textsi% \LetLtxMacro\textsl\LWR@null@textsl% \LetLtxMacro\textnormal\LWR@null@textnormal% \LetLtxMacro\rmfamily\LWR@null@rmfamily% @@ -32522,6 +32797,12 @@ width:\LWR@printlength{\LWR@tempwidth}% \LetLtxMacro\upshape\LWR@null@upshape% \LetLtxMacro\slshape\LWR@null@slshape% \LetLtxMacro\scshape\LWR@null@scshape% +% \end{macrocode} +% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.} +% \begin{macrocode} +\LetLtxMacro\sishape\LWR@null@sishape% +% \end{macrocode} +% \begin{macrocode} \LetLtxMacro\itshape\LWR@null@itshape% \LetLtxMacro\normalfont\LWR@null@normalfont% \LetLtxMacro\em\LWR@null@em% @@ -32682,6 +32963,17 @@ width:\LWR@printlength{\LWR@tempwidth}% % \end{macrocode} % \end{macro} +% \begin{macro}{\sishape} +% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.} +% \begin{macrocode} +\@ifundefined{sishape}{ + \newrobustcmd*{\sishape}{\renewcommand*{\LWR@f@shape}{si}} +}{ + \renewrobustcmd*{\sishape}{\renewcommand*{\LWR@f@shape}{si}} +} +% \end{macrocode} +% \end{macro} + % \begin{macro}{\slshape} % \changes{v0.62}{2018/11/11}{Added.} % \begin{macrocode} @@ -33073,11 +33365,13 @@ width:\LWR@printlength{\LWR@tempwidth}% % \begin{macro}{\quad} % Handles special minipage \& horizontal space interactions. +% Uses |2003 EM SPACE| to pass validation. % \changes{v0.64}{2018/12/08}{Made robust.} +% \changes{v0.65}{2018/12/22}{Changed to Unicode EM SPACE.} % \begin{macrocode} \renewrobustcmd*{\quad}{% \LWR@minipagestoppars% -\HTMLunicode{2001}% +\HTMLunicode{2003}% \LWR@minipagestartpars% } % \end{macrocode} @@ -33094,10 +33388,11 @@ width:\LWR@printlength{\LWR@tempwidth}% % \begin{macro}{\enskip} % Handles special minipage \& horizontal space interactions. % \changes{v0.64}{2018/12/08}{Made robust.} +% \changes{v0.65}{2018/12/22}{Changed to Unicode EN SPACE.} % \begin{macrocode} \renewrobustcmd*{\enskip}{% \LWR@minipagestoppars% -\HTMLunicode{2000}% +\HTMLunicode{2002}% \LWR@minipagestartpars% } % \end{macrocode} @@ -33735,34 +34030,15 @@ width:\LWR@printlength{\LWR@tempwidth}% % \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} +% \section{\pkg{ut*} classes} % -% Load patches to \pkg{ltjs*} classes. +% Load patches to \pkg{uj*} and \pkg{ut*} classes, as well as \pkg{ltj*} classes. % -% \changes{v0.63}{2018/11/24}{\pkg{ltjs*}: Added.} +% \changes{v0.64}{2018/12/07}{\pkg{ujarticle} and related: Improved \cs{today}.} +% \changes{v0.64}{2018/12/07}{Added \pkg{utarticle} and related.} +% \changes{v0.65}{2018/12/15}{Fix for \cs{rensuji}.} % % \codehtml % \begin{macrocode} @@ -33770,35 +34046,14 @@ width:\LWR@printlength{\LWR@tempwidth}% % \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}}{} +\newcommand*{\LWR@patchujtclasses}{ % \end{macrocode} % +% \pkg{uj/t} does not use \cs{partname} % \begin{macrocode} -\end{warpHTML} + \def\@partnameformat{} % \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% @@ -33813,6 +34068,9 @@ width:\LWR@printlength{\LWR@tempwidth}% \quad% } } +% \end{macrocode} +% Use decimal points instead of centered dots: +% \begin{macrocode} \renewcommand{\thepart}{\@Roman\c@part} \@ifundefined{chapter}{ \renewcommand{\thesection}{\@arabic\c@section} @@ -33827,6 +34085,15 @@ width:\LWR@printlength{\LWR@tempwidth}% \thesubsubsection.\@arabic\c@paragraph} \renewcommand{\thesubparagraph}{% \theparagraph.\@arabic\c@subparagraph} + \@ifundefined{chapter}{ + \renewcommand{\thefigure}{\@arabic\c@figure} + \renewcommand{\thetable}{\@arabic\c@table} + }{ + \renewcommand{\thefigure}{% + \ifnum\c@chapter>\z@\thechapter.\fi\@arabic\c@figure} + \renewcommand{\thetable}{% + \ifnum\c@chapter>\z@\thechapter.\fi\@arabic\c@table} + } } \@ifclassloaded{ujarticle}{\LWR@patchujtclasses}{} @@ -33835,6 +34102,17 @@ width:\LWR@printlength{\LWR@tempwidth}% \@ifclassloaded{utarticle}{\LWR@patchujtclasses}{} \@ifclassloaded{utbook}{\LWR@patchujtclasses}{} \@ifclassloaded{utreport}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjarticle}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjbook}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjreport}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjsarticle}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjsbook}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjsreport}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjskiyou}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjspf}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjtarticle}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjtbook}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjtreport}{\LWR@patchujtclasses}{} % \end{macrocode} % % \begin{macrocode} @@ -35729,6 +36007,8 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % % % +% +% % \iffalse %<*array> % \fi @@ -35740,12 +36020,15 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % \DescribePackage{array} % \pkg{array} is used as-is for print output, and emulated for \HTML. % +% \pkg{plarray} and \pkg{plextarray} do not affect \cs{firsthline} or +% \cs{lasthline}, and so are not affected by the following. +% % \changes{v0.45}{2017/12/03}{\pkg{array}: Added.} % \changes{v0.58}{2018/06/07}{\pkg{array}: Improved print/\HTML\ output selection.} % % \codehtml % -% Remove the dummy macros: +% Remove the default nullfied macros: % \begin{macrocode} \let\firsthline\relax \let\lasthline\relax @@ -35767,6 +36050,9 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % % % +% +% +% % \iffalse %<*arydshln> % \fi @@ -35820,9 +36106,10 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% \newcommand*{\nodashgapcolor}{} % \end{macrocode} % +% % In a \env{lateximage}, revert to solid vertical rules: % \begin{macrocode} -\appto\LWR@restoreorigformatting{ +\appto\LWR@restoreorigformatting{% \newcolumntype{:}{|}% \newcolumntype{;}[1]{|}% \LetLtxMacro\hdashline\hline% @@ -35890,6 +36177,8 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % % % +% +% % \iffalse %<*asymptote> % \fi @@ -36880,6 +37169,32 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % % % \iffalse +%<*bounddvi> +% \fi +% +% \part{lwarp-bounddvi.sty} +% +% \section{bounddvi} +% +% \DescribePackage{bounddvi} +% \pkg{bounddvi} is ignored. +% +% \changes{v0.65}{2018/12/18}{\pkg{bounddvi}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{bounddvi} +% \end{macrocode} +% +% \iffalse +%</bounddvi> +% \fi +% +% +% +% +% \iffalse %<*boxedminipage2e> % \fi @@ -39498,7 +39813,7 @@ name = \chemmacros_translate:n {scheme-name} % % \codehtml % -% A few placeholder definitions are forgotten first: +% A placeholder definition is forgotten first: % \begin{macrocode} \let\rowcolor\relax @@ -39520,7 +39835,7 @@ name = \chemmacros_translate:n {scheme-name} \LWR@addtabularcellcolor% } -\LWR@formatted{columncolor} +\AtBeginDocument{\LWR@formatted{columncolor}} % \end{macrocode} % \end{noindmacro} % @@ -39538,7 +39853,7 @@ name = \chemmacros_translate:n {scheme-name} \LWR@getmynexttoken% } -\LWR@expandableformatted{rowcolor} +\AtBeginDocument{\LWR@expandableformatted{rowcolor}} % \end{macrocode} % \end{noindmacro} % @@ -39552,7 +39867,7 @@ name = \chemmacros_translate:n {scheme-name} \LWR@addtabularcellcolor% } -\LWR@formatted{cellcolor} +\AtBeginDocument{\LWR@formatted{cellcolor}} % \end{macrocode} % \end{noindmacro} @@ -39567,7 +39882,7 @@ name = \chemmacros_translate:n {scheme-name} \convertcolorspec{#1}{#2}{HTML}\LWR@ruleHTMLcolor% } -\LWR@expandableformatted{arrayrulecolor} +\AtBeginDocument{\LWR@expandableformatted{arrayrulecolor}} % \end{macrocode} % \end{noindmacro} @@ -39582,7 +39897,7 @@ name = \chemmacros_translate:n {scheme-name} \LWR@getmynexttoken% } -\LWR@expandableformatted{arrayrulecolornexttoken} +\AtBeginDocument{\LWR@expandableformatted{arrayrulecolornexttoken}} % \end{macrocode} % \end{noindmacro} @@ -39592,7 +39907,7 @@ name = \chemmacros_translate:n {scheme-name} % \begin{macrocode} \newcommand{\LWR@HTML@doublerulesepcolor}[2][named]{} -\LWR@expandableformatted{doublerulesepcolor} +\AtBeginDocument{\LWR@expandableformatted{doublerulesepcolor}} % \end{macrocode} % \end{noindmacro} @@ -39602,7 +39917,7 @@ name = \chemmacros_translate:n {scheme-name} % \begin{macrocode} \newcommand{\LWR@HTML@doublerulesepcolornexttoken}[2][named]{\LWR@getmynexttoken} -\LWR@expandableformatted{doublerulesepcolornexttoken} +\AtBeginDocument{\LWR@expandableformatted{doublerulesepcolornexttoken}} % \end{macrocode} % \end{noindmacro} @@ -40322,6 +40637,66 @@ name = \chemmacros_translate:n {scheme-name} % % % +% \iffalse +%<*embrac> +% \fi +% +% \part{lwarp-embrac.sty} +% +% \section{embrac} +% +% \credits{Clemens Niederberger} +% +% \DescribePackage{embrac} +% \pkg{embrac} is nullfied for \HTML\, and used as-is for print. +% +% \changes{v0.65}{2018/12/10}{\pkg{embrac}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{embrac} +% \end{macrocode} +% +% \begin{macrocode} +\LetLtxMacro\LWR@orig@HTML@emph\LWR@HTML@emph +\RenewDocumentCommand{\LWR@HTML@emph}{s m}{\LWR@orig@HTML@emph{#2}} + +\LetLtxMacro\LWR@orig@HTML@textit\LWR@HTML@textit +\RenewDocumentCommand{\LWR@HTML@textit}{s m}{\LWR@orig@HTML@textit{#2}} + +\LetLtxMacro\LWR@orig@HTML@textsl\LWR@HTML@textsl +\RenewDocumentCommand{\LWR@HTML@textsl}{s m}{\LWR@orig@HTML@textsl{#2}} + +\ifxetexorluatex + \LetLtxMacro\LWR@orig@HTML@textsi\LWR@HTML@textsi + \RenewDocumentCommand{\LWR@HTML@textsi}{s m}{% + \LWR@orig@HTML@textsi{#2}} +\fi + +\AtBeginDocument{ + \LWR@formatted{emph} + \LWR@formatted{textit} + \LWR@formatted{textsl} + \ifxetexorluatex + \LWR@formatted{textsi} + \fi +} + +\newcommand{\LWR@HTML@EmbracOff}{} +\LWR@formatted{EmbracOff} + +\newcommand{\LWR@HTML@EmbracOn}{} +\LWR@formatted{EmbracOn} +% \end{macrocode} +% +% \iffalse +%</embrac> +% \fi +% +% +% +% % % \iffalse %<*emptypage> @@ -41022,8 +41397,6 @@ name = \chemmacros_translate:n {scheme-name} % % % -% -% % \iffalse %<*everyshi> % \fi @@ -41057,8 +41430,6 @@ name = \chemmacros_translate:n {scheme-name} % % % -% -% % \iffalse %<*extramarks> % \fi @@ -43205,6 +43576,37 @@ solid \LWR@origpound\LWR@tempcolor ; % % % % +% \iffalse +%<*footnoterange> +% \fi +% +% \part{lwarp-footnoterange.sty} +% +% \section{footnoterange} +% +% \credits{H.-Martin Münch} +% +% \DescribePackage{footnoterange} +% \pkg{footnoterange} is patched for use by \pkg{lwarp}. +% +% \changes{v0.65}{2018/12/10}{\pkg{footnoterange}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{footnoterange} +% \end{macrocode} +% +% \begin{macrocode} +\csletcs{footnoterange}{footnoterange*} +\csletcs{endfootnoterange}{endfootnoterange*} +% \end{macrocode} +% +% \iffalse +%</footnoterange> +% \fi +% +% % % % \iffalse @@ -43610,6 +44012,40 @@ solid \LWR@origpound\LWR@tempcolor ; % % % % +% \iffalse +%<*gentombow> +% \fi +% +% \part{lwarp-gentombow.sty} +% +% \section{gentombow} +% +% \DescribePackage{gentombow} +% \pkg{gentombow} is ignored. +% +% \changes{v0.65}{2018/12/18}{\pkg{gentombow}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{gentombow} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand{\settombowbanner}[1]{} +\newcommand{\settombowbannerfont}[1]{} +\newcommand{\settombowwidth}[1]{} +\newcommand{\settombowbleed}[1]{} +\newcommand{\settombowcolor}[1]{} +% \end{macrocode} +% +% \iffalse +%</gentombow> +% \fi +% +% +% +% % % \iffalse %<*geometry> @@ -43628,12 +44064,12 @@ solid \LWR@origpound\LWR@tempcolor ; % % \changes{v0.22}{2017/03/01}{\pkg{geometry}: Nullified commands.} % % \codehtml - +% % Discard all options for \pkg{lwarp-geometry}: % \begin{macrocode} \LWR@ProvidesPackageDrop{geometry} % \end{macrocode} - +% % \begin{macrocode} \renewcommand*{\geometry}[1]{} \renewcommand*{\newgeometry}[1]{} @@ -43641,7 +44077,7 @@ solid \LWR@origpound\LWR@tempcolor ; % \renewcommand*{\savegeometry}[1]{} \renewcommand*{\loadgeometry}[1]{} % \end{macrocode} - +% % \iffalse %</geometry> % \fi @@ -43853,6 +44289,10 @@ solid \LWR@origpound\LWR@tempcolor ; % \newcommand*{\LWR@igyscale}{1} \newcommand*{\LWR@igclass}{inlineimage} % \end{macrocode} +% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.} +% \begin{macrocode} +\newcommand*{\LWR@igalt}{(image)} +% \end{macrocode} % Set the actions of each of the key/value combinations for % \cs{includegraphics}. Many are ignored. @@ -43936,8 +44376,14 @@ solid \LWR@origpound\LWR@tempcolor ; % % Handle class key: % \begin{macrocode} \define@key{igraph}{class}{\renewcommand*{\LWR@igclass}{#1}} - % \end{macrocode} +% +% Handle alt key: +% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.} +% \begin{macrocode} +\define@key{igraph}{alt}{\renewcommand*{\LWR@igalt}{#1}} +% \end{macrocode} +% % ^^A \define@key{igraph}{xscale}{\renewcommand*{\LWR@igxscale}{#1}} % ^^A \define@key{igraph}{yscale}{\renewcommand*{\LWR@igyscale}{#1}} % It appears that \pkg{graphicx} does not have separate keys for @@ -44060,9 +44506,11 @@ solid \LWR@origpound\LWR@tempcolor ; % % Define the new class key for the print-mode version of \cs{includegraphics}, % which is enabled inside a \env{lateximage}. % \changes{v0.42}{2017/10/24}{\pkg{includegraphics}: Fix: Class key.} +% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.} % \begin{macrocode} \AtBeginDocument{ \define@key{Gin}{class}{} +\define@key{Gin}{alt}{} } % \end{macrocode} @@ -44154,6 +44602,10 @@ solid \LWR@origpound\LWR@tempcolor ; % \renewcommand*{\LWR@igyscale}{1}% \renewcommand*{\LWR@igclass}{inlineimage}% % \end{macrocode} +% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.} +% \begin{macrocode} +\renewcommand*{\LWR@igalt}{(image)}% +% \end{macrocode} % % If |#3| is empty, only one optional argument was given, thus \pkg{graphicx} syntax: % \begin{macrocode} @@ -44308,9 +44760,11 @@ img src="% " \LWR@orignewline% }{}% % \end{macrocode} -% Set the class: +% Set the class and alt tag: +% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.} % \begin{macrocode} \LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline% +\LWR@origtilde{} alt="\LWR@igalt" \LWR@orignewline% }% end of image tags }% end of href % \end{macrocode} @@ -46924,6 +47378,75 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % % % +% \iffalse +%<*lltjext> +% \fi +% +% \part{lwarp-lltjext.sty} +% +% \section{lltjext} +% +% \credits{The Lua\TeX-ja project team} +% +% \DescribePackage{lltjext} +% \pkg{lltjext} is patched for use by \pkg{lwarp}. +% +% \changes{v0.65}{2018/12/21}{\pkg{lltjext}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{lltjext} +% \end{macrocode} +% +% \begin{macrocode} +\protected\def\yoko{% + \directlua{luatexja.direction.set_list_direction(4, 'yoko')}% +} +\protected\def\tate{\yoko} +\protected\def\dtou{\yoko} +\protected\def\utod{\yoko} + +\define@key[ltj]{japaram}{direction}{} + +\yoko + +\DeclareExpandableDocumentCommand{\rensuji}{s o m}{#3} + +\DeclareDocumentCommand{\layoutfloat}{d() o m}{} + +\DeclareDocumentCommand{\DeclareLayoutCaption}{m d<> d() o}{} + +\LetLtxMacro\pcaption\caption + +\DeclareDocumentCommand{\layoutcaption}{d<> d() o}{} + +\let\captiondir\relax +\RenewDocumentEnvironment{LWR@HTML@minipage}{d<> O{t} O{} O{t} m} + {\LWR@HTML@sub@minipage{#2}{#3}{#4}{#5}} + {\endLWR@HTML@sub@minipage} + +\RenewDocumentCommand{\LWR@HTML@parbox}{d<> O{t} O{} O{t} m +m} +{ +\LWR@traceinfo{parbox of width #4}% +\begin{minipage}[#2][#3][#4]{#5}% +#6 +\end{minipage}% +} + +\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{% +\booltrue{LWR@minipagefullwidth}% +\parbox{#2}{#4}% +} +% \end{macrocode} +% +% \iffalse +%</lltjext> +% \fi +% +% +% +% % % \iffalse %<*longtable> @@ -46968,9 +47491,9 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% \caption@LT@setup% \booltrue{LWR@starredlongtable}% \let\captionlistentry\LWR@LTcaptionlistentry% -\LWR@tabular{#2} +\tabular{#2} } -{\endLWR@tabular\LWR@floatend} +{\endtabular\LWR@floatend} \newenvironment{longtable}[2][]{% \LWR@floatbegin{table}% @@ -46980,10 +47503,9 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% \caption@LT@setup% \refstepcounter{\LTcaptype}% \let\captionlistentry\LWR@LTcaptionlistentry% -\LWR@tabular{#2} +\tabular{#2} } -{\endLWR@tabular\LWR@floatend} - +{\endtabular\LWR@floatend} % \end{macrocode} % \end{environment} @@ -48883,6 +49405,13 @@ background: \newlength{\multicolovershoot} \newlength{\multicolundershoot} % \end{macrocode} +% +% \changes{v0.65}{2018/12/15}{\pkg{multicol}: Added \cs{docolaction}.} +% \begin{macrocode} +\NewDocumentCommand{\docolaction}{s o m m m}{% + \IfValueTF{#2}{#2}{#3}% +} +% \end{macrocode} % \begin{macrocode} \end{warpHTML} @@ -48896,6 +49425,38 @@ background: % % % +% \iffalse +%<*multicolrule> +% \fi +% +% \part{lwarp-multicolrule.sty} +% +% \section{multicolrule} +% +% \DescribePackage{multicolrule} +% \pkg{multicolrule} is ignored. +% +% \changes{v0.65}{2018/12/21}{\pkg{multicolrule}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\RequirePackage{multicol} + +\LWR@ProvidesPackageDrop{multicolrule} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\SetMCRule}[1]{} +% \end{macrocode} +% +% \iffalse +%</multicolrule> +% \fi +% +% +% +% % % % \iffalse @@ -50784,7 +51345,7 @@ class="td% % \end{macrocode} % % \begin{macrocode} -\NewDocumentCommand{\pbox}{O{t} o O{t} m +m}{% +\NewDocumentCommand{\pbox}{O{t} O{} O{t} m +m}{% \booltrue{LWR@minipagefullwidth}% \parbox[#1][#2][#3]{#4}{#5}% } @@ -50871,9 +51432,6 @@ class="td% \LWR@ProvidesPackageDrop{pdflscape} % \end{macrocode} % -% \begin{macrocode} -% \end{macrocode} -% % \iffalse %</pdflscape> % \fi @@ -51359,6 +51917,168 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% \iffalse +%<*plarydshln> +% \fi +% +% \part{lwarp-plarydshln.sty} +% +% \section{plarydshln} +% +% \DescribePackage{plarydshln} +% \pkg{plarydshln} is emulated by \pkg{lwarp-arydshln}. +% +% \changes{v0.65}{2018/12/17}{\pkg{plarydshln}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{plarydshln} +% \end{macrocode} +% +% \begin{macrocode} +\LWR@origRequirePackage{lwarp-arydshln} +% \end{macrocode} +% +% \iffalse +%</plarydshln> +% \fi +% +% +% +% +% +% \iffalse +%<*plext> +% \fi +% +% \part{lwarp-plext.sty} +% +% \section{plext} +% +% \DescribePackage{plext} +% \pkg{plext} is preloaded by \pkg{jtarticle} and related classes. +% +% \changes{v0.65}{2017/08/27}{\pkg{plext}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@loadbefore{plext} + +\LWR@ProvidesPackagePass{plext}[2017/07/21] +% \end{macrocode} +% +% ^^A *8* if \cs{layoutfloat}, frame the next float +% \begin{macrocode} +\let\tate\relax + +\DeclareExpandableDocumentCommand{\rensuji}{s o m}{#3} + +% \layoutfloat(width,height)[pos]#4 +\DeclareDocumentCommand{\layoutfloat}{d() o m}{} + +% \DeclareLayoutCaption{type} <dir>(width)[pos1pos2] +\DeclareDocumentCommand{\DeclareLayoutCaption}{m d<> d() o}{} + +\LetLtxMacro\pcaption\caption + +% \layoutcaption<dir>(width)[pos] +\DeclareDocumentCommand{\layoutcaption}{d<> d() o}{} + +\let\captiondir\relax +% \end{macrocode} +% +% Add the optional |<t/y>| direction: +% \begin{macrocode} +\RenewDocumentEnvironment{LWR@HTML@minipage}{d<> O{t} O{} O{t} m} + {\LWR@HTML@sub@minipage{#2}{#3}{#4}{#5}} + {\endLWR@HTML@sub@minipage} + +\RenewDocumentCommand{\LWR@HTML@parbox}{d<> O{t} O{} O{t} m +m} +{ +\LWR@traceinfo{parbox of width #4}% +\begin{minipage}[#2][#3][#4]{#5}% +#6 +\end{minipage}% +} + +% \pbox <t/y> [width] [l/r] {contents} +\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{% +\booltrue{LWR@minipagefullwidth}% +\parbox{#2}{#4}% +} +% \end{macrocode} +% +% \env{picture}, as modified by \pkg{pext}, +% is encapsulated by the \pkg{lwarp} core. +% +% \iffalse +%</plext> +% \fi +% +% +% +% +% \iffalse +%<*plextarydshln> +% \fi +% +% \part{lwarp-plextarydshln.sty} +% +% \section{plextarydshln} +% +% \DescribePackage{plextarydshln} +% \pkg{plextarydshln} is emulated by \pkg{lwarp-arydshln}. +% +% \changes{v0.65}{2018/12/17}{\pkg{plextarydshln}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{plextarydshln} +% \end{macrocode} +% +% \begin{macrocode} +\LWR@origRequirePackage{lwarp-arydshln} +% \end{macrocode} +% +% \iffalse +%</plextarydshln> +% \fi +% +% +% +% +% \iffalse +%<*plextcolortbl> +% \fi +% +% \part{lwarp-plextcolortbl.sty} +% +% \section{plextcolortbl} +% +% \DescribePackage{plextcolortbl} +% \pkg{plextcolortbl} is emulated by \pkg{lwarp-arydshln}. +% +% \changes{v0.65}{2018/12/17}{\pkg{plextcolortbl}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{plextcolortbl} +% \end{macrocode} +% +% \begin{macrocode} +\LWR@origRequirePackage{lwarp-colortbl} +% \end{macrocode} +% +% \iffalse +%</plextcolortbl> +% \fi +% +% +% % % % \iffalse @@ -51667,6 +52387,122 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% +% \iffalse +%<*pxatbegshi> +% \fi +% +% \part{lwarp-pxatbegshi.sty} +% +% \section{pxatbegshi} +% +% \DescribePackage{pxatbegshi} +% \pkg{pxatbegshi} is ignored. +% +% \changes{v0.65}{2018/12/17}{\pkg{pxatbegshi}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{pxatbegshi} +% \end{macrocode} +% +% \begin{macrocode} +\LWR@origRequirePackage{lwarp-atbegshi} +% \end{macrocode} +% +% \iffalse +%</pxatbegshi> +% \fi +% +% +% +% \iffalse +%<*pxeveryshi> +% \fi +% +% \part{lwarp-pxeveryshi.sty} +% +% \section{pxeveryshi} +% +% \DescribePackage{pxeveryshi} +% \pkg{pxeveryshi} is ignored. +% +% \changes{v0.65}{2018/12/17}{\pkg{pxeveryshi}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{pxeveryshi} +% \end{macrocode} +% +% \begin{macrocode} +\LWR@origRequirePackage{lwarp-everyshi} +% \end{macrocode} +% +% \iffalse +%</pxeveryshi> +% \fi +% +% +% +% +% \iffalse +%<*pxftnright> +% \fi +% +% \part{lwarp-pxftnright.sty} +% +% \section{pxftnright} +% +% \DescribePackage{pxftnright} +% \pkg{pxftnright} is ignored. +% +% \changes{v0.65}{2018/12/17}{\pkg{pxftnright}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{pxftnright} +% \end{macrocode} +% +% \begin{macrocode} +\LWR@origRequirePackage{lwarp-ftnright} +% \end{macrocode} +% +% \iffalse +%</pxftnright> +% \fi +% +% +% +% +% \iffalse +%<*pxjahyper> +% \fi +% +% \part{lwarp-pxjahyper.sty} +% +% \section{pxjahyper} +% +% \DescribePackage{pxjahyper} +% \pkg{pxjahyper} is ignored. +% +% \changes{v0.65}{2018/12/15}{\pkg{pxjahyper}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{pxjahyper} +% \end{macrocode} +% +% \iffalse +%</pxjahyper> +% \fi +% +% +% +% % \iffalse %<*quotchap> % \fi @@ -54367,7 +55203,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \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.} +% \changes{v0.63}{2018/11/24}{\pkg{stfloats}: Adapted to \pkg{ltj*} classes.} % % \codehtml % @@ -54375,7 +55211,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \LWR@ProvidesPackageDrop{stfloats} % \end{macrocode} % -% \pkg{stfloats} may have been preloaded by a \pkg{ltjs*} class. +% \pkg{stfloats} may have been preloaded by a \pkg{ltj*} class. % % The following are provided in case they have not yet been defined: % \begin{macrocode} @@ -55010,6 +55846,113 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% +% +% \iffalse +%<*tascmac> +% \fi +% +% \part{lwarp-tascmac.sty} +% +% \section{tascmac} +% +% \DescribePackage{tascmac} +% \pkg{tascmac} is ignored. +% +% \changes{v0.65}{2018/12/21}{\pkg{tascmac}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{tascmac} +% \end{macrocode} +% +% \begin{macrocode} +\newenvironment*{boxnote} + { + \BlockClass[ + padding: .5ex ; + border: 1px solid black ; + border-top: 1px dashed black ; + ]{boxnote} + } + {\endBlockClass} + +\newenvironment*{screen}[1][] + { + \BlockClass[ + padding: .5ex ; + border: 1px solid gray ; + border-radius: 8pt + ]{boxnote} + } + {\endBlockClass} + +\newenvironment*{itembox}[2][] + { + \BlockClass[ + padding: .5ex ; + border: 1px solid gray ; + border-radius: 8pt + ]{boxnote} + \InlineClass{itemboxtitle}{#2}\par + } + {\endBlockClass} + +\newenvironment*{shadebox} + { + \BlockClass[ + padding: .5ex ; + border: 1px solid black ; + box-shadow: 3px 3px 3px \#808080 ; + ]{boxnote} + } + {\endBlockClass} + +\newcommand*{\mask}[2]{% + \InlineClass[background: lightgray]{mask}{#1}% +} + +\newcommand*{\maskbox}[5]{% + \InlineClass[background: lightgray]{mask}{#5}% +} + +\newcommand*{\Maskbox}[6]{% + \InlineClass[ + background: lightgray ; + border: #5 solid black + ]{mask}{#6}% +} + +\newcommand*{\keytop}[2][]{% + \InlineClass[% + padding: .2ex ; + border: 1px solid black ; + border-radius: .7ex ; + ]{keytop}{#2}% +} + +\def\yen{\HTMLunicode{00A5}} + +\def\return{\HTMLunicode{23CE}} + +\def\Return{\HTMLunicode{23CE}} + +\def\ascii{ASCII Corporation} + +\def\Ascii{ASCII Corporation} + +\def\ASCII{ASCII Corporation} +% \end{macrocode} +% +% \iffalse +%</tascmac> +% \fi +% +% +% +% +% % \iffalse %<*textarea> % \fi @@ -56669,27 +57612,27 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \DeclareDocumentCommand{\@maketitle}{}{% \maketitlehooka { - \LWR@stoppars\LWR@htmltag{\LWR@tagtitle} - \@bspretitle \@title \@bsposttitle - \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars + \LWR@stoppars\LWR@htmltag{\LWR@tagtitle}% + \@bspretitle \@title \@bsposttitle% + \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars% } \maketitlehookb { \begin{BlockClass}{author} - \renewcommand{\and}{ - \end{BlockClass} - \begin{BlockClass}{oneauthor} + \renewcommand{\and}{% + \end{BlockClass}% + \begin{BlockClass}{oneauthor}% } - \begin{BlockClass}{oneauthor} - \@bspreauthor \@author \@bspostauthor - \end{BlockClass} - \end{BlockClass} + \begin{BlockClass}{oneauthor}% + \@bspreauthor \@author \@bspostauthor% + \end{BlockClass}% + \end{BlockClass}% } \maketitlehookc { - \begin{BlockClass}{titledate} - \@bspredate \@date \@bspostdate - \end{BlockClass} + \begin{BlockClass}{titledate}% + \@bspredate \@date \@bspostdate% + \end{BlockClass}% } \maketitlehookd } @@ -58362,6 +59305,43 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% +% \iffalse +%<*versonotes> +% \fi +% +% \part{lwarp-versonotes.sty} +% +% \section{versonotes} +% +% \credits{Norman Gray} +% +% \DescribePackage{versonotes} +% \pkg{versonotes} is emulated. +% +% \changes{v0.65}{2018/12/10}{\pkg{versonotes}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{versonotes} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand{\versonote}[1]{\marginpar{#1}} +\newdimen\versotextwidth +\newdimen\versoleftmargin +\newcommand*{\versolayout}{} +% \end{macrocode} +% +% \iffalse +%</versonotes> +% \fi +% +% +% +% +% % \iffalse %<*vertbars> % \fi diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins index 39873a0254b..accdefe8f57 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins @@ -75,6 +75,7 @@ version 2005/12/01 or later. \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-bounddvi.sty}{\from{lwarp.dtx}{bounddvi}} \file{lwarp-boxedminipage2e.sty}{\from{lwarp.dtx}{boxedminipage2e}} \file{lwarp-breakurl.sty}{\from{lwarp.dtx}{breakurl}} \file{lwarp-breqn.sty}{\from{lwarp.dtx}{breqn}} @@ -119,6 +120,7 @@ version 2005/12/01 or later. \file{lwarp-easy-todo.sty}{\from{lwarp.dtx}{easy-todo}} \file{lwarp-ebook.sty}{\from{lwarp.dtx}{ebook}} \file{lwarp-ellipsis.sty}{\from{lwarp.dtx}{ellipsis}} +\file{lwarp-embrac.sty}{\from{lwarp.dtx}{embrac}} \file{lwarp-emptypage.sty}{\from{lwarp.dtx}{emptypage}} \file{lwarp-endfloat.sty}{\from{lwarp.dtx}{endfloat}} \file{lwarp-endheads.sty}{\from{lwarp.dtx}{endheads}} @@ -160,6 +162,7 @@ version 2005/12/01 or later. \file{lwarp-footmisc.sty}{\from{lwarp.dtx}{footmisc}} \file{lwarp-footnote.sty}{\from{lwarp.dtx}{footnote}} \file{lwarp-footnotehyper.sty}{\from{lwarp.dtx}{footnotehyper}} +\file{lwarp-footnoterange.sty}{\from{lwarp.dtx}{footnoterange}} \file{lwarp-fontenc.sty}{\from{lwarp.dtx}{fontenc}} \file{lwarp-footnpag.sty}{\from{lwarp.dtx}{footnpag}} \file{lwarp-framed.sty}{\from{lwarp.dtx}{framed}} @@ -168,6 +171,7 @@ version 2005/12/01 or later. \file{lwarp-fullpage.sty}{\from{lwarp.dtx}{fullpage}} \file{lwarp-fullwidth.sty}{\from{lwarp.dtx}{fullwidth}} \file{lwarp-fwlw.sty}{\from{lwarp.dtx}{fwlw}} +\file{lwarp-gentombow.sty}{\from{lwarp.dtx}{gentombow}} \file{lwarp-geometry.sty}{\from{lwarp.dtx}{geometry}} \file{lwarp-glossaries.sty}{\from{lwarp.dtx}{glossaries}} \file{lwarp-gmeometric.sty}{\from{lwarp.dtx}{gmeometric}} @@ -200,6 +204,7 @@ version 2005/12/01 or later. \file{lwarp-lineno.sty}{\from{lwarp.dtx}{lineno}} \file{lwarp-lips.sty}{\from{lwarp.dtx}{lips}} \file{lwarp-listings.sty}{\from{lwarp.dtx}{listings}} +\file{lwarp-lltjext.sty}{\from{lwarp.dtx}{lltjext}} \file{lwarp-longtable.sty}{\from{lwarp.dtx}{longtable}} \file{lwarp-lscape.sty}{\from{lwarp.dtx}{lscape}} \file{lwarp-ltablex.sty}{\from{lwarp.dtx}{ltablex}} @@ -228,6 +233,7 @@ version 2005/12/01 or later. \file{lwarp-moreverb.sty}{\from{lwarp.dtx}{moreverb}} \file{lwarp-mparhack.sty}{\from{lwarp.dtx}{mparhack}} \file{lwarp-multicol.sty}{\from{lwarp.dtx}{multicol}} +\file{lwarp-multicolrule.sty}{\from{lwarp.dtx}{multicolrule}} \file{lwarp-multirow.sty}{\from{lwarp.dtx}{multirow}} \file{lwarp-multitoc.sty}{\from{lwarp.dtx}{multitoc}} \file{lwarp-musicography.sty}{\from{lwarp.dtx}{musicography}} @@ -264,6 +270,10 @@ version 2005/12/01 or later. \file{lwarp-pfnote.sty}{\from{lwarp.dtx}{pfnote}} \file{lwarp-phfqit.sty}{\from{lwarp.dtx}{phfqit}} \file{lwarp-placeins.sty}{\from{lwarp.dtx}{placeins}} +\file{lwarp-plarydshln.sty}{\from{lwarp.dtx}{plarydshln}} +\file{lwarp-plext.sty}{\from{lwarp.dtx}{plext}} +\file{lwarp-plextarydshln.sty}{\from{lwarp.dtx}{plextarydshln}} +\file{lwarp-plextcolorbl.sty}{\from{lwarp.dtx}{plextcolortbl}} \file{lwarp-prelim2e.sty}{\from{lwarp.dtx}{prelim2e}} \file{lwarp-prettyref.sty}{\from{lwarp.dtx}{prettyref}} \file{lwarp-preview.sty}{\from{lwarp.dtx}{preview}} @@ -272,6 +282,10 @@ version 2005/12/01 or later. \file{lwarp-pst-eps.sty}{\from{lwarp.dtx}{pst-eps}} \file{lwarp-pstool.sty}{\from{lwarp.dtx}{pstool}} \file{lwarp-pstricks.sty}{\from{lwarp.dtx}{pstricks}} +\file{lwarp-pxatbegshi.sty}{\from{lwarp.dtx}{pxatbegshi}} +\file{lwarp-pxeveryshi.sty}{\from{lwarp.dtx}{pxeveryshi}} +\file{lwarp-pxftnright.sty}{\from{lwarp.dtx}{pxftnright}} +\file{lwarp-pxjahyper.sty}{\from{lwarp.dtx}{pxjahyper}} \file{lwarp-quotchap.sty}{\from{lwarp.dtx}{quotchap}} \file{lwarp-quoting.sty}{\from{lwarp.dtx}{quoting}} \file{lwarp-ragged2e.sty}{\from{lwarp.dtx}{ragged2e}} @@ -323,6 +337,7 @@ version 2005/12/01 or later. \file{lwarp-tabls.sty}{\from{lwarp.dtx}{tabls}} \file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}} \file{lwarp-tabulary.sty}{\from{lwarp.dtx}{tabulary}} +\file{lwarp-tascmac.sty}{\from{lwarp.dtx}{tascmac}} \file{lwarp-textarea.sty}{\from{lwarp.dtx}{textarea}} \file{lwarp-textcomp.sty}{\from{lwarp.dtx}{textcomp}} \file{lwarp-textfit.sty}{\from{lwarp.dtx}{textfit}} @@ -361,6 +376,7 @@ version 2005/12/01 or later. \file{lwarp-url.sty}{\from{lwarp.dtx}{url}} \file{lwarp-uspace.sty}{\from{lwarp.dtx}{uspace}} \file{lwarp-verse.sty}{\from{lwarp.dtx}{verse}} +\file{lwarp-versonotes.sty}{\from{lwarp.dtx}{versonotes}} \file{lwarp-vertbars.sty}{\from{lwarp.dtx}{vertbars}} \file{lwarp-vmargin.sty}{\from{lwarp.dtx}{vmargin}} \file{lwarp-vowel.sty}{\from{lwarp.dtx}{vowel}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty index 2cd4f89df93..4eb5247ed4d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty @@ -34,7 +34,7 @@ \newcommand*{\ADLnoshorthanded}{} \newcommand*{\dashgapcolor}[2][]{} \newcommand*{\nodashgapcolor}{} -\appto\LWR@restoreorigformatting{ +\appto\LWR@restoreorigformatting{% \newcolumntype{:}{|}% \newcolumntype{;}[1]{|}% \LetLtxMacro\hdashline\hline% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty new file mode 100644 index 00000000000..581346e43f9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-bounddvi.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `bounddvi') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{bounddvi} +\endinput +%% +%% End of file `lwarp-bounddvi.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty index 1f9a65b90c3..58afb3fbfc7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty @@ -23,40 +23,40 @@ \LWR@addtabularcellcolor% } -\LWR@formatted{columncolor} +\AtBeginDocument{\LWR@formatted{columncolor}} \NewDocumentCommand{\LWR@HTML@rowcolor}{O{named} m o o}{% \convertcolorspec{#1}{#2}{HTML}\LWR@rowHTMLcolor% \LWR@getmynexttoken% } -\LWR@expandableformatted{rowcolor} +\AtBeginDocument{\LWR@expandableformatted{rowcolor}} \NewDocumentCommand{\LWR@HTML@cellcolor}{O{named} m o o}{% \convertcolorspec{#1}{#2}{HTML}\LWR@cellHTMLcolor% \LWR@addtabularcellcolor% } -\LWR@formatted{cellcolor} +\AtBeginDocument{\LWR@formatted{cellcolor}} \newcommand{\LWR@HTML@arrayrulecolor}[2][named]{% \convertcolorspec{#1}{#2}{HTML}\LWR@ruleHTMLcolor% } -\LWR@expandableformatted{arrayrulecolor} +\AtBeginDocument{\LWR@expandableformatted{arrayrulecolor}} \newcommand{\LWR@HTML@arrayrulecolornexttoken}[2][named]{% \convertcolorspec{#1}{#2}{HTML}\LWR@ruleHTMLcolor% \LWR@getmynexttoken% } -\LWR@expandableformatted{arrayrulecolornexttoken} +\AtBeginDocument{\LWR@expandableformatted{arrayrulecolornexttoken}} \newcommand{\LWR@HTML@doublerulesepcolor}[2][named]{} -\LWR@expandableformatted{doublerulesepcolor} +\AtBeginDocument{\LWR@expandableformatted{doublerulesepcolor}} \newcommand{\LWR@HTML@doublerulesepcolornexttoken}[2][named]{\LWR@getmynexttoken} -\LWR@expandableformatted{doublerulesepcolornexttoken} +\AtBeginDocument{\LWR@expandableformatted{doublerulesepcolornexttoken}} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty new file mode 100644 index 00000000000..52cfac3a7e9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty @@ -0,0 +1,50 @@ +%% +%% This is file `lwarp-embrac.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `embrac') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{embrac} +\LetLtxMacro\LWR@orig@HTML@emph\LWR@HTML@emph +\RenewDocumentCommand{\LWR@HTML@emph}{s m}{\LWR@orig@HTML@emph{#2}} + +\LetLtxMacro\LWR@orig@HTML@textit\LWR@HTML@textit +\RenewDocumentCommand{\LWR@HTML@textit}{s m}{\LWR@orig@HTML@textit{#2}} + +\LetLtxMacro\LWR@orig@HTML@textsl\LWR@HTML@textsl +\RenewDocumentCommand{\LWR@HTML@textsl}{s m}{\LWR@orig@HTML@textsl{#2}} + +\ifxetexorluatex + \LetLtxMacro\LWR@orig@HTML@textsi\LWR@HTML@textsi + \RenewDocumentCommand{\LWR@HTML@textsi}{s m}{% + \LWR@orig@HTML@textsi{#2}} +\fi + +\AtBeginDocument{ + \LWR@formatted{emph} + \LWR@formatted{textit} + \LWR@formatted{textsl} + \ifxetexorluatex + \LWR@formatted{textsi} + \fi +} + +\newcommand{\LWR@HTML@EmbracOff}{} +\LWR@formatted{EmbracOff} + +\newcommand{\LWR@HTML@EmbracOn}{} +\LWR@formatted{EmbracOn} +\endinput +%% +%% End of file `lwarp-embrac.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty new file mode 100644 index 00000000000..985e91bc31a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-footnoterange.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `footnoterange') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{footnoterange} +\csletcs{footnoterange}{footnoterange*} +\csletcs{endfootnoterange}{endfootnoterange*} +\endinput +%% +%% End of file `lwarp-footnoterange.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty new file mode 100644 index 00000000000..2753e214f08 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-gentombow.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `gentombow') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{gentombow} +\newcommand{\settombowbanner}[1]{} +\newcommand{\settombowbannerfont}[1]{} +\newcommand{\settombowwidth}[1]{} +\newcommand{\settombowbleed}[1]{} +\newcommand{\settombowcolor}[1]{} +\endinput +%% +%% End of file `lwarp-gentombow.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty index 89d84bb1892..431cb3bc2f1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty @@ -17,15 +17,12 @@ %% version 2005/12/01 or later. - \LWR@ProvidesPackageDrop{geometry} - \renewcommand*{\geometry}[1]{} \renewcommand*{\newgeometry}[1]{} \renewcommand*{\restoregeometry}{} \renewcommand*{\savegeometry}[1]{} \renewcommand*{\loadgeometry}[1]{} - \endinput %% %% End of file `lwarp-geometry.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 1c71e905add..497baad7b2b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -51,6 +51,7 @@ \newcommand*{\LWR@igxscale}{1} \newcommand*{\LWR@igyscale}{1} \newcommand*{\LWR@igclass}{inlineimage} +\newcommand*{\LWR@igalt}{(image)} \define@key{igraph}{width}{% \setlength{\LWR@igwidth}{#1}% @@ -97,7 +98,7 @@ } \define@key{igraph}{angle}{\renewcommand*{\LWR@igangle}{#1}} \define@key{igraph}{class}{\renewcommand*{\LWR@igclass}{#1}} - +\define@key{igraph}{alt}{\renewcommand*{\LWR@igalt}{#1}} \define@key{igraph}{scale}{% \renewcommand*{\LWR@igxscale}{#1}% \renewcommand*{\LWR@igyscale}{#1}% @@ -149,6 +150,7 @@ \AtBeginDocument{ \define@key{Gin}{class}{} +\define@key{Gin}{alt}{} } \AtBeginDocument{ @@ -187,6 +189,7 @@ \renewcommand*{\LWR@igxscale}{1}% \renewcommand*{\LWR@igyscale}{1}% \renewcommand*{\LWR@igclass}{inlineimage}% +\renewcommand*{\LWR@igalt}{(image)}% \IfValueF{#3}{% \IfValueTF{#2}% {\setkeys{igraph}{#2}}% @@ -306,6 +309,7 @@ img src="% " \LWR@orignewline% }{}% \LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline% +\LWR@origtilde{} alt="\LWR@igalt" \LWR@orignewline% }% end of image tags }% end of href \endgroup diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty new file mode 100644 index 00000000000..bdf82bd9dfe --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty @@ -0,0 +1,59 @@ +%% +%% This is file `lwarp-lltjext.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `lltjext') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{lltjext} +\protected\def\yoko{% + \directlua{luatexja.direction.set_list_direction(4, 'yoko')}% +} +\protected\def\tate{\yoko} +\protected\def\dtou{\yoko} +\protected\def\utod{\yoko} + +\define@key[ltj]{japaram}{direction}{} + +\yoko + +\DeclareExpandableDocumentCommand{\rensuji}{s o m}{#3} + +\DeclareDocumentCommand{\layoutfloat}{d() o m}{} + +\DeclareDocumentCommand{\DeclareLayoutCaption}{m d<> d() o}{} + +\LetLtxMacro\pcaption\caption + +\DeclareDocumentCommand{\layoutcaption}{d<> d() o}{} + +\let\captiondir\relax +\RenewDocumentEnvironment{LWR@HTML@minipage}{d<> O{t} O{} O{t} m} + {\LWR@HTML@sub@minipage{#2}{#3}{#4}{#5}} + {\endLWR@HTML@sub@minipage} + +\RenewDocumentCommand{\LWR@HTML@parbox}{d<> O{t} O{} O{t} m +m} +{ +\LWR@traceinfo{parbox of width #4}% +\begin{minipage}[#2][#3][#4]{#5}% +#6 +\end{minipage}% +} + +\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{% +\booltrue{LWR@minipagefullwidth}% +\parbox{#2}{#4}% +} +\endinput +%% +%% End of file `lwarp-lltjext.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty index 4b81417ad5f..28213a5da06 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty @@ -27,9 +27,9 @@ \caption@LT@setup% \booltrue{LWR@starredlongtable}% \let\captionlistentry\LWR@LTcaptionlistentry% -\LWR@tabular{#2} +\tabular{#2} } -{\endLWR@tabular\LWR@floatend} +{\endtabular\LWR@floatend} \newenvironment{longtable}[2][]{% \LWR@floatbegin{table}% @@ -39,10 +39,9 @@ \caption@LT@setup% \refstepcounter{\LTcaptype}% \let\captionlistentry\LWR@LTcaptionlistentry% -\LWR@tabular{#2} +\tabular{#2} } -{\endLWR@tabular\LWR@floatend} - +{\endtabular\LWR@floatend} \newcounter{LTchunksize} \def\endhead{\LWR@tabularendofline}% throws away options //[dim] and //* diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty index 82035621c47..abc18b3f5a4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty @@ -47,6 +47,9 @@ \newcounter{unbalance} \newlength{\multicolovershoot} \newlength{\multicolundershoot} +\NewDocumentCommand{\docolaction}{s o m m m}{% + \IfValueTF{#2}{#2}{#3}% +} \end{warpHTML} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty new file mode 100644 index 00000000000..c63ab76d721 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-multicolrule.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `multicolrule') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\RequirePackage{multicol} + +\LWR@ProvidesPackageDrop{multicolrule} +\newcommand*{\SetMCRule}[1]{} +\endinput +%% +%% End of file `lwarp-multicolrule.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty index a5029cc2283..a90e26875aa 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty @@ -16,7 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{pbox} -\NewDocumentCommand{\pbox}{O{t} o O{t} m +m}{% +\NewDocumentCommand{\pbox}{O{t} O{} O{t} m +m}{% \booltrue{LWR@minipagefullwidth}% \parbox[#1][#2][#3]{#4}{#5}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty new file mode 100644 index 00000000000..4cfbe279aef --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-plarydshln.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `plarydshln') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{plarydshln} +\LWR@origRequirePackage{lwarp-arydshln} +\endinput +%% +%% End of file `lwarp-plarydshln.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty new file mode 100644 index 00000000000..0087362c6d1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty @@ -0,0 +1,52 @@ +%% +%% This is file `lwarp-plext.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `plext') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@loadbefore{plext} + +\LWR@ProvidesPackagePass{plext}[2017/07/21] +\let\tate\relax + +\DeclareExpandableDocumentCommand{\rensuji}{s o m}{#3} + +\DeclareDocumentCommand{\layoutfloat}{d() o m}{} + +\DeclareDocumentCommand{\DeclareLayoutCaption}{m d<> d() o}{} + +\LetLtxMacro\pcaption\caption + +\DeclareDocumentCommand{\layoutcaption}{d<> d() o}{} + +\let\captiondir\relax +\RenewDocumentEnvironment{LWR@HTML@minipage}{d<> O{t} O{} O{t} m} + {\LWR@HTML@sub@minipage{#2}{#3}{#4}{#5}} + {\endLWR@HTML@sub@minipage} + +\RenewDocumentCommand{\LWR@HTML@parbox}{d<> O{t} O{} O{t} m +m} +{ +\LWR@traceinfo{parbox of width #4}% +\begin{minipage}[#2][#3][#4]{#5}% +#6 +\end{minipage}% +} + +\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{% +\booltrue{LWR@minipagefullwidth}% +\parbox{#2}{#4}% +} +\endinput +%% +%% End of file `lwarp-plext.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty new file mode 100644 index 00000000000..7d5764be332 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-plextarydshln.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `plextarydshln') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{plextarydshln} +\LWR@origRequirePackage{lwarp-arydshln} +\endinput +%% +%% End of file `lwarp-plextarydshln.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty new file mode 100644 index 00000000000..ec4666377ea --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-plextcolorbl.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `plextcolortbl') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{plextcolortbl} +\LWR@origRequirePackage{lwarp-colortbl} +\endinput +%% +%% End of file `lwarp-plextcolorbl.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty new file mode 100644 index 00000000000..380864b6896 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-pxatbegshi.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pxatbegshi') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{pxatbegshi} +\LWR@origRequirePackage{lwarp-atbegshi} +\endinput +%% +%% End of file `lwarp-pxatbegshi.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty new file mode 100644 index 00000000000..fb38713fbe7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-pxeveryshi.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pxeveryshi') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{pxeveryshi} +\LWR@origRequirePackage{lwarp-everyshi} +\endinput +%% +%% End of file `lwarp-pxeveryshi.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty new file mode 100644 index 00000000000..a6cdc9a7048 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-pxftnright.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pxftnright') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{pxftnright} +\LWR@origRequirePackage{lwarp-ftnright} +\endinput +%% +%% End of file `lwarp-pxftnright.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty new file mode 100644 index 00000000000..593f13417dd --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-pxjahyper.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pxjahyper') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{pxjahyper} +\endinput +%% +%% End of file `lwarp-pxjahyper.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty new file mode 100644 index 00000000000..5ab7326d0ea --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty @@ -0,0 +1,96 @@ +%% +%% This is file `lwarp-tascmac.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tascmac') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{tascmac} +\newenvironment*{boxnote} + { + \BlockClass[ + padding: .5ex ; + border: 1px solid black ; + border-top: 1px dashed black ; + ]{boxnote} + } + {\endBlockClass} + +\newenvironment*{screen}[1][] + { + \BlockClass[ + padding: .5ex ; + border: 1px solid gray ; + border-radius: 8pt + ]{boxnote} + } + {\endBlockClass} + +\newenvironment*{itembox}[2][] + { + \BlockClass[ + padding: .5ex ; + border: 1px solid gray ; + border-radius: 8pt + ]{boxnote} + \InlineClass{itemboxtitle}{#2}\par + } + {\endBlockClass} + +\newenvironment*{shadebox} + { + \BlockClass[ + padding: .5ex ; + border: 1px solid black ; + box-shadow: 3px 3px 3px \#808080 ; + ]{boxnote} + } + {\endBlockClass} + +\newcommand*{\mask}[2]{% + \InlineClass[background: lightgray]{mask}{#1}% +} + +\newcommand*{\maskbox}[5]{% + \InlineClass[background: lightgray]{mask}{#5}% +} + +\newcommand*{\Maskbox}[6]{% + \InlineClass[ + background: lightgray ; + border: #5 solid black + ]{mask}{#6}% +} + +\newcommand*{\keytop}[2][]{% + \InlineClass[% + padding: .2ex ; + border: 1px solid black ; + border-radius: .7ex ; + ]{keytop}{#2}% +} + +\def\yen{\HTMLunicode{00A5}} + +\def\return{\HTMLunicode{23CE}} + +\def\Return{\HTMLunicode{23CE}} + +\def\ascii{ASCII Corporation} + +\def\Ascii{ASCII Corporation} + +\def\ASCII{ASCII Corporation} +\endinput +%% +%% End of file `lwarp-tascmac.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty index e34b3820fd0..daf3c4db07d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty @@ -74,27 +74,27 @@ \DeclareDocumentCommand{\@maketitle}{}{% \maketitlehooka { - \LWR@stoppars\LWR@htmltag{\LWR@tagtitle} - \@bspretitle \@title \@bsposttitle - \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars + \LWR@stoppars\LWR@htmltag{\LWR@tagtitle}% + \@bspretitle \@title \@bsposttitle% + \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars% } \maketitlehookb { \begin{BlockClass}{author} - \renewcommand{\and}{ - \end{BlockClass} - \begin{BlockClass}{oneauthor} + \renewcommand{\and}{% + \end{BlockClass}% + \begin{BlockClass}{oneauthor}% } - \begin{BlockClass}{oneauthor} - \@bspreauthor \@author \@bspostauthor - \end{BlockClass} - \end{BlockClass} + \begin{BlockClass}{oneauthor}% + \@bspreauthor \@author \@bspostauthor% + \end{BlockClass}% + \end{BlockClass}% } \maketitlehookc { - \begin{BlockClass}{titledate} - \@bspredate \@date \@bspostdate - \end{BlockClass} + \begin{BlockClass}{titledate}% + \@bspredate \@date \@bspostdate% + \end{BlockClass}% } \maketitlehookd } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty new file mode 100644 index 00000000000..8a57f3f6c1a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty @@ -0,0 +1,25 @@ +%% +%% This is file `lwarp-versonotes.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `versonotes') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{versonotes} +\newcommand{\versonote}[1]{\marginpar{#1}} +\newdimen\versotextwidth +\newdimen\versoleftmargin +\newcommand*{\versolayout}{} +\endinput +%% +%% End of file `lwarp-versonotes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 919e949e4af..83ca291fcb5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2018/12/08 v0.64 Allows LaTeX to directly produce HTML5 output.] + [2018/12/22 v0.65 Allows LaTeX to directly produce HTML5 output.] @@ -50,11 +50,11 @@ \newcommand*{\LWR@loadafter}[1]{% \@ifpackageloaded{#1} { -\PackageError{lwarp} -{Package #1, or one which uses #1, must be loaded after lwarp} -{Move \detokenize{\usepackage}{#1} after \detokenize{\usepackage}{lwarp}. -Package #1 may also be loaded by something else, which must also be moved -after lwarp.} + \PackageError{lwarp} + {Package #1, or one which uses #1, must be loaded after lwarp} + {Move \detokenize{\usepackage}{#1} after \detokenize{\usepackage}{lwarp}. + Package #1 may also be loaded by something else, which must also be moved + after lwarp.} } {} } @@ -63,20 +63,19 @@ after lwarp.} {\newcommand*{\LWR@notmemoirloadafter}[1]{}} {\LetLtxMacro\LWR@notmemoirloadafter\LWR@loadafter} -\LetLtxMacro\LWR@notbxjsloadafter\LWR@loadafter - -\@ifclassloaded{bxjsarticle}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{} -\@ifclassloaded{bxjsbook}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{} -\@ifclassloaded{bxjsreport}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{} -\@ifclassloaded{bxjsslide}{\renewcommand*{\LWR@notbxjsloadafter}[1]{}}{} +\LetLtxMacro\LWR@notltjloadafter\LWR@loadafter -\LetLtxMacro\LWR@notltjsloadafter\LWR@loadafter - -\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{} -\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{} -\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{} -\@ifclassloaded{ltjspf}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{} -\@ifclassloaded{ltjsiyou}{\renewcommand*{\LWR@notltjsloadafter}[1]{}}{} +\@ifclassloaded{ltjarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjspf}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjskiyou}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjtarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjtbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\@ifclassloaded{ltjtreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} \newcommand*{\LWR@loadbefore}[1]{% \@ifpackageloaded{#1} @@ -129,6 +128,12 @@ or is superceded by another class. For a possible alternative, see class(es) #2.} }{}% } +\LWR@earlyclassloadnever{jarticle}{ujarticle} +\LWR@earlyclassloadnever{jbook}{ujbook} +\LWR@earlyclassloadnever{jreport}{ujreport} +\LWR@earlyclassloadnever{tarticle}{utarticle} +\LWR@earlyclassloadnever{tbook}{utbook} +\LWR@earlyclassloadnever{treport}{utreport} \LWR@earlyloadnever{ae}{cm-super, lmodern} \LWR@earlyloadnever{aecompl}{cm-super, lmodern} \LWR@earlyloadnever{aecc}{cm-super, lmodern} @@ -138,7 +143,7 @@ For a possible alternative, see class(es) #2.} \LWR@earlyloadnever{CJK}{ctex, xeCJK} \LWR@earlyloadnever{CJKutf8}{ctex, xeCJK} } -\LWR@earlyloadnever{bxcjkjatype}{pLaTeX, upLaTeX, bxjsarticle, ujarticle, utarticle} +\LWR@earlyloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle} \LWR@earlyloadnever{hangul}{kotex, xetexko, luatexko} \LWR@earlyloadnever{fancyheadings}{fancyhdr} \LWR@earlyloadnever{glossary}{glossaries} @@ -185,6 +190,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{bookmark} \LWR@notmemoirloadafter{booktabs} \LWR@loadafter{bophook} +\LWR@loadafter{bounddvi} \LWR@loadafter{boxedminipage} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{breakurl} @@ -228,6 +234,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{easy-todo} \LWR@loadafter{ebook} \LWR@loadafter{ellipsis} +\LWR@loadafter{embrac} \LWR@loadafter{emptypage} \LWR@loadafter{endfloat} \LWR@loadafter{endheads} @@ -269,6 +276,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{footmisc} \LWR@loadafter{footnote} \LWR@loadafter{footnotehyper} +\LWR@loadafter{footnoterange} \LWR@loadafter{footnpag} \LWR@loadafter{forest} \LWR@loadafter{framed} @@ -277,7 +285,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{fullpage} \LWR@loadafter{fullwidth} \LWR@loadafter{fwlw} -\LWR@notbxjsloadafter{geometry} +\LWR@loadafter{gentombow} \LWR@loadafter{gmeometric} \LWR@loadafter{glossaries} \LWR@loadafter{glossary} @@ -334,6 +342,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{morefloats} \LWR@notmemoirloadafter{moreverb} \LWR@notmemoirloadafter{mparhack} +\LWR@loadafter{multicolrule} \LWR@loadafter{multirow} \LWR@loadafter{multitoc} \LWR@loadafter{musicography} @@ -371,6 +380,12 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{pfnote} \LWR@loadafter{phfqit} \LWR@loadafter{placeins} +\LWR@loadafter{plarray} +\LWR@loadafter{plarydshln} +\LWR@loadafter{plextarray} +\LWR@loadafter{plextarydshln} +\LWR@loadafter{plcolortbl} +\LWR@loadafter{plextdelarray} \LWR@loadafter{prelim2e} \LWR@loadafter{prettyref} \LWR@loadafter{preview} @@ -379,6 +394,9 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{pst-eps} \LWR@loadafter{pstool} \LWR@loadafter{pstricks} +\LWR@loadafter{pxeveryshi} +\LWR@loadafter{pxftnright} +\LWR@loadafter{pxjahyper} \LWR@loadafter{quotchap} \LWR@loadafter{quoting} \LWR@loadafter{ragged2e} @@ -421,7 +439,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{srcltx} \LWR@loadafter{srctex} \LWR@loadafter{stabular} -\LWR@notltjsloadafter{stfloats} +\LWR@notltjloadafter{stfloats} \LWR@loadafter{subfig} \LWR@loadafter{subfigure} \LWR@loadafter{supertabular} @@ -429,6 +447,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{tabls} \LWR@notmemoirloadafter{tabularx} \LWR@loadafter{tabulary} +\LWR@loadafter{tascmac} \LWR@loadafter{textarea} \LWR@loadafter{textfit} \LWR@loadafter{textpos} @@ -463,6 +482,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{uspace} \LWR@loadafter{varioref}% no lwarp package provided \LWR@notmemoirloadafter{verse} +\LWR@loadafter{versonotes} \LWR@loadafter{vertbars} \LWR@loadafter{vmargin} \LWR@loadafter{vowel} @@ -800,9 +820,12 @@ For a possible alternative, see class(es) #2.} left=2in,right=6in,% top=1in,bottom=1in,% } +\setlength{\textheight}{0.8\paperheight} +\setlength{\textwidth}{0.7\paperwidth} \@twosidefalse \@mparswitchfalse + \end{warpHTML} \begin{warpall} @@ -923,6 +946,7 @@ For a possible alternative, see class(es) #2.} \LWR@checkloadbefore{#1}{morewrites} \LWR@checkloadbefore{#1}{newclude} \LWR@checkloadbefore{#1}{newunicodechar} +\LWR@checkloadbefore{#1}{plext} \LWR@checkloadbefore{#1}{xeCJK} \LWR@checkloadbefore{#1}{xetexko} \LWR@checkloadbefore{#1}{zxjatype} @@ -1311,6 +1335,11 @@ For a possible alternative, see class(es) #2.} \LetLtxMacro\LWR@origupshape\upshape \LetLtxMacro\LWR@origslshape\slshape \LetLtxMacro\LWR@origscshape\scshape +\@ifundefined{sishape}{ + \LetLtxMacro\LWR@origsishape\scshape +}{ + \LetLtxMacro\LWR@origsishape\sishape +} \LetLtxMacro\LWR@origitshape\itshape \LetLtxMacro\LWR@origem\em \LetLtxMacro\LWR@orignormalfont\normalfont @@ -1710,6 +1739,12 @@ span.textsc, div.textsc { font-variant-numeric: oldstyle-nums ; } +span.textsi, div.textsi { + font-style: italic ; + font-variant: small-caps; + font-variant-numeric: oldstyle-nums ; +} + span.textsl, div.textsl { font-style: oblique; } span.textup, div.textup { @@ -1797,24 +1832,30 @@ pre.tabbing { } blockquote { - margin-left: 0px ; - margin-right: 0px ; + display: block ; + margin-left: 2em ; + margin-right: 2em ; +} + +blockquotation { + display: block ; + margin-left: 2em ; + margin-right: 2em ; } /* quotchap is for the quotchap package */ div.quotchap { - font-style: oblique ; - overflow-x: auto ; - margin-left: 2em ; - margin-right: 2em ; + display: block ; + font-style: oblique ; + overflow-x: auto ; + margin-left: 2em ; + margin-right: 2em ; } -blockquote p, div.quotchap p { - line-height: 1.5; +blockquote p, blockquotation p, div.quotchap p { + line-height: 1.5; text-align: left ; font-size: .85em ; - margin-left: 3em ; - margin-right: 3em ; } /* qauthor is for the quotchap package */ @@ -1831,19 +1872,6 @@ div.qauthor p { text-align: right ; } -blockquotation { - margin-left: 0px ; - margin-right: 0px ; -} - -blockquotation p { - line-height: 1.5; - text-align: left ; - font-size: .85em ; - margin-left: 3em ; - margin-right: 3em ; -} - div.epigraph, div.dictum { line-height: 1.2; text-align: left ; @@ -1967,39 +1995,33 @@ div.minisec { text-align: left ; } -/* Title of the file */ h1 { margin: 0ex 0em 0ex 0em ; line-height: 1.3; text-align: center ; } -/* Part */ h2 { margin: 1ex 0em 1ex 0em ; line-height: 1.3; text-align: center ; } -/* Chapter */ h3 { margin: 3ex 0em 1ex 0em ; line-height: 1.3; } -/* Section */ h4 { margin: 3ex 0em 1ex 0em ; line-height: 1.3; } -/* Sub-Section */ h5 { margin: 3ex 0em 1ex 0em ; line-height: 1.3; } -/* Sub-Sub-Section */ h6 { margin: 3ex 0em 1ex 0em ; line-height: 1.3; @@ -2017,15 +2039,16 @@ div.titlepage { } .marginpar, .marginparblock { - max-width:50%; - float:right; - text-align:left; + max-width: 50%; + float: right ; + clear: both ; + text-align: left ; margin: 1ex 0.5em 1ex 1em ; padding: 1ex 0.5em 1ex 0.5em ; font-size: 85% ; border-top: 1px solid silver ; border-bottom: 1px solid silver ; - overflow-x: auto; + overflow-x: auto ; } .marginpar br { margin-bottom: 2ex ; } @@ -2053,6 +2076,16 @@ div.marginblock br , div.marginparblock br { margin-bottom: 2ex ; } +div.bodycontainer { + float: left ; + width: 80% ; +} + +div.bodywithoutsidetoc div.bodycontainer { + float: none ; + width: 100% ; +} + section.textbody div.footnotes{ margin: 3ex 2em 0ex 2em ; border-bottom: 2px solid silver ; @@ -2456,7 +2489,7 @@ figure.subfigure, figure.subtable { display: inline-block ; margin: 3ex 1em 3ex 1em ; } -figcaption .minipage { margin:0 ; padding: 0 } +div.figurecaption .minipage { margin:0 ; padding: 0 } div.minipage figure { border: none ; box-shadow: none ; } div.minipage figure.table { margin: 0ex } @@ -2469,7 +2502,7 @@ div.floatrow figure { display: inline-block ; margin: 1ex 2% ; } div.floatfoot { font-size: .85em ; border-top: 1px solid silver ; line-height: 1.2 ; } -figcaption , .lstlistingtitle { +div.figurecaption , .lstlistingtitle { font-size: .85em ; text-align: center ; font-weight: bold ; @@ -2477,7 +2510,7 @@ figcaption , .lstlistingtitle { margin-bottom: 1ex ; } -figure.subfigure figcaption, figure.subtable figcaption { +figure.subfigure div.figurecaption, figure.subtable div.figurecaption { border-bottom: none ; background: none ; } @@ -2489,7 +2522,7 @@ div.nonfloatcaption { } /* For a \RawCaption inside a minipage inside a figure's floatrow: */ -figure div.floatrow div.minipage figcaption { +figure div.floatrow div.minipage div.figurecaption { border: none ; background: none ; } @@ -2510,7 +2543,7 @@ figure.ruled { box-shadow: none ; } -figure.ruled figcaption, figure.boxruled figcaption { +figure.ruled div.figurecaption, figure.boxruled div.figurecaption { border-top: 1px solid silver ; border-bottom: 1px solid silver ; } @@ -2704,7 +2737,7 @@ nav.topnavigation{ margin: 0 ; border-bottom: 1px solid silver ; border-top: 1px solid silver ; - clear:right ; + clear:both ; } nav.botnavigation{ @@ -2714,27 +2747,25 @@ nav.botnavigation{ margin: 0 ; border-top: 1px solid silver ; border-bottom: 1px solid silver ; - clear:right ; + clear:both ; } -header{ +header { line-height: 1.2 ; font-size: 1em ; -/* border-bottom: 2px solid silver ; */ + border-bottom: 1px solid silver ; margin: 0px ; - padding: 0ex 1em 0ex 1em ; - text-align:center ; + padding: 2ex 1em 2ex 1em ; + text-align:left ; } -header p {margin:0ex;padding:4ex 0em 2ex 0em ;text-align:center;} - -footer{ +footer { font-size: .85em ; line-height: 1.2 ; margin-top: 1ex ; - border-top: 2px solid silver ; + border-top: 1px solid silver ; padding: 2ex 1em 2ex 1em ; - clear:right ; + clear:both ; text-align:left ; } @@ -2753,24 +2784,23 @@ img.lateximage{ border: none ; } -nav.sidetoc { +/* The -1px right margin compensates for the 1px right border. */ +/* Without this -1px margin, the body container appears below instead */ +/* of floating to the side. */ +div.sidetoccontainer { font-family: "DejaVu Serif", "Bitstream Vera Serif", "Lucida Bright", Georgia, serif; - float:right ; + float: left ; width: 20%; - border-left: 1px solid silver; - border-top: 1px solid silver; + margin: 0pt -1px 3ex 0pt ; + border-right: 1px solid silver; border-bottom: 1px solid silver; -/* border-top: 2px solid #808080 ; */ background: #FAF7F4 ; - padding: 2ex 0em 2ex 1em ; - margin: 0ex 0em 2ex 1em ; font-size:.9em ; - border-radius: 20px 0px 0px 20px ; - } + border-radius: 0px 0px 20px 0px ; +} div.sidetoccontents { -/* border-top: 1px solid silver ; */ overflow-y: auto ; width: 100% ; text-align: left ; @@ -2985,20 +3015,22 @@ Based on spacing demonstrated by the metafont package. nav.topnavigation { display:none; } nav.botnavigation { display:none; } -@media screen and (max-width: 45em) { -/* nav.sidetoc {display:none;} */ - nav.sidetoc { +/* Only display the sidetoc's webpage title if a small screen */ +span.sidetocthetitle { display: none } + +@media screen and (max-width: 50em) { + div.sidetoccontainer { float: none ; width: 100% ; - margin: 5ex 0px 5ex 0px ; padding: 0 ; border-radius: 0 ; border-bottom: 1px solid black ; border-top: 1px solid black ; box-shadow: none ; } -/* nav.topnavigation { display:block } */ + span.sidetocthetitle { display: inline } nav.botnavigation { display:block } + div.bodycontainer { width: 100% } .marginpar { max-width: 100%; float: none; @@ -3014,21 +3046,24 @@ nav.botnavigation { display:none; } "Liberation Serif", "Nimbus Roman No 9 L", "FreeSerif", "Hoefler Text", Times, "Times New Roman", serif; } - nav.sidetoc { display:none; } + div.sidetoccontainer { display:none; } nav.topnavigation { display: none; } nav.botnavigation { display: none; } + div.bodycontainer { width: 100% } } @media handheld { - nav.sidetoc { display:none; } + div.sidetoccontainer { display:none; } nav.topnavigation { display:block } nav.botnavigation { display:block } + div.bodycontainer { width: 100% } } @media projection { - nav.sidetoc { display:none; } + div.sidetoccontainer { display:none; } nav.topnavigation { display:block } nav.botnavigation { display:block } + div.bodycontainer { width: 100% } } \end{filecontents*} \end{LWRwriteconf} @@ -3065,12 +3100,12 @@ h1 { /* title of the entire website, used on each page */ h1 { border-bottom: 1px solid #304070; - border-top: 2px solid #304070; +/* border-top: 2px solid #304070; */ } h2 { border-bottom: 1px solid #304070; - border-top: 2px solid #304070; +/* border-top: 2px solid #304070; */ background-color: #F7F7F0 ; background-image: linear-gradient(to bottom, #F7F7F0, #DAD0C0); } @@ -3186,7 +3221,7 @@ div.fboxBlock div.minipage { box-shadow: none ; } margin: 0ex ; } -figure.figure .minipage, figcaption .minipage { border: none; } +figure.figure .minipage, div.figurecaption .minipage { border: none; } div.marginblock div.minipage , div.marginparblock div.minipage @@ -3206,7 +3241,7 @@ figure figure { } /* -figcaption { +div.figurecaption { border-top: 1px solid silver ; border-bottom: 1px solid silver ; background-color: #e8e8e8 ; @@ -3244,11 +3279,10 @@ footer{ background-image: linear-gradient(to bottom, #F7F7F0, #b0b8b0); } -nav.sidetoc { +div.sidetoccontainer { background-color: #F7F7F0 ; background-image: linear-gradient(to bottom, #F7F7F0, #C0C0C0); box-shadow: 3px 3px 3px #808080 ; - border-radius: 0px 0px 0px 20px ; } div.sidetoctitle {color: #304070 ; } @@ -3260,7 +3294,7 @@ nav.sidetoc a:hover { } @media screen and (max-width: 45em) { - nav.sidetoc { border-radius: 0 ; } + div.sidetoccontainer { border-radius: 0 ; } } \end{filecontents*} @@ -3310,7 +3344,7 @@ h1, h2 { background-color: #fffcf5 ; background-image: none ; border-bottom: 1px solid #808080; - border-top: 2px solid #808080; +/* border-top: 2px solid #808080; */ } div.abstracttitle { @@ -3394,7 +3428,7 @@ figure { /* border-bottom: 1px solid silver; */ } -figcaption , .lstlisting { +div.figurecaption , .lstlisting { border: none ; /* border-top: 1px solid silver ; */ /* border-bottom: 1px solid silver ; */ @@ -3425,13 +3459,12 @@ nav.toc, nav.lof, nav.lot, nav.lol { "Times New Roman", serif; } -nav.sidetoc { +div.sidetoccontainer { font-family: "Linux Libertine O", "Hoefler Text", "Garamond", "Bembo", "Janson", "TeX Gyre Pagella", "Palatino", "Liberation Serif", "Nimbus Roman No 9 L", "FreeSerif", Times, "Times New Roman", serif; background-image: linear-gradient(to bottom, #fffcf5, #C0C0C0); - border-radius: 0px 0px 0px 20px ; } div.sidetoctitle{ @@ -3448,7 +3481,6 @@ footer{ background-color: #e0e0e0 ; background-image: linear-gradient(to bottom, #fffcf5, #b0b0b0); padding: 2ex 1em 2ex 1em ; - clear:right ; text-align:left ; } @@ -3647,7 +3679,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- -- Copyright 2016-2018 Brian Dunn -printversion = "v0.64" +printversion = "v0.65" requiredconfversion = "1" -- also at *lwarpmk.conf function printhelp () @@ -5155,7 +5187,7 @@ end -- not --version {% \addtocounter{LWR@thisautoidWP}{1}% \LWR@htmltag{% - div class=\textquotedbl#3\textquotedbl % space + div class=\textquotedbl#3\textquotedbl\ % space id=\textquotedbl% \LWR@print@mbox{autoidWP-\arabic{LWR@thisautoidWP}}% \textquotedbl% @@ -5639,7 +5671,7 @@ end -- not --version \StrSubstitute{\LWR@thisnewfilename}{—}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{–}{-}[\LWR@thisnewfilename] \fi% -\global\let\LWR@thisfilename\LWR@thisnewfilename% return a global result +\global\let\LWR@thisfilename\LWR@thisnewfilename% \endgroup% \LWR@traceinfo{LWR@filenamenoblanks: result is \LWR@thisfilename}% } @@ -5704,6 +5736,8 @@ end -- not --version \LWR@htmlelementclassend{section}{textbody} +\LWR@htmlelementclassend{div}{bodycontainer} +\LWR@htmlelementclassend{div}{bodyandsidetoc} \LWR@printpendingfootnotes @@ -5727,11 +5761,28 @@ end -- not --version \LWR@orignewpage \addtocounter{LWR@htmlfilenumber}{1}% - \ifbool{FileSectionNames}% -{\LWR@filenamenoblanks{#1}} +{% + \LWR@filenamenoblanks{#1}% + \edef\LWR@hashedname{\LWR@mdfive{\LWR@thisfilename}}% + \ifcsundef{LWR@filename\LWR@hashedname}{% + \csdef{LWR@filename\LWR@hashedname}{}% + }{% + \PackageError{lwarp} + { + Section name ``#1'', at the line number listed below, + generates the filename ``\LWR@thisfilename'', + which appears to be a duplicate% + } + { + Look for another section of the same type with a similar + or identical name. + (Lwarp sanitizes most symbols and common short words + when generating file names, and this may cause a conflict.) + } + } +} {\renewcommand*{\LWR@thisfilename}{\arabic{LWR@htmlfilenumber}}} - \LWR@traceinfo{LWR@newhtmlfile: about to print start file}% \begingroup% \LWR@nullfonts% @@ -5740,7 +5791,6 @@ end -- not --version \LWR@htmlsectionfilename{\LWR@thisfilename}|% } \endgroup% - \LWR@stoppars \LWR@filestart[#1] @@ -5761,16 +5811,21 @@ end -- not --version \LWR@htmlelementend{header} } -\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} -{} -{\ifcsvoid{thetitle}{}{\LWR@printthetitle}} - +\LWR@htmlelementclass{div}{bodyandsidetoc} \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} {} {\LWR@sidetoc} +\LWR@htmlelementclass{div}{bodycontainer} \LWR@htmlelementclass{section}{textbody} +\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}% + {}% + {% + \ifcsvoid{thetitle}{}{% + \LWR@printthetitle% + }% + }% \LWR@stoppars \LWR@customizeMathJax @@ -5869,17 +5924,17 @@ end -- not --version {% new file \LWR@traceinfo{LWR@section: new HTML file}% \IfNoValueTF{#2}% - {\LWR@newhtmlfile{#3}}% - {\LWR@newhtmlfile{#2}}% + {\LWR@newhtmlfile{#3}}% + {\LWR@newhtmlfile{#2}}% }% new file {% not new file \LWR@traceinfo{LWR@section: not a new HTML file, about to LWR@orignewpage}% \LWR@orignewpage% - }% not new file + \IfValueT{#3}{% -\LWR@traceinfo{LWR@section: about to LWR@setlatestname}% -\IfValueTF{#2}{\LWR@setlatestname{#2}}{\LWR@setlatestname{#3}}% + \LWR@traceinfo{LWR@section: about to LWR@setlatestname}% + \IfValueTF{#2}{\LWR@setlatestname{#2}}{\LWR@setlatestname{#3}}% }% \ifbool{HTMLDebugComments}{% @@ -6144,13 +6199,13 @@ end -- not --version \newcommand*{\HTMLTitleBeforeSection}{% \def\theHTMLTitleSection{% \theHTMLTitle\theHTMLTitleSeparator\theHTMLSection% - } + }% } \newcommand*{\HTMLTitleAfterSection}{% \def\theHTMLTitleSection{% \theHTMLSection\theHTMLTitleSeparator\theHTMLTitle% - } + }% } \HTMLTitleBeforeSection @@ -6270,10 +6325,6 @@ end -- not --version \setlength{\belowcaptionskip}{0ex} \setlength{\abovecaptionskip}{0ex} \renewcommand{\ps@plain}{} -\LetLtxMacro\LWR@origtabular\tabular -\LetLtxMacro\LWR@origendtabular\endtabular -\LetLtxMacro\tabular\LWR@tabular -\LetLtxMacro\endtabular\endLWR@tabular \let\LWR@origcaption\caption \let\LWR@origltx@label\ltx@label \let\ltx@label\LWR@htmlmathlabel @@ -6296,8 +6347,10 @@ end -- not --version \LWR@firstpagetop \LWR@stoppars \LWR@htmltag{/header}\LWR@orignewline +\LWR@htmlelementclass{div}{bodywithoutsidetoc} +\LWR@htmlelementclass{div}{bodycontainer} \LWR@traceinfo{LWR@lwarpStart: Generating textbody.} -\LWR@htmltag{section class=\textquotedbl{}textbody\textquotedbl} +\LWR@htmlelementclass{section}{textbody} \LWR@patchlists \catcode`\$=\active \immediate\write\@mainaux{\catcode`\string$\active}% @@ -6328,6 +6381,8 @@ end -- not --version \LWR@closeprevious{\LWR@depthfinished} \LWR@htmlelementclassend{section}{textbody} +\LWR@htmlelementclassend{div}{bodycontainer} +\LWR@htmlelementclassend{div}{bodyandsidetoc} \LWR@printpendingfootnotes \LWR@htmlelement{footer} @@ -6390,20 +6445,20 @@ end -- not --version \begin{warpHTML} \newcommand*{\printtitle} -{ -\LWR@stoppars -\LWR@htmltag{\LWR@tagtitle}% -\@title% -\LWR@htmltag{\LWR@tagtitleend} -\LWR@startpars +{% + \LWR@stoppars% + \LWR@htmltag{\LWR@tagtitle}% + \@title% + \LWR@htmltag{\LWR@tagtitleend}% + \LWR@startpars% } \newcommand*{\LWR@printthetitle} -{ -\LWR@stoppars -\LWR@htmltag{\LWR@tagtitle}% -\thetitle% -\LWR@htmltag{\LWR@tagtitleend} -\LWR@startpars +{% + \LWR@stoppars% + \LWR@htmltag{\LWR@tagtitle}% + \thetitle% + \LWR@htmltag{\LWR@tagtitleend}% + \LWR@startpars% } \newcommand*{\printauthor}{ @@ -6486,24 +6541,24 @@ end -- not --version \global\let\and\relax } \DeclareDocumentCommand{\@maketitle}{}{% - \LWR@stoppars\LWR@htmltag{\LWR@tagtitle} - \@title - \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars - \begin{BlockClass}{author} - \renewcommand*{\cr}{} - \renewcommand*{\crcr}{} - \renewcommand*{\noalign}{} - \renewcommand{\and}{ - \end{BlockClass} - \begin{BlockClass}{oneauthor} - } - \begin{BlockClass}{oneauthor} - \@author - \end{BlockClass} - \end{BlockClass} - \begin{BlockClass}{titledate} - \@date - \end{BlockClass} + \LWR@stoppars\LWR@htmltag{\LWR@tagtitle}% + \@title% + \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars% + \begin{BlockClass}{author}% + \renewcommand*{\cr}{}% + \renewcommand*{\crcr}{}% + \renewcommand*{\noalign}{}% + \renewcommand{\and}{% + \end{BlockClass}% + \begin{BlockClass}{oneauthor}% + }% + \begin{BlockClass}{oneauthor}% + \@author% + \end{BlockClass}% + \end{BlockClass}% + \begin{BlockClass}{titledate}% + \@date% + \end{BlockClass}% } \newcommand*{\LWR@titlingmaketitle}{% @@ -7792,22 +7847,22 @@ end -- not --version \ifdefstring{\LWR@tempone}{tvertbarl}{% \LWR@tdaddstyle% border-left: 1px solid % space - \LWR@origpound\LWR@vertruleHTMLcolor% + \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarldouble}{% \LWR@tdaddstyle% border-left: 4px double % space - \LWR@origpound\LWR@vertruleHTMLcolor% + \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarldash}{% \LWR@tdaddstyle% border-left: 1px dashed % space - \LWR@origpound\LWR@vertruleHTMLcolor% + \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarldoubledash}{% \LWR@tdaddstyle% border-left: 2px dashed % space - \LWR@origpound\LWR@vertruleHTMLcolor% + \LWR@vertruleHTMLcolor% }{}% }{}% \edef\LWR@tempone{% @@ -7815,19 +7870,19 @@ end -- not --version }% \ifdefstring{\LWR@tempone}{tvertbarr}{% \LWR@tdaddstyle% - border-right: 1px solid \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 1px solid \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarrdouble}{% \LWR@tdaddstyle% - border-right: 4px double \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 4px double \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarrdash}{% \LWR@tdaddstyle% - border-right: 1px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 1px dashed \LWR@vertruleHTMLcolor% }{}% \ifdefstring{\LWR@tempone}{tvertbarrdoubledash}{% \LWR@tdaddstyle% - border-right: 2px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 2px dashed \LWR@vertruleHTMLcolor% }{}% }% } @@ -7988,35 +8043,35 @@ end -- not --version \ifbool{LWR@tabularmutemods}{}{% \ifnumcomp{\value{LWR@mcolvertbarsl}}{=}{1}{% \LWR@tdaddstyle% - border-left: 1px solid \LWR@origpound\LWR@vertruleHTMLcolor% + border-left: 1px solid \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsl}}{>}{1}{% \LWR@tdaddstyle% - border-left: 4px double \LWR@origpound\LWR@vertruleHTMLcolor% + border-left: 4px double \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsldash}}{=}{1}{% \LWR@tdaddstyle% - border-left: 1px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-left: 1px dashed \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsldash}}{>}{1}{% \LWR@tdaddstyle% - border-left: 2px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-left: 2px dashed \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsr}}{=}{1}{% \LWR@tdaddstyle% - border-right: 1px solid \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 1px solid \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsr}}{>}{1}{% \LWR@tdaddstyle% - border-right: 4px double \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 4px double \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsrdash}}{=}{1}{% \LWR@tdaddstyle% - border-right: 1px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 1px dashed \LWR@vertruleHTMLcolor% }{}% \ifnumcomp{\value{LWR@mcolvertbarsrdash}}{>}{1}{% \LWR@tdaddstyle% - border-right: 2px dashed \LWR@origpound\LWR@vertruleHTMLcolor% + border-right: 2px dashed \LWR@vertruleHTMLcolor% }{}% }% } @@ -8422,9 +8477,9 @@ rowspan="#2" % \StartDefiningTabulars -\newenvironment*{LWR@tabular}[2][] +\NewDocumentCommand{\LWR@HTML@@tabular}{d<> o m} {% -\LWR@traceinfo{LWR@tabular started}% +\LWR@traceinfo{LWR@HTML@@tabular started}% \addtocounter{LWR@tabulardepth}{1}% \global\boolfalse{LWR@startedrow}% \setcounter{LWR@hlines}{0}% @@ -8435,10 +8490,10 @@ rowspan="#2" % \global\boolfalse{LWR@exitingtabular}% \global\boolfalse{LWR@tabularmutemods}% \global\booltrue{LWR@intabularmetadata}% -\LWR@traceinfo{LWR@tabular: About to LWR@forecenewpage.}% +\LWR@traceinfo{LWR@@tabular: About to LWR@forecenewpage.}% \LWR@forcenewpage \LWR@htmlblocktag{table}% -\LWR@parsetablecols{#2}% +\LWR@parsetablecols{#3}% \LWR@stoppars% \setcounter{LWR@tableLaTeXcolindex}{1}% \global\boolfalse{LWR@tabularcelladded}% @@ -8450,9 +8505,11 @@ rowspan="#2" % \gdef\LWR@rowHTMLcolor{}% \gdef\LWR@cellHTMLcolor{}% \@rowcolors% -\edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor}% +\ifdefvoid{\LWR@ruleHTMLcolor}% + {\edef\LWR@vertruleHTMLcolor{black}}% + {\edef\LWR@vertruleHTMLcolor{\LWR@origpound\LWR@ruleHTMLcolor}}% \setcounter{LWR@cellcolordepth}{0}% -\LWR@traceinfo{LWR@tabular: redefining macros}% +\LWR@traceinfo{LWR@@HTML@tabular: redefining macros}% \LetLtxMacro\noalign\LWR@tabularnoalign% \LetLtxMacro\hline\LWR@HTMLhline% \LetLtxMacro\cline\LWR@HTMLcline% @@ -8496,11 +8553,12 @@ rowspan="#2" % \StartDefiningTabulars% \protected\gdef&{\LWR@tabularampersand}% \addtocounter{LWR@tabularpardepth}{1}% -\LWR@traceinfo{LWR@tabular: about to LWR@getmynexttoken}% +\LWR@traceinfo{LWR@@HTML@tabular: about to LWR@getmynexttoken}% \LWR@getmynexttoken% }% +\newcommand*{\LWR@HTML@endtabular} {% -\LWR@traceinfo{LWR@tabular ending}% +\LWR@traceinfo{LWR@HTML@endtabular}% \addtocounter{LWR@tabularpardepth}{-1}% \ifboolexpr{% test {% @@ -8527,10 +8585,19 @@ rowspan="#2" % \addtocounter{LWR@tabulardepth}{-1}% \protected\gdef&{\LWR@origampmacro}% \StopDefiningTabulars% -\LWR@traceinfo{LWR@tabular finished ending}% +\LWR@traceinfo{LWR@HTML@endtabular finished}% } +\csletcs{LWR@HTML@endtabular*}{LWR@HTML@endtabular} + \StopDefiningTabulars +\AtBeginDocument{ + \LetLtxMacro\LWR@origendtabular\endtabular + \csletcs{LWR@origendtabular*}{endtabular*} + \LWR@formatted{@tabular} + \LWR@formatted{endtabular} + \LWR@formatted{endtabular*} +} \end{warpHTML} @@ -8911,28 +8978,21 @@ autopage-\theLWR@currentautosec% \setcounter{LWR@latestautopage}{1} \newenvironment*{LWR@figcaption} -{% - \LWR@traceinfo{LWR@figcaption env start}% - \LWR@htmlblocktag{figcaption}% - \ifbool{FormatWP}{% - \begin{BlockClass}[font-style:italic]{italic} - \LWR@print@vspace*{\baselineskip} - }{}% - \LWR@traceinfo{LWR@figcaption env start: done}% -} -{% - \LWR@traceinfo{LWR@figcaption env end}% - \ifbool{FormatWP}{\end{BlockClass}}{}% - \LWR@htmlblocktag{/figcaption}% - \LWR@traceinfo{LWR@figcaption env end: done}% -} + { + \ifbool{FormatWP}{% + \BlockClass[font-style:italic]{figurecaption} + }{ + \BlockClass{figurecaption} + }% + } + {\endBlockClass} \newcommand*{\LWR@HTML@caption@begin}[1] { \LWR@traceinfo{LWR@HTML@caption@begin}% \begingroup% \@setpar{\LWR@closeparagraph\@@par}% \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}% -\RenewDocumentCommand{\parbox}{O{t} o O{t} m +m}{##5}% +\RenewDocumentCommand{\parbox}{O{t} O{} O{t} m +m}{##5}% \LWR@figcaption% \LWR@traceinfo{LWR@HTML@caption@begin: about to LWR@origcaption@begin}% \LWR@print@caption@begin{#1}% @@ -9112,11 +9172,13 @@ autopage-\theLWR@currentautosec% \LWR@forcenewpage \LWR@stoppars +\LWR@htmlelementclass{div}{sidetoccontainer} \LWR@htmlelementclass{nav}{sidetoc} \setcounter{tocdepth}{\value{SideTOCDepth}} \begin{BlockClass}{sidetoctitle} +\ifcsvoid{thetitle}{}{\InlineClass{sidetocthetitle}{\thetitle}\par} \sidetocname \end{BlockClass} \begin{BlockClass}{sidetoccontents} @@ -9125,6 +9187,7 @@ autopage-\theLWR@currentautosec% \LWR@myshorttoc{sidetoc} \end{BlockClass} \LWR@htmlelementclassend{nav}{sidetoc} +\LWR@htmlelementclassend{div}{sidetoccontainer} } @@ -9274,6 +9337,7 @@ autopage-\theLWR@currentautosec% \renewrobustcmd{\texttt}[1]{\LWR@HTML@texttt{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textup}[1]{\LWR@HTML@textup{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textsc}[1]{\LWR@HTML@textsc{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textsi}[1]{\LWR@HTML@textsi{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textit}[1]{\LWR@HTML@textit{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textsl}[1]{\LWR@HTML@textsl{\LWR@doindexentry{##1}}}% } @@ -9357,6 +9421,7 @@ autopage-\theLWR@currentautosec% \LetLtxMacro\upshape\LWR@origupshape% \LetLtxMacro\slshape\LWR@origslshape% \LetLtxMacro\scshape\LWR@origscshape% +\LetLtxMacro\sishape\LWR@origsishape% \LetLtxMacro\itshape\LWR@origitshape% \LetLtxMacro\em\LWR@origem% \LetLtxMacro\normalfont\LWR@orignormalfont% @@ -9371,8 +9436,8 @@ autopage-\theLWR@currentautosec% \let\enskip\LWR@origenskip% \let\quad\LWR@origquad% \let\qquad\LWR@origqquad% -\LetLtxMacro\tabular\LWR@origtabular% \LetLtxMacro\endtabular\LWR@origendtabular% +\csletcs{endtabular*}{LWR@origendtabular*}% \LetLtxMacro\noalign\LWR@orignoalign% \LetLtxMacro\hline\LWR@orighline% \let\newline\LWR@orignewline% @@ -10291,7 +10356,13 @@ autopage-\theLWR@currentautosec% \begin{warpHTML} \newcommand*{\LWR@PreloadedPackage}[1]{% -\@ifpackageloaded{#1}{\LWR@origRequirePackage{lwarp-#1}}{} + \@ifpackageloaded{#1}% + {% + \AtBeginDocument{ + \LWR@origRequirePackage{lwarp-#1}% + } + }% + {}% } \LWR@PreloadedPackage{textcomp} @@ -10304,6 +10375,14 @@ autopage-\theLWR@currentautosec% \LWR@PreloadedPackage{xetexko-vertical} +\LWR@PreloadedPackage{geometry} + +\LWR@PreloadedPackage{plext} + +\LWR@PreloadedPackage{stfloats} + +\LWR@PreloadedPackage{lltjext} + \end{warpHTML} @@ -10338,6 +10417,7 @@ autopage-\theLWR@currentautosec% \begin{warpprint} \define@key{Gin}{class}{} +\define@key{Gin}{alt}{} \AtBeginDocument{ \@ifpackageloaded{overpic}{ \newcommand*{\overpicfontsize}{12} @@ -10596,7 +10676,7 @@ autopage-\theLWR@currentautosec% \begin{warpHTML} \newbool{LWR@minipagethispar} \boolfalse{LWR@minipagethispar} -\NewDocumentEnvironment{LWR@HTML@minipage}{O{t} o O{t} m} +\NewDocumentEnvironment{LWR@HTML@sub@minipage}{m m m m} {% \LWR@traceinfo{minipage}% \begingroup @@ -10610,7 +10690,7 @@ autopage-\theLWR@currentautosec% }{}% \LWR@traceinfo{computed width is \LWR@printlength{\LWR@minipagewidth}}% \setlength{\LWR@minipageheight}{\textheight}% default unless specified -\IfValueT{#2}{\setlength{\LWR@minipageheight}{#2}}% +\ifblank{#2}{}{\setlength{\LWR@minipageheight}{#2}}% \addtocounter{LWR@minipagedepth}{1}% \ifbool{FormatWP}{\newline}{}% \LWR@stoppars% @@ -10641,7 +10721,7 @@ autopage-\theLWR@currentautosec% {width:\LWR@printlength{\LWR@minipagewidth} ; }% }% \LWR@traceinfo{minipage: about to print the height}% -\IfValueT{#2}{height:\LWR@printlength{\LWR@minipageheight} ; }% +\ifblank{#2}{}{height:\LWR@printlength{\LWR@minipageheight} ; }% "}% \setlength{\linewidth}{#4}% the original width @@ -10683,8 +10763,12 @@ autopage-\theLWR@currentautosec% \LWR@traceinfo{LWR@minipage: done}% } +\NewDocumentEnvironment{LWR@HTML@minipage}{O{t} O{} O{t} m} + {\LWR@HTML@sub@minipage{#1}{#2}{#3}{#4}} + {\endLWR@HTML@sub@minipage} + \LWR@formattedenv{minipage} -\NewDocumentCommand{\LWR@HTML@parbox}{O{t} o O{t} m +m} +\NewDocumentCommand{\LWR@HTML@parbox}{O{t} O{} O{t} m +m} { \LWR@traceinfo{parbox of width #4}% \begin{minipage}[#1][#2][#3]{#4}% @@ -10925,6 +11009,24 @@ width:\LWR@printlength{\LWR@tempwidth}% \DeclareRobustCommand{\LWR@null@textsc}[1]{#1} +\@ifundefined{textsi}{ + \LetLtxMacro\LWR@print@textsi\LWR@print@textsc +}{} + +\DeclareRobustCommand{\LWR@HTML@textsi}[1]{% + {% + \sishape% + \InlineClass( + font-style: italic; + font-variant: small-caps ; + font-variant-numeric: oldstyle-nums ; + ){textsi}{#1}% + }% +} +\LWR@formatted{textsi} + +\DeclareRobustCommand{\LWR@null@textsi}[1]{#1} + \DeclareRobustCommand{\LWR@HTML@textsl}[1]{% {% \slshape% @@ -10962,6 +11064,7 @@ width:\LWR@printlength{\LWR@tempwidth}% \LetLtxMacro\textup\LWR@null@textup% \LetLtxMacro\textit\LWR@null@textit% \LetLtxMacro\textsc\LWR@null@textsc% +\LetLtxMacro\textsi\LWR@null@textsi% \LetLtxMacro\textsl\LWR@null@textsl% \LetLtxMacro\textnormal\LWR@null@textnormal% \LetLtxMacro\rmfamily\LWR@null@rmfamily% @@ -10972,6 +11075,7 @@ width:\LWR@printlength{\LWR@tempwidth}% \LetLtxMacro\upshape\LWR@null@upshape% \LetLtxMacro\slshape\LWR@null@slshape% \LetLtxMacro\scshape\LWR@null@scshape% +\LetLtxMacro\sishape\LWR@null@sishape% \LetLtxMacro\itshape\LWR@null@itshape% \LetLtxMacro\normalfont\LWR@null@normalfont% \LetLtxMacro\em\LWR@null@em% @@ -11045,6 +11149,12 @@ width:\LWR@printlength{\LWR@tempwidth}% \renewrobustcmd*{\scshape}{\renewcommand*{\LWR@f@shape}{sc}} +\@ifundefined{sishape}{ + \newrobustcmd*{\sishape}{\renewcommand*{\LWR@f@shape}{si}} +}{ + \renewrobustcmd*{\sishape}{\renewcommand*{\LWR@f@shape}{si}} +} + \renewrobustcmd*{\slshape}{\renewcommand*{\LWR@f@shape}{sl}} \renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape} @@ -11184,7 +11294,7 @@ width:\LWR@printlength{\LWR@tempwidth}% \renewrobustcmd*{\quad}{% \LWR@minipagestoppars% -\HTMLunicode{2001}% +\HTMLunicode{2003}% \LWR@minipagestartpars% } @@ -11192,7 +11302,7 @@ width:\LWR@printlength{\LWR@tempwidth}% \renewrobustcmd*{\enskip}{% \LWR@minipagestoppars% -\HTMLunicode{2000}% +\HTMLunicode{2002}% \LWR@minipagestartpars% } @@ -11452,25 +11562,8 @@ width:\LWR@printlength{\LWR@tempwidth}% \end{warpHTML} \begin{warpHTML} -\@ifclassloaded{bxjsarticle}{\RequirePackage{lwarp-geometry}}{} -\@ifclassloaded{bxjsbook}{\RequirePackage{lwarp-geometry}}{} -\@ifclassloaded{bxjsreport}{\RequirePackage{lwarp-geometry}}{} -\@ifclassloaded{bxjsslide}{\RequirePackage{lwarp-geometry}}{} -\end{warpHTML} - -\begin{warpHTML} -\@ifclassloaded{ltjsarticle}{\RequirePackage{lwarp-stfloats}}{} -\@ifclassloaded{ltjsbook}{\RequirePackage{lwarp-stfloats}}{} -\@ifclassloaded{ltjsreport}{\RequirePackage{lwarp-stfloats}}{} -\@ifclassloaded{ltjspf}{\RequirePackage{lwarp-stfloats}}{} -\@ifclassloaded{ltjsiyou}{\RequirePackage{lwarp-stfloats}}{} -\end{warpHTML} - -\begin{warpHTML} \newcommand*{\LWR@patchujtclasses}{ - \let\tate\relax - \DeclareDocumentCommand{\rensuji}{m}{##1} - \def\@partnameformat{}% uj/t does not use \partname + \def\@partnameformat{} \def\@partcntformat##1{% \prepartname% \csname the##1\endcsname% @@ -11499,6 +11592,15 @@ width:\LWR@printlength{\LWR@tempwidth}% \thesubsubsection.\@arabic\c@paragraph} \renewcommand{\thesubparagraph}{% \theparagraph.\@arabic\c@subparagraph} + \@ifundefined{chapter}{ + \renewcommand{\thefigure}{\@arabic\c@figure} + \renewcommand{\thetable}{\@arabic\c@table} + }{ + \renewcommand{\thefigure}{% + \ifnum\c@chapter>\z@\thechapter.\fi\@arabic\c@figure} + \renewcommand{\thetable}{% + \ifnum\c@chapter>\z@\thechapter.\fi\@arabic\c@table} + } } \@ifclassloaded{ujarticle}{\LWR@patchujtclasses}{} @@ -11507,6 +11609,17 @@ width:\LWR@printlength{\LWR@tempwidth}% \@ifclassloaded{utarticle}{\LWR@patchujtclasses}{} \@ifclassloaded{utbook}{\LWR@patchujtclasses}{} \@ifclassloaded{utreport}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjarticle}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjbook}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjreport}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjsarticle}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjsbook}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjsreport}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjskiyou}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjspf}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjtarticle}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjtbook}{\LWR@patchujtclasses}{} +\@ifclassloaded{ltjtreport}{\LWR@patchujtclasses}{} \end{warpHTML} \begin{warpHTML} |