novel (6mar17)

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

7 files changed, 66 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty
index 7fdf5adb33c..c0154c81533 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/01 v1.0.6 LaTeX file (chapter and scene macros)]
+[2017/03/05 v1.0.6a LaTeX file (chapter and scene macros)]
 %%
 
 
@@ -87,7 +87,7 @@
   \FPsub{\@fixlines}{#1}{3}%
   \FPsub{\@fixlines}{\@fixlines}{0.001}% fudge to avoid rounding problems
   \if@thispagestyleset\else\thispagestyle{\@setchapterdisplay}\fi%
-  \null%
+  \strut\bunchofspaces\par% embeds various actual space characters
   \ResetFootnoteSymbol% resets symbolic markers, but not numeric markers
   \if@addCTline\null\else\fi% used with dropfolio
   \setcounter{@linequarter}{0}%
@@ -208,6 +208,8 @@
 %   the line grid using some amount of \vspace{}. That's your problem.
 %
 \newcommand\Epigraph[2][c]{% note capital E
+  \strut\bunchofspaces\par
+  \vspace{-\nbs}
   \StrDel{#1}{ }[\@onens]
   \StrCut{\@onens}{,}{\@onealigna}{\@onemore}
   \StrCut{\@onemore}{,}{\@onefsa}{\@onewsa}
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty
index 72426d40435..9bbb74796d9 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/01 v1.0.6 LaTeX file (default fonts)]
+[2017/03/05 v1.0.6a LaTeX file (default fonts)]
 %%
 
 
@@ -103,7 +103,7 @@
  }
 \fi
 % Now we are ready to set the main font:
-\setmainfont[\@masterfontfeatures]{\@masterfontname}
+\@setmainfont[\@masterfontfeatures]{\@masterfontname}
 %
 %%
 \defaultfontfeatures{} % reset
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty
index 8717ac15fa2..a79118c2614 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/01 v1.0.6 LaTeX file (header and footer styles)]
+[2017/03/05 v1.0.6a LaTeX file (header and footer styles)]
 %%
 
 
@@ -147,6 +147,7 @@
 
 %% ACTIVATE HEADER/FOOTER STYLES AT BEGIN DOCUMENT
 %% -----------------------------------------------------------------------------
+%% \bunchofspaces is defined in novel-TextMacros.sty.
 %
 \gdef\@activateHeadFootStyles{ % called \AtBeginDocument by novel.cls
   % Pre-configured header/footer styles, unless user over-rode them:
@@ -174,6 +175,7 @@
       }
       \fancyhead[CE]{{\headfont\textls[\@loosehead]{\versoheadtext}}}
       \fancyhead[CO]{{\headfont\textls[\@loosehead]{\rectoheadtext}}}
+      \fancyhead[RE,LO]{\bunchofspaces}
     \fi
   }{}
   %
@@ -185,6 +187,7 @@
       \fancyfoot[RO]{\my@RectoEmblem\makebox[2.5em][r]{%
         {\headfont\textls[\@looseheadnum]{\pagenumberstyle}}}%
       }
+      \fancyfoot[RE,LO]{\bunchofspaces}
     \fi
   }{}
   %
@@ -193,6 +196,7 @@
       \fancyfoot[CO,CE]{{%
         \headfont\textls[\@looseheadnum]{\pagenumberstyle}}%
       }
+      \fancyfoot[RE,LO]{\bunchofspaces}
     \fi
   }{}
   %
@@ -207,6 +211,7 @@
         \hspace{1em}\my@RectoEmblem\makebox[2.5em][r]{{%
           \headfont\textls[\@looseheadnum]{\pagenumberstyle}}}%
       }
+      \fancyhead[RE,LO]{\bunchofspaces}
     \fi
   }{}
   %
@@ -219,6 +224,7 @@
       \fancyfoot[CO,CE]{%
         {\headfont\textls[\@looseheadnum]{\pagenumberstyle}}%
       }
+      \fancyfoot[RE,LO]{\bunchofspaces}
     \fi
   }{}
   %
@@ -232,6 +238,7 @@
       }
       \fancyhead[RE]{{\headfont\textls[\@loosehead]{\versoheadtext}}}
       \fancyhead[LO]{{\headfont\textls[\@loosehead]{\rectoheadtext}}}
+      \fancyhead[CE,CO]{\bunchofspaces}
     \fi
   }{}
   %
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
index 1de97130d1d..2b8cd8af45f 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/01 v1.0.6 LaTeX file (layout settings)]
+[2017/03/05 v1.0.6a LaTeX file (layout settings)]
 %%
 
 
@@ -472,10 +472,16 @@
 %% 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.}%
+}
 \ExplSyntaxOn
 %% Store settings for the master font:
 % The master font will become the main font AtEndPreamble. It will also become
-%   the default ancestor of all novel-defined fonts, except the deco font. 
+%   the default ancestor of all novel-defined fonts, except the deco font.
 \newif \if@masterfontset
 \gdef\@masterfontfeatures{}
 \gdef\@masterfontname{}
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
index 613202fe5c4..b50f647a839 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/01 v1.0.6 LaTeX file (text macros usable within document body)]
+[2017/03/05 v1.0.6a LaTeX file (text macros usable within document body)]
 %%
 
 
@@ -65,6 +65,7 @@
 % \stake inserts zero-width rule, 1pt thick, as placeholder.
 % \color and \textcolor (from package xcolor) have been modified to ensure black, or grayscale when permitted.
 % \squeeze{} and \crush{} for emergency text adjustment.
+% \bunchofspaces for inserting a pile of actual text space characters in one place.
 
 
 %% The following useful commands are from core code, or other pre-loaded packages.
@@ -356,7 +357,7 @@
 %
 %%
 % Environment toc (alternative table of contents):
-% optional argument: additional vspace after each \tocitem entry.
+% optional argument: additional vspace (\nbs) after each \tocitem entry.
 % required: LR margin increase, to narrow the table (0pt = full textwidth).
 \newlength\@tocnumwid
 \newlength\@tocskip
@@ -368,6 +369,8 @@
   \global\@tocnumwid=\@tocnumwid%
   \setlength\@tocskip{#1\nbs}%
   \global\@tocskip=\@tocskip%
+  \strut\bunchofspaces\par%
+  \vspace{-\nbs}%
 }{%
   \endgroup\end{adjustwidth}\par%
 }%
@@ -522,6 +525,41 @@
 %%
 
 
+%% Ensures that actual space characters are present on each numbered page.
+%% Some PDF software cannot accurately extract text, without seeing the space.
+\gdef\bunchofspaces{%
+  \smash{%
+    {\chapterfont%
+      \char"20%
+      \rlap{\emph{\char"20}}%
+      \rlap{\textbf{\char"20}}%
+      \rlap{\textbf{\emph{\char"20}}}%
+    }%
+    {\subchfont%
+      \rlap{\char"20}%
+      \rlap{\emph{\char"20}}%
+      \rlap{\textbf{\char"20}}%
+      \rlap{\textbf{\emph{\char"20}}}%
+    }%
+    {\headfont%
+      \rlap{\char"20}%
+      \rlap{\emph{\char"20}}%
+      \rlap{\textbf{\char"20}}%
+      \rlap{\textbf{\emph{\char"20}}}%
+    }%
+    \rmfamily{%
+      \rlap{\char"20}%
+      \rlap{\emph{\char"20}}%
+      \rlap{\textbf{\char"20}}%
+      \rlap{\textbf{\emph{\char"20}}}%
+    }%
+    {\decofont\rlap{\char"20}}%
+  }%
+}%
+%% end \bunchofspaces
+\gdef\specialblankline{\strut\bunchofspaces\par}
+%%
+
 
 %%
 %% End of file `novel-TextMacros.sty'.
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty
index 43f2df3502b..e84d46ccd6f 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/01 v1.0.6 LaTeX file (novel XMP packet template)]
+[2017/03/05 v1.0.6a LaTeX file (novel XMP packet template)]
 %%
 
 
@@ -37,7 +37,7 @@
 
 
 \begingroup
-
+\catcode`\¤=12\relax
 \lccode`\¤="FEFF
 \lowercase{\gdef\@novelBOM{¤}}
 \catcode`\#=12
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel.cls b/Master/texmf-dist/tex/lualatex/novel/novel.cls
index f39aa7fa09e..39d55c4fd66 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/01 v1.0.6 LaTeX document class]
+\ProvidesClass{novel}[2017/03/05 v1.0.6a LaTeX document class]
 %%
 
 
@@ -72,6 +72,7 @@
 % Prevent complaints about no protrusion list for cmr, cmm, etc. in decimal pts:
 \WarningFilter{microtype}{I cannot find a protrusion list} % It's not there!
 %
+\WarningsOff[Fancyhdr,fancyhdr] % complains about headheight when no header
 \RequirePackage[relative]{textpos} % for inserting images
 \RequirePackage{noindentafter} % for unindented chapter and scene starts
 \RequirePackage{calc} % allows length expression calculations