diff options
author | Karl Berry <karl@freefriends.org> | 2017-10-02 21:57:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-10-02 21:57:58 +0000 |
commit | 08f4fdc740a25d49aa543ac6694453cd84aacfd4 (patch) | |
tree | 55a8c16b95d52595fe11b2a80d726ca12124c5df /Master/texmf-dist/tex/lualatex | |
parent | 3bb038ffb3dccb8c6562bf33bfd0044ae6e02df1 (diff) |
novel (1oct17)
git-svn-id: svn://tug.org/texlive/trunk@45450 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
17 files changed, 165 insertions, 161 deletions
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo index ea0df257a5f..625d8b32338 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.40.2 +% Typically used in the USA. Novel file version 1.41 % 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 eb4455ac5a8..561f407072e 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/09/21 v1.40.2 LaTeX file (layout calculations)] +[2017/10/02 v1.41 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 c4ae78198f1..e968146b910 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/09/21 v1.40.2 LaTeX file (chapter and scene macros)] +[2017/10/02 v1.41 LaTeX file (chapter and scene macros)] %% @@ -36,27 +36,8 @@ % \sceneline centers a line, about 1/3 textwidth. % \scenestars centers three widely-spaced asterisks. % Default behavior is \noindent for following paragraph. -% Use \AfterScenebreak{indent or noindent} in preamble to change this globally. +% Use \SetScenebreakIndent{true or false} in Preamble to change this globally. % Either way, the local behavior can be changed using \indent or \noindent. -\newif\if@indentAfterScenebreak \@indentAfterScenebreakfalse -\newcommand\IndentAfterScenebreak{\@indentAfterScenebreaktrue} % deprected from v. 1.40.2 -\newcommand\AfterScenebreak[1]{% indent or noindent. From v. 1.40.2 - \def\ngoodarg{false} - \ifthenelse{\equal{#1}{indent}}{% - \def\ngoodarg{true} - \@indentAfterScenebreaktrue - }{}% - \ifthenelse{\equal{#1}{noindent}}{% - \def\ngoodarg{true} - \@indentAfterScenebreakfalse - }{}% - \ifthenelse{\equal{\ngoodarg}{false}}{% - \ClassError{novel}{Bad argument for \string\AfterScenebreak\space}% - {\string\AfterScenebreak\space argument must be indent or noindent.}% - }{}% -} -\AfterScenebreak{noindent} % default -% \newcommand\scenebreak{\null} % \newcommand\sceneline{% @@ -98,16 +79,60 @@ \newlength\@oldparindent % % The argument is the number of normal baselineskips high (integer GTE 4). -\newenvironment{ChapterStart}[1][\@setchapterstartheight] % default 10 +\ExplSyntaxOn +\DeclareDocumentEnvironment {ChapterStart} { O{\@setchapterstartheight} O{\@setchapterstart} } {% - \FPifint{#1}\else% - \ClassError{novel}{\string\SetChapterStartHeight\space must be integer GTE 4}% - {Height of ChapterStart must be integer, greater than or equal to 4}% - \fi% - \FPiflt{#1}{4}% - \ClassError{novel}{\string\SetChapterStartHeight\space must be integer GTE 4}% - {Height of ChapterStart must be integer, greater than or equal to 4}% + \gdef\@thiscsstyle{#2}% + \thispagestyle{\@thiscsstyle}% + \setlength\@oldparindent{\parindent}% + \global\@oldparindent=\@oldparindent% + \setlength\parindent{0pt}% + \global\parindent=\parindent% + \ResetFootnoteSymbol% resets symbolic markers, but not numerical markers + \IfStrEq{#1}{*}{\gdef\@thiscsheight{\@setchapterstartheight}}{\gdef\@thiscsheight{#1}}% + \FPsub{\@fixlines}{\@thiscsheight}{2}% + \FPsub{\@fixlines}{\@fixlines}{0.001}% fudge to avoid rounding problems + \FPround{\@thiscsheight}{\@thiscsheight}{0}% + \FPiflt{\@thiscsheight}{4}% + \IfStrEq{\@thiscsstyle}{dropfolioinside}{% + \ClassError{novel}{ChapterStart~ height~ insufficient~ for~ dropfolioinside}% + {With~ dropfolioinside,~ the~ ChapterStart~ height~ must~ be~ at~ least~ 4.}% + }{}% \else\fi% + \FPiflt{\@thiscsheight}{3}% + \ClassError{novel}{ChapterStart~ height~ must~ be~ at~ least~ 3}% + {If~ you~ need~ height~ less~ than~ 3,~ consider~ \string\QuickChapter\space~ instead.}% + \else\fi% + \null% always a line above the first thing to appear within the environment + \setcounter{@linequarter}{0}% + \begin{textblock*}{\textwidth}[0,0](0pt,0pt)% +}{% close the environment: + \ifthenelse{% + \equal{\value{@linequarter}}{1} \OR \equal{\value{@linequarter}}{5}% + \OR \equal{\value{@linequarter}}{9} \OR \equal{\value{@linequarter}}{13}% + }{\vspace{0.75\nbs}}{}% + \ifthenelse{% + \equal{\value{@linequarter}}{2} \OR \equal{\value{@linequarter}}{6}% + \OR \equal{\value{@linequarter}}{10} \OR \equal{\value{@linequarter}}{14}% + }{\vspace{0.5\nbs}}{}% + \ifthenelse{% + \equal{\value{@linequarter}}{3} \OR \equal{\value{@linequarter}}{7}% + \OR \equal{\value{@linequarter}}{11} \OR \equal{\value{@linequarter}}{15}% + }{\vspace{0.25\nbs}}{}% + \end{textblock*}% + \vspace{\@fixlines\nbs}% + \if@addCTline\null\fi% + \setlength\parindent{\@oldparindent}% + \global\parindent=\parindent% + \nov@AfterGroup\NoIndentAfterThis% etextools and noindentafter +} +\ExplSyntaxOff % end ChapterStart environment + + + +%%%%% +\newenvironment{OldChapterStart}[1][\@setchapterstartheight] % default 10 +{% \setlength\@oldparindent{\parindent}% \global\@oldparindent=\@oldparindent% \setlength\parindent{0pt}% @@ -139,6 +164,13 @@ \global\parindent=\parindent% \nov@AfterGroup\NoIndentAfterThis% etextools and noindentafter } +%%%%% + + + + + + %% \LetLtxMacro\ChapterDisplay\ChapterStart\relax % deprecated \LetLtxMacro\endChapterDisplay\endChapterStart\relax % deprecated diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo index e26989efedf..098212ec7a1 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.40.2 +% Typically used in Europe. Novel file version 1.41 % 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 4cf07e74183..b6587408c95 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/09/21 v1.40.2 LaTeX file (File Data settings)] +[2017/10/02 v1.41 LaTeX file (File Data settings)] %% @@ -61,14 +61,14 @@ % Changing this does not change the software, it just changes the name. % Normally leave as default, but can change if urgent. \gdef\SetApplication#1{\gdef\@novelApplication{#1}} -\SetApplication{LaTeX with novel and microtype} % default +\SetApplication{LuaLaTeX with novel and microtype} % default % % \SetProducer{} (rarely used) % Name of the software that compiles to source to make PDF. % Changing this does not change the software, it just changes the name. % Normally leave as default, but can change if urgent. \gdef\SetProducer#1{\gdef\@novelProducer{#1}} -\SetProducer{LuaTeX with novel-pdfx and hyperref} % default +\SetProducer{LuaLaTeX with novel-pdfx and hyperref} % default % % Although some other data fields could have been added, % they do not pertain to fiction, especially if your book is print-on-demand. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty index 632161afcf7..27562142e07 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/09/21 v1.40.2 LaTeX file (default fonts)] +[2017/10/02 v1.41 LaTeX file (default fonts)] %% @@ -22,7 +22,6 @@ %% - %% Most TeX installations will use Latin Modern or Computer Modern %% as default fonts. These are unsuitable for commercial fiction. %% But `novel' class uses Libertinus as defaults. @@ -135,7 +134,7 @@ %% \newif \if@headfontdefault \if@headfontset\else - \SetHeadFont[\@parentfontfeatures,Scale=0.92]{\@parentfontname} + \SetHeadFont[Letters=SmallCaps,\@parentfontfeatures,Scale=0.92]{\@parentfontname} \global\@headfontdefaulttrue \fi \newfontfamily\headfont[\@headfontfeatures]{\@headfontname} @@ -211,42 +210,7 @@ %% -% Get rid of previously-defined fake polyglossia commands, -% but you can still use \setkeys from that package: -\let\SetMainLanguage\relax -\let\SetDefaultLanguage\relax -\let\SetOtherLanguage\relax -\let\SetOtherLanguages\relax -\let\setmainlanguage\relax -\let\setdefaultlanguage\relax -\let\setotherlanguage\relax -\let\setotherlanguages\relax -% Now that the basic fonts are defined, we can load these packages: -\RequirePackage{polyglossia} % Instead of babel. % -\ifthenelse{\equal{\@setmainlang}{}}{ - \setmainlanguage{english} -}{ - \ifthenelse{\equal{\@setmainlangopt}{}}{ - \setmainlanguage{\@setmainlang} - }{ - \setmainlanguage[\@setmainlangopt]{\@setmainlang} - } -} -\ifthenelse{\equal{\@setotherlang}{}}{}{ - \ifthenelse{\equal{\@setotherlangopt}{}}{ - \setotherlanguage{\@setotherlang} - }{ - \setotherlanguage[\@setotherlangopt]{\@setotherlang} - } -} -\ifthenelse{\equal{\@setotherlangs}{}}{}{ - \ifthenelse{\equal{\@setotherlangsopt}{}}{ - \setotherlanguages{\@setotherlangs} - }{ - \setotherlanguages[\@setotherlangsopt]{\@setotherlangs} - } -} %% 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 @@ -259,7 +223,7 @@ } \else % user did not write \microtypesetup{} in Preamble \gdef\@mymicrotypeset{% - config=novel-microtype,stretch=20,shrink=20} + config=novel-microtype,stretch=20,shrink=20,final} \fi \RequirePackage[\@mymicrotypeset,final,tracking]{microtype} % diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty index f44f6433282..bbc78dcbffd 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/09/21 v1.40.2 LaTeX file (commands for footnotes and endnotes)] +[2017/10/02 v1.41 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 65da05fc9ac..e3ef6970893 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty @@ -13,17 +13,19 @@ %% %% \ProvidesFile{novel-HeadFootStyles.sty}% -[2017/09/21 v1.40.2 LaTeX file (header and footer styles)] +[2017/10/02 v1.41 LaTeX file (header and footer layouts and styles)] %% %% File `novel-LayoutSettings.sty' reserved space for header/footer, %% but did not place anything there. In this file, `fancyhdr' syntax -%% defines the standard styles. These styles are not activated until -%% \AtEndPreamble, and only if the user did not already define the styles +%% defines the layout. The layout are not activated until +%% \AtEndPreamble, and only if the user did not already define the layout %% in the Preamble. +%% Note that `style' sometimes means `layout`. + % @isVerso true = even page, false = odd page. Only accurate during shipout. % Not to be used in commands that are inserted in main text! @@ -56,10 +58,12 @@ \gdef\@@loosehead{#1} \FPdiv{\@loosehead}{\@@loosehead}{10} % change in method of using fontspec with microtype \FPmin{\@looseheadnum}{\@loosehead}{50} % Don't want numbers too loose. + \FPdiv{\@looseheadword}{\@loosehead}{30} % new in v. 1.40.3. + \FPadd{\@looseheadword}{\@looseheadword}{1} } \SetLooseHead{50} % 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 +% somewhere in the Preamble. If not, then pre-defined layout based on trimsize % will be applied \AtEndPreamble. \LetLtxMacro{\@tempFancyhead}{\fancyhead} % from package `letltxmacro' \renewcommand\fancyhead[2][]{% @@ -79,7 +83,7 @@ } % \LetLtxMacro{\@myTempTPS}{\thispagestyle} -% Re-define \thispagestyle based on layout. When style requests only the page +% Re-define \thispagestyle based on layout. When it requests only the page % number, decide what to do based on this command and whether footer is used: \newif \if@thispagestyleset \@thispagestylesetfalse % @@ -153,15 +157,15 @@ % \versoheadtext is initialized to \theauthor % \rectoheadtext is initialized to \thetitle \@ifundefined{versoheadtext}{ - \NewVersoHeadText{\smcp{\StrSubstitute{\theauthor}{\space}{ \,}}} + \NewVersoHeadText{\theauthor} % revised in v. 1.40.3 }{} \@ifundefined{rectoheadtext}{ - \NewRectoHeadText{\smcp{\StrSubstitute{\thetitle}{\space}{ \,}}} + \NewRectoHeadText{\thetitle} % revised in v. 1.40.3 }{} % % ---------------------------------------------------------------------------- - % IF YOU ARE WRITING YOUR OWN HEADER/FOOTER STYLE: - % Look here for the pre-defined styles, for use as models. + % IF YOU ARE WRITING YOUR OWN HEADER/FOOTER LAYOUT: + % Look here for the pre-defined layouts, for use as models. % Note that if you write \fancyhead or \fancyfoot in the Preamble, % that sets the \@styledHeader flag, so these codes do not over-ride yours. \ifthenelse{\equal{\my@HeadFootStyle}{1}}{ % default @@ -236,7 +240,7 @@ }{} % % - % END PRE-DEFINED STYLES. + % END PRE-DEFINED LAYOUTS AND STYLES. % ---------------------------------------------------------------------------- % % Substitute for \thispagestyle{plain} @@ -281,10 +285,12 @@ \widthof{{\headfont{\addfontfeature{LetterSpace=\@looseheadnum}\pagenumberstyle}}}}% \if@offcenterTrim% \setlength\temp@pgnumraise{% - \New@BottomMargin+\New@MediaHeight-\New@TrimHeight}% + \dimexpr\New@BottomMargin+\New@MediaHeight-\New@TrimHeight}% + \global\temp@pgnumraise=\temp@pgnumraise% \else% \setlength\temp@pgnumraise{% - \New@BottomMargin+0.5\New@MediaHeight-0.5\New@TrimHeight}% + \dimexpr\New@BottomMargin+0.5\New@MediaHeight-0.5\New@TrimHeight}% + \global\temp@pgnumraise=\temp@pgnumraise% \fi% \check@IsVerso% \if@isVerso% @@ -342,7 +348,7 @@ \gdef\NewVersoHeadText#1{ \FPdiv{\@myk}{\@loosehead}{500} \setlength\@mykem{\@myk em} - \gdef\versoheadtext{\gdef~{\kern\@mykem\space}#1\gdef~{\nobreakspace {}}} + \gdef\versoheadtext{#1} } \let\SetVersoHeadText\NewVersoHeadText\relax % for convenience \let\RenewVersoHeadText\NewVersoHeadText\relax % for convenience @@ -350,7 +356,7 @@ \gdef\NewRectoHeadText#1{ \FPdiv{\@myk}{\@loosehead}{500} \setlength\@mykem{\@myk em} - \gdef\rectoheadtext{\gdef~{\kern\@mykem\space}#1\gdef~{\nobreakspace {}}} + \gdef\rectoheadtext{#1} } \let\SetRectoHeadText\NewRectoHeadText\relax % for convenience \let\RenewRectoHeadText\NewRectoHeadText\relax % for convenience diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty index 1fdda5b0dc9..01109a06c94 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/09/21 v1.40.2 LaTeX file (image placement)] +[2017/10/02 v1.41 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 bf507e64478..de0152c9c31 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.40.2 +% Typically used in Japan. Novel file version 1.41 % 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 834e92238e4..da162ed4784 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/09/21 v1.40.2 LaTeX file (layout settings)] +[2017/10/02 v1.41 LaTeX file (layout settings)] %% @@ -234,11 +234,11 @@ \gdef\SetHeadStyle#1{\gdef\my@HeadFootStyle{0}} % deprecated \SetHeadFootStyle{0} \else - % See docs part 7 for available style choices: + % See docs for available layout choices: \gdef\SetHeadFootStyle#1{\gdef\my@HeadFootStyle{#1}} \gdef\SetHeadStyle#1{\gdef\my@HeadFootStyle{#1}} % deprecated \fi -% See docs part 7 for what these emblems do, if used: +% See docs for what these emblems do, if used: \newcommand\SetEmblems[2]{ % verso, recto \gdef\my@VersoEmblem{{\headfont #1}} \gdef\my@RectoEmblem{{\headfont #2}} @@ -287,9 +287,10 @@ } % 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 -% New in version 1.40.1: +\gdef\SetChapterStartStyle#1{\gdef\@setchapterstart{#1}} % from v1.40.3. +\let\SetChapterStart\SetChapterStartStyle\relax % deprecated from v1.40.3. +\SetChapterStartStyle{footer} % default +% New in version 1.40.2: \gdef\SetChapterStartHeight#1{% \FPifint{#1}\else% \ClassError{novel}{\string\SetChapterStartHeight\space must be integer GTE 4}% @@ -302,9 +303,28 @@ \gdef\@setchapterstartheight{#1}% } \SetChapterStartHeight{10} % default - - % See novel.cls for the accompanying AtBeginDocument routine. +% Scene breaks: +\newif\if@indentAfterScenebreak \@indentAfterScenebreakfalse +\newcommand\IndentAfterScenebreak{\@indentAfterScenebreaktrue} % deprected from v. 1.40.3 +% \SetScenebreakIndent controls whether line after \scenebreak, \sceneline, or \scenestars +% will be indented. Set true or false, default false. +\newcommand\SetScenebreakIndent[1]{% true or false, default false. From v. 1.40.3 + \def\ngoodarg{no} + \ifthenelse{\equal{#1}{true}}{% + \def\ngoodarg{yes} + \@indentAfterScenebreaktrue + }{}% + \ifthenelse{\equal{#1}{false}}{% + \def\ngoodarg{yes} + \@indentAfterScenebreakfalse + }{}% + \ifthenelse{\equal{\ngoodarg}{no}}{% + \ClassError{novel}{Bad argument for \string\SetScenebreakIndent\space}% + {\string\SetScenebreakIndent\space argument must be true or false.}% + }{}% +} +\SetScenebreakIndent{false} % default % %% End reserve space for header/footer and set default ChapterStart @@ -326,11 +346,11 @@ %% -%% +%% Markers (superscript, subscripts): \newtoggle{@usesymbolmark} % true when footnote markers are symbolic \newtoggle{@realmarker} % true when OT features sups, sinf, subs requested % -% \SetMarkers does two things. +% \SetMarkerStyle does two things. % Option real: OT features sups, sinf, subs requested. Fake if not available. % Option fake: Always fake OT features sups, sinf, subs. % Mandatory: asterisk, dagger, number. Pertains to footnote markers only. @@ -357,6 +377,7 @@ {Optional: real, fake. Required: asterisk, dagger, number.}% }{} } +\LetLtxMacro{\SetMarkers}{\SetMarkerStyle} % backwards compatibilty pre-v1.40.3. % \SetMarkerStyle[real]{asterisk} % default %% @@ -475,20 +496,29 @@ %% Prior to v. 1.1, parentfont was known as masterfont. Backwards compatible. % \providecommand\rmdefault{lmr} % should be lmr anyway, at this point. -\let\@noveloldrmdefault\rmdefault % stored for later comparison. +\LetLtxMacro\@noveloldrmdefault\rmdefault\relax % stored for later comparison. % The `no-math' option prevents fontspec from tracking certain font changes. % This is probably necessary, since novel does some of its own font tracking: \RequirePackage[no-math]{fontspec} % For LuaLaTeX. NOT package `fontenc'. -\defaultfontfeatures{} % reset -% User-created fonts (not standard, not novel-specific defaults: -\defaultfontfeatures{% - SmallCapsFeatures={Renderer=Basic},Kerning=On,% - Ligatures=TeX,% -}% % You shouldn't be doing math! You can use \setmathfont, if you wish. % If you must load a math font package, it should be done using % \RequirePackage before (yes, before) calling the document class. \RequirePackage{unicode-math} +% +% Math font no kern: +\defaultfontfeatures{SmallCapsFeatures={Renderer=Basic},Ligatures=TeX,} +% +\IfFontExistsTF{Libertinus Math} +{\setmathfont{Libertinus Math}} +{\IfFontExistsTF{Asana Math} + {\setmathfont{Asana Math}} + {\IfFontExistsTF{STIX Math} + {\setmathfont{STIX Math}} + {\setmathfont{Latin Modern Math}} % last choice + } +}% end \IfFontExistsTF nest. +% For user-created font commands: +\defaultfontfeatures{SmallCapsFeatures={Renderer=Basic},Kerning=On,Ligatures=TeX,}% %% %% This could have been easier, but fontspec allows mandatory and optional % arguments to appear in either order. We wish to store the fontnames @@ -541,7 +571,7 @@ \gdef\@headfontname{} \DeclareDocumentCommand \SetHeadFont { O{} m O{} } {% \novel@checkfeatures{#1,#3} - \gdef\@headfontfeatures{#1,#3} + \gdef\@headfontfeatures{WordSpace=\@looseheadword,LetterSpace=\@loosehead,#1,#3} % revised in v. 1.40.3. \gdef\@headfontname{#2} \global\@headfontsettrue }% @@ -603,7 +633,7 @@ % In the document body: {\addfontfeature{myfs} text} \DeclareDocumentCommand \CreateFontFeature { m m } {% \IfEndWith{#1}{,}{\StrGobbleRight{#1}{1}[\@fakezero]}{\def\@fakezero{#1}} - \def\@fakeone{"\@fakezero"} %%%%% + \def\@fakeone{"\@fakezero"} \StrSubstitute{\@fakeone}{=}{"]="}[\@fakeone] \StrSubstitute{\@fakeone}{,}{",\space["}[\@fakeone] \directlua{ @@ -620,41 +650,6 @@ %% end definition of parent and other fonts. -%% FAKE POLYGLOSSIA COMMANDS -%% -------------------------------------------------------------------------- -% The polyglossia package is not loaded until \AtEndPreamble. -% So, its commands are not directly available in the Preamble. -% These fake commands store the data. Later, the commands will be relaxed, -% then the real polyglossia commands can work, and the data will be passed -% to the real commands at that time. -% Default main language will be set to english by novel-FontDefaults.sty. -\newcommand\SetMainLanguage[2][]{ - \gdef\@setmainlangopt{#1} - \gdef\@setmainlang{#2} -} -\let\setmainlanguage\SetMainLanguage\relax -\newcommand\SetDefaultLanguage[2][]{ - \gdef\@setmainlangopt{#1} - \gdef\@setmainlang{#2} -} -\let\setdefaultlanguage\SetDefaultLanguage\relax -\SetMainLanguage[]{} % if not user-specified, defaults to english -\newcommand\SetOtherLanguage[2][]{ - \gdef\@setotherlangopt{#1} - \gdef\@setotherlang{#2} -} -\let\setotherlanguage\SetOtherLanguage\relax -\SetOtherLanguage[]{} % default empty -\newcommand\SetOtherLanguages[2][]{ - \gdef\@setotherlangsopt{#1} - \gdef\@setotherlangs{#2} -} -\let\setotherlanguages\SetOtherLanguages\relax -\SetOtherLanguages[]{} % default empty -% -%% end fake polyglossia commands. - - %% FRONTMATTER, MAINMATTER. BUT NO BACKMATTER! %% -------------------------------------------------------------------------- % @@ -695,14 +690,14 @@ \setcounter{page}{1} } % -\def\backmatter{\@ifstar\@backmatterst\@backmatterns} % obsolete from v. 1.40. +\def\backmatter{\@ifstar\@backmatterst\@backmatterns} % asterisk obsolete from v. 1.40. \def\@backmatterst{% \ClassWarning{novel}{Command \string\backmatter*\ ignored. Do not use.^^J}% } % \def\@backmatterns{% \cleartorecto% v. 1.40.2 - \ClassWarning{novel}{Command \string\backmatter\ merely clears to recto.^^J}% v. 1.40.2 + \typeout{Class `novel' Alert: \string\backmatter\space merely clears to recto. See docs.^^J}% v. 1.42 % } % @@ -764,6 +759,12 @@ %% end disable or neutralize. +%% polyglossia +% Language-specific settings: +\RequirePackage{polyglossia} % loading order changed in v. 1.40.3. +%% end polyglossia + + %% %% End of file `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 00eb0dac67c..fe84ffd0a1e 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/09/21 v1.40.2 LaTeX file (text macros usable within document body)] +[2017/10/02 v1.41 LaTeX file (text macros usable within document body)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex index 8c3abf89ca0..6a1e83476ef 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/09/21 v1.40.2 LaTeX file (additional glyph to unicode)] +[2017/10/02 v1.41 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 aa5f707f73e..85902f0c58d 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/09/21 v1.40.2 LaTeX file (microtype configuration file for novel class)] +[2017/10/02 v1.41 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 c67aa8cb44c..01f82fb5ed7 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/09/21 v1.40.2 LaTeX file (PDF/X support for novel class)] +[2017/10/02 v1.41 LaTeX file (PDF/X support for novel class)] % This package supports, and is part of, class `novel'. % No support for anything but LuaLaTeX. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty index 555f12c9a57..661c712cef7 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/09/21 v1.40.2 LaTeX file (novel XMP packet template)] +[2017/10/02 v1.41 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 73fb88c79c5..0abd22133f6 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel.cls +++ b/Master/texmf-dist/tex/lualatex/novel/novel.cls @@ -17,10 +17,11 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] % Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016. -\ProvidesClass{novel}[2017/09/21 v1.40.2 LaTeX document class] +\ProvidesClass{novel}[2017/10/02 v1.41 LaTeX document class] %% %% Version 1.40: removed `debug' option (was not useful). Major docs rewrite. +%% Versions 1.40.x: Incremental changes, leading to 1.42. %% Version 1.38: corrected offset in cover artwork; some docs modified. @@ -109,7 +110,7 @@ % fontspec -- in novel-LayoutSettings.sty % unicode-math -- in novel-LayoutSettings.sty % eso-pic -- in novel-CalculateLayout.sty -% polyglossia -- in novel-FontDefaults.sty +% polyglossia -- in novel-LayoutSettings.sty % microtype -- in novel-FontDefaults.sty % hyperref -- in novel-pdfx.sty % fancyhdr -- in novel.HeadFootStyles.sty @@ -337,6 +338,9 @@ %% ----------------------------------------------------------------------------- % \AtEndPreamble{ + % If user did not choose language, default is here. Sorry, Brits: + % Macro \xpg@main@language is gdef'd by \setdefaultlanguage in polyglossia. + \@ifundefined{xpg@main@language}{\setdefaultlanguage[variant=american]{english}}{} \RequirePackage{novel-CalculateLayout} \RequirePackage{novel-FontDefaults} \renewcommand\textls[2][]{#2% @@ -447,18 +451,15 @@ \ifthenelse{\equal{\@setchapterstart}{forcenumber}}{% \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterstart}{dropfolio}}{% no footnote there + \ifthenelse{\equal{\@setchapterstart}{dropfolioinside}}{% \def\@setchapterstartOK{true}% }{}% - \ifthenelse{\equal{\@setchapterstart}{dropfoliolater}}{% footnote(s) there - \def\@setchapterstartOK{true}% - }{}% - \ifthenelse{\equal{\@setchapterstart}{foliobeneath}}{% + \ifthenelse{\equal{\@setchapterstart}{dropfoliobeneath}}{% \def\@setchapterstartOK{true}% }{}% \ifthenelse{\equal{\@setchapterstartOK}{true}}{}{% - \ClassError{novel}{\string\SetChapterStart\space bad argument}% - {\string\SetChapterStart\space only allows certain choices.^^J}% + \ClassError{novel}{\string\SetChapterStartStyle\space bad argument}% + {\string\SetChapterStartStyle\space only allows certain choices.^^J}% }% %% %% Pertains to novel-TextMacros.sty: |