texlive[43705] trunk: lwarp (6Apr)
commits+preining at tug.org
commits+preining at tug.org
Thu Apr 6 02:32:27 CEST 2017
Revision: 43705
http://tug.org/svn/texlive?view=revision&revision=43705
Author: preining
Date: 2017-04-06 02:32:26 +0200 (Thu, 06 Apr 2017)
Log Message:
-----------
lwarp (6Apr)
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/source/latex/lwarp/lwarp.ins
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2017-04-06 00:29:09 UTC (rev 43704)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2017-04-06 00:32:26 UTC (rev 43705)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.26"
+printversion = "v0.27"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2017-04-06 00:29:09 UTC (rev 43704)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2017-04-06 00:32:26 UTC (rev 43705)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.26 README.txt
+LaTeX lwarp package v0.27 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-04-06 00:29:09 UTC (rev 43704)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2017-04-06 00:32:26 UTC (rev 43705)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.26"
+printversion = "v0.27"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2017-04-06 00:29:09 UTC (rev 43704)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2017-04-06 00:32:26 UTC (rev 43705)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2017/03/31 v0.26 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2017/04/04 v0.27 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -581,6 +581,15 @@
\end{itemize}
}
+\newcommand{\limitssaveboxes}{%
+\LaTeX\ boxes are placed inline and do not allow line breaks, so boxes
+with long contents may overflow the line during \acro{HTML} conversion.
+This is mostly a problem when the boxes contain objects which themselves
+hold large \acro{HTML} tags, such as rotation commands with long contents.
+When this object overflows the line, some \acro{HTML} code will be lost and
+the page will be corrupted.
+}
+
\newcommand{\limitsminipage}{%
Minipages and parboxes will be placed side-by-side in \acro{HTML}
unless you place a \cs{newline} between them.
@@ -822,7 +831,7 @@
%<*package>
% \fi
%
-% \CheckSum{0}
+% \CheckSum{10774}
%
% \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
@@ -887,6 +896,7 @@
% \changes{v0.25}{2017/03/22}{\ 2016/03/22}
% \changes{v0.25}{2017/03/16}{Docs: Adds credits for patched code.}
% \changes{v0.26}{2017/03/31}{\ 2017/03/31}
+% \changes{v0.27}{2017/04/04}{\ 2017/04/04}
@@ -1020,6 +1030,13 @@
% For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}.
%
% \begin{description}
+% \item[v0.27:] \
+% \begin{itemize}
+% \item Improved documentation for MacOS install.
+% \item Fix for \pkg{microtype} with \XeLaTeX\ and \LuaLaTeX.
+% \item Fix for table footnote paragraph tags.
+% \item Adds \pkg{lettrine}, \pkg{ulem}, and \pkg{soul}.
+% \end{itemize}
% \item[v0.26:] \
% \begin{itemize}
% \item Improved installation instructions for MiK\TeX\ regarding generating
@@ -1243,9 +1260,9 @@
% \protect\pkg{lwarp} package ---
% Supported functions\label{tab:supported}} \endfirsthead
% \warpprintonly{\multicolumn{2}{c}{\pkg{lwarp} Supported Functions --- continued} \\
-% Package or Macro & Status \\ \toprule \endhead}
+% Category & Status \\ \toprule \endhead}
% \toprule
-% Package or Macro & Status \\
+% Category & Status \\
% \midrule
% Engines: & pdf\LaTeX, \XeLaTeX, \LuaLaTeX \\
% \midrule
@@ -1257,7 +1274,7 @@
% Files may be numbered sequentially or named according to section name.
% Common short words and punctuation is removed from the filenames. \\
% Table of Contents, Figures, Tables: & Supported, with hyperlinks. \\
-% \cs{maketitle}, \env{titlepage}, \pkg{titling}: & Supported, with optional
+% Title page: & \cs{maketitle}, \env{titlepage}, \pkg{titling}. Optional
% \pkg{titling}-based commands for published and subtitle. \\
% \env{abstract}: & Supported \\
% \midrule
@@ -1267,8 +1284,8 @@
% \cs{nameref}, \cs{ref},
% the \pkg{cleveref} commands, and index entries.\\
% \midrule
-% Footnotes, pkg{footnote}, \pkg{footmisc}, \pkg{pagenote}, \pkg{endnotes}: &
-% Supported. \\
+% Footnotes: & \pkg{footnote}, \pkg{footmisc},
+% \pkg{marginnote}, \pkg{sidenote}, \pkg{pagenote}, \pkg{endnotes}. \\
% Indexing: & \cmds{texindy} is used, with hyperlinks. \\
% Bibliography: & Supported, without hyperlinks so far. \\
% \midrule
@@ -1278,16 +1295,13 @@
% \AmS{} environments are supported.
% User-defined macros are available during converson,
% due to native \LaTeX{} processing.\\
-% \pkg{theorem}, \pkg{amsthm}, \pkg{ntheorem}: & Supported, with added \acro{CSS} tags. \\
+% Theorems: & Support for native \LaTeX\ theorems, plus
+% \pkg{theorem}, \pkg{amsthm}, \pkg{ntheorem}. \\
% \midrule
-% Floats: & Supported, appear where declared.
-% \pkg{float} is emulated, \pkg{newfloat} is supported,
-% \pkg{caption} and \pkg{subcaption} are supported,
-% \pkg{subfig} is supported,
-% \pkg{capt-of} is supported,
-% \pkg{placeins} is ignored,
-% \pkg{trivfloat} is supported, \pkg{floatrow} is emulated,
-% \pkg{keyfloat} is supported, \pkg{wrapfig} is emulated. \\
+% Floats: & Appear where declared.
+% \pkg{float}, \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
@@ -1333,7 +1347,8 @@
% \midrule
% Direct formatting: & \cs{emph}, \cs{textsuperscript},
% \cs{textbf}, etc are supported.
-% \cs{bfseries}, etc.\ are not yet supported. \\
+% \cs{bfseries}, etc.\ are not yet supported.
+% \pkg{lettrine}, \pkg{ulem}, and \pkg{soul} 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
@@ -1601,14 +1616,6 @@
%
% \item[Poppler PDF utilities:] \
%
-% These might be provided by your operating-system package manager.
-%
-% From Poppler: \url{poppler.freedesktop.org}.
-%
-% For Windows, also see: \\
-% \url{https://sourceforge.net/projects/poppler-win32/} \quad and: \\
-% \url{http://blog.alivate.com.au/poppler-windows/}
-%
% \begin{description}
%
% \item[pdftotext:] Used to convert \acro{PDF} to text.
@@ -1622,6 +1629,18 @@
%
% \end{description}
%
+% These might be provided by your operating-system package manager.
+%
+% From Poppler: \url{poppler.freedesktop.org}.
+%
+% For MacOS\textregistered, see
+% \url{https://brew.sh/}, install Homebrew, then enter \\
+% \hspace*{2em}|brew install poppler|
+%
+% For Windows, see: \\
+% \url{https://sourceforge.net/projects/poppler-win32/} \quad and: \\
+% \url{http://blog.alivate.com.au/poppler-windows/}
+%
% \item[Perl:] \
%
% This may be provided by your operating-system package manager, and is
@@ -1841,18 +1860,15 @@
%
% \subsection{Installing additional utilities}
%
-% The \TeX\ utilities |latexmk| and |pdfcrop| may be provided by
-% the installation of additional \TeX-relatex operating-system packages.
+% \changes{v0.27}{2017/04/02}{Docs: Installing utilities for MacOS.}
%
-% The tools from the \textsc{Poppler} project may also be provided by your
-% operating system's package-installation tools.
-% For Windows, see \cref{tab:utility} on \cpageref{tab:utility}.
+% \begin{description}
+% \item [To test for the existence of the additional utilities:] \
%
-% Perl may require installation as well. See \cref{tab:utility}.
+% Enter the following in a command line. If each programs' version is
+% displayed, then that utility is already installed.
+% See \cref{tab:utility} on page \pageref{tab:utility}.
%
-% \begin{description}
-% \item [To test for the existence of the additional utilities:]
-% Enter the following in a command line:
% \userentry{luatex --version}
% \userentry{xindy --version}
% \userentry{latexmk --version}
@@ -1861,16 +1877,39 @@
% \userentry{pdftotext -v}
% \userentry{pdfseparate --version}
% \userentry{pdftocairo -v}
-% \end{description}
%
-% Any utilities installed by hand must be added to the |PATH|.
+% \item [To install |xindy|, |latexmk|, and |pdfcrop|:] \
%
+% The \TeX\ utilities |xindy|, |latexmk|, and |pdfcrop| may be provided by
+% your operating system's package manager, and are also provided by
+% the CTAN archive: \\
+% \hspace*{2em}\url{http://ctan.org/pkg/xindy} \\
+% \hspace*{2em}\url{http://ctan.org/pkg/latexmk} \\
+% \hspace*{2em}\url{http://ctan.org/pkg/pdfcrop}
+%
+%
+% \item [To install the Poppler utilities to a Unix/Linux system:] \
% \DescribeProgram[requirement]{pdftotext}\index{Poppler}
% \DescribeProgram[requirement]{pdfseparate}
% \DescribeProgram[requirement]{pdftocairo}
-% \begin{description}
-% \item [To add the Poppler utilities to a Windows machine:] \
+%
+% The tools from the \textsc{Poppler} project should be provided by your
+% operating system's package manager.
+%
+%
+% \item [To install the Poppler utilities to a MacOS machine:] \
+% \begin{enumerate}
+% \item Install Homebrew from \url{https://brew.sh/}:
+% \userentry{~ \\ \hspace*{-2in}/usr/bin/ruby -e "\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"}
+% \item Install the Poppler utilities:
+% \userentry{brew install poppler}
+% \end{enumerate}
+%
+%
+% \item [To install the Poppler utilities to a Windows machine:] \
+%
% \begin{enumerate}
+% \item See \cref{tab:utility} on \cpageref{tab:utility}.
% \item Download and extract the Poppler utilities |pdftotext|, |pdfseparate|,
% and |pdftocairo| to a directory, such as |Poppler|.
% \item In the Start window, type "Path" to search for results
@@ -1885,11 +1924,9 @@
% Be sure to include |\bin|.
% \item Click "Ok" when done.
% \end{enumerate}
-% \end{description}
%
+% \item [To install Perl to a Windows machine:] \
% \DescribeProgram[requirement]{perl}\index{Perl}
-% \begin{description}
-% \item [To add Perl to a Windows machine:] \
% \begin{enumerate}
% \item Download and install a version of Perl, such as Straweberry Perl,
% to a directory without a space in its name, such as |C:\Strawberry|.
@@ -1900,10 +1937,14 @@
% Be sure to include |\bin|.
% \item Click "Ok" when done.
% \end{enumerate}
+%
% \end{description}
%
+% \vspace{1in}
+% \textcolor{red}{\textbf{Any utilities installed by hand must be added to the |PATH|.}}
%
%
+%
% \clearpage
%
% \section{Tutorial}
@@ -3031,7 +3072,7 @@
%
% \DescribeEnv{titlepage}
% The \env{titlepage} environment may be used to hold a custom title page.
-% The titlepage will be set in a |div| class |titlepage|, and \cs{printtitle}, etc.\ may be used
+% The titlepage will be set in a \tag{div} class |titlepage|, and \cs{printtitle}, etc.\ may be used
% inside this environment.
%
% \DescribeEnv{titlingpage}
@@ -3050,25 +3091,25 @@
%
% In |\author|, use |\protect| before formatting commands such as |\textsc|.
% \watchout
-% In \acro{HTML}, the author will appear in a |div| class |author|.
+% In \acro{HTML}, the author will appear in a \tag{div} class |author|.
% \cs{affiliation} is a new addition to \pkg{lwarp}.
%
% \DescribeMacro{\date} \marg{date}
%
% |\date| works as expected.
-% In \acro{HTML}, this will appear in a |div| class |titledate|.
+% In \acro{HTML}, this will appear in a \tag{div} class |titledate|.
%
% \DescribeMacro{\subtitle} \marg{subtitle}
%
% A new command which sets a subtitle. Newlines are allowed.
% The default is empty.
-% In \acro{HTML}, this will appear in a |div| class |subtitle|.
+% In \acro{HTML}, this will appear in a \tag{div} class |subtitle|.
%
% \DescribeMacro{\published} \marg{published}
%
% A new command which sets a publisher.
% The default is empty.
-% In \acro{HTML}, this will appear in a |div| class |published|.
+% In \acro{HTML}, this will appear in a \tag{div} class |published|.
%
%
% \DescribeMacro{\thanks} \marg{text}
@@ -3176,13 +3217,22 @@
% \limitstabular
%
%
+% \subsubsection{Save Boxes}
+%
+% \changes{v0.27}{2017/04/04}{Docs: Limitations of saveboxes.}
+%
+% \limitssaveboxes
+%
+%
% \subsubsection{Minipages}
%
% \limitsminipage
%
+%
% \subsubsection{Mdframed}
%
% \limitsmdframed
+%
%
% \subsubsection{\pkg{float}, \pkg{trivfloat}, and/or \pkg{algorithmicx} together}
%
@@ -3974,6 +4024,7 @@
\LWR at loadafter{keyfloat}
\LWR at loadafter{layout}
\LWR at loadafter{letterspace}
+\LWR at loadafter{lettrine}
\LWR at loadafter{lips}
\LWR at loadafter{listings}
\LWR at loadafter{longtable}
@@ -4003,6 +4054,7 @@
\LWR at loadafter{showkeys}
\LWR at loadafter{sidecap}
\LWR at loadafter{sidenotes}
+\LWR at loadafter{soul}
\LWR at loadafter{subfig}
\LWR at loadafter{tabularx}
\LWR at loadafter{textpos}
@@ -4014,6 +4066,7 @@
\LWR at loadafter{titletoc}
\LWR at loadafter{tocloft}
\LWR at loadafter{trivfloat}
+\LWR at loadafter{ulem}
\LWR at loadafter{varioref}
\LWR at loadafter{verse}
\LWR at loadafter{wallpaper}
@@ -4241,12 +4294,13 @@
% \end{itemize}
%
% \changes{v0.20}{2017/01/12}{Page geometry set to 6in wide with large margins.}
+% \changes{v0.27}{2017/04/04}{Page geometry modified to reduce line overflow.}
%
% \codehtml
% \begin{macrocode}
\begin{warpHTML}
\RequirePackage[paperheight=190in,paperwidth=20in,%
-left=7in,right=7in,%
+left=2in,right=12in,%
top=1in,bottom=1in,%
]{geometry}
\end{warpHTML}
@@ -5490,7 +5544,7 @@
%
-% \begin{environment}{LWR at nestspan} Disable \env{minipage}, \cs{parbox} inside a |span|.
+% \begin{environment}{LWR at nestspan} Disable \env{minipage}, \cs{parbox} inside a \tag{span}.
%
% |\begin{LWR at nestspan}| must follow the opening |<span>| tag to allow
% \watchout
@@ -5779,7 +5833,7 @@
%
%
% \begin{macro}{\BlockClassSingle} \marg{class} \marg{text} \quad
-% A single-line |div|, without a paragraph tag for the line of text.
+% A single-line \tag{div}, without a paragraph tag for the line of text.
%
% \changes{v0.20}{2017/01/03}{Renamed from "LWR at htmldivclassline".}
%
@@ -5810,7 +5864,7 @@
% \codehtml
% \begin{macrocode}
\begin{warpHTML}
-\NewDocumentCommand{\InlineClass}{m o m}{%
+\NewDocumentCommand{\InlineClass}{m o +m}{%
\LWR at htmlspanclass{#1}[#2]{#3}%
}
\end{warpHTML}
@@ -5818,7 +5872,7 @@
% \codeprint
% \begin{macrocode}
\begin{warpprint}
-\NewDocumentCommand{\InlineClass}{m o m}{#3}
+\NewDocumentCommand{\InlineClass}{m o +m}{#3}
\end{warpprint}
% \end{macrocode}
% \end{macro}
@@ -5941,7 +5995,7 @@
\ifbool{LWR at doingstartpars}%
{% handling pars
% \end{macrocode}
-% See if have already started a \env{lateximage} or a |span|.
+% See if have already started a \env{lateximage} or a \tag{span}.
% If so, do not generate nested paragraph tags.
% \begin{macrocode}
\ifthenelse{%
@@ -5950,12 +6004,12 @@
}% nested par tags?
% \end{macrocode}
% If so: Do nothing if already started a \env{lateximage} page. Cannot nest a \env{lateximage}.
-% Also do nothing if already inside a |span|. Do not nest paragraph tags
-% inside a |span|.
+% Also do nothing if already inside a \tag{span}. Do not nest paragraph tags
+% inside a \tag{span}.
% \begin{macrocode}
{}% no nested par tags
% \end{macrocode}
-% Else: No \env{lateximage} or |span| has been started yet,
+% Else: No \env{lateximage} or \tag{span} has been started yet,
% so it's OK to generate paragraph tags.
% \begin{macrocode}
{% yes nest par tags
@@ -6010,7 +6064,7 @@
% \begin{macrocode}
{% handling pars
% \end{macrocode}
-% See if already started a \env{lateximage} or a |span|:
+% See if already started a \env{lateximage} or a \tag{span}:
% \begin{macrocode}
\ifthenelse{%
\cnttest{\value{LWR at lateximagedepth}}{>}{0} \OR%
@@ -6017,7 +6071,7 @@
\cnttest{\value{LWR at spandepth}}{>}{0}%
}%
% \end{macrocode}
-% Do nothing if already started a \env{lateximage} or a |span|,
+% Do nothing if already started a \env{lateximage} or a \tag{span},
% but add a parbreak if in a span but not a \env{lateximage}.
% \begin{macrocode}
{% no nested par tags
@@ -6032,7 +6086,7 @@
{}%
}% no nested par tags
% \end{macrocode}
-% If have not already started a \env{lateximage} or a |span|:
+% If have not already started a \env{lateximage} or a \tag{span}:
% \begin{macrocode}
{% yes nest par tags
% \end{macrocode}
@@ -6388,7 +6442,6 @@
% Patch \LaTeX\ footnotes to use a new \cs{box} for \pkg{lwarp} footnotes.
% \begin{macrocode}
\newbox\LWR at footnotes
-\setbox\LWR at footnotes=\vbox{}
% \end{macrocode}
%
% Much of the following has unneeded print-mode formatting removed.
@@ -6396,7 +6449,14 @@
\long\def\@makefntext#1{\textsuperscript{\@thefnmark} #1}
\def\@makefnmark{\hbox{\textsuperscript{\@thefnmark}}}
-
+% \end{macrocode}
+%
+% Footnotes may be in regular text, in which case paragraphs are tagged,
+% or in a table data cell, in which case paragraph tags must be added manually.
+%
+% \changes{v0.27}{2017/04/04}{Fix for table footnote par tags.}
+%
+% \begin{macrocode}
\long\def\@footnotetext#1{%
\global\setbox\LWR at footnotes=\vbox{\unvbox\LWR at footnotes%
\protected at edef\@currentlabel{%
@@ -6403,12 +6463,9 @@
\csname p at footnote\endcsname\@thefnmark%
}% @currentlabel
\color at begingroup%
+\ifbool{LWR at doingstartpars}{}{\LWR at htmltagc{\LWR at tagregularparagraph}}%
\@makefntext{#1}%
-% \end{macrocode}
-%
-% A closing paragraph tag is required here:
-% \begin{macrocode}
-\LWR at htmltagc{/\LWR at tagregularparagraph}%
+\ifbool{LWR at doingstartpars}{\par}{\LWR at htmltagc{/\LWR at tagregularparagraph}}%
\color at endgroup%
}% vbox
}%
@@ -6442,11 +6499,13 @@
% Enclose the footnotes in a class, print, then clear:
% \begin{macrocode}
\newcommand*{\LWR at printpendingfootnotes}{%
+\ifvoid\LWR at footnotes\else
\begin{BlockClass}{footnotes}
\LWR at origmedskip
\unvbox\LWR at footnotes
\setbox\LWR at footnotes=\vbox{}
\end{BlockClass}
+\fi
}
% \end{macrocode}
@@ -13108,7 +13167,7 @@
\let\tabular\LWR at origtabular%
\let\endtabular\LWR at origendtabular%
\let\newline\LWR at orignewline%
-\LWR at origlabel{LWRlateximage\arabic{LWR at lateximagenumber}}% *8*
+\LWR at origlabel{LWRlateximage\arabic{LWR at lateximagenumber}}%
}% end of outer-most lateximage
}% end of \begin{lateximage}
{% start of \end{lateximage}
@@ -13760,7 +13819,7 @@
% \end{macrocode}
% Select |inline-block| so that \acro{HTML} will transform this span:
% \begin{macrocode}
-\LWR at htmltagc{span style="display: inline-block;
+\LWR at htmltagc{span style="display: inline-block; %
% \end{macrocode}
% If an origin was given, translate and print the origin information:
% \begin{macrocode}
@@ -14691,7 +14750,7 @@
% \index{horizontal space>between minipages}
% Minipages are often placed side-by-side inside figures, with a bit of
% horizontal space to separate them. Since \acro{HTML} does not allow
-% a |div| to be inside a |p|, paragraphs must be turned off during the
+% a \tag{div} to be inside a |p|, paragraphs must be turned off during the
% generation of the minipage, then turned on after the minipage is complete.
% When this occurs between side-by-side minipages, |lwarp| correctly
% surpresses the paragraph tags between the minipages, unless some other
@@ -15645,8 +15704,60 @@
div.epigraphsource p { padding: .5ex 0ex 0ex 0ex ; margin: 0ex ;}
+/* lettrine package: */
+span.lettrine { font-size: 3ex ; float: left ; }
+span.lettrinetext { font-variant: small-caps ; }
+/* ulem and soul packages: */
+span.uline {
+ text-decoration: underline ;
+ text-decoration-skip ;
+}
+span.uuline {
+ text-decoration: underline ;
+ text-decoration-skip ;
+ text-decoration-style: double ;
+}
+
+span.uwave {
+ text-decoration: underline ;
+ text-decoration-skip ;
+ text-decoration-style: wavy ;
+}
+
+span.sout {
+ text-decoration: line-through ;
+}
+
+span.xout {
+ text-decoration: line-through ;
+}
+
+span.dashuline {
+ text-decoration: underline ;
+ text-decoration-skip ;
+ text-decoration-style: dashed ;
+}
+
+span.dotuline {
+ text-decoration: underline ;
+ text-decoration-skip ;
+ text-decoration-style: dotted ;
+}
+
+span.letterspacing { letter-spacing: .2ex ; }
+
+span.capsspacing {
+ font-variant: small-caps ;
+ letter-spacing: .1ex ;
+}
+
+span.highlight { background: #F8E800 ; }
+
+
+
+
html body {
margin: 0 ;
line-height: 1.2;
@@ -15733,6 +15844,7 @@
font-size: .85em ;
margin: 3ex 1em 0ex 1em ;
padding-bottom: 1ex ;
+ border-top: 1px solid silver ;
}
.marginpar {
@@ -17270,7 +17382,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.26"
+printversion = "v0.27"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -17873,8 +17985,8 @@
%
%
-% Inside the \env{algorithmic} environment, level indenting is converted to a |span|
-% of the required length, and comments are placed inside a |span| which is floated right.
+% Inside the \env{algorithmic} environment, level indenting is converted to a \tag{span}
+% of the required length, and comments are placed inside a \tag{span} which is floated right.
%
% \limitscombiningfloats
%
@@ -17965,12 +18077,12 @@
% \begin{description}
% \item[CSS styling of theorems and proofs:] \
% \begin{description}
-% \item [Theorem:] |div| of class |amsthmbody<theoremstyle>|
-% \item [Theorem Name:] |span| of class |amsthmname<theoremtyle>|
-% \item [Theorem Number:] |span| of class |amsthmnumber<theoremstyle>|
-% \item [Theorem Note:] |span| of class |amsthmnote<theoremstyle>|
-% \item [Proof:] |div| of class |amsthmproof|
-% \item [Proof Name:] |span| of class |amsthmproofname|
+% \item [Theorem:] \tag{div} of class |amsthmbody<theoremstyle>|
+% \item [Theorem Name:] \tag{span} of class |amsthmname<theoremtyle>|
+% \item [Theorem Number:] \tag{span} of class |amsthmnumber<theoremstyle>|
+% \item [Theorem Note:] \tag{span} of class |amsthmnote<theoremstyle>|
+% \item [Proof:] \tag{div} of class |amsthmproof|
+% \item [Proof Name:] \tag{span} of class |amsthmproofname|
% \end{description}
% where |<theoremstyle>| is |plain|, |definition|, etc.
% \end{description}
@@ -19091,7 +19203,7 @@
% ^^A \begin{environment}{floatrow} \oarg{numfloats}
% \changes{v0.20}{2016/08/20}{Fix: \cs{linewidth} in a floatrow.}
%
-% The row of floats is placed into a |div| of class |floatrow|.
+% The row of floats is placed into a \tag{div} of class |floatrow|.
% \begin{macrocode}
\newenvironment*{floatrow}[1][2]
{
@@ -19196,7 +19308,7 @@
% ^^A \begin{macro}{\floatfoot} \marg{text}
%
% Places additional text inside a float,
-% inside a \acro{CSS} |div| of class |floatfoot|.
+% inside a \acro{CSS} \tag{div} of class |floatfoot|.
% \begin{macrocode}
\NewDocumentCommand{\floatfoot}{s +m}{%
\begin{BlockClass}{floatfoot}
@@ -19220,7 +19332,7 @@
\newenvironment*{subfloatrow}[1][2]
{
% \end{macrocode}
-% The row of floats is placed into a |div| of class |floatrow|:
+% The row of floats is placed into a \tag{div} of class |floatrow|:
% \begin{macrocode}
\BlockClass{floatrow}
% \end{macrocode}
@@ -20290,6 +20402,72 @@
% \clearpage
%
% \iffalse
+%<*lettrine>
+% \fi
+%
+% \part{lwarp-lettrine.sty}
+%
+% \section{Lettrine}
+%
+% \credits{Daniel Flipo}
+%
+% \DescribePackage{lettrine} Emulated.
+%
+% \changes{v0.27}{2017/04/02}{\pkg{lettrine}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-lettrine}:
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{lettrine}
+% \end{macrocode}
+%
+% The initial letter is in a \tag{span} of class |lettrine|, and the following
+% text is in a \tag{span} of class |lettrinetext|.
+% \cs{lettrine} \oarg{keys} \marg{letter} \marg{additional text}
+% \begin{macrocode}
+\DeclareDocumentCommand{\lettrine}{o m m}{%
+\InlineClass{lettrine}{#2}\InlineClass{lettrinetext}{#3} %
+}
+
+\newcounter{DefaultLines}
+\setcounter{DefaultLines}{2}
+\newcounter{DefaultDepth}
+\newcommand*{\DefaultOptionsFile}{\relax}
+\newcommand*{\DefaultLoversize}{0}
+\newcommand*{\DefaultLraise}{0}
+\newcommand*{\DefaultLhang}{0}
+\newdimen\DefaultFindent
+\setlength{\DefaultFindent}{\z@}
+\newdimen\DefaultNindent
+\setlength{\DefaultNindent}{0.5em}
+\newdimen\DefaultSlope
+\setlength{\DefaultSlope}{\z@}
+\newdimen\DiscardVskip
+\setlength{\DiscardVskip}{0.2\p@}
+\newif\ifLettrineImage
+\newif\ifLettrineOnGrid
+\newif\ifLettrineRealHeight
+
+\newcommand*{\LettrineTextFont}{\scshape}
+
+\newcommand*{\LettrineFontHook}{}
+
+\newcommand*{\LettrineFont}[1]{\InlineClass{lettrine}{#1}}
+\newcommand*{\LettrineFontEPS}[1]{\includegraphics[height=1.5ex]{#1}}
+% \end{macrocode}
+%
+% \iffalse
+%</lettrine>
+% \fi
+%
+%
+%
+%
+%
+% \clearpage
+%
+% \iffalse
%<*lips>
% \fi
@@ -20898,10 +21076,10 @@
%
% Environments created or encapsulated by \pkg{mdframed} are enclosed in a
% \margintag{CSS classes}
-% |div| of class |md<environmentname>|, or |mdframed| otherwise.
+% \tag{div} of class |md<environmentname>|, or |mdframed| otherwise.
%
-% Frame titles are placed into a |span| of class |mdframedtitle|.
-% Subtitles are in a |span| of class |mdframedsubtitle|, and likewise for subsubtitles.
+% Frame titles are placed into a \tag{span} of class |mdframedtitle|.
+% Subtitles are in a \tag{span} of class |mdframedsubtitle|, and likewise for subsubtitles.
%
% Pre-existing hooks are used to patch extra functions before and after the frames.
%
@@ -20958,7 +21136,7 @@
% ^^A \begin{macro}{\LWR at mdframedstart}
% Actions before an mdframe starts.
%
-% Encapsulate a frame inside a |div| of the desired |class|.
+% Encapsulate a frame inside a \tag{div} of the desired |class|.
% \begin{macrocode}
\newcommand*{\LWR at mdframedstart}{%
% \end{macrocode}
@@ -20971,7 +21149,7 @@
% \begin{macrocode}
\uselengthunit{PT}%
% \end{macrocode}
-% Open a |div| and with custom |class| and custom |style|:
+% Open a \tag{div} and with custom |class| and custom |style|:
% \begin{macrocode}
\LWR at htmltagc{div class="\LWR at mdthisenv" \LWR at orignewline
style=" \LWR at orignewline
@@ -21017,11 +21195,11 @@
% ^^A \begin{macro}{\LWR at mdframedend}
% Actions after an mdframe ends.
%
-% After closing the |div|, globally restore to the default environment type:
+% After closing the \tag{div}, globally restore to the default environment type:
% \begin{macrocode}
\newcommand*{\LWR at mdframedend}{
% \end{macrocode}
-% Close the custom |div|:
+% Close the custom \tag{div}:
% \begin{macrocode}
\LWR at htmldivclassend{\LWR at mdthisenv}
% \end{macrocode}
@@ -21040,7 +21218,7 @@
% ^^A \begin{macro}{\mdfframedtitleenv} \marg{title}
%
% Encapsulation of the original which places the title
-% inside a |span| of class |mdframedtitle|:
+% inside a \tag{span} of class |mdframedtitle|:
% \begin{macrocode}
\let\LWR at origmdfframedtitleenv\mdfframedtitleenv
@@ -21053,7 +21231,7 @@
% \begin{macrocode}
\uselengthunit{PT}%
% \end{macrocode}
-% Open a |span| with a custom |class| and custom |style|:
+% Open a \tag{span} with a custom |class| and custom |style|:
% \begin{macrocode}
\LWR at htmltagc{span class="mdframedtitle" \LWR at orignewline
style=" \LWR at orignewline
@@ -21111,7 +21289,7 @@
%
% Common code for \cs{LWR at mdfsubtitle} and \cs{LWR at mdfsubsubtitle}.
%
-% Encapsulate the subtitle inside a |span| of class |mdframedsubtitle|:
+% Encapsulate the subtitle inside a \tag{span} of class |mdframedsubtitle|:
% \begin{macrocode}
\NewDocumentCommand{\LWR at mdfsubtitlecommon}{m o m}
{% the following empty line is required
@@ -21123,7 +21301,7 @@
% \begin{macrocode}
\let\par\LWR at origpar%
% \end{macrocode}
-% Open a |span| with a custom |class| and custom |style|:
+% Open a \tag{span} with a custom |class| and custom |style|:
% \begin{macrocode}
\LWR at htmltagc{span class="mdframed#1title"
style=" \LWR at orignewline
@@ -21299,6 +21477,7 @@
% 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.}
%
% \codehtml
%
@@ -21308,28 +21487,27 @@
% \end{macrocode}
% \begin{macrocode}
-\renewcommand*\DeclareMicrotypeSet[3][]{}
-\renewcommand*\UseMicrotypeSet[2][]{}
-\renewcommand*\DeclareMicrotypeSetDefault[2][]{}
-\renewcommand*\SetProtrusion[3][]{}
-\renewcommand*\SetExpansion[3][]{}
-\renewcommand*\SetTracking[3][]{}
-\renewcommand*\SetExtraKerning[3][]{}
-\renewcommand*\SetExtraSpacing[3][]{}
-\renewcommand*\DisableLigatures[2][]{}
-\renewcommand*\DeclareCharacterInheritance[3][]{}
-\renewcommand*\DeclareMicrotypeVariants[1]{}
-\renewcommand*\DeclareMicrotypeAlias[2]{}
-\renewcommand*\LoadMicrotypeFile[1]{}
-\renewcommand*\DeclareMicrotypeBabelHook[2]{}
-\renewcommand*\microtypesetup[1]{}
-\renewcommand*\microtypecontext[1]{}
-\renewcommand*\textmicrotypecontext[2]{#2}
+\DeclareDocumentCommand{\DeclareMicrotypeSet}{o m m}{}
+\DeclareDocumentCommand{\UseMicrotypeSet}{o m}{}
+\DeclareDocumentCommand{\DeclareMicrotypeSetDefault}{o m}{}
+\DeclareDocumentCommand{\SetProtrusion}{o m m}{}
+\DeclareDocumentCommand{\SetExpansion}{o m m}{}
+\DeclareDocumentCommand{\SetTracking}{o m m}{}
+\DeclareDocumentCommand{\SetExtraKerning}{o m m}{}
+\DeclareDocumentCommand{\SetExtraSpacing}{o m m}{}
+\DeclareDocumentCommand{\DisableLigatures}{o m}{}
+\DeclareDocumentCommand{\DeclareCharacterInheritance}{o m m}{}
+\DeclareDocumentCommand{\DeclareMicrotypeVariants}{m}{}
+\DeclareDocumentCommand{\DeclareMicrotypeAlias}{m m}{}
+\DeclareDocumentCommand{\LoadMicrotypeFile}{m}{}
+\DeclareDocumentCommand{\DeclareMicrotypeBabelHook}{m m}{}
+\DeclareDocumentCommand{\microtypesetup}{m}{}
+\DeclareDocumentCommand{\microtypecontext}{m}{}
+\DeclareDocumentCommand{\textmicrotypecontext}{m m}{#2}
\@ifpackageloaded{letterspace}{\let\MT at textls\relax}{%
-\renewcommand*\lsstyle{}
-\renewcommand\textls[2][]{}
-\def\textls#1#{}
-\renewcommand*\lslig[1]{#1}
+\DeclareDocumentCommand{\lsstyle}{}{}
+\DeclareDocumentCommand{\textls}{o +m}{}
+\DeclareDocumentCommand{\lslig}{m}{#1}
}
\def\DeclareMicrotypeSet#1#{\@gobbletwo}
\def\DeclareMicrotypeVariants#1#{\@gobble}
@@ -21399,9 +21577,9 @@
% Multicols are converted into a 1--3 column display, browser-supported.
%
-% The optional multicols heading is placed inside a |div| of class |multicolsheading|.
+% The optional multicols heading is placed inside a \tag{div} of class |multicolsheading|.
%
-% The content is placed inside a |div| of class |multicols|.
+% The content is placed inside a \tag{div} of class |multicols|.
% \begin{macrocode}
\begin{warpHTML}
@@ -21715,8 +21893,8 @@
% \begin{description}
% \item[CSS styling of theorems and proofs:] \
% \begin{description}
-% \item [Theorem:] |div| of class |theorembody<theoremstyle>|
-% \item [Theorem Header:] |span| of class |theoremheader<style>|
+% \item [Theorem:] \tag{div} of class |theorembody<theoremstyle>|
+% \item [Theorem Header:] \tag{span} of class |theoremheader<style>|
% \end{description}
% where |<theoremstyle>| is |plain|, |break|, etc.
% \end{description}
@@ -22415,7 +22593,7 @@
% \pkg{rotating} is emulated during \acro{HTML} output, and
% the \pkg{rotating} package is ignored.
%
-% \textcolor{red}{This code is untested.}
+% All rotations are ignored in \acro{HTML} output.
%
% \codehtml
% \begin{macrocode}
@@ -22727,7 +22905,111 @@
%
%
%
+% \clearpage
%
+% \iffalse
+%<*soul>
+% \fi
+%
+% \part{lwarp-soul.sty}
+%
+% \section{Soul}
+%
+% \credits{Melchior FRANZ}
+%
+% \DescribePackage{soul} Emulated.
+%
+% \changes{v0.27}{2017/04/02}{\pkg{soul}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{soul}
+% \end{macrocode}
+%
+% Storage for the colors to use:
+% \begin{macrocode}
+\newcommand*{\LWR at soululcolor}{}
+
+\newcommand*{\LWR at soulstcolor}{}
+
+% \definecolor{LWR at soulhlcolordefault}{HTML}{F8E800}
+% \newcommand*{\LWR at soulhlcolor}{LWR at soulhlcolordefault}
+\newcommand*{\LWR at soulhlcolor}{}
+% \end{macrocode}
+%
+% Basic markup with \acro{CSS}:
+% \begin{macrocode}
+\newcommand{\so}[1]{\InlineClass{letterspacing}{#1}}
+\newcommand{\caps}[1]{\InlineClass{capsspacing}{#1}}
+% \end{macrocode}
+%
+% Add colors if not empty:
+% \begin{macrocode}
+\newcommand{\LWR at soulcolor}[4]{%
+\ifcsempty{#2}%
+{%
+\InlineClass{#3}{#1}}%
+{%
+\convertcolorspec{named}{\csuse{#2}}{HTML}\LWR at tempcolor%
+\InlineClass{#3}[#4: \#\LWR at tempcolor]{#1}%
+}%
+}
+
+\newcommand{\ul}[1]{%
+\LWR at soulcolor{#1}{LWR at soululcolor}{uline}{text-decoration-color}%
+}
+
+\newcommand{\st}[1]{
+\LWR at soulcolor{#1}{LWR at soulstcolor}{sout}{text-decoration-color}%
+}
+
+\newcommand{\hl}[1]{
+\LWR at soulcolor{#1}{LWR at soulhlcolor}{highlight}{background-color}%
+}
+% \end{macrocode}
+%
+% Nullified:
+% \begin{macrocode}
+\newcommand*{\soulaccent}[1]{}
+\newcommand*{\soulregister}[2]{}
+\newcommand{\sloppyword}[1]{#1}
+\newcommand*{\sodef}[5]{\DeclareRobustCommand*#1[1]{\so{##1}}}
+\newcommand*{\resetso}{}
+\newcommand*{\capsdef}[5]{}
+\newcommand*{\capsreset}{}
+\newcommand*{\capssave}[1]{}
+\newcommand*{\capsselect}[1]{}
+\newcommand*{\setul}[2]{}
+\newcommand*{\resetul}{}
+\newcommand*{\setuldepth}[1]{}
+\newcommand*{\setuloverlap}[1]{}
+% \end{macrocode}
+%
+% Set colors:
+% \begin{macrocode}
+\newcommand*{\setulcolor}[1]{\renewcommand{\LWR at soululcolor}{#1}}
+\newcommand*{\setstcolor}[1]{\renewcommand{\LWR at soulstcolor}{#1}}
+\newcommand*{\sethlcolor}[1]{\renewcommand{\LWR at soulhlcolor}{#1}}
+% \end{macrocode}
+%
+% Long versions of the user-level macros:
+% \begin{macrocode}
+\let\textso\so
+\let\textul\ul
+\let\texthl\hl
+\let\textcaps\caps
+% \end{macrocode}
+%
+% \iffalse
+%</soul>
+% \fi
+%
+%
+%
+%
+%
+%
% \clearpage
%
% \iffalse
@@ -23133,8 +23415,8 @@
% \begin{description}
% \item[CSS styling of theorems and proofs:] \
% \begin{description}
-% \item [Theorem:] |div| of class |theorembody<theoremstyle>|
-% \item [Theorem Header:] |span| of class |theoremheader|
+% \item [Theorem:] \tag{div} of class |theorembody<theoremstyle>|
+% \item [Theorem Header:] \tag{span} of class |theoremheader|
% \end{description}
% where |<theoremstyle>| is |plain|, |break|, etc.
% \end{description}
@@ -24426,9 +24708,116 @@
%
%
%
+%
+%
% \clearpage
%
% \iffalse
+%<*ulem>
+% \fi
+%
+% \part{lwarp-ulem.sty}
+%
+% \section{Ulem}
+%
+% \credits{Donald Arseneau}
+%
+% \DescribePackage{ulem} Emulated.
+%
+% \changes{v0.27}{2017/04/02}{\pkg{ulem}: Added.}
+%
+% \codehtml
+%
+% Original \pkg{lwarp} definitions:
+% \begin{macrocode}
+\let\LWR at ulemorigemph\emph
+\let\LWR at ulemorigtextbf\textbf
+% \end{macrocode}
+%
+% Basic markup commands, using \acro{CSS}:
+% \begin{macrocode}
+\NewDocumentCommand{\uline}{+m}{%
+\InlineClass{uline}{#1}%
+}
+
+\NewDocumentCommand{\uuline}{+m}{%
+\InlineClass{uuline}{#1}%
+}
+
+\NewDocumentCommand{\uwave}{+m}{%
+\InlineClass{uwave}{#1}%
+}
+
+\NewDocumentCommand{\sout}{+m}{%
+\InlineClass{sout}{#1}%
+}
+
+\NewDocumentCommand{\xout}{+m}{%
+\InlineClass{xout}{#1}%
+}
+
+\NewDocumentCommand{\dashuline}{+m}{%
+\InlineClass{dashuline}{#1}%
+}
+
+\NewDocumentCommand{\dotuline}{+m}{%
+\InlineClass{dotuline}{#1}%
+}
+% \end{macrocode}
+%
+% Nullified parameters:
+% \begin{macrocode}
+\NewDocumentCommand{\ULthickness}{}{}
+\newlength{\ULdepth}
+% \end{macrocode}
+%
+% Nullified/emulated macros:
+% \begin{macrocode}
+\NewDocumentCommand{\markoverwith}{m}{}
+\NewDocumentCommand{\ULon}{+m}{\uline{#1}}
+% \end{macrocode}
+%
+% \cs{useunder} only works with \cs{textbf}, etc, but not \cs{bfseries}, etc.
+% \begin{macrocode}
+\NewDocumentCommand{\useunder}{m m m}{%
+\relax%
+\ifx\relax#3\relax\else % argumentative command
+ \def#3{#1}\MakeRobust{#3}\fi
+}
+% \end{macrocode}
+%
+% Triggered by package options, also available for the users:
+% \begin{macrocode}
+\newcommand*{\normalem}{\let\emph\LWR at ulemorigemph}
+\newcommand*{\ULforem}{\let\emph\uline}
+\ULforem% default
+% \end{macrocode}
+%
+%
+% Package options:
+% \begin{macrocode}
+\DeclareOption{normalem}{\normalem}
+\DeclareOption{ULforem}{\ULforem}
+\DeclareOption{normalbf}{}
+\DeclareOption{UWforbf}{\useunder{\uwave}{\bf}{\textbf}}
+% \end{macrocode}
+%
+% Emulate the original package:
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{ulem}
+% \end{macrocode}
+%
+% \iffalse
+%</ulem>
+% \fi
+%
+%
+%
+%
+%
+% \clearpage
+%
+% \iffalse
%<*verse>
% \fi
%
@@ -24692,8 +25081,9 @@
-% ^^A \begin{macro}{\LWR at colorstyle} \marg{1: styletext} \marg{2: model}
-% ^^A \marg{3: color} \marg{4: spancontents}
+% ^^A \begin{macro}{\LWR at colorstyle}
+% \cs{LWR at colorstyle} \marg{1: styletext} \marg{2: model}
+% \marg{3: color} \marg{4: spancontents}
%
% \changes{v0.19}{2016/06/01}{Supports colored \cs{rule}.}
%
@@ -24713,7 +25103,7 @@
\ifthenelse{\equal{#1}{color:}}%
{\renewcommand*{\LWR at currenttextcolor}{\#\LWR at tempcolor}}{}%
% \end{macrocode}
-% Create the \acro{HTML} |span| with the styled color:
+% Create the \acro{HTML} \tag{span} with the styled color:
% \begin{macrocode}
\LWR at htmltagc{span style="#1\#\LWR at tempcolor"{}}%
\begin{LWR at nestspan}%
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2017-04-06 00:29:09 UTC (rev 43704)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2017-04-06 00:32:26 UTC (rev 43705)
@@ -74,6 +74,7 @@
\file{lwarp-keyfloat.sty}{\from{lwarp.dtx}{keyfloat}}
\file{lwarp-layout.sty}{\from{lwarp.dtx}{layout}}
\file{lwarp-letterspace.sty}{\from{lwarp.dtx}{letterspace}}
+\file{lwarp-lettrine.sty}{\from{lwarp.dtx}{lettrine}}
\file{lwarp-lips.sty}{\from{lwarp.dtx}{lips}}
\file{lwarp-listings.sty}{\from{lwarp.dtx}{listings}}
\file{lwarp-longtable.sty}{\from{lwarp.dtx}{longtable}}
@@ -104,6 +105,7 @@
\file{lwarp-sidenotes.sty}{\from{lwarp.dtx}{sidenotes}}
\file{lwarp-showidx.sty}{\from{lwarp.dtx}{idx}}
\file{lwarp-showkeys.sty}{\from{lwarp.dtx}{showkeys}}
+\file{lwarp-soul.sty}{\from{lwarp.dtx}{soul}}
\file{lwarp-subfig.sty}{\from{lwarp.dtx}{subfig}}
\file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}}
\file{lwarp-textpos.sty}{\from{lwarp.dtx}{textpos}}
@@ -116,6 +118,7 @@
\file{lwarp-titling.sty}{\from{lwarp.dtx}{titling}}
\file{lwarp-tocloft.sty}{\from{lwarp.dtx}{tocloft}}
\file{lwarp-trivfloat.sty}{\from{lwarp.dtx}{trivfloat}}
+\file{lwarp-ulem.sty}{\from{lwarp.dtx}{ulem}}
\file{lwarp-verse.sty}{\from{lwarp.dtx}{verse}}
\file{lwarp-wallpaper.sty}{\from{lwarp.dtx}{wallpaper}}
\file{lwarp-wrapfig.sty}{\from{lwarp.dtx}{wrapfig}}
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty 2017-04-06 00:32:26 UTC (rev 43705)
@@ -0,0 +1,50 @@
+%%
+%% This is file `lwarp-lettrine.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `lettrine')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR at ProvidesPackageDrop{lettrine}
+\DeclareDocumentCommand{\lettrine}{o m m}{%
+\InlineClass{lettrine}{#2}\InlineClass{lettrinetext}{#3} %
+}
+
+\newcounter{DefaultLines}
+\setcounter{DefaultLines}{2}
+\newcounter{DefaultDepth}
+\newcommand*{\DefaultOptionsFile}{\relax}
+\newcommand*{\DefaultLoversize}{0}
+\newcommand*{\DefaultLraise}{0}
+\newcommand*{\DefaultLhang}{0}
+\newdimen\DefaultFindent
+\setlength{\DefaultFindent}{\z@}
+\newdimen\DefaultNindent
+\setlength{\DefaultNindent}{0.5em}
+\newdimen\DefaultSlope
+\setlength{\DefaultSlope}{\z@}
+\newdimen\DiscardVskip
+\setlength{\DiscardVskip}{0.2\p@}
+\newif\ifLettrineImage
+\newif\ifLettrineOnGrid
+\newif\ifLettrineRealHeight
+
+\newcommand*{\LettrineTextFont}{\scshape}
+
+\newcommand*{\LettrineFontHook}{}
+
+\newcommand*{\LettrineFont}[1]{\InlineClass{lettrine}{#1}}
+\newcommand*{\LettrineFontEPS}[1]{\includegraphics[height=1.5ex]{#1}}
+\endinput
+%%
+%% End of file `lwarp-lettrine.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty 2017-04-06 00:29:09 UTC (rev 43704)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty 2017-04-06 00:32:26 UTC (rev 43705)
@@ -20,28 +20,27 @@
\LWR at ProvidesPackageDrop{microtype}
-\renewcommand*\DeclareMicrotypeSet[3][]{}
-\renewcommand*\UseMicrotypeSet[2][]{}
-\renewcommand*\DeclareMicrotypeSetDefault[2][]{}
-\renewcommand*\SetProtrusion[3][]{}
-\renewcommand*\SetExpansion[3][]{}
-\renewcommand*\SetTracking[3][]{}
-\renewcommand*\SetExtraKerning[3][]{}
-\renewcommand*\SetExtraSpacing[3][]{}
-\renewcommand*\DisableLigatures[2][]{}
-\renewcommand*\DeclareCharacterInheritance[3][]{}
-\renewcommand*\DeclareMicrotypeVariants[1]{}
-\renewcommand*\DeclareMicrotypeAlias[2]{}
-\renewcommand*\LoadMicrotypeFile[1]{}
-\renewcommand*\DeclareMicrotypeBabelHook[2]{}
-\renewcommand*\microtypesetup[1]{}
-\renewcommand*\microtypecontext[1]{}
-\renewcommand*\textmicrotypecontext[2]{#2}
+\DeclareDocumentCommand{\DeclareMicrotypeSet}{o m m}{}
+\DeclareDocumentCommand{\UseMicrotypeSet}{o m}{}
+\DeclareDocumentCommand{\DeclareMicrotypeSetDefault}{o m}{}
+\DeclareDocumentCommand{\SetProtrusion}{o m m}{}
+\DeclareDocumentCommand{\SetExpansion}{o m m}{}
+\DeclareDocumentCommand{\SetTracking}{o m m}{}
+\DeclareDocumentCommand{\SetExtraKerning}{o m m}{}
+\DeclareDocumentCommand{\SetExtraSpacing}{o m m}{}
+\DeclareDocumentCommand{\DisableLigatures}{o m}{}
+\DeclareDocumentCommand{\DeclareCharacterInheritance}{o m m}{}
+\DeclareDocumentCommand{\DeclareMicrotypeVariants}{m}{}
+\DeclareDocumentCommand{\DeclareMicrotypeAlias}{m m}{}
+\DeclareDocumentCommand{\LoadMicrotypeFile}{m}{}
+\DeclareDocumentCommand{\DeclareMicrotypeBabelHook}{m m}{}
+\DeclareDocumentCommand{\microtypesetup}{m}{}
+\DeclareDocumentCommand{\microtypecontext}{m}{}
+\DeclareDocumentCommand{\textmicrotypecontext}{m m}{#2}
\@ifpackageloaded{letterspace}{\let\MT at textls\relax}{%
-\renewcommand*\lsstyle{}
-\renewcommand\textls[2][]{}
-\def\textls#1#{}
-\renewcommand*\lslig[1]{#1}
+\DeclareDocumentCommand{\lsstyle}{}{}
+\DeclareDocumentCommand{\textls}{o +m}{}
+\DeclareDocumentCommand{\lslig}{m}{#1}
}
\def\DeclareMicrotypeSet#1#{\@gobbletwo}
\def\DeclareMicrotypeVariants#1#{\@gobble}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty 2017-04-06 00:29:09 UTC (rev 43704)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty 2017-04-06 00:32:26 UTC (rev 43705)
@@ -237,6 +237,57 @@
div.epigraph p { padding: .5ex ; margin: 0ex ;}
div.epigraphsource p { padding: .5ex 0ex 0ex 0ex ; margin: 0ex ;}
+/* lettrine package: */
+span.lettrine { font-size: 3ex ; float: left ; }
+span.lettrinetext { font-variant: small-caps ; }
+
+/* ulem and soul packages: */
+span.uline {
+ text-decoration: underline ;
+ text-decoration-skip ;
+}
+
+span.uuline {
+ text-decoration: underline ;
+ text-decoration-skip ;
+ text-decoration-style: double ;
+}
+
+span.uwave {
+ text-decoration: underline ;
+ text-decoration-skip ;
+ text-decoration-style: wavy ;
+}
+
+span.sout {
+ text-decoration: line-through ;
+}
+
+span.xout {
+ text-decoration: line-through ;
+}
+
+span.dashuline {
+ text-decoration: underline ;
+ text-decoration-skip ;
+ text-decoration-style: dashed ;
+}
+
+span.dotuline {
+ text-decoration: underline ;
+ text-decoration-skip ;
+ text-decoration-style: dotted ;
+}
+
+span.letterspacing { letter-spacing: .2ex ; }
+
+span.capsspacing {
+ font-variant: small-caps ;
+ letter-spacing: .1ex ;
+}
+
+span.highlight { background: #F8E800 ; }
+
html body {
margin: 0 ;
line-height: 1.2;
@@ -318,6 +369,7 @@
font-size: .85em ;
margin: 3ex 1em 0ex 1em ;
padding-bottom: 1ex ;
+border-top: 1px solid silver ;
}
.marginpar {
@@ -1684,7 +1736,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.26"
+printversion = "v0.27"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty 2017-04-06 00:32:26 UTC (rev 43705)
@@ -0,0 +1,69 @@
+%%
+%% This is file `lwarp-soul.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `soul')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR at ProvidesPackageDrop{soul}
+\newcommand*{\LWR at soululcolor}{}
+
+\newcommand*{\LWR at soulstcolor}{}
+
+\newcommand*{\LWR at soulhlcolor}{}
+\newcommand{\so}[1]{\InlineClass{letterspacing}{#1}}
+\newcommand{\caps}[1]{\InlineClass{capsspacing}{#1}}
+\newcommand{\LWR at soulcolor}[4]{%
+\ifcsempty{#2}%
+{%
+\InlineClass{#3}{#1}}%
+{%
+\convertcolorspec{named}{\csuse{#2}}{HTML}\LWR at tempcolor%
+\InlineClass{#3}[#4: \#\LWR at tempcolor]{#1}%
+}%
+}
+
+\newcommand{\ul}[1]{%
+\LWR at soulcolor{#1}{LWR at soululcolor}{uline}{text-decoration-color}%
+}
+
+\newcommand{\st}[1]{
+\LWR at soulcolor{#1}{LWR at soulstcolor}{sout}{text-decoration-color}%
+}
+
+\newcommand{\hl}[1]{
+\LWR at soulcolor{#1}{LWR at soulhlcolor}{highlight}{background-color}%
+}
+\newcommand*{\soulaccent}[1]{}
+\newcommand*{\soulregister}[2]{}
+\newcommand{\sloppyword}[1]{#1}
+\newcommand*{\sodef}[5]{\DeclareRobustCommand*#1[1]{\so{##1}}}
+\newcommand*{\resetso}{}
+\newcommand*{\capsdef}[5]{}
+\newcommand*{\capsreset}{}
+\newcommand*{\capssave}[1]{}
+\newcommand*{\capsselect}[1]{}
+\newcommand*{\setul}[2]{}
+\newcommand*{\resetul}{}
+\newcommand*{\setuldepth}[1]{}
+\newcommand*{\setuloverlap}[1]{}
+\newcommand*{\setulcolor}[1]{\renewcommand{\LWR at soululcolor}{#1}}
+\newcommand*{\setstcolor}[1]{\renewcommand{\LWR at soulstcolor}{#1}}
+\newcommand*{\sethlcolor}[1]{\renewcommand{\LWR at soulhlcolor}{#1}}
+\let\textso\so
+\let\textul\ul
+\let\texthl\hl
+\let\textcaps\caps
+\endinput
+%%
+%% End of file `lwarp-soul.sty'.
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty 2017-04-06 00:32:26 UTC (rev 43705)
@@ -0,0 +1,66 @@
+%%
+%% This is file `lwarp-ulem.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `ulem')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\let\LWR at ulemorigemph\emph
+\let\LWR at ulemorigtextbf\textbf
+\NewDocumentCommand{\uline}{+m}{%
+\InlineClass{uline}{#1}%
+}
+
+\NewDocumentCommand{\uuline}{+m}{%
+\InlineClass{uuline}{#1}%
+}
+
+\NewDocumentCommand{\uwave}{+m}{%
+\InlineClass{uwave}{#1}%
+}
+
+\NewDocumentCommand{\sout}{+m}{%
+\InlineClass{sout}{#1}%
+}
+
+\NewDocumentCommand{\xout}{+m}{%
+\InlineClass{xout}{#1}%
+}
+
+\NewDocumentCommand{\dashuline}{+m}{%
+\InlineClass{dashuline}{#1}%
+}
+
+\NewDocumentCommand{\dotuline}{+m}{%
+\InlineClass{dotuline}{#1}%
+}
+\NewDocumentCommand{\ULthickness}{}{}
+\newlength{\ULdepth}
+\NewDocumentCommand{\markoverwith}{m}{}
+\NewDocumentCommand{\ULon}{+m}{\uline{#1}}
+\NewDocumentCommand{\useunder}{m m m}{%
+\relax%
+\ifx\relax#3\relax\else % argumentative command
+ \def#3{#1}\MakeRobust{#3}\fi
+}
+\newcommand*{\normalem}{\let\emph\LWR at ulemorigemph}
+\newcommand*{\ULforem}{\let\emph\uline}
+\ULforem% default
+\DeclareOption{normalem}{\normalem}
+\DeclareOption{ULforem}{\ULforem}
+\DeclareOption{normalbf}{}
+\DeclareOption{UWforbf}{\useunder{\uwave}{\bf}{\textbf}}
+\LWR at ProvidesPackageDrop{ulem}
+\endinput
+%%
+%% End of file `lwarp-ulem.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2017-04-06 00:29:09 UTC (rev 43704)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2017-04-06 00:32:26 UTC (rev 43705)
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2017/03/31 v0.26 Allows LaTeX to directly produce HTML5 output.]
+ [2017/04/04 v0.27 Allows LaTeX to directly produce HTML5 output.]
@@ -159,6 +159,7 @@
\LWR at loadafter{keyfloat}
\LWR at loadafter{layout}
\LWR at loadafter{letterspace}
+\LWR at loadafter{lettrine}
\LWR at loadafter{lips}
\LWR at loadafter{listings}
\LWR at loadafter{longtable}
@@ -187,6 +188,7 @@
\LWR at loadafter{showkeys}
\LWR at loadafter{sidecap}
\LWR at loadafter{sidenotes}
+\LWR at loadafter{soul}
\LWR at loadafter{subfig}
\LWR at loadafter{tabularx}
\LWR at loadafter{textpos}
@@ -198,6 +200,7 @@
\LWR at loadafter{titletoc}
\LWR at loadafter{tocloft}
\LWR at loadafter{trivfloat}
+\LWR at loadafter{ulem}
\LWR at loadafter{varioref}
\LWR at loadafter{verse}
\LWR at loadafter{wallpaper}
@@ -247,7 +250,7 @@
\begin{warpHTML}
\RequirePackage[paperheight=190in,paperwidth=20in,%
-left=7in,right=7in,%
+left=2in,right=12in,%
top=1in,bottom=1in,%
]{geometry}
\end{warpHTML}
@@ -921,12 +924,12 @@
\end{warpprint}
\begin{warpHTML}
-\NewDocumentCommand{\InlineClass}{m o m}{%
+\NewDocumentCommand{\InlineClass}{m o +m}{%
\LWR at htmlspanclass{#1}[#2]{#3}%
}
\end{warpHTML}
\begin{warpprint}
-\NewDocumentCommand{\InlineClass}{m o m}{#3}
+\NewDocumentCommand{\InlineClass}{m o +m}{#3}
\end{warpprint}
@@ -1146,11 +1149,9 @@
\begin{warpHTML}
\newbox\LWR at footnotes
-\setbox\LWR at footnotes=\vbox{}
\long\def\@makefntext#1{\textsuperscript{\@thefnmark} #1}
\def\@makefnmark{\hbox{\textsuperscript{\@thefnmark}}}
-
\long\def\@footnotetext#1{%
\global\setbox\LWR at footnotes=\vbox{\unvbox\LWR at footnotes%
\protected at edef\@currentlabel{%
@@ -1157,8 +1158,9 @@
\csname p at footnote\endcsname\@thefnmark%
}% @currentlabel
\color at begingroup%
+\ifbool{LWR at doingstartpars}{}{\LWR at htmltagc{\LWR at tagregularparagraph}}%
\@makefntext{#1}%
-\LWR at htmltagc{/\LWR at tagregularparagraph}%
+\ifbool{LWR at doingstartpars}{\par}{\LWR at htmltagc{/\LWR at tagregularparagraph}}%
\color at endgroup%
}% vbox
}%
@@ -1181,11 +1183,13 @@
\color at endgroup}%
}
\newcommand*{\LWR at printpendingfootnotes}{%
+\ifvoid\LWR at footnotes\else
\begin{BlockClass}{footnotes}
\LWR at origmedskip
\unvbox\LWR at footnotes
\setbox\LWR at footnotes=\vbox{}
\end{BlockClass}
+\fi
}
\end{warpHTML}
@@ -4034,7 +4038,7 @@
\let\tabular\LWR at origtabular%
\let\endtabular\LWR at origendtabular%
\let\newline\LWR at orignewline%
-\LWR at origlabel{LWRlateximage\arabic{LWR at lateximagenumber}}% *8*
+\LWR at origlabel{LWRlateximage\arabic{LWR at lateximagenumber}}%
}% end of outer-most lateximage
}% end of \begin{lateximage}
{% start of \end{lateximage}
@@ -4345,7 +4349,7 @@
\NewDocumentCommand{\LWR at rotatebox}{O{} m +m}{%
\renewcommand*{\LWR at rotboxorigin}{}
\setkeys{krotbox}{#1}%
-\LWR at htmltagc{span style="display: inline-block;
+\LWR at htmltagc{span style="display: inline-block; %
\ifthenelse{\NOT\equal{\LWR at rotboxorigin}{}}%
{transform-origin: \LWR at originnames{\LWR at rotboxorigin};\LWR at origtilde}{}%
\LWR at rotstyle{-ms-}{#2} %
More information about the tex-live-commits
mailing list