From 3c806bd4ccf248e9411683a41ef534d1a909bc99 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 6 Apr 2017 00:32:26 +0000 Subject: lwarp (6Apr) git-svn-id: svn://tug.org/texlive/trunk@43705 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty | 50 ++++++++++++++++ .../texmf-dist/tex/latex/lwarp/lwarp-microtype.sty | 41 +++++++------ .../tex/latex/lwarp/lwarp-newproject.sty | 54 ++++++++++++++++- Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty | 69 ++++++++++++++++++++++ Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty | 66 +++++++++++++++++++++ Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 22 ++++--- 6 files changed, 271 insertions(+), 31 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty new file mode 100644 index 00000000000..def689ec591 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty @@ -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@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'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty index 71130da10df..0061012e6e3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty @@ -20,28 +20,27 @@ \LWR@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@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} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty index 33fbf306686..b1fd0af99d6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty @@ -237,6 +237,57 @@ div.epigraphsource{ 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 @@ div.titlepage { font-size: .85em ; margin: 3ex 1em 0ex 1em ; padding-bottom: 1ex ; +border-top: 1px solid silver ; } .marginpar { @@ -1684,7 +1736,7 @@ MathJax.Hub.Config({ -- 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.") ; diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty new file mode 100644 index 00000000000..1561eae959c --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty @@ -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@ProvidesPackageDrop{soul} +\newcommand*{\LWR@soululcolor}{} + +\newcommand*{\LWR@soulstcolor}{} + +\newcommand*{\LWR@soulhlcolor}{} +\newcommand{\so}[1]{\InlineClass{letterspacing}{#1}} +\newcommand{\caps}[1]{\InlineClass{capsspacing}{#1}} +\newcommand{\LWR@soulcolor}[4]{% +\ifcsempty{#2}% +{% +\InlineClass{#3}{#1}}% +{% +\convertcolorspec{named}{\csuse{#2}}{HTML}\LWR@tempcolor% +\InlineClass{#3}[#4: \#\LWR@tempcolor]{#1}% +}% +} + +\newcommand{\ul}[1]{% +\LWR@soulcolor{#1}{LWR@soululcolor}{uline}{text-decoration-color}% +} + +\newcommand{\st}[1]{ +\LWR@soulcolor{#1}{LWR@soulstcolor}{sout}{text-decoration-color}% +} + +\newcommand{\hl}[1]{ +\LWR@soulcolor{#1}{LWR@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@soululcolor}{#1}} +\newcommand*{\setstcolor}[1]{\renewcommand{\LWR@soulstcolor}{#1}} +\newcommand*{\sethlcolor}[1]{\renewcommand{\LWR@soulhlcolor}{#1}} +\let\textso\so +\let\textul\ul +\let\texthl\hl +\let\textcaps\caps +\endinput +%% +%% End of file `lwarp-soul.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty new file mode 100644 index 00000000000..f944feb537b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty @@ -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@ulemorigemph\emph +\let\LWR@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@ulemorigemph} +\newcommand*{\ULforem}{\let\emph\uline} +\ULforem% default +\DeclareOption{normalem}{\normalem} +\DeclareOption{ULforem}{\ULforem} +\DeclareOption{normalbf}{} +\DeclareOption{UWforbf}{\useunder{\uwave}{\bf}{\textbf}} +\LWR@ProvidesPackageDrop{ulem} +\endinput +%% +%% End of file `lwarp-ulem.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 0540344eb02..3cde0578003 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/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 @@ Please use the #2 package instead} \LWR@loadafter{keyfloat} \LWR@loadafter{layout} \LWR@loadafter{letterspace} +\LWR@loadafter{lettrine} \LWR@loadafter{lips} \LWR@loadafter{listings} \LWR@loadafter{longtable} @@ -187,6 +188,7 @@ Please use the #2 package instead} \LWR@loadafter{showkeys} \LWR@loadafter{sidecap} \LWR@loadafter{sidenotes} +\LWR@loadafter{soul} \LWR@loadafter{subfig} \LWR@loadafter{tabularx} \LWR@loadafter{textpos} @@ -198,6 +200,7 @@ Please use the #2 package instead} \LWR@loadafter{titletoc} \LWR@loadafter{tocloft} \LWR@loadafter{trivfloat} +\LWR@loadafter{ulem} \LWR@loadafter{varioref} \LWR@loadafter{verse} \LWR@loadafter{wallpaper} @@ -247,7 +250,7 @@ spacing=false} \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 @@ top=1in,bottom=1in,% \end{warpprint} \begin{warpHTML} -\NewDocumentCommand{\InlineClass}{m o m}{% +\NewDocumentCommand{\InlineClass}{m o +m}{% \LWR@htmlspanclass{#1}[#2]{#3}% } \end{warpHTML} \begin{warpprint} -\NewDocumentCommand{\InlineClass}{m o m}{#3} +\NewDocumentCommand{\InlineClass}{m o +m}{#3} \end{warpprint} @@ -1146,19 +1149,18 @@ top=1in,bottom=1in,% \begin{warpHTML} \newbox\LWR@footnotes -\setbox\LWR@footnotes=\vbox{} \long\def\@makefntext#1{\textsuperscript{\@thefnmark} #1} \def\@makefnmark{\hbox{\textsuperscript{\@thefnmark}}} - \long\def\@footnotetext#1{% \global\setbox\LWR@footnotes=\vbox{\unvbox\LWR@footnotes% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark% }% @currentlabel \color@begingroup% +\ifbool{LWR@doingstartpars}{}{\LWR@htmltagc{\LWR@tagregularparagraph}}% \@makefntext{#1}% -\LWR@htmltagc{/\LWR@tagregularparagraph}% +\ifbool{LWR@doingstartpars}{\par}{\LWR@htmltagc{/\LWR@tagregularparagraph}}% \color@endgroup% }% vbox }% @@ -1181,11 +1183,13 @@ top=1in,bottom=1in,% \color@endgroup}% } \newcommand*{\LWR@printpendingfootnotes}{% +\ifvoid\LWR@footnotes\else \begin{BlockClass}{footnotes} \LWR@origmedskip \unvbox\LWR@footnotes \setbox\LWR@footnotes=\vbox{} \end{BlockClass} +\fi } \end{warpHTML} @@ -4034,7 +4038,7 @@ class="lateximagesource"{}} \LWR@orignewline \let\tabular\LWR@origtabular% \let\endtabular\LWR@origendtabular% \let\newline\LWR@orignewline% -\LWR@origlabel{LWRlateximage\arabic{LWR@lateximagenumber}}% *8* +\LWR@origlabel{LWRlateximage\arabic{LWR@lateximagenumber}}% }% end of outer-most lateximage }% end of \begin{lateximage} {% start of \end{lateximage} @@ -4345,7 +4349,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \NewDocumentCommand{\LWR@rotatebox}{O{} m +m}{% \renewcommand*{\LWR@rotboxorigin}{} \setkeys{krotbox}{#1}% -\LWR@htmltagc{span style="display: inline-block; +\LWR@htmltagc{span style="display: inline-block; % \ifthenelse{\NOT\equal{\LWR@rotboxorigin}{}}% {transform-origin: \LWR@originnames{\LWR@rotboxorigin};\LWR@origtilde}{}% \LWR@rotstyle{-ms-}{#2} % -- cgit v1.2.3