diff options
author | Karl Berry <karl@freefriends.org> | 2017-09-14 20:53:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-09-14 20:53:13 +0000 |
commit | bf209a8e0ec3db9f1fd8513bdc7341357468a1c0 (patch) | |
tree | 7051e2d44a0ace4c931e53451b5df80457ec360d /Master/texmf-dist/tex/lualatex | |
parent | 235f48116002765dd45a0eab7961e12c70a05fa7 (diff) |
novel (14sep17)
git-svn-id: svn://tug.org/texlive/trunk@45302 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
17 files changed, 81 insertions, 379 deletions
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo index 90117580e55..53df7ebe6b8 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.38 +% Typically used in the USA. Novel file version 1.40 % 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 77eb60a3637..61627aa2be6 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty @@ -12,15 +12,13 @@ %% %% \ProvidesFile{novel-CalculateLayout.sty}% -[2017/08/15 v1.38 LaTeX file (layout calculations)] +[2017/09/14 v1.40 LaTeX file (layout calculations)] %% %% %% This file is loaded \AtEndPreamble, which precedes \AtBeginDocument. %% -%% Novel Tracking messages in this file begin with 9. -\NDB{9.0 in novel-CalculateLayout.sty.} \newlength\normalFontSize % becomes 1em in normal text. \newlength\normalBaselineSkip % also abbreviated as \nbs @@ -37,7 +35,6 @@ \SetMediaSize{5.5in}{8.5in} \fi \fi -\NDB{9.1 in novel-CalculateLayout.sty.} % Default margins are based on Trim Height, if user does not set margins. % Works for standard w/h aspect ratios, but not for exotically narrow. \if@MarginsSet\else @@ -72,7 +69,6 @@ } % end internal dimtest } % end dimtest for margins. \fi % end default margins -\NDB{9.2 in novel-CalculateLayout.sty.} % % Choose default font size based on Trim Width, unless font size set by user: \if@FontSizeSet\else @@ -86,7 +82,6 @@ } % end internal dimtest } % end dimtest for font size. \fi -\NDB{9.3 in novel-CalculateLayout.sty.} % % Default lines/page based on Trim Height, font size, unless LPP set by user: \if@LinesPerPageSet\else @@ -102,7 +97,6 @@ \FPclip{\@tempLPP}{\@tempLPP} % remove excess trailing 0. \gdef\my@LinesPerPage{\@tempLPP} \fi -\NDB{9.4 in novel-CalculateLayout.sty.} % % Correct bottom margin for descenders, assumed to be 0.3em: \addtolength\Old@BottomMargin{0.3\Old@FontSize} @@ -120,7 +114,6 @@ % %% end set default sizes and initial corrections -\NDB{9.5 in novel-CalculateLayout.sty.} %% OLD, NEW, CURRENT, LIVE, TEXT MACRO DEFINITIONS @@ -180,7 +173,6 @@ % %% End old, new... macro definitions. -\NDB{9.6 in novel-CalculateLayout.sty.} %% PRELIMINARY CALCULATION OF BASELINESKIP %% ----------------------------------------------------------------------------- @@ -199,7 +191,6 @@ \if@gotFooter % allow for footer jump \FPadd{\adj@LinesPerPage}{\adj@LinesPerPage}{\@footjump} \fi -\NDB{9.7 in novel-CalculateLayout.sty.} % % Baseline Skip is Live Height divided by adjusted number of lines. % Thus initially, Text (with header/footer) occupies full Live Height. @@ -221,7 +212,6 @@ % %% End preliminary calculation of baselineskip. -\NDB{9.8 in novel-CalculateLayout.sty.} %% FIT CurrentTextWidth TO NewLiveWidth @@ -235,7 +225,6 @@ % %% end fit CurrentTextWidth to NewLiveWidth -\NDB{9.9 in novel-CalculateLayout.sty.} %% ADJUST CurrentBaselineSkip TO FIT NewLiveHeight %% ----------------------------------------------------------------------------- @@ -247,7 +236,6 @@ \setlength\Current@BaselineSkip{\Current@BaselineSkipNum pt} \FPmul{\Current@TextHeightNum}{\Current@BaselineSkipNum}{\adj@LinesPerPage} \fi -\NDB{9.10 in novel-CalculateLayout.sty.} % Check if the revised skip is too small: \FPdiv{\@ratioBLtoFS}{\Current@BaselineSkipNum}{\Current@FontSizeNum} \FPiflt{\@ratioBLtoFS}{1.2} % Too small. Re-tweak font, text width, skip. @@ -266,8 +254,6 @@ % %% end adjust CurrentBaselineSkip to fit NewLiveHeight. -\NDB{9.11 in novel-CalculateLayout.sty.} - %% DISTRIBUTE SIDE EXCESS %% ----------------------------------------------------------------------------- @@ -280,7 +266,6 @@ % %% end distribute side excess. -\NDB{9.12 in novel-CalculateLayout.sty.} %% SET TEXTWIDTH, FONT SIZE, BASELINESKIP @@ -294,14 +279,12 @@ \@setfontsize\normalsize\normalFontSize{\normalBaselineSkip}% \normalsize % Defined in `novel.cls'. Uses numbers, not lengths. % -\NDB{9.13 in novel-CalculateLayout.sty.} \newlength\nfs % abbreviation for normal fontsize \setlength\nfs{\normalFontSize} \gdef\nfsnum{\strip@pt\nfs} \newlength\nbs % abbreviation for normal baselineskip \setlength\nbs{\normalBaselineSkip} \gdef\nbsnum{\strip@pt\nbs} % just the numerical part -\NDB{9.14 in novel-CalculateLayout.sty.} % % This document class limits range of normal point size: \FPiflt{\Current@FontSizeNum}{8}% @@ -327,7 +310,6 @@ \typeout{^^JClass `novel' Alert: Line spacing is allowable, but wide.^^J% Consider more lines per page, or add header or footer.^^J}% \fi -\NDB{9.15 in novel-CalculateLayout.sty.} % \FPdiv{\Ratio@BaselineSkip}{\Current@BaselineSkipNum}{\Old@BaselineSkipNum} \FPround{\Ratio@BaselineSkip}{\Ratio@BaselineSkip}{3} @@ -336,7 +318,6 @@ \FPdiv{\Ratio@EM}{\Current@FontSizeNum}{\Old@FontSizeNum} \FPround{\Ratio@EM}{\Ratio@EM}{3} \FPclip{\Ratio@EM}{\Ratio@EM} -\NDB{9.16 in novel-CalculateLayout.sty.} % Alert if images scaled by \Rework: \ifthenelse{\equal{\Ratio@EM}{1} \AND \equal{\Ratio@BaselineSkip}{1}}{}{% \typeout{^^JClass `novel' Alert: Due to \string\Rework\space there may be^^J% @@ -362,8 +343,6 @@ % %% end set textwidth, font size, baselineskip -\NDB{9.17 in novel-CalculateLayout.sty.} - %% BEGIN LAYOUT CALCULATIONS @@ -378,7 +357,6 @@ \setlength\headheight{0pt} \setlength\headsep{0pt} \fi -\NDB{9.18 in novel-CalculateLayout.sty.} % % Prior to this, the following were set by user or calculated: % \textwidth \headsep \headheight @@ -396,8 +374,6 @@ \fi %% -\NDB{9.19 in novel-CalculateLayout.sty.} - % % Standard TeX \hoffset and \voffset is not relative to the MediaBox, but is @@ -439,7 +415,6 @@ \fi %% -\NDB{9.20 in novel-CalculateLayout.sty.} % % \evensidemargin is at the left (outside edge) of verso pages. @@ -457,9 +432,6 @@ \fi %% -\NDB{9.21 in novel-CalculateLayout.sty.} - - % % \topmargin is measured from 1in below the top of the MediaBox, to the top of @@ -484,7 +456,6 @@ \fi %% -\NDB{9.22 in novel-CalculateLayout.sty.} % Vertical position of the textblock is measured to the "top" of the first line % of text. But that could be an X height, or an accented character height, @@ -519,7 +490,6 @@ \fi %% -\NDB{9.23 in novel-CalculateLayout.sty.} %% End layout calculations. @@ -549,7 +519,6 @@ \fi % End when Media Size exceeds Trim Size. -\NDB{9.24 in novel-CalculateLayout.sty.} % When Media Size = Trim Size, cropmarks are disabled. % Too late for \@cropviewfalse; OK since CropBox already calculated properly. @@ -569,7 +538,6 @@ \newlength\adj@NewLiveHeight \setlength\adj@NewLiveHeight{\New@LiveHeight+0.3\normalFontSize} % -\NDB{9.25 in novel-CalculateLayout.sty.} \gdef\@getPageXY{ \check@IsVerso % defined in novel-HeadFootStyles.sty \if@isVerso @@ -591,7 +559,6 @@ \setlength\Live@By{\Trim@By+\New@BottomMargin-0.3\normalFontSize} } % -\NDB{9.26 in novel-CalculateLayout.sty.} %% With class option `shademargins' (only effective in draft mode): @@ -625,7 +592,6 @@ \fi% \fi % end \if@shademargins % -\NDB{9.27 in novel-CalculateLayout.sty.} % Labels each page with DRAFT at upper left, if in draft mode: \if@useDraftMode @@ -634,7 +600,6 @@ }% \fi % -\NDB{9.28 in novel-CalculateLayout.sty.} % Cropmarks (trim marks, really) are not important in this document class. % That's because the targeted printing services generally do not want them. @@ -694,7 +659,6 @@ % %% end cropmarks -\NDB{9.29 in novel-CalculateLayout.sty.} %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty index ef6ead346c1..01f6c8c813a 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty @@ -13,11 +13,9 @@ %% %% \ProvidesFile{novel-ChapterScene.sty}% -[2017/08/15 v1.38 LaTeX file (chapter and scene macros)] +[2017/09/14 v1.40 LaTeX file (chapter and scene macros)] %% -%% Novel Tracking messages in this file begin with 6. -\NDB{6.0 in novel-ChapterScene.sty.} % Class `novel' does not use \maketitle. @@ -27,7 +25,6 @@ You must make your own title pages!^^J}% } % -\NDB{6.1 in novel-ChapterScene.sty.} %% SCENE CHANGES @@ -57,7 +54,6 @@ \raisebox{-.3em}{*\quad\quad*\quad\quad*}\hfil\par% } %% end scene changes -\NDB{6.2 in novel-ChapterScene.sty.} %% Repair \FirstLine{} command from `magaz' package. @@ -67,7 +63,7 @@ % and empty line to restore grid and absorb the noindent. % Starred version uses the original \FirstLine definition, just in case % the following paragraph has some exotic feature. -% Thanks to user `egreg' at tex.stackexchange.com for debug assistance. +% Thanks to user `egreg' at tex.stackexchange.com for assistance. \let\oldFirstLine\FirstLine \def\FirstLine{\@ifstar\FirstLineFoo\@FirstLineFoo} % improved \def\FirstLineFoo#1{\oldFirstLine{#1}} % starred restores original def. @@ -75,7 +71,6 @@ \oldFirstLine{#1}\par\vspace{-\nbs}\strut\par% } %% -\NDB{6.3 in novel-ChapterScene.sty.} %% ChapterStart environment. @@ -90,7 +85,6 @@ % The argument is the number of normal baselineskips high: \newenvironment{ChapterStart}[1][10] {% - \NDB{6.4.0 in novel-ChapterScene.sty.}% \setlength\@oldparindent{\parindent}% \global\@oldparindent=\@oldparindent% \setlength\parindent{0pt}% @@ -102,9 +96,7 @@ \null% \setcounter{@linequarter}{0}% \begin{textblock*}{\textwidth}[0,0](0pt,0pt)% - \NDB{6.4.1 in novel-ChapterScene.sty.}% }{% close the environment: - \NDB{6.4.3 in novel-ChapterScene.sty.}% \ifthenelse{% \equal{\value{@linequarter}}{1} \OR \equal{\value{@linequarter}}{5}% \OR \equal{\value{@linequarter}}{9} \OR \equal{\value{@linequarter}}{13}% @@ -123,12 +115,10 @@ \setlength\parindent{\@oldparindent}% \global\parindent=\parindent% \nov@AfterGroup\NoIndentAfterThis% etextools and noindentafter - \NDB{6.4.4 in novel-ChapterScene.sty.}% } %% \LetLtxMacro\ChapterDisplay\ChapterStart\relax % deprecated \LetLtxMacro\endChapterDisplay\endChapterStart\relax % deprecated -\NDB{6.5 in novel-ChapterScene.sty.} % \newcommand\ChapterTitle[2][c]{% optional alignment l, c, r \ignorespaces% @@ -144,7 +134,6 @@ \fi% {\@csalign\stake\smash{{\chapterfont{}#2}}\par}% } -\NDB{6.6 in novel-ChapterScene.sty.} % \newcommand\ChapterSubtitle[2][c]{% optional alignment l, c, r \vspace{0.25\nbs}\addtocounter{@linequarter}{1} @@ -159,7 +148,6 @@ \fi% {\@csalign{\stake\smash{\subchfont #2}}\par}% } -\NDB{6.7 in novel-ChapterScene.sty.} % In ChapterDeco, a trick is used. Instead of two optional arguments, and % instead of using expl3 syntax to create different argument delimiters, % the arguments for alignment and scale are passed as a single option. @@ -190,7 +178,6 @@ } % %% -\NDB{6.8 in novel-ChapterScene.sty.} %% \Epigraph[align,scale,width]{text} OBSOLETE IN CODE VERSION 1.2 @@ -226,8 +213,41 @@ \NoIndentAfterThis% } % end \QuickChapter %% -\NDB{6.9 in novel-ChapterScene.sty.} +%% New in version 1.40: \cleartorecto and \cleartoend +% \cleartorecto works same as \clearpage when next page is recto. +% If next page would be verso, a blank verso is inserted, +% so that the following material is recto. +% \cleartoend is used at very end of book. +% It adds a blank page. If the blank is verso, end of book. +% But if that blank is recto, it adds a second blank page, end of book. +% So, the book always ends with a blank verso. +\gdef\cleartorecto{ + \clearpage + \ifodd\c@page + \else + \thispagestyle{empty} + \null + \clearpage + \fi +} +\gdef\cleartoend{ + \ifodd\c@page + \clearpage + \thispagestyle{empty} + \null + \clearpage + \else + \clearpage + \thispagestyle{empty} + \null + \clearpage + \thispagestyle{empty} + \null + \clearpage + \fi +} +% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo index acd97967f41..64c67a953b9 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.38 +% Typically used in Europe. Novel file version 1.40 % 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 e4717370f4a..8c3592bc0fe 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty @@ -13,12 +13,9 @@ %% %% \ProvidesFile{novel-FileData.sty}% -[2017/08/15 v1.38 LaTeX file (File Data settings)] +[2017/09/14 v1.40 LaTeX file (File Data settings)] %% -%% Novel Tracking codes in this file begin with 2. -\NDB{2.0 in novel-FileData.sty.} - %% FILE DATA (see class documentation for technical meaning of this term). %% ----------------------------------------------------------------------------- @@ -35,7 +32,6 @@ \gdef\thetitle{\@title} \gdef\theTitle{\@title} \title{} -\NDB{2.1 in novel-FileData.sty.} % % \author{} or \SetAuthor{} % Copied to metadata at end of preamble, unless not set or over-ridden. @@ -47,7 +43,6 @@ \gdef\theauthor{\@author} \gdef\theAuthor{\@author} \author{} -\NDB{2.2 in novel-FileData.sty.} % % \subtitle{} or \SetSubtitle{} (if any) % Not copied to metadata by itself, as there is no such metadata entry. @@ -59,7 +54,6 @@ \gdef\thesubtitle{\@subtitle} \gdef\theSubtitle{\@subtitle} \subtitle{} -\NDB{2.3 in novel-FileData.sty.} % % \SetApplication{} (rarely used) % Also known as CreatorTool. @@ -68,7 +62,6 @@ % Normally leave as default, but can change if urgent. \gdef\SetApplication#1{\gdef\@novelApplication{#1}} \SetApplication{LaTeX with novel and microtype} % default -\NDB{2.4 in novel-FileData.sty.} % % \SetProducer{} (rarely used) % Name of the software that compiles to source to make PDF. @@ -76,7 +69,6 @@ % Normally leave as default, but can change if urgent. \gdef\SetProducer#1{\gdef\@novelProducer{#1}} \SetProducer{LuaTeX with novel-pdfx and hyperref} % default -\NDB{2.5 in novel-FileData.sty.} % % Although some other data fields could have been added, % they do not pertain to fiction, especially if your book is print-on-demand. @@ -106,22 +98,18 @@ \gdef\@OIregistry{} \gdef\@OIprofile{} % -\NDB{2.6 in novel-FileData.sty.} %% \gdef\SetPDFX{\@ifstar\@setpdfxst\@setpdfxns} \newcommand\@setpdfxst[2][CGATSTR001]{ \global\@noembediccfalse \@setpdfx{#1}{#2} } -\NDB{2.7 in novel-FileData.sty.} \newcommand\@setpdfxns[2][CGATSTR001]{ \global\@noembedicctrue \@setpdfx{#1}{#2} } -\NDB{2.8 in novel-FileData.sty.} % \newcommand\@setpdfx[2]{ - \NDB{2.9.0 in novel-FileData.sty.} \ifthenelse{\equal{#2}{off}}{ \global\pdfx@isOFFtrue \@chosenComplianceOKtrue @@ -162,7 +150,6 @@ \ClassError{novel}{Bad compliance argument for \string\SetPDFX}% {Choose: off, X-1a:2001, X-1a:2003, X-3:2002, X-3:2003.^^J}% \fi - \NDB{2.9.1 in novel-FileData.sty.} % \ifpdfx@isOFF\else % Output Intent ignored if compliance is `off'. % Grab the file that defines the output intent information: @@ -176,7 +163,6 @@ } \makeatother % back to usual \fi - \NDB{2.9.2 in novel-FileData.sty.} } % end \@setpdfx % diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty index be7150605b6..9c82b9dc9ca 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/08/15 v1.38 LaTeX file (default fonts)] +[2017/09/14 v1.40 LaTeX file (default fonts)] %% @@ -21,8 +21,7 @@ %% This file is loaded \AtEndPreamble. %% -%% Novel Tracking messages in this file begin with 10. -\NDB{10.0 in novel-FontDefaults.sty.} + %% Most TeX installations will use Latin Modern or Computer Modern %% as default fonts. These are unsuitable for commercial fiction. @@ -39,7 +38,6 @@ \defaultfontfeatures[\ttfamily]{% monofont has no kerning or common ligatures SmallCapsFeatures={Renderer=Basic},Ligatures=TeX,% }% -\NDB{10.1 in novel-FontDefaults.sty.} \ifthenelse{\equal{\ttdefault}{lmtt}\OR\equal{\ttdefault}{cmtt}}{% over-ride: \IfFontExistsTF{Libertinus Mono}{ \setmonofont[% @@ -55,7 +53,6 @@ } } }{} % User \setmonofont, so leave alone. -\NDB{10.2 in novel-FontDefaults.sty.} %% \defaultfontfeatures{} % reset % Main and sans fonts: kerning, ligatures, and OldStyle numbers if available: @@ -75,7 +72,6 @@ } } }{} % User \setsansfont, so leave alone. -\NDB{10.3 in novel-FontDefaults.sty.} %% % 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, @@ -110,13 +106,11 @@ } } \fi -\NDB{10.4 in novel-FontDefaults.sty.} % Now we are ready to set the main font: \setmainfont[\@parentfontfeatures]{\@parentfontname} \let\textfont\rmfamily\relax % compatibility \let\mainfont\rmfamily\relax % compatibility % -\NDB{10.5 in novel-FontDefaults.sty.} %% \defaultfontfeatures{} % reset % New in version 1.38, \straightquote and \straightdblquote: @@ -128,7 +122,6 @@ SmallCapsFeatures={Renderer=Basic},Kerning=On,% Ligatures=TeX,Ligatures=CommonOff,Numbers=Lining,% }% -\NDB{10.6 in novel-FontDefaults.sty.} %% The novel-specific fonts: \if@chapterfontset\else \SetChapterFont[\@parentfontfeatures,Scale=1.6]{\@parentfontname} @@ -146,7 +139,6 @@ \global\@headfontdefaulttrue \fi \newfontfamily\headfont[\@headfontfeatures]{\@headfontname} -\NDB{10.7 in novel-FontDefaults.sty.} %% \defaultfontfeatures{} % reset \defaultfontfeatures{% for decofont @@ -158,7 +150,6 @@ \SetDecoFont{NovelDeco} }{} \fi -\NDB{10.8 in novel-FontDefaults.sty.} %% \gdef\acronym#1{#1}% Re-defined below, if decofont available. %% @@ -206,7 +197,6 @@ % \fi% end \if@gotdeco % -\NDB{10.9 in novel-FontDefaults.sty.} % %% % Any other fonts will use these defaults: @@ -231,10 +221,8 @@ \let\setdefaultlanguage\relax \let\setotherlanguage\relax \let\setotherlanguages\relax -\NDB{10.10 in novel-FontDefaults.sty.} % Now that the basic fonts are defined, we can load these packages: \RequirePackage{polyglossia} % Instead of babel. -\NDB{10.11 in novel-FontDefaults.sty.} % \ifthenelse{\equal{\@setmainlang}{}}{ \setmainlanguage{english} @@ -259,7 +247,6 @@ \setotherlanguages[\@setotherlangsopt]{\@setotherlangs} } } -\NDB{10.12 in novel-FontDefaults.sty.} %% 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 @@ -278,7 +265,6 @@ % %% -\NDB{10.13 in novel-FontDefaults.sty.} % diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty index f157dd3548f..0b35f952a2c 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty @@ -13,11 +13,9 @@ %% %% \ProvidesFile{novel-Footnotes.sty}% -[2017/08/15 v1.38 LaTeX file (commands for footnotes and endnotes)] +[2017/09/14 v1.40 LaTeX file (commands for footnotes and endnotes)] %% -%% Novel Tracking codes in this file begin with 8. -\NDB{8.0 in novel-Footnotes.sty.} %% FOOTNOTES @@ -50,7 +48,6 @@ \gdef\ResetFootnoteSymbol{\setcounter{@fnsymbolcount}{1}} % only symbols \gdef\Resetendnote{\setcounter{@rnnumbercount}{1}} % -\NDB{8.1 in novel-Footnotes.sty.} \newtoggle{@usenomark} % when true: no mark, no increment count \newtoggle{@placedfootnotenumber} % true if any numerical footnote placed % @@ -63,7 +60,6 @@ } \let\footnoterule\@fourem % -\NDB{8.2 in novel-Footnotes.sty.} % \@makefnmark applies to the footnote marker in the flow of main text: @@ -74,7 +70,6 @@ {\forceindent#1}% {\forceindent\@getbotfnmark\,#1}% } % end \@makefntext -\NDB{8.3 in novel-Footnotes.sty.} % Now re-define \footnote: \newcommand\footnote[2][]{% \ifthenelse{\equal{#1}{0}}{% @@ -90,7 +85,6 @@ \unskip\my@oldfootnote{#2}% \endgroup% } % end \footnote -\NDB{8.4 in novel-Footnotes.sty.} % % \@rollfnsymbol prevents running out of symbolic markers: \gdef\@rollfnsymbol{% @@ -99,7 +93,6 @@ \setcounter{@fnsymbolcount}{1}% }{}% } % end \@rollfnsymbol -\NDB{8.5 in novel-Footnotes.sty.} % % \@getfnmark places a footnote marker in the running text. % The marker depends upon whether it should be a number or a symbol. @@ -132,7 +125,6 @@ \sups{\arabic{@fnnumbercount}}% }% } % end \@getfnmark -\NDB{8.6 in novel-Footnotes.sty.} % % \@getbotfnmark places the marker in front of the actual footnote, % towards the bottom of the textblock. It duplicates the marker used in @@ -170,7 +162,6 @@ % %% end footnotes -\NDB{8.7 in novel-Footnotes.sty.} %% ENDNOTES @@ -191,7 +182,6 @@ \stepcounter{@endnotecount}\sups{\arabic{@endnotecount}}% \long\edef\@endnotelist{\@endnotelist\space (\arabic{@endnotecount},p.\thepage)}% } -\NDB{8.8 in novel-Footnotes.sty.} %% % \endnotetext{ID}{text} where ID is (usually) the endnote number. % If ID is other than space or tilde, it prints at left margin, followed by @@ -207,7 +197,6 @@ } %% end endnotes -\NDB{8.9 in novel-Footnotes.sty.} %% See novel.cls for the accompanying AtBeginDocument routine. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty index d0a14068492..5b616a14dab 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty @@ -13,11 +13,9 @@ %% %% \ProvidesFile{novel-HeadFootStyles.sty}% -[2017/08/15 v1.38 LaTeX file (header and footer styles)] +[2017/09/14 v1.40 LaTeX file (header and footer styles)] %% -%% Novel Tracking messages in this file begin with 5. -\NDB{5.0 in novel-HeadFootStyles.sty.} %% File `novel-LayoutSettings.sty' reserved space for header/footer, @@ -42,7 +40,6 @@ % \newtoggle{@inheadfoot} % true in header or footer %% -\NDB{5.1 in novel-HeadFootStyles.sty.} %% INITIALIZE FANCYHDR @@ -60,9 +57,7 @@ \FPdiv{\@loosehead}{\@@loosehead}{10} % change in method of using fontspec with microtype \FPmin{\@looseheadnum}{\@loosehead}{50} % Don't want numbers too loose. } -\NDB{5.2 in novel-HeadFootStyles.sty.} \SetLooseHead{50} -\NDB{5.3 in novel-HeadFootStyles.sty.} % Create flags to know if \fancyhead and \fancyfoot have been defined by user, % somewhere in the Preamble. If not, then pre-defined styles based on trimsize % will be applied \AtEndPreamble. @@ -72,7 +67,6 @@ \@tempFancyhead[#1]{\toggletrue{@inheadfoot}{\normalsize#2}}% } % -\NDB{5.4 in novel-HeadFootStyles.sty.} \LetLtxMacro{\@tempFancyfoot}{\fancyfoot} \renewcommand\fancyfoot[2][]{% \@styledFootertrue% @@ -84,7 +78,6 @@ }% } % -\NDB{5.5 in novel-HeadFootStyles.sty.} \LetLtxMacro{\@myTempTPS}{\thispagestyle} % Re-define \thispagestyle based on layout. When style requests only the page % number, decide what to do based on this command and whether footer is used: @@ -92,7 +85,6 @@ % %% See AtBeginShipout routine in novel.cls. % -\NDB{5.6 in novel-HeadFootStyles.sty.} \gdef\thispagestyle#1{% \global\@thispagestylesettrue% \gdef\@pagestyleOK{false}% @@ -110,7 +102,6 @@ \else \@myTempTPS{empty}% \fi% }{}% - \NDB{5.6.1 in novel-HeadFootStyles.sty.}% \ifthenelse{\equal{#1}{forcenumber}}{% \gdef\@pagestyleOK{true}% \if@gotFooter \@myTempTPS{fancyplain}% @@ -118,7 +109,6 @@ \fi% }{}% % - \NDB{5.6.2 in novel-HeadFootStyles.sty.}% \ifthenelse{\equal{#1}{dropfolioinside}% after \clearpage \OR \equal{#1}{dropfolio} \OR \equal{#1}{dropfoliolater}}{% compatibility \gdef\@pagestyleOK{true}% @@ -130,7 +120,6 @@ \@dropfolioinside \fi% }{}% - \NDB{5.6.3 in novel-HeadFootStyles.sty.}% % With `dropfoliobeneath` only a footer is used, if present. If no footer, % then the styled page number is centered at one baselineskip beneath the % ordinary bottom of the textblock. Thus, the number intrudes into the @@ -146,14 +135,12 @@ \@dropfoliobeneath \fi% }{}% - \NDB{5.6.4 in novel-HeadFootStyles.sty.}% %% \ifthenelse{\equal{\@pagestyleOK}{true}}{}{% \ClassWarning{novel}{^^JPage \pagenumberstyle\space has % \string\thispagestyle{}^^J% but its argument is not defined. Default substituted. Better fix that.^^J}% }% - \NDB{5.6.5 in novel-HeadFootStyles.sty.}% } % %% End initialize fancyhdr. @@ -161,19 +148,16 @@ %% See AtBeginDocument routine in novel.cls: %% ----------------------------------------------------------------------------- -\NDB{5.7 in novel-HeadFootStyles.sty.} \gdef\@activateHeadFootStyles{ % called AtBeginDocument by novel.cls % Pre-configured header/footer styles, unless user over-rode them: % \versoheadtext is initialized to \theauthor % \rectoheadtext is initialized to \thetitle - \NDB{5.7.1 in novel-HeadFootStyles.sty.}% \@ifundefined{versoheadtext}{ \NewVersoHeadText{\smcp{\StrSubstitute{\theauthor}{\space}{ \,}}} }{} \@ifundefined{rectoheadtext}{ \NewRectoHeadText{\smcp{\StrSubstitute{\thetitle}{\space}{ \,}}} }{} - \NDB{5.7.2 in novel-HeadFootStyles.sty.}% % % ---------------------------------------------------------------------------- % IF YOU ARE WRITING YOUR OWN HEADER/FOOTER STYLE: @@ -251,7 +235,6 @@ \fi }{} % - \NDB{5.7.1 in novel-HeadFootStyles.sty.}% % % END PRE-DEFINED STYLES. % ---------------------------------------------------------------------------- @@ -284,7 +267,6 @@ % %% end initialize fancyhdr -\NDB{5.8 in novel-HeadFootStyles.sty.} %% DROPFOLIO %% ----------------------------------------------------------------------------- @@ -304,14 +286,12 @@ \setlength\temp@pgnumraise{% \New@BottomMargin+0.5\New@MediaHeight-0.5\New@TrimHeight}% \fi% - \NDB{5.8.1 in novel-HeadFootStyles.sty.}% \check@IsVerso% \if@isVerso% \AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{% \hspace{\dimexpr\Trim@Lx+\New@OutsideMargin+0.5\textwidth-0.5\temp@pgnumwidth}\raisebox{% \temp@pgnumraise}{{\headfont{\addfontfeature{LetterSpace=\@looseheadnum}\pagenumberstyle}}}}}% \else% - \NDB{5.8.2 in novel-HeadFootStyles.sty.}% \AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{% \hspace{\dimexpr\Trim@Lx+\New@InsideMargin-0.5\temp@pgnumwidth}% \charscale[1,0.5\textwidth,\temp@pgnumraise]{% @@ -321,7 +301,6 @@ % \let\dropfolionow\relax % compatibility with earlier version. % -\NDB{5.9 in novel-HeadFootStyles.sty.} % \@dropfoliobeneath does not change the textblock height. The styled page % number is centered where an extra line would be, within the bottom margin. @@ -335,14 +314,12 @@ \setlength\temp@pgnumraise{% \New@BottomMargin-\nbs+0.5\New@MediaHeight-0.5\New@TrimHeight}% \fi% - \NDB{5.9.1 in novel-HeadFootStyles.sty.}% \check@IsVerso% \if@isVerso% \AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{% \hspace{\dimexpr\Trim@Lx+\New@OutsideMargin-0.5\temp@pgnumwidth}\raisebox{% \temp@pgnumraise}{{\headfont{\addfontfeature{LetterSpace=\@looseheadnum}\pagenumberstyle}}}}}% \else% - \NDB{5.9.2 in novel-HeadFootStyles.sty.}% \AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{% \hspace{\dimexpr\Trim@Lx+\New@InsideMargin-0.5\temp@pgnumwidth}% \charscale[1,0.5\textwidth,\temp@pgnumraise]{% @@ -352,7 +329,6 @@ %% % -\NDB{5.10 in novel-HeadFootStyles.sty.} % Content of header text (if present) can be changed at any time within % the body, using the following commands. If not used, then @@ -371,7 +347,6 @@ \let\SetVersoHeadText\NewVersoHeadText\relax % for convenience \let\RenewVersoHeadText\NewVersoHeadText\relax % for convenience % -\NDB{5.11 in novel-HeadFootStyles.sty.} \gdef\NewRectoHeadText#1{ \FPdiv{\@myk}{\@loosehead}{500} \setlength\@mykem{\@myk em} @@ -379,7 +354,6 @@ } \let\SetRectoHeadText\NewRectoHeadText\relax % for convenience \let\RenewRectoHeadText\NewRectoHeadText\relax % for convenience -\NDB{5.12 in novel-HeadFootStyles.sty.} % %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty index 79327b46e35..4d7e6617d10 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty @@ -13,11 +13,9 @@ %% %% \ProvidesFile{novel-Images.sty}% -[2017/08/15 v1.38 LaTeX file (image placement)] +[2017/09/14 v1.40 LaTeX file (image placement)] %% -%% Novel Tracking messages in this file begin with 7. -\NDB{7.0 in novel-Images.sty.} %% %% Be sure to read the separate documentation about how to prepare images. @@ -81,7 +79,6 @@ {The `novel' class has its own commands for placing images. See docs.^^J% You cannot use the \string\includegraphics\space command.}% } -\NDB{7.1 in novel-Images.sty.} % % \InlineImage can be used in body, header, footer. % However, macros such as \imagefilename, \imagewidth, etc. @@ -114,7 +111,6 @@ \ifthenelse{\equal{\@myilya}{} \OR \equal{\@myilya}{0}}{% \def\@myily{0pt}}{\def\@myily{\@myilya}% }% - \NDB{7.1.1 in novel-Images.sty.}% \iftoggle{@inheadfoot}{}{\gdef\imagefilename{#3}}% for possible later use \gdef\my@graphic{\@includegraphics[draft=false]{#3}}% \setlength\@imagewidth{\widthof{\my@graphic}}% @@ -122,14 +118,12 @@ \iftoggle{@inheadfoot}{}{\setlength\imagewidth{\@imagewidth}}% \setlength\@imageheight{\heightof{\my@graphic}}% \global\@imageheight=\@imageheight% - \NDB{7.1.2 in novel-Images.sty.}% \iftoggle{@inheadfoot}{}{% \setlength\imageheight{\@imageheight}% \global\imageheight=\imageheight% \typeout{^^JClass~`novel'~Info:~An~image~was~placed~on~page~\thepage.^^J% Review~layout~to~ensure~that~it~does~not~overflow~into~margins.^^J}% }% - \NDB{7.1.3 in novel-Images.sty.}% % \setlength\@imagehoffset{\@myilx}% \IfBeginWith{\@myily}{b}{% @@ -142,7 +136,6 @@ \setlength\@imagevoffset{-\@imageheight}% \addtolength\@imagevoffset{\@myily}% }% - \NDB{7.1.4 in novel-Images.sty.}% % \IfBooleanTF{#1}% % starred: @@ -154,7 +147,6 @@ }% }% % unstarred: - \NDB{7.1.5 in novel-Images.sty.}% {% \iftoggle{@inheadfoot}{}{\gdef\imagestarred{false}}% \hspace{\@imagehoffset}% @@ -167,7 +159,6 @@ % %% -\NDB{7.2 in novel-Images.sty.} %% \BlockImage[alignment]{image}[text] @@ -205,7 +196,6 @@ \ifthenelse{\equal{\@myyt}{}\OR\equal{\@myyt}{0}}{% \def\@myy{0pt}}{\def\@myy{\@myyt}% } - \NDB{7.2.1 in novel-Images.sty.}% \newdimen\@sbsheight \ifthenelse{\equal{\@myalign}{c}\OR\equal{\@myalign}{}}{% {\centering\strut\InlineImage*[{\@myx-0.5\imagewidth},{\@myy}]{#2}\par} @@ -213,9 +203,8 @@ {\centering\strut #3\par} \setbox0=\vbox{{\centering #3\par}} }{} - \NDB{7.2.2 in novel-Images.sty.}% \ifthenelse{\equal{\@myalign}{r}}{% - \noindent\InlineImage*[{\textwidth-\imagewidth+\@myx},{\@myy}]{#2}\par% + \noindent\InlineImage[{\textwidth-\imagewidth+\@myx},{\@myy}]{#2}\par% \vspace{-\nbs} \begin{adjustwidth}{0pt}{\imagewidth+\parindent}% #3\par% @@ -226,7 +215,6 @@ \end{adjustwidth}% }% }{} - \NDB{7.2.3 in novel-Images.sty.}% \ifthenelse{\equal{\@myalign}{l}}{% \noindent\InlineImage*[{\@myx},{\@myy}]{#2}\par% \vspace{-\nbs} @@ -239,7 +227,6 @@ \end{adjustwidth}% }% }{} - \NDB{7.2.4 in novel-Images.sty.}% % portion here, inspired by post from user Killian Foth, % at stackoverflow.com, license CC-by-sa-3.0. \@sbsheight=\ht0 \advance\@sbsheight by \dp0 @@ -263,7 +250,6 @@ \ExplSyntaxOff %% -\NDB{7.3 in novel-Images.sty.} % Returns 1 for monochrome, 8 for grayscale (or rgb). EXPERIMENTAL. @@ -277,7 +263,6 @@ }% } % -\NDB{7.4 in novel-Images.sty.} %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo index b3fcc7dba01..3d6675907c0 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.38 +% Typically used in Japan. Novel file version 1.40 % 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 77ba1bd6b9b..4f02ac85a78 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty @@ -13,11 +13,9 @@ %% %% \ProvidesFile{novel-LayoutSettings.sty}% -[2017/08/15 v1.38 LaTeX file (layout settings)] +[2017/09/14 v1.40 LaTeX file (layout settings)] %% -% Novel Tracking codes in this file begin with 3. -\NDB{3.0 in novel-LayoutSettings.sty.} %% 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. @@ -56,7 +54,6 @@ \newlength\normalxheight \newlength\normalXheight %% -\NDB{3.1 in novel-LayoutSettings.sty.} %% SIZE-RELATED COMMANDS AVAILABLE IN PREAMBLE. @@ -72,7 +69,6 @@ % % \SetTrimSize{}{} width and height of printed book. \newcommand\SetTrimSize[2]{% - \NDB{3.2.0 in novel-LayoutSettings.sty.} \global\@TrimSizeSettrue \ifthenelse{\dimtest{#1}{<}{2.99in}}{ \ClassError{novel}{Unacceptably small Trim Width}% @@ -91,7 +87,6 @@ {\string\SetTrimSize\space cannot follow \string\ReworkTrimSize^^J% and cannot follow \string\ReworkMargins.}% \fi - \NDB{3.2.1 in novel-LayoutSettings.sty.} \setlength\Old@TrimWidth{#1}% \setlength\Old@TrimHeight{#2}% \setlength\New@TrimWidth{#1}% @@ -102,12 +97,10 @@ \setlength\New@MediaWidth{#1}% \setlength\New@MediaHeight{#2}% \fi - \NDB{3.2.3 in novel-LayoutSettings.sty.} } % % Retroactively change Trim Size after layout. See documentation: \newcommand\ReworkTrimSize[2]{% - \NDB{3.4.0 in novel-LayoutSettings.sty.} \if@coverart % New in version 1.2 \ClassError{novel}{Rework command cannot be used with coverart option}% {Instead of reworking document size, you must re-do the artwork.} @@ -122,7 +115,6 @@ Carefully review your PDF to ensure that line breaks, paragraphs,^^J% and page breaks are where you expect them to be.^^J}% \fi - \NDB{3.4.1 in novel-LayoutSettings.sty.} } % Margins at top and bottom are relative to: % top of header, or top of textblock if no header; @@ -130,7 +122,6 @@ % Inside margin generally greater than outside, due to gutter. % Standard margins command ("TOBI, or not TOBI, that is the question."): \newcommand\SetMargins[4]{ % top, outside, bottom, inside - \NDB{3.5.0 in novel-LayoutSettings.sty.} \global\@MarginsSettrue \if@ReworkMarginsSet \ClassError{novel}{^^JCannot set Margins after reworking them}% @@ -144,11 +135,9 @@ \setlength\New@BottomMargin{#3} \setlength\Old@InsideMargin{#4} \setlength\New@InsideMargin{#4} - \NDB{3.5.1 in novel-LayoutSettings.sty.} } % Retroactively change margins after layout. See documentation: \newcommand\ReworkMargins[4]{ - \NDB{3.6.0 in novel-LayoutSettings.sty.} \if@coverart % New in version 1.2 \ClassError{novel}{Rework command cannot be used with coverart option}% {Instead of reworking document size, you must re-do the artwork.} @@ -163,7 +152,6 @@ Carefully review your PDF to ensure that line breaks, paragraphs,^^J% and page breaks are where you expect them to be.^^J}% \fi - \NDB{3.6.1 in novel-LayoutSettings.sty.} } % \SetMediaSize[]{}{} such as {8.5in}{11in}. % This command is only used when the Trim Size must be placed in a larger @@ -176,7 +164,6 @@ % \newif \if@offcenterTrim \@offcenterTrimfalse \newcommand\SetMediaSize[3][center]{ % [alignment] width, height - \NDB{3.7.0 in novel-LayoutSettings.sty.} \ifthenelse{\equal{#1}{center} \OR \equal{#1}{edge}}{ \global\@MediaSizeSettrue \setlength\Old@MediaWidth{#2} @@ -190,7 +177,6 @@ \if@coverart\else % new in version 1.2 \ifthenelse{\equal{#1}{edge}}{\global\@offcenterTrimtrue}{} \fi - \NDB{3.7.1 in novel-LayoutSettings.sty.} } % \SetLinesPerPage{} limited due to fontsize and Trim Size constraints. % There is no `rework' command, because as long as the number of lines fit, @@ -199,7 +185,6 @@ % 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]{ - \NDB{3.8.0 in novel-LayoutSettings.sty.} \global\@LinesPerPageSettrue \FPiflt{#1}{1}% \ClassError{novel}{\string\SetLinesPerPage\ must be at least 1}% @@ -207,7 +192,6 @@ \else\fi % \FPround{\temp@IntegerLines}{#1}{0} \def\my@LinesPerPage{\temp@IntegerLines} - \NDB{3.8.1 in novel-LayoutSettings.sty.} } % \SetFontSize{} may be in any units, even decimals: 12.2pt, 11.5bp, etc. % When packages load, the font size is temporarily set to 11pt at 15pt skip, @@ -215,10 +199,8 @@ % Then the size is changed to its actual value based on this command, or on % the defaults for Trim Size, or on the effects of \Rework. \newcommand\SetFontSize[1]{ - \NDB{3.9.0 in novel-LayoutSettings.sty.} \global\@FontSizeSettrue \global\setlength\Old@FontSize{#1} - \NDB{3.9.1 in novel-LayoutSettings.sty.} } % %% End size-related commands available in Preamble. @@ -246,7 +228,6 @@ \SetHeadJump{1.5} % default \gdef\SetFootJump#1{\gdef\@footjump{#1}} \SetFootJump{1.5} % default -\NDB{3.10 in novel-LayoutSettings.sty.} % New in version 1.2, coverart. \if@coverart % cover art has no header or footer \gdef\SetHeadFootStyle#1{\gdef\my@HeadFootStyle{0}} @@ -257,20 +238,17 @@ \gdef\SetHeadFootStyle#1{\gdef\my@HeadFootStyle{#1}} \gdef\SetHeadStyle#1{\gdef\my@HeadFootStyle{#1}} % deprecated \fi -\NDB{3.11 in novel-LayoutSettings.sty.} % See docs part 7 for what these emblems do, if used: \newcommand\SetEmblems[2]{ % verso, recto \gdef\my@VersoEmblem{{\headfont #1}} \gdef\my@RectoEmblem{{\headfont #2}} } -\NDB{3.12 in novel-LayoutSettings.sty.} \let\SetEmblem\SetEmblems% for convenience % If you want something fancier than \thepage: \gdef\SetPageNumberStyle#1{\gdef\pagenumberstyle{#1}} % See novel.cls for the accompanying AtBeginDocument routine. -\NDB{3.13 in novel-LayoutSettings.sty.} % \newif \if@gotHeader \newif \if@gotFooter @@ -279,7 +257,6 @@ \newif \if@validHF % \gdef\@reserveHFspace{ % used for layout calculations - \NDB{3.14.1 in novel-LayoutSettings.sty.} \ifthenelse{\equal{\my@HeadFootStyle}{0}}{ \@gotHeaderfalse\@gotFooterfalse\@validHFtrue }{} @@ -307,13 +284,11 @@ {\string\SetHeadFootStyle\space needs choice of 0,1,2,3,4,5,6,^^J% even if you wish to customize using fancyhdr syntax.^^J}% \fi - \NDB{3.14.2 in novel-LayoutSettings.sty.} } % end \@reserveHFspace % Each new chapter generally has its own header/footer style. This allows a % default setting when chapters begin with ChapterStart environment: \gdef\SetChapterStart#1{\gdef\@setchapterstart{#1}} \SetChapterStart{footer} % default -\NDB{3.15 in novel-LayoutSettings.sty.} % % See novel.cls for the accompanying AtBeginDocument routine. % @@ -322,7 +297,6 @@ %% New in version 1.2: cover image. \newcommand\SetCoverImage[1]{ - \NDB{3.17.0 in novel-LayoutSettings.sty.} \def\coverimageok{false} \IfSubStr{#1}{jpg}{\def\coverimageok{true}}{} \IfSubStr{#1}{jpeg}{\def\coverimageok{true}}{} @@ -334,7 +308,6 @@ \ClassError{novel}{Cover image has wrong file extension}% {Cover image must be jpg, JPG, jpeg, or JPEG.} }% - \NDB{3.17.1 in novel-LayoutSettings.sty.} } %% @@ -351,7 +324,6 @@ % dagger, dbldagger, and section (when used as footnote markers) % are always partially faked. \newcommand\SetMarkerStyle[2][real]{ - \NDB{3.18.0 in novel-LayoutSettings.sty.} \def\@goodfnm{no} \ifthenelse{\equal{#2}{asterisk}}{% \def\@goodfnm{yes}\global\toggletrue{@usesymbolmark}% @@ -370,7 +342,6 @@ \ClassError{novel}{Bad choice for \string\SetMarkers}% {Optional: real, fake. Required: asterisk, dagger, number.}% }{} - \NDB{3.18.1 in novel-LayoutSettings.sty.} } % \SetMarkerStyle[real]{asterisk} % default @@ -389,7 +360,6 @@ \SetCropmarkGap{0.125in} % default %% -\NDB{3.19 in novel-LayoutSettings.sty.} %% Fake \microtypesetup until package is loaded later: @@ -400,7 +370,6 @@ } %% -\NDB{3.20 in novel-LayoutSettings.sty.} %% MISCELLANOUS SETTINGS. Mostly remove "glue". Best to leave as-is. @@ -464,14 +433,12 @@ % %% End miscellaneous settings. -\NDB{3.21 in novel-LayoutSettings.sty.} % 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{% - \NDB{3.22.0 in novel-LayoutSettings.sty.} \def\@featuresareok{yes} \IfSubStr{#1}{Color}{\def\@featuresareok{no}}{}% \IfSubStr{#1}{Colour}{\def\@featuresareok{no}}{}% @@ -484,7 +451,6 @@ {You defined a font, or added a font feature, with Color or Opacity.^^J% That is disallowed in `novel' class.}% } - \NDB{3.22.1 in novel-LayoutSettings.sty.} } %% @@ -520,7 +486,6 @@ \newif \if@parentfontset \gdef\@parentfontfeatures{} \gdef\@parentfontname{} -\NDB{3.23 in novel-LayoutSettings.sty.} \DeclareDocumentCommand \SetParentFont { O{} m O{} } {% from version 1.1. \novel@checkfeatures{#1,#3} \gdef\@parentfontfeatures{#1,#3} @@ -533,7 +498,6 @@ \gdef\@parentfontname{#2} \global\@parentfontsettrue }% -\NDB{3.24 in novel-LayoutSettings.sty.} %% Store settings for the chapterfont: % The chapter font is used by the \ChapterTitle{} command. \newif \if@chapterfontset @@ -582,7 +546,6 @@ \global\@gotdecotrue \newfontface\decofont[#1,#3]{#2} }% -\NDB{3.25 in novel-LayoutSettings.sty.} % \msg_set:nnnn {fontspec} {font-not-found} { % rewrites the standard message Font~ "#1"~ cannot~ be~ found. @@ -592,7 +555,6 @@ If~the~missing~font~is~anything~else,~then~the~missing~font~is\\ not~caused~by~`novel'~class.\\ }% -\NDB{3.26 in novel-LayoutSettings.sty.} %% For syntax consistency: \cs_new_eq:NN \NewFontFamily \newfontfamily \cs_new_eq:NN \NewFontFace \newfontface @@ -602,7 +564,6 @@ \cs_new_eq:NN \AddFontFeatures \addfontfeatures \cs_new_eq:NN \AddFontFeature \addfontfeatures %% -\NDB{3.27 in novel-LayoutSettings.sty.} %% \CreateFontFeature{substitutions}{feature code} % 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. @@ -644,7 +605,6 @@ %% %% end definition of parent and other fonts. -\NDB{3.29 in novel-LayoutSettings.sty.} %% FAKE POLYGLOSSIA COMMANDS %% -------------------------------------------------------------------------- @@ -680,20 +640,17 @@ % %% end fake polyglossia commands. -\NDB{3.30 in novel-LayoutSettings.sty.} -%% FRONTMATTER, MAINMATTER, BACKMATTER +%% FRONTMATTER, MAINMATTER. BUT NO BACKMATTER! %% -------------------------------------------------------------------------- % \newif \ifWithinFrontmatter \WithinFrontmatterfalse \newif \ifWithinMainmatter \WithinMainmatterfalse -\newif \ifWithinBackmatter \WithinBackmatterfalse \newcounter{frontmatterpages} \newcounter{runningpages} % % See novel.cls for the AtBeginShipout routine. % -\NDB{3.32 in novel-LayoutSettings.sty.} \def\frontmatter{ % starts page count and frontmatter count at 1. \ifWithinFrontmatter \ClassError{novel}{\string\frontmatter\ used more than once}% @@ -701,115 +658,48 @@ \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}% + {In order: \string\frontmatter\ \string\mainmatter^^J% + but you do not need both 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}% - \fi - \WithinFrontmattertrue\WithinMainmatterfalse\WithinBackmatterfalse + \WithinFrontmattertrue\WithinMainmatterfalse \clearpage \pagenumbering{roman} \setcounter{page}{1} \setcounter{frontmatterpages}{1} } -\NDB{3.33 in novel-LayoutSettings.sty.} % \def\mainmatter{ % restarts page to 1, arabic numbers; freeze frontpagecount \ifWithinMainmatter \ClassError{novel}{\string\mainmatter\ used more than once}% {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}% - \fi - \WithinFrontmatterfalse\WithinMainmattertrue\WithinBackmatterfalse + \WithinFrontmatterfalse\WithinMainmattertrue \setcounter{frontmatterpages}{\value{page}} \addtocounter{frontmatterpages}{-1} \pagenumbering{arabic} \setcounter{page}{1} } -\NDB{3.34 in novel-LayoutSettings.sty.} -% -\def\backmatter{\@ifstar\@backmatterst\@backmatterns} % -\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}% - \fi - % 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}% - \fi - \WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue - \addtocounter{frontmatterpages}{1} - \pagenumbering{roman} - \setcounter{page}{\value{frontmatterpages}} +\def\backmatter{\@ifstar\@backmatterst\@backmatterns} % obsolete from v. 1.40. +\def\@backmatterst{% + \ClassWarning{novel}{Command \string\backmatter*\ ignored. Do not use.^^J}% } % -\def\@backmatterns{ % continues mainmatter arabic numerals - \ifWithinBackmatter - \ClassError{novel}{\string\backmatter\space used more than once}% - {You issued \string\backmatter\space more than once.^^J}% - \fi - % 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}% - \fi - \WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue +\def\@backmatterns{% + \ClassWarning{novel}{Command \string\backmatter\ ignored. Do not use.^^J}% } -\NDB{3.35 in novel-LayoutSettings.sty.} % -\def\Backmatter{\@ifstar\@Backmatterst\@Backmatterns} +\def\Backmatter{\@ifstar\@Backmatterst\@Backmatterns} % obsolete from v. 1.40. % \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}% - \fi - % 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}% - \fi - \WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue - \addtocounter{frontmatterpages}{1} - \pagenumbering{Roman} - \setcounter{page}{\value{frontmatterpages}} + \ClassWarning{novel}{Command \string\Backmatter*\ ignored. Do not use.^^J}% } % -\def\@Backmatterns{ % restarts page count with uppercase Roman numerals - \ifWithinBackmatter - \ClassError{novel}{\string\backmatter\ used more than once}% - {You issued \string\backmatter\ more than once.^^J}% - \fi - % 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}% - \fi - \WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue - \pagenumbering{Roman} - \setcounter{page}{1} +\def\@Backmatterns{% + \ClassWarning{novel}{Command \string\Backmatter\ ignored. Do not use.^^J}% } % -%% end frontmatter, mainmatter, backmatter. -\NDB{3.36 in novel-LayoutSettings.sty.} +%% end frontmatter, mainmatter. No backmatter! %% DISABLE OR NEUTRALIZE SOME STANDARD LATEX COMMANDS @@ -855,7 +745,6 @@ \long\gdef\listoffigures\@nodocommand{listoffigures} % %% end disable or neutralize. -\NDB{3.37 in novel-LayoutSettings.sty.} %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty index 8fe91201abf..a4c70f47651 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty @@ -13,11 +13,9 @@ %% %% \ProvidesFile{novel-TextMacros.sty}% -[2017/08/15 v1.38 LaTeX file (text macros usable within document body)] +[2017/09/14 v1.40 LaTeX file (text macros usable within document body)] %% -%% Novel Tracking messages in this file begin with 4. -\NDB{4.0 in novel-TextMacros.sty.} %% This file contains commands that are usable within the document body, %% for styling and otherwise manipulating text. @@ -39,7 +37,7 @@ % \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. -% \frontmatter, \mainmatter, \backmatter and variations -- See novel-LayoutSettings.sty. +% \frontmatter, \mainmatter -- See novel-LayoutSettings.sty. % \footnote[]{}, \endnote, \endnotetext[]{} -- See novel-Footnotes.sty. % \thispagestyle{choice} and \dropfolio -- See novel-HeadFootStyles.sty. % \NewVersoHeadText{}, \NewRectoHeadText{} Also \Set and \Renew forms. -- See novel-HeadFootStyles.sty. @@ -141,14 +139,12 @@ % Useful when you wish to put a note to yourself in the *.tex document. % Not the same as % comment, because anything after the braces will print. \long\gdef\memo#1{} -\NDB{4.1 in novel-TextMacros.sty.} % \gdef\stake{\rule{0pt}{1pt}} % placeholder % % \forceindent and \backindent perform or remove indent, using \hspace{}. % Rationale: Sometimes \indent and \noindent are neutralized by another command. \newlength\forceparlength % holds default value, even when \parindent changed -\NDB{4.2 in novel-TextMacros.sty.} % See novel.cls for accompanying AtBeginDocument routine. @@ -172,7 +168,6 @@ } % \ExplSyntaxOff -\NDB{4.4 in novel-TextMacros.sty.} % \let\textsc\smcp\relax % unified \let\oldscshape\scshape\relax % in case needed later @@ -190,7 +185,6 @@ %% Just in case `xcolor' re-defines its internals, to prevent code bomb: \ProvideDocumentCommand\@declaredcolor { m } {} \ProvideDocumentCommand\@undeclaredcolor { o m } {} -\NDB{4.5 in novel-TextMacros.sty.} %% \if@graytext % and the usual colors, including black and white. \definecolor[named]{gray1}{gray}{0.15} % ten percent gray, etc. @@ -211,7 +205,6 @@ \ifthenelse{\equal{#2}{hingledingle}}{\@declaredcolor{white}}{}% hingledingle is internal alias for white } \fi -\NDB{4.6 in novel-TextMacros.sty.} %% @@ -233,7 +226,6 @@ \expandafter\aftergroup\csname nov@ettl@fterGroup\the\nov@ettl@fter\endcsname% } % End code from `etextools`. -\NDB{4.7 in novel-TextMacros.sty.} @@ -251,7 +243,6 @@ #2% \fi% } -\NDB{4.8 in novel-TextMacros.sty.} %% \bigemdash inspired by code by RTBarnard at stackoverflow.com, CC-by-sa-3.0: % Allows a rule of variable length to fill available space at its right. % There must be a "right-hand limit" imposed by something, such as by enclosing @@ -277,7 +268,6 @@ {\leaders\hbox{\rule[\@myraise ex]{1pt}{\@mythick em}}\hfill\stake}% } %% -\NDB{4.9 in novel-TextMacros.sty.} %% % \charscale[scale,x,y]{text} and starred version @@ -325,7 +315,6 @@ } \ExplSyntaxOff %% -\NDB{4.10 in novel-TextMacros.sty.} @@ -357,7 +346,6 @@ \FPround{\my@tempDetailsSkipNum}{\my@tempDetailsSkipNum}{2}% \fontsize{\my@tempDetailsFontNum pt}{\my@tempDetailsSkipNum pt}\selectfont}% {\endgroup} -\NDB{4.11 in novel-TextMacros.sty.} % %% % Environment toc (alternative table of contents): @@ -376,7 +364,6 @@ }{% \endgroup\end{adjustwidth}\par% }% -\NDB{4.12 in novel-TextMacros.sty.} %% \tocitem[number]{description}{page} provides a one-line table entry in toc. % optional number might be chapter number. Can use ~ to offset. % unstarred: distance between description and page is not decorated. @@ -394,7 +381,6 @@ \dotfill% \,#3\par\vspace{\@tocskip}% }% -\NDB{4.13 in novel-TextMacros.sty.} % \newcommand\@tocitemns[3][]{% \ifthenelse{\equal{#1}{}}{}{% @@ -408,7 +394,6 @@ \hfill% #3\par\vspace{\@tocskip}% }% -\NDB{4.14 in novel-TextMacros.sty.} %% end toc and \tocitem. %% %% legalese environment. Certain info, such as Copyright page, customarily is @@ -427,7 +412,6 @@ \setlength\@temphangl{\widthof{#1}}% \stake\hspace{-\@temphangl}#1% } -\NDB{4.15 in novel-TextMacros.sty.} %% % \showlength[decimal places]{length}{units} % Returns the length as a string with the units, but does not change the length. @@ -455,7 +439,6 @@ \temp@lengthnum#3% } %% end \showlength -\NDB{4.16 in novel-TextMacros.sty.} %% \squeeze{} and \crush{} slightly shrink the horizonal dimension of the @@ -489,7 +472,6 @@ \gdef\realmarker{\toggletrue{@realmarker}} % anywhere in text \gdef\fakemarker{\togglefalse{@realmarker}} % anywhere in text %% -\NDB{4.17 in novel-TextMacros.sty.} \ExplSyntaxOn % \DeclareDocumentCommand \sups { m } @@ -507,7 +489,6 @@ }% }% end \sups % -\NDB{4.18 in novel-TextMacros.sty.} \DeclareDocumentCommand \subs { m } {% \iftoggle{@realmarker}{% @@ -535,7 +516,6 @@ \gdef\specialblankline{\null} % deprecated %% -\NDB{4.19 in novel-TextMacros.sty.} %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex index cbd4733c408..c33c34c7692 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/08/15 v1.38 LaTeX file (additional glyph to unicode)] +[2017/09/14 v1.40 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 f5ba1184cc2..89a37c9231a 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg +++ b/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg @@ -18,8 +18,8 @@ %% ------------------------------------------------------------------------ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{novel-microtype.cfg} - [2017/08/15 v1.38 LaTeX file (microtype configuration file for novel class)] +\ProvidesFile{novel-microtype.cfg}% +[2017/09/14 v1.40 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 5b5baa9a6a9..329eb76351b 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty @@ -23,8 +23,8 @@ %% ----------------------------------------------------------------------------- %% \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{novel-pdfx.sty} - [2017/08/15 v1.38 LaTeX file (PDF/X support for novel class)] +\ProvidesFile{novel-pdfx.sty}% +[2017/09/14 v1.40 LaTeX file (PDF/X support for novel class)] % This package supports, and is part of, class `novel'. % No support for anything but LuaLaTeX. @@ -33,8 +33,6 @@ %% This file is loaded \AtEndPreamble. %% -%% Novel Tracking messages in this file begin with 11. -\NDB{11.0 in novel-pdfx.sty.} % @@ -45,14 +43,12 @@ pdfpagelabels=true,pageanchor=false,pdfstartview=} % \RequirePackage[\pdfx@pdfX@opts@luatex]{hyperref} -\NDB{11.1 in novel-pdfx.sty.} % \hypersetup{pdfencoding=auto} \expandafter\ifx\csname KV@Hyp@psdextra\endcsname\relax\else \hypersetup{psdextra} \fi \Hy@bookmarksfalse -\NDB{11.2 in novel-pdfx.sty.} % \newif \if@gottitle \@gottitlefalse % refers to PDF File Data % Was \title{} called prior to this step? If so: @@ -66,7 +62,6 @@ before using \string\SetPDFX.^^J} \fi \fi -\NDB{11.3 in novel-pdfx.sty.} % \if@gottitle\else \ClassWarning{novel}{Your file has been compiled without standard^^J % @@ -82,7 +77,6 @@ \edef\pdfcreationdate{\pdfcreationdate}% \let\pdfx@mdfivesum\pdf@mdfivesum % -\NDB{11.4 in novel-pdfx.sty.} @@ -111,7 +105,6 @@ \FPmul{\my@THnum}{\my@THnum}{0.99626401} \FPround{\my@THnum}{\my@THnum}{3} % -\NDB{11.5 in novel-pdfx.sty.} \FPsub{\my@TWorigin}{\my@MWnum}{\my@TWnum} \FPmul{\my@TWorigin}{\my@TWorigin}{0.5} \FPround{\my@TWorigin}{\my@TWorigin}{3} @@ -128,7 +121,6 @@ \FPclip{\my@THorigin}{\my@THorigin} \FPclip{\my@THcorner}{\my@THcorner} % -\NDB{11.6 in novel-pdfx.sty.} \newcommand\novel@CropBox{% \if@cropview% /CropBox[\my@TWorigin\space\my@THorigin\space\my@TWcorner\space\my@THcorner]% @@ -136,12 +128,10 @@ /CropBox[0\space0\space\my@MWnum\space\my@MHnum]% \fi% } -\NDB{11.7 in novel-pdfx.sty.} % \newcommand\novel@TrimBox{% /TrimBox[\my@TWorigin\space\my@THorigin\space\my@TWcorner\space\my@THcorner]% } -\NDB{11.8 in novel-pdfx.sty.} % % New in version 1.2: BleedBox, only for cover art. Same size as MediaBox. \newcommand\novel@BleedBox{% @@ -149,14 +139,12 @@ /BleedBox[0\space0\space\my@MWnum\space\my@MHnum]% \else\fi% } -\NDB{11.9 in novel-pdfx.sty.} % \begingroup\edef\next{% \endgroup\pdfpageattr{\novel@CropBox^^J\novel@BleedBox^^J\novel@TrimBox}}\next % %% End calculate and specify TrimBox. -\NDB{11.10 in novel-pdfx.sty.} %% DISABLE HYPERLINKS AND BOOKMARKS @@ -193,7 +181,6 @@ }{} %% End disable hyperlinks and bookmarks. -\NDB{11.11 in novel-pdfx.sty.} %% GENERAL PDF INTERNAL METADATA PREPARATION @@ -205,7 +192,6 @@ % %% End general PDF in internal metadata preparation. -\NDB{11.12 in novel-pdfx.sty.} %% PREPARATION OF XMP METADATA @@ -230,7 +216,6 @@ \def\pad@cxxviii{\pad@lxiv\pad@lxiv} \def\pad@cclvi{\pad@cxxviii\pad@cxxviii} \def\pad@dxii{\pad@cclvi\pad@cclvi} -\NDB{11.13 in novel-pdfx.sty.} % % Frankly, I am not sure if all this rigamarole is necessary, but it works! % Here, portions of XMP code are prepared. Later, they will be inserted @@ -254,13 +239,11 @@ \pad@vi</dc:creator>^^J } } -\NDB{11.14 in novel-pdfx.sty.} % \def\@documentID{uuid:\xmp@docid} \def\@instanceID{uuid:\xmp@instid} % \def\@pdfVersion{1.\the\pdfminorversion} -\NDB{11.15 in novel-pdfx.sty.} % \ifpdfx@isOFF \gdef\@verconfString{}% @@ -272,7 +255,6 @@ \fi } \fi -\NDB{11.16 in novel-pdfx.sty.} % \ifpdfx@isOFF \gdef\@pdfidString{}% @@ -281,7 +263,6 @@ \pad@vi<pdfxid:GTS_PDFXVersion>\@PDFXversion</pdfxid:GTS_PDFXVersion>^^J } \fi -\NDB{11.17 in novel-pdfx.sty.} % \ifthenelse{\equal{\@novelApplication}{} \OR \equal{\@novelApplication}{ }}{ \gdef\@applicationString{}% @@ -294,7 +275,6 @@ }{ \gdef\@producerString{\pad@vi<pdf:Producer>\@novelProducer</pdf:Producer>^^J}% } -\NDB{11.18 in novel-pdfx.sty.} % % Calculation of Dates and Times, which must be in a specific format. % Each time you process to PDF, the current date/time is used, @@ -344,7 +324,6 @@ % %% End Prepare XMP metadata. -\NDB{11.19 in novel-pdfx.sty.} %% WRITE THE XMP METADATA, UNLESS PDF/X IS OFF OR NO TITLE @@ -384,7 +363,6 @@ % %% End write the XMP metadata. -\NDB{11.20 in novel-pdfx.sty.} %% PREPARE PDF /INFO METADATA @@ -413,7 +391,6 @@ \endgroup \fi } -\NDB{11.21 in novel-pdfx.sty.} % Now, massage the metadata: \@infotopdfstring{\@infotitle}{\@title} \@infotopdfstring{\@infoauthor}{\@author} @@ -428,7 +405,6 @@ % %% End prepare PDF /Info. -\NDB{11.22 in novel-pdfx.sty.} %% WRITE THE OUTPUT INTENT, UNLESS PDFX IS OFF. @@ -490,7 +466,6 @@ % %% End write the output intent. -\NDB{11.23 in novel-pdfx.sty.} %% DISABLE HYPERREF OPTIONS @@ -508,7 +483,6 @@ % %% End disable hyperref options. -\NDB{11.24 in novel-pdfx.sty.} %% PREPARE PDF/Info @@ -544,7 +518,6 @@ % %% End prepare PDF/Info. -\NDB{11.25 in novel-pdfx.sty.} %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty index c4b5ef95ce1..e125c9834a3 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/08/15 v1.38 LaTeX file (novel XMP packet template)] +[2017/09/14 v1.40 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 da6d7234271..ab90ac76d26 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel.cls +++ b/Master/texmf-dist/tex/lualatex/novel/novel.cls @@ -17,14 +17,16 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] % Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016. -\ProvidesClass{novel}[2017/08/15 v1.38 LaTeX document class] +\ProvidesClass{novel}[2017/09/14 v1.40 LaTeX document class] %% +%% Version 1.40: removed `debug' option (was not useful). Major docs rewrite. + %% Version 1.38: corrected offset in cover artwork; some docs modified. %% Version 1.36: minor documentation correction. -%% Version 1.34: Added debug class option and related code. +%% Version 1.34: Added debug class option and related code. [Later removed.] %% Version 1.32 includes a minor documentation fix, and a major bug fix %% concerning looose text tracking. The bug occasionally appeared when @@ -59,11 +61,6 @@ %% custom font, NovelDeco.otf, is used for special purposes. %% -%% From version 1.34, novel has a debug system. See documentation pg. 11. -%% Some messages appear in log file, whether or not debug option used. -%% Other messages only appear with debug option. -\typeout{Novel Tracking 0.0: Begin loading novel.cls file.} - %% REQUIRE LUATEX and do some preliminary setup. %% ----------------------------------------------------------------------------- @@ -127,7 +124,7 @@ %% ----------------------------------------------------------------------------- % Allowed option list: % draft xml shademargins graytext greytext cropmarks cropview closecrop -% coverart debug +% coverart unblock % Yes, I realize that this could have been done another way: \gdef\@mycol{\@classoptionslist} \StrDel{\@mycol}{ }[\@mycol] @@ -141,11 +138,13 @@ \StrDel{\@mycol}{cropview}[\@mycol] \StrDel{\@mycol}{closecrop}[\@mycol] \StrDel{\@mycol}{coverart}[\@mycol] -\StrDel{\@mycol}{debug}[\@mycol] +\StrDel{\@mycol}{debug}[\@mycol] % obsolete +\StrDel{\@mycol}{unblock}[\@mycol] % \ifthenelse{\equal{\@mycol}{}}{}{ \ClassWarning{novel}{Unrecognized class option: \@mycol^^J% The unrecognized option was ignored!^^J% + If `debug' it is obsolete from v.1.40.^^J% Note that font point size and document size^^J% are not novel class options. See documentation.}% } @@ -214,11 +213,6 @@ \DeclareOption{coverart}{ \@coverarttrue } -% New in version 1.34: debug option. See documentation page 11. -\newif \if@noveldebug -\DeclareOption{debug}{ - \@noveldebugtrue -} % New in version 1.34: unblock option, for developer use only. % Normally, a number of packages known to be incompatible with this document class % are blocked from loading. If the user tries to get them via \usepackage @@ -259,14 +253,6 @@ \fi %% end class options -\typeout{Novel Tracking 0.0: Class options processed.} - -% \NDB is used in various other files, part of novel class. -% It may also be used in the TeX document. -% If debug option, this prints a message to log file. -% Example usage: \NDB{your message goes here} -\gdef\NDB#1{\if@noveldebug\typeout{Novel Tracking #1}\fi} - %% Activate xcolor, adjustbox, and eso-pic: %% ----------------------------------------------------------------------------- @@ -311,7 +297,6 @@ % %% end temporary normal point size and baselineskip -\typeout{Novel Tracking 0.1: Additional packages loaded.} %% Define commands used for File Data, including PDF/X Settings. %% ----------------------------------------------------------------------------- @@ -319,7 +304,6 @@ %% and in XMP. This class does not write it to the Catalog. %% Defines commands such as \title{}, not necessarily the same as other TeX. \RequirePackage{novel-FileData} -\typeout{Novel Tracking 0.2: novel-FileData.sty loaded.} % %% @@ -329,7 +313,6 @@ %% Define commands that over-ride the class option pre-configured settings. %% Variety of miscellaneous layout settings such as \parsep, \parindent, etc. \RequirePackage{novel-LayoutSettings} -\typeout{Novel Tracking 0.3: novel-LayoutSettings.sty loaded.} % %% @@ -339,19 +322,14 @@ %% % Macros for use in document body: \RequirePackage{novel-TextMacros} % part of novel class -\typeout{Novel Tracking 0.4: novel-TextMacros.sty loaded.} % Standard `fancyhdr' header footer styles: \RequirePackage{novel-HeadFootStyles} % part of novel class -\typeout{Novel Tracking 0.5: novel-HeadFootStyles.sty loaded.} % Chapter and Scene styles: \RequirePackage{novel-ChapterScene} -\typeout{Novel Tracking 0.6: novel-ChapterScene.sty loaded.} % Image placement: \RequirePackage{novel-Images} % part of novel class -\typeout{Novel Tracking 0.7: novel-Images.sty loaded.} % Footnotes and endnotes: \RequirePackage{novel-Footnotes} % part of novel class -\typeout{Novel Tracking 0.8: novel-Footnotes.sty loaded.} %% @@ -359,17 +337,12 @@ %% ----------------------------------------------------------------------------- % \AtEndPreamble{ - \typeout{Novel Tracking 1.AEP.E: Entered AtEndPreamble routine in novel.cls.} \RequirePackage{novel-CalculateLayout} - \typeout{Novel Tracking 1.9: novel-CalculateLayout.sty loaded.} \RequirePackage{novel-FontDefaults} - \typeout{Novel Tracking 1.10: novel-FontDefaults.sty loaded.} \renewcommand\textls[2][]{#2% \typeout{Class `novel' Alert: \string\textls\space ignored on pg \thepage.}% } % nullifies this microtype command (problems) - \RequirePackage{novel-pdfx} - \typeout{Novel Tracking 1.11: novel-pdfx.sty loaded.} - \typeout{Novel Tracking 1.AEP.X: Exiting AtEndPreamble routine in novel.cls.} + \RequirePackage{novel-pdfx}% } %% @@ -378,14 +351,12 @@ %% ----------------------------------------------------------------------------- % \AtBeginDocument{ % - \typeout{Novel Tracking 1.ABD.E: Entering AtBeginDocument routine in novel.cls.} \defaultfontfeatures{} % reset % Any other fonts will use these defaults: \defaultfontfeatures{% SmallCapsFeatures={Renderer=Basic},Kerning=On,% Ligatures=TeX,% }% - \NDB{1.ABD.1 in novel.cls.} % % Find some useful measurements: \gdef\@normalxheight{\heightof{x}} @@ -394,14 +365,12 @@ \gdef\@normalXheight{\heightof{X}} \setlength\normalXheight{\@normalXheight} \global\normalXheight=\normalXheight - \NDB{1.ABD.2 in novel.cls.} % Activate user choice of whether or not to indent after scenebreak commands: \if@indentAfterScenebreak\else \NoIndentAfterCmd{\scenebreak} \NoIndentAfterCmd{\sceneline} \NoIndentAfterCmd{\scenestars} \fi - \NDB{1.ABD.3 in novel.cls.} % \@activateHeadFootStyles % in file `novel-HeadFootStyles.sty' \@novelPDFinfo % in file `novel-pdfx.sty'. @@ -410,7 +379,6 @@ \let\title\relax \let\author\relax \let\subtitle\relax - \NDB{1.ABD.4 in novel.cls.} % Dealing with known incompatible packages: \if@novelunblock \gdef\sorry@no#1{} % let them be used @@ -424,7 +392,6 @@ }{}% } \fi - \NDB{1.ABD.5 in novel.cls.} % \sorry@no{pdfx} \sorry@no{xmpincl} @@ -454,13 +421,12 @@ \sorry@no{engord} \sorry@no{endnotes} %% - \NDB{1.ABD.6 in novel.cls.} + %% %% Pertains to novel-LayoutSettings.sty: \ifcsname pagenumberstyle\endcsname\else \SetPageNumberStyle{\thepage} \fi - \NDB{1.ABD.7 in novel.cls.} % \def\@setchapterstartOK{false}% \ifthenelse{\equal{\@setchapterstart}{empty}}{% @@ -494,14 +460,12 @@ \ClassError{novel}{\string\SetChapterStart\space bad argument}% {\string\SetChapterStart\space only allows certain choices.^^J}% }% - \NDB{1.ABD.8 in novel.cls.} %% %% Pertains to novel-TextMacros.sty: \setlength\forceparlength{\parindent} \global\forceparlength=\forceparlength \gdef\forceindent{\ifvmode\else\unskip\fi\stake\hspace{\forceparlength}} \gdef\backindent{\ifvmode\else\unskip\fi\hspace{-\forceparlength}} - \NDB{1.ABD.9 in novel.cls.} %% %% Pertains to novel-footnotes.sty: \gdef\SetFootnoteMarker#1{% @@ -510,7 +474,6 @@ } % Must wait for \nbs to be calculated: \setlength\footnotesep{0.8\nbs} - \NDB{1.ABD.10 in novel.cls.} % Must wait for main font and its size to be active: \newlength\@hoaring \setlength\@hoaring{\heightof{Å}} @@ -539,20 +502,16 @@ \addtolength\@tweight{-0.2\@tweight}% \addtolength\@tweight{-\@hoaring}% \global\@tweight=\@tweight% - \NDB{1.ABD.11 in novel.cls.} % Must wait to see how \SetFootnoteMarker was used: \ifthenelse{\equal{\@myfnsymbols}{*}}{\setcounter{@maxfnsymbol}{8}}{} \ifthenelse{\equal{\@myfnsymbols}{†}}{\setcounter{@maxfnsymbol}{6}}{} - \NDB{1.ABD.12 in novel.cls.} %% - \typeout{Novel Tracking 1.ABD.X: Exiting AtBeginDocument in novel.cls.} } %% %% New in version 1.2, coverart option. See docs page 10. \AfterEndPreamble{ - \typeout{Novel Tracking 1.FEP.E: Entered AfterEndPreamble in novel.cls.} \if@coverart \AddToShipoutPictureBG{% \AtPageUpperLeft{% @@ -561,18 +520,15 @@ } \null% without this, page has no "content" \fi - \typeout{Novel Tracking 1.FEP.X: Exiting AfterEndPreamble in novel.cls.} } %% %% AtBeginShipout occurs at the completion of each page layout, in document body. \AtBeginShipout{% - \NDB{1.ABS.E: Entered AtBeginShipout, page \thepage, in novel.cls.}% \gdef\@fnafter{}% Pertains to some standard LaTeX footnote code. \stepcounter{runningpages}% \global\@thispagestylesetfalse% - \NDB{1.ABS.X: Exiting AtBeginShipout, page \thepage, in novel.cls.}% } %% |