texlive[45082] trunk: lwarp (20aug17)
commits+karl at tug.org
commits+karl at tug.org
Mon Aug 21 00:12:59 CEST 2017
Revision: 45082
http://tug.org/svn/texlive?view=revision&revision=45082
Author: karl
Date: 2017-08-21 00:12:58 +0200 (Mon, 21 Aug 2017)
Log Message:
-----------
lwarp (20aug17)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2017-08-20 22:12:36 UTC (rev 45081)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2017-08-20 22:12:58 UTC (rev 45082)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.36"
+printversion = "v0.37"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -25,7 +25,7 @@
For use with latexmk or a Makefile:
Convert project_html.pdf to project_html.html and
individual HTML files.
-lwarpmk clean [project]: Remove project.aux, .toc, .lof/t, .idx, .ind, .log, .gl*
+lwarpmk clean [project]: Remove project.aux, .toc, .lof/t, .idx, .ind, .log, *_html_inc.*, .gl*
lwarpmk cleanall [project]: Remove auxiliary files and also project.pdf, *.html
lwarpmk -h: Print this help message.
lwarpmk --help: Print this help message.
@@ -254,7 +254,8 @@
sourcename ..".idx " .. sourcename .. "_html.idx " ..
sourcename ..".ind " .. sourcename .. "_html.ind " ..
sourcename ..".log " .. sourcename .. "_html.log " ..
- sourcename ..".gl* " .. sourcename .. "_html.gl* "
+ sourcename ..".gl* " .. sourcename .. "_html.gl* " ..
+ "*_html_inc.*"
)
end
@@ -473,7 +474,7 @@
print ("lwarpmk: Done.")
-- lwarpmk clean:
--- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, .gl*
+-- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, *_html_inc.*, .gl*
elseif arg[1] == "clean" then
loadconf ()
@@ -481,7 +482,7 @@
print ("lwarpmk: Done.")
-- lwarpmk cleanall
--- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, .gl*
+-- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, *_html_inc.*, .gl*
-- and also project.pdf, *.html
elseif arg[1] == "cleanall" then
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2017-08-20 22:12:36 UTC (rev 45081)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2017-08-20 22:12:58 UTC (rev 45082)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.36 README.txt
+LaTeX lwarp package v0.37 README.txt
Files included are:
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2017-08-20 22:12:36 UTC (rev 45081)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2017-08-20 22:12:58 UTC (rev 45082)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.36"
+printversion = "v0.37"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -25,7 +25,7 @@
For use with latexmk or a Makefile:
Convert project_html.pdf to project_html.html and
individual HTML files.
-lwarpmk clean [project]: Remove project.aux, .toc, .lof/t, .idx, .ind, .log, .gl*
+lwarpmk clean [project]: Remove project.aux, .toc, .lof/t, .idx, .ind, .log, *_html_inc.*, .gl*
lwarpmk cleanall [project]: Remove auxiliary files and also project.pdf, *.html
lwarpmk -h: Print this help message.
lwarpmk --help: Print this help message.
@@ -254,7 +254,8 @@
sourcename ..".idx " .. sourcename .. "_html.idx " ..
sourcename ..".ind " .. sourcename .. "_html.ind " ..
sourcename ..".log " .. sourcename .. "_html.log " ..
- sourcename ..".gl* " .. sourcename .. "_html.gl* "
+ sourcename ..".gl* " .. sourcename .. "_html.gl* " ..
+ "*_html_inc.*"
)
end
@@ -473,7 +474,7 @@
print ("lwarpmk: Done.")
-- lwarpmk clean:
--- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, .gl*
+-- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, *_html_inc.*, .gl*
elseif arg[1] == "clean" then
loadconf ()
@@ -481,7 +482,7 @@
print ("lwarpmk: Done.")
-- lwarpmk cleanall
--- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, .gl*
+-- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, *_html_inc.*, .gl*
-- and also project.pdf, *.html
elseif arg[1] == "cleanall" then
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2017-08-20 22:12:36 UTC (rev 45081)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2017-08-20 22:12:58 UTC (rev 45082)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2017/08/17 v0.36 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2017/08/19 v0.37 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -356,6 +356,17 @@
\cs{kern} and \cs{hskip} are treated as a single normal space.
}
+\newcommand{\limitstextcomp}{%
+Many \pkg{textcomp} symbols are not supported by many fonts.
+\watchout[Missing symbols]
+Try using more complete fonts in the \CSS, but expect to see gaps in coverage.
+}
+
+\newcommand{\limitsaccents}{%
+Native \LaTeX\ accents such as \cs{"} will work, but many more kinds of
+accents are available when using Unicode-aware \XeLaTeX\ and \LuaLaTeX.
+}
+
\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},
@@ -906,6 +917,11 @@
\pkg{fancybox}'s \cs{VerbBox} may be used inside \cs{fbox}.
\margintag{framed \cs{VerbBox}}
+
+\env{LVerbatim}, \cs{LVerbatimInput}, and \cs{LUseVerbatim} indent with horizontal
+\margintag{indented alignment}
+space which may not line up exactly with what \texttt{pdftotext} detects.
+Some lines may be off slightly in their left edge.
}
\newcommand{\limitsmdframed}{%
@@ -1010,7 +1026,7 @@
Do not use \cmds{per-mode=fraction}, which cannot be seen by the final \cmds{pdftotext} conversion.
\watchout[per-mode]
-Place the \cs{SI} expression inside math mode for anything which requires math mode units.
+Some units will require that the expression be placed inside math mode.
}
\newcommand{\limitsnicefrac}{%
@@ -1144,7 +1160,7 @@
%<*package>
% \fi
%
-% \CheckSum{12815}
+% \CheckSum{13116}
%
% \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
@@ -1220,8 +1236,9 @@
% \changes{v0.34}{2017/07/25}{File: \texttt{README.txt}: updated.}
% \changes{v0.34}{2017/07/25}{Docs: Horizontal space limitations.}
% \changes{v0.35}{2017/08/08}{\ 2017/08/08}
+% \changes{v0.36}{2017/08/15}{Source: Improved formatting.}
% \changes{v0.36}{2017/08/17}{\ 2017/08/17}
-% \changes{v0.36}{2017/08/15}{Source: Improved formatting.}
+% \changes{v0.37}{2017/08/19}{\ 2017/08/19}
@@ -1356,6 +1373,22 @@
% For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}.
%
% \begin{description}
+% \item[v0.37:] \
+% \begin{itemize}
+% \item \cs{include} now maintains independent |.aux| files
+% \margintag{\cs{include} for \HTML}
+% for \HTML\ versions.
+% \item \pkg{comment}, used by \pkg{lwarp}, now maintains
+% \margintag{\texttt{latexmk}}
+% independent cut files for print and \HTML\ versions, helping |latexmk| to
+% better know whether to recompile.
+% \item Improved support for \LaTeX\ accents,
+% \margintag{accents and symbols}
+% \pkg{textcomp}, \pkg{siunitx} symbols.
+% \item Improved \pkg{babel-french} handling for
+% \margintag{\pkg{babel-french}}
+% load order and \textasciitilde\ tilde.
+% \end{itemize}
% \item[v0.36:] \
% \begin{itemize}
% \item Recorganized the documentation section regarding special cases and limitations.
@@ -1366,7 +1399,7 @@
% \item \cs{makebox} and \cs{framebox} now use width and position.
% \item \cs{fcolorbox} and related now work inside a \env{lateximage}.
% \item \pkg{babel-french}: Improvements for French variants, load order,
-% \margintag{babel-french}
+% \margintag{\pkg{babel-french}}
% footnotes, ellipses.
% \item Improved footnote numbering.
% \margintag{footnotes}
@@ -1374,7 +1407,7 @@
% the numbering of the print version.
% Also fixed a regression with MathJax.
% \item Improved \pkg{siunitx} units.
-% \margintag{siunitx}
+% \margintag{\pkg{siunitx}}
% \item Fix for filenames while using MathJax.
% \item Fix for \cs{rule} when \pkg{xcolor} is not loaded.
% \item Added \pkg{transparent}, \pkg{upref}.
@@ -1418,11 +1451,11 @@
% \cs{fbox} and minipages now often work in \SVG\ math and \env{lateximage}s.
% MathJax supports \cs{fbox}, but not \cs{fboxBlock} nor \env{fminipage}.
% \item Improved compatibility between \env{lateximage} and
-% \margintag{lateximage, \SVG\ math, tabular}
+% \margintag{\env{lateximage}, \SVG\ math, \env{tabular}}
% \env{minipage}, \cs{parbox}, \cs{makebox}, \cs{fbox}, \cs{framebox},
% \cs{raisebox}, \cs{scalebox}, \cs{reflectbox}, \env{tabular}, \pkg{booktabs}.
% \item Improved font control for \env{lateximage}es and \SVG\ math.
-% \item Added the \env{eqnarray} environments.\margintag{eqnarray}
+% \item Added the \env{eqnarray} environments.\margintag{\env{eqnarray}}
% \item \pkg{fancyvrb} is no longer required (preloaded),
% \margintag{verbatim packages}
% but is still supported.
@@ -1437,7 +1470,7 @@
% \item Added \pkg{rotfloat}, \pkg{marginfit},
% and several minor packages; see the change log.
% \item Adds fixed-width \HTML\ spaces around punctuation
-% \margintag{babel-french}
+% \margintag{\pkg{babel-french}}
% when using \pkg{babel-french}.
% \LuaTeX\ does not yet use the extra punctuation spacing.
% \end{itemize}
@@ -3825,6 +3858,16 @@
% of the macros \cs{centering}, \cs{raggedright}, \cs{raggedleft}.
%
%
+% \subsubsection{Accents}
+%
+% \limitsaccents
+%
+%
+% \subsubsection{Textcomp}
+%
+% \limitstextcomp
+%
+%
% \subsubsection{Superscripts and other non-math uses of math mode}
%
% Use \cs{textsuperscript\{x\}} instead of |$^{x}$|
@@ -4780,15 +4823,8 @@
% \end{macrocode}
%
%
-% \DescribePackage{comment}
-% Provides conditional code blocks.
%
-% \begin{macrocode}
-\RequirePackage{comment}
-\excludecomment{testing}
-% \end{macrocode}
-
-
+%
% \DescribePackage{letltxmacro}
% Used to redefine \cs{textbf} and friends.
%
@@ -4888,43 +4924,17 @@
% \end{macrocode}
%
%
-%
-%
-% \begin{macro}{\warpprintonly} \marg{contents}
-%
-% Only process the contents if producing printed output.
-% \changes{v0.19}{2016/06/06}{Replaces \cs{rowprintedonly}.}
+% The default is print output,
+% \margintag{defaults}
+% and \SVG\ math if the user chose \HTML\ output.
% \begin{macrocode}
-\newcommand{\warpprintonly}[1]{\ifbool{warpingprint}{#1}{}}
+\booltrue{warpingprint}%
+\boolfalse{warpingHTML}%
+\boolfalse{mathjax}%
% \end{macrocode}
-% \end{macro}
%
%
-% \begin{macro}{\warpHTMLonly} \marg{contents}
%
-% Only process the contents if producing \HTML\ output.
-% \changes{v0.19}{2016/06/06}{Added.}
-% \begin{macrocode}
-\newcommand{\warpHTMLonly}[1]{\ifbool{warpingHTML}{#1}{}}
-% \end{macrocode}
-% \end{macro}
-
-
-
-
-% \begin{environment}{warpall}
-% Anything in the |warpall| environment will be generated for print or \HTML\ outputs.
-% \begin{macrocode}
-\includecomment{warpall}
-% \end{macrocode}
-% \end{environment}
-
-
-
-
-% \begin{environment}{warpprint}
-% Anything in the |warpprint| environment will be generated for print output only.
-%
% \DescribeOption{warpprint}
% If the |warpprint| option is given, boolean |warpingprint| is true and boolean |warpingHTML| is false,
% and may be used for |\ifbool| tests.
@@ -4933,13 +4943,10 @@
% \begin{macrocode}
\DeclareVoidOption{warpprint}{%
\PackageInfo{lwarp}{Using option 'warpprint'}
-\includecomment{warpprint}%
-\excludecomment{warpHTML}%
\booltrue{warpingprint}%
\boolfalse{warpingHTML}%
}
% \end{macrocode}
-% \end{environment}
% \begin{environment}{warpHTML}
% Anything in the |warpHTML| environment will be generated for \HTML\ output only.
@@ -4950,9 +4957,7 @@
%
% \begin{macrocode}
\DeclareVoidOption{warpHTML}{%
-\PackageInfo{lwarp}{Using option 'warpHTML'}
-\excludecomment{warpprint}%
-\includecomment{warpHTML}%
+\PackageInfo{lwarp}{Using option 'warpHTML'}%
\booltrue{warpingHTML}%
\boolfalse{warpingprint}%
}
@@ -5040,9 +5045,12 @@
%
% If |lwarpmk| option, creates a local copy of |lwarpmk.lua|:
% \begin{macrocode}
+\newbool{LWR at creatinglwarpmk}
+\boolfalse{LWR at creatinglwarpmk}
+
\DeclareVoidOption{lwarpmk}{
\PackageInfo{lwarp}{Using option 'lwarpmk'}
-\includecomment{LWR at createlwarpmk}
+\booltrue{LWR at creatinglwarpmk}
}
% \end{macrocode}
@@ -5101,26 +5109,6 @@
% \end{macrocode}
-
-% The default is print output,
-% \margintag{defaults}
-% and \SVG\ math if the user chose \HTML\ output.
-% \begin{macrocode}
-\includecomment{warpprint}%
-\excludecomment{warpHTML}%
-\booltrue{warpingprint}%
-\boolfalse{warpingHTML}%
-\boolfalse{mathjax}%
-% \end{macrocode}
-
-
-
-% Optionally generate a local copy of |lwarpmk|. Default to no:
-% \begin{macrocode}
-\excludecomment{LWR at createlwarpmk}
-% \end{macrocode}
-
-
% Execute the package options, with the defaults which have been set just above:
% \margintag{Execute options}
% \begin{macrocode}
@@ -5128,8 +5116,6 @@
% \end{macrocode}
-
-
% Assign the \cs{BaseJobname} if the user hasn't provided one:
% \begin{macrocode}
\providecommand*{\BaseJobname}{\LWR at BaseJobname}
@@ -5147,12 +5133,109 @@
\csedef{HTMLFilename}{\LWR at HTMLFilename}
% \end{macrocode}
%
+%
+%
+% \subsection{Conditional compilation}
+%
+%
+%
+% \begin{macro}{\warpprintonly} \marg{contents}
+%
+% Only process the contents if producing printed output.
+% \changes{v0.19}{2016/06/06}{Replaces \cs{rowprintedonly}.}
+% \begin{macrocode}
+\newcommand{\warpprintonly}[1]{\ifbool{warpingprint}{#1}{}}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\warpHTMLonly} \marg{contents}
+%
+% Only process the contents if producing \HTML\ output.
+% \changes{v0.19}{2016/06/06}{Added.}
+% \begin{macrocode}
+\newcommand{\warpHTMLonly}[1]{\ifbool{warpingHTML}{#1}{}}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \DescribePackage{comment} Provides conditional code blocks.
+%
+% \begin{macrocode}
+\RequirePackage{comment}
+% \end{macrocode}
+% Use |comment_print.cut| for print mode, and
+% |comment_html.cut| for \HTML\ mode.
+% This helps |latexmk| to more reliably know whether to recompile.
+%
+% \changes{v0.37}{2017/08/19}{\pkg{comment}: Maintains independent
+% cutfiles for print, \protect\HTML.}
+%
+% \begin{macrocode}
+\ifbool{warpingHTML}{
+\def\DefaultCutFileName{\def\CommentCutFile{comment_html.cut}}
+}{}
+\ifbool{warpingprint}{
+\def\DefaultCutFileName{\def\CommentCutFile{comment_print.cut}}
+}{}
+% \end{macrocode}
+% \begin{macrocode}
+\excludecomment{testing}
+% \end{macrocode}
+
+% \begin{environment}{warpall}
+% Anything in the |warpall| environment will be generated for print or \HTML\ outputs.
+% \begin{macrocode}
+\includecomment{warpall}
+% \end{macrocode}
+% \end{environment}
+
+
+
+
+% \begin{environment}{warpprint}
+% \begin{environment}{warpHTML}
+% Anything in the |warpprint| environment will be generated for print output only.
+%
+% For \HTML\ output:
+% \begin{macrocode}
+\ifbool{warpingHTML}{%
+\includecomment{warpHTML}
+}
+{\excludecomment{warpHTML}}%
+% \end{macrocode}
+
+% \begin{macrocode}
+\ifbool{warpingprint}
+{\includecomment{warpprint}}
+{\excludecomment{warpprint}}
+% \end{macrocode}
+
+% \end{environment}
+% \end{environment}
+
+
+% Optionally generate a local copy of |lwarpmk|.
+% Default to no.
+% \begin{macrocode}
+\ifbool{LWR at creatinglwarpmk}
+{\includecomment{LWR at createlwarpmk}}
+{\excludecomment{LWR at createlwarpmk}}
+% \end{macrocode}
+%
+%
+%
+%
+%
+%
+
+
% \section{Misplaced packages}
%
% \changes{v0.21}{2017/02/22}{Add: Errors for misplaced packages.}
@@ -5840,12 +5923,6 @@
% \end{macrocode}
-
-
-
-
-
-
% \begin{macrocode}
\end{warpHTML}
% \end{macrocode}
@@ -6009,6 +6086,114 @@
+% \section{File handles}
+
+% Defines file handles for writes.
+
+% \changes{v0.37}{2017/08/19}{File handles reorganized.}
+
+% \codeall
+% \begin{macrocode}
+\begin{warpall}
+% \end{macrocode}
+
+% \begin{macro}{\LWR at quickfile}
+% For quick temporary use only.
+% This is reused in several places.
+% \begin{macrocode}
+\newwrite\LWR at quickfile%
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macrocode}
+\end{warpall}
+% \end{macrocode}
+
+
+% \codehtml
+% \begin{macrocode}
+\begin{warpHTML}
+% \end{macrocode}
+
+% \begin{macro}{\LWR at lateximagesfile}
+% For |lateximages.txt|.
+% \begin{macrocode}
+\newwrite\LWR at lateximagesfile
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macrocode}
+\end{warpHTML}
+% \end{macrocode}
+
+
+% \section{Include a file}
+%
+% During \HTML\ output, |\include{<filename>}| causes the following to occur:
+%
+% \begin{enumerate}
+% \item \pkg{lwarp} creates |<filename>_html_inc.tex| whose contents are:
+% \begin{sourcedisplay}
+% \cs{input} \textless{}filename\textgreater.tex
+% \end{sourcedisplay}
+% \item |<filename>_html_inc.tex| is then \cs{include}d instead of |<filename>.tex|.
+% \item |<filename>_html_inc.aux| is automatically generated and used by \LaTeX.
+% \end{enumerate}
+%
+% \codehtml
+% \begin{macrocode}
+\begin{warpHTML}
+% \end{macrocode}
+
+% \begin{macro}{\include} \marg{filename}
+%
+% \changes{v0.37}{2017/08/19}{Maintains independent \protect\texttt{.aux} files for \protect\HTML.}
+%
+% \begin{macro}{\@include} \marg{filename} Modified to load |_html_inc| files.
+% \begin{macrocode}
+\def\@include#1 {%
+\immediate\openout\LWR at quickfile #1_html_inc.tex% new
+\immediate\write\LWR at quickfile{\string\input{#1.tex}}% new
+\immediate\closeout\LWR at quickfile% new
+\LWR at origclearpage% \changed
+\if at filesw
+ \immediate\write\@mainaux{\string\@input{#1_html_inc.aux}}% changed
+\fi
+\@tempswatrue
+\if at partsw
+ \@tempswafalse
+ \edef\reserved at b{#1}%
+ \@for\reserved at a:=\@partlist\do
+ {\ifx\reserved at a\reserved at b\@tempswatrue\fi}%
+\fi
+\if at tempswa
+ \let\@auxout\@partaux
+ \if at filesw
+ \immediate\openout\@partaux #1_html_inc.aux % changed
+ \immediate\write\@partaux{\relax}%
+ \fi
+ \@input@{#1_html_inc.tex}% changed
+ \LWR at origclearpage% changed
+ \@writeckpt{#1}%
+ \if at filesw
+ \immediate\closeout\@partaux
+ \fi
+\else
+ \deadcycles\z@
+ \@nameuse{cp@#1}%
+\fi
+\let\@auxout\@mainaux%
+}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+
+% \begin{macrocode}
+\end{warpHTML}
+% \end{macrocode}
+
+
+
% \section{Copying a file}
% \codehtml
@@ -6021,20 +6206,21 @@
% Used to copy the |.toc| file to |.sidetoc| to re-print the \TOC\ in
% the side\TOC\ navigation pane.
% \begin{macrocode}
+\newwrite\LWR at copyoutfile % open the file to write to
+\newread\LWR at copyinfile % open the file to read from
+
\newcommand*{\LWR at copyfile}[2]{%
-\newwrite\copyfile % open the file to write to
-\immediate\openout\copyfile=#2
-\newread\file % open the file to read from
-\openin\file=#1
+\immediate\openout\LWR at copyoutfile=#2
+\openin\LWR at copyinfile=#1
\begingroup\endlinechar=-1
\makeatletter
-\loop\unless\ifeof\file
- \read\file to\fileline % Read one line and store it into \fileline
-% \fileline\par % print the content into the pdf
+\loop\unless\ifeof\LWR at copyinfile
+ \read\LWR at copyinfile to\LWR at fileline % Read one line and store it into \LWR at fileline
+% \LWR at fileline\par % print the content into the pdf
% print the content:
- \immediate\write\copyfile{\unexpanded\expandafter{\fileline}}%
+ \immediate\write\LWR at copyoutfile{\unexpanded\expandafter{\LWR at fileline}}%
\repeat
-\closeout\copyfile
+\closeout\LWR at copyoutfile
\endgroup
}
% \end{macrocode}
@@ -6255,31 +6441,48 @@
-% \section{Textcomp and SIunitx}
-
-% Mimic the \pkg{textcomp} package if it not loaded,
-% then create \HTML\ versions.
-
-% \changes{v0.36}{2017/08/17}{\pkg{siunitx}: Improved symbol support.}
-
+% \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}.
% \begin{macrocode}
\AtBeginDocument{% in case textcomp was not loaded
-\providecommand*{\textdegree}{DEG}
-\providecommand*{\textcelsius}{DEGC}
-\providecommand*{\textohm}{OHM}
-\providecommand*{\textmu}{MU}
-
+\@ifpackageloaded{textcomp}
+{
+% \end{macrocode}
+% The following are restored for print when inside a \env{lateximage}:
+% \begin{macrocode}
\let\LWR at origtextdegree\textdegree
\let\LWR at origtextcelsius\textcelsius
\let\LWR at origtextohm\textohm
\let\LWR at origtextmu\textmu
-
+\LetLtxMacro\LWR at origcapitalcedilla\capitalcedilla
+\LetLtxMacro\LWR at origcapitalogonek\capitalogonek
+\LetLtxMacro\LWR at origcapitalgrave\capitalgrave
+\LetLtxMacro\LWR at origcapitalacute\capitalacute
+\LetLtxMacro\LWR at origcapitalcircumflex\capitalcircumflex
+\LetLtxMacro\LWR at origcapitaltilde\capitaltilde
+\LetLtxMacro\LWR at origcapitaldieresis\capitaldieresis
+\LetLtxMacro\LWR at origcapitalhungarumlaut\capitalhungarumlaut
+\LetLtxMacro\LWR at origcapitalring\capitalring
+\LetLtxMacro\LWR at origcapitalcaron\capitalcaron
+\LetLtxMacro\LWR at origcapitalbreve\capitalbreve
+\LetLtxMacro\LWR at origcapitalmacron\capitalmacron
+\LetLtxMacro\LWR at origcapitaldotaccent\capitaldotaccent
+\LetLtxMacro\LWR at 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}
@@ -6291,7 +6494,170 @@
\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 at currenttextcolor]{textcircled}{#1}%
+}
+% \end{macrocode}
+%
+% \begin{macro}{\LWR at restoreorigtextcomp}
+% Called from \cs{restoreoriginalformatting} when a \env{lateximage} is begun.
+% \begin{macrocode}
+\newcommand*{\LWR at restoreorigtextcomp}{%
+\let\textdegree\LWR at origtextdegree%
+\let\textcelsius\LWR at origtextcelsius%
+\let\textohm\LWR at origtextohm%
+\let\textmu\LWR at origtextmu%
+\LetLtxMacro\capitalcedilla\LWR at origcapitalcedilla%
+\LetLtxMacro\capitalogonek\LWR at origcapitalogonek%
+\LetLtxMacro\capitalgrave\LWR at origcapitalgrave%
+\LetLtxMacro\capitalacute\LWR at origcapitalacute%
+\LetLtxMacro\capitalcircumflex\LWR at origcapitalcircumflex%
+\LetLtxMacro\capitaltilde\LWR at origcapitaltilde%
+\LetLtxMacro\capitaldieresis\LWR at origcapitaldieresis%
+\LetLtxMacro\capitalhungarumlaut\LWR at origcapitalhungarumlaut%
+\LetLtxMacro\capitalring\LWR at origcapitalring%
+\LetLtxMacro\capitalcaron\LWR at origcapitalcaron%
+\LetLtxMacro\capitalbreve\LWR at origcapitalbreve%
+\LetLtxMacro\capitalmacron\LWR at origcapitalmacron%
+\LetLtxMacro\capitaldotaccent\LWR at origcapitaldotaccent%
+\LetLtxMacro\textcircled\LWR at 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 at 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
+% \begin{macrocode}
+\begin{warpHTML}
+% \end{macrocode}
+%
+%
+% Without \cs{AtBeginDocument}, \cs{t} was being re-defined somewhere.
+% \begin{macrocode}
+\AtBeginDocument{
+% \end{macrocode}
+% The following are restored for print when inside a \env{lateximage}.
+%
+% For Unicode engines, only \cs{t} needs to be redefined:
+% \begin{macrocode}
+\LetLtxMacro{\LWR at origt}{\t}
+% \end{macrocode}
+% For pdf\LaTeX, additional work is required:
+% \begin{macrocode}
+\ifPDFTeX
+\LetLtxMacro{\LWR at origequalaccent}{\=}
+\LetLtxMacro{\LWR at origdotaccent}{\.}
+\LetLtxMacro{\LWR at origu}{\u}
+\LetLtxMacro{\LWR at origv}{\v}
+\LetLtxMacro{\LWR at origc}{\c}
+\LetLtxMacro{\LWR at origd}{\d}
+\LetLtxMacro{\LWR at origb}{\b}
+% \end{macrocode}
+% The \HTML\ redefinitions follow.
+%
+% For pdf\LaTeX, Unicode diacritical marks are used:
+% \begin{macrocode}
+\renewcommand*{\=}[1]{#1\HTMLunicode{0305}}
+\renewcommand*{\.}[1]{#1\HTMLunicode{0307}}
+\renewcommand*{\u}[1]{#1\HTMLunicode{0306}}
+\renewcommand*{\v}[1]{#1\HTMLunicode{030C}}
+\renewcommand*{\c}[1]{#1\HTMLunicode{0327}}
+\renewcommand*{\d}[1]{#1\HTMLunicode{0323}}
+\renewcommand*{\b}[1]{#1\HTMLunicode{0331}}
+\fi
+% \end{macrocode}
+% For all engines, a Unicode diacritical tie is used:
+% \begin{macrocode}
+\def\LWR at t#1#2{#1\HTMLunicode{0361}#2}
+\renewcommand*{\t}[1]{\LWR at t#1}
+% \end{macrocode}
+%
+% \begin{macro}{\LWR at restoreorigaccents}
+% Called from \cs{restoreoriginalformatting} when a \env{lateximage} is begun.
+% \begin{macrocode}
+\ifPDFTeX
+\newcommand*{\LWR at restoreorigaccents}{%
+\LetLtxMacro{\=}{\LWR at origequalaccent}%
+\LetLtxMacro{\.}{\LWR at origdotaccent}%
+\LetLtxMacro{\u}{\LWR at origu}%
+\LetLtxMacro{\v}{\LWR at origu}%
+\LetLtxMacro{\t}{\LWR at origt}%
+\LetLtxMacro{\c}{\LWR at origc}%
+\LetLtxMacro{\d}{\LWR at origd}%
+\LetLtxMacro{\b}{\LWR at origb}%
+}
+\else% XeLaTeX, LuaLaTeX:
+\newcommand*{\LWR at restoreorigaccents}{%
+\LetLtxMacro{\t}{\LWR at origt}%
+}
+\fi
+}% AtBeginDocument
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
+% \begin{macrocode}
+\end{warpHTML}
+% \end{macrocode}
+
+
+
+
+% \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}}
@@ -6299,9 +6665,8 @@
\DeclareSIUnit\elementarycharge{\textit{e}}
\DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}}
\DeclareSIUnit\hartree{\textit{E}\textsubscript{h}}
-\DeclareSIUnit\planckbar{\HTMLunicode{210F}}
}% siunitx loaded
-{}
+{}% siunitx not loaded
}% AtBeginDocument
@@ -6338,16 +6703,15 @@
% Only write |\jobname_html.tex| if generating the print version.
% \begin{macrocode}
\begin{warpprint}
-\ifcsdef{LWR at file}{}{\newwrite{\LWR at file}}
-\immediate\openout\LWR at file=\jobname_html.tex
-\immediate\write\LWR at file{%
+\immediate\openout\LWR at quickfile=\jobname_html.tex
+\immediate\write\LWR at quickfile{%
\detokenize{\PassOptionsToPackage}%
{warpHTML,BaseJobname=\jobname}{lwarp}%
}
-\immediate\write\LWR at file{%
+\immediate\write\LWR at quickfile{%
\detokenize{\input}\string{\jobname.tex\string }%
}
-\immediate\closeout\LWR at file
+\immediate\closeout\LWR at quickfile
\end{warpprint}
% \end{macrocode}
@@ -6378,31 +6742,31 @@
% \codeprint
% \begin{macrocode}
\begin{warpprint}
-\ifcsdef{LWR at file}{}{\newwrite{\LWR at file}}
-\immediate\openout\LWR at file=lwarpmk.conf
+\ifcsdef{LWR at quickfile}{}{\newwrite{\LWR at quickfile}}
+\immediate\openout\LWR at quickfile=lwarpmk.conf
\ifbool{usingOSWindows}{
-\immediate\write\LWR at file{opsystem = "Windows"}
+\immediate\write\LWR at quickfile{opsystem = "Windows"}
}{
-\immediate\write\LWR at file{opsystem = "Unix"}
+\immediate\write\LWR at quickfile{opsystem = "Unix"}
}
\ifPDFTeX
-\immediate\write\LWR at file{latexname = "pdflatex"}
+\immediate\write\LWR at quickfile{latexname = "pdflatex"}
\fi
\ifXeTeX
-\immediate\write\LWR at file{latexname = "xelatex"}
+\immediate\write\LWR at quickfile{latexname = "xelatex"}
\fi
\ifLuaTeX
-\immediate\write\LWR at file{latexname = "lualatex"}
+\immediate\write\LWR at quickfile{latexname = "lualatex"}
\fi
-\immediate\write\LWR at file{sourcename = "\jobname"}
-\immediate\write\LWR at file{%
+\immediate\write\LWR at quickfile{sourcename = "\jobname"}
+\immediate\write\LWR at quickfile{%
homehtmlfilename = "\HomeHTMLFilename"%
}
-\immediate\write\LWR at file{htmlfilename = "\HTMLFilename"}
-\immediate\write\LWR at file{latexmk = "\ifbool{LWR at latexmk}{true}{false}"}
-\immediate\write\LWR at file{language = "\LWR at IndexLanguage"}
-\immediate\write\LWR at file{xdyfile = "\LWR at xdyFilename"}
-\immediate\closeout\LWR at file
+\immediate\write\LWR at quickfile{htmlfilename = "\HTMLFilename"}
+\immediate\write\LWR at quickfile{latexmk = "\ifbool{LWR at latexmk}{true}{false}"}
+\immediate\write\LWR at quickfile{language = "\LWR at IndexLanguage"}
+\immediate\write\LWR at quickfile{xdyfile = "\LWR at xdyFilename"}
+\immediate\closeout\LWR at quickfile
\end{warpprint}
% \end{macrocode}
@@ -6416,31 +6780,31 @@
%
% \begin{macrocode}
\begin{warpprint}
-\ifcsdef{LWR at file}{}{\newwrite{\LWR at file}}
-\immediate\openout\LWR at file=\jobname.lwarpmkconf
+\ifcsdef{LWR at quickfile}{}{\newwrite{\LWR at quickfile}}
+\immediate\openout\LWR at quickfile=\jobname.lwarpmkconf
\ifbool{usingOSWindows}{
-\immediate\write\LWR at file{opsystem = "Windows"}
+\immediate\write\LWR at quickfile{opsystem = "Windows"}
}{
-\immediate\write\LWR at file{opsystem = "Unix"}
+\immediate\write\LWR at quickfile{opsystem = "Unix"}
}
\ifPDFTeX
-\immediate\write\LWR at file{latexname = "pdflatex"}
+\immediate\write\LWR at quickfile{latexname = "pdflatex"}
\fi
\ifXeTeX
-\immediate\write\LWR at file{latexname = "xelatex"}
+\immediate\write\LWR at quickfile{latexname = "xelatex"}
\fi
\ifLuaTeX
-\immediate\write\LWR at file{latexname = "lualatex"}
+\immediate\write\LWR at quickfile{latexname = "lualatex"}
\fi
-\immediate\write\LWR at file{sourcename = "\jobname"}
-\immediate\write\LWR at file{%
+\immediate\write\LWR at quickfile{sourcename = "\jobname"}
+\immediate\write\LWR at quickfile{%
homehtmlfilename = "\HomeHTMLFilename"%
}
-\immediate\write\LWR at file{htmlfilename = "\HTMLFilename"}
-\immediate\write\LWR at file{latexmk = "\ifbool{LWR at latexmk}{true}{false}"}
-\immediate\write\LWR at file{language = "\LWR at IndexLanguage"}
-\immediate\write\LWR at file{xdyfile = "\LWR at xdyFilename"}
-\immediate\closeout\LWR at file
+\immediate\write\LWR at quickfile{htmlfilename = "\HTMLFilename"}
+\immediate\write\LWR at quickfile{latexmk = "\ifbool{LWR at latexmk}{true}{false}"}
+\immediate\write\LWR at quickfile{language = "\LWR at IndexLanguage"}
+\immediate\write\LWR at quickfile{xdyfile = "\LWR at xdyFilename"}
+\immediate\closeout\LWR at quickfile
\end{warpprint}
% \end{macrocode}
@@ -6554,6 +6918,8 @@
Geneva, Verdana, sans-serif ;
}
+span.textcircled { border: 1px solid black ; border-radius: 1ex ; }
+
span.attribution {
margin-left: 1em ; font-size: 80% ; font-variant: small-caps;
}
@@ -8377,6 +8743,7 @@
% \changes{v0.30}{2017/04/28}{\protect\texttt{lwarpmk}: Add: \protect\texttt{xdyfile} configuration option.}
% \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.}
%
% \begin{macrocode}
\begin{filecontents*}{lwarpmk.lua}
@@ -8386,7 +8753,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.36"
+printversion = "v0.37"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -8407,7 +8774,7 @@
For use with latexmk or a Makefile:
Convert project_html.pdf to project_html.html and
individual HTML files.
-lwarpmk clean [project]: Remove project.aux, .toc, .lof/t, .idx, .ind, .log, .gl*
+lwarpmk clean [project]: Remove project.aux, .toc, .lof/t, .idx, .ind, .log, *_html_inc.*, .gl*
lwarpmk cleanall [project]: Remove auxiliary files and also project.pdf, *.html
lwarpmk -h: Print this help message.
lwarpmk --help: Print this help message.
@@ -8643,7 +9010,8 @@
sourcename ..".idx " .. sourcename .. "_html.idx " ..
sourcename ..".ind " .. sourcename .. "_html.ind " ..
sourcename ..".log " .. sourcename .. "_html.log " ..
- sourcename ..".gl* " .. sourcename .. "_html.gl* "
+ sourcename ..".gl* " .. sourcename .. "_html.gl* " ..
+ "*_html_inc.*"
)
end
@@ -8867,7 +9235,7 @@
print ("lwarpmk: Done.")
-- lwarpmk clean:
--- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, .gl*
+-- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, *_html_inc.*, .gl*
elseif arg[1] == "clean" then
loadconf ()
@@ -8875,7 +9243,7 @@
print ("lwarpmk: Done.")
-- lwarpmk cleanall
--- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, .gl*
+-- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, *_html_inc.*, .gl*
-- and also project.pdf, *.html
elseif arg[1] == "cleanall" then
@@ -9567,6 +9935,7 @@
% \changes{v0.34}{2017/08/03}{\pkg{babel-french}: Adds fixed-width HTML spaces to punctuation.}
% \changes{v0.36}{2017/08/15}{\pkg{babel-french}: Adjustements for French variants,
% load order, footnotes, ellipses.}
+% \changes{v0.37}{2017/08/19}{\pkg{babel-french}: Adjustment for load order.}
%
% Adjust \pkg{babel-french} for \HTML\ spaces.
% So far, this only works for |pdflatex| and |xelatex|.
@@ -9613,6 +9982,7 @@
\LWR at origampersand{}nbsp;% ~
\endgroup%
}
+ \renewcommand*{~}{\HTMLentity{nbsp}}% was overwritten by babel-french
\ifFBunicode
\else
\DeclareTextSymbol{\FBtextellipsis}{LY1}{133}
@@ -11853,7 +12223,7 @@
%
% For the |lateximages| record file:
% \begin{macrocode}
-\immediate\openout\LWR at file=lateximages.txt
+\immediate\openout\LWR at lateximagesfile=lateximages.txt
% \end{macrocode}
%
% Removes space after the caption in the \HTML:
@@ -12063,7 +12433,7 @@
% \end{macrocode}
% For \env{lateximage} commands:
% \begin{macrocode}
-\immediate\closeout\LWR at file
+\immediate\closeout\LWR at lateximagesfile
}
% \end{macrocode}
% \end{macro}
@@ -17057,10 +17427,6 @@
\let\sb\LWR at origsb%
\let\textsuperscript\LWR at origtextsuperscript%
\let\textsubscript\LWR at origtextsubscript%
-\let\textdegree\LWR at origtextdegree%
-\let\textcelsius\LWR at origtextcelsius%
-\let\textohm\LWR at origtextohm%
-\let\textmu\LWR at origtextmu%
\let~\LWR at origtilde%
\let\enskip\LWR at origenskip%
\let\quad\LWR at origquad%
@@ -17090,6 +17456,10 @@
\LetLtxMacro{\parbox}{\LWR at origparbox}%
\LWR at restoreorigxcolor%
\LWR at restoremoreorigxcolor%
+%
+\LWR at restoreorigtextcomp%
+\LWR at restoreorigaccents%
+%
\LWR at FBcancel%
}
% \end{macrocode}
@@ -17763,11 +18133,6 @@
\setcounter{LWR at lateximagedepth}{0}
% \end{macrocode}
-% Declare the |\LWR at file| for writing
-% to generate file |lateximages.txt|:
-% \begin{macrocode}
-\ifcsdef{LWR at file}{}{\newwrite{\LWR at file}}
-% \end{macrocode}
% A few utility macros to write special characters:
% \begin{macrocode}
\edef\LWR at hashmark{\string#} % for use in \write
@@ -17944,7 +18309,7 @@
% Write instructions to the |lateximages.txt| file:
% \begin{macrocode}
\LWR at traceinfo{lateximage: about to write to lateximages.txt}%
- \immediate\write\LWR at file{|\theLWR at LIpage|\theLWR at externalfilecnt|}%
+ \immediate\write\LWR at lateximagesfile{|\theLWR at LIpage|\theLWR at externalfilecnt|}%
% \end{macrocode}
% Place an open comment tag at the bottom of page; footnotes will be above this tag.
% This will hide any traces of the lateximage \PDF\ page which were picked up by
@@ -19919,8 +20284,6 @@
\LetLtxMacro{\em}{\LWR at nullem}%
\LetLtxMacro{\normalfont}{\LWR at nullnormalfont}%
\renewcommand*{\HTMLunicode}[1]{}%
-% \renewcommand*{\HTMLunicode}[1]{}
-% \renewcommand*{\HTMLentity}[1]{##1}
\renewcommand*{\HTMLentity}[1]{}%
% \end{macrocode}
% Ampersand becomes ``and'', which is a short word and is then removed from the filename.
@@ -21385,10 +21748,38 @@
%
%
%
-%
% \clearpage
%
+%
% \iffalse
+%<*color>
+% \fi
+%
+% \part{lwarp-color.sty}
+%
+% \section{Color}
+%
+% \DescribePackage{color}
+% \pkg{color} is superceded by \pkg{xcolor}, and
+% \pkg{lwarp} requires several of the features of \pkg{xcolor}.
+%
+% \changes{v0.37}{2017/08/18}{\pkg{color}: Prevented.}
+%
+% \codehtml
+% \begin{macrocode}
+\LWR at loadnever{color}{xcolor}
+% \end{macrocode}
+%
+% \iffalse
+%</color>
+% \fi
+%
+%
+%
+%
+%
+%
+% \iffalse
%<*crop>
% \fi
%
@@ -22121,6 +22512,7 @@
\renewcommand*{\LUseVerbatim}[1]{%
\LWR at atbeginverbatim{LVerbatim}%\unskip\LWR at origvspace*{-\baselineskip}%%
+\noindent%
\LWRFB at LUseVerbatim{#1}%
\LWR at afterendverbatim%
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty 2017-08-20 22:12:36 UTC (rev 45081)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty 2017-08-20 22:12:58 UTC (rev 45082)
@@ -82,6 +82,7 @@
\renewcommand*{\LUseVerbatim}[1]{%
\LWR at atbeginverbatim{LVerbatim}%\unskip\LWR at origvspace*{-\baselineskip}%%
+\noindent%
\LWRFB at LUseVerbatim{#1}%
\LWR at afterendverbatim%
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2017-08-20 22:12:36 UTC (rev 45081)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2017-08-20 22:12:58 UTC (rev 45082)
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2017/08/17 v0.36 Allows LaTeX to directly produce HTML5 output.]
+ [2017/08/19 v0.37 Allows LaTeX to directly produce HTML5 output.]
@@ -48,9 +48,6 @@
\RequirePackage{etoolbox}[2011/01/03]
\RequirePackage{ifplatform}% sense op-system platform
-\RequirePackage{comment}
-\excludecomment{testing}
-
\RequirePackage{letltxmacro}
\newbool{usingOSWindows}
@@ -76,23 +73,17 @@
\newbool{warpingprint}
\newbool{warpingHTML}
\newbool{mathjax}
-\newcommand{\warpprintonly}[1]{\ifbool{warpingprint}{#1}{}}
-\newcommand{\warpHTMLonly}[1]{\ifbool{warpingHTML}{#1}{}}
-
-\includecomment{warpall}
-
+\booltrue{warpingprint}%
+\boolfalse{warpingHTML}%
+\boolfalse{mathjax}%
\DeclareVoidOption{warpprint}{%
\PackageInfo{lwarp}{Using option 'warpprint'}
-\includecomment{warpprint}%
-\excludecomment{warpHTML}%
\booltrue{warpingprint}%
\boolfalse{warpingHTML}%
}
\DeclareVoidOption{warpHTML}{%
-\PackageInfo{lwarp}{Using option 'warpHTML'}
-\excludecomment{warpprint}%
-\includecomment{warpHTML}%
+\PackageInfo{lwarp}{Using option 'warpHTML'}%
\booltrue{warpingHTML}%
\boolfalse{warpingprint}%
}
@@ -112,9 +103,12 @@
\DeclareStringOption[lwarp.xdy]{xdyFilename}
+\newbool{LWR at creatinglwarpmk}
+\boolfalse{LWR at creatinglwarpmk}
+
\DeclareVoidOption{lwarpmk}{
\PackageInfo{lwarp}{Using option 'lwarpmk'}
-\includecomment{LWR at createlwarpmk}
+\booltrue{LWR at creatinglwarpmk}
}
\DeclareVoidOption{OSWindows}{
@@ -128,14 +122,6 @@
\DeclareBoolOption[false]{latexmk}
-\includecomment{warpprint}%
-\excludecomment{warpHTML}%
-\booltrue{warpingprint}%
-\boolfalse{warpingHTML}%
-\boolfalse{mathjax}%
-
-\excludecomment{LWR at createlwarpmk}
-
\ProcessKeyvalOptions*\relax
\providecommand*{\BaseJobname}{\LWR at BaseJobname}
@@ -147,9 +133,38 @@
}
\csedef{HTMLFilename}{\LWR at HTMLFilename}
+\newcommand{\warpprintonly}[1]{\ifbool{warpingprint}{#1}{}}
+\newcommand{\warpHTMLonly}[1]{\ifbool{warpingHTML}{#1}{}}
+\RequirePackage{comment}
+\ifbool{warpingHTML}{
+\def\DefaultCutFileName{\def\CommentCutFile{comment_html.cut}}
+}{}
+\ifbool{warpingprint}{
+\def\DefaultCutFileName{\def\CommentCutFile{comment_print.cut}}
+}{}
+\excludecomment{testing}
+
+\includecomment{warpall}
+
+\ifbool{warpingHTML}{%
+\includecomment{warpHTML}
+}
+{\excludecomment{warpHTML}}%
+
+\ifbool{warpingprint}
+{\includecomment{warpprint}}
+{\excludecomment{warpprint}}
+
+
+\ifbool{LWR at creatinglwarpmk}
+{\includecomment{LWR at createlwarpmk}}
+{\excludecomment{LWR at createlwarpmk}}
+
+
+
\newcommand*{\LWR at loadafter}[1]{%
\@ifpackageloaded{#1}
{
@@ -488,20 +503,74 @@
\end{warpHTML}
+
+
+\begin{warpall}
+
+\newwrite\LWR at quickfile%
+
+\end{warpall}
+
\begin{warpHTML}
+\newwrite\LWR at lateximagesfile
+
+\end{warpHTML}
+
+\begin{warpHTML}
+
+\def\@include#1 {%
+\immediate\openout\LWR at quickfile #1_html_inc.tex% new
+\immediate\write\LWR at quickfile{\string\input{#1.tex}}% new
+\immediate\closeout\LWR at quickfile% new
+\LWR at origclearpage% \changed
+\if at filesw
+ \immediate\write\@mainaux{\string\@input{#1_html_inc.aux}}% changed
+\fi
+\@tempswatrue
+\if at partsw
+ \@tempswafalse
+ \edef\reserved at b{#1}%
+ \@for\reserved at a:=\@partlist\do
+ {\ifx\reserved at a\reserved at b\@tempswatrue\fi}%
+\fi
+\if at tempswa
+ \let\@auxout\@partaux
+ \if at filesw
+ \immediate\openout\@partaux #1_html_inc.aux % changed
+ \immediate\write\@partaux{\relax}%
+ \fi
+ \@input@{#1_html_inc.tex}% changed
+ \LWR at origclearpage% changed
+ \@writeckpt{#1}%
+ \if at filesw
+ \immediate\closeout\@partaux
+ \fi
+\else
+ \deadcycles\z@
+ \@nameuse{cp@#1}%
+\fi
+\let\@auxout\@mainaux%
+}
+
+\end{warpHTML}
+
+
+\begin{warpHTML}
+
+\newwrite\LWR at copyoutfile % open the file to write to
+\newread\LWR at copyinfile % open the file to read from
+
\newcommand*{\LWR at copyfile}[2]{%
-\newwrite\copyfile % open the file to write to
-\immediate\openout\copyfile=#2
-\newread\file % open the file to read from
-\openin\file=#1
+\immediate\openout\LWR at copyoutfile=#2
+\openin\LWR at copyinfile=#1
\begingroup\endlinechar=-1
\makeatletter
-\loop\unless\ifeof\file
- \read\file to\fileline % Read one line and store it into \fileline
- \immediate\write\copyfile{\unexpanded\expandafter{\fileline}}%
+\loop\unless\ifeof\LWR at copyinfile
+ \read\LWR at copyinfile to\LWR at fileline % Read one line and store it into \LWR at fileline
+ \immediate\write\LWR at copyoutfile{\unexpanded\expandafter{\LWR at fileline}}%
\repeat
-\closeout\copyfile
+\closeout\LWR at copyoutfile
\endgroup
}
@@ -610,23 +679,29 @@
\end{warpHTML}
-
-
-
\begin{warpHTML}
-
\AtBeginDocument{% in case textcomp was not loaded
-\providecommand*{\textdegree}{DEG}
-\providecommand*{\textcelsius}{DEGC}
-\providecommand*{\textohm}{OHM}
-\providecommand*{\textmu}{MU}
-
+\@ifpackageloaded{textcomp}
+{
\let\LWR at origtextdegree\textdegree
\let\LWR at origtextcelsius\textcelsius
\let\LWR at origtextohm\textohm
\let\LWR at origtextmu\textmu
-
+\LetLtxMacro\LWR at origcapitalcedilla\capitalcedilla
+\LetLtxMacro\LWR at origcapitalogonek\capitalogonek
+\LetLtxMacro\LWR at origcapitalgrave\capitalgrave
+\LetLtxMacro\LWR at origcapitalacute\capitalacute
+\LetLtxMacro\LWR at origcapitalcircumflex\capitalcircumflex
+\LetLtxMacro\LWR at origcapitaltilde\capitaltilde
+\LetLtxMacro\LWR at origcapitaldieresis\capitaldieresis
+\LetLtxMacro\LWR at origcapitalhungarumlaut\capitalhungarumlaut
+\LetLtxMacro\LWR at origcapitalring\capitalring
+\LetLtxMacro\LWR at origcapitalcaron\capitalcaron
+\LetLtxMacro\LWR at origcapitalbreve\capitalbreve
+\LetLtxMacro\LWR at origcapitalmacron\capitalmacron
+\LetLtxMacro\LWR at origcapitaldotaccent\capitaldotaccent
+\LetLtxMacro\LWR at origtextcircled\textcircled
\ifPDFTeX
\renewcommand*{\textdegree}{\HTMLentity{deg}}
\renewcommand*{\textcelsius}{\HTMLentity{deg}\,C}
@@ -638,7 +713,97 @@
\renewcommand*{\textohm}{Ω}
\renewcommand*{\textmu}{μ}
\fi
+\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}}
+\renewcommand*{\textcircled}[1]{%
+\InlineClass[border: 1px solid \LWR at currenttextcolor]{textcircled}{#1}%
+}
+\newcommand*{\LWR at restoreorigtextcomp}{%
+\let\textdegree\LWR at origtextdegree%
+\let\textcelsius\LWR at origtextcelsius%
+\let\textohm\LWR at origtextohm%
+\let\textmu\LWR at origtextmu%
+\LetLtxMacro\capitalcedilla\LWR at origcapitalcedilla%
+\LetLtxMacro\capitalogonek\LWR at origcapitalogonek%
+\LetLtxMacro\capitalgrave\LWR at origcapitalgrave%
+\LetLtxMacro\capitalacute\LWR at origcapitalacute%
+\LetLtxMacro\capitalcircumflex\LWR at origcapitalcircumflex%
+\LetLtxMacro\capitaltilde\LWR at origcapitaltilde%
+\LetLtxMacro\capitaldieresis\LWR at origcapitaldieresis%
+\LetLtxMacro\capitalhungarumlaut\LWR at origcapitalhungarumlaut%
+\LetLtxMacro\capitalring\LWR at origcapitalring%
+\LetLtxMacro\capitalcaron\LWR at origcapitalcaron%
+\LetLtxMacro\capitalbreve\LWR at origcapitalbreve%
+\LetLtxMacro\capitalmacron\LWR at origcapitalmacron%
+\LetLtxMacro\capitaldotaccent\LWR at origcapitaldotaccent%
+\LetLtxMacro\textcircled\LWR at origtextcircled%
+}
+}% textcomp loaded
+{% textcomp not loaded
+\newcommand*{\LWR at restoreorigtextcomp}{}%
+}% textcomp not loaded
+}% AtBeginDocument
+
+\end{warpHTML}
+
+\begin{warpHTML}
+\AtBeginDocument{
+\LetLtxMacro{\LWR at origt}{\t}
+\ifPDFTeX
+\LetLtxMacro{\LWR at origequalaccent}{\=}
+\LetLtxMacro{\LWR at origdotaccent}{\.}
+\LetLtxMacro{\LWR at origu}{\u}
+\LetLtxMacro{\LWR at origv}{\v}
+\LetLtxMacro{\LWR at origc}{\c}
+\LetLtxMacro{\LWR at origd}{\d}
+\LetLtxMacro{\LWR at origb}{\b}
+\renewcommand*{\=}[1]{#1\HTMLunicode{0305}}
+\renewcommand*{\.}[1]{#1\HTMLunicode{0307}}
+\renewcommand*{\u}[1]{#1\HTMLunicode{0306}}
+\renewcommand*{\v}[1]{#1\HTMLunicode{030C}}
+\renewcommand*{\c}[1]{#1\HTMLunicode{0327}}
+\renewcommand*{\d}[1]{#1\HTMLunicode{0323}}
+\renewcommand*{\b}[1]{#1\HTMLunicode{0331}}
+\fi
+\def\LWR at t#1#2{#1\HTMLunicode{0361}#2}
+\renewcommand*{\t}[1]{\LWR at t#1}
+\ifPDFTeX
+\newcommand*{\LWR at restoreorigaccents}{%
+\LetLtxMacro{\=}{\LWR at origequalaccent}%
+\LetLtxMacro{\.}{\LWR at origdotaccent}%
+\LetLtxMacro{\u}{\LWR at origu}%
+\LetLtxMacro{\v}{\LWR at origu}%
+\LetLtxMacro{\t}{\LWR at origt}%
+\LetLtxMacro{\c}{\LWR at origc}%
+\LetLtxMacro{\d}{\LWR at origd}%
+\LetLtxMacro{\b}{\LWR at origb}%
+}
+\else% XeLaTeX, LuaLaTeX:
+\newcommand*{\LWR at restoreorigaccents}{%
+\LetLtxMacro{\t}{\LWR at origt}%
+}
+\fi
+}% AtBeginDocument
+\end{warpHTML}
+
+
+
+\begin{warpHTML}
+
+\AtBeginDocument{% in case textcomp was not loaded
+
\@ifpackageloaded{siunitx}
{
\DeclareSIUnit\bohr{\textit{a}\textsubscript{0}}
@@ -646,9 +811,8 @@
\DeclareSIUnit\elementarycharge{\textit{e}}
\DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}}
\DeclareSIUnit\hartree{\textit{E}\textsubscript{h}}
-\DeclareSIUnit\planckbar{\HTMLunicode{210F}}
}% siunitx loaded
-{}
+{}% siunitx not loaded
}% AtBeginDocument
@@ -661,72 +825,71 @@
\end{warpprint}
\begin{warpprint}
-\ifcsdef{LWR at file}{}{\newwrite{\LWR at file}}
-\immediate\openout\LWR at file=\jobname_html.tex
-\immediate\write\LWR at file{%
+\immediate\openout\LWR at quickfile=\jobname_html.tex
+\immediate\write\LWR at quickfile{%
\detokenize{\PassOptionsToPackage}%
{warpHTML,BaseJobname=\jobname}{lwarp}%
}
-\immediate\write\LWR at file{%
+\immediate\write\LWR at quickfile{%
\detokenize{\input}\string{\jobname.tex\string }%
}
-\immediate\closeout\LWR at file
+\immediate\closeout\LWR at quickfile
\end{warpprint}
\begin{warpprint}
-\ifcsdef{LWR at file}{}{\newwrite{\LWR at file}}
-\immediate\openout\LWR at file=lwarpmk.conf
+\ifcsdef{LWR at quickfile}{}{\newwrite{\LWR at quickfile}}
+\immediate\openout\LWR at quickfile=lwarpmk.conf
\ifbool{usingOSWindows}{
-\immediate\write\LWR at file{opsystem = "Windows"}
+\immediate\write\LWR at quickfile{opsystem = "Windows"}
}{
-\immediate\write\LWR at file{opsystem = "Unix"}
+\immediate\write\LWR at quickfile{opsystem = "Unix"}
}
\ifPDFTeX
-\immediate\write\LWR at file{latexname = "pdflatex"}
+\immediate\write\LWR at quickfile{latexname = "pdflatex"}
\fi
\ifXeTeX
-\immediate\write\LWR at file{latexname = "xelatex"}
+\immediate\write\LWR at quickfile{latexname = "xelatex"}
\fi
\ifLuaTeX
-\immediate\write\LWR at file{latexname = "lualatex"}
+\immediate\write\LWR at quickfile{latexname = "lualatex"}
\fi
-\immediate\write\LWR at file{sourcename = "\jobname"}
-\immediate\write\LWR at file{%
+\immediate\write\LWR at quickfile{sourcename = "\jobname"}
+\immediate\write\LWR at quickfile{%
homehtmlfilename = "\HomeHTMLFilename"%
}
-\immediate\write\LWR at file{htmlfilename = "\HTMLFilename"}
-\immediate\write\LWR at file{latexmk = "\ifbool{LWR at latexmk}{true}{false}"}
-\immediate\write\LWR at file{language = "\LWR at IndexLanguage"}
-\immediate\write\LWR at file{xdyfile = "\LWR at xdyFilename"}
-\immediate\closeout\LWR at file
+\immediate\write\LWR at quickfile{htmlfilename = "\HTMLFilename"}
+\immediate\write\LWR at quickfile{latexmk = "\ifbool{LWR at latexmk}{true}{false}"}
+\immediate\write\LWR at quickfile{language = "\LWR at IndexLanguage"}
+\immediate\write\LWR at quickfile{xdyfile = "\LWR at xdyFilename"}
+\immediate\closeout\LWR at quickfile
\end{warpprint}
\begin{warpprint}
-\ifcsdef{LWR at file}{}{\newwrite{\LWR at file}}
-\immediate\openout\LWR at file=\jobname.lwarpmkconf
+\ifcsdef{LWR at quickfile}{}{\newwrite{\LWR at quickfile}}
+\immediate\openout\LWR at quickfile=\jobname.lwarpmkconf
\ifbool{usingOSWindows}{
-\immediate\write\LWR at file{opsystem = "Windows"}
+\immediate\write\LWR at quickfile{opsystem = "Windows"}
}{
-\immediate\write\LWR at file{opsystem = "Unix"}
+\immediate\write\LWR at quickfile{opsystem = "Unix"}
}
\ifPDFTeX
-\immediate\write\LWR at file{latexname = "pdflatex"}
+\immediate\write\LWR at quickfile{latexname = "pdflatex"}
\fi
\ifXeTeX
-\immediate\write\LWR at file{latexname = "xelatex"}
+\immediate\write\LWR at quickfile{latexname = "xelatex"}
\fi
\ifLuaTeX
-\immediate\write\LWR at file{latexname = "lualatex"}
+\immediate\write\LWR at quickfile{latexname = "lualatex"}
\fi
-\immediate\write\LWR at file{sourcename = "\jobname"}
-\immediate\write\LWR at file{%
+\immediate\write\LWR at quickfile{sourcename = "\jobname"}
+\immediate\write\LWR at quickfile{%
homehtmlfilename = "\HomeHTMLFilename"%
}
-\immediate\write\LWR at file{htmlfilename = "\HTMLFilename"}
-\immediate\write\LWR at file{latexmk = "\ifbool{LWR at latexmk}{true}{false}"}
-\immediate\write\LWR at file{language = "\LWR at IndexLanguage"}
-\immediate\write\LWR at file{xdyfile = "\LWR at xdyFilename"}
-\immediate\closeout\LWR at file
+\immediate\write\LWR at quickfile{htmlfilename = "\HTMLFilename"}
+\immediate\write\LWR at quickfile{latexmk = "\ifbool{LWR at latexmk}{true}{false}"}
+\immediate\write\LWR at quickfile{language = "\LWR at IndexLanguage"}
+\immediate\write\LWR at quickfile{xdyfile = "\LWR at xdyFilename"}
+\immediate\closeout\LWR at quickfile
\end{warpprint}
@@ -819,6 +982,8 @@
Geneva, Verdana, sans-serif ;
}
+span.textcircled { border: 1px solid black ; border-radius: 1ex ; }
+
span.attribution {
margin-left: 1em ; font-size: 80% ; font-variant: small-caps;
}
@@ -2456,7 +2621,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.36"
+printversion = "v0.37"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -2477,7 +2642,7 @@
For use with latexmk or a Makefile:
Convert project_html.pdf to project_html.html and
individual HTML files.
-lwarpmk clean [project]: Remove project.aux, .toc, .lof/t, .idx, .ind, .log, .gl*
+lwarpmk clean [project]: Remove project.aux, .toc, .lof/t, .idx, .ind, .log, *_html_inc.*, .gl*
lwarpmk cleanall [project]: Remove auxiliary files and also project.pdf, *.html
lwarpmk -h: Print this help message.
lwarpmk --help: Print this help message.
@@ -2706,7 +2871,8 @@
sourcename ..".idx " .. sourcename .. "_html.idx " ..
sourcename ..".ind " .. sourcename .. "_html.ind " ..
sourcename ..".log " .. sourcename .. "_html.log " ..
- sourcename ..".gl* " .. sourcename .. "_html.gl* "
+ sourcename ..".gl* " .. sourcename .. "_html.gl* " ..
+ "*_html_inc.*"
)
end
@@ -2925,7 +3091,7 @@
print ("lwarpmk: Done.")
-- lwarpmk clean:
--- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, .gl*
+-- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, *_html_inc.*, .gl*
elseif arg[1] == "clean" then
loadconf ()
@@ -2933,7 +3099,7 @@
print ("lwarpmk: Done.")
-- lwarpmk cleanall
--- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, .gl*
+-- Remove project.aux, .toc, .lof, .lot, .idx, .ind, .log, *_html_inc.*, .gl*
-- and also project.pdf, *.html
elseif arg[1] == "cleanall" then
@@ -3291,6 +3457,7 @@
\LWR at origampersand{}nbsp;% ~
\endgroup%
}
+ \renewcommand*{~}{\HTMLentity{nbsp}}% was overwritten by babel-french
\ifFBunicode
\else
\DeclareTextSymbol{\FBtextellipsis}{LY1}{133}
@@ -4272,7 +4439,7 @@
\linespread{1.3}%
\setlength{\parindent}{0pt}
\setlength{\parskip}{2ex}
-\immediate\openout\LWR at file=lateximages.txt
+\immediate\openout\LWR at lateximagesfile=lateximages.txt
\setlength{\belowcaptionskip}{-3ex}
\renewcommand{\ps at plain}{}
\renewcommand*{\centering}{}
@@ -4358,7 +4525,7 @@
\LWR at htmltag{/body}\LWR at orignewline
\LWR at htmltag{/html}\LWR at orignewline
\LWR at orignewpage
-\immediate\closeout\LWR at file
+\immediate\closeout\LWR at lateximagesfile
}
\end{warpHTML}
@@ -6364,10 +6531,6 @@
\let\sb\LWR at origsb%
\let\textsuperscript\LWR at origtextsuperscript%
\let\textsubscript\LWR at origtextsubscript%
-\let\textdegree\LWR at origtextdegree%
-\let\textcelsius\LWR at origtextcelsius%
-\let\textohm\LWR at origtextohm%
-\let\textmu\LWR at origtextmu%
\let~\LWR at origtilde%
\let\enskip\LWR at origenskip%
\let\quad\LWR at origquad%
@@ -6397,6 +6560,8 @@
\LetLtxMacro{\parbox}{\LWR at origparbox}%
\LWR at restoreorigxcolor%
\LWR at restoremoreorigxcolor%
+\LWR at restoreorigtextcomp%
+\LWR at restoreorigaccents%
\LWR at FBcancel%
}
@@ -6736,7 +6901,6 @@
\newcounter{LWR at lateximagedepth}
\setcounter{LWR at lateximagedepth}{0}
-\ifcsdef{LWR at file}{}{\newwrite{\LWR at file}}
\edef\LWR at hashmark{\string#} % for use in \write
\edef\LWR at percent{\@percentchar} % for use in \write
\newcounter{LWR at LIpage}
@@ -6812,7 +6976,7 @@
\LWR at htmltag{span id="lateximage\arabic{LWR at lateximagenumber}" %
class="lateximagesource"{}} \LWR at orignewline
\LWR at traceinfo{lateximage: about to write to lateximages.txt}%
- \immediate\write\LWR at file{|\theLWR at LIpage|\theLWR at externalfilecnt|}%
+ \immediate\write\LWR at lateximagesfile{|\theLWR at LIpage|\theLWR at externalfilecnt|}%
\LWR at traceinfo{lateximage: about to create open comment}%
\LWR at htmlopencomment%
\addtocounter{LWR at lateximagedepth}{1}%
More information about the tex-live-commits
mailing list