novel (28mar17)

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

17 files changed, 53 insertions, 35 deletions

diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo
index ec34e8b1fde..167b42f7731 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo
@@ -1,4 +1,4 @@
-% Typically used in the USA. Novel file version 1.0.9
+% Typically used in the USA. Novel file version 1.0.10
 
 % The values of the arguments are public industry standards.
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty b/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty
index e371850d70e..ae84f7cd7d9 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty
@@ -12,7 +12,7 @@
 %% 
 %%
 \ProvidesFile{novel-CalculateLayout.sty}%
-[2017/03/21 v1.0.9 LaTeX file (layout calculations)]
+[2017/03/27 v1.0.10 LaTeX file (layout calculations)]
 %%
 
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty
index 5b1be49ca42..01e7491bf84 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty
@@ -13,7 +13,7 @@
 %% 
 %%
 \ProvidesFile{novel-ChapterScene.sty}%
-[2017/03/21 v1.0.9 LaTeX file (chapter and scene macros)]
+[2017/03/27 v1.0.10 LaTeX file (chapter and scene macros)]
 %%
 
 
@@ -80,10 +80,15 @@
 \newif \if@addCTline \@addCTlinetrue
 \newcounter{@linequarter}
 \newif \if@csalignok \@csalignokfalse
+\newlength\@oldparindent
 %
 % The argument is the number of normal baselineskips high:
 \newenvironment{ChapterStart}[1][10]
 {%
+  \setlength\@oldparindent{\parindent}%
+  \global\@oldparindent=\@oldparindent%
+  \setlength\parindent{0pt}%
+  \global\parindent=\parindent%
   \FPsub{\@fixlines}{#1}{2}%
   \FPsub{\@fixlines}{\@fixlines}{0.001}% fudge to avoid rounding problems
   \if@thispagestyleset\else\thispagestyle{\@setchapterstart}\fi%
@@ -107,6 +112,8 @@
   \end{textblock*}%
   \vspace{\@fixlines\nbs}%
   \if@addCTline\null\fi%
+  \setlength\parindent{\@oldparindent}%
+  \global\parindent=\parindent%
   \nov@AfterGroup\NoIndentAfterThis% etextools and noindentafter
 }
 %%
@@ -115,17 +122,18 @@
 
 %
 \newcommand\ChapterTitle[2][c]{% optional alignment l, c, r
-  \vspace{0.5\nbs}\addtocounter{@linequarter}{2}
+  \ignorespaces%
+  \vspace{0.5\nbs}\addtocounter{@linequarter}{2}%
   \@csalignokfalse%
-  \ifthenelse{\equal{#1}{l}}{\let\@csalign\relax\@csalignoktrue}{}
-  \ifthenelse{\equal{#1}{c}}{\let\@csalign\centering\relax\@csalignoktrue}{}
-  \ifthenelse{\equal{#1}{r}}{\let\@csalign\hfill\relax\@csalignoktrue}{}
+  \ifthenelse{\equal{#1}{l}}{\let\@csalign\relax\@csalignoktrue}{}%
+  \ifthenelse{\equal{#1}{c}}{\let\@csalign\centering\relax\@csalignoktrue}{}%
+  \ifthenelse{\equal{#1}{r}}{\let\@csalign\hfill\relax\@csalignoktrue}{}%
   \if@csalignok\else%
     \ClassError{novel}{Chapter Title, Deco, Subtitle align must be l, c, or r}%
     {On page \thepage you wrote a Chapter command with alignment^^J%
      other than the allowed l, c, or r.}%
   \fi%
-  {\@csalign\stake\smash{{\chapterfont #2}}\par}%
+  {\@csalign\stake\smash{{\chapterfont{}#2}}\par}%
 }
 %
 \newcommand\ChapterSubtitle[2][c]{% optional alignment l, c, r
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo
index 2fddbeba175..45c4d80d8a6 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo
@@ -1,4 +1,4 @@
-% Typically used in Europe.  Novel file version 1.0.9
+% Typically used in Europe.  Novel file version 1.0.10
 
 % The values of the arguments are public industry standards.
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty
index a88c1c042c9..5accb33c03d 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty
@@ -13,7 +13,7 @@
 %% 
 %%
 \ProvidesFile{novel-FileData.sty}%
-[2017/03/21 v1.0.9 LaTeX file (File Data settings)]
+[2017/03/27 v1.0.10 LaTeX file (File Data settings)]
 %% 
 
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty
index 8c45a23898c..238e7d67477 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty
@@ -13,7 +13,7 @@
 %% 
 %%
 \ProvidesFile{novel-FontDefaults.sty}%
-[2017/03/21 v1.0.9 LaTeX file (default fonts)]
+[2017/03/27 v1.0.10 LaTeX file (default fonts)]
 %%
 
 
@@ -161,8 +161,8 @@
   ]{\@decofontname}
   %
   \gdef\decoglyph#1{% Be sure to use % without preceding space:
-    \IfBeginWith{#1}{s}{% numeral superscript
-      \StrBehind{#1}{s}[\@tempdecoglyph]{\@decoglyph{#1}}%
+    \IfBeginWith{#1}{n}{% normal weight symbol (same as regular)
+      \StrBehind{#1}{n}[\@tempdecoglyph]{\@decoglyph\symbol{\@tempdecoglyph}}%
     }{}%
     \IfBeginWith{#1}{r}{% regular weight symbol
       \StrBehind{#1}{r}[\@tempdecoglyph]{\@decoglyph\symbol{\@tempdecoglyph}}%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty
index 8a394d90a9b..326f4a484d2 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty
@@ -13,7 +13,7 @@
 %% 
 %%
 \ProvidesFile{novel-Footnotes.sty}%
-[2017/03/21 v1.0.9 LaTeX file (commands for footnotes and endnotes)]
+[2017/03/27 v1.0.10 LaTeX file (commands for footnotes and endnotes)]
 %%
 
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty
index 04d88a9161b..8f08dd349c9 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty
@@ -13,7 +13,7 @@
 %% 
 %%
 \ProvidesFile{novel-HeadFootStyles.sty}%
-[2017/03/21 v1.0.9 LaTeX file (header and footer styles)]
+[2017/03/27 v1.0.10 LaTeX file (header and footer styles)]
 %% 
 
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty
index 076e968682e..8c1a8dab051 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty
@@ -13,7 +13,7 @@
 %% 
 %%
 \ProvidesFile{novel-Images.sty}%
-[2017/03/21 v1.0.9 LaTeX file (image placement)]
+[2017/03/27 v1.0.10 LaTeX file (image placement)]
 %%
 
 
@@ -124,12 +124,6 @@
     \typeout{^^JClass~`novel'~Info:~An~image~was~placed~on~page~\thepage.^^J%
       Review~layout~to~ensure~that~it~does~not~overflow~into~margins.^^J}%
   }%
-  \gdef\@imageheightnum{\strip@pt\@imageheight}%
-  \FPdiv{\@imagelines}{\@imageheightnum}{\nbsnum}%
-  \FPadd{\@imagelines}{\@imagelines}{0.5}% round up to integer, not down
-  \FPround{\@imagelines}{\@imagelines}{0}%
-  \FPclip{\@imagelines}{\@imagelines}%
-  \iftoggle{@inheadfoot}{}{\gdef\imagelineskip{\@imagelines}}%
   %
   \setlength\@imagehoffset{\@myilx}%
   \IfBeginWith{\@myily}{b}{%
@@ -185,8 +179,12 @@
 % be at the baseline grid. Beware of using this command near bottom of page.
 \ExplSyntaxOn
 \DeclareDocumentCommand \BlockImage { O{c} m +O{} }{
+  \iftoggle{@inheadfoot}{%
+    \ClassError{novel}{Cannot~use~BlockImage~in~header~or~footer}%
+      {Header~footer~allow~InlineImage~but~not~BlockImage.}%
+  }{}%
   % Allows empty or blank to be used, and still provide default values:
-  \ifthenelse{\equal{#1}{}\OR\equal{#1}{\space}}{%
+  \ifthenelse{\equal{#1}{} \OR \equal{#1}{\space}}{%
     \def\@myargs{c}}{\def\@myargs{#1}%
   }
   \StrDel{\@myargs}{\space}[\@myargsns] % needs {\space} not { }
@@ -200,9 +198,9 @@
   }
   \newdimen\@sbsheight
   \ifthenelse{\equal{\@myalign}{c}\OR\equal{\@myalign}{}}{%
-    {\centering\InlineImage*[{\@myx-0.5\imagewidth},{\@myy}]{#2}\par}
-    \vspace{-\nbs}
-    {\centering #3\par}
+    {\centering\strut\InlineImage*[{\@myx-0.5\imagewidth},{\@myy}]{#2}\par}
+    \vspace*{-\nbs}
+    {\centering\strut #3\par}
     \setbox0=\vbox{{\centering #3\par}}
   }{}
   \ifthenelse{\equal{\@myalign}{r}}{%
@@ -236,6 +234,13 @@
   \FPdiv{\@roughlines}{\@sbsheightnum}{\nbsnum}
   \FPadd{\@roughlines}{\@roughlines}{0.5} % round up, not down
   \FPround{\@roughlines}{\@roughlines}{0}
+
+  \gdef\@imageheightnum{\strip@pt\@imageheight}%
+  \FPdiv{\@imagelines}{\@imageheightnum}{\nbsnum}%
+  \FPadd{\@imagelines}{\@imagelines}{0.5}% round up to integer, not down
+  \FPround{\@imagelines}{\@imagelines}{0}%
+  \FPclip{\@imagelines}{\@imagelines}%
+  \gdef\imagelineskip{\@imagelines}%
   \FPclip{\@roughlines}{\@roughlines}
   \FPadd{\@adjimagelines}{\imagelineskip}{1} % \imagelineskip from \InlineImage*
   \FPsub{\@skipme}{\@adjimagelines}{\@roughlines}
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo
index db0a29a6b28..5c85ddc0ae2 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo
@@ -1,4 +1,4 @@
-% Typically used in Japan. Novel file version 1.0.9
+% Typically used in Japan. Novel file version 1.0.10
 
 % The values of the arguments are public industry standards.
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
index b05d11b721d..0e6215ddfcd 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
@@ -13,7 +13,7 @@
 %% 
 %%
 \ProvidesFile{novel-LayoutSettings.sty}%
-[2017/03/21 v1.0.9 LaTeX file (layout settings)]
+[2017/03/27 v1.0.10 LaTeX file (layout settings)]
 %%
 
 
@@ -477,7 +477,12 @@
 \def\setmainfont{%
   \ClassError{novel}{Use \string\SetMasterFont\space not \string\setmainfont}%
   {The \string\setmainfont\space command is not in this document class.^^J%
-   Use \string\SetMasterFont\space to get what you need.}%
+   Use \string\SetMasterFont\space to get what you need.^^J%
+   You may see this message if you \string\usepackage{some font}^^J%
+   in the Preamble. Do not do that. If you wish to use that font, and if^^J%
+   it is Open Type (or TrueType) format, and installed, then instead of^^J%
+   \string\usepackage\space use \string\SetMasterFont. See `novel' docs.^^J%
+   Any attempt to continue without fixing is doomed to failure!}%
 }
 \ExplSyntaxOn
 %% Store settings for the master font:
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
index 1af2d46b374..76d23fb55cb 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
@@ -13,7 +13,7 @@
 %% 
 %%
 \ProvidesFile{novel-TextMacros.sty}%
-[2017/03/21 v1.0.9 LaTeX file (text macros usable within document body)]
+[2017/03/27 v1.0.10 LaTeX file (text macros usable within document body)]
 %%
 
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex
index 973aad88451..e7b21e019c5 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex
@@ -14,7 +14,7 @@
 %% 
 %%
 \ProvidesFile{novel-gyphtounicode.tex}%
-[2017/03/21 v1.0.9 LaTeX file (additional glyph to unicode)]
+[2017/03/27 v1.0.10 LaTeX file (additional glyph to unicode)]
 %%
 
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg b/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg
index bc228ad31d4..c5f73085be4 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg
@@ -19,7 +19,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{novel-microtype.cfg}
-  [2017/03/21 v1.0.9 LaTeX file (microtype configuration file for novel class)]
+  [2017/03/27 v1.0.10 LaTeX file (microtype configuration file for novel class)]
 
 %%% -----------------------------------------------------------------------
 %%% FONT SETS
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty b/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty
index e420d89bd34..59723c00064 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty
@@ -24,7 +24,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{novel-pdfx.sty}
-  [2017/03/21 v1.0.9 LaTeX file (PDF/X support for novel class)]
+  [2017/03/27 v1.0.10 LaTeX file (PDF/X support for novel class)]
 % This package supports, and is part of, class `novel'.
 % No support for anything but LuaLaTeX.
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty
index 23db81b88b7..5f2c92d9fce 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty
@@ -22,7 +22,7 @@
 %%
 %%
 \ProvidesFile{novel-xmppacket.sty}%
-[2017/03/21 v1.0.9 LaTeX file (novel XMP packet template)]
+[2017/03/27 v1.0.10 LaTeX file (novel XMP packet template)]
 %%
 
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel.cls b/Master/texmf-dist/tex/lualatex/novel/novel.cls
index 2280294b626..e0245543b0f 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel.cls
+++ b/Master/texmf-dist/tex/lualatex/novel/novel.cls
@@ -14,7 +14,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 % Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016.
-\ProvidesClass{novel}[2017/03/21 v1.0.9 LaTeX document class]
+\ProvidesClass{novel}[2017/03/27 v1.0.10 LaTeX document class]
 %%