From 1ebb33e9902b2a96b03f5cd15dcf3f6c561f19ef Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 27 Aug 2017 23:56:09 +0000 Subject: lwarp (27aug17) git-svn-id: svn://tug.org/texlive/trunk@45144 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/lwarp/lwarp.dtx | 2106 +++++++++++++++++++----- Master/texmf-dist/source/latex/lwarp/lwarp.ins | 19 + 2 files changed, 1724 insertions(+), 401 deletions(-) (limited to 'Master/texmf-dist/source/latex/lwarp') diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx index 9d0e35838c4..00fe3ffbe9d 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx @@ -16,16 +16,24 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{lwarp} -% [2017/08/19 v0.37 Allows LaTeX to directly produce HTML5 output.] +% [2017/08/27 v0.38 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} \usepackage{lmodern} % \usepackage{libertine} +\usepackage[space]{erewhon} +% \usepackage[varqu,varl]{inconsolata} % typewriter +% \usepackage{roboto} +% \usepackage{cabin} +\usepackage[tabular]{sourcesanspro} + + \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} -\usepackage{textcomp} % provides \degree, \textquotesingle, \textmu + +\usepackage{textcomp} % provides \degree, \textquotesingle, \textmu \usepackage{newunicodechar} \newunicodechar{ff}{ff} @@ -62,6 +70,8 @@ \usepackage[lwarpmk]{lwarp} +\usepackage[erewhon]{newtxmath} + \usepackage{needspace} @@ -215,33 +225,35 @@ Keywords={LaTeX, HTML, conversion}% \newcommand{\userentry}[1]{% -\leavevmode\smallskip\newline +\par \hspace*{2em}\begin{minipage}{\linewidth-2em} {\footnotesize Enter~$\Rightarrow$}\quad\texttt{#1} \end{minipage} -\unskip\smallskip +\par } \newenvironment{sourcedisplay} { -\leavevmode\smallskip\newline +\leavevmode +\par \hspace*{2em}\minipage{\linewidth-2em} \ttfamily } { \endminipage -\unskip\smallskip +\par } \newenvironment{UIdisplay} { -\leavevmode\smallskip\newline +\leavevmode +\par \hspace*{2em}\minipage{\linewidth-2em} \sffamily } { \endminipage -\unskip\smallskip +\par } @@ -324,14 +336,160 @@ during \HTML\ output, nor does \pkg{url} create hyperlinks during print output. } \newcommand{\limitsabstract}{% -\pkg{abstract} is supported. If using the \texttt{number} option with file splits, +\watchout[missing \acro{TOC}] be sure to place the table of contents before the abstract. The number option causes a section break which may cause a file split, which would put a table of contents out of the home page if it is after the abstract. } +\newcommand{\limitsappendix}{% +During \HTML\ conversion, the option \texttt{toc} without +\watchout[incorrect \acro{TOC} link] +the option \texttt{page} results in a \acro{TOC} link to +whichever section was before the \texttt{appendices} environment. +It is recommended to use both \texttt{toc} and also \texttt{page} at the same time. +} + +\newcommand{\limitsindexlanguage}{% +The \pkg{lwarp} package takes an option +\DescribeOption{IndexLanguage} +\texttt{IndexLanguage=english} to set the language used by \texttt{xindy}. +This is passed to \texttt{xindy} using its \texttt{-L} option, and is +used for both index and glossary generation. +} + +\newcommand{\limitsglossaries}{% +\texttt{xindy} is required for \pkg{glossaries}. + +The default \texttt{style=item} option for \pkg{glossaries} conflicts +with \pkg{lwarp}, so the style is forced to \texttt{index} instead. + +The page number list in the printed form would become \cs{nameref}s in \HTML, +which could become a very long string if many items are referenced. +For now, the number list is simply turned off. + +The glossaries may be placed in a numbered or unnumbered section, given +\margintag{placement and \acro{TOC} options} +a \acro{TOC} entry, and placed inline or on their own \HTML page: +\begin{description} + +\item [Numbered section, on its own \HTML\ page:] + \begin{sourcedisplay} + \cs{usepackage}[xindy,toc,numberedsection=nolabel]\{glossaries\} \\ + \dots \\ + \cs{printglossaries} + \end{sourcedisplay} + +\item [Unnumbered section, inline with the current \HTML\ page:] + \begin{sourcedisplay} + \cs{usepackage}[xindy,toc]\{glossaries\} \\ + \dots \\ + \cs{printglossaries} + \end{sourcedisplay} + +\item [Unnumbered section, on its own \HTML\ page:] + \begin{sourcedisplay} + \cs{usepackage}[xindy,toc]\{glossaries\} \\ + \dots \\ + \cs{ForceHTMLPage} \\ + \cs{printglossaries} + \end{sourcedisplay} +\end{description} + +\limitsindexlanguage + +\DescribeOption[lwarpmk]{printglossary} +\DescribeOption[lwarpmk]{htmlglossary} +\texttt{lwarpmk} has the commands \texttt{lwarpmk printglossary} and +\texttt{lwarpmk htmlglossary} to process the glossaries created by +\pkg{glossaries} using \texttt{xindy}. +} + + +\newcommand*{\limitsindex}{% + +\limitsindexlanguage + +An index may be placed inline with other \HTML\ text, or on its own \HTML\ page: +\margintag{placement and \acro{TOC} options} + +\begin{description} + +\item [Inline, with a manual TOC entry:] \ + + A commonly-used method to introduce an index in a \LaTeX\ document: + \begin{sourcedisplay} + \cs{cleardoublepage} \\ + \cs{phantomsection} \\ + \cs{addcontentsline}\{toc\}\{section\}\{\cs{indexname}\}\% or chapter \\ + \cs{printindex} + \end{sourcedisplay} + +\item [On its own \HTML\ page, with a manual TOC entry:] \ + \begin{sourcedisplay} + \cs{begin}\{warpprint\} \\ + \cs{cleardoublepage} \\ + \cs{phantomsection} \\ + \cs{addcontentsline}\{toc\}\{section\}\{\cs{indexname}\}\% or chapter \\ + \cs{end}\{warpprint\} \\ + \cs{ForceHTMLPage} \\ + \cs{ForceHTMLTOC} \\ + \cs{printindex} + \end{sourcedisplay} + +\item [Inline, with an automatic TOC entry:] \ + + The \pkg{tocbibind} + \DescribePackage{tocbibind} + package may be used to automatically place an entry in the \acro{TOC}. + \begin{sourcedisplay} + \cs{usepackage}[nottoc]\{tocbibind\} \\ + \dots \\ + \cs{cleardoublepage} \\ + \cs{phantomsection} \% to fix print-version index link \\ + \cs{printindex} + \end{sourcedisplay} + +\item [On its own \HTML\ page, with an automatic TOC entry:] + \begin{sourcedisplay} + \cs{usepackage}[nottoc]\{tocbibind\} \\ + \dots \\ + \cs{cleardoublepage} \\ + \cs{phantomsection} \% to fix print-version index link \\ + \cs{ForceHTMLPage} \\ + \cs{printindex} + \end{sourcedisplay} + + Use the \pkg{tocbibind} \texttt{numindex} option to generate a numbered index. +\DescribeOption[tocbibind]{numindex} + Without this option, the index heading has no number. +\margintag{numbered index section} +\end{description} +} + +\newcommand*{\limitspagenote}{% +\pkg{pagenote} works as-is, but the \texttt{page} option is disabled. +} + +\newcommand*{\limitsendnotes}{% +To place the endnotes in the \acro{TOC}, use: +\margintag{table of contents} +\begin{sourcedisplay} +\cs{usepackage}\{endnotes\} \\ +\cs{appto}\cs{enoteheading}\{\cs{addcontentsline}\{toc\}\{section\}\{\cs{notesname}\}\} +\cs{renewcommand*}\{\cs{notesname}\}\{Endnotes\} \% optional \\ +\end{sourcedisplay} + +To additionally have the endnotes on their own \HTML\ page, +\margintag{\HTML\ page} +if \texttt{FileDepth} allows: +\begin{sourcedisplay} +\cs{ForceHTMLPage} \\ +\cs{theendnotes} +\end{sourcedisplay} +} \newcommand{\limitstext}{\cs{textbf}, etc.\ are supported, @@ -367,6 +525,16 @@ Native \LaTeX\ accents such as \cs{"} will work, but many more kinds of accents are available when using Unicode-aware \XeLaTeX\ and \LuaLaTeX. } +\newcommand{\limitsrelsize}{% +For \HTML\, only the inline macros are supported: \cs{textlarger}, \cs{textsmaller}, and +\cs{textscale}. Each becomes an inline span of a modified \attribute{font-size}. + +\cs{relsize}, \cs{larger}, \cs{smaller}, and \cs{relscale} are ignored. + +While creating \SVG\ math for \HTML, the original definitions are temporarilty restored, +and so should work as expected. +} + \newcommand{\limitsreferences}{% \cs{nameref} refers to the most recently-used section where the \cs{label} was defined. If no section has been defined before the \cs{label}, @@ -649,6 +817,25 @@ For a document with a large amount of math, see \cref{sec:tutorialmathjax} to use MathJax instead. } +\newcommand{\limitsgrffile}{% +\pkg{grffile} is partially emulated. +File types known to the browser are displayed, and unknown file types are given a link. +Each \PDF\ image for print mode should be accompanied +\watchout[matching \PDF\ and \SVG] +by an \SVG\ version for \HTML. +No attempt is made to convert input or filename encodings. +\watchout[encodings] +} + +\newcommand{\limitscolor}{% +\pkg{color} is superceded by \pkg{xcolor}, and +\pkg{lwarp} requires several of the features of \pkg{xcolor}. + +It should be sufficient for the user's document to load \pkg{color} then +\watchout[missing colors] +load \pkg{xcolor} as well. +} + \newcommand{\limitsxcolor}{% \cs{colorboxBlock} and \cs{fcolorboxBlock} are provided for \margintag{\cs{colorboxBlock} and \cs{fcolorboxBlock}} @@ -891,7 +1078,7 @@ The caption may be placed either inside or outside the \env{fminipage}: \cs{begin}\{table\}\\ \cs{begin}\{fminipage\}\{\cs{linewidth}\}\\ \cs{begin}\{tabular\}\{lr\}\\ -...\\ +\dots \\ \cs{end}\{tabular\}\\ \cs{end}\{fminipage\}\\ \cs{end}\{table\}\\ @@ -964,12 +1151,10 @@ Footnotes are currently placed at the bottom of the \HTML\ page. \newcommand{\limitscaption}{% To ensure proper float numbering, set caption positions such as: - \begin{sourcedisplay} \cs{captionsetup}[table]\{position=top\} \\ \cs{captionsetup}[figure]\{position=bottom\} \end{sourcedisplay} - Similarly for \texttt{subtable}, \texttt{subfigure}, and \texttt{longtable}. } @@ -1055,12 +1240,10 @@ changed to a dash. The following may be used to restore it to a colon: Also when French is used, \margintag{punctuation spaces} -\pkg{lwarp} patches \cs{FBcolonspace} and \cs{FBthinspace} to create -fixed-width \HTML\ spaces around punctutation: -\begin{sourcedisplay} -\cs{renewcommand*}\{\cs{FBcolonspace}\}\{\~{}\} \\ -\cs{renewcommand*}\{\cs{FBthinspace}\}\{\cs{,}\} -\end{sourcedisplay} +\pkg{lwarp} creates fixed-width space around punctuation by patching +\cs{FBcolonspace}, \cs{FBthinspace}, +\cs{FBguillspace}, \cs{FBmedkern}, \cs{FBthickkern}, \cs{FBtextellipsis}, +and the tilde. If the user's document also changes these parameters, \watchout[customized spacing] the user's changes @@ -1096,26 +1279,6 @@ The proper load order is: \end{enumerate} } -\newcommand{\limitsglossaries}{% -\texttt{xindy} is required for \pkg{glossaries}. - -The default \texttt{style=item} option for \pkg{glossaries} conflicts -with \pkg{lwarp}, so the style is forced to \texttt{index} instead. - -The page number list in the printed form would become \cs{nameref}s in \HTML, -which could become a very long string if many items are referenced. -For now, the number list is simply turned off. - -\texttt{lwarpmk} has the commands \texttt{printglossary} and -\texttt{htmlglossary} to process the glossaries created by -\pkg{glossaries} using \texttt{xindy}. - -The package \pkg{lwarp} takes an option -\DescribeOption{IndexLanguage} -\texttt{IndexLanguage=english} to set the language used by \texttt{xindy}. -This is passed to \texttt{xindy} using its \texttt{-L} option, and is -used for both index and glossary generation. -} \newcommand{\osportabilityusage}{% @@ -1160,7 +1323,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{13116} +% \CheckSum{13540} % % \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 @@ -1239,6 +1402,7 @@ This boolean may be tested by the user for later use. % \changes{v0.36}{2017/08/15}{Source: Improved formatting.} % \changes{v0.36}{2017/08/17}{\ 2017/08/17} % \changes{v0.37}{2017/08/19}{\ 2017/08/19} +% \changes{v0.38}{2017/08/27}{\ 2017/08/27} @@ -1269,13 +1433,13 @@ This boolean may be tested by the user for later use. % % \bigskip % -% {\small\copyright{} 2016--2017} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com} +% {\small\textcopyright{} 2016--2017} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com} % % % ^^A % \title{The \pkg{lwarp} package\thanks{This document % ^^A % corresponds to \pkg{lwarp}~\fileversion, % ^^A % dated \filedate.}} -% ^^A % \author{{\small\copyright{} 2016--2017} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com}} +% ^^A % \author{{\small\textcopyright{} 2016--2017} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com}} % ^^A % \published{} % ^^A % \subtitle{\textup{\LaTeX{} to HTML5}} % ^^A % @@ -1373,6 +1537,34 @@ This boolean may be tested by the user for later use. % For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}. % % \begin{description} +% \item[v0.38:] \ +% \begin{itemize} +% \item Added |lwarpmk print1| and |lwarpmk html1| actions to +% \margintag{forced single-pass compile} +% force a compile of the project a single time. +% Useful when multiple passes are not needed, +% or changes were not detected. +% \item Added \cs{ForceHTMLPage} and \cs{ForceHTMLTOC} to force +% \margintag{starred sections} +% a starred sectional unit onto its own \HTML\ page +% and with its own \acro{TOC} entry. +% See \cref{sec:forcesectionstar}. +% \item Modified the tutorial to use the new \cs{ForceHTMLPage} +% \margintag{updated tutorial} +% and \cs{ForceHTMLTOC} macros. +% \item Added \pkg{appendix}, \pkg{tocbibind}, \pkg{fncychap}, \pkg{fix2col}. +% \margintag{packages} +% \item Added \pkg{relsize}, \pkg{scalefnt}. +% \item Added \pkg{realscripts}, \pkg{metalogo}, \pkg{xltxtra}. +% \item Added \pkg{grffile}, \pkg{romanbar}. +% \item Added \pkg{arabicfront}, \pkg{chappg}, \pkg{nonumonpart}, \pkg{nopageno}, +% \pkg{romanbarpagenumber}. +% \item Docs: Improved description of the use of front/back matter. +% \margintag{front \& back matter} +% See \cref{sec:frontbackmatter}. +% \item Fix: \pkg{color} requests \pkg{xcolor}. +% \item Fix: \cs{part} for |article| class. +% \end{itemize} % \item[v0.37:] \ % \begin{itemize} % \item \cs{include} now maintains independent |.aux| files @@ -1839,6 +2031,7 @@ This boolean may be tested by the user for later use. % \subsection{Supported packages and features} % % \changes{v0.15}{2016/04/05}{Docs: Moved the supported functions table to the introduction.} +% \changes{v0.38}{2017/08/22}{Docs: Enhanced \protect\textit{Supported Functions} table.} % % Supported classes include \pkg{book}, \pkg{report}, and \pkg{article}. % \pkg{memoir} is planned, but in the meantime many of the packages @@ -1867,25 +2060,23 @@ This boolean may be tested by the user for later use. % \midrule % Classes: & \pkg{book}, \pkg{report}, or \pkg{article}. \pkg{memoir} is planned. \\ % \midrule +% Page layout: & Emulates \pkg{fancyhdr}, \pkg{titleps}. \\ % Sectioning: & Supported, with hyperlinks. % Honors \cmds{tocdepth} and \cmds{secnumdepth}. -% Adds \cmds{filedepth} for splitting the \HTML\ output. +% Adds \cmds{FileDepth} for splitting the \HTML\ output. % Files may be numbered sequentially or named according to section name. % Common short words and punctuation is removed from the filenames. -% Emulates \pkg{titlesec}. \\ -% Page layout: & Emulates \pkg{fancyhdr}, \pkg{titleps}. \\ +% Emulates \pkg{titlesec}, \pkg{fncychap}. \\ % Table of contents, figures, tables: & Supported, with hyperlinks. -% Emulates \pkg{titletoc} and \pkg{tocloft}. \\ +% Supports \pkg{tocbibind}. Emulates \pkg{titletoc} and \pkg{tocloft}. \\ % Title page: & \cs{maketitle}, \env{titlepage}, \pkg{titling}. Optional % \pkg{titling}-based commands for published and subtitle. \\ -% \env{abstract}: & Supported \\ +% Front \&\ back matter: & \pkg{abstract}, \pkg{appendix} \\ % \midrule -% Cross-references: & Emulated, with hyperlinks. \\ -% \pkg{hyperref}: & Emulated. -% \HTML\ hyperlinks are generated for \TOC, \LOF, \LOT, -% \cs{nameref}, \cs{ref}, -% the \pkg{cleveref} commands, and index entries.\\ -% \pkg{url}: & Supported, without hyperlinks so far. \\ +% Cross-references: & Emulated, with hyperlinks. +% \pkg{hyperref}, \pkg{cleveref}, \pkg{varioref}, \pkg{url}. \\ +% Bibliography & Supported text-only. \\ +% Languages & \pkg{babel}. (\pkg{polyglossia} is untested.) \\ % \midrule % Margin notes: & \pkg{marginfit}, \pkg{marginfix}. \\ % Footnotes: & \pkg{footnote}, \pkg{footmisc}, @@ -1902,57 +2093,56 @@ This boolean may be tested by the user for later use. % due to native \LaTeX{} processing.\\ % Theorems: & Support for native \LaTeX\ theorems, plus % \pkg{theorem}, \pkg{amsthm}, \pkg{ntheorem}. \\ +% Add'l math: & \pkg{delarray}, \pkg{bm}, math fonts via \SVG\ images. \\ +% Units and fractions: & \pkg{siunitx}, \pkg{xfrac}, \pkg{nicefrac}, \pkg{units} \\ % \midrule % Floats: & Appear where declared. % \pkg{float}, \pkg{rotfloat}, \pkg{newfloat}, \pkg{caption} and \pkg{subcaption}, % \pkg{subfig}, \pkg{capt-of}, \pkg{placeins}, \pkg{trivfloat}, \pkg{floatrow}, % \pkg{keyfloat}, \pkg{wrapfig}, \pkg{cutwin}, \pkg{floatflt}. \\ % \midrule -% \env{tabular}: & Emulated. -% \cs{multirow} and \cs{multicolumn} are available, but cannot -% be used at the same time. -% Nested tables are not supported. \\ -% \pkg{array}: & Supported inside math environments, emulated elsewhere. \\ -% \pkg{tabularx}, \pkg{tabulary}, \pkg{threeparttable}, \pkg{multirow}: & Emulated. \\ -% \pkg{longtable}: & Emulated. Converted to a tabular. Captions supported. -% Extra headings and \cs{kill} lines must be enclosed in -% \cs{warpprintonly\{\}} \\ -% \cmidrule{2-2} -% \pkg{booktabs}: & Emulated. \cs{toprule} and \cs{bottomrule} -% form black rules, \cs{midrule} forms silver rules, as demonstrated on -% this table. -% \cs{cmidrule}, demonstrated at this line, does not use width or trim options. \\ +% Tabular & +% \env{tabular} environment, \pkg{array}, \pkg{tabularx}, \pkg{tabulary}, +% \pkg{threeparttable}, \pkg{multirow}, \pkg{longtable}, \pkg{booktabs}. \\ % \midrule -% \pkg{graphics}, \pkg{graphicx}: & Emulated. +% Graphics & \pkg{graphics} and \pkg{graphicx} are emulated. % \cs{includegraphics} supports \cmds{width}, \cmds{height}, % \cmds{origin}, \cmds{angle}, and \cmds{scale} tags, and adds \cmds{class}. % References to \PDF\ files are changed to \SVG, other image types % are accepted as well. -% \cs{rotatebox} and \cs{scalebox} are supported as well as \HTML\ can handle. \\ +% \cs{rotatebox} and \cs{scalebox} are supported as well as \HTML\ can handle. +% \pkg{grffile} is emulated. \\ % \pkg{rotating}: & Emulated. All objects are displayed unrotated. \\ +% \pkg{picture} and \pkg{tikz}: & Converted to an \SVG\ image. \\ +% \midrule +% \pkg{xcolor}: & \textcolor{DarkGreen}{Supported}. +% Full package color names, any color models, +% and \textcolor{Goldenrod}{mixing}. +% \textcolor{Maroon}{\cs{textcolor}}, +% \colorbox{LightSteelBlue}{\cs{colorbox}}, +% \fcolorbox{red}{NavajoWhite}{\cs{fcolorbox}}. +% Enhanced for \HTML\ compatibility. \\ % \midrule % Lists: & Standard \LaTeX\ environments are supported, along with % \pkg{enumitem}, \pkg{enumerate}, \pkg{paralist}. % Spacing is still controlled by \CSS. \\ % \midrule % Environments: & Standard \LaTeX{} environments are supported. \\ -% \pkg{picture} and \pkg{tikz}: & Converted to an \SVG\ image. \\ % \env{minipage}: & Supported with some \HTMLfive-imposed limitations. % Nested minipages are supported. % Footnotes appear at the bottom of the \HTML\ page. \\ +% Quotations: & \pkg{verse}, \pkg{csquotes}, \pkg{epigraph} \\ % Verbatim: & \pkg{verbatim}, \pkg{moreverb}, \pkg{fancyvrb} (except for verbatim footnotes). \\ % Frames: & \pkg{framed}, \pkg{fancybox}, \pkg{mdframed}, \pkg{boxedminipage2e}, \pkg{shadow}. \\ % \pkg{multicol}: & Emulated, with \CSSthree. % Converted to up to three columns with an optional heading, % per browser support. Single-column if unsupported.\\ % \midrule -% \pkg{siunitx}: & Mostly supported except for \cmds{per-mode=fraction}. \\ -% \pkg{xfrac}: & Supported \\ -% \midrule % Direct formatting: & \cs{emph}, \cs{textsuperscript}, % \cs{textbf}, etc are supported. % \cs{bfseries}, etc.\ are not yet supported. -% \pkg{lettrine}, \pkg{ulem}, and \pkg{soul} are supported. \\ +% \pkg{lettrine}, \pkg{ulem}, \pkg{soul}, \pkg{relsize}, \pkg{scalefnt}, +% and \pkg{realscripts} are supported. \\ % Ordinals: & \pkg{nth}, \pkg{fmtcount}, and \pkg{engord} are supported. \\ % Text ligatures: & Ligatures for symbols are supported. % Ligatures for f, q, t are intentionally turned off @@ -1965,15 +2155,16 @@ This boolean may be tested by the user for later use. % \HTML\ reserved characters: & \cs{\&}, \cs{textless}, and % \cs{textgreater} are converted to \HTML\ entities. \\ % \midrule -% \pkg{xcolor}: & \textcolor{DarkGreen}{Supported}. -% Full package color names, any color models, -% and \textcolor{Goldenrod}{mixing} is -% converted to hex web colors via \cs{convertcolorspec}. -% Patched commands are -% \textcolor{Maroon}{\cs{textcolor}}, -% \colorbox{LightSteelBlue}{\cs{colorbox}}, -% and \fcolorbox{red}{NavajoWhite}{\cs{fcolorbox}}. -% \cs{pagecolor} is not supported. \\ +% Fonts: & Used as-is. Appear in math expressions or embedded image environments. \\ +% Symbols: & Native \LaTeX\ diacriticals, \pkg{textcomp}. \\ +% \midrule +% Working as-is: & +% Various utility, calculation, file, and text-only packags, such as +% \pkg{calc}, +% \pkg{fileerr}, +% \pkg{somedefs}, +% \pkg{trace}, +% \pkg{xspace}. \\ % \midrule % Where: & \\ % \textbf{Supported:} & The existing \LaTeX{} package is used. \\ @@ -1984,37 +2175,9 @@ This boolean may be tested by the user for later use. % \end{longtable} % % -% Supported packages include everything listed in the table of contents, -% plus the packages listed in \cref{tab:additionalsupported}, -% and probably others which have not yet been tested. -% Many are simply nullfied during \HTML\ output. -% Others are not affected by the output mode and thus work as-is. -% -% -% \begin{table} -% \caption{Additional supported packages} -% \label{tab:additionalsupported} -% \sffamily -% babel, bm, -% calc, cleveref, csquotes, -% fancyvrb, fileerr, -% newtxmath, nicefrac -% siunitx, somedefs, -% tikz, trace, -% units, url, -% varioref, -% xspace -% \end{table} -% % -% These packages and features probably works with little or no change to the -% user's source code. -% Special environments are provided to mark blocks of code which are for -% print only, \HTML\ only, or both, should it be necessary. -% % % -% % \clearpage % % \section{Alternatives} @@ -2651,6 +2814,9 @@ This boolean may be tested by the user for later use. % % \VerbatimInput{lwarp_tutorial.txt} % +% ^^A so they don't copy/paste the header: +% \thispagestyle{empty} +% % ^^A ************************************************************************** % ^^A NOTE: lwarp_tutorial.txt is located in the TDS doc directory! % ^^A Copy it to the source directory if you wish to recompile lwarp.dtx! @@ -2748,7 +2914,6 @@ This boolean may be tested by the user for later use. % Several compilations may be necessary to resolve cross-references. % % \item Force a recompile to occur. -% % \userentry{lwarpmk again} % \userentry{lwarpmk print} % @@ -2759,12 +2924,15 @@ This boolean may be tested by the user for later use. % % \item Process the index.\index{index>processing}\footnote{A \texttt{lwarpmk printglossary} command is also % available to process a glossary produced with the \textsf{glossaries} package. -% See \cref{sec:glossaries}.} +% See \cref{sec:glossaries}.}\footnote{Also see \cref{sec:indextocbibind} for index options.} % \userentry{lwarpmk printindex} % % \item Recompile again to include the index. % \userentry{lwarpmk print} % +% \item To force a single recompile when needed, even if no changes were detected: +% \userentry{lwarpmk print1} +% % \end{enumerate} % % Note that the \HTML\ customization commands are ignored while making the @@ -2819,13 +2987,17 @@ This boolean may be tested by the user for later use. % % \item Process the \HTML\ index and recompile:\index{index>processing}\footnote{A \texttt{lwarpmk htmlglossary} command is also % available to process a glossary produced with the \textsf{glossaries} package. -% See \cref{sec:glossaries}.} +% See \cref{sec:glossaries}.}\footnote{Also see \cref{sec:indextocbibind} for index options.} % \userentry{lwarpmk htmlindex} % \userentry{lwarpmk html} % -% |_Index.html|, is updated for the new \LaTeX\ index. +% |_Index.html| is updated for the new \LaTeX\ index. % % \item Reload the web page to see the added index. +% +% \item To force a single recompile when needed, even if no changes were detected: +% \userentry{lwarpmk html1} +% % \end{enumerate} % % @@ -2885,7 +3057,8 @@ This boolean may be tested by the user for later use. % options for rendering, and for copying the \LaTeX\ source. % % While using MathJax has many advantages, it may not be able to represent -% complex expressions or spacing adjustments as well as \LaTeX. +% complex expressions or spacing adjustments as well as \LaTeX, and it +% may not support some math-related packages. % % % @@ -3256,6 +3429,11 @@ This boolean may be tested by the user for later use. % the |lwarpmk| utility does and it is likely to correctly know when to % recompile. A recompile may be forced by making a small change to the source. % +% A single recompile may be forced with: +% \margintag{forced single-pass recompile} +% \userentry{lwarpmk print1} \quad and/or +% \userentry{lwarpmk html1} +% % % \clearpage % @@ -3889,6 +4067,9 @@ This boolean may be tested by the user for later use. % |\item[\href{file\_name.pdf}{text}]| % \end{sourcedisplay} % +% \subsubsection{\pkg{relsize} package} +% +% \limitsrelsize % % % \subsection{Boxes and minipages} @@ -4037,6 +4218,91 @@ This boolean may be tested by the user for later use. % \limitsfootnotes % % +% +% \subsection{Front and back matter} +% \label{sec:frontbackmatter} +% +% \subsubsection{Starred chapters and sections} +% \label{sec:forcesectionstar} +% +% \changes{v0.38}{2017/08/24}{Docs: Starred sections.} +% +% The following describes \cs{ForceHTMLPage} and \cs{ForceHTMLTOC}, +% which may be used for \pkg{endnotes}, \pkg{glossaries}, \pkg{tocbibind}, +% and the index. See the following sections where applicable. +% Continue here if interested in the reason for adding these commands to \pkg{lwarp}. +% +% Some packages use \cs{chapter*} or \cs{section*} to introduce reference +% material such as notes or lists, often to be placed in the back matter of a book. +% These starred sections are placed inline instead of on their own \HTML\ pages, +% and they are not given \acro{TOC} entries. +% +% \pkg{lwarp} provides a method to cause a starred section to be on its own \HTML\ page, +% subject to \texttt{FileDepth}, and also a method to cause the starred section +% to have its own \acro{TOC} entry during \HTML\ output. +% +% \DescribeMacro{\ForceHTMLPage} +% To place a starred section on its own \HTML\ page, use \cs{ForceHTMLPage} just before +% the \cs{chapter*} or \cs{section*}. \pkg{lwarp} will create a new page for the +% starred sectional unit. +% +% A starred sectional unit does not have a \acro{TOC} entry unless one is placed +% manually. The typical method using \cs{phantomsection} and \cs{addcontentsline} +% works for inline text but fails when the new starred section is given its own +% webpage after the \acro{TOC} entry is created. +% If the starred section has its own \HTML\ page but no correct \acro{TOC} entry +% \watchout[inaccessible \HTML\ page] +% pointing to that page, the page will be inaccessible unless some other link is created. +% +% \DescribeMacro{\ForceHTMLTOC} +% To automatically force the \HTML\ version of the document to have a \acro{TOC} entry +% for a starred section, use \cs{ForceHTMLTOC} just before the \cs{chapter*} or +% \cs{section*}. The \acro{TOC} will only be assigned for \HTML\ output, not +% for print output, and it will appear in the main \acro{TOC} and also the side\acro{TOC} +% per page. +% +% For print output, \cs{ForceHTMLTOC} and \cs{ForceHTMLPage} have no effect. +% +% +% \subsubsection{\pkg{abstract} package} +% +% \limitsabstract +% +% +% \subsubsection{\pkg{appendix} package} +% +% \limitsappendix +% +% +% \subsubsection{\pkg{pagenote} package} +% +% \limitspagenote +% +% +% \subsubsection{\pkg{endnotes} package} +% +% \limitsendnotes +% +% +% \subsubsection{\pkg{glossaries} package} +% \label{sec:glossaries} +% +% \DescribePackage{glossaries} +% \limitsglossaries +% +% +% \subsubsection{Index and the \pkg{tocbibind} package} +% \label{sec:indextocbibind} +% \index{index>placement and \acro{TOC} options} +% +% \changes{v0.38}{2017/08/24}{Docs: Index, \protect\pkg{tocbibind}.} +% +% \limitsindex +% +% See \cref{sec:index}. +% +% +% % \subsection{Math} % \label{sec:limitsmath} % @@ -4076,6 +4342,16 @@ This boolean may be tested by the user for later use. % \limitsgraphics % % +% \subsubsection{\pkg{grffile} package} +% +% \limitsgrffile +% +% +% \subsubsection{\pkg{color} package} +% +% \limitscolor +% +% % \subsubsection{\pkg{xcolor} package} % % \limitsxcolor @@ -4119,10 +4395,6 @@ This boolean may be tested by the user for later use. % % \subsection{Miscellaneous} % -% \subsubsection{\pkg{abstract} package} -% -% \limitsabstract -% % % \subsubsection{\pkg{verse} and \pkg{memoir}} % @@ -4146,12 +4418,6 @@ This boolean may be tested by the user for later use. % \limitsbabeltwo % % -% \subsubsection{\pkg{glossaries} package} -% \label{sec:glossaries} -% -% \DescribePackage{glossaries} -% \limitsglossaries -% % % % @@ -4235,7 +4501,7 @@ This boolean may be tested by the user for later use. % Select the ``magic wand'' to the right of this entry box, and set % the first entry % \begin{UIdisplay} -% Math HTML tags with tag name: +% Match HTML tags with tag name: % \end{UIdisplay} % to \element{h4}. (Or \element{h3} for document classes with \cs{chapter}s.) % The \textsf{Detect chapters at} field should then show @@ -4322,14 +4588,29 @@ This boolean may be tested by the user for later use. % % An additional boolean may be set to help mark float boundaries: % +% \newcommand{\describeHTMLMarkFloats}{ +% Default true. +% Adds +% \begin{sourcedisplay} +% === table begin \\ +% \dots \\ +% === end +% \end{sourcedisplay} +% or +% \begin{sourcedisplay} +% === figure begin \\ +% \dots \\ +% === end +% \end{sourcedisplay} +% around floats while formatting for word processors. +% This helps identify boundaries of floats to be manually converted +% to word-processor frames. +% } +% % \DescribeBoolean{HTMLMarkFloats} % \begin{docsidebar} % \raggedright -% Default true. -% Adds |=== table begin| or |=== figure begin|, and |=== end| -% around floats while formatting for word processors. -% This helps identify boundaries of floats to be manually converted -% to word-processor frames. +% \describeHTMLMarkFloats % \end{docsidebar} % \index{word processor>HTML conversion settings} % \index{HTML>conversion settings>word processor} @@ -4388,8 +4669,15 @@ This boolean may be tested by the user for later use. % will not need to be emulated for \HTML\ output. Only the ``user-facing'' % macros need to be nullified or emulated. % -% Each |lwarp-| package should first call either \cs{LWR@ProvidesPackageDrop} -% or \cs{LWR@ProvidesPackagePass}. If |Drop|ped, the original print-version +% Each |lwarp-| package should first call either +% \begin{sourcedisplay} +% \cs{LWR@ProvidesPackageDrop} +% \end{sourcedisplay} +% or +% \begin{sourcedisplay} +% \cs{LWR@ProvidesPackagePass} +% \end{sourcedisplay} +% If |Drop|ped, the original print-version % package is ignored, and only the |lwarp-| version is used. % Use this where the original print version is useless for \HTML. % If |Pass|ed, the original package is loaded first, with the user-supplied options, @@ -4401,6 +4689,17 @@ This boolean may be tested by the user for later use. % For a case where the original package is usable without changes, there is no % need to create a |lwarp-| version. % +% \subsection{Adding a package to the \pkg{lwarp.dtx} file} +% +% When adding a package to |lwarp.dtx| for permanent inclusing in \pkg{lwarp}, +% provide the |lwarp-| code in |lwarp.dtx|, +% add its entry into |lwarp.ins|, and also remember to add +% \begin{sourcedisplay} +% \cs{LWR@loadafter}\{\textless{}packagename\textgreater\} +% \end{sourcedisplay} +% to |lwarp.dtx| in \cref{sec:loadafter}. This causes \pkg{lwarp} to stop with +% an error if \pkg{packagename} is loaded before \pkg{lwarp}. +% % % \subsection{Testing \protect\pkg{lwarp}} % @@ -4744,7 +5043,7 @@ This boolean may be tested by the user for later use. % \vfill % % \begin{center} -% \pkg{lwarp} source code begins on the following page. +% --- \pkg{lwarp} source code begins on the following page --- % \end{center} % % @@ -5027,7 +5326,7 @@ This boolean may be tested by the user for later use. % The default is |lwarp.xdy|. % A customized file should be based on |lwarp.xdy|, and must retain % the line -% \begin{Verbatim}[gobble=4] +% \begin{Verbatim}[gobble=2] % (markup-locref :open "\hyperindexref{" :close "}") % \end{Verbatim} % @@ -5258,6 +5557,8 @@ This boolean may be tested by the user for later use. % \begin{macro}{\LWR@loadafter} \marg{packagename} \quad % Error if this package was loaded before \pkg{lwarp}. % +% \label{sec:loadafter} +% % \begin{macrocode} \newcommand*{\LWR@loadafter}[1]{% \@ifpackageloaded{#1} @@ -5327,6 +5628,8 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{algorithmicx} \LWR@loadafter{alltt} \LWR@loadafter{amsthm} +\LWR@loadafter{appendix} +\LWR@loadafter{arabicfront} \LWR@loadafter{array} \LWR@loadafter{balance} \LWR@loadafter{bookmark} @@ -5335,6 +5638,8 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{ccaption} \LWR@loadafter{changepage} +\LWR@loadafter{chappg} +\LWR@loadafter{color} \LWR@loadafter{crop} \LWR@loadafter{cutwin} \LWR@loadafter{dcolumn} @@ -5352,17 +5657,20 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fancyhdr} \LWR@loadafter{fancyvrb} \LWR@loadafter{figcaps} +\LWR@loadafter{fix2col} \LWR@loadafter{float} \LWR@loadafter{floatflt} \LWR@loadafter{floatpag} \LWR@loadafter{floatrow} \LWR@loadafter{flushend} +\LWR@loadafter{fncychap} \LWR@loadafter{ftnright} \LWR@loadafter{fullpage} \LWR@loadafter{geometry} \LWR@loadafter{glossaries} % \LWR@loadafter{graphics}% pre-loaded by xunicode % \LWR@loadafter{graphicx}% pre-loaded by xunicode +\LWR@loadafter{grffile} \LWR@loadafter{hyperref} \LWR@loadafter{hyperxmp} \LWR@loadafter{idxlayout} @@ -5381,6 +5689,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{marginnote} \LWR@loadafter{mcaption} \LWR@loadafter{mdframed} +\LWR@loadafter{metalogo} \LWR@loadafter{microtype} \LWR@loadafter{moreverb} \LWR@loadafter{mparhack} @@ -5390,6 +5699,8 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{needspace} \LWR@loadafter{newtxmath} \LWR@loadafter{nextpage} +\LWR@loadafter{nonumonpart} +\LWR@loadafter{nopageno} \LWR@loadafter{nowidow} \LWR@loadafter{ntheorem} \LWR@loadafter{pagenote} @@ -5400,19 +5711,26 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{placeins} \LWR@loadafter{prelim2e} \LWR@loadafter{ragged2e} +\LWR@loadafter{realscripts} +\LWR@loadafter{relsize} +\LWR@loadafter{romanbar} +\LWR@loadafter{romanbarpagenumber} \LWR@loadafter{rotating} \LWR@loadafter{rotfloat} \LWR@loadafter{savetrees} +% \LWR@loadafter{scalefnt}% loaded by babel-french \LWR@loadafter{setspace} \LWR@loadafter{shadow} \LWR@loadafter{showidx} \LWR@loadafter{showkeys} \LWR@loadafter{sidecap} \LWR@loadafter{sidenotes} +\LWR@loadafter{siunitx} \LWR@loadafter{soul} \LWR@loadafter{subfig} \LWR@loadafter{tabularx} \LWR@loadafter{tabulary} +% \LWR@loadafter{textcomp}% maybe before lwarp with font packages \LWR@loadafter{textpos} \LWR@loadafter{theorem} \LWR@loadafter{threeparttable} @@ -5420,6 +5738,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{titleps} \LWR@loadafter{titlesec} \LWR@loadafter{titletoc} +\LWR@loadafter{tocbibind} \LWR@loadafter{tocloft} \LWR@loadafter{transparent} \LWR@loadafter{trivfloat} @@ -5431,6 +5750,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{wrapfig} \LWR@loadafter{xcolor} \LWR@loadafter{xfrac} +\LWR@loadafter{xltxtra} \LWR@loadafter{xmpincl} % \end{macrocode} @@ -6332,13 +6652,11 @@ top=1in,bottom=1in,% % \end{macrocode} % % -% \DescribeBoolean{HTMLMarkFloats} Default true. -% Adds |=== table begin| or |=== figure begin|, and |=== end| -% around floats while formatting for word processors. -% This helps identify boundaries of floats to be manually converted -% to word-processor frames. -% (Perhaps some day word processors will have \HTML\ import options -% for identifying \element{div} classes for figures and tables.) +% \DescribeBoolean{HTMLMarkFloats} +% \describeHTMLMarkFloats +% \footnote{Perhaps some day word processors will have \HTML\ import options +% for identifying \element{div} classes for figures and tables, +% along with the associated captions.} % \index{word processor>HTML conversion settings} % \index{HTML>conversion settings>word processor} % @@ -6443,131 +6761,47 @@ top=1in,bottom=1in,% % \section{Textcomp} % -% \limitstextcomp -% -% \changes{v0.37}{2017/08/18}{\pkg{textcomp}: Improved support.} -% % \codehtml % \begin{macrocode} \begin{warpHTML} % \end{macrocode} % -% Modifications for \pkg{textcomp} are done \cs{AtBeginDocument} since -% \pkg{textcomp} may have been loaded before \pkg{lwarp}. +% +% If \pkg{textcomp} was loaded before \pkg{lwarp}, +% perhaps as part of the font-related packages, +% explicitly load the lwarp patches now: % \begin{macrocode} -\AtBeginDocument{% in case textcomp was not loaded - \@ifpackageloaded{textcomp} { +\LWR@origRequirePackage{lwarp-textcomp} +} % \end{macrocode} -% The following are restored for print when inside a \env{lateximage}: +% If \pkg{textcomp} is loaded after \pkg{warp}, +% \pkg{lwarp} will automatically load \pkg{lwarp-textcomp} +% at that time. Meanwhile, define a null version +% of \cs{LWR@restoreorigtextcomp} until \pkg{textcomp} is +% actually loaded, at which point \pkg{lwarp-textcomp} will +% replaced \cs{LWR@restoreorigtextcomp}. % \begin{macrocode} -\let\LWR@origtextdegree\textdegree -\let\LWR@origtextcelsius\textcelsius -\let\LWR@origtextohm\textohm -\let\LWR@origtextmu\textmu -\LetLtxMacro\LWR@origcapitalcedilla\capitalcedilla -\LetLtxMacro\LWR@origcapitalogonek\capitalogonek -\LetLtxMacro\LWR@origcapitalgrave\capitalgrave -\LetLtxMacro\LWR@origcapitalacute\capitalacute -\LetLtxMacro\LWR@origcapitalcircumflex\capitalcircumflex -\LetLtxMacro\LWR@origcapitaltilde\capitaltilde -\LetLtxMacro\LWR@origcapitaldieresis\capitaldieresis -\LetLtxMacro\LWR@origcapitalhungarumlaut\capitalhungarumlaut -\LetLtxMacro\LWR@origcapitalring\capitalring -\LetLtxMacro\LWR@origcapitalcaron\capitalcaron -\LetLtxMacro\LWR@origcapitalbreve\capitalbreve -\LetLtxMacro\LWR@origcapitalmacron\capitalmacron -\LetLtxMacro\LWR@origcapitaldotaccent\capitaldotaccent -\LetLtxMacro\LWR@origtextcircled\textcircled +{ +\providecommand*{\LWR@restoreorigtextcomp}{}% +} % \end{macrocode} -% For \HTML, use \HTML\ entities or direct Unicode, depending on the engine: + % \begin{macrocode} -\ifPDFTeX -\renewcommand*{\textdegree}{\HTMLentity{deg}} -\renewcommand*{\textcelsius}{\HTMLentity{deg}\,C} -\renewcommand*{\textohm}{\HTMLunicode{2126}} -\renewcommand*{\textmu}{\HTMLunicode{00B5}} -\else -\renewcommand*{\textdegree}{°} -\renewcommand*{\textcelsius}{°C} -\renewcommand*{\textohm}{Ω} -\renewcommand*{\textmu}{μ} -\fi +\end{warpHTML} % \end{macrocode} -% For \HTML, Unicode diacritical marks are used: -% \begin{macrocode} -\renewcommand*{\capitalcedilla}[1]{#1\HTMLunicode{0327}} -\renewcommand*{\capitalogonek}[1]{#1\HTMLunicode{0328}} -\renewcommand*{\capitalgrave}[1]{#1\HTMLunicode{0300}} -\renewcommand*{\capitalacute}[1]{#1\HTMLunicode{0301}} -\renewcommand*{\capitalcircumflex}[1]{#1\HTMLunicode{0302}} -\renewcommand*{\capitaltilde}[1]{#1\HTMLunicode{0303}} -\renewcommand*{\capitaldieresis}[1]{#1\HTMLunicode{0308}} -\renewcommand*{\capitalhungarumlaut}[1]{#1\HTMLunicode{30B}} -\renewcommand*{\capitalring}[1]{#1\HTMLunicode{30A}} -\renewcommand*{\capitalcaron}[1]{#1\HTMLunicode{30C}} -\renewcommand*{\capitalbreve}[1]{#1\HTMLunicode{306}} -\renewcommand*{\capitalmacron}[1]{#1\HTMLunicode{304}} -\renewcommand*{\capitaldotaccent}[1]{#1\HTMLunicode{307}} -% \end{macrocode} -% \cs{textcircled} becomes a span with a rounded border: -% \begin{macrocode} -\renewcommand*{\textcircled}[1]{% -\InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}% -} -% \end{macrocode} -% -% \begin{macro}{\LWR@restoreorigtextcomp} -% Called from \cs{restoreoriginalformatting} when a \env{lateximage} is begun. -% \begin{macrocode} -\newcommand*{\LWR@restoreorigtextcomp}{% -\let\textdegree\LWR@origtextdegree% -\let\textcelsius\LWR@origtextcelsius% -\let\textohm\LWR@origtextohm% -\let\textmu\LWR@origtextmu% -\LetLtxMacro\capitalcedilla\LWR@origcapitalcedilla% -\LetLtxMacro\capitalogonek\LWR@origcapitalogonek% -\LetLtxMacro\capitalgrave\LWR@origcapitalgrave% -\LetLtxMacro\capitalacute\LWR@origcapitalacute% -\LetLtxMacro\capitalcircumflex\LWR@origcapitalcircumflex% -\LetLtxMacro\capitaltilde\LWR@origcapitaltilde% -\LetLtxMacro\capitaldieresis\LWR@origcapitaldieresis% -\LetLtxMacro\capitalhungarumlaut\LWR@origcapitalhungarumlaut% -\LetLtxMacro\capitalring\LWR@origcapitalring% -\LetLtxMacro\capitalcaron\LWR@origcapitalcaron% -\LetLtxMacro\capitalbreve\LWR@origcapitalbreve% -\LetLtxMacro\capitalmacron\LWR@origcapitalmacron% -\LetLtxMacro\capitaldotaccent\LWR@origcapitaldotaccent% -\LetLtxMacro\textcircled\LWR@origtextcircled% -} -% \end{macrocode} -% \end{macro} -% -% \begin{macrocode} -}% textcomp loaded -{% textcomp not loaded -% \end{macrocode} -% A null version for use when \pkg{textcomp} was not loaded: -% \begin{macrocode} -\newcommand*{\LWR@restoreorigtextcomp}{}% -}% textcomp not loaded - -}% AtBeginDocument - -% \begin{macrocode} -\end{warpHTML} -% \end{macrocode} - - - -% \section{Accents} -% -% \limitsaccents -% -% \changes{v0.37}{2017/08/18}{\protect\LaTeX\ accents: Added.} -% -% \codehtml + + + + +% \section{Accents} +% +% \limitsaccents +% +% \changes{v0.37}{2017/08/18}{\protect\LaTeX\ accents: Added.} +% +% \codehtml % \begin{macrocode} \begin{warpHTML} % \end{macrocode} @@ -6645,38 +6879,6 @@ top=1in,bottom=1in,% -% \section{SIunitx} - -% \changes{v0.36}{2017/08/17}{\pkg{siunitx}: Improved symbol support.} -% \changes{v0.37}{2017/08/17}{\pkg{siunitx}: Improved symbol support.} - -% \codehtml -% \begin{macrocode} -\begin{warpHTML} -% \end{macrocode} - -% \begin{macrocode} -\AtBeginDocument{% in case textcomp was not loaded - -\@ifpackageloaded{siunitx} -{ -\DeclareSIUnit\bohr{\textit{a}\textsubscript{0}} -\DeclareSIUnit\clight{\textit{c}\textsubscript{0}} -\DeclareSIUnit\elementarycharge{\textit{e}} -\DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}} -\DeclareSIUnit\hartree{\textit{E}\textsubscript{h}} -}% siunitx loaded -{}% siunitx not loaded - -}% AtBeginDocument - -% \begin{macrocode} -\end{warpHTML} -% \end{macrocode} - - - - % \section{Configuration Files} @@ -6880,7 +7082,7 @@ body { p {margin: 1.5ex 0em 1.5ex 0em ;} /* Holds a section number to add space between it and the name */ -span.sectionnumber { margin-right: .6em } +span.sectionnumber { margin-right: 0em } /* Inserted in front of index lines */ span.indexitem {margin-left: 0em} @@ -6920,6 +7122,33 @@ span.textsf { span.textcircled { border: 1px solid black ; border-radius: 1ex ; } + + +/* For realscripts */ +.supsubscript { + display: inline-block; + text-align:left ; +} + +.supsubscript sup, +.supsubscript sub { + position: relative; + display: block; + font-size: .5em; + line-height: 1; +} + +.supsubscript sup { + top: .5em; +} + +.supsubscript sub { + top: .5em; +} + + + + span.attribution { margin-left: 1em ; font-size: 80% ; font-variant: small-caps; } @@ -7826,11 +8055,15 @@ div.sidetoccontents { text-align: left ; } + nav.sidetoc p {line-height:1.2 ; margin: 1ex .5em 1ex .5em ; text-indent: 0 ; } + nav.sidetoc p a {color:black ; font-size: .7em ;} + div.sidetoctitle {font-size: 1.2em; font-weight:bold; text-align:center; border-bottom: 1px solid silver ; } + nav.sidetoc a:hover {text-decoration: underline ; } @@ -8744,6 +8977,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX- % \changes{v0.32}{2017/06/08}{\protect\texttt{lwarpmk}: Fix: \protect\texttt{io.lines()} changed to \protect\texttt{file:lines()} % due to \protect\texttt{luatex} changes.} % \changes{v0.37}{2017/08/19}{\protect\texttt{lwarpmk}: Removes additional \HTML\ \protect\texttt{aux} files.} +% \changes{v0.38}{2017/08/24}{\protect\texttt{lwarpmk}: Added print1 and html1 actions.} % % \begin{macrocode} \begin{filecontents*}{lwarpmk.lua} @@ -8753,7 +8987,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX- -- Print the usage of the lwarpmk command: -printversion = "v0.37" +printversion = "v0.38" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -8762,10 +8996,12 @@ end function printusage () print ( [[ -lwarpmk print [project]: Compile a print version. +lwarpmk print [project]: Compile the print version if necessary. +lwarpmk print1 [project]: Forced single compile of the print version. lwarpmk printindex [project]: Process the index for the print version. lwarpmk printglossary [project]: Process the glossary for the print version. -lwarpmk html [project]: Compile an HTML version. +lwarpmk html [project]: Compile the HTML version if necessary. +lwarpmk html1 [project]: Forced single compile of the HTML version. lwarpmk htmlindex [project]: Process the index for the html version. lwarpmk htmlglossary [project]: Process the glossary for the html version. lwarpmk again [project]: Touch the source code to trigger recompiles. @@ -9081,7 +9317,7 @@ end if (arg[1] == "--version") then print ( "lwarpmk: " .. printversion ) -else -- not -- version +else -- not --version -- print intro: @@ -9112,6 +9348,12 @@ else -- not latexmk end end -- not latexmk +elseif arg[1] == "print1" then + loadconf () + verifyfileexists (sourcename .. ".tex") ; + onetime("") + print ("lwarpmk: Done.") ; + -- lwarp printindex: -- Compile the index then touch the source -- to trigger a recompile of the document: @@ -9172,6 +9414,13 @@ else -- not latexmk end end -- not latexmk +elseif arg[1] == "html1" then + loadconf () + verifyfileexists ( sourcename .. ".tex" ) ; + onetime("_html") + pdftohtml () + print ("lwarpmk: Done.") + elseif arg[1] == "pdftohtml" then loadconf () pdftohtml () @@ -9360,7 +9609,7 @@ end -- not --version % A stack to record the depth of each level: % -% Note that nested LaTeX structures may push depths which are non-sequential. +% Note that nested \LaTeX\ structures may push depths which are non-sequential. % \watchout % \begin{docsidebar}[Ex:] @@ -9393,7 +9642,7 @@ end -- not --version % \begin{macro}{\pushclose} \marg{action} \marg{depth} -% Pushes one return action and its LaTeX depth onto the stacks. +% Pushes one return action and its \LaTeX\ depth onto the stacks. % \begin{macrocode} \NewDocumentCommand{\pushclose}{m m} { @@ -9779,7 +10028,7 @@ end -- not --version % \section{\textbackslash{}PrintStack diagnostic tool} % Diagnostics tool: -% Prints the LaTeX nesting depth values for the stack levels. +% Prints the \LaTeX\ nesting depth values for the stack levels. % Must have |\LWR@startpars| active while printing the stack, so |\PrintStack| may % \watchout % be called from anywhere in the normal text flow. @@ -9849,6 +10098,8 @@ end -- not --version % \section{PDF pages and styles} +% \changes{v0.38}{2017/08/21}{Added \cs{markboth}, \cs{sloppy}, etc.} + % \codehtml % \begin{macrocode} \begin{warpHTML} @@ -9866,10 +10117,11 @@ end -- not --version \LWR@stoppars\LWR@orignewpage\LWR@startpars% } % \end{macrocode} - - - -% \cs{pagestyle} and \cs{thispagestyle} are nullified for \HTML\ output. +% +% +% +% \cs{pagestyle}, etc. are nullified for \HTML\ output. +% % % \begin{macro}{\pagestyle} \marg{style} % \begin{macrocode} @@ -9883,14 +10135,57 @@ end -- not --version % \end{macrocode} % \end{macro} % +% \begin{macro}{\markboth} \marg{left} \marg{right} +% \begin{macrocode} +\renewcommand*{\markboth}[2]{} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\markright} \marg{right} +% \begin{macrocode} +\renewcommand*{\markright}[1]{} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\raggedbottom} +% \begin{macrocode} +\renewcommand*{\raggedbottom}{} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\flushbottom} +% \begin{macrocode} +\renewcommand*{\flushbottom}{} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\sloppy} +% \begin{macrocode} +\renewcommand*{\sloppy}{} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\fussy} +% \begin{macrocode} +\renewcommand*{\fussy}{} +% \end{macrocode} +% \end{macro} +% +% +% % \begin{macro}{\pagenumbering} \marg{commands} % \begin{macrocode} \renewcommand*{\pagenumbering}[1]{} % \end{macrocode} % \end{macro} % - - +% +% % \begin{macrocode} \end{warpHTML} % \end{macrocode} @@ -11563,6 +11858,75 @@ end -- not --version % \end{macrocode} % % +% +% \subsection{User-level starred section commands} +% +% +% \begin{macro}{\ForceHTMLPage} +% For \HTML\ output, forces the next section to be on its own \HTML\ page, +% if |FileDepth| allows, even if starred. +% For use with \cs{printindex} and others which generate a starred section +% which should be on its own \HTML\ page. Also see \cs{ForceHTMLTOC}. +% +% For print output, no effect. +% +% \changes{v0.38}{2017/08/22}{Added.} +% +% \begin{macrocode} +\newbool{LWR@forcinghtmlpage} +\boolfalse{LWR@forcinghtmlpage} + +\newcommand*{\ForceHTMLPage}{% +\global\booltrue{LWR@forcinghtmlpage}% +} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\ForceHTMLTOC} +% For \HTML\ output, forces the next section to have a TOC entry, even if starred. +% For use with \cs{printindex} and others which generate a starred section +% which should be in the \acro{TOC} so that it may be accessed via \HTML. +% Not necessary if used with \pkg{tocbibind}. Also see \cs{ForceHTMLPage}. +% +% For print output, no effect. +% +% \changes{v0.38}{2017/08/22}{Added.} +% +% \begin{macrocode} +\newbool{LWR@forcinghtmltoc} +\boolfalse{LWR@forcinghtmltoc} + +\newcommand*{\ForceHTMLTOC}{% +\global\booltrue{LWR@forcinghtmltoc}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\end{warpHTML} +% \end{macrocode} +% +% +% +% \codeprint +% \begin{macrocode} +\begin{warpprint} +\newcommand*{\ForceHTMLPage}{} +\newcommand*{\ForceHTMLTOC}{} +\end{warpprint} +% \end{macrocode} +% +% +% +% \codehtml +% \begin{macrocode} +\begin{warpHTML} +% \end{macrocode} +% +% +% +% % \subsection{Book class commands} % % @@ -11675,74 +12039,103 @@ end -- not --version % \end{macrocode} % % +% \begin{macro}{\@seccntformat} +% \changes{v0.38}{2017/08/21}{Added for \pkg{appendix}.} +% +% \begin{macrocode} +\def\@seccntformat#1{\csname the#1\endcsname\protect\quad} +% \end{macrocode} +% \end{macro} +% % % \begin{macro}{\LWR@section} * \oarg{TOC name} \marg{name} \marg{sectiontype} % % \changes{v0.20}{2017/01/09}{Combined higher-level sections together into files.} % \changes{v0.36}{2017/08/15}{Improved spacing.} +% \changes{v0.38}{2017/08/21}{\cs{part*} starts a new \HTML\ page, for \pkg{appendix}.} +% \changes{v0.38}{2017/08/21}{Modified spacing, uses \cs{numberline}.} % % The common actions for the high-level sectioning commands. % \begin{macrocode} \DeclareDocumentCommand{\LWR@section}{m m m m}{% -\LWR@traceinfo{LWR@section}% +\LWR@traceinfo{LWR@section |#2| |#3|}% +% \ifthenelse{% +% % \equal{#2}{\-NoValue-}\AND% +% \isempty{#3}% +% }% +% {% empty section name +% \LWR@traceinfo{LWR@section: empty section}% +% }% empty section name +% {% not an empty section name +\LWR@traceinfo{LWR@section: not an empty section}% \LWR@stoppars% % \end{macrocode} % Cancel special \env{minipage} horizontal space interaction: % \begin{macrocode} \global\boolfalse{LWR@minipagethispar}% % \end{macrocode} -% Start a new \HTML\ file if not starred, and is a shallow sectioning depth: +% Start a new \HTML\ file unless starred, +% and if is a shallow sectioning depth. +% +% Exception: Also start a new \HTML\ file for \cs{part*}, for \pkg{appendix}. +% +% Generate a new \LaTeX\ page so that \TOC\ and index page number points to the section: % \begin{macrocode} \LWR@traceinfo{LWR@section: testing whether to start a new HTML file}% -\IfBooleanTF{#1}{% starred -% \end{macrocode} -% Generate a new LaTeX page so that \TOC\ and index page number points to the section: -% \begin{macrocode} - \LWR@orignewpage% - -}{% not starred - \ifthenelse{% - \cnttest{\csuse{LWR@depth#4}}{<=}{\value{FileDepth}}% - \AND% - \(% +\IfBooleanTF{#1}{\LWR@traceinfo{LWR@section: starred}}{}% +\ifbool{LWR@forcinghtmlpage}{\LWR@traceinfo{LWR@section: forcinghtmlpage}}{}% +\ifthenelse{% + \(% + \(\NOT\equal{#1}{\BooleanTrue}\)\OR% + \(\cnttest{\csuse{LWR@depth#4}}{=}{\LWR@depthpart}\)\OR% + \(\boolean{LWR@forcinghtmlpage}\)% + \)% + \AND% + \cnttest{\csuse{LWR@depth#4}}{<=}{\value{FileDepth}}% + \AND% + \(% \NOT\boolean{CombineHigherDepths}\OR% \cnttest{\csuse{LWR@depth#4}}{<=}{\value{LWR@prevFileDepth}}% - \)% - }% + \)% + \AND% + \NOT\equal{#3}{}% phantomsection +}% % \end{macrocode} % If so: start a new \HTML\ file: % \begin{macrocode} - {% new file - \LWR@traceinfo{LWR@section: new HTML file}% +{% new file + \LWR@traceinfo{LWR@section: new HTML file}% % \end{macrocode} % See if there was an optional TOC name entry: % \begin{macrocode} - \IfNoValueTF{#2}% + \IfNoValueTF{#2}% % \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}}% - }% new file + {\LWR@newhtmlfile{#2}}% +}% new file % \end{macrocode} % Else: No new \HTML\ file: % \begin{macrocode} - {% not new file +{% not new file % \end{macrocode} -% Generate a new LaTeX page so that \TOC\ and index page number points to the section: +% Generate a new \LaTeX\ page so that \TOC\ and index page number points to the section: % \begin{macrocode} - \LWR@orignewpage% + \LWR@traceinfo{LWR@section: not a new HTML file}% + \LWR@orignewpage% - }% not new file -}% not starred +}% not new file % \end{macrocode} % Remember this section's name for \cs{nameref}: % \begin{macrocode} +\IfValueTF{#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; % ex: ``section'' ``Introduction'' @@ -11765,10 +12158,21 @@ end -- not --version % \begin{macrocode} \LWR@createautosec{\csuse{LWR@tag#4}}% % \end{macrocode} -% If not starred, step counter and add to TOC: +% Check if starred: % \begin{macrocode} \IfBooleanTF{#1}% -{}% starred +{% +% \end{macrocode} +% Starred, but also forcing a TOC entry, so +% add unnumbered TOC name or regular name: +% \begin{macrocode} +\ifbool{LWR@forcinghtmltoc}% +{\addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}}% +{}% +}% starred +% \end{macrocode} +% Not starred, so step counter and add to TOC: +% \begin{macrocode} {% not starred % \end{macrocode} % Only add a numbered TOC entry if section number is not too deep: @@ -11791,8 +12195,10 @@ end -- not --version % \begin{macrocode} \LWR@traceinfo{LWR@section: about to addcontentsline}% \addcontentsline{toc}{#4}% - {\protect\LWR@sectionnumber{\csuse{the#4}}% - \IfValueTF{#2}{ #2}{ #3}}% + {% + \protect\numberline{\csuse{the#4}}% + {\ignorespaces\IfValueTF{#2}{#2}{#3}\protect\relax}% + }% \LWR@traceinfo{LWR@section: finished addcontentsline}% }% end of if main matter % \end{macrocode} @@ -11800,14 +12206,14 @@ end -- not --version % \begin{macrocode} {% not main matter \LWR@traceinfo{LWR@section: no main matter}% - \addcontentsline{toc}{#4}{\IfValueTF{#2}{ #2}{ #3}}% + \addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}% }% end of not main matter }% end of secnumdepth % \end{macrocode} % Deeper than secnumdepth, so add an unnumbered TOC entry: % \begin{macrocode} {% - \addcontentsline{toc}{#4}{\IfValueTF{#2}{ #2}{ #3}}% + \addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}% }% % \end{macrocode} % For part, print the section type: @@ -11828,7 +12234,7 @@ end -- not --version \ifthenelse{% \cnttest{\csuse{LWR@depth#4}}{<=}{\value{secnumdepth}}% }% - {\protect\LWR@sectionnumber{\csuse{the#4}}~}% + {\protect\LWR@sectionnumber{\@seccntformat{#4}}}% {}% \LWR@traceinfo{LWR@section: finished print section number}% }{}% @@ -11857,6 +12263,9 @@ end -- not --version % If not starred, remember the previous depth to % possibly trigger a new \HTML\ page. % +% HOWEVER, allow a \cs{part*} to start a new \HTML\ page. +% This is used by \pkg{appendix}. +% % A starred section does not trigger a new \HTML\ page at the beginning % of this macro, so it should not affect it here at the end either. % This became an issue when a \cs{listoftables} was tested in the middle of @@ -11864,11 +12273,25 @@ end -- not --version % a new \HTML\ page for the section following it % while |CombineHigherDepths| was true. % \begin{macrocode} -\IfBooleanTF{#1}% -{}% +\ifthenelse{% + \NOT\equal{#1}{\BooleanTrue}\OR% + \cnttest{\csuse{LWR@depth#4}}{=}{\LWR@depthpart}% +}% {% not starred \setcounter{LWR@prevFileDepth}{\csuse{LWR@depth#4}}% }% not starred +{}% +% \end{macrocode} +% Reset to defaults if not a phantomsection: +% \begin{macrocode} +\ifstrempty{#3}% +{}% +{% +\global\boolfalse{LWR@forcinghtmlpage}% +\global\boolfalse{LWR@forcinghtmltoc}% +}% +% +% }% not an empty section name \LWR@traceinfo{LWR@section: done}% } % \end{macrocode} @@ -11879,10 +12302,10 @@ end -- not --version % \subsection{\textbackslash{}section and friends} % \begin{macro}{\part} * \oarg{TOC name} \marg{name} +% +% \changes{v0.38}{2017/08/21}{Fix with \texttt{article} class.} +% % \begin{macrocode} -\@ifundefined{chapter} -{} -{% \DeclareDocumentCommand{\part}{s o m}{% \LWR@epubprintpendingfootnotes% \LWR@stoppars% @@ -11891,7 +12314,6 @@ end -- not --version \LWR@section{#1}{#2}{#3}{part}% } -} % \end{macrocode} % \end{macro} @@ -11910,9 +12332,7 @@ end -- not --version \LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}% -\LWR@traceinfo{chapter: about to LWR@section}% \LWR@section{#1}{#2}{#3}{chapter}% -\LWR@traceinfo{chapter: done}% } } % \end{macrocode} @@ -15920,7 +16340,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@traceinfo{LWR@newlabel: !#1!}% % \@bsphack% % \end{macrocode} -% Create a traditional LaTeX label, as modified by \pkg{cleveref}: +% Create a traditional \LaTeX\ label, as modified by \pkg{cleveref}: % \begin{macrocode} \LWR@origlabel{#1}% % \end{macrocode} @@ -16856,9 +17276,12 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % (Called from each line in the |.aux|, |.lof| files.) % % Record this section number for further use: +% +% \changes{v0.38}{2017/08/21}{Added trailing \cs{quad}.} +% % \begin{macrocode} \renewcommand*{\numberline}[1]{% -\LWR@sectionnumber{#1}% +\LWR@sectionnumber{#1}\quad% } % \end{macrocode} % \end{macro} @@ -16976,6 +17399,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \section{Index and glossary} +% \label{sec:index} % See:\\ % \href{http://tex.stackexchange.com/questions/187038/how-to-mention-section-number-in-index-created-by-imakeidx} @@ -17002,17 +17426,6 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \end{macrocode} -% \begin{macro}{\LWR@indexsection} -% -% Controls whether the index will be in a section or a chapter, depending on -% the documentclass. -% \begin{macrocode} -\@ifundefined{chapter} - {\newcommand*{\LWR@indexsection}{\section{\indexname}}} - {\newcommand*{\LWR@indexsection}{\chapter{\indexname}}} -% \end{macrocode} -% \end{macro} - % \begin{macro}{\printindex} % \begin{macrocode} @@ -17020,7 +17433,6 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \renewcommand*{\printindex} { -\LWR@indexsection \LWR@startpars \LWR@origprintindex } @@ -17029,7 +17441,12 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \begin{environment}{theindex} % \begin{macrocode} +\@ifundefined{chapter} +{\newcommand*{\LWR@indexsection}[1]{\section*{#1}}} +{\newcommand*{\LWR@indexsection}[1]{\chapter*{#1}}} + \renewenvironment*{theindex}{% +\LWR@indexsection{\indexname}% \let\item\LWR@indexitem% \let\subitem\LWR@indexsubitem% \let\subsubitem\LWR@indexsubsubitem% @@ -17386,11 +17803,18 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \end{macro} % % - - -% \begin{macro}{\LWR@restoreorigformatting} -% While producing \SVG\ math or a \env{lateximage}, -% use regular \LaTeX\ formatting instead of \HTML\ tags. +% +% \begin{macro}{\LWR@restoreorigrelsize} Patched by \pkg{lwarp-relsize} if loaded. +% \begin{macrocode} +\newcommand*{\LWR@restoreorigrelsize}{} +% \end{macrocode} +% \end{macro} +% +% +% +% \begin{macro}{\LWR@restoreorigformatting} +% While producing \SVG\ math or a \env{lateximage}, +% use regular \LaTeX\ formatting instead of \HTML\ tags. % \label{sec:restoreorigformatting} % \changes{v0.34}{2017/08/05}{Improved font control.} % \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.} @@ -17459,6 +17883,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \LWR@restoreorigtextcomp% \LWR@restoreorigaccents% +\LWR@restoreorigrelsize% % \LWR@FBcancel% } @@ -17479,7 +17904,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@htmlopencomment % \end{macrocode} -% Start the LaTeX math environment inside the \HTML\ comment: +% Start the \LaTeX\ math environment inside the \HTML\ comment: % \begin{macrocode} \begingroup \csuse{LWR@orig#1} @@ -20888,7 +21313,9 @@ width:\rndprintlength{\LWR@tempwidth}% % Emulate the hyperref |\phantomsection| command, % often used to insert the bibliography into table of contents: % \begin{macrocode} -\newcommand*{\phantomsection}{\section*{}} +\newcommand*{\phantomsection}{% +\section*{}% +} % \end{macrocode} % \end{macro} @@ -21499,6 +21926,80 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \clearpage % % \iffalse +%<*appendix> +% \fi +% +% \part{lwarp-appendix.sty} + +% \section{Appendix} +% +% \DescribePackage{appendix} +% \pkg{appendix} is patched for use by \pkg{lwarp}. +% +% \limitsappendix +% +% \changes{v0.38}{2017/08/21}{\pkg{appendix}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{appendix} +% \end{macrocode} + +% \begin{macrocode} +\renewcommand*{\@chap@pppage}{% +\part*{\appendixpagename} + \if@dotoc@pp + \addappheadtotoc + \fi +} + +\renewcommand*{\@sec@pppage}{% +\part*{\appendixpagename} + \if@dotoc@pp + \addappheadtotoc + \fi +} + +% \end{macrocode} + +% \iffalse +% +% \fi +% +% +% +% +% \clearpage +% +% \iffalse +%<*arabicfront> +% \fi +% +% \part{lwarp-arabicfront.sty} +% +% \section{Arabicfront} +% +% \DescribePackage{arabicfront} +% \pkg{arabicfront} is ignored. +% +% \changes{v0.38}{2017/08/25}{\pkg{arabicfront}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{arabicfront} +% \end{macrocode} +% +% +% \iffalse +% +% \fi +% +% +% +% +% \iffalse %<*balance> % \fi % @@ -21681,6 +22182,33 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % +% \clearpage +% +% \iffalse +%<*caption2> +% \fi +% +% \part{lwarp-caption2.sty} +% +% \section{Caption2} +% +% \DescribePackage{caption2} +% \pkg{caption2} is not used. +% The user is recommended to use \pkg{caption} instead. +% +% \changes{v0.38}{2017/08/22}{\pkg{caption2}: Prevented.} +% +% \codehtml +% \begin{macrocode} +\LWR@loadnever{caption2}{caption} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% % % \clearpage % @@ -21746,6 +22274,37 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % +% \clearpage +% +% \iffalse +%<*chappg> +% \fi +% +% \part{lwarp-chappg.sty} +% +% \section{Chappg} +% +% \DescribePackage{chappg} +% \pkg{chappg} is ignored. +% +% \changes{v0.38}{2017/08/25}{\pkg{chappg}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{chappg} +% \end{macrocode} +% +% \begin{macrocode} +\renewcommand{\pagenumbering}[2][]{} +\providecommand{\chappgsep}{--} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% % % % \clearpage @@ -21759,15 +22318,18 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{Color} % -% \DescribePackage{color} -% \pkg{color} is superceded by \pkg{xcolor}, and -% \pkg{lwarp} requires several of the features of \pkg{xcolor}. +% \DescribePackage{color} Allowed but ignored. +% \pkg{xcolor} is then required as well. +% +% \limitscolor % % \changes{v0.37}{2017/08/18}{\pkg{color}: Prevented.} +% \changes{v0.38}{2017/08/25}{\pkg{color}: Forces \pkg{xcolor} as well.} % % \codehtml % \begin{macrocode} -\LWR@loadnever{color}{xcolor} +\LWR@ProvidesPackagePass{color} +\RequirePackage{xcolor} % \end{macrocode} % % \iffalse @@ -22003,8 +22565,11 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \credits{John Lavagnino} % -% \DescribePackage{endnotes} +% \DescribePackage{endnotes} Used as-is. +% +% \limitsendnotes % +% \bigskip % % \changes{v0.26}{2017/03/27}{\pkg{endnotes}: Added.} % @@ -22536,7 +23101,6 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % -% % \iffalse %<*fancyhdr> % \fi @@ -22758,7 +23322,9 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \let\FV@EndListFrame\LWR@fvendsingle} \def\FV@Frame@lines{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@FVtextstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}% +}% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% @@ -22928,6 +23494,34 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % % +% +% \iffalse +%<*fix2col> +% \fi +% +% \part{lwarp-fix2col.sty} +% +% \section{Fix2col} +% +% \DescribePackage{fix2col} +% \pkg{fix2col} is ignored. +% +% \changes{v0.38}{2017/08/25}{\pkg{fix2col}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{fix2col} +% \end{macrocode} +% +% +% \iffalse +% +% \fi +% +% +% +% % \clearpage % % \iffalse @@ -23490,6 +24084,58 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % % +% \clearpage +% +% \iffalse +%<*fncychap> +% \fi + +% \part{lwarp-fncychap.sty} + +% \section{Fncychap} +% +% \DescribePackage{fncychap} +% \pkg{fncychap} is ignored. +% +% \changes{v0.38}{2017/08/24}{\pkg{fncychap}: Added.} +% +% \codehtml +% +% Discard all options for \pkg{lwarp-fncychap}: +% \begin{macrocode} +\LWR@ProvidesPackageDrop{fncychap} +% \end{macrocode} + +% \begin{macrocode} +\def\mghrulefill#1{} +\def\ChNameLowerCase{} +\def\ChNameUpperCase{} +\def\ChNameAsIs{} +\def\ChTitleLowerCase{} +\def\ChTitleUpperCase{} +\def\ChTitleAsIs{} +\newcommand{\ChRuleWidth}[1]{} +\newcommand{\ChNameVar}[1]{} +\newcommand{\ChNumVar}[1]{} +\newcommand{\ChTitleVar}[1]{} +\newcommand{\TheAlphaChapter}{} +\newcommand{\DOCH}{} +\newcommand{\DOTI}[1]{} +\newcommand{\DOTIS}[1]{} +\newlength{\mylen} +\newlength{\myhi} +\newlength{\px} +\newlength{\py} +\newlength{\pyy} +\newlength{\pxx} +\newlength{\RW} +\newcommand{\FmN}[1]{#1} +\newcommand{\FmTi}[1]{#1} +% \end{macrocode} + +% \iffalse +% +% \fi % % % @@ -24018,6 +24664,28 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \setupglossaries{nonumberlist} \setglossarystyle{index} % \end{macrocode} +% Patched to fix \acro{TOC} pointing to the previous page: +% \begin{macrocode} +\renewcommand*{\@p@glossarysection}[2]{% + \glsclearpage + \phantomsection + \ifdefempty\@@glossarysecstar + {% + \csname\@@glossarysec\endcsname{#2}% + }% + {% +% \end{macrocode} +% In the original, the \acro{TOC} entry was made before the section, +% thus linking to the phantomsection in the printed version, but for +% \HTML\, this caused the link to point to the page before the glossaries. +% Here, the \acro{TOC} entry is made after the section is created: +% \begin{macrocode} + \csname\@@glossarysec\endcsname*{#2}% + \@gls@toc{#1}{\@@glossarysec}% Moved after the previous line. + }% + \@@glossaryseclabel +} +% \end{macrocode} % % \iffalse % @@ -24077,6 +24745,47 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % % +% +% +% \clearpage +% +% \iffalse +%<*grffile> +% \fi +% +% \part{lwarp-grffile.sty} +% +% \section{Grffile} +% +% \DescribePackage{grffile} +% \limitsgrffile +% +% \changes{v0.38}{2017/08/25}{\pkg{grffile}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{grffile} +% \end{macrocode} +% +% \begin{macrocode} +\define@key{igraph}{multidot}{} +\define@key{igraph}{babel}{} +\define@key{igraph}{extendedchars}{} +\define@key{igraph}{encoding}{} +\define@key{igraph}{inputencoding}{} +\define@key{igraph}{filenameencoding}{} +\define@key{igraph}{space}{} + +\newcommand*{\grffilesetup}[1]{} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% % \clearpage % % \iffalse @@ -24476,7 +25185,6 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \renewcommand*{\printindex} { -\LWR@indexsection \LWR@startpars \LWR@indexprenote @@ -25949,6 +26657,40 @@ background: % % % +% \clearpage +% +% \iffalse +%<*metalogo> +% \fi +% +% \part{lwarp-metalogo.sty} +% +% \section{Metalogo} +% +% \DescribePackage{metalogo} +% \pkg{metalogo} is ignored. +% +% \changes{v0.38}{2017/08/25}{\pkg{metalogo}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{metalogo} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand\setlogokern[2]{} +\newcommand\setlogodrop[2][XeTeX]{} +\newcommand\setLaTeXa[1]{} +\newcommand\setLaTeXee[1]{} +\newcommand\seteverylogo[1]{} +\newcommand\everylogo[1]{} +% \end{macrocode} +% +% \iffalse +% +% \fi +% % % % @@ -25968,7 +26710,7 @@ background: % All user options and macros are ignored and disabled. % \changes{v0.20}{2017/01/03}{\pkg{microtype}: User-interface emulated.} -% \changes{v0.27}{2017/04/01}{\pkg{microtype}: Fix with Xe\LaTeX, Lua\LaTeX.} +% \changes{v0.27}{2017/04/01}{\pkg{microtype}: Fix with Xe\LaTeX, \LuaLaTeX.} % % \codehtml % @@ -26437,6 +27179,65 @@ background: % % % +% \clearpage +% +% \iffalse +%<*nonumonpart> +% \fi +% +% \part{lwarp-nonumonpart.sty} +% +% \section{Nonumonpart} +% +% \DescribePackage{nonumonpart} +% \pkg{nonumonpart} is ignored. +% +% \changes{v0.38}{2017/08/25}{\pkg{nonumonpart}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{nonumonpart} +% \end{macrocode} +% +% +% \iffalse +% +% \fi +% +% +% +% \iffalse +%<*nopageno> +% \fi +% +% \part{lwarp-nopageno.sty} +% +% \section{Nopageno} +% +% \DescribePackage{nopageno} +% \pkg{nopageno} is ignored. +% +% \changes{v0.38}{2017/08/25}{\pkg{nopageno}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{nopageno} +% \end{macrocode} +% +% +% \iffalse +% +% \fi +% +% +% +% +% +% +% \clearpage +% % \iffalse %<*nowidow> % \fi @@ -27068,17 +27869,14 @@ background: % \section{Pagenote} % % \DescribePackage{pagenote} -% \pkg{pagenote} works as-is. -% -% It is only included as an |lwarp-pagenote.sty| file because -% past versions of \pkg{lwarp} used \pkg{pagenote} to emulate -% footnotes, and so the file may exist on current installations, -% and should be over-written by this newer version. +% \limitspagenote % % \changes{v0.26}{2017/03/29}{\pkg{pagenote}: Supported as-is.} +% \changes{v0.38}{2017/08/24}{\pkg{pagenote}: Option \protect\texttt{page} disabled.} % % \codehtml % \begin{macrocode} +\DeclareOption{page}{} \LWR@ProvidesPackagePass{pagenote} % \end{macrocode} % @@ -27110,7 +27908,6 @@ background: \LWR@ProvidesPackagePass{paralist} % \end{macrocode} % -% \codehtml % \begin{macrocode} \AtBeginEnvironment{compactitem}{\LWR@itemizestart} \AtEndEnvironment{compactitem}{\LWR@itemizeend} @@ -27343,33 +28140,234 @@ background: % % % -% % \clearpage % % \iffalse -%<*rotating> +%<*realscripts> % \fi - -% \part{lwarp-rotating.sty} - -% \section{Rotating} % -% \DescribePackage{rotating} -% \pkg{rotating} is emulated during \HTML\ output, and -% the \pkg{rotating} package is ignored. +% \part{lwarp-realscripts.sty} % -% All rotations are ignored in \HTML\ output. +% \section{Realscripts} +% +% \DescribePackage{realscripts} +% \pkg{realscripts} is emulated. +% See |lwarp.css| for the \element{span} of class \attribute{supsubscript}. +% +% \changes{v0.38}{2017/08/26}{\pkg{realscripts}: Added.} % % \codehtml +% % \begin{macrocode} -\LWR@ProvidesPackageDrop{rotating} +\LWR@ProvidesPackageDrop{realscripts} % \end{macrocode} - +% % \begin{macrocode} -\LetLtxMacro\sidewaystable\table -\let\endsidewaystable\endtable +\let\LWR@origtextsuperscript\textsuperscript +\let\LWR@origtextsubscript\textsubscript -\LetLtxMacro\sidewaysfigure\figure +\RenewDocumentCommand{\textsuperscript}{s}{\LWR@origtextsuperscript} +\RenewDocumentCommand{\textsubscript}{s}{\LWR@origtextsubscript} + +\let\realsuperscript\textsuperscript +\let\realsubscript\textsubscript + +\let\fakesuperscript\textsuperscript +\let\fakesubscript\textsubscript + +\newlength{\subsupersep} + +\newcommand*{\LWR@realscriptsalign}{} + +\newcommand*{\LWR@setrealscriptsalign}[1]{% +\renewcommand*{\LWR@realscriptsalign}{}% +\ifthenelse{\equal{#1}{c}}{\renewcommand{\LWR@realscriptsalign}{text-align:center;}}{}% +\ifthenelse{\equal{#1}{r}}{\renewcommand{\LWR@realscriptsalign}{text-align:right;}}{}% +} + +\DeclareDocumentCommand \textsubsuperscript {s O{l} mm} {% +\LWR@setrealscriptsalign{#2}% +\InlineClass[\LWR@realscriptsalign]{supsubscript}{% +\textsuperscript{#4}\textsubscript{#3}% +}% +} + +\DeclareDocumentCommand \textsupersubscript {s O{l} mm} {% +\LWR@setrealscriptsalign{#2}% +\InlineClass[\LWR@realscriptsalign]{supsubscript}{% +\textsubscript{#4}\textsuperscript{#3}% +}% +} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% +% +% \clearpage +% +% \iffalse +%<*relsize> +% \fi +% +% \part{lwarp-relsize.sty} + +% \section{Relsize} +% +% \DescribePackage{relsize} +% \pkg{relsize} is patched for use by \pkg{lwarp}. +% +% \limitsrelsize +% +% \changes{v0.38}{2017/08/25}{\pkg{relsize}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{relsize} +% \end{macrocode} +% +% \begin{macrocode} +\let\LWR@origrelsize\relsize +\LetLtxMacro\LWR@origlarger\larger +\LetLtxMacro\LWR@origsmaller\smaller +\let\LWR@relscale\relscale +\LetLtxMacro\LWR@origtextlarger\textlarger +\LetLtxMacro\LWR@origtextsmaller\textsmaller +\let\LWR@textscale\textscale + +\renewcommand*{\LWR@restoreorigrelsize}{% +\let\relsize\LWR@origrelsize% +\LetLtxMacro\larger\LWR@origlarger% +\LetLtxMacro\smaller\LWR@origsmaller% +\let\relscale\LWR@relscale% +\LetLtxMacro\textlarger\LWR@origtextlarger% +\LetLtxMacro\textsmaller\LWR@origtextsmaller% +\let\textscale\LWR@textscale% +} + +\newcounter{LWR@relsizetemp} + +\renewcommand*{\relsize}[1]{} +\renewcommand*{\larger}[1][]{} +\renewcommand*{\smaller}[1][]{} +\renewcommand*{\relscale}[1]{} + +\renewcommand*{\textlarger}[2][1]{% +\setcounter{LWR@relsizetemp}{100+(#1*20)}% +\InlineClass[font-size:\arabic{LWR@relsizetemp}\%]{textlarger}{#2}% +} + +\renewcommand*{\textsmaller}[2][1]{% +\setcounter{LWR@relsizetemp}{100-(#1*20)}% +\InlineClass[font-size:\arabic{LWR@relsizetemp}\%]{textsmaller}{#2}% +} + +\renewcommand*{\textscale}[2]{% +\setcounter{LWR@relsizetemp}{100*\real{#1}}% +\InlineClass[font-size:\arabic{LWR@relsizetemp}\%]{textscale}{#2}% +} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% +% +% \clearpage +% +% \iffalse +%<*romanbar> +% \fi +% +% \part{lwarp-romanbar.sty} + +% \section{Romanbar} +% +% \DescribePackage{romanbar} +% \pkg{romanbar} is patched for use by \pkg{lwarp}. +% +% An inline class with an overline and underline is used. +% +% \changes{v0.38}{2017/08/21}{\pkg{romanbar}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{romanbar} +% \end{macrocode} + +% \begin{macrocode} +\DeclareRobustCommand{\Roman@bar}[1]{% #1 is in Roman, i.e. MMXII +\InlineClass[% + text-decoration: overline underline ; +]{romanbar}{#1}% +} +% \end{macrocode} + +% \iffalse +% +% \fi +% +% +% +% \iffalse +%<*romanbarpagenumber> +% \fi +% +% \part{lwarp-romanbarpagenumber.sty} +% +% \section{Romanbarpagenumber} +% +% \DescribePackage{romanbarpagenumber} +% \pkg{romanbarpagenumber} is ignored. +% +% \changes{v0.38}{2017/08/25}{\pkg{romanbarpagenumber}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{romanbarpagenumber} +% \end{macrocode} +% +% +% \iffalse +% +% \fi +% +% +% +% \clearpage +% +% \iffalse +%<*rotating> +% \fi + +% \part{lwarp-rotating.sty} + +% \section{Rotating} +% +% \DescribePackage{rotating} +% \pkg{rotating} is emulated during \HTML\ output, and +% the \pkg{rotating} package is ignored. +% +% All rotations are ignored in \HTML\ output. +% +% \codehtml +% \begin{macrocode} +\LWR@ProvidesPackageDrop{rotating} +% \end{macrocode} + +% \begin{macrocode} +\LetLtxMacro\sidewaystable\table +\let\endsidewaystable\endtable + +\LetLtxMacro\sidewaysfigure\figure \let\endsidewaysfigure\endfigure \newenvironment*{sideways}{}{} @@ -27483,6 +28481,36 @@ background: % % % +% \iffalse +%<*scalefnt> +% \fi +% +% \part{lwarp-scalefnt.sty} + +% \section{Scalefnt} +% +% \DescribePackage{scalefnt} +% \pkg{scalefnt} is ignored. +% +% \changes{v0.38}{2017/08/25}{\pkg{scalefnt}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{scalefnt} +% \end{macrocode} +% +% \begin{macrocode} +\DeclareRobustCommand\scalefont[1]{} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% +% % % \clearpage % @@ -27812,6 +28840,48 @@ background: % % % +% \clearpage +% +% \iffalse +%<*siunitx> +% \fi +% +% \part{lwarp-siunitx.sty} + +% \section{Siunitx} +% +% \DescribePackage{siunitx} +% \pkg{siunitx} is patched for use by \pkg{lwarp}. +% +% \limitssiunitx +% +% \changes{v0.36}{2017/08/17}{\pkg{siunitx}: Improved symbol support.} +% \changes{v0.37}{2017/08/17}{\pkg{siunitx}: Improved symbol support.} +% \changes{v0.38}{2017/08/26}{\pkg{siunitx}: Removed from \pkg{lwarp} core.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{siunitx} +% \end{macrocode} + +% \begin{macrocode} +\AtBeginDocument{% in case textcomp was not loaded +\DeclareSIUnit\bohr{\textit{a}\textsubscript{0}} +\DeclareSIUnit\clight{\textit{c}\textsubscript{0}} +\DeclareSIUnit\elementarycharge{\textit{e}} +\DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}} +\DeclareSIUnit\hartree{\textit{E}\textsubscript{h}} +}% AtBeginDocument + +% \end{macrocode} + +% \iffalse +% +% \fi +% +% +% % % \clearpage % @@ -28342,6 +29412,126 @@ background: % % % +% \clearpage +% +% \iffalse +%<*textcomp> +% \fi +% +% \part{lwarp-textcomp.sty} + +% \section{Textcomp} +% +% \DescribePackage{textcomp} +% \pkg{textcomp} is patched for use by \pkg{lwarp}. +% +% \limitstextcomp +% +% \changes{v0.37}{2017/08/18}{\pkg{textcomp}: Improved support.} +% \changes{v0.38}{2017/08/21}{\pkg{textcomp}: Removed from \pkg{lwarp} core.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{textcomp} +% \end{macrocode} +% +% +% +% The following are restored for print when inside a \env{lateximage}: +% \begin{macrocode} +\let\LWR@origtextdegree\textdegree +\let\LWR@origtextcelsius\textcelsius +\let\LWR@origtextohm\textohm +\let\LWR@origtextmu\textmu +\LetLtxMacro\LWR@origcapitalcedilla\capitalcedilla +\LetLtxMacro\LWR@origcapitalogonek\capitalogonek +\LetLtxMacro\LWR@origcapitalgrave\capitalgrave +\LetLtxMacro\LWR@origcapitalacute\capitalacute +\LetLtxMacro\LWR@origcapitalcircumflex\capitalcircumflex +\LetLtxMacro\LWR@origcapitaltilde\capitaltilde +\LetLtxMacro\LWR@origcapitaldieresis\capitaldieresis +\LetLtxMacro\LWR@origcapitalhungarumlaut\capitalhungarumlaut +\LetLtxMacro\LWR@origcapitalring\capitalring +\LetLtxMacro\LWR@origcapitalcaron\capitalcaron +\LetLtxMacro\LWR@origcapitalbreve\capitalbreve +\LetLtxMacro\LWR@origcapitalmacron\capitalmacron +\LetLtxMacro\LWR@origcapitaldotaccent\capitaldotaccent +\LetLtxMacro\LWR@origtextcircled\textcircled +% \end{macrocode} +% For \HTML, use \HTML\ entities or direct Unicode, depending on the engine: +% \begin{macrocode} +\ifPDFTeX +\renewcommand*{\textdegree}{\HTMLentity{deg}} +\renewcommand*{\textcelsius}{\HTMLentity{deg}\,C} +\renewcommand*{\textohm}{\HTMLunicode{2126}} +\renewcommand*{\textmu}{\HTMLunicode{00B5}} +\else +\renewcommand*{\textdegree}{°} +\renewcommand*{\textcelsius}{°C} +\renewcommand*{\textohm}{Ω} +\renewcommand*{\textmu}{μ} +\fi +% \end{macrocode} +% For \HTML, Unicode diacritical marks are used: +% \begin{macrocode} +\renewcommand*{\capitalcedilla}[1]{#1\HTMLunicode{0327}} +\renewcommand*{\capitalogonek}[1]{#1\HTMLunicode{0328}} +\renewcommand*{\capitalgrave}[1]{#1\HTMLunicode{0300}} +\renewcommand*{\capitalacute}[1]{#1\HTMLunicode{0301}} +\renewcommand*{\capitalcircumflex}[1]{#1\HTMLunicode{0302}} +\renewcommand*{\capitaltilde}[1]{#1\HTMLunicode{0303}} +\renewcommand*{\capitaldieresis}[1]{#1\HTMLunicode{0308}} +\renewcommand*{\capitalhungarumlaut}[1]{#1\HTMLunicode{30B}} +\renewcommand*{\capitalring}[1]{#1\HTMLunicode{30A}} +\renewcommand*{\capitalcaron}[1]{#1\HTMLunicode{30C}} +\renewcommand*{\capitalbreve}[1]{#1\HTMLunicode{306}} +\renewcommand*{\capitalmacron}[1]{#1\HTMLunicode{304}} +\renewcommand*{\capitaldotaccent}[1]{#1\HTMLunicode{307}} +% \end{macrocode} +% \cs{textcircled} becomes a span with a rounded border: +% \begin{macrocode} +\renewcommand*{\textcircled}[1]{% +\InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}% +} +% \end{macrocode} +% +% \begin{macro}{\LWR@restoreorigtextcomp} +% Called from \cs{restoreoriginalformatting} when a \env{lateximage} is begun. +% \begin{macrocode} +\let\LWR@restoreorigtextcomp\relax + +\newcommand*{\LWR@restoreorigtextcomp}{% +\let\textdegree\LWR@origtextdegree% +\let\textcelsius\LWR@origtextcelsius% +\let\textohm\LWR@origtextohm% +\let\textmu\LWR@origtextmu% +\LetLtxMacro\capitalcedilla\LWR@origcapitalcedilla% +\LetLtxMacro\capitalogonek\LWR@origcapitalogonek% +\LetLtxMacro\capitalgrave\LWR@origcapitalgrave% +\LetLtxMacro\capitalacute\LWR@origcapitalacute% +\LetLtxMacro\capitalcircumflex\LWR@origcapitalcircumflex% +\LetLtxMacro\capitaltilde\LWR@origcapitaltilde% +\LetLtxMacro\capitaldieresis\LWR@origcapitaldieresis% +\LetLtxMacro\capitalhungarumlaut\LWR@origcapitalhungarumlaut% +\LetLtxMacro\capitalring\LWR@origcapitalring% +\LetLtxMacro\capitalcaron\LWR@origcapitalcaron% +\LetLtxMacro\capitalbreve\LWR@origcapitalbreve% +\LetLtxMacro\capitalmacron\LWR@origcapitalmacron% +\LetLtxMacro\capitaldotaccent\LWR@origcapitaldotaccent% +\LetLtxMacro\textcircled\LWR@origtextcircled% +} +% \end{macrocode} +% \end{macro} +% +% +% \iffalse +% +% \fi +% +% +% +% % % \clearpage % @@ -28970,8 +30160,6 @@ background: % % % -% \clearpage -% % % \iffalse %<*titleref> @@ -29263,8 +30451,7 @@ background: % The following patches are not needed by \pkg{lwarp}, % but are required if the user requests \pkg{titling}. % -% \pkg{lwarp} uses page notes for footnotes, so the various -% \pkg{titling} footnote restyling commands have no effect. +% The various \pkg{titling} footnote restyling commands have no effect. % % \changes{v0.20}{2017/01/22}{\pkg{titling}: Improved compatibility.} % @@ -29316,6 +30503,68 @@ background: % % % +% +% \clearpage +% +% \iffalse +%<*tocbibind> +% \fi +% +% \part{lwarp-tocbibind.sty} + +% \section{Tocbibind} +% +% \DescribePackage{tocbibind} +% \pkg{tocbibind} is patched for use by \pkg{lwarp}. +% +% \changes{v0.38}{2017/08/22}{\pkg{tocbibind}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{tocbibind} +% \end{macrocode} + +% \begin{macrocode} + \renewenvironment{theindex}% + {% + \if@bibchapter + \if@donumindex + \chapter{\indexname} + \else + \if@dotocind + \chapter*{\indexname} + \addcontentsline{toc}{chapter}{\indexname} + \else + \chapter*{\indexname} + \fi + \fi + \else + \if@donumindex + \section{\indexname} + \else + \if@dotocind + \section*{\indexname} + \addcontentsline{toc}{\@tocextra}{\indexname} + \else + \section*{\indexname} + \fi + \fi + \fi +\let\item\LWR@indexitem% +\let\subitem\LWR@indexsubitem% +\let\subsubitem\LWR@indexsubsubitem% +} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% + + % % % \clearpage @@ -30209,8 +31458,9 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; % % are temporary as \env{lateximage} is used. % % \begin{description} -% \item [When \pkg{lwarp} is loaded in print or HTML mode:] -% \cs{LWR@restoreorigxcolor} and \cs{LWR@restoremoreorigxcolor} are defined as null. +% \item [When \pkg{lwarp} is loaded in print or HTML mode:] \hfill +% \cs{LWR@restoreorigxcolor} and +% \cs{LWR@restoremoreorigxcolor} are defined as null. % \Cref{sec:xcolordefaults} % \item [When \pkg{xcolor} is loaded in print mode:] \ % No special actions are taken at the time that \pkg{xcolor} is loaded in @@ -30229,8 +31479,10 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; % % for \pkg{lwarp}'s new macros print-mode macros \cs{colorboxBlock}, % \cs{fcolorboxBlock}, and \env{fcolorminipage}. The \HTML\ versions of these % macros will already have been created by \pkg{lwarp-xcolor} if it has been loaded. -% For use inside an \HTML\ \env{lateximage}, \cs{LWR@restoremoreorigxcolor} -% is defined to temporarily set these functions to their print-mode versions. +% +% For use inside an \HTML\ \env{lateximage}, +% \cs{LWR@restoremoreorigxcolor} is defined to temporarily set these functions +% to their print-mode versions. % \item [In a \env{lateximage} in HTML mode:] \ % \cs{LWR@restoreorigxcolor} and \\ \cs{LWR@restoremoreorigxcolor} are used to % temporarily restore the print-mode definitions of \pkg{xcolor}'s functions. @@ -30814,6 +32066,58 @@ scaling = false % % % +% \clearpage +% +% \iffalse +%<*xltxtra> +% \fi +% +% \part{lwarp-xltxtra.sty} +% +% \section{Xltxtra} +% +% +% \DescribePackage{xltxtra} +% \pkg{xltxtra} is emulated. +% +% \credits{Will Robertson, Jonathan Kew} +% +% \changes{v0.38}{2017/08/25}{\pkg{xltxtra}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{xltxtra} +% \end{macrocode} +% +% \begin{macrocode} +\RequirePackage{realscripts} +\RequirePackage{metalogo} +\newcommand*\TeX@logo@spacing[6]{} + +\newcommand*{\vfrac}[2]{% +\textsuperscript{#1}/\textsubscript{#2}% +} + +\newcommand\namedglyph[1]{% + \@tempcnta=\XeTeXglyphindex "#1"\relax + \ifnum\@tempcnta>0 + \XeTeXglyph\@tempcnta + \else + \xxt@namedglyph@fallback{#1}% + \fi} + +\newcommand\xxt@namedglyph@fallback[1]{[#1]} + +\newcommand{\showhyphens}[1]{} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% % % % \clearpage diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins index 2dba3766b93..74222f1191e 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins @@ -38,6 +38,8 @@ version 2005/12/01 or later. \file{lwarp-algorithmicx.sty}{\from{lwarp.dtx}{algorithmicx}} \file{lwarp-alltt.sty}{\from{lwarp.dtx}{alltt}} \file{lwarp-amsthm.sty}{\from{lwarp.dtx}{amsthm}} +\file{lwarp-appendix.sty}{\from{lwarp.dtx}{appendix}} +\file{lwarp-arabicfront.sty}{\from{lwarp.dtx}{arabicfront}} \file{lwarp-balance.sty}{\from{lwarp.dtx}{balance}} \file{lwarp-bookmark.sty}{\from{lwarp.dtx}{bookmark}} \file{lwarp-booktabs.sty}{\from{lwarp.dtx}{booktabs}} @@ -45,6 +47,8 @@ version 2005/12/01 or later. \file{lwarp-boxedminipage2e.sty}{\from{lwarp.dtx}{boxedminipage2e}} \file{lwarp-ccaption.sty}{\from{lwarp.dtx}{ccaption}} \file{lwarp-changepage.sty}{\from{lwarp.dtx}{changepage}} +\file{lwarp-chappg.sty}{\from{lwarp.dtx}{chappg}} +\file{lwarp-color.sty}{\from{lwarp.dtx}{color}} \file{lwarp-crop.sty}{\from{lwarp.dtx}{crop}} \file{lwarp-cutwin.sty}{\from{lwarp.dtx}{cutwin}} \file{lwarp-dcolumn.sty}{\from{lwarp.dtx}{dcolumn}} @@ -63,11 +67,13 @@ version 2005/12/01 or later. \file{lwarp-fancyhdr.sty}{\from{lwarp.dtx}{fancyhdr}} \file{lwarp-fancyvrb.sty}{\from{lwarp.dtx}{fancyvrb}} \file{lwarp-figcaps.sty}{\from{lwarp.dtx}{figcaps}} +\file{lwarp-fix2col.sty}{\from{lwarp.dtx}{fix2col}} \file{lwarp-float.sty}{\from{lwarp.dtx}{float}} \file{lwarp-floatflt.sty}{\from{lwarp.dtx}{floatflt}} \file{lwarp-floatpag.sty}{\from{lwarp.dtx}{floatpag}} \file{lwarp-floatrow.sty}{\from{lwarp.dtx}{floatrow}} \file{lwarp-flushend.sty}{\from{lwarp.dtx}{flushend}} +\file{lwarp-fncychap.sty}{\from{lwarp.dtx}{fncychap}} \file{lwarp-footmisc.sty}{\from{lwarp.dtx}{footmisc}} \file{lwarp-footnote.sty}{\from{lwarp.dtx}{footnote}} \file{lwarp-footnotehyper.sty}{\from{lwarp.dtx}{footnotehyper}} @@ -80,6 +86,7 @@ version 2005/12/01 or later. \file{lwarp-glossaries.sty}{\from{lwarp.dtx}{glossaries}} \file{lwarp-graphicx.sty}{\from{lwarp.dtx}{graphicx}} \file{lwarp-graphics.sty}{\from{lwarp.dtx}{graphics}} +\file{lwarp-grffile.sty}{\from{lwarp.dtx}{grffile}} \file{lwarp-hyperref.sty}{\from{lwarp.dtx}{hyperref}} \file{lwarp-hyperxmp.sty}{\from{lwarp.dtx}{hyperxmp}} \file{lwarp-idxlayout.sty}{\from{lwarp.dtx}{idxlayout}} @@ -100,6 +107,7 @@ version 2005/12/01 or later. \file{lwarp-mcaption.sty}{\from{lwarp.dtx}{mcaption}} \file{lwarp-mdframed.sty}{\from{lwarp.dtx}{mdframed}} \file{lwarp-microtype.sty}{\from{lwarp.dtx}{microtype}} +\file{lwarp-metalogo.sty}{\from{lwarp.dtx}{metalogo}} \file{lwarp-moreverb.sty}{\from{lwarp.dtx}{moreverb}} \file{lwarp-mparhack.sty}{\from{lwarp.dtx}{mparhack}} \file{lwarp-multicol.sty}{\from{lwarp.dtx}{multicol}} @@ -109,6 +117,8 @@ version 2005/12/01 or later. \file{lwarp-newclude.sty}{\from{lwarp.dtx}{newclude}} \file{lwarp-newunicodechar.sty}{\from{lwarp.dtx}{newunicodechar}} \file{lwarp-nextpage.sty}{\from{lwarp.dtx}{nextpage}} +\file{lwarp-nonumonpart.sty}{\from{lwarp.dtx}{nonumonpart}} +\file{lwarp-nopageno.sty}{\from{lwarp.dtx}{nopageno}} \file{lwarp-nowidow.sty}{\from{lwarp.dtx}{nowidow}} \file{lwarp-ntheorem.sty}{\from{lwarp.dtx}{ntheorem}} \file{lwarp-pagenote.sty}{\from{lwarp.dtx}{pagenote}} @@ -119,20 +129,27 @@ version 2005/12/01 or later. \file{lwarp-placeins.sty}{\from{lwarp.dtx}{placeins}} \file{lwarp-prelim2e.sty}{\from{lwarp.dtx}{prelim2e}} \file{lwarp-ragged2e.sty}{\from{lwarp.dtx}{ragged2e}} +\file{lwarp-realscripts.sty}{\from{lwarp.dtx}{realscripts}} +\file{lwarp-relsize.sty}{\from{lwarp.dtx}{relsize}} +\file{lwarp-romanbar.sty}{\from{lwarp.dtx}{romanbar}} +\file{lwarp-romanbarpagenumber.sty}{\from{lwarp.dtx}{romanbarpagenumber}} \file{lwarp-rotating.sty}{\from{lwarp.dtx}{rotating}} \file{lwarp-rotfloat.sty}{\from{lwarp.dtx}{rotfloat}} \file{lwarp-savetrees.sty}{\from{lwarp.dtx}{savetrees}} +\file{lwarp-scalefnt.sty}{\from{lwarp.dtx}{scalefnt}} \file{lwarp-setspace.sty}{\from{lwarp.dtx}{setspace}} \file{lwarp-shadow.sty}{\from{lwarp.dtx}{shadow}} \file{lwarp-showidx.sty}{\from{lwarp.dtx}{idx}} \file{lwarp-showkeys.sty}{\from{lwarp.dtx}{showkeys}} \file{lwarp-sidecap.sty}{\from{lwarp.dtx}{sidecap}} \file{lwarp-sidenotes.sty}{\from{lwarp.dtx}{sidenotes}} +\file{lwarp-siunitx.sty}{\from{lwarp.dtx}{siunitx}} \file{lwarp-soul.sty}{\from{lwarp.dtx}{soul}} \file{lwarp-subfig.sty}{\from{lwarp.dtx}{subfig}} \file{lwarp-syntonly.sty}{\from{lwarp.dtx}{syntonly}} \file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}} \file{lwarp-tabulary.sty}{\from{lwarp.dtx}{tabulary}} +\file{lwarp-textcomp.sty}{\from{lwarp.dtx}{textcomp}} \file{lwarp-textpos.sty}{\from{lwarp.dtx}{textpos}} \file{lwarp-theorem.sty}{\from{lwarp.dtx}{theorem}} \file{lwarp-threeparttable.sty}{\from{lwarp.dtx}{threeparttable}} @@ -142,6 +159,7 @@ version 2005/12/01 or later. \file{lwarp-titlesec.sty}{\from{lwarp.dtx}{titlesec}} \file{lwarp-titletoc.sty}{\from{lwarp.dtx}{titletoc}} \file{lwarp-titling.sty}{\from{lwarp.dtx}{titling}} +\file{lwarp-tocbibind.sty}{\from{lwarp.dtx}{tocbibind}} \file{lwarp-tocloft.sty}{\from{lwarp.dtx}{tocloft}} \file{lwarp-transparent.sty}{\from{lwarp.dtx}{transparent}} \file{lwarp-trivfloat.sty}{\from{lwarp.dtx}{trivfloat}} @@ -152,6 +170,7 @@ version 2005/12/01 or later. \file{lwarp-wrapfig.sty}{\from{lwarp.dtx}{wrapfig}} \file{lwarp-xcolor.sty}{\from{lwarp.dtx}{xcolor}} \file{lwarp-xfrac.sty}{\from{lwarp.dtx}{xfrac}} +\file{lwarp-xltxtra.sty}{\from{lwarp.dtx}{xltxtra}} \file{lwarp-xmpincl.sty}{\from{lwarp.dtx}{xmpincl}} } \Msg{*********************************************************} -- cgit v1.2.3