novel (14apr17)

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

17 files changed, 120 insertions, 121 deletions

diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo
index 167b42f7731..e0c3e241d12 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.10
+% Typically used in the USA. Novel file version 1.1
 
 % 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 ae84f7cd7d9..c2e482876b2 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/27 v1.0.10 LaTeX file (layout calculations)]
+[2017/04/12 v1.1 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 01e7491bf84..2b902215ef1 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/27 v1.0.10 LaTeX file (chapter and scene macros)]
+[2017/04/12 v1.1 LaTeX file (chapter and scene macros)]
 %%
 
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo
index 45c4d80d8a6..524c3462a36 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.10
+% Typically used in Europe.  Novel file version 1.1
 
 % 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 5accb33c03d..46459cfa833 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/27 v1.0.10 LaTeX file (File Data settings)]
+[2017/04/12 v1.1 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 238e7d67477..0b2d007a04a 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/27 v1.0.10 LaTeX file (default fonts)]
+[2017/04/12 v1.1 LaTeX file (default fonts)]
 %%
 
 
@@ -23,7 +23,7 @@
 %% Most TeX installations will use Latin Modern or Computer Modern
 %%   as default fonts. These are unsuitable for commercial fiction.
 %% But `novel' class uses Libertinus as defaults.
-%% Change them using \SetMasterFont and other fontspec commands, in Preamble.
+%% Change them using \SetParentFont and other fontspec commands, in Preamble.
 % Libertinus Serif has Regular, Italic, Bold, Bold Italic.
 % Here, Semibold over-rides Bold.
 %
@@ -32,10 +32,10 @@
 \defaultfontfeatures{} % reset
 %
 % The mono font:
-\defaultfontfeatures[\ttfamily]{% mono font has no kerning or common ligatures
+\defaultfontfeatures[\ttfamily]{% monofont has no kerning or common ligatures
   SmallCapsFeatures={Renderer=Basic},Ligatures=TeX,%
 }%
-\ifthenelse{\equal{\ttdefault}{lmtt} \OR \equal{\ttdefault}{cmtt}}{ % over-ride:
+\ifthenelse{\equal{\ttdefault}{lmtt}\OR\equal{\ttdefault}{cmtt}}{% over-ride:
   \IfFontExistsTF{Libertinus Mono}{
     \setmonofont[%
       ItalicFont={},% Doesn't have these.
@@ -52,13 +52,13 @@
 }{} % User \setmonofont, so leave alone.
 %%
 \defaultfontfeatures{} % reset
-% Main and sans fonts use kerning, ligatures, and OldStyle numbers if available:
+% Main and sans fonts: kerning, ligatures, and OldStyle numbers if available:
 \defaultfontfeatures[\rmfamily,\sffamily]{%
   SmallCapsFeatures={Renderer=Basic},Kerning=On,Numbers=OldStyle,%
   Ligatures=Common,Ligatures=TeX,%
 }%
 % The sans font:
-\ifthenelse{\equal{\sfdefault}{lmss} \OR \equal{\sfdefault}{cmss}}{ % over-ride:
+\ifthenelse{\equal{\sfdefault}{lmss}\OR\equal{\sfdefault}{cmss}}{ % override:
   \IfFontExistsTF{Libertinus Sans}{
     \setsansfont{Libertinus Sans}
   }{
@@ -70,30 +70,32 @@
   }
 }{} % User \setsansfont, so leave alone.
 %%
-% At this point, if \rmdefault is something other than lmr or cmr, it probably
-%   means that the user issued \setmainfont. But that's ineffective in this
-%   class, because it will be over-written. Use \SetMasterFont instead:
-\ifthenelse{\equal{\rmdefault}{lmr} \OR \equal{\rmdefault}{cmr}}{}{%
-  \ClassWarning{novel}{^^JDid you use \string\setmainfont\space in Preamble?^^J%
-   The \string\setmainfont\space command is ineffective in `novel' class.^^J%
-   Use \string\SetMasterFont\space instead. This Warning may be spurious if^^J%
-   you have an unusual configuration for your TeX installation.^^J}%
+% At this point, if \rmdefault is something other than lmr, it means
+%   that the user attempted to set the main font using ordinary TeX commands,
+%   or via fontspec's \setmainfont. But those are ineffective in this class,
+%   because without \SetParentFont the prior command will be over-written.
+\ifthenelse{\equal{\rmdefault}{lmr}}{}{%
+  \ClassWarning{novel}{^^JBIG BAD WARNING:^^J%
+  You attempted to define the main document font using a command such as^^J%
+  \string\renewcommand\string\rmdefault\space or \string\usepackage{font}^^J%
+  or \string\setmainfont. These are incorrect in `novel' class.^^J%
+  Use \string\SetParentFont\space instead. See `novel' documentation.^^J}%
 }%
-% The masterfont:
-\if@masterfontset\else
+% The parentfont: (from v.1.1. Known as masterfont in prior versions)
+\if@parentfontset\else
  \IfFontExistsTF{Libertinus Serif}{
-    \SetMasterFont[%
+    \SetParentFont[%
       BoldFont=libertinusserif-semibold.otf,%
       BoldItalicFont=libertinusserif-semibolditalic.otf,%
     ]{Libertinus Serif}
  }{
    \IfFontExistsTF{Linux Libertine O}{
-     \SetMasterFont[%
+     \SetParentFont[%
        BoldFont=LinLibertine_RZ.otf,%
        BoldItalicFont=LinLibertine_RZI.otf,%
      ]{Linux Libertine O}
    }{
-     \SetMasterFont[%
+     \SetParentFont[%
       SmallCapsFont={Latin Modern Roman Caps}%
      ]{Latin Modern Roman}% Eeek! Only because you have it!
      \let\scshape\oldscshape % or small caps won't work
@@ -102,7 +104,7 @@
  }
 \fi
 % Now we are ready to set the main font:
-\@setmainfont[\@masterfontfeatures]{\@masterfontname}
+\setmainfont[\@parentfontfeatures]{\@parentfontname}
 %
 %%
 \defaultfontfeatures{} % reset
@@ -113,18 +115,18 @@
 }%
 %% The novel-specific fonts:
 \if@chapterfontset\else
-  \SetChapterFont[\@masterfontfeatures,Scale=1.6]{\@masterfontname}
+  \SetChapterFont[\@parentfontfeatures,Scale=1.6]{\@parentfontname}
 \fi
 \newfontfamily\chapterfont[\@chapterfontfeatures]{\@chapterfontname}
 %%
 \if@subchfontset\else
-  \SetSubchFont[\@masterfontfeatures,Scale=1.2]{\@masterfontname}
+  \SetSubchFont[\@parentfontfeatures,Scale=1.2]{\@parentfontname}
 \fi
 \newfontfamily\subchfont[\@subchfontfeatures]{\@subchfontname}
 %%
 \newif \if@headfontdefault
 \if@headfontset\else
-  \SetHeadFont[\@masterfontfeatures,Scale=0.92]{\@masterfontname}
+  \SetHeadFont[\@parentfontfeatures,Scale=0.92]{\@parentfontname}
   \global\@headfontdefaulttrue
 \fi
 \newfontfamily\headfont[\@headfontfeatures]{\@headfontname}
@@ -144,7 +146,7 @@
 %%
 %% Now to get the decofont activated:
 % Decorative glyphs, only in this font. Should not be re-set by user:
-\gdef\decoglyph#1{~} % If NovelDeco not found, non-breaking space in main text.
+\gdef\decoglyph#1{~}% If NovelDeco not found, nonbreaking space in main text.
 %
 \if@gotdeco % NovelDeco or a user-defined alternative was found:
   \newfontface\@decoglyph[%
@@ -162,19 +164,19 @@
   %
   \gdef\decoglyph#1{% Be sure to use % without preceding space:
     \IfBeginWith{#1}{n}{% normal weight symbol (same as regular)
-      \StrBehind{#1}{n}[\@tempdecoglyph]{\@decoglyph\symbol{\@tempdecoglyph}}%
+     \StrBehind{#1}{n}[\@tempdecoglyph]{\@decoglyph\symbol{\@tempdecoglyph}}%
     }{}%
     \IfBeginWith{#1}{r}{% regular weight symbol
-      \StrBehind{#1}{r}[\@tempdecoglyph]{\@decoglyph\symbol{\@tempdecoglyph}}%
+     \StrBehind{#1}{r}[\@tempdecoglyph]{\@decoglyph\symbol{\@tempdecoglyph}}%
     }{}%
     \IfBeginWith{#1}{l}{% light weight symbol
-      \StrBehind{#1}{l}[\@tempdecoglyph]{\@decoglypha\symbol{\@tempdecoglyph}}%
+    \StrBehind{#1}{l}[\@tempdecoglyph]{\@decoglypha\symbol{\@tempdecoglyph}}%
     }{}%
     \IfBeginWith{#1}{e}{% extra light weight symbol
-      \StrBehind{#1}{e}[\@tempdecoglyph]{\@decoglyphb\symbol{\@tempdecoglyph}}%
+    \StrBehind{#1}{e}[\@tempdecoglyph]{\@decoglyphb\symbol{\@tempdecoglyph}}%
     }{}%
     \IfBeginWith{#1}{t}{% thin weight symbol
-      \StrBehind{#1}{t}[\@tempdecoglyph]{\@decoglyphc\symbol{\@tempdecoglyph}}%
+    \StrBehind{#1}{t}[\@tempdecoglyph]{\@decoglyphc\symbol{\@tempdecoglyph}}%
     }{}%
   }% end gdef decoglyph
   %
@@ -234,8 +236,8 @@
     \setotherlanguages[\@setotherlangsopt]{\@setotherlangs}
   }
 }
-%% This provides default microtype settings, allows the user to over-ride, and
-%  hopefully prevents the user from choosing inappropriate settings:
+%% This provides default microtype settings, allows the user to over-ride,
+%    and hopefully prevents the user from choosing inappropriate settings:
 \let\microtypesetup\relax % fake command no longer needed
 \if@setmicrotype % user wrote \microtypesetup{} in Preamble
   \IfSubStr{\@mymicrotypesetup}{config}{% user specified own config file
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty
index 326f4a484d2..e7499c77308 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/27 v1.0.10 LaTeX file (commands for footnotes and endnotes)]
+[2017/04/12 v1.1 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 8f08dd349c9..6f6c9e47d15 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/27 v1.0.10 LaTeX file (header and footer styles)]
+[2017/04/12 v1.1 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 8c1a8dab051..7054d3c31b5 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/27 v1.0.10 LaTeX file (image placement)]
+[2017/04/12 v1.1 LaTeX file (image placement)]
 %%
 
 
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo
index 5c85ddc0ae2..3c3e7597d7f 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.10
+% Typically used in Japan. Novel file version 1.1
 
 % 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 0e6215ddfcd..e10c1cada65 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
@@ -13,11 +13,11 @@
 %% 
 %%
 \ProvidesFile{novel-LayoutSettings.sty}%
-[2017/03/27 v1.0.10 LaTeX file (layout settings)]
+[2017/04/12 v1.1 LaTeX file (layout settings)]
 %%
 
 
-%% Note that nearly all layout settings are pre-configured based on Trim Size.
+%% Note that nearly all layout settings are preconfigured based on Trim Size.
 %% In general, these user commands may be used to over-ride the presets.
 
 \newlength\Old@TrimWidth % finished width of printed book
@@ -57,12 +57,12 @@
 
 
 %% SIZE-RELATED COMMANDS AVAILABLE IN PREAMBLE.
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
 %% Use if necessary for customization.
 %% If you like a class option that pre-sets these values,
 %% then you do not have to use any of these commands.
 %
-% Note: This class does not ask you to set the width or height of the textblock.
+% Note: This class does not ask you to set the width/height of the textblock.
 % Instead, these values are automatically calculated from other dimensions.
 %
 
@@ -166,11 +166,11 @@
   }
   \ifthenelse{\equal{#1}{edge}}{\@offcenterTrimtrue}{}
 }
-% \SetLinesPerPage{} may be limited due to fontsize and Trim Size constraints.
+% \SetLinesPerPage{} limited due to fontsize and Trim Size constraints.
 % There is no `rework' command, because as long as the number of lines fit,
 %   the line spacing will be automatically changed to fit a reworked size.
 %   The only possible problem is if lines were originally so tight that
-%   a reworked size cannot fit. In that case, the user's best plan is to remove
+%   a reworked size cannot fit. In that case, the user's best plan is remove
 %   header or footer (if possible), or reduce vertical margins (if possible).
 \newcommand\SetLinesPerPage[1]{
   \global\@LinesPerPageSettrue
@@ -196,13 +196,13 @@
 
 
 %% RESERVE SPACE FOR HEADER/FOOTER, AND SET DEFAULT CHAPTER DISPLAY PAGE
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
 %% At this point, `novel' needs to know whether or not header/footer used,
 %% so that space can be reserved at top/bottom. Actual styling comes later.
 %
 % If the user wishes to tweak layout, these Preamble commands store info,
 %   that will be used in novel-CalculateLayout.sty.
-% The jumps are scale factors, which increase or decrease headsep and footskip
+% The jumps are scale factors, which increase/decrease headsep and footskip
 %   relative to normal baselineskip. Do not use \setlength\headsep or
 %   \setlength\footskip directly, because direct settings will lead to
 %   improper calculations.
@@ -295,7 +295,7 @@
   \ifthenelse{\equal{\@setchapterstart}{dropfolio}}{% no footnote there
     \def\@setchapterstartOK{true}%
   }{}%
-  \ifthenelse{\equal{\@setchapterstart}{dropfoliolater}}{% has footnote(s) there
+  \ifthenelse{\equal{\@setchapterstart}{dropfoliolater}}{% footnote(s) there
     \def\@setchapterstartOK{true}%
   }{}%
   \ifthenelse{\equal{\@setchapterstart}{foliobeneath}}{%
@@ -324,9 +324,11 @@
 \newcommand\SetMarkerStyle[2][real]{
   \def\@goodfnm{no}
   \ifthenelse{\equal{#2}{asterisk}}{%
-    \def\@goodfnm{yes}\global\toggletrue{@usesymbolmark}\gdef\@myfnsymbols{*}}{}
+    \def\@goodfnm{yes}\global\toggletrue{@usesymbolmark}%
+    \gdef\@myfnsymbols{*}}{}
   \ifthenelse{\equal{#2}{dagger}}{%
-    \def\@goodfnm{yes}\global\toggletrue{@usesymbolmark}\gdef\@myfnsymbols{†}}{}
+    \def\@goodfnm{yes}\global\toggletrue{@usesymbolmark}%
+    \gdef\@myfnsymbols{†}}{}
   \ifthenelse{\equal{#2}{number}}{%
     \def\@goodfnm{yes}\global\togglefalse{@usesymbolmark}}{}
   \def\@goodfnk{no}
@@ -369,7 +371,7 @@
 
 
 %% MISCELLANOUS SETTINGS. Mostly remove "glue". Best to leave as-is.
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
 %%
 %
 \@twocolumnfalse
@@ -430,8 +432,8 @@
 %% End miscellaneous settings.
 
 
-% The following might become unnecessary if fontspec adds the capability
-%   to disable keys. For now: Color and Opacity cannot be used as font features,
+% The following might become unnecessary if fontspec adds the capability to
+% disable keys. For now: Color and Opacity cannot be used as font features,
 %   for a black/white printed book. Alas, fontspec over-rules xcolor.
 % So, this code over-rules fontspec:
 \gdef\novel@checkfeatures#1{%
@@ -452,11 +454,13 @@
 
 
 
-%% DEFINITION OF MASTER AND OTHER FONTS
-%% -----------------------------------------------------------------------------
-%%
+%% DEFINITION OF PARENT AND OTHER FONTS
+%% --------------------------------------------------------------------------
+%% Prior to v. 1.1, parentfont was known as masterfont. Backwards compatible.
+%
+\providecommand\rmdefault{lmr} % should be lmr anyway, at this point.
 % The `no-math' option prevents fontspec from tracking certain font changes.
-%   This is probably necessary, since novel does some of its own font tracking:
+% This is probably necessary, since novel does some of its own font tracking:
 \RequirePackage[no-math]{fontspec} % For LuaLaTeX. NOT package `fontenc'.
 \defaultfontfeatures{} % reset
 % User-created fonts (not standard, not novel-specific defaults:
@@ -464,38 +468,32 @@
   SmallCapsFeatures={Renderer=Basic},Kerning=On,%
   Ligatures=TeX,%
 }%
-% Latin Modern Math (Open Type) fonts will be selected by default, for math.
 % You shouldn't be doing math! You can use \setmathfont, if you wish.
-% If you must load a math font package, it should be done using \RequirePackage
-%   before (yes, before) calling the document class.
+% If you must load a math font package, it should be done using
+%  \RequirePackage before (yes, before) calling the document class.
 \RequirePackage{unicode-math}
 %%
 %% This could have been easier, but fontspec allows mandatory and optional
 %   arguments to appear in either order. We wish to store the fontnames
 %   and arguments, but need Expl syntax to tell which is which.
-\let\@setmainfont\setmainfont\relax
-\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.^^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:
-% The master font will become the main font AtEndPreamble. It will also become
+%% Store settings for the parent font:
+% \AtEndPreamble, the parent font becomes becomes
 %   the default ancestor of all novel-defined fonts, except the deco font.
-\newif \if@masterfontset
-\gdef\@masterfontfeatures{}
-\gdef\@masterfontname{}
-\DeclareDocumentCommand \SetMasterFont { O{} m O{} } {%
+\newif \if@parentfontset
+\gdef\@parentfontfeatures{}
+\gdef\@parentfontname{}
+\DeclareDocumentCommand \SetParentFont { O{} m O{} } {% from version 1.1.
+  \novel@checkfeatures{#1,#3}
+  \gdef\@parentfontfeatures{#1,#3}
+  \gdef\@parentfontname{#2}
+  \global\@parentfontsettrue
+}%
+\DeclareDocumentCommand \SetMasterFont { O{} m O{} } {% DEPRECATED
   \novel@checkfeatures{#1,#3}
-  \gdef\@masterfontfeatures{#1,#3}
-  \gdef\@masterfontname{#2}
-  \global\@masterfontsettrue
+  \gdef\@parentfontfeatures{#1,#3}
+  \gdef\@parentfontname{#2}
+  \global\@parentfontsettrue
 }%
 %% Store settings for the chapterfont:
 % The chapter font is used by the \ChapterTitle{} command.
@@ -564,7 +562,7 @@
 \cs_new_eq:NN \AddFontFeature \addfontfeatures
 %%
 %% \CreateFontFeature{substitutions}{feature code}
-% Problem: The font has one or more alternate glyphs that you would like to use,
+% Problem: Font has one or more alternate glyphs that you would like to use,
 %   but they are not listed in a feature set for the font.
 % Solution: Create your own feature set, with \CreateFontFeature. The created
 %   feature may then be used like a real feature, in any font definition.
@@ -583,7 +581,7 @@
 %   a style set such as ss03 if you are sure that the font in question
 %   do not already have ss03 (but this is taking a chance).
 % Once defined, you may use it like this (for example):
-%   \SetMasterFont[RawFeature=+myfs]{fontname}
+%   \SetParentFont[RawFeature=+myfs]{fontname}
 %   \NewFontFamily\myfake[RawFeature=+myfs]{fontname}
 %   In the document body: {\addfontfeature{myfs} text}
 \DeclareDocumentCommand \CreateFontFeature { m m } {%
@@ -602,12 +600,12 @@
 %%
 \ExplSyntaxOff
 %%
-%% end definition of master and other fonts.
+%% end definition of parent and other fonts.
 
 
 
 %% FAKE POLYGLOSSIA COMMANDS
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
 % The polyglossia package is not loaded until \AtEndPreamble.
 % So, its commands are not directly available in the Preamble.
 % These fake commands store the data. Later, the commands will be relaxed,
@@ -643,7 +641,7 @@
 
 
 %% FRONTMATTER, MAINMATTER, BACKMATTER
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
 %
 \newif \ifWithinFrontmatter \WithinFrontmatterfalse
 \newif \ifWithinMainmatter \WithinMainmatterfalse
@@ -658,14 +656,14 @@
     {You issued \string\frontmatter\ more than once.^^J}%
   \fi
   \ifWithinMainmatter
-    \ClassError{novel}{\string\frontmatter\ cannot follow \mainmatter}%
-    {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
-      but you do not need all of them.^^J}%
+   \ClassError{novel}{\string\frontmatter\ cannot follow \mainmatter}%
+   {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
+    but you do not need all of them.^^J}%
   \fi
   \ifWithinBackmatter
-    \ClassError{novel}{\string\frontmatter\ cannot follow \backmatter}%
-    {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
-      but you do not need all of them.^^J}%
+   \ClassError{novel}{\string\frontmatter\ cannot follow \backmatter}%
+   {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
+    but you do not need all of them.^^J}%
   \fi
   \WithinFrontmattertrue\WithinMainmatterfalse\WithinBackmatterfalse
   \pagenumbering{roman}
@@ -679,9 +677,9 @@
     {You issued \string\mainmatter\ more than once.}%
   \fi
   \ifWithinBackmatter
-    \ClassError{novel}{\string\mainmatter\ cannot follow \backmatter}%
-    {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
-      but you do not need all of them.^^J}%
+   \ClassError{novel}{\string\mainmatter\ cannot follow \backmatter}%
+   {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
+    but you do not need all of them.^^J}%
   \fi
   \WithinFrontmatterfalse\WithinMainmattertrue\WithinBackmatterfalse
   \setcounter{frontmatterpages}{\value{page}}
@@ -692,7 +690,7 @@
 %
 \def\backmatter{\@ifstar\@backmatterst\@backmatterns}
 %
-\def\@backmatterst{ % continues frontmatter count with lowercase roman numerals
+\def\@backmatterst{% continues frontmatter count w/ lowercase roman numerals
   \ifWithinBackmatter
     \ClassError{novel}{\string\backmatter\space used more than once}%
     {You issued \string\backmatter\space more than once.^^J}%
@@ -700,9 +698,9 @@
   % If you really must go directly from front to back without main,
   %   simply issue \mainmatter\backmatter together. Not advised.
   \ifWithinFrontmatter
-    \ClassError{novel}{Missing \string\mainmatter}%
-    {You went directly from \string\frontmatter\space to \string\backmatter^^J%
-     Must have \string\mainmatter\space in between.^^J}%
+  \ClassError{novel}{Missing \string\mainmatter}%
+  {You went directly from \string\frontmatter\space to \string\backmatter^^J%
+   Must have \string\mainmatter\space in between.^^J}%
   \fi
   \WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue
   \addtocounter{frontmatterpages}{1}
@@ -718,16 +716,16 @@
   % If you really must go directly from front to back without main,
   %   simply issue \mainmatter\backmatter together. Not advised.
   \ifWithinFrontmatter
-    \ClassError{novel}{Missing \string\mainmatter}%
-    {You went directly from \string\frontmatter\space to \string\backmatter^^J%
-     Must have \string\mainmatter\space in between.^^J}%
+  \ClassError{novel}{Missing \string\mainmatter}%
+  {You went directly from \string\frontmatter\space to \string\backmatter^^J%
+   Must have \string\mainmatter\space in between.^^J}%
   \fi
   \WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue
 }
 %
 \def\Backmatter{\@ifstar\@Backmatterst\@Backmatterns}
 %
-\def\@Backmatterst{ % continues frontmatter count with uppercase Roman numerals
+\def\@Backmatterst{% continues frontmatter count w/ uppercase Roman numerals
   \ifWithinBackmatter
     \ClassError{novel}{\string\backmatter\space used more than once}%
     {You issued \string\backmatter\space more than once.^^J}%
@@ -735,9 +733,9 @@
   % If you really must go directly from front to back without main,
   %   simply issue \mainmatter\backmatter together. Not advised.
   \ifWithinFrontmatter
-    \ClassError{novel}{Missing \string\mainmatter}%
-    {You went directly from \string\frontmatter\space to \string\backmatter^^J%
-     Must have \string\mainmatter\space in between.^^J}%
+  \ClassError{novel}{Missing \string\mainmatter}%
+  {You went directly from \string\frontmatter\space to \string\backmatter^^J%
+   Must have \string\mainmatter\space in between.^^J}%
   \fi
   \WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue
   \addtocounter{frontmatterpages}{1}
@@ -753,9 +751,9 @@
   % If you really must go directly from front to back without main,
   %   simply issue \mainmatter\backmatter together. Not advised.
   \ifWithinFrontmatter
-    \ClassError{novel}{Missing \string\mainmatter}%
-    {You went directly from \string\frontmatter\space to \string\backmatter^^J%
-     Must have \string\mainmatter\space in between.^^J}%
+  \ClassError{novel}{Missing \string\mainmatter}%
+  {You went directly from \string\frontmatter\space to \string\backmatter^^J%
+   Must have \string\mainmatter\space in between.^^J}%
   \fi
   \WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue
   \pagenumbering{Roman}
@@ -767,12 +765,12 @@
 
 
 %% DISABLE OR NEUTRALIZE SOME STANDARD LATEX COMMANDS
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
 % The `novel' class disallows these commands, or neutralizes them by simply
-% repeating their arguments. In some cases, they request functionality that is
-% not implemented in `novel'. In other cases, the functionality is part of core,
+% repeating their arguments. In some cases, they request functionality that's
+% not implemented in `novel'. In other cases, functionality is part of core,
 % but would interfere with the `novel' emphasis on constant line skip.
-% You may re-define the commands using your own code in Preamble (discouraged).
+% You may redefine the commands using your own Preamble code (discouraged).
 %
 \gdef\null{\hbox{\strut}} % May be important!
 %
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
index 76d23fb55cb..309f2249990 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/27 v1.0.10 LaTeX file (text macros usable within document body)]
+[2017/04/12 v1.1 LaTeX file (text macros usable within document body)]
 %%
 
 
@@ -33,7 +33,7 @@
 % \thesubtitle or \theSubtitle returns string set by \subtitle{} or \SetSubtitle{} -- See novel-LayoutSettings.sty.
 % \InlineImage, \BlockImage, \ClearImage -- See novel-Images.sty.
 % \scenebreak, \sceneline, \scenestars -- See novel-ChapterScene.sty.
-% ChapterStart, \ChapterTitle{}, \ChapterSubtitle{}, \ChapterDeco{}, \ChapterText -- See novel-ChapterScene.sty.
+% ChapterStart, \ChapterTitle{}, \ChapterSubtitle{}, \ChapterDeco{} -- See novel-ChapterScene.sty.
 % \DecoChapterTitle{}{}, \SideDecoChapterTitle{}, ModernChapterTitle[]{}{} -- See novel-ChapterScene.sty.
 % {\chapterfont text} and other pre-defined font selection commands -- See novel-LayoutSettings.sty.
 % \decoglyph{} and \acronym{} -- See novel-FontDefaults.sty.
@@ -57,7 +57,6 @@
 % toc environment for table of contents.
 % \tocitem[]{}{} and \tocitem*[]{}{} for one-line entries in toc.
 % legalese environment uses ragged right, disables hyphenation, and reduces microtype tweaks.
-% poem environment uses ragged right, disables hyphenation, parindent zero, and optional increased right margin.
 % \showlength[round]{length}{units} returns the length, re-calculated in units, rounded.
 % \supersub{raise}{scale}{text} alternative to superscript and subscript commands.
 % \sups{text}, \subs{text}, and \sinf{text} other alternatives to super/subscripts.
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex
index e7b21e019c5..ff26b82150a 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/27 v1.0.10 LaTeX file (additional glyph to unicode)]
+[2017/04/12 v1.1 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 c5f73085be4..3cda2d724ea 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/27 v1.0.10 LaTeX file (microtype configuration file for novel class)]
+  [2017/04/212 v1.1 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 59723c00064..fb965571488 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/27 v1.0.10 LaTeX file (PDF/X support for novel class)]
+  [2017/04/12 v1.1 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 5f2c92d9fce..ebe462d2668 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/27 v1.0.10 LaTeX file (novel XMP packet template)]
+[2017/04/12 v1.1 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 e0245543b0f..bcdc6cef3bb 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/27 v1.0.10 LaTeX document class]
+\ProvidesClass{novel}[2017/04/12 v1.1 LaTeX document class]
 %%