lwarp (29apr17)

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

3 files changed, 29 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt
index cd0004b7712..f5b9d35fafe 100644
--- a/Master/texmf-dist/doc/latex/lwarp/README.txt
+++ b/Master/texmf-dist/doc/latex/lwarp/README.txt
@@ -1,5 +1,5 @@
 
-LaTeX lwarp package v0.29   README.txt
+LaTeX lwarp package v0.30   README.txt
 
 Files included are:
 
diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
index b334c8805d5..7cac958b166 100644
--- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
+++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp_tutorial.txt b/Master/texmf-dist/doc/latex/lwarp/lwarp_tutorial.txt
index 89da7124729..bd28114bd9b 100644
--- a/Master/texmf-dist/doc/latex/lwarp/lwarp_tutorial.txt
+++ b/Master/texmf-dist/doc/latex/lwarp/lwarp_tutorial.txt
@@ -6,49 +6,55 @@
 \usepackage{iftex}
 
 % --- LOAD FONT SELECTION AND ENCODING BEFORE LOADING LWARP ---
+
 \ifPDFTeX
-\usepackage{lmodern}           % pdflatex
+\usepackage{lmodern}            % pdflatex
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \else
-\usepackage{fontspec}          % XeLaTeX or LuaLaTeX
+\usepackage{fontspec}           % XeLaTeX or LuaLaTeX
 \fi
 
-% --- HTML FILENAME AND LATEXMK SETTINGS ---
-% \newcommand{\HomeHTMLFilename}{index} % Filename of the homepage.
-% \newcommand{\HTMLFileName}{node-} % Filename prefix of other pages.
-% \newcommand{\UseLatexmk}{true}% Uncomment to use latexmk
-
 % --- LWARP IS LOADED NEXT ---
-\usepackage{lwarp-newproject}   % Possibly with the [lwarpmk] option.
-\usepackage{lwarp}
+\usepackage[
+%   HomeHTMLFilename=index,     % Filename of the homepage.
+%   HTMLFilename={node-},       % Filename prefix of other pages.
+%   IndexLanguage=english,      % Language for xindy index, glossary.
+%   latexmk,                    % Use latexmk to compile.
+%   OSWindows,                  % Force Windows. (Usually automatic.)
+%   mathjax,                    % Use MathJax to display math.
+]{lwarp}
 % \boolfalse{FileSectionNames}  % If false, numbers the files.
 
 % --- OTHER PACKAGES ARE LOADED AFTER LWARP ---
 \usepackage{makeidx} \makeindex
-\usepackage{xcolor}
-
+\usepackage{xcolor}             % (Demonstration purposes only.)
 \usepackage{hyperref,cleveref}  % LOAD THESE LAST!
 
 % --- LATEX AND HTML CUSTOMIZATION ---
 \title{The Lwarp Tutorial}
 \author{Some Author}
-\setcounter{tocdepth}{2}        % Include subsections in the TOC.
+\setcounter{tocdepth}{2}        % Include subsections in the \TOC.
 \setcounter{secnumdepth}{2}     % Number down to subsections.
-\setcounter{FileDepth}{1}       % Split HTML files at sections
+\setcounter{FileDepth}{1}       % Split \HTML\ files at sections
 \booltrue{CombineHigherDepths}  % Combine parts/chapters/sections
-\setcounter{SideTOCDepth}{1}    % Include subsections in the sideTOC
-\SetFirstPageTop{Name and \fbox{HOMEPAGE LOGO}}
-\SetPageTop{\fbox{LOGO}}
-\SetPageBottom{Contact Information and Copyright}
-\NewCSS{lwarp_sagebrush.css}
+\setcounter{SideTOCDepth}{1}    % Include subsections in the side\TOC
+\HTMLAuthor{Some Author}        % Sets the HTML meta author tag.
+\HTMLLanguage{en-US}            % Sets the HTML meta language.
+\HTMLDescription{A description.}% Sets the HTML meta description.
+\HTMLFirstPageTop{Name and \fbox{HOMEPAGE LOGO}}
+\HTMLPageTop{\fbox{LOGO}}
+\HTMLPageBottom{Contact Information and Copyright}
+\CSSFilename{lwarp_sagebrush.css}
 
 \begin{document}
-\maketitle                      % (or a titlepage environment)
 
-% --- An abstract may be placed here. ---
+\maketitle                      % Or titlepage/titlingpage environment.
+
+% An article abstract would go here.
 
-\tableofcontents \listoffigures % --- MUST BE BEFORE THE FIRST SECTION.
+\tableofcontents                % MUST BE BEFORE THE FIRST SECTION BREAK!
+\listoffigures
 
 \chapter{First chapter}
 
@@ -68,6 +74,7 @@ See \cref{fig:withtext}.
 \section{Some math}
 
 Inline math: $r = r_0 + vt - \frac{1}{2}at^2$
+followed by display math:
 \begin{equation}
 a^2 + b^2 = c^2
 \end{equation}