From 82e5a90bfde07a5459c34702012cb65d32038575 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Mar 2017 22:51:55 +0000 Subject: novel (8mar17) git-svn-id: svn://tug.org/texlive/trunk@43447 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/lualatex/novel/novel-CGATSTR001.clo | 2 +- .../tex/lualatex/novel/novel-CalculateLayout.sty | 2 +- .../tex/lualatex/novel/novel-ChapterScene.sty | 4 +-- .../tex/lualatex/novel/novel-FOGRA39.clo | 2 +- .../tex/lualatex/novel/novel-FileData.sty | 2 +- .../tex/lualatex/novel/novel-FontDefaults.sty | 9 +++-- .../tex/lualatex/novel/novel-Footnotes.sty | 2 +- .../tex/lualatex/novel/novel-HeadFootStyles.sty | 11 ++---- .../texmf-dist/tex/lualatex/novel/novel-Images.sty | 2 +- .../tex/lualatex/novel/novel-JC200103.clo | 2 +- .../tex/lualatex/novel/novel-LayoutSettings.sty | 5 +-- .../tex/lualatex/novel/novel-TextMacros.sty | 41 ++-------------------- .../tex/lualatex/novel/novel-glyphtounicode.tex | 2 +- .../tex/lualatex/novel/novel-microtype.cfg | 2 +- .../texmf-dist/tex/lualatex/novel/novel-pdfx.sty | 6 ++-- .../tex/lualatex/novel/novel-xmppacket.sty | 2 +- Master/texmf-dist/tex/lualatex/novel/novel.cls | 2 +- 17 files changed, 26 insertions(+), 72 deletions(-) (limited to 'Master/texmf-dist/tex/lualatex') diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo index ba1653ff03f..ec34e8b1fde 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.6 +% Typically used in the USA. Novel file version 1.0.9 % 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 92d38d8bf68..ed715fc7161 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/01 v1.0.6 LaTeX file (layout calculations)] +[2017/03/09 v1.0.7 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 c0154c81533..2ed0a50c957 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/05 v1.0.6a LaTeX file (chapter and scene macros)] +[2017/03/09 v1.0.7 LaTeX file (chapter and scene macros)] %% @@ -87,7 +87,6 @@ \FPsub{\@fixlines}{#1}{3}% \FPsub{\@fixlines}{\@fixlines}{0.001}% fudge to avoid rounding problems \if@thispagestyleset\else\thispagestyle{\@setchapterdisplay}\fi% - \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,7 +207,6 @@ % 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} diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo index 64536e5345d..2fddbeba175 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.6 +% Typically used in Europe. Novel file version 1.0.9 % 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 86df6b85e6f..0a4c81843b8 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/01 v1.0.6 LaTeX file (File Data settings)] +[2017/03/09 v1.0.7 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 9bbb74796d9..e1f113620b7 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/05 v1.0.6a LaTeX file (default fonts)] +[2017/03/09 v1.0.7 LaTeX file (default fonts)] %% @@ -50,7 +50,6 @@ } } }{} % User \setmonofont, so leave alone. -% %% \defaultfontfeatures{} % reset % Main and sans fonts use kerning, ligatures, and OldStyle numbers if available: @@ -112,17 +111,17 @@ SmallCapsFeatures={Renderer=Basic},Kerning=On,% Ligatures=TeX,Ligatures=CommonOff,Numbers=Lining,% }% -% The novel-specific fonts: +%% The novel-specific fonts: \if@chapterfontset\else \SetChapterFont[\@masterfontfeatures,Scale=1.6]{\@masterfontname} \fi \newfontfamily\chapterfont[\@chapterfontfeatures]{\@chapterfontname} -% +%% \if@subchfontset\else \SetSubchFont[\@masterfontfeatures,Scale=1.2]{\@masterfontname} \fi \newfontfamily\subchfont[\@subchfontfeatures]{\@subchfontname} -% +%% \newif \if@headfontdefault \if@headfontset\else \SetHeadFont[\@masterfontfeatures,Scale=0.92]{\@masterfontname} diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty index 4cdec984649..184678f513e 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/01 v1.0.6 LaTeX file (commands for footnotes and endnotes)] +[2017/03/09 v1.0.7 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 a79118c2614..a37471d1611 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/05 v1.0.6a LaTeX file (header and footer styles)] +[2017/03/09 v1.0.7 LaTeX file (header and footer styles)] %% @@ -147,7 +147,6 @@ %% 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: @@ -175,7 +174,6 @@ } \fancyhead[CE]{{\headfont\textls[\@loosehead]{\versoheadtext}}} \fancyhead[CO]{{\headfont\textls[\@loosehead]{\rectoheadtext}}} - \fancyhead[RE,LO]{\bunchofspaces} \fi }{} % @@ -187,7 +185,6 @@ \fancyfoot[RO]{\my@RectoEmblem\makebox[2.5em][r]{% {\headfont\textls[\@looseheadnum]{\pagenumberstyle}}}% } - \fancyfoot[RE,LO]{\bunchofspaces} \fi }{} % @@ -196,7 +193,6 @@ \fancyfoot[CO,CE]{{% \headfont\textls[\@looseheadnum]{\pagenumberstyle}}% } - \fancyfoot[RE,LO]{\bunchofspaces} \fi }{} % @@ -211,7 +207,6 @@ \hspace{1em}\my@RectoEmblem\makebox[2.5em][r]{{% \headfont\textls[\@looseheadnum]{\pagenumberstyle}}}% } - \fancyhead[RE,LO]{\bunchofspaces} \fi }{} % @@ -224,7 +219,6 @@ \fancyfoot[CO,CE]{% {\headfont\textls[\@looseheadnum]{\pagenumberstyle}}% } - \fancyfoot[RE,LO]{\bunchofspaces} \fi }{} % @@ -238,7 +232,6 @@ } \fancyhead[RE]{{\headfont\textls[\@loosehead]{\versoheadtext}}} \fancyhead[LO]{{\headfont\textls[\@loosehead]{\rectoheadtext}}} - \fancyhead[CE,CO]{\bunchofspaces} \fi }{} % @@ -361,7 +354,7 @@ \let\SetRectoHeadText\NewRectoHeadText\relax % for convenience \let\RenewRectoHeadText\NewRectoHeadText\relax % for convenience % -%% end dropfolio. +%% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty index 9a823653d37..9fdfde2189c 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/01 v1.0.6 LaTeX file (image placement)] +[2017/03/09 v1.0.7 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 5fb491ab202..db0a29a6b28 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.6 +% Typically used in Japan. Novel file version 1.0.9 % 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 2b8cd8af45f..8ab84227466 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/05 v1.0.6a LaTeX file (layout settings)] +[2017/03/09 v1.0.7 LaTeX file (layout settings)] %% @@ -218,6 +218,7 @@ \SetFootJump{1.5} % default % See docs part 7 for available style choices: \gdef\SetHeadFootStyle#1{\gdef\my@HeadFootStyle{#1}} +\gdef\SetHeadStyle#1{\gdef\my@HeadFootStyle{#1}} % deprecated % See docs part 7 for what these emblems do, if used: \newcommand\SetEmblems[2]{ % verso, recto \gdef\my@VersoEmblem{{\headfont #1}} @@ -602,7 +603,7 @@ %% FAKE POLYGLOSSIA COMMANDS %% ----------------------------------------------------------------------------- -% The polyglossia package is not loaded until \AfterEndPreamble. +% 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, % then the real polyglossia commands can work, and the data will be passed diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty index b50f647a839..ae0a0853088 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/05 v1.0.6a LaTeX file (text macros usable within document body)] +[2017/03/09 v1.0.7 LaTeX file (text macros usable within document body)] %% @@ -65,7 +65,6 @@ % \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. @@ -369,8 +368,6 @@ \global\@tocnumwid=\@tocnumwid% \setlength\@tocskip{#1\nbs}% \global\@tocskip=\@tocskip% - \strut\bunchofspaces\par% - \vspace{-\nbs}% }{% \endgroup\end{adjustwidth}\par% }% @@ -523,41 +520,7 @@ \let\textsuperscipt\sups\relax \let\textsubscript\subs\relax %% - - -%% 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} +\gdef\specialblankline{\null} % deprecated %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex index 62a53374ba5..e1126bc28a2 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/01 v1.0.6 LaTeX file (additional glyph to unicode)] +[2017/03/09 v1.0.7 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 e00ec591fae..5d42805753c 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/01 v1.0.6 LaTeX file (microtype configuration file for novel class)] + [2017/03/09 v1.0.7 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 36f7bbb67ff..c21380800f1 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/01 v1.0.6 LaTeX file (PDF/X support for novel class)] + [2017/03/09 v1.0.7 LaTeX file (PDF/X support for novel class)] % This package supports, and is part of, class `novel'. % No support for anything but LuaLaTeX. @@ -56,8 +56,8 @@ % Sanity check: If title is missing at this step, then compliance must be off: \ifpdfx@isOFF\else \if@gottitle\else - \ClassError{novel}{PDF/X requires \string\title\space first}% - {Unless \string\SetPDFX\space is off, must use \string\title\space ^^J% + \ClassError{novel}{PDF/X requires \string\SetTitle\space first}% + {Unless \string\SetPDFX\space is off, must use \string\SetTitle\space ^^J% before using \string\SetPDFX.^^J} \fi \fi diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty index e84d46ccd6f..7b770bc92cf 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/05 v1.0.6a LaTeX file (novel XMP packet template)] +[2017/03/09 v1.0.7 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 39d55c4fd66..89443fb1df3 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/05 v1.0.6a LaTeX document class] +\ProvidesClass{novel}[2017/03/09 v1.0.7 LaTeX document class] %% -- cgit v1.2.3