lwarp (20aug17)

git-svn-id: svn://tug.org/texlive/trunk@45082 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 253 insertions, 89 deletions

diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 83c2d6e275a..ce165a885a4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
@@ -17,7 +17,7 @@
 %% version 2005/12/01 or later.
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{lwarp}
-    [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@creatinglwarpmk}
+\boolfalse{LWR@creatinglwarpmk}
+
 \DeclareVoidOption{lwarpmk}{
 \PackageInfo{lwarp}{Using option 'lwarpmk'}
-\includecomment{LWR@createlwarpmk}
+\booltrue{LWR@creatinglwarpmk}
 }
 
 \DeclareVoidOption{OSWindows}{
@@ -128,14 +122,6 @@
 
 \DeclareBoolOption[false]{latexmk}
 
-\includecomment{warpprint}%
-\excludecomment{warpHTML}%
-\booltrue{warpingprint}%
-\boolfalse{warpingHTML}%
-\boolfalse{mathjax}%
-
-\excludecomment{LWR@createlwarpmk}
-
 \ProcessKeyvalOptions*\relax
 
 \providecommand*{\BaseJobname}{\LWR@BaseJobname}
@@ -147,6 +133,35 @@
 }
 
 \csedef{HTMLFilename}{\LWR@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@creatinglwarpmk}
+{\includecomment{LWR@createlwarpmk}}
+{\excludecomment{LWR@createlwarpmk}}
 
 
 
@@ -488,20 +503,74 @@ top=1in,bottom=1in,%
 \end{warpHTML}
 
 
+
+
+\begin{warpall}
+
+\newwrite\LWR@quickfile%
+
+\end{warpall}
+
+\begin{warpHTML}
+
+\newwrite\LWR@lateximagesfile
+
+\end{warpHTML}
+
+\begin{warpHTML}
+
+\def\@include#1 {%
+\immediate\openout\LWR@quickfile #1_html_inc.tex% new
+\immediate\write\LWR@quickfile{\string\input{#1.tex}}% new
+\immediate\closeout\LWR@quickfile% new
+\LWR@origclearpage% \changed
+\if@filesw
+    \immediate\write\@mainaux{\string\@input{#1_html_inc.aux}}% changed
+\fi
+\@tempswatrue
+\if@partsw
+    \@tempswafalse
+    \edef\reserved@b{#1}%
+    \@for\reserved@a:=\@partlist\do
+    {\ifx\reserved@a\reserved@b\@tempswatrue\fi}%
+\fi
+\if@tempswa
+    \let\@auxout\@partaux
+    \if@filesw
+        \immediate\openout\@partaux #1_html_inc.aux % changed
+        \immediate\write\@partaux{\relax}%
+    \fi
+    \@input@{#1_html_inc.tex}% changed
+    \LWR@origclearpage% changed
+    \@writeckpt{#1}%
+    \if@filesw
+        \immediate\closeout\@partaux
+    \fi
+\else
+    \deadcycles\z@
+    \@nameuse{cp@#1}%
+\fi
+\let\@auxout\@mainaux%
+}
+
+\end{warpHTML}
+
+
 \begin{warpHTML}
 
+\newwrite\LWR@copyoutfile  % open the file to write to
+\newread\LWR@copyinfile      % open the file to read from
+
 \newcommand*{\LWR@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@copyoutfile=#2
+\openin\LWR@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@copyinfile
+  \read\LWR@copyinfile to\LWR@fileline  % Read one line and store it into \LWR@fileline
+  \immediate\write\LWR@copyoutfile{\unexpanded\expandafter{\LWR@fileline}}%
 \repeat
-\closeout\copyfile
+\closeout\LWR@copyoutfile
 \endgroup
 }
 
@@ -610,23 +679,29 @@ top=1in,bottom=1in,%
 
 \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@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
 \ifPDFTeX
 \renewcommand*{\textdegree}{\HTMLentity{deg}}
 \renewcommand*{\textcelsius}{\HTMLentity{deg}\,C}
@@ -638,6 +713,96 @@ top=1in,bottom=1in,%
 \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@currenttextcolor]{textcircled}{#1}%
+}
+\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%
+}
+}% textcomp loaded
+{% textcomp not loaded
+\newcommand*{\LWR@restoreorigtextcomp}{}%
+}% textcomp not loaded
+
+}% AtBeginDocument
+
+\end{warpHTML}
+
+\begin{warpHTML}
+\AtBeginDocument{
+\LetLtxMacro{\LWR@origt}{\t}
+\ifPDFTeX
+\LetLtxMacro{\LWR@origequalaccent}{\=}
+\LetLtxMacro{\LWR@origdotaccent}{\.}
+\LetLtxMacro{\LWR@origu}{\u}
+\LetLtxMacro{\LWR@origv}{\v}
+\LetLtxMacro{\LWR@origc}{\c}
+\LetLtxMacro{\LWR@origd}{\d}
+\LetLtxMacro{\LWR@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@t#1#2{#1\HTMLunicode{0361}#2}
+\renewcommand*{\t}[1]{\LWR@t#1}
+\ifPDFTeX
+\newcommand*{\LWR@restoreorigaccents}{%
+\LetLtxMacro{\=}{\LWR@origequalaccent}%
+\LetLtxMacro{\.}{\LWR@origdotaccent}%
+\LetLtxMacro{\u}{\LWR@origu}%
+\LetLtxMacro{\v}{\LWR@origu}%
+\LetLtxMacro{\t}{\LWR@origt}%
+\LetLtxMacro{\c}{\LWR@origc}%
+\LetLtxMacro{\d}{\LWR@origd}%
+\LetLtxMacro{\b}{\LWR@origb}%
+}
+\else% XeLaTeX, LuaLaTeX:
+\newcommand*{\LWR@restoreorigaccents}{%
+\LetLtxMacro{\t}{\LWR@origt}%
+}
+\fi
+}% AtBeginDocument
+\end{warpHTML}
+
+
+
+\begin{warpHTML}
+
+\AtBeginDocument{% in case textcomp was not loaded
 
 \@ifpackageloaded{siunitx}
 {
@@ -646,9 +811,8 @@ top=1in,bottom=1in,%
 \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 @@ top=1in,bottom=1in,%
 \end{warpprint}
 
 \begin{warpprint}
-\ifcsdef{LWR@file}{}{\newwrite{\LWR@file}}
-\immediate\openout\LWR@file=\jobname_html.tex
-\immediate\write\LWR@file{%
+\immediate\openout\LWR@quickfile=\jobname_html.tex
+\immediate\write\LWR@quickfile{%
 \detokenize{\PassOptionsToPackage}%
 {warpHTML,BaseJobname=\jobname}{lwarp}%
 }
-\immediate\write\LWR@file{%
+\immediate\write\LWR@quickfile{%
 \detokenize{\input}\string{\jobname.tex\string }%
 }
-\immediate\closeout\LWR@file
+\immediate\closeout\LWR@quickfile
 \end{warpprint}
 
 \begin{warpprint}
-\ifcsdef{LWR@file}{}{\newwrite{\LWR@file}}
-\immediate\openout\LWR@file=lwarpmk.conf
+\ifcsdef{LWR@quickfile}{}{\newwrite{\LWR@quickfile}}
+\immediate\openout\LWR@quickfile=lwarpmk.conf
 \ifbool{usingOSWindows}{
-\immediate\write\LWR@file{opsystem = "Windows"}
+\immediate\write\LWR@quickfile{opsystem = "Windows"}
 }{
-\immediate\write\LWR@file{opsystem = "Unix"}
+\immediate\write\LWR@quickfile{opsystem = "Unix"}
 }
 \ifPDFTeX
-\immediate\write\LWR@file{latexname = "pdflatex"}
+\immediate\write\LWR@quickfile{latexname = "pdflatex"}
 \fi
 \ifXeTeX
-\immediate\write\LWR@file{latexname = "xelatex"}
+\immediate\write\LWR@quickfile{latexname = "xelatex"}
 \fi
 \ifLuaTeX
-\immediate\write\LWR@file{latexname = "lualatex"}
+\immediate\write\LWR@quickfile{latexname = "lualatex"}
 \fi
-\immediate\write\LWR@file{sourcename = "\jobname"}
-\immediate\write\LWR@file{%
+\immediate\write\LWR@quickfile{sourcename = "\jobname"}
+\immediate\write\LWR@quickfile{%
 homehtmlfilename = "\HomeHTMLFilename"%
 }
-\immediate\write\LWR@file{htmlfilename = "\HTMLFilename"}
-\immediate\write\LWR@file{latexmk = "\ifbool{LWR@latexmk}{true}{false}"}
-\immediate\write\LWR@file{language = "\LWR@IndexLanguage"}
-\immediate\write\LWR@file{xdyfile = "\LWR@xdyFilename"}
-\immediate\closeout\LWR@file
+\immediate\write\LWR@quickfile{htmlfilename = "\HTMLFilename"}
+\immediate\write\LWR@quickfile{latexmk = "\ifbool{LWR@latexmk}{true}{false}"}
+\immediate\write\LWR@quickfile{language = "\LWR@IndexLanguage"}
+\immediate\write\LWR@quickfile{xdyfile = "\LWR@xdyFilename"}
+\immediate\closeout\LWR@quickfile
 \end{warpprint}
 
 \begin{warpprint}
-\ifcsdef{LWR@file}{}{\newwrite{\LWR@file}}
-\immediate\openout\LWR@file=\jobname.lwarpmkconf
+\ifcsdef{LWR@quickfile}{}{\newwrite{\LWR@quickfile}}
+\immediate\openout\LWR@quickfile=\jobname.lwarpmkconf
 \ifbool{usingOSWindows}{
-\immediate\write\LWR@file{opsystem = "Windows"}
+\immediate\write\LWR@quickfile{opsystem = "Windows"}
 }{
-\immediate\write\LWR@file{opsystem = "Unix"}
+\immediate\write\LWR@quickfile{opsystem = "Unix"}
 }
 \ifPDFTeX
-\immediate\write\LWR@file{latexname = "pdflatex"}
+\immediate\write\LWR@quickfile{latexname = "pdflatex"}
 \fi
 \ifXeTeX
-\immediate\write\LWR@file{latexname = "xelatex"}
+\immediate\write\LWR@quickfile{latexname = "xelatex"}
 \fi
 \ifLuaTeX
-\immediate\write\LWR@file{latexname = "lualatex"}
+\immediate\write\LWR@quickfile{latexname = "lualatex"}
 \fi
-\immediate\write\LWR@file{sourcename = "\jobname"}
-\immediate\write\LWR@file{%
+\immediate\write\LWR@quickfile{sourcename = "\jobname"}
+\immediate\write\LWR@quickfile{%
 homehtmlfilename = "\HomeHTMLFilename"%
 }
-\immediate\write\LWR@file{htmlfilename = "\HTMLFilename"}
-\immediate\write\LWR@file{latexmk = "\ifbool{LWR@latexmk}{true}{false}"}
-\immediate\write\LWR@file{language = "\LWR@IndexLanguage"}
-\immediate\write\LWR@file{xdyfile = "\LWR@xdyFilename"}
-\immediate\closeout\LWR@file
+\immediate\write\LWR@quickfile{htmlfilename = "\HTMLFilename"}
+\immediate\write\LWR@quickfile{latexmk = "\ifbool{LWR@latexmk}{true}{false}"}
+\immediate\write\LWR@quickfile{language = "\LWR@IndexLanguage"}
+\immediate\write\LWR@quickfile{xdyfile = "\LWR@xdyFilename"}
+\immediate\closeout\LWR@quickfile
 \end{warpprint}
 
 
@@ -819,6 +982,8 @@ span.textsf {
         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 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-
 
 -- 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 @@ lwarpmk pdftohtml [project]:
     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 @@ function removeaux ()
         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: " .. sourcename ..".tex is ready to be recompiled.")
 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 @@ removeaux ()
 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 @@ end -- not --version
         \LWR@origampersand{}nbsp;% ~
         \endgroup%
     }
+    \renewcommand*{~}{\HTMLentity{nbsp}}% was overwritten by babel-french
     \ifFBunicode
     \else
         \DeclareTextSymbol{\FBtextellipsis}{LY1}{133}
@@ -4272,7 +4439,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \linespread{1.3}%
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{2ex}
-\immediate\openout\LWR@file=lateximages.txt
+\immediate\openout\LWR@lateximagesfile=lateximages.txt
 \setlength{\belowcaptionskip}{-3ex}
 \renewcommand{\ps@plain}{}
 \renewcommand*{\centering}{}
@@ -4358,7 +4525,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \LWR@htmltag{/body}\LWR@orignewline
 \LWR@htmltag{/html}\LWR@orignewline
 \LWR@orignewpage
-\immediate\closeout\LWR@file
+\immediate\closeout\LWR@lateximagesfile
 }
 
 \end{warpHTML}
@@ -6364,10 +6531,6 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \let\sb\LWR@origsb%
 \let\textsuperscript\LWR@origtextsuperscript%
 \let\textsubscript\LWR@origtextsubscript%
-\let\textdegree\LWR@origtextdegree%
-\let\textcelsius\LWR@origtextcelsius%
-\let\textohm\LWR@origtextohm%
-\let\textmu\LWR@origtextmu%
 \let~\LWR@origtilde%
 \let\enskip\LWR@origenskip%
 \let\quad\LWR@origquad%
@@ -6397,6 +6560,8 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \LetLtxMacro{\parbox}{\LWR@origparbox}%
 \LWR@restoreorigxcolor%
 \LWR@restoremoreorigxcolor%
+\LWR@restoreorigtextcomp%
+\LWR@restoreorigaccents%
 \LWR@FBcancel%
 }
 
@@ -6736,7 +6901,6 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \newcounter{LWR@lateximagedepth}
 \setcounter{LWR@lateximagedepth}{0}
 
-\ifcsdef{LWR@file}{}{\newwrite{\LWR@file}}
 \edef\LWR@hashmark{\string#} % for use in \write
 \edef\LWR@percent{\@percentchar} % for use in \write
 \newcounter{LWR@LIpage}
@@ -6812,7 +6976,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
     \LWR@htmltag{span id="lateximage\arabic{LWR@lateximagenumber}" %
     class="lateximagesource"{}} \LWR@orignewline
     \LWR@traceinfo{lateximage: about to write to lateximages.txt}%
-    \immediate\write\LWR@file{|\theLWR@LIpage|\theLWR@externalfilecnt|}%
+    \immediate\write\LWR@lateximagesfile{|\theLWR@LIpage|\theLWR@externalfilecnt|}%
     \LWR@traceinfo{lateximage: about to create open comment}%
     \LWR@htmlopencomment%
     \addtocounter{LWR@lateximagedepth}{1}%