diff options
| author | Norbert Preining <norbert@preining.info> | 2024-02-01 03:00:51 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2024-02-01 03:00:51 +0000 |
| commit | a494a509f3f4a13a450c898488155f7aa5353bd3 (patch) | |
| tree | ab11a3116dfe36f273b0eefe1a7abb556253a9c8 /macros | |
| parent | 79e1bbc1ad6b308aa2074540b2afd43b6a72ce03 (diff) | |
CTAN sync 202402010300
Diffstat (limited to 'macros')
123 files changed, 4519 insertions, 17723 deletions
diff --git a/macros/ec-plain/00readme.doc b/macros/ec-plain/00readme.doc deleted file mode 100644 index 66db615f61..0000000000 --- a/macros/ec-plain/00readme.doc +++ /dev/null @@ -1,44 +0,0 @@ -This is the complete set of files to generate a EC font oriented PLAIN.FMT - -The main file for plain format is EC-PLAIN. -The main file for pdf plain format is EC-PDFPLAIN. - -The EC-PLFMT.BAT is MSDOS file (for 386 and emTeX) which I -used to generate the EC-PLAIN format under emTeX. - -For the TeXLive distribution, the building commands are: - - -- initex ec-plain - -- pdfinitex ec-pdfplain - -The code page converter I use (to avoid active characters >127) -is 850DCTEX.TCP (to be transferred in BINARY). Its source -to be compiled with maketcp is 850DCTEX.MTC (to be transferred -in ASCII). Use maketcp version 1.1c or later with option -c -to generate 850DCTEX.TCP - -With the TeXLive distribution, one should only change he [pdf]texing -commands by adding the option "translate-file": - -tex.exe -translate-file=cp850-fr.tcx &ec-plain \input %1 %2 %3 %4 -pdftex.exe -translate-file=cp850-fr.tcx &ec-pdfplain \input %1 %2 %3 %4 - - -CAUTION -======= -File names in this directory have been changed from the original (e.g. -dcacceur.tex --> hyacceur.tex) in order to have no missing file when -generating format. Thus you should put these files in a directory distinct -from your usual TEXINPUT, unless you look at EC-PLFMT.BAT to rename them -backwards. - -ec-plain.tex differs from plain.tex for: - - font names (e.g. cmr10 -> ecrm1000) - - cmmi* -> exmi* with 128 additional chars to have upright greek capitals - - several mathchardefs - - inclusion of hyacceur.tex+acmacros.sty+hyconfig.ptx instead of hyphen.tex - - \magstep up to 9 - -Daniel TAUPIN - -taupin@lps.u-psud.fr diff --git a/macros/ec-plain/README b/macros/ec-plain/README deleted file mode 120000 index 2ba1706e78..0000000000 --- a/macros/ec-plain/README +++ /dev/null @@ -1 +0,0 @@ -00readme.doc
\ No newline at end of file diff --git a/macros/ec-plain/acmacros.sty b/macros/ec-plain/acmacros.sty deleted file mode 100644 index e161d7efd6..0000000000 --- a/macros/ec-plain/acmacros.sty +++ /dev/null @@ -1,594 +0,0 @@ -% special distinction EURO-TeX/tm.fonts/dm.fonts -\ifx\rm\undefined\relax -\else\rm -\def\wordsplita#1#2#3.{#1}% -\def\wordsplitb#1#2#3.{#2}% -% -\ifx\fonthdg\undefined - \edef\fonthdg{\expandafter\wordsplita\fontname\the\font.}\fi -\ifx\fonthdge\undefined - \edef\fonthdge{\expandafter\wordsplitb\fontname\the\font.}\fi -\fi - -\newif\ifeurotex -\immediate\write16{ Font heading:\fonthdg\fonthdge}\relax -\if\fonthdg d\relax - \if\fonthdge c\relax - \immediate\write16{ DC fonts active}% - \eurotextrue - \fi -\fi -% -\if\fonthdg e\relax - \if\fonthdge c\relax - \immediate\write16{ EC fonts active}% - \eurotextrue - \fi -\fi -% -\ifx\protect\undefined\let\protect\relax\fi -% -% ================== Special accent macro codes ============================ -% taken from dc-plain.ch -\ifeurotex - \def\acute{\mathaccent"7001 } - \def\grave{\mathaccent"7000 } - \def\ddot{\mathaccent"7004 } - \def\tilde{\mathaccent"7003 } - \def\bar{\mathaccent"7009 } - \def\breve{\mathaccent"7008 } - \def\check{\mathaccent"7007 } - \def\hat{\mathaccent"7002 } - \def\vec{\mathaccent"017E } - \def\dot{\mathaccent"700A } - \def\ss{^^ff} - \def\ae{^^e6} - \def\oe{^^f7} - \def\o{^^f8} - \def\AE{^^c6} - \def\OE{^^d7} - \def\O{^^d8} - \def\i{^^19}\def\j{^^1a} % dotless letters - \def\aa{^^e5} - \def\AA{^^c5} - \def\l{^^aa} %backslash-lowercase L for Polish waw} - \def\L{^^8a} - \def\th{^^fe} - \def\TH{^^de} - \def\dh{^^f0} - \def\DH{^^d0} - \def\dj{^^9e} - \def\DJ{^^d0} - \def\ng{^^ad} - \def\NG{^^8d} - \def\SS{^^df} -\else - \def\ae{^^1a} - \def\oe{^^1b} - \def\o{^^1c} - \def\AE{^^1d} - \def\OE{^^1e} - \def\O{^^1f} - \def\i{^^10} - \def\j{^^11} % dotless letters -\fi - -\ifeurotex - \def\b#1{\oalign{#1\crcr\hidewidth - \vbox to.2ex{\hbox{\char"09}\vss}\hidewidth}} -\fi - -\ifeurotex -\def\@gr@#1{{\accent"00 #1}} -\else -\def\@gr@#1{{\accent18 #1}} -\fi - -\def\`#1{\ifx#1a^^e0% {} - \else\ifx#1e^^e8% {} - \else\ifx#1\i ^^ec% {} - \else\ifx#1i^^ec% {} - \else\ifx#1o^^f2% {} - \else\ifx#1u^^f9% {} - \else\ifx#1A^^c0% {} - \else\ifx#1E^^c8% {} - \else\ifx#1I^^cc% {} - \else\ifx#1O^^d2% {} - \else\ifx#1U^^d9% {} - \else\protect\@gr@{#1}% - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} - -\def\c@{\@c@} -\ifeurotex -\def\@c@#1{\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent"0B #1% - \else{\ooalign{\hidewidth\char"0B\hidewidth\crcr\unhbox\z@}}\fi}% -\else -\def\@c@#1{\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent 24 #1% - \else{\ooalign{\hidewidth\char 24\hidewidth\crcr\unhbox\z@}}\fi}% -\fi - - -\ifeurotex -\def\c#1{\ifx#1c^^e7% {} - \else\ifx#1a^^a1% {} - \else\ifx#1e^^a6% {} - \else\ifx#1s^^b3% {} - \else\ifx#1t^^b5% {} - \else\ifx#1C^^c7% {} - \else\ifx#1A^^81% {} - \else\ifx#1E^^86% {} - \else\ifx#1S^^93% {} - \else\ifx#1T^^95% {} - \else\protect\@c@{#1}% - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} -\else -\def\c#1{\ifx#1c^^e7% {} - \else\ifx#1C^^c7% {} - \else\protect\@c@{#1}% - \fi\fi} -\fi - -\ifeurotex -\def\@r@#1{{\accent"06 #1}} -\else -\def\@r@#1{{\accent"17 #1}} -\fi - -\ifeurotex -\def\r#1{\ifx#1a^^e5% {} - \else\ifx#1A^^c5% {} - \else\ifx#1u^^b7% {} - \else\ifx#1U^^97% {} - \else\protect\@r@{#1}% - \fi\fi\fi\fi} -\else -\def\r#1{\ifx#1a^^e5% {} - \else\ifx#1A^^c5% {} - \else\protect\@r@{#1}% - \fi\fi} -\fi - -\ifeurotex -\def\@ac@#1{{\accent"01 #1}} -\else -\def\@ac@#1{{\accent19 #1}} -\fi - -\ifeurotex -\def\'#1{\ifx#1a^^e1% {} - \else\ifx#1e^^e9% {} - \else\ifx#1\i ^^ed% {} - \else\ifx#1i^^ed% {} - \else\ifx#1o^^f3% {} - \else\ifx#1u^^fa% {} - \else\ifx#1y^^fd% {} - \else\ifx#1c^^a2% {} - \else\ifx#1l^^a8% {} - \else\ifx#1n^^ab% {} - \else\ifx#1r^^af% {} - \else\ifx#1s^^b1% {} - \else\ifx#1z^^b9% {} - \else\ifx#1A^^c1% {} - \else\ifx#1E^^c9% {} - \else\ifx#1I^^cd% {} - \else\ifx#1O^^d3% {} - \else\ifx#1U^^da% {} - \else\ifx#1Y^^dd% {} - \else\ifx#1C^^82% {} - \else\ifx#1L^^88% {} - \else\ifx#1N^^8b% {} - \else\ifx#1R^^8f% {} - \else\ifx#1S^^91% {} - \else\ifx#1Z^^99% {} - \else\protect\@ac@{#1}% - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} -\else -\def\'#1{\ifx#1a^^e1% {} - \else\ifx#1e^^e9% {} - \else\ifx#1\i ^^ed% {} - \else\ifx#1i^^ed% {} - \else\ifx#1o^^f3% {} - \else\ifx#1u^^fa% {} - \else\ifx#1y^^fd% {} - \else\ifx#1A^^c1% {} - \else\ifx#1E^^c9% {} - \else\ifx#1I^^cd% {} - \else\ifx#1O^^d3% {} - \else\ifx#1U^^da% {} - \else\ifx#1Y^^dd% {} - \else\protect\@ac@{#1}% - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} -\fi - -\ifeurotex -\def\@v@#1{{\accent"07 #1}} -\else -\def\@v@#1{{\accent 20 #1}} -\fi - -\ifeurotex -\def\v#1{\ifx#1c^^a3% {} - \else\ifx#1d^^a4% {} - \else\ifx#1e^^a5% {} - \else\ifx#1n^^ac% {} - \else\ifx#1r^^b0% {} - \else\ifx#1s^^b2% {} - \else\ifx#1t^^b4% {} - \else\ifx#1l^^a9% {} - \else\ifx#1C^^83% {} - \else\ifx#1D^^84% {} - \else\ifx#1E^^85% {} - \else\ifx#1N^^8c% {} - \else\ifx#1R^^90% {} - \else\ifx#1S^^92% {} - \else\ifx#1T^^94% {} - \else\ifx#1L^^89% {} - \else\protect\@v@{#1}% - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} -\else -\def\v#1{\protect\@v@{#1}}% -\fi - -\ifeurotex -\def\@u@#1{{\accent"08 #1}} -\else -\def\@u@#1{{\accent 21 #1}} -\fi - -%\check - -\ifeurotex -\def\u#1{\ifx#1a^^a0% {} - \else\ifx#1g^^a7% {} - \else\ifx#1A^^80% {} - \else\ifx#1G^^87% {} - \else\protect\@u@{#1}% - \fi\fi\fi\fi} -\else -\def\u#1{\protect\@u@{#1}}% -\fi - -\ifeurotex -\def\@dot@#1{{\accent"0A #1}} -\else -\def\@dot@#1{{\accent 95 #1}} -\fi - -%\check - -\ifeurotex -\def\.#1{\ifx#1z^^bb% {} - \else\ifx#1Z^^9b% {} - \else\ifx#1I^^9d% {} - \else\protect\@dot@{#1}% - \fi\fi\fi} -\else -\def\.#1{\protect\@dot@{#1}}% -\fi - -%\check - -\ifeurotex -\def\@H@#1{{\accent"05 #1}} -\else -\def\@H@#1{{\accent"7D #1}} -\fi - -\ifeurotex -\def\H#1{\ifx#1o^^ae% {} - \else\ifx#1u^^b6% {} - \else\ifx#1O^^8e% {} - \else\ifx#1U^^96% {} - \else\protect\@H@{#1}% - \fi\fi\fi\fi} -\else -\def\H#1{\protect\@H@{#1}}% -\fi - -%\check - -\ifeurotex -\def\@um@#1{{\accent"04 #1}} -\else -\def\@um@#1{{\accent"7F #1}} -\fi - -\ifeurotex -\def\"#1{\ifx#1a^^e4% {} - \else\ifx#1e^^eb% {} - \else\ifx#1\i ^^ef% {} - \else\ifx#1i^^ef% {} - \else\ifx#1o^^f6% {} - \else\ifx#1u^^fc% {} - \else\ifx#1y^^b8% {} - \else\ifx#1A^^c4% {} - \else\ifx#1E^^cb% {} - \else\ifx#1I^^cf% {} - \else\ifx#1O^^d6% {} - \else\ifx#1U^^dc% {} - \else\ifx#1Y^^98% {} - \else\protect\@um@{#1}% - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} -\else -\def\"#1{\ifx#1a^^e4% {} - \else\ifx#1e^^eb% {} - \else\ifx#1\i ^^ef% {} - \else\ifx#1i^^ef% {} - \else\ifx#1o^^f6% {} - \else\ifx#1u^^fc% {} - \else\ifx#1A^^c4% {} - \else\ifx#1E^^cb% {} - \else\ifx#1I^^cf% {} - \else\ifx#1O^^d6% {} - \else\ifx#1U^^dc% {} - \else\protect\@um@{#1}% - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} -\fi - - -\ifeurotex -\def\@eq@#1{{\accent"09 #1}} -\else -\def\@eq@#1{{\accent22 #1}} -\fi - -\def\=#1{\protect\@eq@{#1}} - -\ifeurotex -\def\@hat@#1{{\accent"02 #1}} -\else -\def\@hat@#1{{\accent94 #1}} -\fi - -\def\^#1{\ifx#1a^^e2% {} - \else\ifx#1e^^ea% {} - \else\ifx#1\i ^^ee% {} - \else\ifx#1i^^ee% {} - \else\ifx#1o^^f4% {} - \else\ifx#1u^^fb% {} - \else\ifx#1A^^c2% {} - \else\ifx#1E^^ca% {} - \else\ifx#1I^^ce% {} - \else\ifx#1O^^d4% {} - \else\ifx#1U^^db% {} - \else\protect\@hat@{#1}% - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} - -%\check - - -\ifeurotex -\def\@til@#1{{\accent"03 #1}} -\else -\def\@til@#1{{\accent"7E #1}} -\fi - -\def\~#1{\ifx#1a^^e3% {} - \else\ifx#1n^^f1% {} - \else\ifx#1o^^f5% {} - \else\ifx#1A^^c3% {} - \else\ifx#1N^^d1% {} - \else\ifx#1O^^d5% {} - \else\protect\@til@{#1}% - \fi\fi\fi\fi\fi\fi} - -\ifeurotex -% normal greek symbols : lower case slanted, uppercase upright -\mathchardef\Gamma="0180 -\mathchardef\Delta="0181 -\mathchardef\Theta="0182 -\mathchardef\Lambda="0183 -\mathchardef\Xi="0184 -\mathchardef\Pi="0185 -\mathchardef\Sigma="0186 -\mathchardef\Upsilon="0187 -\mathchardef\Phi="0188 -\mathchardef\Psi="0189 -\mathchardef\Omega="018A -\mathchardef\alpha="010B -\mathchardef\beta="010C -\mathchardef\gamma="010D -\mathchardef\delta="010E -\mathchardef\epsilon="010F -\mathchardef\zeta="0110 -\mathchardef\eta="0111 -\mathchardef\theta="0112 -\mathchardef\iota="0113 -\mathchardef\kappa="0114 -\mathchardef\lambda="0115 -\mathchardef\mu="0116 -\mathchardef\nu="0117 -\mathchardef\xi="0118 -\mathchardef\pi="0119 -\mathchardef\rho="011A -\mathchardef\sigma="011B -\mathchardef\tau="011C -\mathchardef\upsilon="011D -\mathchardef\phi="011E -\mathchardef\chi="011F -\mathchardef\psi="0120 -\mathchardef\omega="0121 -\mathchardef\varepsilon="0122 -\mathchardef\vartheta="0123 -\mathchardef\varpi="0124 -\mathchardef\varrho="0125 -\mathchardef\varsigma="0126 -\mathchardef\varphi="0127 - % -% slanted greek symbols : -\mathchardef\slGamma="0100 -\mathchardef\slDelta="0101 -\mathchardef\slTheta="0102 -\mathchardef\slLambda="0103 -\mathchardef\slXi="0104 -\mathchardef\slPi="0105 -\mathchardef\slSigma="0106 -\mathchardef\slUpsilon="0107 -\mathchardef\slPhi="0108 -\mathchardef\slPsi="0109 -\mathchardef\slOmega="010A -\mathchardef\slalpha="010B -\mathchardef\slbeta="010C -\mathchardef\slgamma="010D -\mathchardef\sldelta="010E -\mathchardef\slepsilon="010F -\mathchardef\slzeta="0110 -\mathchardef\sleta="0111 -\mathchardef\sltheta="0112 -\mathchardef\sliota="0113 -\mathchardef\slkappa="0114 -\mathchardef\sllambda="0115 -\mathchardef\slmu="0116 -\mathchardef\slnu="0117 -\mathchardef\slxi="0118 -\mathchardef\slpi="0119 -\mathchardef\slrho="011A -\mathchardef\slsigma="011B -\mathchardef\sltau="011C -\mathchardef\slupsilon="011D -\mathchardef\slphi="011E -\mathchardef\slchi="011F -\mathchardef\slpsi="0120 -\mathchardef\slomega="0121 -\mathchardef\slvarepsilon="0122 -\mathchardef\slvartheta="0123 -\mathchardef\slvarpi="0124 -\mathchardef\slvarrho="0125 -\mathchardef\slvarsigma="0126 -\mathchardef\slvarphi="0127 - % -% upright (roman) greek symbols : -\mathchardef\rmGamma="0180 -\mathchardef\rmDelta="0181 -\mathchardef\rmTheta="0182 -\mathchardef\rmLambda="0183 -\mathchardef\rmXi="0184 -\mathchardef\rmPi="0185 -\mathchardef\rmSigma="0186 -\mathchardef\rmUpsilon="0187 -\mathchardef\rmPhi="0188 -\mathchardef\rmPsi="0189 -\mathchardef\rmOmega="018A -\mathchardef\rmalpha="018B -\mathchardef\rmbeta="018C -\mathchardef\rmgamma="018D -\mathchardef\rmdelta="018E -\mathchardef\rmepsilon="018F -\mathchardef\rmzeta="0190 -\mathchardef\rmeta="0191 -\mathchardef\rmtheta="0192 -\mathchardef\rmiota="0193 -\mathchardef\rmkappa="0194 -\mathchardef\rmlambda="0195 -\mathchardef\rmmu="0196 -\mathchardef\rmnu="0197 -\mathchardef\rmxi="0198 -\mathchardef\rmpi="0199 -\mathchardef\rmrho="019A -\mathchardef\rmsigma="019B -\mathchardef\rmtau="019C -\mathchardef\rmupsilon="019D -\mathchardef\rmphi="019E -\mathchardef\rmchi="019F -\mathchardef\rmpsi="0120 -\mathchardef\rmomega="01A1 -\mathchardef\rmvarepsilon="01A2 -\mathchardef\rmvartheta="01A3 -\mathchardef\rmvarpi="01A4 -\mathchardef\rmvarrho="01A5 -\mathchardef\rmvarsigma="01A6 -\mathchardef\rmvarphi="01A7 - % - % -% bold greek symbols : -\mathchardef\bfGamma="01A8 -\mathchardef\bfDelta="01A9 -\mathchardef\bfTheta="01AA -\mathchardef\bfLambda="01AB -\mathchardef\bfXi="01AC -\mathchardef\bfPi="01AD -\mathchardef\bfSigma="01AE -\mathchardef\bfUpsilon="01AF -\mathchardef\bfPhi="01B0 -\mathchardef\bfPsi="01B1 -\mathchardef\bfOmega="01B2 -\mathchardef\bfalpha="01B3 -\mathchardef\bfbeta="01B4 -\mathchardef\bfgamma="01B5 -\mathchardef\bfdelta="01B6 -\mathchardef\bfepsilon="01B7 -\mathchardef\bfzeta="01B8 -\mathchardef\bfeta="01B9 -\mathchardef\bftheta="01BA -\mathchardef\bfiota="01BB -\mathchardef\bfkappa="01BC -\mathchardef\bflambda="01BD -\mathchardef\bfmu="01BE -\mathchardef\bfnu="01BF -\mathchardef\bfxi="01C0 -\mathchardef\bfpi="01C1 -\mathchardef\bfrho="01C2 -\mathchardef\bfsigma="01C3 -\mathchardef\bftau="01C4 -\mathchardef\bfupsilon="01C5 -\mathchardef\bfphi="01C6 -\mathchardef\bfchi="01C7 -\mathchardef\bfpsi="01C8 -\mathchardef\bfomega="01C9 -\mathchardef\bfvarepsilon="01CA -\mathchardef\bfvartheta="01CB -\mathchardef\bfvarpi="01CC -\mathchardef\bfvarrho="01CD -\mathchardef\bfvarsigma="01CE -\mathchardef\bfvarphi="01CF - % - % -% bold slanted greek symbols : -\mathchardef\bfslGamma="01D0 -\mathchardef\bfslDelta="01D1 -\mathchardef\bfslTheta="01D2 -\mathchardef\bfslLambda="01D3 -\mathchardef\bfslXi="01D4 -\mathchardef\bfslPi="01D5 -\mathchardef\bfslSigma="01D6 -\mathchardef\bfslUpsilon="01D7 -\mathchardef\bfslPhi="01D8 -\mathchardef\bfslPsi="01D9 -\mathchardef\bfslOmega="01DA -\mathchardef\bfslalpha="01DB -\mathchardef\bfslbeta="01DC -\mathchardef\bfslgamma="01DD -\mathchardef\bfsldelta="01DE -\mathchardef\bfslepsilon="01DF -\mathchardef\bfslzeta="01E0 -\mathchardef\bfsleta="01E1 -\mathchardef\bfsltheta="01E2 -\mathchardef\bfsliota="01E3 -\mathchardef\bfslkappa="01E4 -\mathchardef\bfsllambda="01E5 -\mathchardef\bfslmu="01E6 -\mathchardef\bfslnu="01E7 -\mathchardef\bfslxi="01E8 -\mathchardef\bfslpi="01E9 -\mathchardef\bfslrho="01EA -\mathchardef\bfslsigma="01EB -\mathchardef\bfsltau="01EC -\mathchardef\bfslupsilon="01ED -\mathchardef\bfslphi="01EE -\mathchardef\bfslchi="01EF -\mathchardef\bfslpsi="01F0 -\mathchardef\bfslomega="01F1 -\mathchardef\bfslvarepsilon="01F2 -\mathchardef\bfslvartheta="01F3 -\mathchardef\bfslvarpi="01F4 -\mathchardef\bfslvarrho="01F5 -\mathchardef\bfslvarsigma="01F6 -\mathchardef\bfslvarphi="01F7 - % -\def\c@{\@c@} -\fi - - -\gdef\accenthyphcodes{} - -\endinput diff --git a/macros/ec-plain/dybx10.mf b/macros/ec-plain/dybx10.mf deleted file mode 100644 index 722592dfa9..0000000000 --- a/macros/ec-plain/dybx10.mf +++ /dev/null @@ -1,69 +0,0 @@ -u#:=23/36pt#; % unit width -width_adj#:=11/36pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=7/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=0pt#; % extra space added to all sidebars - -body_height#:=270/36pt#; % height of tallest characters -asc_height#:=250/36pt#; % height of lowercase ascenders -cap_height#:=247/36pt#; % height of caps -fig_height#:=232/36pt#; % height of numerals -x_height#:=160/36pt#; % height of lowercase without ascenders -math_axis#:=90/36pt#; % axis of symmetry for math symbols -bar_height#:=85/36pt#; % height of crossbar in lowercase e -comma_depth#:=70/36pt#; % depth of comma below baseline -desc_depth#:=70/36pt#; % depth of lowercase descenders - -crisp#:=0pt#; % diameter of serif corners -tiny#:=13/36pt#; % diameter of rounded corners -fine#:=10/36pt#; % diameter of sharply rounded corners -thin_join#:=10/36pt#; % width of extrafine details -hair#:=17/36pt#; % lowercase hairline breadth -stem#:=41/36pt#; % lowercase stem breadth -curve#:=46/36pt#; % lowercase curve breadth -ess#:=38/36pt#; % breadth in middle of lowercase s -flare#:=45/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=56/36pt#; % diameter of dots -cap_hair#:=19/36pt#; % uppercase hairline breadth -cap_stem#:=51/36pt#; % uppercase stem breadth -cap_curve#:=55/36pt#; % uppercase curve breadth -cap_ess#:=53/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.6pt#; % thickness of lines in math symbols - -dish#:=1/36pt#; % amount erased at top or bottom of serifs -bracket#:=10/36pt#; % vertical distance from serif base to tangent -jut#:=25/36pt#; % protrusion of lowercase serifs -cap_jut#:=39/36pt#; % protrusion of uppercase serifs -beak_jut#:=11/36pt#; % horizontal protrusion of beak serifs -beak#:=70/36pt#; % vertical protrusion of beak serifs -vair#:=13/36pt#; % vertical diameter of hairlines -notch_cut#:=10pt#; % maximum breadth above or below notches -bar#:=17/36pt#; % lowercase bar thickness -slab#:=17/36pt#; % serif and arm thickness -cap_bar#:=17/36pt#; % uppercase bar thickness -cap_band#:=17/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=10pt#; % max breadth above/below uppercase notches -serif_drop#:=3/36pt#; % vertical drop of sloped serifs -stem_corr#:=2/36pt#; % for small refinements of stem breadth -vair_corr#:=1.5/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=4/36pt#; % amount of overshoot for curves -apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions - -slant:=0; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=.5; % extra openness of math symbols -superness:=8/11; % parameter for superellipses -superpull:=1/8; % extra openness inside bowls -beak_darkness:=.4; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=false; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=false; % should math-mode spacing be used? - diff --git a/macros/ec-plain/dybx12.mf b/macros/ec-plain/dybx12.mf deleted file mode 100644 index 2b460fbfd5..0000000000 --- a/macros/ec-plain/dybx12.mf +++ /dev/null @@ -1,70 +0,0 @@ -u#:=27/36pt#; % unit width -width_adj#:=13/36pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=8/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=0pt#; % extra space added to all sidebars - -body_height#:=324/36pt#; % height of tallest characters -asc_height#:=300/36pt#; % height of lowercase ascenders -cap_height#:=296.4/36pt#; % height of caps -fig_height#:=278.4/36pt#; % height of numerals -x_height#:=192/36pt#; % height of lowercase without ascenders -math_axis#:=108/36pt#; % axis of symmetry for math symbols -bar_height#:=102/36pt#; % height of crossbar in lowercase e -comma_depth#:=84/36pt#; % depth of comma below baseline -desc_depth#:=84/36pt#; % depth of lowercase descenders - -crisp#:=0pt#; % diameter of serif corners -tiny#:=13/36pt#; % diameter of rounded corners -fine#:=10/36pt#; % diameter of sharply rounded corners -thin_join#:=10.5/36pt#; % width of extrafine details -hair#:=18.3/36pt#; % lowercase hairline breadth -stem#:=47/36pt#; % lowercase stem breadth -curve#:=52/36pt#; % lowercase curve breadth -ess#:=44/36pt#; % breadth in middle of lowercase s -flare#:=51/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=62/36pt#; % diameter of dots -cap_hair#:=20/36pt#; % uppercase hairline breadth -cap_stem#:=57/36pt#; % uppercase stem breadth -cap_curve#:=61/36pt#; % uppercase curve breadth -cap_ess#:=59/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.66pt#; % thickness of lines in math symbols - -dish#:=1/36pt#; % amount erased at top or bottom of serifs -bracket#:=12/36pt#; % vertical distance from serif base to tangent -jut#:=30/36pt#; % protrusion of lowercase serifs -cap_jut#:=46/36pt#; % protrusion of uppercase serifs -beak_jut#:=12.4/36pt#; % horizontal protrusion of beak serifs -beak#:=84/36pt#; % vertical protrusion of beak serifs -vair#:=14.3/36pt#; % vertical diameter of hairlines -notch_cut#:=12pt#; % maximum breadth above or below notches -bar#:=18.5/36pt#; % lowercase bar thickness -slab#:=18.5/36pt#; % serif and arm thickness -cap_bar#:=18.5/36pt#; % uppercase bar thickness -cap_band#:=18.5/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=12pt#; % max breadth above/below uppercase notches -serif_drop#:=3.6/36pt#; % vertical drop of sloped serifs -stem_corr#:=2/36pt#; % for small refinements of stem breadth -vair_corr#:=1.5/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=5/36pt#; % amount of overshoot for curves -apex_o#:=4/36pt#; % amount of overshoot for diagonal junctions - -slant:=0; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=.4; % extra openness of math symbols -superness:=8/11; % parameter for superellipses -superpull:=1/8; % extra openness inside bowls -beak_darkness:=.4; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=false; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=false; % should math-mode spacing be used? - - diff --git a/macros/ec-plain/dybx5.mf b/macros/ec-plain/dybx5.mf deleted file mode 100644 index cbe1c0bab1..0000000000 --- a/macros/ec-plain/dybx5.mf +++ /dev/null @@ -1,69 +0,0 @@ -u#:=14.5/36pt#; % unit width -width_adj#:=7/36pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=3/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=3/36pt#; % extra space added to all sidebars - -body_height#:=135/36pt#; % height of tallest characters -asc_height#:=125/36pt#; % height of lowercase ascenders -cap_height#:=123.5/36pt#; % height of caps -fig_height#:=116/36pt#; % height of numerals -x_height#:=80/36pt#; % height of lowercase without ascenders -math_axis#:=45/36pt#; % axis of symmetry for math symbols -bar_height#:=40/36pt#; % height of crossbar in lowercase e -comma_depth#:=35/36pt#; % depth of comma below baseline -desc_depth#:=35/36pt#; % depth of lowercase descenders - -crisp#:=0pt#; % diameter of serif corners -tiny#:=9/36pt#; % diameter of rounded corners -fine#:=8/36pt#; % diameter of sharply rounded corners -thin_join#:=8/36pt#; % width of extrafine details -hair#:=15/36pt#; % lowercase hairline breadth -stem#:=24/36pt#; % lowercase stem breadth -curve#:=27/36pt#; % lowercase curve breadth -ess#:=19/36pt#; % breadth in middle of lowercase s -flare#:=27/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=31/36pt#; % diameter of dots -cap_hair#:=17/36pt#; % uppercase hairline breadth -cap_stem#:=28/36pt#; % uppercase stem breadth -cap_curve#:=31/36pt#; % uppercase curve breadth -cap_ess#:=24/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.43pt#; % thickness of lines in math symbols - -dish#:=.7/36pt#; % amount erased at top or bottom of serifs -bracket#:=5/36pt#; % vertical distance from serif base to tangent -jut#:=13/36pt#; % protrusion of lowercase serifs -cap_jut#:=19/36pt#; % protrusion of uppercase serifs -beak_jut#:=7/36pt#; % horizontal protrusion of beak serifs -beak#:=25/36pt#; % vertical protrusion of beak serifs -vair#:=10/36pt#; % vertical diameter of hairlines -notch_cut#:=5pt#; % maximum breadth above or below notches -bar#:=12/36pt#; % lowercase bar thickness -slab#:=12/36pt#; % serif and arm thickness -cap_bar#:=12/36pt#; % uppercase bar thickness -cap_band#:=12/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=5pt#; % max breadth above/below uppercase notches -serif_drop#:=1.5/36pt#; % vertical drop of sloped serifs -stem_corr#:=1.5/36pt#; % for small refinements of stem breadth -vair_corr#:=1/36pt#; % for small refinements of hairline height -apex_corr#:=9/36pt#; % extra width at diagonal junctions - -o#:=3/36pt#; % amount of overshoot for curves -apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions - -slant:=0; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=1.5; % extra openness of math symbols -superness:=8/11; % parameter for superellipses -superpull:=1/8; % extra openness inside bowls -beak_darkness:=.4; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=false; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=false; % should math-mode spacing be used? - diff --git a/macros/ec-plain/dybx6.mf b/macros/ec-plain/dybx6.mf deleted file mode 100644 index a3d298a3cf..0000000000 --- a/macros/ec-plain/dybx6.mf +++ /dev/null @@ -1,69 +0,0 @@ -u#:=16.2/36pt#; % unit width -width_adj#:=7.8/36pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=3.8/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=2/36pt#; % extra space added to all sidebars - -body_height#:=162/36pt#; % height of tallest characters -asc_height#:=150/36pt#; % height of lowercase ascenders -cap_height#:=148.2/36pt#; % height of caps -fig_height#:=139.2/36pt#; % height of numerals -x_height#:=96/36pt#; % height of lowercase without ascenders -math_axis#:=54/36pt#; % axis of symmetry for math symbols -bar_height#:=49/36pt#; % height of crossbar in lowercase e -comma_depth#:=42/36pt#; % depth of comma below baseline -desc_depth#:=42/36pt#; % depth of lowercase descenders - -crisp#:=0pt#; % diameter of serif corners -tiny#:=10/36pt#; % diameter of rounded corners -fine#:=9/36pt#; % diameter of sharply rounded corners -thin_join#:=9/36pt#; % width of extrafine details -hair#:=15.4/36pt#; % lowercase hairline breadth -stem#:=28/36pt#; % lowercase stem breadth -curve#:=31/36pt#; % lowercase curve breadth -ess#:=25/36pt#; % breadth in middle of lowercase s -flare#:=31/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=36/36pt#; % diameter of dots -cap_hair#:=18/36pt#; % uppercase hairline breadth -cap_stem#:=33/36pt#; % uppercase stem breadth -cap_curve#:=36/36pt#; % uppercase curve breadth -cap_ess#:=31/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.47pt#; % thickness of lines in math symbols - -dish#:=.8/36pt#; % amount erased at top or bottom of serifs -bracket#:=6/36pt#; % vertical distance from serif base to tangent -jut#:=15/36pt#; % protrusion of lowercase serifs -cap_jut#:=23/36pt#; % protrusion of uppercase serifs -beak_jut#:=7.8/36pt#; % horizontal protrusion of beak serifs -beak#:=36/36pt#; % vertical protrusion of beak serifs -vair#:=11/36pt#; % vertical diameter of hairlines -notch_cut#:=6pt#; % maximum breadth above or below notches -bar#:=13/36pt#; % lowercase bar thickness -slab#:=13/36pt#; % serif and arm thickness -cap_bar#:=13/36pt#; % uppercase bar thickness -cap_band#:=13/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=6pt#; % max breadth above/below uppercase notches -serif_drop#:=1.8/36pt#; % vertical drop of sloped serifs -stem_corr#:=1.6/36pt#; % for small refinements of stem breadth -vair_corr#:=1.1/36pt#; % for small refinements of hairline height -apex_corr#:=5/36pt#; % extra width at diagonal junctions - -o#:=3/36pt#; % amount of overshoot for curves -apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions - -slant:=0; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=1.3; % extra openness of math symbols -superness:=8/11; % parameter for superellipses -superpull:=1/8; % extra openness inside bowls -beak_darkness:=.4; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=false; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=false; % should math-mode spacing be used? - diff --git a/macros/ec-plain/dybx7.mf b/macros/ec-plain/dybx7.mf deleted file mode 100644 index 99c6ae3b19..0000000000 --- a/macros/ec-plain/dybx7.mf +++ /dev/null @@ -1,70 +0,0 @@ -u#:=17.9/36pt#; % unit width -width_adj#:=8.6/36pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=4.6/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=1/36pt#; % extra space added to all sidebars - -body_height#:=189/36pt#; % height of tallest characters -asc_height#:=175/36pt#; % height of lowercase ascenders -cap_height#:=172.9/36pt#; % height of caps -fig_height#:=162.4/36pt#; % height of numerals -x_height#:=112/36pt#; % height of lowercase without ascenders -math_axis#:=63/36pt#; % axis of symmetry for math symbols -bar_height#:=58/36pt#; % height of crossbar in lowercase e -comma_depth#:=49/36pt#; % depth of comma below baseline -desc_depth#:=49/36pt#; % depth of lowercase descenders - -crisp#:=0pt#; % diameter of serif corners -tiny#:=11/36pt#; % diameter of rounded corners -fine#:=9/36pt#; % diameter of sharply rounded corners -thin_join#:=9/36pt#; % width of extrafine details -hair#:=15.8/36pt#; % lowercase hairline breadth -stem#:=32/36pt#; % lowercase stem breadth -curve#:=35/36pt#; % lowercase curve breadth -ess#:=29/36pt#; % breadth in middle of lowercase s -flare#:=35/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=41/36pt#; % diameter of dots -cap_hair#:=18/36pt#; % uppercase hairline breadth -cap_stem#:=38/36pt#; % uppercase stem breadth -cap_curve#:=41/36pt#; % uppercase curve breadth -cap_ess#:=37/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.51pt#; % thickness of lines in math symbols - -dish#:=.9/36pt#; % amount erased at top or bottom of serifs -bracket#:=7/36pt#; % vertical distance from serif base to tangent -jut#:=17/36pt#; % protrusion of lowercase serifs -cap_jut#:=27/36pt#; % protrusion of uppercase serifs -beak_jut#:=8.6/36pt#; % horizontal protrusion of beak serifs -beak#:=46/36pt#; % vertical protrusion of beak serifs -vair#:=11.5/36pt#; % vertical diameter of hairlines -notch_cut#:=7pt#; % maximum breadth above or below notches -bar#:=14/36pt#; % lowercase bar thickness -slab#:=14/36pt#; % serif and arm thickness -cap_bar#:=14/36pt#; % uppercase bar thickness -cap_band#:=14/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=7pt#; % max breadth above/below uppercase notches -serif_drop#:=2.1/36pt#; % vertical drop of sloped serifs -stem_corr#:=1.7/36pt#; % for small refinements of stem breadth -vair_corr#:=1.2/36pt#; % for small refinements of hairline height -apex_corr#:=2/36pt#; % extra width at diagonal junctions - -o#:=3/36pt#; % amount of overshoot for curves -apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions - -slant:=0; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=1.1; % extra openness of math symbols -superness:=8/11; % parameter for superellipses -superpull:=1/8; % extra openness inside bowls -beak_darkness:=.4; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=false; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=false; % should math-mode spacing be used? - - diff --git a/macros/ec-plain/dybx8.mf b/macros/ec-plain/dybx8.mf deleted file mode 100644 index 8ecd0b2a89..0000000000 --- a/macros/ec-plain/dybx8.mf +++ /dev/null @@ -1,69 +0,0 @@ -u#:=19.6/36pt#; % unit width -width_adj#:=9.4/36pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=5.4/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=0pt#; % extra space added to all sidebars - -body_height#:=216/36pt#; % height of tallest characters -asc_height#:=200/36pt#; % height of lowercase ascenders -cap_height#:=197.6/36pt#; % height of caps -fig_height#:=185.6/36pt#; % height of numerals -x_height#:=128/36pt#; % height of lowercase without ascenders -math_axis#:=72/36pt#; % axis of symmetry for math symbols -bar_height#:=67/36pt#; % height of crossbar in lowercase e -comma_depth#:=56/36pt#; % depth of comma below baseline -desc_depth#:=56/36pt#; % depth of lowercase descenders - -crisp#:=0pt#; % diameter of serif corners -tiny#:=12/36pt#; % diameter of rounded corners -fine#:=10/36pt#; % diameter of sharply rounded corners -thin_join#:=10/36pt#; % width of extrafine details -hair#:=16.2/36pt#; % lowercase hairline breadth -stem#:=35/36pt#; % lowercase stem breadth -curve#:=39/36pt#; % lowercase curve breadth -ess#:=32/36pt#; % breadth in middle of lowercase s -flare#:=39/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=46/36pt#; % diameter of dots -cap_hair#:=19/36pt#; % uppercase hairline breadth -cap_stem#:=43/36pt#; % uppercase stem breadth -cap_curve#:=46/36pt#; % uppercase curve breadth -cap_ess#:=43/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.54pt#; % thickness of lines in math symbols - -dish#:=1/36pt#; % amount erased at top or bottom of serifs -bracket#:=8/36pt#; % vertical distance from serif base to tangent -jut#:=19/36pt#; % protrusion of lowercase serifs -cap_jut#:=31/36pt#; % protrusion of uppercase serifs -beak_jut#:=9.4/36pt#; % horizontal protrusion of beak serifs -beak#:=55/36pt#; % vertical protrusion of beak serifs -vair#:=12/36pt#; % vertical diameter of hairlines -notch_cut#:=8pt#; % maximum breadth above or below notches -bar#:=15/36pt#; % lowercase bar thickness -slab#:=15/36pt#; % serif and arm thickness -cap_bar#:=15/36pt#; % uppercase bar thickness -cap_band#:=15/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=8pt#; % max breadth above/below uppercase notches -serif_drop#:=2.4/36pt#; % vertical drop of sloped serifs -stem_corr#:=1.8/36pt#; % for small refinements of stem breadth -vair_corr#:=1.3/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=4/36pt#; % amount of overshoot for curves -apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions - -slant:=0; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=.9; % extra openness of math symbols -superness:=8/11; % parameter for superellipses -superpull:=1/8; % extra openness inside bowls -beak_darkness:=.4; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=false; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=false; % should math-mode spacing be used? - diff --git a/macros/ec-plain/dybx9.mf b/macros/ec-plain/dybx9.mf deleted file mode 100644 index 0a7832316a..0000000000 --- a/macros/ec-plain/dybx9.mf +++ /dev/null @@ -1,69 +0,0 @@ -u#:=21.3/36pt#; % unit width -width_adj#:=10.2/36pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=6.2/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=0pt#; % extra space added to all sidebars - -body_height#:=243/36pt#; % height of tallest characters -asc_height#:=225/36pt#; % height of lowercase ascenders -cap_height#:=222.3/36pt#; % height of caps -fig_height#:=208.8/36pt#; % height of numerals -x_height#:=144/36pt#; % height of lowercase without ascenders -math_axis#:=81/36pt#; % axis of symmetry for math symbols -bar_height#:=76/36pt#; % height of crossbar in lowercase e -comma_depth#:=63/36pt#; % depth of comma below baseline -desc_depth#:=63/36pt#; % depth of lowercase descenders - -crisp#:=0pt#; % diameter of serif corners -tiny#:=13/36pt#; % diameter of rounded corners -fine#:=10/36pt#; % diameter of sharply rounded corners -thin_join#:=10/36pt#; % width of extrafine details -hair#:=16.6/36pt#; % lowercase hairline breadth -stem#:=38/36pt#; % lowercase stem breadth -curve#:=43/36pt#; % lowercase curve breadth -ess#:=35/36pt#; % breadth in middle of lowercase s -flare#:=42/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=51/36pt#; % diameter of dots -cap_hair#:=19/36pt#; % uppercase hairline breadth -cap_stem#:=47/36pt#; % uppercase stem breadth -cap_curve#:=51/36pt#; % uppercase curve breadth -cap_ess#:=48/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.57pt#; % thickness of lines in math symbols - -dish#:=1/36pt#; % amount erased at top or bottom of serifs -bracket#:=9/36pt#; % vertical distance from serif base to tangent -jut#:=22/36pt#; % protrusion of lowercase serifs -cap_jut#:=35/36pt#; % protrusion of uppercase serifs -beak_jut#:=10.2/36pt#; % horizontal protrusion of beak serifs -beak#:=63/36pt#; % vertical protrusion of beak serifs -vair#:=12.5/36pt#; % vertical diameter of hairlines -notch_cut#:=9pt#; % maximum breadth above or below notches -bar#:=16/36pt#; % lowercase bar thickness -slab#:=16/36pt#; % serif and arm thickness -cap_bar#:=16/36pt#; % uppercase bar thickness -cap_band#:=16/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=9pt#; % max breadth above/below uppercase notches -serif_drop#:=2.7/36pt#; % vertical drop of sloped serifs -stem_corr#:=1.9/36pt#; % for small refinements of stem breadth -vair_corr#:=1.4/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=4/36pt#; % amount of overshoot for curves -apex_o#:=3/36pt#; % amount of overshoot for diagonal junctions - -slant:=0; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=.7; % extra openness of math symbols -superness:=8/11; % parameter for superellipses -superpull:=1/8; % extra openness inside bowls -beak_darkness:=.4; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=false; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=false; % should math-mode spacing be used? - diff --git a/macros/ec-plain/dymi10.mf b/macros/ec-plain/dymi10.mf deleted file mode 100644 index 7bfa592cfe..0000000000 --- a/macros/ec-plain/dymi10.mf +++ /dev/null @@ -1,69 +0,0 @@ -u#:=20/36pt#; % unit width -width_adj#:=0pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=5/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=0pt#; % extra space added to all sidebars - -body_height#:=270/36pt#; % height of tallest characters -asc_height#:=250/36pt#; % height of lowercase ascenders -cap_height#:=246/36pt#; % height of caps -fig_height#:=232/36pt#; % height of numerals -x_height#:=155/36pt#; % height of lowercase without ascenders -math_axis#:=90/36pt#; % axis of symmetry for math symbols -bar_height#:=87/36pt#; % height of crossbar in lowercase e -comma_depth#:=70/36pt#; % depth of comma below baseline -desc_depth#:=70/36pt#; % depth of lowercase descenders - -crisp#:=8/36pt#; % diameter of serif corners -tiny#:=8/36pt#; % diameter of rounded corners -fine#:=7/36pt#; % diameter of sharply rounded corners -thin_join#:=7/36pt#; % width of extrafine details -hair#:=9/36pt#; % lowercase hairline breadth -stem#:=24/36pt#; % lowercase stem breadth -curve#:=29/36pt#; % lowercase curve breadth -ess#:=27/36pt#; % breadth in middle of lowercase s -flare#:=32/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=38/36pt#; % diameter of dots -cap_hair#:=11/36pt#; % uppercase hairline breadth -cap_stem#:=30/36pt#; % uppercase stem breadth -cap_curve#:=35/36pt#; % uppercase curve breadth -cap_ess#:=33/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.4pt#; % thickness of lines in math symbols - -dish#:=1/36pt#; % amount erased at top or bottom of serifs -bracket#:=20/36pt#; % vertical distance from serif base to tangent -jut#:=30/36pt#; % protrusion of lowercase serifs -cap_jut#:=37/36pt#; % protrusion of uppercase serifs -beak_jut#:=10/36pt#; % horizontal protrusion of beak serifs -beak#:=70/36pt#; % vertical protrusion of beak serifs -vair#:=8/36pt#; % vertical diameter of hairlines -notch_cut#:=10pt#; % maximum breadth above or below notches -bar#:=11/36pt#; % lowercase bar thickness -slab#:=11/36pt#; % serif and arm thickness -cap_bar#:=11/36pt#; % uppercase bar thickness -cap_band#:=11/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=10pt#; % max breadth above/below uppercase notches -serif_drop#:=4/36pt#; % vertical drop of sloped serifs -stem_corr#:=1/36pt#; % for small refinements of stem breadth -vair_corr#:=1/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=8/36pt#; % amount of overshoot for curves -apex_o#:=8/36pt#; % amount of overshoot for diagonal junctions - -slant:=.25; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=0; % extra openness of math symbols -superness:=1/sqrt2; % parameter for superellipses -superpull:=1/6; % extra openness inside bowls -beak_darkness:=11/30; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=true; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=true; % should math-mode spacing be used? - diff --git a/macros/ec-plain/dymi12.mf b/macros/ec-plain/dymi12.mf deleted file mode 100644 index e1b9f398ec..0000000000 --- a/macros/ec-plain/dymi12.mf +++ /dev/null @@ -1,70 +0,0 @@ -u#:=23.5/36pt#; % unit width -width_adj#:=0pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=5.8/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=0pt#; % extra space added to all sidebars - -body_height#:=324/36pt#; % height of tallest characters -asc_height#:=300/36pt#; % height of lowercase ascenders -cap_height#:=295.2/36pt#; % height of caps -fig_height#:=278.4/36pt#; % height of numerals -x_height#:=186/36pt#; % height of lowercase without ascenders -math_axis#:=108/36pt#; % axis of symmetry for math symbols -bar_height#:=104.4/36pt#; % height of crossbar in lowercase e -comma_depth#:=84/36pt#; % depth of comma below baseline -desc_depth#:=84/36pt#; % depth of lowercase descenders - -crisp#:=8/36pt#; % diameter of serif corners -tiny#:=8/36pt#; % diameter of rounded corners -fine#:=7/36pt#; % diameter of sharply rounded corners -thin_join#:=7.5/36pt#; % width of extrafine details -hair#:=9.5/36pt#; % lowercase hairline breadth -stem#:=27/36pt#; % lowercase stem breadth -curve#:=32/36pt#; % lowercase curve breadth -ess#:=30/36pt#; % breadth in middle of lowercase s -flare#:=35/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=42/36pt#; % diameter of dots -cap_hair#:=11.5/36pt#; % uppercase hairline breadth -cap_stem#:=33/36pt#; % uppercase stem breadth -cap_curve#:=38/36pt#; % uppercase curve breadth -cap_ess#:=32/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.44pt#; % thickness of lines in math symbols - -dish#:=1/36pt#; % amount erased at top or bottom of serifs -bracket#:=24/36pt#; % vertical distance from serif base to tangent -jut#:=35/36pt#; % protrusion of lowercase serifs -cap_jut#:=41/36pt#; % protrusion of uppercase serifs -beak_jut#:=11.4/36pt#; % horizontal protrusion of beak serifs -beak#:=84/36pt#; % vertical protrusion of beak serifs -vair#:=8.5/36pt#; % vertical diameter of hairlines -notch_cut#:=12pt#; % maximum breadth above or below notches -bar#:=12.5/36pt#; % lowercase bar thickness -slab#:=12.5/36pt#; % serif and arm thickness -cap_bar#:=12.5/36pt#; % uppercase bar thickness -cap_band#:=12.5/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=12pt#; % max breadth above/below uppercase notches -serif_drop#:=4.8/36pt#; % vertical drop of sloped serifs -stem_corr#:=1/36pt#; % for small refinements of stem breadth -vair_corr#:=1/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=9/36pt#; % amount of overshoot for curves -apex_o#:=9/36pt#; % amount of overshoot for diagonal junctions - -slant:=.25; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=-0.2; % extra openness of math symbols -superness:=1/sqrt2; % parameter for superellipses -superpull:=1/6; % extra openness inside bowls -beak_darkness:=11/30; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=true; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=true; % should math-mode spacing be used? - - diff --git a/macros/ec-plain/dymi5.mf b/macros/ec-plain/dymi5.mf deleted file mode 100644 index b0921607cc..0000000000 --- a/macros/ec-plain/dymi5.mf +++ /dev/null @@ -1,69 +0,0 @@ -u#:=12.5/36pt#; % unit width -width_adj#:=0pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=2/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=10/36pt#; % extra space added to all sidebars - -body_height#:=135/36pt#; % height of tallest characters -asc_height#:=125/36pt#; % height of lowercase ascenders -cap_height#:=123/36pt#; % height of caps -fig_height#:=116/36pt#; % height of numerals -x_height#:=77.5/36pt#; % height of lowercase without ascenders -math_axis#:=45/36pt#; % axis of symmetry for math symbols -bar_height#:=43.5/36pt#; % height of crossbar in lowercase e -comma_depth#:=35/36pt#; % depth of comma below baseline -desc_depth#:=35/36pt#; % depth of lowercase descenders - -crisp#:=6/36pt#; % diameter of serif corners -tiny#:=6/36pt#; % diameter of rounded corners -fine#:=5/36pt#; % diameter of sharply rounded corners -thin_join#:=5/36pt#; % width of extrafine details -hair#:=7.5/36pt#; % lowercase hairline breadth -stem#:=15.5/36pt#; % lowercase stem breadth -curve#:=17.5/36pt#; % lowercase curve breadth -ess#:=12/36pt#; % breadth in middle of lowercase s -flare#:=18.5/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=22/36pt#; % diameter of dots -cap_hair#:=8/36pt#; % uppercase hairline breadth -cap_stem#:=18.5/36pt#; % uppercase stem breadth -cap_curve#:=20.5/36pt#; % uppercase curve breadth -cap_ess#:=13.5/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.28pt#; % thickness of lines in math symbols - -dish#:=.7/36pt#; % amount erased at top or bottom of serifs -bracket#:=10/36pt#; % vertical distance from serif base to tangent -jut#:=17/36pt#; % protrusion of lowercase serifs -cap_jut#:=20/36pt#; % protrusion of uppercase serifs -beak_jut#:=6/36pt#; % horizontal protrusion of beak serifs -beak#:=35/36pt#; % vertical protrusion of beak serifs -vair#:=6/36pt#; % vertical diameter of hairlines -notch_cut#:=5pt#; % maximum breadth above or below notches -bar#:=8/36pt#; % lowercase bar thickness -slab#:=8/36pt#; % serif and arm thickness -cap_bar#:=8/36pt#; % uppercase bar thickness -cap_band#:=8/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=5pt#; % max breadth above/below uppercase notches -serif_drop#:=2/36pt#; % vertical drop of sloped serifs -stem_corr#:=.7/36pt#; % for small refinements of stem breadth -vair_corr#:=.5/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=4/36pt#; % amount of overshoot for curves -apex_o#:=4/36pt#; % amount of overshoot for diagonal junctions - -slant:=.25; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=1; % extra openness of math symbols -superness:=1/sqrt2; % parameter for superellipses -superpull:=1/6; % extra openness inside bowls -beak_darkness:=11/30; % fraction of triangle inside beak serifs -ligs:=1; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=true; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=true; % should math-mode spacing be used? - diff --git a/macros/ec-plain/dymi6.mf b/macros/ec-plain/dymi6.mf deleted file mode 100644 index ba4f8b30ff..0000000000 --- a/macros/ec-plain/dymi6.mf +++ /dev/null @@ -1,69 +0,0 @@ -u#:=14/36pt#; % unit width -width_adj#:=0pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=2.8/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=6/36pt#; % extra space added to all sidebars - -body_height#:=162/36pt#; % height of tallest characters -asc_height#:=150/36pt#; % height of lowercase ascenders -cap_height#:=147.6/36pt#; % height of caps -fig_height#:=139.2/36pt#; % height of numerals -x_height#:=93/36pt#; % height of lowercase without ascenders -math_axis#:=54/36pt#; % axis of symmetry for math symbols -bar_height#:=52.2/36pt#; % height of crossbar in lowercase e -comma_depth#:=42/36pt#; % depth of comma below baseline -desc_depth#:=42/36pt#; % depth of lowercase descenders - -crisp#:=6.5/36pt#; % diameter of serif corners -tiny#:=6.5/36pt#; % diameter of rounded corners -fine#:=6/36pt#; % diameter of sharply rounded corners -thin_join#:=6/36pt#; % width of extrafine details -hair#:=8/36pt#; % lowercase hairline breadth -stem#:=17.5/36pt#; % lowercase stem breadth -curve#:=20/36pt#; % lowercase curve breadth -ess#:=17/36pt#; % breadth in middle of lowercase s -flare#:=20.5/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=26/36pt#; % diameter of dots -cap_hair#:=8.5/36pt#; % uppercase hairline breadth -cap_stem#:=21/36pt#; % uppercase stem breadth -cap_curve#:=23.5/36pt#; % uppercase curve breadth -cap_ess#:=18.5/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.31pt#; % thickness of lines in math symbols - -dish#:=.8/36pt#; % amount erased at top or bottom of serifs -bracket#:=12/36pt#; % vertical distance from serif base to tangent -jut#:=19/36pt#; % protrusion of lowercase serifs -cap_jut#:=23/36pt#; % protrusion of uppercase serifs -beak_jut#:=6.8/36pt#; % horizontal protrusion of beak serifs -beak#:=42/36pt#; % vertical protrusion of beak serifs -vair#:=7/36pt#; % vertical diameter of hairlines -notch_cut#:=6pt#; % maximum breadth above or below notches -bar#:=8.5/36pt#; % lowercase bar thickness -slab#:=8.5/36pt#; % serif and arm thickness -cap_bar#:=8.5/36pt#; % uppercase bar thickness -cap_band#:=8.5/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=6pt#; % max breadth above/below uppercase notches -serif_drop#:=2.4/36pt#; % vertical drop of sloped serifs -stem_corr#:=.8/36pt#; % for small refinements of stem breadth -vair_corr#:=.7/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=4.5/36pt#; % amount of overshoot for curves -apex_o#:=4.5/36pt#; % amount of overshoot for diagonal junctions - -slant:=.25; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=.8; % extra openness of math symbols -superness:=1/sqrt2; % parameter for superellipses -superpull:=1/6; % extra openness inside bowls -beak_darkness:=11/30; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=true; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=true; % should math-mode spacing be used? - diff --git a/macros/ec-plain/dymi7.mf b/macros/ec-plain/dymi7.mf deleted file mode 100644 index 8a22845789..0000000000 --- a/macros/ec-plain/dymi7.mf +++ /dev/null @@ -1,69 +0,0 @@ -u#:=15.5/36pt#; % unit width -width_adj#:=0pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=3.5/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=4/36pt#; % extra space added to all sidebars - -body_height#:=189/36pt#; % height of tallest characters -asc_height#:=175/36pt#; % height of lowercase ascenders -cap_height#:=172.2/36pt#; % height of caps -fig_height#:=162.4/36pt#; % height of numerals -x_height#:=108.5/36pt#; % height of lowercase without ascenders -math_axis#:=63/36pt#; % axis of symmetry for math symbols -bar_height#:=60.9/36pt#; % height of crossbar in lowercase e -comma_depth#:=49/36pt#; % depth of comma below baseline -desc_depth#:=49/36pt#; % depth of lowercase descenders - -crisp#:=7/36pt#; % diameter of serif corners -tiny#:=7/36pt#; % diameter of rounded corners -fine#:=6/36pt#; % diameter of sharply rounded corners -thin_join#:=6/36pt#; % width of extrafine details -hair#:=8.5/36pt#; % lowercase hairline breadth -stem#:=19.5/36pt#; % lowercase stem breadth -curve#:=22.5/36pt#; % lowercase curve breadth -ess#:=21/36pt#; % breadth in middle of lowercase s -flare#:=23.5/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=29/36pt#; % diameter of dots -cap_hair#:=9/36pt#; % uppercase hairline breadth -cap_stem#:=23.5/36pt#; % uppercase stem breadth -cap_curve#:=26.5/36pt#; % uppercase curve breadth -cap_ess#:=22.5/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.34pt#; % thickness of lines in math symbols - -dish#:=.9/36pt#; % amount erased at top or bottom of serifs -bracket#:=14/36pt#; % vertical distance from serif base to tangent -jut#:=21/36pt#; % protrusion of lowercase serifs -cap_jut#:=26/36pt#; % protrusion of uppercase serifs -beak_jut#:=7.6/36pt#; % horizontal protrusion of beak serifs -beak#:=49/36pt#; % vertical protrusion of beak serifs -vair#:=7/36pt#; % vertical diameter of hairlines -notch_cut#:=7pt#; % maximum breadth above or below notches -bar#:=9/36pt#; % lowercase bar thickness -slab#:=9/36pt#; % serif and arm thickness -cap_bar#:=9/36pt#; % uppercase bar thickness -cap_band#:=9/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=7pt#; % max breadth above/below uppercase notches -serif_drop#:=2.8/36pt#; % vertical drop of sloped serifs -stem_corr#:=.9/36pt#; % for small refinements of stem breadth -vair_corr#:=.9/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=5/36pt#; % amount of overshoot for curves -apex_o#:=5/36pt#; % amount of overshoot for diagonal junctions - -slant:=.25; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=.6; % extra openness of math symbols -superness:=1/sqrt2; % parameter for superellipses -superpull:=1/6; % extra openness inside bowls -beak_darkness:=11/30; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=true; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=true; % should math-mode spacing be used? - diff --git a/macros/ec-plain/dymi8.mf b/macros/ec-plain/dymi8.mf deleted file mode 100644 index 997808f3c5..0000000000 --- a/macros/ec-plain/dymi8.mf +++ /dev/null @@ -1,69 +0,0 @@ -u#:=17/36pt#; % unit width -width_adj#:=0pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=4.1/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=0pt#; % extra space added to all sidebars - -body_height#:=216/36pt#; % height of tallest characters -asc_height#:=200/36pt#; % height of lowercase ascenders -cap_height#:=196.8/36pt#; % height of caps -fig_height#:=185.6/36pt#; % height of numerals -x_height#:=124/36pt#; % height of lowercase without ascenders -math_axis#:=72/36pt#; % axis of symmetry for math symbols -bar_height#:=69.6/36pt#; % height of crossbar in lowercase e -comma_depth#:=56/36pt#; % depth of comma below baseline -desc_depth#:=56/36pt#; % depth of lowercase descenders - -crisp#:=8/36pt#; % diameter of serif corners -tiny#:=8/36pt#; % diameter of rounded corners -fine#:=7/36pt#; % diameter of sharply rounded corners -thin_join#:=7/36pt#; % width of extrafine details -hair#:=9/36pt#; % lowercase hairline breadth -stem#:=21.5/36pt#; % lowercase stem breadth -curve#:=25/36pt#; % lowercase curve breadth -ess#:=23/36pt#; % breadth in middle of lowercase s -flare#:=26.5/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=32/36pt#; % diameter of dots -cap_hair#:=9.5/36pt#; % uppercase hairline breadth -cap_stem#:=25.5/36pt#; % uppercase stem breadth -cap_curve#:=29/36pt#; % uppercase curve breadth -cap_ess#:=26/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.36pt#; % thickness of lines in math symbols - -dish#:=1/36pt#; % amount erased at top or bottom of serifs -bracket#:=16/36pt#; % vertical distance from serif base to tangent -jut#:=24/36pt#; % protrusion of lowercase serifs -cap_jut#:=29/36pt#; % protrusion of uppercase serifs -beak_jut#:=8.4/36pt#; % horizontal protrusion of beak serifs -beak#:=56/36pt#; % vertical protrusion of beak serifs -vair#:=8/36pt#; % vertical diameter of hairlines -notch_cut#:=8pt#; % maximum breadth above or below notches -bar#:=9.5/36pt#; % lowercase bar thickness -slab#:=9.5/36pt#; % serif and arm thickness -cap_bar#:=9.5/36pt#; % uppercase bar thickness -cap_band#:=9.5/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=8pt#; % max breadth above/below uppercase notches -serif_drop#:=3.2/36pt#; % vertical drop of sloped serifs -stem_corr#:=1/36pt#; % for small refinements of stem breadth -vair_corr#:=1/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=6/36pt#; % amount of overshoot for curves -apex_o#:=6/36pt#; % amount of overshoot for diagonal junctions - -slant:=.25; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=.4; % extra openness of math symbols -superness:=1/sqrt2; % parameter for superellipses -superpull:=1/6; % extra openness inside bowls -beak_darkness:=11/30; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=true; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=true; % should math-mode spacing be used? - diff --git a/macros/ec-plain/dymi9.mf b/macros/ec-plain/dymi9.mf deleted file mode 100644 index a06ca59966..0000000000 --- a/macros/ec-plain/dymi9.mf +++ /dev/null @@ -1,70 +0,0 @@ -u#:=18.5/36pt#; % unit width -width_adj#:=0pt#; % width adjustment for certain characters -serif_fit#:=0pt#; % extra sidebar near lowercase serifs -cap_serif_fit#:=4.6/36pt#; % extra sidebar near uppercase serifs -letter_fit#:=0pt#; % extra space added to all sidebars - -body_height#:=243/36pt#; % height of tallest characters -asc_height#:=225/36pt#; % height of lowercase ascenders -cap_height#:=221.4/36pt#; % height of caps -fig_height#:=208.8/36pt#; % height of numerals -x_height#:=139.5/36pt#; % height of lowercase without ascenders -math_axis#:=81/36pt#; % axis of symmetry for math symbols -bar_height#:=78.3/36pt#; % height of crossbar in lowercase e -comma_depth#:=63/36pt#; % depth of comma below baseline -desc_depth#:=63/36pt#; % depth of lowercase descenders - -crisp#:=8/36pt#; % diameter of serif corners -tiny#:=8/36pt#; % diameter of rounded corners -fine#:=7/36pt#; % diameter of sharply rounded corners -thin_join#:=7/36pt#; % width of extrafine details -hair#:=9/36pt#; % lowercase hairline breadth -stem#:=23/36pt#; % lowercase stem breadth -curve#:=27/36pt#; % lowercase curve breadth -ess#:=25/36pt#; % breadth in middle of lowercase s -flare#:=29/36pt#; % diameter of bulbs or breadth of terminals -dot_size#:=35/36pt#; % diameter of dots -cap_hair#:=10/36pt#; % uppercase hairline breadth -cap_stem#:=28/36pt#; % uppercase stem breadth -cap_curve#:=32/36pt#; % uppercase curve breadth -cap_ess#:=30/36pt#; % breadth in middle of uppercase s -rule_thickness#:=.38pt#; % thickness of lines in math symbols - -dish#:=1/36pt#; % amount erased at top or bottom of serifs -bracket#:=18/36pt#; % vertical distance from serif base to tangent -jut#:=27/36pt#; % protrusion of lowercase serifs -cap_jut#:=33/36pt#; % protrusion of uppercase serifs -beak_jut#:=9.2/36pt#; % horizontal protrusion of beak serifs -beak#:=63/36pt#; % vertical protrusion of beak serifs -vair#:=8/36pt#; % vertical diameter of hairlines -notch_cut#:=9pt#; % maximum breadth above or below notches -bar#:=10/36pt#; % lowercase bar thickness -slab#:=10/36pt#; % serif and arm thickness -cap_bar#:=10/36pt#; % uppercase bar thickness -cap_band#:=10/36pt#; % uppercase thickness above/below lobes -cap_notch_cut#:=9pt#; % max breadth above/below uppercase notches -serif_drop#:=3.6/36pt#; % vertical drop of sloped serifs -stem_corr#:=1/36pt#; % for small refinements of stem breadth -vair_corr#:=1/36pt#; % for small refinements of hairline height -apex_corr#:=0pt#; % extra width at diagonal junctions - -o#:=7/36pt#; % amount of overshoot for curves -apex_o#:=7/36pt#; % amount of overshoot for diagonal junctions - -slant:=.25; % tilt ratio $(\Delta x/\Delta y)$ -fudge:=1; % factor applied to weights of heavy characters -math_spread:=.2; % extra openness of math symbols -superness:=1/sqrt2; % parameter for superellipses -superpull:=1/6; % extra openness inside bowls -beak_darkness:=11/30; % fraction of triangle inside beak serifs -ligs:=2; % level of ligatures to be included - -square_dots:=false; % should dots be square? -hefty:=false; % should we try hard not to be overweight? -serifs:=true; % should serifs and bulbs be attached? -monospace:=false; % should all characters have the same width? -variant_g:=true; % should an italic-style g be used? -low_asterisk:=false; % should the asterisk be centered at the axis? -math_fitting:=true; % should math-mode spacing be used? - - diff --git a/macros/ec-plain/ec-pdfplain.fmt b/macros/ec-plain/ec-pdfplain.fmt Binary files differdeleted file mode 100644 index f782620f7a..0000000000 --- a/macros/ec-plain/ec-pdfplain.fmt +++ /dev/null diff --git a/macros/ec-plain/ec-pdfplain.tex b/macros/ec-plain/ec-pdfplain.tex deleted file mode 100644 index 398667a0d9..0000000000 --- a/macros/ec-plain/ec-pdfplain.tex +++ /dev/null @@ -1,2 +0,0 @@ -\input ec-plain.tex -\endinput diff --git a/macros/ec-plain/ec-plain.fmt b/macros/ec-plain/ec-plain.fmt Binary files differdeleted file mode 100644 index 09ccec42f2..0000000000 --- a/macros/ec-plain/ec-plain.fmt +++ /dev/null diff --git a/macros/ec-plain/ec-plain.tex b/macros/ec-plain/ec-plain.tex deleted file mode 100644 index 38ee66fff5..0000000000 --- a/macros/ec-plain/ec-plain.tex +++ /dev/null @@ -1,1245 +0,0 @@ -% This is the plain TeX format that's described in The TeXbook. -% N.B.: A version number is defined at the very end of this file; -% please change that number whenever the file is modified! -% And don't modify the file under any circumstances. -% These circumstances are the use of EC fonts which changes font names -% cmmi --> exmi (same with additional greek chars above 127) -% cmr --> ecrm, cmbx --> ecbx, etc. -% mathchardefs for uppercase greek letters -% -% Provided by Daniel TAUPIN : taupin@lps.u-psud.fr - -\catcode`\{=1 % left brace is begin-group character -\catcode`\}=2 % right brace is end-group character -\catcode`\$=3 % dollar sign is math shift -\catcode`\&=4 % ampersand is alignment tab -\catcode`\#=6 % hash mark is macro parameter character -\catcode`\^=7 \catcode`\^^K=7 % circumflex and uparrow are for superscripts -\catcode`\_=8 \catcode`\^^A=8 % underline and downarrow are for subscripts -\catcode`\^^I=10 % ascii tab is a blank space -\chardef\active=13 \catcode`\~=\active % tilde is active -\catcode`\^^L=\active \outer\def^^L{\par} % ascii form-feed is "\outer\par" - -\message{Preloading the plain format: codes,} - -% We had to define the \catcodes right away, before the message line, -% since \message uses the { and } characters. -% When INITEX (the TeX initializer) starts up, -% it has defined the following \catcode values: -% \catcode`\^^@=9 % ascii null is ignored -% \catcode`\^^M=5 % ascii return is end-line -% \catcode`\\=0 % backslash is TeX escape character -% \catcode`\%=14 % percent sign is comment character -% \catcode`\ =10 % ascii space is blank space -% \catcode`\^^?=15 % ascii delete is invalid -% \catcode`\A=11 ... \catcode`\Z=11 % uppercase letters -% \catcode`\a=11 ... \catcode`\z=11 % lowercase letters -% all others are type 12 (other) - -% Here is a list of the characters that have been specially catcoded: -\def\dospecials{\do\ \do\\\do\{\do\}\do\$\do\&% - \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~} -% (not counting ascii null, tab, linefeed, formfeed, return, delete) -% Each symbol in the list is preceded by \do, which can be defined -% if you want to do something to every item in the list. - -% We make @ signs act like letters, temporarily, to avoid conflict -% between user names and internal control sequences of plain format. -\catcode`@=11 - -% INITEX sets up \mathcode x=x, for x=0..255, except that -% \mathcode x=x+"7100, for x = `A to `Z and `a to `z; -% \mathcode x=x+"7000, for x = `0 to `9. -% The following changes define internal codes as recommended -% in Appendix C of The TeXbook: -\mathcode`\^^@="2201 % \cdot -\mathcode`\^^A="3223 % \downarrow -\mathcode`\^^B="010B % \alpha -\mathcode`\^^C="010C % \beta -\mathcode`\^^D="225E % \land -\mathcode`\^^E="023A % \lnot -\mathcode`\^^F="3232 % \in -\mathcode`\^^G="0119 % \pi -\mathcode`\^^H="0115 % \lambda -\mathcode`\^^I="010D % \gamma -\mathcode`\^^J="010E % \delta -\mathcode`\^^K="3222 % \uparrow -\mathcode`\^^L="2206 % \pm -\mathcode`\^^M="2208 % \oplus -\mathcode`\^^N="0231 % \infty -\mathcode`\^^O="0140 % \partial -\mathcode`\^^P="321A % \subset -\mathcode`\^^Q="321B % \supset -\mathcode`\^^R="225C % \cap -\mathcode`\^^S="225B % \cup -\mathcode`\^^T="0238 % \forall -\mathcode`\^^U="0239 % \exists -\mathcode`\^^V="220A % \otimes -\mathcode`\^^W="3224 % \leftrightarrow -\mathcode`\^^X="3220 % \leftarrow -\mathcode`\^^Y="3221 % \rightarrow -\mathcode`\^^Z="8000 % \ne -\mathcode`\^^[="2205 % \diamond -\mathcode`\^^\="3214 % \le -\mathcode`\^^]="3215 % \ge -\mathcode`\^^^="3211 % \equiv -\mathcode`\^^_="225F % \lor -\mathcode`\ ="8000 % \space -\mathcode`\!="5021 -\mathcode`\'="8000 % ^\prime -\mathcode`\(="4028 -\mathcode`\)="5029 -\mathcode`\*="2203 % \ast -\mathcode`\+="202B -\mathcode`\,="613B -\mathcode`\-="2200 -\mathcode`\.="013A -\mathcode`\/="013D -\mathcode`\:="303A -\mathcode`\;="603B -\mathcode`\<="313C -\mathcode`\=="303D -\mathcode`\>="313E -\mathcode`\?="503F -\mathcode`\[="405B -\mathcode`\\="026E % \backslash -\mathcode`\]="505D -\mathcode`\_="8000 % \_ -\mathcode`\{="4266 -\mathcode`\|="026A -\mathcode`\}="5267 -\mathcode`\^^?="1273 % \smallint - -% INITEX sets \uccode`x=`X and \uccode `X=`X for all letters x, -% and \lccode`x=`x, \lccode`X=`x; all other values are zero. -% No changes to those tables are needed in plain TeX format. - -% INITEX sets \sfcode x=1000 for all x, except that \sfcode`X=999 -% for uppercase letters. The following changes are needed: -\sfcode`\)=0 \sfcode`\'=0 \sfcode`\]=0 -% The \nonfrenchspacing macro will make further changes to \sfcode values. - -% Finally, INITEX sets all \delcode values to -1, except \delcode`.=0 -\delcode`\(="028300 -\delcode`\)="029301 -\delcode`\[="05B302 -\delcode`\]="05D303 -\delcode`\<="26830A -\delcode`\>="26930B -\delcode`\/="02F30E -\delcode`\|="26A30C -\delcode`\\="26E30F -% N.B. { and } should NOT get delcodes; otherwise parameter grouping fails! - -% To make the plain macros more efficient in time and space, -% several constant values are declared here as control sequences. -% If they were changed, anything could happen; so they are private symbols. -\chardef\@ne=1 -\chardef\tw@=2 -\chardef\thr@@=3 -\chardef\sixt@@n=16 -\chardef\@cclv=255 -\mathchardef\@cclvi=256 -\mathchardef\@m=1000 -\mathchardef\@M=10000 -\mathchardef\@MM=20000 - -% Allocation of registers - -% Here are macros for the automatic allocation of \count, \box, \dimen, -% \skip, \muskip, and \toks registers, as well as \read and \write -% stream numbers, \fam codes, \language codes, and \insert numbers. - -\message{registers,} - -% When a register is used only temporarily, it need not be allocated; -% grouping can be used, making the value previously in the register return -% after the close of the group. The main use of these macros is for -% registers that are defined by one macro and used by others, possibly at -% different nesting levels. All such registers should be defined through -% these macros; otherwise conflicts may occur, especially when two or more -% more macro packages are being used at once. - -% The following counters are reserved: -% 0 to 9 page numbering -% 10 count allocation -% 11 dimen allocation -% 12 skip allocation -% 13 muskip allocation -% 14 box allocation -% 15 toks allocation -% 16 read file allocation -% 17 write file allocation -% 18 math family allocation -% 19 language allocation -% 20 insert allocation -% 21 the most recently allocated number -% 22 constant -1 -% New counters are allocated starting with 23, 24, etc. Other registers are -% allocated starting with 10. This leaves 0 through 9 for the user to play -% with safely, except that counts 0 to 9 are considered to be the page and -% subpage numbers (since they are displayed during output). In this scheme, -% \count 10 always contains the number of the highest-numbered counter that -% has been allocated, \count 14 the highest-numbered box, etc. -% Inserts are given numbers 254, 253, etc., since they require a \count, -% \dimen, \skip, and \box all with the same number; \count 20 contains the -% lowest-numbered insert that has been allocated. Of course, \box255 is -% reserved for \output; \count255, \dimen255, and \skip255 can be used freely. - -% It is recommended that macro designers always use -% \global assignments with respect to registers numbered 1, 3, 5, 7, 9, and -% always non-\global assignments with respect to registers 0, 2, 4, 6, 8, 255. -% This will prevent ``save stack buildup'' that might otherwise occur. - -\count10=22 % allocates \count registers 23, 24, ... -\count11=9 % allocates \dimen registers 10, 11, ... -\count12=9 % allocates \skip registers 10, 11, ... -\count13=9 % allocates \muskip registers 10, 11, ... -\count14=9 % allocates \box registers 10, 11, ... -\count15=9 % allocates \toks registers 10, 11, ... -\count16=-1 % allocates input streams 0, 1, ... -\count17=-1 % allocates output streams 0, 1, ... -\count18=3 % allocates math families 4, 5, ... -\count19=0 % allocates \language codes 1, 2, ... -\count20=255 % allocates insertions 254, 253, ... -\countdef\insc@unt=20 % the insertion counter -\countdef\allocationnumber=21 % the most recent allocation -\countdef\m@ne=22 \m@ne=-1 % a handy constant -\def\wlog{\immediate\write\m@ne} % write on log file (only) - -% Here are abbreviations for the names of scratch registers -% that don't need to be allocated. - -\countdef\count@=255 -\dimendef\dimen@=0 -\dimendef\dimen@i=1 % global only -\dimendef\dimen@ii=2 -\skipdef\skip@=0 -\toksdef\toks@=0 - -% Now, we define \newcount, \newbox, etc. so that you can say \newcount\foo -% and \foo will be defined (with \countdef) to be the next counter. -% To find out which counter \foo is, you can look at \allocationnumber. -% Since there's no \boxdef command, \chardef is used to define a \newbox, -% \newinsert, \newfam, and so on. - -\outer\def\newcount{\alloc@0\count\countdef\insc@unt} -\outer\def\newdimen{\alloc@1\dimen\dimendef\insc@unt} -\outer\def\newskip{\alloc@2\skip\skipdef\insc@unt} -\outer\def\newmuskip{\alloc@3\muskip\muskipdef\@cclvi} -\outer\def\newbox{\alloc@4\box\chardef\insc@unt} -\let\newtoks=\relax % we do this to allow plain.tex to be read in twice -\outer\def\newhelp#1#2{\newtoks#1#1\expandafter{\csname#2\endcsname}} -\outer\def\newtoks{\alloc@5\toks\toksdef\@cclvi} -\outer\def\newread{\alloc@6\read\chardef\sixt@@n} -\outer\def\newwrite{\alloc@7\write\chardef\sixt@@n} -\outer\def\newfam{\alloc@8\fam\chardef\sixt@@n} -\outer\def\newlanguage{\alloc@9\language\chardef\@cclvi} -\def\alloc@#1#2#3#4#5{\global\advance\count1#1by\@ne - \ch@ck#1#4#2% make sure there's still room - \allocationnumber=\count1#1% - \global#3#5=\allocationnumber - \wlog{\string#5=\string#2\the\allocationnumber}} -\outer\def\newinsert#1{\global\advance\insc@unt by\m@ne - \ch@ck0\insc@unt\count - \ch@ck1\insc@unt\dimen - \ch@ck2\insc@unt\skip - \ch@ck4\insc@unt\box - \allocationnumber=\insc@unt - \global\chardef#1=\allocationnumber - \wlog{\string#1=\string\insert\the\allocationnumber}} -\def\ch@ck#1#2#3{\ifnum\count1#1<#2% - \else\errmessage{No room for a new #3}\fi} - -% Here are some examples of allocation. -\newdimen\maxdimen \maxdimen=16383.99999pt % the largest legal <dimen> -\newskip\hideskip \hideskip=-1000pt plus 1fill % negative but can grow -\newskip\centering \centering=0pt plus 1000pt minus 1000pt -\newdimen\p@ \p@=1pt % this saves macro space and time -\newdimen\z@ \z@=0pt % can be used both for 0pt and 0 -\newskip\z@skip \z@skip=0pt plus0pt minus0pt -\newbox\voidb@x % permanently void box register - -% And here's a different sort of allocation: -% For example, \newif\iffoo creates \footrue, \foofalse to go with \iffoo. -\outer\def\newif#1{\count@\escapechar \escapechar\m@ne - \expandafter\expandafter\expandafter - \edef\@if#1{true}{\let\noexpand#1=\noexpand\iftrue}% - \expandafter\expandafter\expandafter - \edef\@if#1{false}{\let\noexpand#1=\noexpand\iffalse}% - \@if#1{false}\escapechar\count@} % the condition starts out false -\def\@if#1#2{\csname\expandafter\if@\string#1#2\endcsname} -{\uccode`1=`i \uccode`2=`f \uppercase{\gdef\if@12{}}} % `if' is required - -% Assign initial values to TeX's parameters - -\message{parameters,} - -% All of TeX's numeric parameters are listed here, -% but the code is commented out if no special value needs to be set. -% INITEX makes all parameters zero except where noted. - -\pretolerance=100 -\tolerance=200 % INITEX sets this to 10000 -\hbadness=1000 -\vbadness=1000 -\linepenalty=10 -\hyphenpenalty=50 -\exhyphenpenalty=50 -\binoppenalty=700 -\relpenalty=500 -\clubpenalty=150 -\widowpenalty=150 -\displaywidowpenalty=50 -\brokenpenalty=100 -\predisplaypenalty=10000 -% \postdisplaypenalty=0 -% \interlinepenalty=0 -% \floatingpenalty=0, set during \insert -% \outputpenalty=0, set before TeX enters \output -\doublehyphendemerits=10000 -\finalhyphendemerits=5000 -\adjdemerits=10000 -% \looseness=0, cleared by TeX after each paragraph -% \pausing=0 -% \holdinginserts=0 -% \tracingonline=0 -% \tracingmacros=0 -% \tracingstats=0 -% \tracingparagraphs=0 -% \tracingpages=0 -% \tracingoutput=0 -\tracinglostchars=1 -% \tracingcommands=0 -% \tracingrestores=0 -% \language=0 -\uchyph=1 -% \lefthyphenmin=2 \righthyphenmin=3 set below -% \globaldefs=0 -% \maxdeadcycles=25 % INITEX does this -% \hangafter=1 % INITEX does this, also TeX after each paragraph -% \fam=0 -% \mag=1000 % INITEX does this -% \escapechar=`\\ % INITEX does this -\defaulthyphenchar=`\- -\defaultskewchar=-1 -% \endlinechar=`\^^M % INITEX does this -\newlinechar=-1 -\delimiterfactor=901 -% \time=now % TeX does this at beginning of job -% \day=now % TeX does this at beginning of job -% \month=now % TeX does this at beginning of job -% \year=now % TeX does this at beginning of job -\showboxbreadth=5 -\showboxdepth=3 -\errorcontextlines=5 - -\hfuzz=0.1pt -\vfuzz=0.1pt -\overfullrule=5pt -\hsize=6.5in -\vsize=8.9in -\maxdepth=4pt -\splitmaxdepth=\maxdimen -\boxmaxdepth=\maxdimen -% \lineskiplimit=0pt, changed by \normalbaselines -\delimitershortfall=5pt -\nulldelimiterspace=1.2pt -\scriptspace=0.5pt -% \mathsurround=0pt -% \predisplaysize=0pt, set before TeX enters $$ -% \displaywidth=0pt, set before TeX enters $$ -% \displayindent=0pt, set before TeX enters $$ -\parindent=20pt -% \hangindent=0pt, zeroed by TeX after each paragraph -% \hoffset=0pt -% \voffset=0pt - -% \baselineskip=0pt, changed by \normalbaselines -% \lineskip=0pt, changed by \normalbaselines -\parskip=0pt plus 1pt -\abovedisplayskip=12pt plus 3pt minus 9pt -\abovedisplayshortskip=0pt plus 3pt -\belowdisplayskip=12pt plus 3pt minus 9pt -\belowdisplayshortskip=7pt plus 3pt minus 4pt -% \leftskip=0pt -% \rightskip=0pt -\topskip=10pt -\splittopskip=10pt -% \tabskip=0pt -% \spaceskip=0pt -% \xspaceskip=0pt -\parfillskip=0pt plus 1fil - -\thinmuskip=3mu -\medmuskip=4mu plus 2mu minus 4mu -\thickmuskip=5mu plus 5mu - -% We also define special registers that function like parameters: -\newskip\smallskipamount \smallskipamount=3pt plus 1pt minus 1pt -\newskip\medskipamount \medskipamount=6pt plus 2pt minus 2pt -\newskip\bigskipamount \bigskipamount=12pt plus 4pt minus 4pt -\newskip\normalbaselineskip \normalbaselineskip=12pt -\newskip\normallineskip \normallineskip=1pt -\newdimen\normallineskiplimit \normallineskiplimit=0pt -\newdimen\jot \jot=3pt -\newcount\interdisplaylinepenalty \interdisplaylinepenalty=100 -\newcount\interfootnotelinepenalty \interfootnotelinepenalty=100 - -% Definitions for preloaded fonts - -\def\magstephalf{1095 } -\def\magstep#1{\ifcase#1 \@m\or 1200\or 1440\or 1728\or 2074\or - 2488\or 2986\or 3583\or 4300\or 5160\fi\relax} - -% Fonts assigned to \preloaded are not part of "plain TeX", -% but they are preloaded so that other format packages can use them. -% For example, if another set of macros says "\font\ninerm=cmr9", -% TeX will not have to reload the font metric information for cmr9. - -\message{fonts,} - -\font\tenrm=ecrm1000 % roman text -%\font\preloaded=ecrm0900 -%\font\preloaded=ecrm0800 -\font\sevenrm=ecrm0700 -%\font\preloaded=ecrm0600 -\font\fiverm=ecrm0500 - -\font\teni=exmi10 % math italic -%\font\preloaded=exmi9 -%\font\preloaded=exmi8 -\font\seveni=exmi7 -%\font\preloaded=exmi6 -\font\fivei=exmi5 - -\font\tensy=cmsy10 % math symbols -%\font\preloaded=cmsy9 -%\font\preloaded=cmsy8 -\font\sevensy=cmsy7 -%\font\preloaded=cmsy6 -\font\fivesy=cmsy5 - -\font\tenex=cmex10 % math extension - -%\font\preloaded=ecss1000 % sans serif -%\font\preloaded=cmssq8 - -%\font\preloaded=ecsi1000 % sans serif italic -%\font\preloaded=cmssqi8 - -\font\tenbf=ecbx1000 % boldface extended -%\font\preloaded=ecbx0900 -%\font\preloaded=ecbx0800 -\font\sevenbf=ecbx0700 -%\font\preloaded=ecbx0600 -\font\fivebf=ecbx0500 - -\font\tentt=ectt1000 % typewriter -%\font\preloaded=ectt0900 -%\font\preloaded=ectt0800 - -%\font\preloaded=ecst1000 % slanted typewriter - -\font\tensl=ecsl1000 % slanted roman -%\font\preloaded=ecsl0900 -%\font\preloaded=ecsl0800 - -\font\tenit=ecti1000 % text italic -%\font\preloaded=ecti0900 -%\font\preloaded=ecti0800 -%\font\preloaded=ecti0700 - -\message{more fonts,} -%\font\preloaded=ecui1000 % unslanted text italic - -%\font\preloaded=cmmib10 % bold math italic -%\font\preloaded=cmbsy10 % bold math symbols - -%\font\preloaded=eccc1000 % caps and small caps - -%\font\preloaded=ecso1000 % sans serif bold extended - -%\font\preloaded=cmdunh10 % Dunhill style - -%\font\preloaded=ecrm0700 scaled \magstep4 % for titles -%\font\preloaded=ectt1000 scaled \magstep2 -%\font\preloaded=ecso1000 scaled \magstep2 - -%\font\preloaded=manfnt % METAFONT logo and dragon curve and special symbols - -% Additional \preloaded fonts can be specified here. -% (And those that were \preloaded above can be eliminated.) - -\let\preloaded=\undefined % preloaded fonts must be declared anew later. - -\skewchar\teni='177 \skewchar\seveni='177 \skewchar\fivei='177 -\skewchar\tensy='60 \skewchar\sevensy='60 \skewchar\fivesy='60 - -\textfont0=\tenrm \scriptfont0=\sevenrm \scriptscriptfont0=\fiverm -\def\rm{\fam\z@\tenrm} -\textfont1=\teni \scriptfont1=\seveni \scriptscriptfont1=\fivei -\def\mit{\fam\@ne} \def\oldstyle{\fam\@ne\teni} -\textfont2=\tensy \scriptfont2=\sevensy \scriptscriptfont2=\fivesy -\def\cal{\fam\tw@} -\textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex -\newfam\itfam \def\it{\fam\itfam\tenit} % \it is family 4 -\textfont\itfam=\tenit -\newfam\slfam \def\sl{\fam\slfam\tensl} % \sl is family 5 -\textfont\slfam=\tensl -\newfam\bffam \def\bf{\fam\bffam\tenbf} % \bf is family 6 -\textfont\bffam=\tenbf \scriptfont\bffam=\sevenbf -\scriptscriptfont\bffam=\fivebf -\newfam\ttfam \def\tt{\fam\ttfam\tentt} % \tt is family 7 -\textfont\ttfam=\tentt - -% Macros for setting ordinary text -\message{macros,} - -\def\frenchspacing{\sfcode`\.\@m \sfcode`\?\@m \sfcode`\!\@m - \sfcode`\:\@m \sfcode`\;\@m \sfcode`\,\@m} -\def\nonfrenchspacing{\sfcode`\.3000\sfcode`\?3000\sfcode`\!3000% - \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 } - -\def\normalbaselines{\lineskip\normallineskip - \baselineskip\normalbaselineskip \lineskiplimit\normallineskiplimit} - -\def\^^M{\ } % control <return> = control <space> -\def\^^I{\ } % same for <tab> - -\def\lq{`} \def\rq{'} -\def\lbrack{[} \def\rbrack{]} - -\let\endgraf=\par \let\endline=\cr - -\def\space{ } -\def\empty{} -\def\null{\hbox{}} - -\let\bgroup={ \let\egroup=} - -% In \obeylines, we say `\let^^M=\par' instead of `\def^^M{\par}' -% since this allows, for example, `\let\par=\cr \obeylines \halign{...' -{\catcode`\^^M=\active % these lines must end with % - \gdef\obeylines{\catcode`\^^M\active \let^^M\par}% - \global\let^^M\par} % this is in case ^^M appears in a \write -\def\obeyspaces{\catcode`\ \active} -{\obeyspaces\global\let =\space} - -\def\loop#1\repeat{\def\body{#1}\iterate} -\def\iterate{\body \let\next\iterate \else\let\next\relax\fi \next} -\let\repeat=\fi % this makes \loop...\if...\repeat skippable - -\def\thinspace{\kern .16667em } -\def\negthinspace{\kern-.16667em } -\def\enspace{\kern.5em } - -\def\enskip{\hskip.5em\relax} -\def\quad{\hskip1em\relax} -\def\qquad{\hskip2em\relax} - -\def\smallskip{\vskip\smallskipamount} -\def\medskip{\vskip\medskipamount} -\def\bigskip{\vskip\bigskipamount} - -\def\nointerlineskip{\prevdepth-1000\p@} -\def\offinterlineskip{\baselineskip-1000\p@ - \lineskip\z@ \lineskiplimit\maxdimen} - -\def\topglue{\nointerlineskip\vglue-\topskip\vglue} % for top of page -\def\vglue{\afterassignment\vgl@\skip@=} -\def\vgl@{\par \dimen@\prevdepth \hrule height\z@ - \nobreak\vskip\skip@ \prevdepth\dimen@} -\def\hglue{\afterassignment\hgl@\skip@=} -\def\hgl@{\leavevmode \count@\spacefactor \vrule width\z@ - \nobreak\hskip\skip@ \spacefactor\count@} - -\def~{\penalty\@M \ } % tie -\def\slash{/\penalty\exhyphenpenalty} % a `/' that acts like a `-' - -\def\break{\penalty-\@M} -\def\nobreak{\penalty \@M} -\def\allowbreak{\penalty \z@} - -\def\filbreak{\par\vfil\penalty-200\vfilneg} -\def\goodbreak{\par\penalty-500 } -\def\eject{\par\break} -\def\supereject{\par\penalty-\@MM} - -\def\removelastskip{\ifdim\lastskip=\z@\else\vskip-\lastskip\fi} -\def\smallbreak{\par\ifdim\lastskip<\smallskipamount - \removelastskip\penalty-50\smallskip\fi} -\def\medbreak{\par\ifdim\lastskip<\medskipamount - \removelastskip\penalty-100\medskip\fi} -\def\bigbreak{\par\ifdim\lastskip<\bigskipamount - \removelastskip\penalty-200\bigskip\fi} - -\def\line{\hbox to\hsize} -\def\leftline#1{\line{#1\hss}} -\def\rightline#1{\line{\hss#1}} -\def\centerline#1{\line{\hss#1\hss}} - -\def\rlap#1{\hbox to\z@{#1\hss}} -\def\llap#1{\hbox to\z@{\hss#1}} - -\def\m@th{\mathsurround\z@} -\def\underbar#1{$\setbox\z@\hbox{#1}\dp\z@\z@ - \m@th \underline{\box\z@}$} - -\newbox\strutbox -\setbox\strutbox=\hbox{\vrule height8.5pt depth3.5pt width\z@} -\def\strut{\relax\ifmmode\copy\strutbox\else\unhcopy\strutbox\fi} - -\def\hidewidth{\hskip\hideskip} % for alignment entries that can stick out -\def\ialign{\everycr{}\tabskip\z@skip\halign} % initialized \halign -\newcount\mscount -\def\multispan#1{\omit \mscount#1\relax - \loop\ifnum\mscount>\@ne \sp@n\repeat} -\def\sp@n{\span\omit\advance\mscount\m@ne} - -\newif\ifus@ \newif\if@cr -\newbox\tabs \newbox\tabsyet \newbox\tabsdone - -\def\cleartabs{\global\setbox\tabsyet\null \setbox\tabs\null} -\def\settabs{\setbox\tabs\null \futurelet\next\sett@b} -\let\+=\relax % in case this file is being read in twice -\def\sett@b{\ifx\next\+\def\nxt{\afterassignment\s@tt@b\let\nxt}% - \else\let\nxt\s@tcols\fi \let\next\relax \nxt} -\def\s@tt@b{\let\nxt\relax \us@false\m@ketabbox} -\def\tabalign{\us@true\m@ketabbox} % non-\outer version of \+ -\outer\def\+{\tabalign} -\def\s@tcols#1\columns{\count@#1\dimen@\hsize - \loop\ifnum\count@>\z@ \@nother \repeat} -\def\@nother{\dimen@ii\dimen@ \divide\dimen@ii\count@ - \setbox\tabs\hbox{\hbox to\dimen@ii{}\unhbox\tabs}% - \advance\dimen@-\dimen@ii \advance\count@\m@ne} - -\def\m@ketabbox{\begingroup - \global\setbox\tabsyet\copy\tabs - \global\setbox\tabsdone\null - \def\cr{\@crtrue\crcr\egroup\egroup - \ifus@\unvbox\z@\lastbox\fi\endgroup - \setbox\tabs\hbox{\unhbox\tabsyet\unhbox\tabsdone}}% - \setbox\z@\vbox\bgroup\@crfalse - \ialign\bgroup&\t@bbox##\t@bb@x\crcr} - -\def\t@bbox{\setbox\z@\hbox\bgroup} -\def\t@bb@x{\if@cr\egroup % now \box\z@ holds the column - \else\hss\egroup \global\setbox\tabsyet\hbox{\unhbox\tabsyet - \global\setbox\@ne\lastbox}% now \box\@ne holds its size - \ifvoid\@ne\global\setbox\@ne\hbox to\wd\z@{}% - \else\setbox\z@\hbox to\wd\@ne{\unhbox\z@}\fi - \global\setbox\tabsdone\hbox{\box\@ne\unhbox\tabsdone}\fi - \box\z@} - -\def\hang{\hangindent\parindent} -\def\textindent#1{\indent\llap{#1\enspace}\ignorespaces} -\def\item{\par\hang\textindent} -\def\itemitem{\par\indent \hangindent2\parindent \textindent} -\def\narrower{\advance\leftskip\parindent - \advance\rightskip\parindent} - -\outer\def\beginsection#1\par{\vskip\z@ plus.3\vsize\penalty-250 - \vskip\z@ plus-.3\vsize\bigskip\vskip\parskip - \message{#1}\leftline{\bf#1}\nobreak\smallskip\noindent} -\outer\def\proclaim #1. #2\par{\medbreak - \noindent{\bf#1.\enspace}{\sl#2\par}% - \ifdim\lastskip<\medskipamount \removelastskip\penalty55\medskip\fi} - -\def\raggedright{\rightskip\z@ plus2em \spaceskip.3333em \xspaceskip.5em\relax} -\def\ttraggedright{\tt\rightskip\z@ plus2em\relax} % for use with \tt only - -\chardef\%=`\% -\chardef\&=`\& -\chardef\#=`\# -\chardef\$=`\$ -\chardef\ss="19 -\chardef\ae="1A -\chardef\oe="1B -\chardef\o="1C -\chardef\AE="1D -\chardef\OE="1E -\chardef\O="1F -\chardef\i="10 \chardef\j="11 % dotless letters -\def\aa{\accent23a} -\def\l{\char32l} -\def\L{\leavevmode\setbox0\hbox{L}\hbox to\wd0{\hss\char32L}} - -\def\leavevmode{\unhbox\voidb@x} % begins a paragraph, if necessary -\def\_{\leavevmode \kern.06em \vbox{\hrule width.3em}} -\def\AA{\leavevmode\setbox0\hbox{h}\dimen@\ht0\advance\dimen@-1ex% - \rlap{\raise.67\dimen@\hbox{\char'27}}A} - -\def\mathhexbox#1#2#3{\leavevmode - \hbox{$\m@th \mathchar"#1#2#3$}} -\def\dag{\mathhexbox279} -\def\ddag{\mathhexbox27A} -\def\S{\mathhexbox278} -\def\P{\mathhexbox27B} - -\def\oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% - \ialign{##\crcr#1\crcr}}} \def\o@lign{\lineskiplimit\z@ \oalign} -\def\ooalign{\lineskiplimit-\maxdimen \oalign} % chars over each other -\def\sh@ft#1{\dimen\z@.00#1ex\multiply\dimen\z@\fontdimen1\font - \kern-.0156\dimen\z@} % compensate for slant in lowered accents -\def\d#1{{\o@lign{\relax#1\crcr\hidewidth\sh@ft{10}.\hidewidth}}} -\def\b#1{{\o@lign{\relax#1\crcr\hidewidth\sh@ft{29}% - \vbox to.2ex{\hbox{\char22}\vss}\hidewidth}}} -\def\c#1{\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent24 #1% - \else{\ooalign{\unhbox\z@\crcr\hidewidth\char24\hidewidth}}\fi} -\def\copyright{{\ooalign{\hfil\raise.07ex\hbox{c}\hfil\crcr\mathhexbox20D}}} - -\def\dots{\relax\ifmmode\ldots\else$\m@th\ldots\,$\fi} -\def\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX} - -\def\`#1{{\accent18 #1}} -\def\'#1{{\accent19 #1}} -\def\v#1{{\accent20 #1}} \let\^^_=\v -\def\u#1{{\accent21 #1}} \let\^^S=\u -\def\=#1{{\accent22 #1}} -\def\^#1{{\accent94 #1}} \let\^^D=\^ -\def\.#1{{\accent95 #1}} -\def\H#1{{\accent"7D #1}} -\def\~#1{{\accent"7E #1}} -\def\"#1{{\accent"7F #1}} -\def\t#1{{\edef\next{\the\font}\the\textfont1\accent"7F\next#1}} - -\def\hrulefill{\leaders\hrule\hfill} -\def\dotfill{\cleaders\hbox{$\m@th \mkern1.5mu.\mkern1.5mu$}\hfill} -\def\rightarrowfill{$\m@th\smash-\mkern-7mu% - \cleaders\hbox{$\mkern-2mu\smash-\mkern-2mu$}\hfill - \mkern-7mu\mathord\rightarrow$} -\def\leftarrowfill{$\m@th\mathord\leftarrow\mkern-7mu% - \cleaders\hbox{$\mkern-2mu\smash-\mkern-2mu$}\hfill - \mkern-7mu\smash-$} -\mathchardef\braceld="37A \mathchardef\bracerd="37B -\mathchardef\bracelu="37C \mathchardef\braceru="37D -\def\downbracefill{$\m@th \setbox\z@\hbox{$\braceld$}% - \braceld\leaders\vrule height\ht\z@ depth\z@\hfill\braceru - \bracelu\leaders\vrule height\ht\z@ depth\z@\hfill\bracerd$} -\def\upbracefill{$\m@th \setbox\z@\hbox{$\braceld$}% - \bracelu\leaders\vrule height\ht\z@ depth\z@\hfill\bracerd - \braceld\leaders\vrule height\ht\z@ depth\z@\hfill\braceru$} - -\outer\def\bye{\par\vfill\supereject\end} - -% Macros for math setting -\message{math definitions,} - -\let\sp=^ \let\sb=_ -\def\,{\mskip\thinmuskip} -\def\>{\mskip\medmuskip} -\def\;{\mskip\thickmuskip} -\def\!{\mskip-\thinmuskip} -\def\*{\discretionary{\thinspace\the\textfont2\char2}{}{}} -{\catcode`\'=\active \gdef'{^\bgroup\prim@s}} -\def\prim@s{\prime\futurelet\next\pr@m@s} -\def\pr@m@s{\ifx'\next\let\nxt\pr@@@s \else\ifx^\next\let\nxt\pr@@@t - \else\let\nxt\egroup\fi\fi \nxt} -\def\pr@@@s#1{\prim@s} \def\pr@@@t#1#2{#2\egroup} -{\catcode`\^^Z=\active \gdef^^Z{\not=}} % ^^Z is like \ne in math - -{\catcode`\_=\active \global\let_=\_} % _ in math is either subscript or \_ - -\mathchardef\alpha="010B -\mathchardef\beta="010C -\mathchardef\gamma="010D -\mathchardef\delta="010E -\mathchardef\epsilon="010F -\mathchardef\zeta="0110 -\mathchardef\eta="0111 -\mathchardef\theta="0112 -\mathchardef\iota="0113 -\mathchardef\kappa="0114 -\mathchardef\lambda="0115 -\mathchardef\mu="0116 -\mathchardef\nu="0117 -\mathchardef\xi="0118 -\mathchardef\pi="0119 -\mathchardef\rho="011A -\mathchardef\sigma="011B -\mathchardef\tau="011C -\mathchardef\upsilon="011D -\mathchardef\phi="011E -\mathchardef\chi="011F -\mathchardef\psi="0120 -\mathchardef\omega="0121 -\mathchardef\varepsilon="0122 -\mathchardef\vartheta="0123 -\mathchardef\varpi="0124 -\mathchardef\varrho="0125 -\mathchardef\varsigma="0126 -\mathchardef\varphi="0127 -\mathchardef\Gamma="0800 -\mathchardef\Delta="0801 -\mathchardef\Theta="0802 -\mathchardef\Lambda="0803 -\mathchardef\Xi="0804 -\mathchardef\Pi="0805 -\mathchardef\Sigma="0806 -\mathchardef\Upsilon="0807 -\mathchardef\Phi="0808 -\mathchardef\Psi="0809 -\mathchardef\Omega="080A - -\mathchardef\aleph="0240 -\def\hbar{{\mathchar'26\mkern-9muh}} -\mathchardef\imath="017B -\mathchardef\jmath="017C -\mathchardef\ell="0160 -\mathchardef\wp="017D -\mathchardef\Re="023C -\mathchardef\Im="023D -\mathchardef\partial="0140 -\mathchardef\infty="0231 -\mathchardef\prime="0230 -\mathchardef\emptyset="023B -\mathchardef\nabla="0272 -\def\surd{{\mathchar"1270}} -\mathchardef\top="023E -\mathchardef\bot="023F -\def\angle{{\vbox{\ialign{$\m@th\scriptstyle##$\crcr - \not\mathrel{\mkern14mu}\crcr - \noalign{\nointerlineskip} - \mkern2.5mu\leaders\hrule height.34pt\hfill\mkern2.5mu\crcr}}}} -\mathchardef\triangle="0234 -\mathchardef\forall="0238 -\mathchardef\exists="0239 -\mathchardef\neg="023A \let\lnot=\neg -\mathchardef\flat="015B -\mathchardef\natural="015C -\mathchardef\sharp="015D -\mathchardef\clubsuit="027C -\mathchardef\diamondsuit="027D -\mathchardef\heartsuit="027E -\mathchardef\spadesuit="027F - -\mathchardef\coprod="1360 -\mathchardef\bigvee="1357 -\mathchardef\bigwedge="1356 -\mathchardef\biguplus="1355 -\mathchardef\bigcap="1354 -\mathchardef\bigcup="1353 -\mathchardef\intop="1352 \def\int{\intop\nolimits} -\mathchardef\prod="1351 -\mathchardef\sum="1350 -\mathchardef\bigotimes="134E -\mathchardef\bigoplus="134C -\mathchardef\bigodot="134A -\mathchardef\ointop="1348 \def\oint{\ointop\nolimits} -\mathchardef\bigsqcup="1346 -\mathchardef\smallint="1273 - -\mathchardef\triangleleft="212F -\mathchardef\triangleright="212E -\mathchardef\bigtriangleup="2234 -\mathchardef\bigtriangledown="2235 -\mathchardef\wedge="225E \let\land=\wedge -\mathchardef\vee="225F \let\lor=\vee -\mathchardef\cap="225C -\mathchardef\cup="225B -\mathchardef\ddagger="227A -\mathchardef\dagger="2279 -\mathchardef\sqcap="2275 -\mathchardef\sqcup="2274 -\mathchardef\uplus="225D -\mathchardef\amalg="2271 -\mathchardef\diamond="2205 -\mathchardef\bullet="220F -\mathchardef\wr="226F -\mathchardef\div="2204 -\mathchardef\odot="220C -\mathchardef\oslash="220B -\mathchardef\otimes="220A -\mathchardef\ominus="2209 -\mathchardef\oplus="2208 -\mathchardef\mp="2207 -\mathchardef\pm="2206 -\mathchardef\circ="220E -\mathchardef\bigcirc="220D -\mathchardef\setminus="226E % for set difference A\setminus B -\mathchardef\cdot="2201 -\mathchardef\ast="2203 -\mathchardef\times="2202 -\mathchardef\star="213F - -\mathchardef\propto="322F -\mathchardef\sqsubseteq="3276 -\mathchardef\sqsupseteq="3277 -\mathchardef\parallel="326B -\mathchardef\mid="326A -\mathchardef\dashv="3261 -\mathchardef\vdash="3260 -\mathchardef\nearrow="3225 -\mathchardef\searrow="3226 -\mathchardef\nwarrow="322D -\mathchardef\swarrow="322E -\mathchardef\Leftrightarrow="322C -\mathchardef\Leftarrow="3228 -\mathchardef\Rightarrow="3229 -\def\neq{\not=} \let\ne=\neq -\mathchardef\leq="3214 \let\le=\leq -\mathchardef\geq="3215 \let\ge=\geq -\mathchardef\succ="321F -\mathchardef\prec="321E -\mathchardef\approx="3219 -\mathchardef\succeq="3217 -\mathchardef\preceq="3216 -\mathchardef\supset="321B -\mathchardef\subset="321A -\mathchardef\supseteq="3213 -\mathchardef\subseteq="3212 -\mathchardef\in="3232 -\mathchardef\ni="3233 \let\owns=\ni -\mathchardef\gg="321D -\mathchardef\ll="321C -\mathchardef\not="3236 -\mathchardef\leftrightarrow="3224 -\mathchardef\leftarrow="3220 \let\gets=\leftarrow -\mathchardef\rightarrow="3221 \let\to=\rightarrow -\mathchardef\mapstochar="3237 \def\mapsto{\mapstochar\rightarrow} -\mathchardef\sim="3218 -\mathchardef\simeq="3227 -\mathchardef\perp="323F -\mathchardef\equiv="3211 -\mathchardef\asymp="3210 -\mathchardef\smile="315E -\mathchardef\frown="315F -\mathchardef\leftharpoonup="3128 -\mathchardef\leftharpoondown="3129 -\mathchardef\rightharpoonup="312A -\mathchardef\rightharpoondown="312B - -\def\joinrel{\mathrel{\mkern-3mu}} -\def\relbar{\mathrel{\smash-}} % \smash, because - has the same height as + -\def\Relbar{\mathrel=} -\mathchardef\lhook="312C \def\hookrightarrow{\lhook\joinrel\rightarrow} -\mathchardef\rhook="312D \def\hookleftarrow{\leftarrow\joinrel\rhook} -\def\bowtie{\mathrel\triangleright\joinrel\mathrel\triangleleft} -\def\models{\mathrel|\joinrel=} -\def\Longrightarrow{\Relbar\joinrel\Rightarrow} -\def\longrightarrow{\relbar\joinrel\rightarrow} -\def\longleftarrow{\leftarrow\joinrel\relbar} -\def\Longleftarrow{\Leftarrow\joinrel\Relbar} -\def\longmapsto{\mapstochar\longrightarrow} -\def\longleftrightarrow{\leftarrow\joinrel\rightarrow} -\def\Longleftrightarrow{\Leftarrow\joinrel\Rightarrow} -\def\iff{\;\Longleftrightarrow\;} - -\mathchardef\ldotp="613A % ldot as a punctuation mark -\mathchardef\cdotp="6201 % cdot as a punctuation mark -\mathchardef\colon="603A % colon as a punctuation mark -\def\ldots{\mathinner{\ldotp\ldotp\ldotp}} -\def\cdots{\mathinner{\cdotp\cdotp\cdotp}} -\def\vdots{\vbox{\baselineskip4\p@ \lineskiplimit\z@ - \kern6\p@\hbox{.}\hbox{.}\hbox{.}}} -\def\ddots{\mathinner{\mkern1mu\raise7\p@\vbox{\kern7\p@\hbox{.}}\mkern2mu - \raise4\p@\hbox{.}\mkern2mu\raise\p@\hbox{.}\mkern1mu}} - -\def\acute{\mathaccent"7013 } -\def\grave{\mathaccent"7012 } -\def\ddot{\mathaccent"707F } -\def\tilde{\mathaccent"707E } -\def\bar{\mathaccent"7016 } -\def\breve{\mathaccent"7015 } -\def\check{\mathaccent"7014 } -\def\hat{\mathaccent"705E } -\def\vec{\mathaccent"017E } -\def\dot{\mathaccent"705F } -\def\widetilde{\mathaccent"0365 } -\def\widehat{\mathaccent"0362 } -\def\overrightarrow#1{\vbox{\m@th\ialign{##\crcr - \rightarrowfill\crcr\noalign{\kern-\p@\nointerlineskip} - $\hfil\displaystyle{#1}\hfil$\crcr}}} -\def\overleftarrow#1{\vbox{\m@th\ialign{##\crcr - \leftarrowfill\crcr\noalign{\kern-\p@\nointerlineskip} - $\hfil\displaystyle{#1}\hfil$\crcr}}} -\def\overbrace#1{\mathop{\vbox{\m@th\ialign{##\crcr\noalign{\kern3\p@} - \downbracefill\crcr\noalign{\kern3\p@\nointerlineskip} - $\hfil\displaystyle{#1}\hfil$\crcr}}}\limits} -\def\underbrace#1{\mathop{\vtop{\m@th\ialign{##\crcr - $\hfil\displaystyle{#1}\hfil$\crcr\noalign{\kern3\p@\nointerlineskip} - \upbracefill\crcr\noalign{\kern3\p@}}}}\limits} -\def\skew#1#2#3{{\muskip\z@#1mu\divide\muskip\z@\tw@ \mkern\muskip\z@ - #2{\mkern-\muskip\z@{#3}\mkern\muskip\z@}\mkern-\muskip\z@}{}} - -\def\lmoustache{\delimiter"437A340 } % top from (, bottom from ) -\def\rmoustache{\delimiter"537B341 } % top from ), bottom from ( -\def\lgroup{\delimiter"462833A } % extensible ( with sharper tips -\def\rgroup{\delimiter"562933B } % extensible ) with sharper tips -\def\arrowvert{\delimiter"26A33C } % arrow without arrowheads -\def\Arrowvert{\delimiter"26B33D } % double arrow without arrowheads -\def\bracevert{\delimiter"77C33E } % the vertical bar that extends braces -\def\Vert{\delimiter"26B30D } \let\|=\Vert -\def\vert{\delimiter"26A30C } -\def\uparrow{\delimiter"3222378 } -\def\downarrow{\delimiter"3223379 } -\def\updownarrow{\delimiter"326C33F } -\def\Uparrow{\delimiter"322A37E } -\def\Downarrow{\delimiter"322B37F } -\def\Updownarrow{\delimiter"326D377 } -\def\backslash{\delimiter"26E30F } % for double coset G\backslash H -\def\rangle{\delimiter"526930B } -\def\langle{\delimiter"426830A } -\def\rbrace{\delimiter"5267309 } \let\}=\rbrace -\def\lbrace{\delimiter"4266308 } \let\{=\lbrace -\def\rceil{\delimiter"5265307 } -\def\lceil{\delimiter"4264306 } -\def\rfloor{\delimiter"5263305 } -\def\lfloor{\delimiter"4262304 } - -\def\bigl{\mathopen\big} -\def\bigm{\mathrel\big} -\def\bigr{\mathclose\big} -\def\Bigl{\mathopen\Big} -\def\Bigm{\mathrel\Big} -\def\Bigr{\mathclose\Big} -\def\biggl{\mathopen\bigg} -\def\biggm{\mathrel\bigg} -\def\biggr{\mathclose\bigg} -\def\Biggl{\mathopen\Bigg} -\def\Biggm{\mathrel\Bigg} -\def\Biggr{\mathclose\Bigg} -\def\big#1{{\hbox{$\left#1\vbox to8.5\p@{}\right.\n@space$}}} -\def\Big#1{{\hbox{$\left#1\vbox to11.5\p@{}\right.\n@space$}}} -\def\bigg#1{{\hbox{$\left#1\vbox to14.5\p@{}\right.\n@space$}}} -\def\Bigg#1{{\hbox{$\left#1\vbox to17.5\p@{}\right.\n@space$}}} -\def\n@space{\nulldelimiterspace\z@ \m@th} - -\def\choose{\atopwithdelims()} -\def\brack{\atopwithdelims[]} -\def\brace{\atopwithdelims\{\}} - -\def\sqrt{\radical"270370 } - -\def\mathpalette#1#2{\mathchoice{#1\displaystyle{#2}}% - {#1\textstyle{#2}}{#1\scriptstyle{#2}}{#1\scriptscriptstyle{#2}}} -\newbox\rootbox -\def\root#1\of{\setbox\rootbox\hbox{$\m@th\scriptscriptstyle{#1}$} - \mathpalette\r@@t} -\def\r@@t#1#2{\setbox\z@\hbox{$\m@th#1\sqrt{#2}$} - \dimen@\ht\z@ \advance\dimen@-\dp\z@ - \mkern5mu\raise.6\dimen@\copy\rootbox \mkern-10mu \box\z@} -\newif\ifv@ \newif\ifh@ -\def\vphantom{\v@true\h@false\ph@nt} -\def\hphantom{\v@false\h@true\ph@nt} -\def\phantom{\v@true\h@true\ph@nt} -\def\ph@nt{\ifmmode\def\next{\mathpalette\mathph@nt}% - \else\let\next\makeph@nt\fi\next} -\def\makeph@nt#1{\setbox\z@\hbox{#1}\finph@nt} -\def\mathph@nt#1#2{\setbox\z@\hbox{$\m@th#1{#2}$}\finph@nt} -\def\finph@nt{\setbox\tw@\null - \ifv@ \ht\tw@\ht\z@ \dp\tw@\dp\z@\fi - \ifh@ \wd\tw@\wd\z@\fi \box\tw@} -\def\mathstrut{\vphantom(} -\def\smash{\relax % \relax, in case this comes first in \halign - \ifmmode\def\next{\mathpalette\mathsm@sh}\else\let\next\makesm@sh - \fi\next} -\def\makesm@sh#1{\setbox\z@\hbox{#1}\finsm@sh} -\def\mathsm@sh#1#2{\setbox\z@\hbox{$\m@th#1{#2}$}\finsm@sh} -\def\finsm@sh{\ht\z@\z@ \dp\z@\z@ \box\z@} - -\def\cong{\mathrel{\mathpalette\@vereq\sim}} % congruence sign -\def\@vereq#1#2{\lower.5\p@\vbox{\lineskiplimit\maxdimen\lineskip-.5\p@ - \ialign{$\m@th#1\hfil##\hfil$\crcr#2\crcr=\crcr}}} -\def\notin{\mathrel{\mathpalette\c@ncel\in}} -\def\c@ncel#1#2{\m@th\ooalign{$\hfil#1\mkern1mu/\hfil$\crcr$#1#2$}} -\def\rightleftharpoons{\mathrel{\mathpalette\rlh@{}}} -\def\rlh@#1{\vcenter{\m@th\hbox{\ooalign{\raise2pt - \hbox{$#1\rightharpoonup$}\crcr - $#1\leftharpoondown$}}}} -\def\buildrel#1\over#2{\mathrel{\mathop{\kern\z@#2}\limits^{#1}}} -\def\doteq{\buildrel\textstyle.\over=} - -\def\log{\mathop{\rm log}\nolimits} -\def\lg{\mathop{\rm lg}\nolimits} -\def\ln{\mathop{\rm ln}\nolimits} -\def\lim{\mathop{\rm lim}} -\def\limsup{\mathop{\rm lim\,sup}} -\def\liminf{\mathop{\rm lim\,inf}} -\def\sin{\mathop{\rm sin}\nolimits} -\def\arcsin{\mathop{\rm arcsin}\nolimits} -\def\sinh{\mathop{\rm sinh}\nolimits} -\def\cos{\mathop{\rm cos}\nolimits} -\def\arccos{\mathop{\rm arccos}\nolimits} -\def\cosh{\mathop{\rm cosh}\nolimits} -\def\tan{\mathop{\rm tan}\nolimits} -\def\arctan{\mathop{\rm arctan}\nolimits} -\def\tanh{\mathop{\rm tanh}\nolimits} -\def\cot{\mathop{\rm cot}\nolimits} -\def\coth{\mathop{\rm coth}\nolimits} -\def\sec{\mathop{\rm sec}\nolimits} -\def\csc{\mathop{\rm csc}\nolimits} -\def\max{\mathop{\rm max}} -\def\min{\mathop{\rm min}} -\def\sup{\mathop{\rm sup}} -\def\inf{\mathop{\rm inf}} -\def\arg{\mathop{\rm arg}\nolimits} -\def\ker{\mathop{\rm ker}\nolimits} -\def\dim{\mathop{\rm dim}\nolimits} -\def\hom{\mathop{\rm hom}\nolimits} -\def\det{\mathop{\rm det}} -\def\exp{\mathop{\rm exp}\nolimits} -\def\Pr{\mathop{\rm Pr}} -\def\gcd{\mathop{\rm gcd}} -\def\deg{\mathop{\rm deg}\nolimits} - -\def\bmod{\nonscript\mskip-\medmuskip\mkern5mu - \mathbin{\rm mod}\penalty900\mkern5mu\nonscript\mskip-\medmuskip} -\def\pmod#1{\allowbreak\mkern18mu({\rm mod}\,\,#1)} - -\def\cases#1{\left\{\,\vcenter{\normalbaselines\m@th - \ialign{$##\hfil$&\quad##\hfil\crcr#1\crcr}}\right.} -\def\matrix#1{\null\,\vcenter{\normalbaselines\m@th - \ialign{\hfil$##$\hfil&&\quad\hfil$##$\hfil\crcr - \mathstrut\crcr\noalign{\kern-\baselineskip} - #1\crcr\mathstrut\crcr\noalign{\kern-\baselineskip}}}\,} -\def\pmatrix#1{\left(\matrix{#1}\right)} -\newdimen\p@renwd -\setbox0=\hbox{\tenex B} \p@renwd=\wd0 % width of the big left ( -\def\bordermatrix#1{\begingroup \m@th - \setbox\z@\vbox{\def\cr{\crcr\noalign{\kern2\p@\global\let\cr\endline}}% - \ialign{$##$\hfil\kern2\p@\kern\p@renwd&\thinspace\hfil$##$\hfil - &&\quad\hfil$##$\hfil\crcr - \omit\strut\hfil\crcr\noalign{\kern-\baselineskip}% - #1\crcr\omit\strut\cr}}% - \setbox\tw@\vbox{\unvcopy\z@\global\setbox\@ne\lastbox}% - \setbox\tw@\hbox{\unhbox\@ne\unskip\global\setbox\@ne\lastbox}% - \setbox\tw@\hbox{$\kern\wd\@ne\kern-\p@renwd\left(\kern-\wd\@ne - \global\setbox\@ne\vbox{\box\@ne\kern2\p@}% - \vcenter{\kern-\ht\@ne\unvbox\z@\kern-\baselineskip}\,\right)$}% - \null\;\vbox{\kern\ht\@ne\box\tw@}\endgroup} - -\def\openup{\afterassignment\@penup\dimen@=} -\def\@penup{\advance\lineskip\dimen@ - \advance\baselineskip\dimen@ - \advance\lineskiplimit\dimen@} -\def\eqalign#1{\null\,\vcenter{\openup\jot\m@th - \ialign{\strut\hfil$\displaystyle{##}$&$\displaystyle{{}##}$\hfil - \crcr#1\crcr}}\,} -\newif\ifdt@p -\def\displ@y{\global\dt@ptrue\openup\jot\m@th - \everycr{\noalign{\ifdt@p \global\dt@pfalse \ifdim\prevdepth>-1000\p@ - \vskip-\lineskiplimit \vskip\normallineskiplimit \fi - \else \penalty\interdisplaylinepenalty \fi}}} -\def\@lign{\tabskip\z@skip\everycr{}} % restore inside \displ@y -\def\displaylines#1{\displ@y \tabskip\z@skip - \halign{\hbox to\displaywidth{$\@lign\hfil\displaystyle##\hfil$}\crcr - #1\crcr}} -\def\eqalignno#1{\displ@y \tabskip\centering - \halign to\displaywidth{\hfil$\@lign\displaystyle{##}$\tabskip\z@skip - &$\@lign\displaystyle{{}##}$\hfil\tabskip\centering - &\llap{$\@lign##$}\tabskip\z@skip\crcr - #1\crcr}} -\def\leqalignno#1{\displ@y \tabskip\centering - \halign to\displaywidth{\hfil$\@lign\displaystyle{##}$\tabskip\z@skip - &$\@lign\displaystyle{{}##}$\hfil\tabskip\centering - &\kern-\displaywidth\rlap{$\@lign##$}\tabskip\displaywidth\crcr - #1\crcr}} - -% Definitions related to output - -\message{output routines,} - -\countdef\pageno=0 \pageno=1 % first page is number 1 -\newtoks\headline \headline={\hfil} % headline is normally blank -\newtoks\footline \footline={\hss\tenrm\folio\hss} - % footline is normally a centered page number in font \tenrm -\newif\ifr@ggedbottom -\def\raggedbottom{\topskip 10\p@ plus60\p@ \r@ggedbottomtrue} -\def\normalbottom{\topskip 10\p@ \r@ggedbottomfalse} % undoes \raggedbottom -\def\folio{\ifnum\pageno<\z@ \romannumeral-\pageno \else\number\pageno \fi} -\def\nopagenumbers{\footline{\hfil}} % blank out the footline -\def\advancepageno{\ifnum\pageno<\z@ \global\advance\pageno\m@ne - \else\global\advance\pageno\@ne \fi} % increase |pageno| - -\newinsert\footins -\def\footnote#1{\let\@sf\empty % parameter #2 (the text) is read later - \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\/\fi - #1\@sf\vfootnote{#1}} -\def\vfootnote#1{\insert\footins\bgroup - \interlinepenalty\interfootnotelinepenalty - \splittopskip\ht\strutbox % top baseline for broken footnotes - \splitmaxdepth\dp\strutbox \floatingpenalty\@MM - \leftskip\z@skip \rightskip\z@skip \spaceskip\z@skip \xspaceskip\z@skip - \textindent{#1}\footstrut\futurelet\next\fo@t} -\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t - \else\let\next\f@t\fi \next} -\def\f@@t{\bgroup\aftergroup\@foot\let\next} -\def\f@t#1{#1\@foot} -\def\@foot{\strut\egroup} -\def\footstrut{\vbox to\splittopskip{}} -\skip\footins=\bigskipamount % space added when footnote is present -\count\footins=1000 % footnote magnification factor (1 to 1) -\dimen\footins=8in % maximum footnotes per page - -\newinsert\topins -\newif\ifp@ge \newif\if@mid -\def\topinsert{\@midfalse\p@gefalse\@ins} -\def\midinsert{\@midtrue\@ins} -\def\pageinsert{\@midfalse\p@getrue\@ins} -\skip\topins=\z@skip % no space added when a topinsert is present -\count\topins=1000 % magnification factor (1 to 1) -\dimen\topins=\maxdimen % no limit per page -\def\@ins{\par\begingroup\setbox\z@\vbox\bgroup} % start a \vbox -\def\endinsert{\egroup % finish the \vbox - \if@mid \dimen@\ht\z@ \advance\dimen@\dp\z@ \advance\dimen@12\p@ - \advance\dimen@\pagetotal \advance\dimen@-\pageshrink - \ifdim\dimen@>\pagegoal\@midfalse\p@gefalse\fi\fi - \if@mid \bigskip\box\z@\bigbreak - \else\insert\topins{\penalty100 % floating insertion - \splittopskip\z@skip - \splitmaxdepth\maxdimen \floatingpenalty\z@ - \ifp@ge \dimen@\dp\z@ - \vbox to\vsize{\unvbox\z@\kern-\dimen@}% depth is zero - \else \box\z@\nobreak\bigskip\fi}\fi\endgroup} - -\output{\plainoutput} -\def\plainoutput{\shipout\vbox{\makeheadline\pagebody\makefootline}% - \advancepageno - \ifnum\outputpenalty>-\@MM \else\dosupereject\fi} -\def\pagebody{\vbox to\vsize{\boxmaxdepth\maxdepth \pagecontents}} -\def\makeheadline{\vbox to\z@{\vskip-22.5\p@ - \line{\vbox to8.5\p@{}\the\headline}\vss}\nointerlineskip} -\def\makefootline{\baselineskip24\p@\line{\the\footline}} -\def\dosupereject{\ifnum\insertpenalties>\z@ % something is being held over - \line{}\kern-\topskip\nobreak\vfill\supereject\fi} - -\def\pagecontents{\ifvoid\topins\else\unvbox\topins\fi - \dimen@=\dp\@cclv \unvbox\@cclv % open up \box255 - \ifvoid\footins\else % footnote info is present - \vskip\skip\footins - \footnoterule - \unvbox\footins\fi - \ifr@ggedbottom \kern-\dimen@ \vfil \fi} -\def\footnoterule{\kern-3\p@ - \hrule width 2truein \kern 2.6\p@} % the \hrule is .4pt high - -% Hyphenation, miscellaneous macros, and initial values for standard layout -\message{hyphenation} - -\lefthyphenmin=2 \righthyphenmin=3 % disallow x- or -xx breaks - -\input hyacceur.tex % special lc.uc codes for characters > 127 -\input acmacros.sty % macros for accented letters -\input hyconfig.ptx - -\def\magnification{\afterassignment\m@g\count@} -\def\m@g{\mag\count@ - \hsize6.5truein\vsize8.9truein\dimen\footins8truein} - -\def\tracingall{\tracingonline\@ne\tracingcommands\tw@\tracingstats\tw@ - \tracingpages\@ne\tracingoutput\@ne\tracinglostchars\@ne - \tracingmacros\tw@\tracingparagraphs\@ne\tracingrestores\@ne - \showboxbreadth\maxdimen\showboxdepth\maxdimen\errorstopmode} - -\def\showhyphens#1{\setbox0\vbox{\parfillskip\z@skip\hsize\maxdimen\tenrm - \pretolerance\m@ne\tolerance\m@ne\hbadness0\showboxdepth0\ #1}} - -\normalbaselines\rm % select roman font -\nonfrenchspacing % punctuation affects the spacing -\catcode`@=12 % at signs are no longer letters - -\def\fmtname{plain}\def\fmtversion{3.141592} % identifies the current format -\dump -\endinput diff --git a/macros/ec-plain/ec-plfmt.bat b/macros/ec-plain/ec-plfmt.bat deleted file mode 100644 index dc7b25e39d..0000000000 --- a/macros/ec-plain/ec-plfmt.bat +++ /dev/null @@ -1,46 +0,0 @@ -echo on -echo fmt.bat for 5 languages -del *.bak -del *.log -del *.tex -del *.sty -del *.ch -del *.mf -del *.tfm -del *.min -del *.doc -del *.dat -del *.zip -del *.tmp - -rem copy d:\emtex\texinput\etc\plain.tex - -copy d:\emtex\texinput\acmacros.sty -copy d:\emtex\texinput\hyconfig.ptx -copy d:\emtex\texinput\dcacceur.tex hyacceur.tex -copy d:\emtex\texinput\enhyph.tex -copy d:\emtex\texinput\enhyphex.tex -copy d:\emtex\texinput\f8hyph.tex -rem copy d:\emtex\texinput\french\f8hyphex.tex -rem copy d:\emtex\texinput\french\frhyphex.tex -copy d:\emtex\texinput\ithyph.tex -copy d:\emtex\texinput\eshyph.tex -copy d:\emtex\texinput\ghyph31.tex -copy d:\emtex\texinput\ec-plain.tex -copy d:\emtex\texinput\ec-plain.doc 00readme.doc -copy d:\emtex\mfinput\ec\exmi*.mf -del exmib*.mf -copy d:\emtex\mfinput\ec\ecbxmath.mf -copy d:\emtex\mfinput\ec\ecmathit.mf -copy d:\emtex\mfinput\misc\dy*.mf -copy d:\emtex\mfinput\misc\ofgree*.mf -copy d:\emtex\tfm\ec\exmi*.tfm -del exmib*.tfm -del dymib*.mf - -echo french-english-german-italian-spanish plain -copy d:\emtex\texinput\language.eur language.dat -initex ec-plain \dump -if errorlevel 1 goto error - -:error diff --git a/macros/ec-plain/ecbxmath.mf b/macros/ec-plain/ecbxmath.mf deleted file mode 100644 index 686db6ea04..0000000000 --- a/macros/ec-plain/ecbxmath.mf +++ /dev/null @@ -1,21 +0,0 @@ -% bold greek letters -character_offset:=168; - -font_setup; - -input ofgreeku; % -input ofgreekl; % - -% bold italic Greek letters -character_offset:=208; -currenttransform:=old_currenttransform; -slant:=old_slant; -mono_charic#:=old_mono_charic#; -% crisp#:=old_crisp#; % diameter of serif corners - -font_setup; - -input ofgreeku; % -input ofgreekl; % - - diff --git a/macros/ec-plain/ecmathit.mf b/macros/ec-plain/ecmathit.mf deleted file mode 100644 index 0f279acdc8..0000000000 --- a/macros/ec-plain/ecmathit.mf +++ /dev/null @@ -1,88 +0,0 @@ -% The Computer Modern Math Italic family (by D. E. Knuth, 1979--1985) - -font_coding_scheme:="TeX math italic"; -mode_setup; font_setup; - -input romanu; % upper case (majuscules) -input itall; % lower case (minuscules) -input greeku; % upper case greek letters -input greekl; % lower case Greek letters -input italms; % special symbols for math italic - -font_slant slant; font_x_height x_height#; -font_quad 18u#+4letter_fit#; - -% saving normal variables to re-use them for Taupin's additions. -transform old_currenttransform; -old_slant:=slant; -old_mono_charic#:=mono_charic#; -old_currenttransform:=currenttransform; - -slant:=mono_charic#:=0; % the remaining characters will not be slanted -currenttransform:=identity yscaled aspect_ratio scaled granularity; -input olddig; % oldstyle numerals -input romms; % roman math specials - -% additions by D. Taupin for upright Greek letters, bold Greek letters - -old_crisp#:=crisp#; -old_u#:=u#; - -% upright greek letters -character_offset:=128; -slant:=0; mono_charic#:=0; -crisp#:=0pt; % diameter of serif corners -currenttransform:=identity yscaled aspect_ratio scaled granularity; -input ofgreeku; % -input ofgreekl; % - -character_offset:=0; -slant:=old_slant; -mono_charic#:=old_mono_charic#; -crisp#:=old_crisp#; -u#:=old_u#; - -skewchar=oct"177"; skew#=.5u#; -save comma; -period=oct"72"; comma=oct"73"; slash=oct"75"; % non-ASCII positions -ligtable "h": skewchar kern -skew#; -ligtable oct"027":oct"034": comma kern -u#, period kern -u#, % $\nu:\tau:$ - "L":"g":"u":"v":"x": oct"013": oct"026": % $L:g:u:v:x:\alpha:\mu:$ - oct"035":oct"173": skewchar kern skew#; % $\upsilon:\imath:$ -ligtable "U": comma kern-2u#, period kern-2u#, % $U:$ - slash kern-u#, skewchar kern skew#; -ligtable "K":oct"011": slash kern-u#, % $K:\it\Psi:$ - oct"016":"r": comma kern-u#, period kern-u#, % $\delta:r:$ - "D":"c":"e":"o":"s":"y":"z":oct"017": % $D:c:e:o:s:y:z:\epsilon:$ - oct"021":oct"023":oct"037": skewchar kern 2skew#; % $\eta:\iota:\chi:$ -ligtable oct"007": slash kern-u#, % $\it\Upsilon:$ - comma kern-2u#, period kern-2u#, skewchar kern 2skew#; -ligtable oct"005":"H": slash kern-u#, % $\it\Pi:H:$ - comma kern-u#, period kern-u#, skewchar kern 2skew#; -ligtable "N":"X": slash kern -1.5u#, % $N:X:$ - "C":"T": slash kern -.5u#, comma kern -u#, period kern -u#, % $C:T:$ - "B":"E":"G":"O":"Q":"R":oct"174": % $B:E:G:O:Q:R:\jmath:$ - "l":"p":"q":"t":"w":oct"002":oct"004": % $l:p:q:t:w:\it\Theta:\Xi:$ - oct"006":oct"010":oct"012":oct"014": % $\it\Sigma:\Phi:\Omega:\beta:$ - oct"020":oct"022":oct"032":oct"036": % $\zeta:\theta:\rho:\phi:$ - oct"042":oct"043":oct"045": % $\varepsilon:\vartheta:\varrho:$ - oct"046":oct"047":oct"100": % $\varsigma:\varphi:\partial:$ - skewchar kern 3skew#; -ligtable "M":"S":"Z": slash kern-u#, % $M:S:Z:$ - comma kern-u#, period kern-u#, skewchar kern 3skew#; -ligtable oct"000":"F":"P": slash kern -u#, % $\it\Gamma:F:P:$ - comma kern-2u#, period kern-2u#, skewchar kern 3skew#; -ligtable "I":oct"030":oct"040":oct"140":oct"175": % $I:\xi:\psi:\ell:\wp:$ - skewchar kern 4skew#; -ligtable "A": skewchar kern 5skew#; % $A:$ -ligtable "d": "Y" kern u#, "Z" kern-u#, "j" kern-2u#, "f" kern-3u#, % $d:$ - oct"001":oct"003": skewchar kern 6skew#; % $\it\Delta:\Lambda:$ -ligtable "f": comma kern-u#, period kern-u#, skewchar kern 6skew#; % $f:$ -ligtable "J": slash kern-u#, % $J:$ - comma kern-2u#, period kern-2u#, skewchar kern 6skew#; -ligtable "j":oct"033": comma kern -u#, period kern -u#; % $j:\sigma:$ -ligtable "V":"W":"Y":comma kern-3u#, period kern-3u#, % $V:W:Y:$ - slash kern-2u#; -ligtable slash: oct"001" kern -u#, "A" kern -u#, "M" kern -u#, % $/:$ - "N" kern -u#, "Y" kern +u#, "Z" kern -u#; - diff --git a/macros/ec-plain/enhyph.tex b/macros/ec-plain/enhyph.tex deleted file mode 100644 index 74ee805b02..0000000000 --- a/macros/ec-plain/enhyph.tex +++ /dev/null @@ -1,4457 +0,0 @@ -% ------- English hyphen patterns ----- -\message{Enhyph.tex English hyphenation pattern.} -% -% The Plain TeX hyphenation tables [NOT TO BE CHANGED IN ANY WAY!] - -\patterns{ % just type <return> if you're not using INITEX -.ach4 -.ad4der -.af1t -.al3t -.am5at -.an5c -.ang4 -.ani5m -.ant4 -.an3te -.anti5s -.ar5s -.ar4tie -.ar4ty -.as3c -.as1p -.as1s -.aster5 -.atom5 -.au1d -.av4i -.awn4 -.ba4g -.ba5na -.bas4e -.ber4 -.be5ra -.be3sm -.be5sto -.bri2 -.but4ti -.cam4pe -.can5c -.capa5b -.car5ol -.ca4t -.ce4la -.ch4 -.chill5i -.ci2 -.cit5r -.co3e -.co4r -.cor5ner -.de4moi -.de3o -.de3ra -.de3ri -.des4c -.dictio5 -.do4t -.du4c -.dumb5 -.earth5 -.eas3i -.eb4 -.eer4 -.eg2 -.el5d -.el3em -.enam3 -.en3g -.en3s -.eq5ui5t -.er4ri -.es3 -.eu3 -.eye5 -.fes3 -.for5mer -.ga2 -.ge2 -.gen3t4 -.ge5og -.gi5a -.gi4b -.go4r -.hand5i -.han5k -.he2 -.hero5i -.hes3 -.het3 -.hi3b -.hi3er -.hon5ey -.hon3o -.hov5 -.id4l -.idol3 -.im3m -.im5pin -.in1 -.in3ci -.ine2 -.in2k -.in3s -.ir5r -.is4i -.ju3r -.la4cy -.la4m -.lat5er -.lath5 -.le2 -.leg5e -.len4 -.lep5 -.lev1 -.li4g -.lig5a -.li2n -.li3o -.li4t -.mag5a5 -.mal5o -.man5a -.mar5ti -.me2 -.mer3c -.me5ter -.mis1 -.mist5i -.mon3e -.mo3ro -.mu5ta -.muta5b -.ni4c -.od2 -.odd5 -.of5te -.or5ato -.or3c -.or1d -.or3t -.os3 -.os4tl -.oth3 -.out3 -.ped5al -.pe5te -.pe5tit -.pi4e -.pio5n -.pi2t -.pre3m -.ra4c -.ran4t -.ratio5na -.ree2 -.re5mit -.res2 -.re5stat -.ri4g -.rit5u -.ro4q -.ros5t -.row5d -.ru4d -.sci3e -.self5 -.sell5 -.se2n -.se5rie -.sh2 -.si2 -.sing4 -.st4 -.sta5bl -.sy2 -.ta4 -.te4 -.ten5an -.th2 -.ti2 -.til4 -.tim5o5 -.ting4 -.tin5k -.ton4a -.to4p -.top5i -.tou5s -.trib5ut -.un1a -.un3ce -.under5 -.un1e -.un5k -.un5o -.un3u -.up3 -.ure3 -.us5a -.ven4de -.ve5ra -.wil5i -.ye4 -4ab. -a5bal -a5ban -abe2 -ab5erd -abi5a -ab5it5ab -ab5lat -ab5o5liz -4abr -ab5rog -ab3ul -a4car -ac5ard -ac5aro -a5ceou -ac1er -a5chet -4a2ci -a3cie -ac1in -a3cio -ac5rob -act5if -ac3ul -ac4um -a2d -ad4din -ad5er. -2adi -a3dia -ad3ica -adi4er -a3dio -a3dit -a5diu -ad4le -ad3ow -ad5ran -ad4su -4adu -a3duc -ad5um -ae4r -aeri4e -a2f -aff4 -a4gab -aga4n -ag5ell -age4o -4ageu -ag1i -4ag4l -ag1n -a2go -3agog -ag3oni -a5guer -ag5ul -a4gy -a3ha -a3he -ah4l -a3ho -ai2 -a5ia -a3ic. -ai5ly -a4i4n -ain5in -ain5o -ait5en -a1j -ak1en -al5ab -al3ad -a4lar -4aldi -2ale -al3end -a4lenti -a5le5o -al1i -al4ia. -ali4e -al5lev -4allic -4alm -a5log. -a4ly. -4alys -5a5lyst -5alyt -3alyz -4ama -am5ab -am3ag -ama5ra -am5asc -a4matis -a4m5ato -am5era -am3ic -am5if -am5ily -am1in -ami4no -a2mo -a5mon -amor5i -amp5en -a2n -an3age -3analy -a3nar -an3arc -anar4i -a3nati -4and -ande4s -an3dis -an1dl -an4dow -a5nee -a3nen -an5est. -a3neu -2ang -ang5ie -an1gl -a4n1ic -a3nies -an3i3f -an4ime -a5nimi -a5nine -an3io -a3nip -an3ish -an3it -a3niu -an4kli -5anniz -ano4 -an5ot -anoth5 -an2sa -an4sco -an4sn -an2sp -ans3po -an4st -an4sur -antal4 -an4tie -4anto -an2tr -an4tw -an3ua -an3ul -a5nur -4ao -apar4 -ap5at -ap5ero -a3pher -4aphi -a4pilla -ap5illar -ap3in -ap3ita -a3pitu -a2pl -apoc5 -ap5ola -apor5i -apos3t -aps5es -a3pu -aque5 -2a2r -ar3act -a5rade -ar5adis -ar3al -a5ramete -aran4g -ara3p -ar4at -a5ratio -ar5ativ -a5rau -ar5av4 -araw4 -arbal4 -ar4chan -ar5dine -ar4dr -ar5eas -a3ree -ar3ent -a5ress -ar4fi -ar4fl -ar1i -ar5ial -ar3ian -a3riet -ar4im -ar5inat -ar3io -ar2iz -ar2mi -ar5o5d -a5roni -a3roo -ar2p -ar3q -arre4 -ar4sa -ar2sh -4as. -as4ab -as3ant -ashi4 -a5sia. -a3sib -a3sic -5a5si4t -ask3i -as4l -a4soc -as5ph -as4sh -as3ten -as1tr -asur5a -a2ta -at3abl -at5ac -at3alo -at5ap -ate5c -at5ech -at3ego -at3en. -at3era -ater5n -a5terna -at3est -at5ev -4ath -ath5em -a5then -at4ho -ath5om -4ati. -a5tia -at5i5b -at1ic -at3if -ation5ar -at3itu -a4tog -a2tom -at5omiz -a4top -a4tos -a1tr -at5rop -at4sk -at4tag -at5te -at4th -a2tu -at5ua -at5ue -at3ul -at3ura -a2ty -au4b -augh3 -au3gu -au4l2 -aun5d -au3r -au5sib -aut5en -au1th -a2va -av3ag -a5van -ave4no -av3era -av5ern -av5ery -av1i -avi4er -av3ig -av5oc -a1vor -3away -aw3i -aw4ly -aws4 -ax4ic -ax4id -ay5al -aye4 -ays4 -azi4er -azz5i -5ba. -bad5ger -ba4ge -bal1a -ban5dag -ban4e -ban3i -barbi5 -bari4a -bas4si -1bat -ba4z -2b1b -b2be -b3ber -bbi4na -4b1d -4be. -beak4 -beat3 -4be2d -be3da -be3de -be3di -be3gi -be5gu -1bel -be1li -be3lo -4be5m -be5nig -be5nu -4bes4 -be3sp -be5str -3bet -bet5iz -be5tr -be3tw -be3w -be5yo -2bf -4b3h -bi2b -bi4d -3bie -bi5en -bi4er -2b3if -1bil -bi3liz -bina5r4 -bin4d -bi5net -bi3ogr -bi5ou -bi2t -3bi3tio -bi3tr -3bit5ua -b5itz -b1j -bk4 -b2l2 -blath5 -b4le. -blen4 -5blesp -b3lis -b4lo -blun4t -4b1m -4b3n -bne5g -3bod -bod3i -bo4e -bol3ic -bom4bi -bon4a -bon5at -3boo -5bor. -4b1ora -bor5d -5bore -5bori -5bos4 -b5ota -both5 -bo4to -bound3 -4bp -4brit -broth3 -2b5s2 -bsor4 -2bt -bt4l -b4to -b3tr -buf4fer -bu4ga -bu3li -bumi4 -bu4n -bunt4i -bu3re -bus5ie -buss4e -5bust -4buta -3butio -b5uto -b1v -4b5w -5by. -bys4 -1ca -cab3in -ca1bl -cach4 -ca5den -4cag4 -2c5ah -ca3lat -cal4la -call5in -4calo -can5d -can4e -can4ic -can5is -can3iz -can4ty -cany4 -ca5per -car5om -cast5er -cas5tig -4casy -ca4th -4cativ -cav5al -c3c -ccha5 -cci4a -ccompa5 -ccon4 -ccou3t -2ce. -4ced. -4ceden -3cei -5cel. -3cell -1cen -3cenc -2cen4e -4ceni -3cent -3cep -ce5ram -4cesa -3cessi -ces5si5b -ces5t -cet4 -c5e4ta -cew4 -2ch -4ch. -4ch3ab -5chanic -ch5a5nis -che2 -cheap3 -4ched -che5lo -3chemi -ch5ene -ch3er. -ch3ers -4ch1in -5chine. -ch5iness -5chini -5chio -3chit -chi2z -3cho2 -ch4ti -1ci -3cia -ci2a5b -cia5r -ci5c -4cier -5cific. -4cii -ci4la -3cili -2cim -2cin -c4ina -3cinat -cin3em -c1ing -c5ing. -5cino -cion4 -4cipe -ci3ph -4cipic -4cista -4cisti -2c1it -cit3iz -5ciz -ck1 -ck3i -1c4l4 -4clar -c5laratio -5clare -cle4m -4clic -clim4 -cly4 -c5n -1co -co5ag -coe2 -2cog -co4gr -coi4 -co3inc -col5i -5colo -col3or -com5er -con4a -c4one -con3g -con5t -co3pa -cop3ic -co4pl -4corb -coro3n -cos4e -cov1 -cove4 -cow5a -coz5e -co5zi -c1q -cras5t -5crat. -5cratic -cre3at -5cred -4c3reta -cre4v -cri2 -cri5f -c4rin -cris4 -5criti -cro4pl -crop5o -cros4e -cru4d -4c3s2 -2c1t -cta4b -ct5ang -c5tant -c2te -c3ter -c4ticu -ctim3i -ctu4r -c4tw -cud5 -c4uf -c4ui -cu5ity -5culi -cul4tis -3cultu -cu2ma -c3ume -cu4mi -3cun -cu3pi -cu5py -cur5a4b -cu5ria -1cus -cuss4i -3c4ut -cu4tie -4c5utiv -4cutr -1cy -cze4 -1d2a -5da. -2d3a4b -dach4 -4daf -2dag -da2m2 -dan3g -dard5 -dark5 -4dary -3dat -4dativ -4dato -5dav4 -dav5e -5day -d1b -d5c -d1d4 -2de. -deaf5 -deb5it -de4bon -decan4 -de4cil -de5com -2d1ed -4dee. -de5if -deli4e -del5i5q -de5lo -d4em -5dem. -3demic -dem5ic. -de5mil -de4mons -demor5 -1den -de4nar -de3no -denti5f -de3nu -de1p -de3pa -depi4 -de2pu -d3eq -d4erh -5derm -dern5iz -der5s -des2 -d2es. -de1sc -de2s5o -des3ti -de3str -de4su -de1t -de2to -de1v -dev3il -4dey -4d1f -d4ga -d3ge4t -dg1i -d2gy -d1h2 -5di. -1d4i3a -dia5b -di4cam -d4ice -3dict -3did -5di3en -d1if -di3ge -di4lato -d1in -1dina -3dine. -5dini -di5niz -1dio -dio5g -di4pl -dir2 -di1re -dirt5i -dis1 -5disi -d4is3t -d2iti -1di1v -d1j -d5k2 -4d5la -3dle. -3dled -3dles. -4dless -2d3lo -4d5lu -2dly -d1m -4d1n4 -1do -3do. -do5de -5doe -2d5of -d4og -do4la -doli4 -do5lor -dom5iz -do3nat -doni4 -doo3d -dop4p -d4or -3dos -4d5out -do4v -3dox -d1p -1dr -drag5on -4drai -dre4 -drea5r -5dren -dri4b -dril4 -dro4p -4drow -5drupli -4dry -2d1s2 -ds4p -d4sw -d4sy -d2th -1du -d1u1a -du2c -d1uca -duc5er -4duct. -4ducts -du5el -du4g -d3ule -dum4be -du4n -4dup -du4pe -d1v -d1w -d2y -5dyn -dy4se -dys5p -e1a4b -e3act -ead1 -ead5ie -ea4ge -ea5ger -ea4l -eal5er -eal3ou -eam3er -e5and -ear3a -ear4c -ear5es -ear4ic -ear4il -ear5k -ear2t -eart3e -ea5sp -e3ass -east3 -ea2t -eat5en -eath3i -e5atif -e4a3tu -ea2v -eav3en -eav5i -eav5o -2e1b -e4bel. -e4bels -e4ben -e4bit -e3br -e4cad -ecan5c -ecca5 -e1ce -ec5essa -ec2i -e4cib -ec5ificat -ec5ifie -ec5ify -ec3im -eci4t -e5cite -e4clam -e4clus -e2col -e4comm -e4compe -e4conc -e2cor -ec3ora -eco5ro -e1cr -e4crem -ec4tan -ec4te -e1cu -e4cul -ec3ula -2e2da -4ed3d -e4d1er -ede4s -4edi -e3dia -ed3ib -ed3ica -ed3im -ed1it -edi5z -4edo -e4dol -edon2 -e4dri -e4dul -ed5ulo -ee2c -eed3i -ee2f -eel3i -ee4ly -ee2m -ee4na -ee4p1 -ee2s4 -eest4 -ee4ty -e5ex -e1f -e4f3ere -1eff -e4fic -5efici -efil4 -e3fine -ef5i5nite -3efit -efor5es -e4fuse. -4egal -eger4 -eg5ib -eg4ic -eg5ing -e5git5 -eg5n -e4go. -e4gos -eg1ul -e5gur -5egy -e1h4 -eher4 -ei2 -e5ic -ei5d -eig2 -ei5gl -e3imb -e3inf -e1ing -e5inst -eir4d -eit3e -ei3th -e5ity -e1j -e4jud -ej5udi -eki4n -ek4la -e1la -e4la. -e4lac -elan4d -el5ativ -e4law -elaxa4 -e3lea -el5ebra -5elec -e4led -el3ega -e5len -e4l1er -e1les -el2f -el2i -e3libe -e4l5ic. -el3ica -e3lier -el5igib -e5lim -e4l3ing -e3lio -e2lis -el5ish -e3liv3 -4ella -el4lab -ello4 -e5loc -el5og -el3op. -el2sh -el4ta -e5lud -el5ug -e4mac -e4mag -e5man -em5ana -em5b -e1me -e2mel -e4met -em3ica -emi4e -em5igra -em1in2 -em5ine -em3i3ni -e4mis -em5ish -e5miss -em3iz -5emniz -emo4g -emoni5o -em3pi -e4mul -em5ula -emu3n -e3my -en5amo -e4nant -ench4er -en3dic -e5nea -e5nee -en3em -en5ero -en5esi -en5est -en3etr -e3new -en5ics -e5nie -e5nil -e3nio -en3ish -en3it -e5niu -5eniz -4enn -4eno -eno4g -e4nos -en3ov -en4sw -ent5age -4enthes -en3ua -en5uf -e3ny. -4en3z -e5of -eo2g -e4oi4 -e3ol -eop3ar -e1or -eo3re -eo5rol -eos4 -e4ot -eo4to -e5out -e5ow -e2pa -e3pai -ep5anc -e5pel -e3pent -ep5etitio -ephe4 -e4pli -e1po -e4prec -ep5reca -e4pred -ep3reh -e3pro -e4prob -ep4sh -ep5ti5b -e4put -ep5uta -e1q -equi3l -e4q3ui3s -er1a -era4b -4erand -er3ar -4erati. -2erb -er4bl -er3ch -er4che -2ere. -e3real -ere5co -ere3in -er5el. -er3emo -er5ena -er5ence -4erene -er3ent -ere4q -er5ess -er3est -eret4 -er1h -er1i -e1ria4 -5erick -e3rien -eri4er -er3ine -e1rio -4erit -er4iu -eri4v -e4riva -er3m4 -er4nis -4ernit -5erniz -er3no -2ero -er5ob -e5roc -ero4r -er1ou -er1s -er3set -ert3er -4ertl -er3tw -4eru -eru4t -5erwau -e1s4a -e4sage. -e4sages -es2c -e2sca -es5can -e3scr -es5cu -e1s2e -e2sec -es5ecr -es5enc -e4sert. -e4serts -e4serva -4esh -e3sha -esh5en -e1si -e2sic -e2sid -es5iden -es5igna -e2s5im -es4i4n -esis4te -esi4u -e5skin -es4mi -e2sol -es3olu -e2son -es5ona -e1sp -es3per -es5pira -es4pre -2ess -es4si4b -estan4 -es3tig -es5tim -4es2to -e3ston -2estr -e5stro -estruc5 -e2sur -es5urr -es4w -eta4b -eten4d -e3teo -ethod3 -et1ic -e5tide -etin4 -eti4no -e5tir -e5titio -et5itiv -4etn -et5ona -e3tra -e3tre -et3ric -et5rif -et3rog -et5ros -et3ua -et5ym -et5z -4eu -e5un -e3up -eu3ro -eus4 -eute4 -euti5l -eu5tr -eva2p5 -e2vas -ev5ast -e5vea -ev3ell -evel3o -e5veng -even4i -ev1er -e5verb -e1vi -ev3id -evi4l -e4vin -evi4v -e5voc -e5vu -e1wa -e4wag -e5wee -e3wh -ewil5 -ew3ing -e3wit -1exp -5eyc -5eye. -eys4 -1fa -fa3bl -fab3r -fa4ce -4fag -fain4 -fall5e -4fa4ma -fam5is -5far -far5th -fa3ta -fa3the -4fato -fault5 -4f5b -4fd -4fe. -feas4 -feath3 -fe4b -4feca -5fect -2fed -fe3li -fe4mo -fen2d -fend5e -fer1 -5ferr -fev4 -4f1f -f4fes -f4fie -f5fin. -f2f5is -f4fly -f2fy -4fh -1fi -fi3a -2f3ic. -4f3ical -f3ican -4ficate -f3icen -fi3cer -fic4i -5ficia -5ficie -4fics -fi3cu -fi5del -fight5 -fil5i -fill5in -4fily -2fin -5fina -fin2d5 -fi2ne -f1in3g -fin4n -fis4ti -f4l2 -f5less -flin4 -flo3re -f2ly5 -4fm -4fn -1fo -5fon -fon4de -fon4t -fo2r -fo5rat -for5ay -fore5t -for4i -fort5a -fos5 -4f5p -fra4t -f5rea -fres5c -fri2 -fril4 -frol5 -2f3s -2ft -f4to -f2ty -3fu -fu5el -4fug -fu4min -fu5ne -fu3ri -fusi4 -fus4s -4futa -1fy -1ga -gaf4 -5gal. -3gali -ga3lo -2gam -ga5met -g5amo -gan5is -ga3niz -gani5za -4gano -gar5n4 -gass4 -gath3 -4gativ -4gaz -g3b -gd4 -2ge. -2ged -geez4 -gel4in -ge5lis -ge5liz -4gely -1gen -ge4nat -ge5niz -4geno -4geny -1geo -ge3om -g4ery -5gesi -geth5 -4geto -ge4ty -ge4v -4g1g2 -g2ge -g3ger -gglu5 -ggo4 -gh3in -gh5out -gh4to -5gi. -1gi4a -gia5r -g1ic -5gicia -g4ico -gien5 -5gies. -gil4 -g3imen -3g4in. -gin5ge -5g4ins -5gio -3gir -gir4l -g3isl -gi4u -5giv -3giz -gl2 -gla4 -glad5i -5glas -1gle -gli4b -g3lig -3glo -glo3r -g1m -g4my -gn4a -g4na. -gnet4t -g1ni -g2nin -g4nio -g1no -g4non -1go -3go. -gob5 -5goe -3g4o4g -go3is -gon2 -4g3o3na -gondo5 -go3ni -5goo -go5riz -gor5ou -5gos. -gov1 -g3p -1gr -4grada -g4rai -gran2 -5graph. -g5rapher -5graphic -4graphy -4gray -gre4n -4gress. -4grit -g4ro -gruf4 -gs2 -g5ste -gth3 -gu4a -3guard -2gue -5gui5t -3gun -3gus -4gu4t -g3w -1gy -2g5y3n -gy5ra -h3ab4l -hach4 -hae4m -hae4t -h5agu -ha3la -hala3m -ha4m -han4ci -han4cy -5hand. -han4g -hang5er -hang5o -h5a5niz -han4k -han4te -hap3l -hap5t -ha3ran -ha5ras -har2d -hard3e -har4le -harp5en -har5ter -has5s -haun4 -5haz -haz3a -h1b -1head -3hear -he4can -h5ecat -h4ed -he5do5 -he3l4i -hel4lis -hel4ly -h5elo -hem4p -he2n -hena4 -hen5at -heo5r -hep5 -h4era -hera3p -her4ba -here5a -h3ern -h5erou -h3ery -h1es -he2s5p -he4t -het4ed -heu4 -h1f -h1h -hi5an -hi4co -high5 -h4il2 -himer4 -h4ina -hion4e -hi4p -hir4l -hi3ro -hir4p -hir4r -his3el -his4s -hith5er -hi2v -4hk -4h1l4 -hlan4 -h2lo -hlo3ri -4h1m -hmet4 -2h1n -h5odiz -h5ods -ho4g -hoge4 -hol5ar -3hol4e -ho4ma -home3 -hon4a -ho5ny -3hood -hoon4 -hor5at -ho5ris -hort3e -ho5ru -hos4e -ho5sen -hos1p -1hous -house3 -hov5el -4h5p -4hr4 -hree5 -hro5niz -hro3po -4h1s2 -h4sh -h4tar -ht1en -ht5es -h4ty -hu4g -hu4min -hun5ke -hun4t -hus3t4 -hu4t -h1w -h4wart -hy3pe -hy3ph -hy2s -2i1a -i2al -iam4 -iam5ete -i2an -4ianc -ian3i -4ian4t -ia5pe -iass4 -i4ativ -ia4tric -i4atu -ibe4 -ib3era -ib5ert -ib5ia -ib3in -ib5it. -ib5ite -i1bl -ib3li -i5bo -i1br -i2b5ri -i5bun -4icam -5icap -4icar -i4car. -i4cara -icas5 -i4cay -iccu4 -4iceo -4ich -2ici -i5cid -ic5ina -i2cip -ic3ipa -i4cly -i2c5oc -4i1cr -5icra -i4cry -ic4te -ictu2 -ic4t3ua -ic3ula -ic4um -ic5uo -i3cur -2id -i4dai -id5anc -id5d -ide3al -ide4s -i2di -id5ian -idi4ar -i5die -id3io -idi5ou -id1it -id5iu -i3dle -i4dom -id3ow -i4dr -i2du -id5uo -2ie4 -ied4e -5ie5ga -ield3 -ien5a4 -ien4e -i5enn -i3enti -i1er. -i3esc -i1est -i3et -4if. -if5ero -iff5en -if4fr -4ific. -i3fie -i3fl -4ift -2ig -iga5b -ig3era -ight3i -4igi -i3gib -ig3il -ig3in -ig3it -i4g4l -i2go -ig3or -ig5ot -i5gre -igu5i -ig1ur -i3h -4i5i4 -i3j -4ik -i1la -il3a4b -i4lade -i2l5am -ila5ra -i3leg -il1er -ilev4 -il5f -il1i -il3ia -il2ib -il3io -il4ist -2ilit -il2iz -ill5ab -4iln -il3oq -il4ty -il5ur -il3v -i4mag -im3age -ima5ry -imenta5r -4imet -im1i -im5ida -imi5le -i5mini -4imit -im4ni -i3mon -i2mu -im3ula -2in. -i4n3au -4inav -incel4 -in3cer -4ind -in5dling -2ine -i3nee -iner4ar -i5ness -4inga -4inge -in5gen -4ingi -in5gling -4ingo -4ingu -2ini -i5ni. -i4nia -in3io -in1is -i5nite. -5initio -in3ity -4ink -4inl -2inn -2i1no -i4no4c -ino4s -i4not -2ins -in3se -insur5a -2int. -2in4th -in1u -i5nus -4iny -2io -4io. -ioge4 -io2gr -i1ol -io4m -ion3at -ion4ery -ion3i -io5ph -ior3i -i4os -io5th -i5oti -io4to -i4our -2ip -ipe4 -iphras4 -ip3i -ip4ic -ip4re4 -ip3ul -i3qua -iq5uef -iq3uid -iq3ui3t -4ir -i1ra -ira4b -i4rac -ird5e -ire4de -i4ref -i4rel4 -i4res -ir5gi -ir1i -iri5de -ir4is -iri3tu -5i5r2iz -ir4min -iro4g -5iron. -ir5ul -2is. -is5ag -is3ar -isas5 -2is1c -is3ch -4ise -is3er -3isf -is5han -is3hon -ish5op -is3ib -isi4d -i5sis -is5itiv -4is4k -islan4 -4isms -i2so -iso5mer -is1p -is2pi -is4py -4is1s -is4sal -issen4 -is4ses -is4ta. -is1te -is1ti -ist4ly -4istral -i2su -is5us -4ita. -ita4bi -i4tag -4ita5m -i3tan -i3tat -2ite -it3era -i5teri -it4es -2ith -i1ti -4itia -4i2tic -it3ica -5i5tick -it3ig -it5ill -i2tim -2itio -4itis -i4tism -i2t5o5m -4iton -i4tram -it5ry -4itt -it3uat -i5tud -it3ul -4itz. -i1u -2iv -iv3ell -iv3en. -i4v3er. -i4vers. -iv5il. -iv5io -iv1it -i5vore -iv3o3ro -i4v3ot -4i5w -ix4o -4iy -4izar -izi4 -5izont -5ja -jac4q -ja4p -1je -jer5s -4jestie -4jesty -jew3 -jo4p -5judg -3ka. -k3ab -k5ag -kais4 -kal4 -k1b -k2ed -1kee -ke4g -ke5li -k3en4d -k1er -kes4 -k3est. -ke4ty -k3f -kh4 -k1i -5ki. -5k2ic -k4ill -kilo5 -k4im -k4in. -kin4de -k5iness -kin4g -ki4p -kis4 -k5ish -kk4 -k1l -4kley -4kly -k1m -k5nes -1k2no -ko5r -kosh4 -k3ou -kro5n -4k1s2 -k4sc -ks4l -k4sy -k5t -k1w -lab3ic -l4abo -laci4 -l4ade -la3dy -lag4n -lam3o -3land -lan4dl -lan5et -lan4te -lar4g -lar3i -las4e -la5tan -4lateli -4lativ -4lav -la4v4a -2l1b -lbin4 -4l1c2 -lce4 -l3ci -2ld -l2de -ld4ere -ld4eri -ldi4 -ld5is -l3dr -l4dri -le2a -le4bi -left5 -5leg. -5legg -le4mat -lem5atic -4len. -3lenc -5lene. -1lent -le3ph -le4pr -lera5b -ler4e -3lerg -3l4eri -l4ero -les2 -le5sco -5lesq -3less -5less. -l3eva -lev4er. -lev4era -lev4ers -3ley -4leye -2lf -l5fr -4l1g4 -l5ga -lgar3 -l4ges -lgo3 -2l3h -li4ag -li2am -liar5iz -li4as -li4ato -li5bi -5licio -li4cor -4lics -4lict. -l4icu -l3icy -l3ida -lid5er -3lidi -lif3er -l4iff -li4fl -5ligate -3ligh -li4gra -3lik -4l4i4l -lim4bl -lim3i -li4mo -l4im4p -l4ina -1l4ine -lin3ea -lin3i -link5er -li5og -4l4iq -lis4p -l1it -l2it. -5litica -l5i5tics -liv3er -l1iz -4lj -lka3 -l3kal -lka4t -l1l -l4law -l2le -l5lea -l3lec -l3leg -l3lel -l3le4n -l3le4t -ll2i -l2lin4 -l5lina -ll4o -lloqui5 -ll5out -l5low -2lm -l5met -lm3ing -l4mod -lmon4 -2l1n2 -3lo. -lob5al -lo4ci -4lof -3logic -l5ogo -3logu -lom3er -5long -lon4i -l3o3niz -lood5 -5lope. -lop3i -l3opm -lora4 -lo4rato -lo5rie -lor5ou -5los. -los5et -5losophiz -5losophy -los4t -lo4ta -loun5d -2lout -4lov -2lp -lpa5b -l3pha -l5phi -lp5ing -l3pit -l4pl -l5pr -4l1r -2l1s2 -l4sc -l2se -l4sie -4lt -lt5ag -ltane5 -l1te -lten4 -ltera4 -lth3i -l5ties. -ltis4 -l1tr -ltu2 -ltur3a -lu5a -lu3br -luch4 -lu3ci -lu3en -luf4 -lu5id -lu4ma -5lumi -l5umn. -5lumnia -lu3o -luo3r -4lup -luss4 -lus3te -1lut -l5ven -l5vet4 -2l1w -1ly -4lya -4lyb -ly5me -ly3no -2lys4 -l5yse -1ma -2mab -ma2ca -ma5chine -ma4cl -mag5in -5magn -2mah -maid5 -4mald -ma3lig -ma5lin -mal4li -mal4ty -5mania -man5is -man3iz -4map -ma5rine. -ma5riz -mar4ly -mar3v -ma5sce -mas4e -mas1t -5mate -math3 -ma3tis -4matiza -4m1b -mba4t5 -m5bil -m4b3ing -mbi4v -4m5c -4me. -2med -4med. -5media -me3die -m5e5dy -me2g -mel5on -mel4t -me2m -mem1o3 -1men -men4a -men5ac -men4de -4mene -men4i -mens4 -mensu5 -3ment -men4te -me5on -m5ersa -2mes -3mesti -me4ta -met3al -me1te -me5thi -m4etr -5metric -me5trie -me3try -me4v -4m1f -2mh -5mi. -mi3a -mid4a -mid4g -mig4 -3milia -m5i5lie -m4ill -min4a -3mind -m5inee -m4ingl -min5gli -m5ingly -min4t -m4inu -miot4 -m2is -mis4er. -mis5l -mis4ti -m5istry -4mith -m2iz -4mk -4m1l -m1m -mma5ry -4m1n -mn4a -m4nin -mn4o -1mo -4mocr -5mocratiz -mo2d1 -mo4go -mois2 -moi5se -4mok -mo5lest -mo3me -mon5et -mon5ge -moni3a -mon4ism -mon4ist -mo3niz -monol4 -mo3ny. -mo2r -4mora. -mos2 -mo5sey -mo3sp -moth3 -m5ouf -3mous -mo2v -4m1p -mpara5 -mpa5rab -mpar5i -m3pet -mphas4 -m2pi -mpi4a -mp5ies -m4p1in -m5pir -mp5is -mpo3ri -mpos5ite -m4pous -mpov5 -mp4tr -m2py -4m3r -4m1s2 -m4sh -m5si -4mt -1mu -mula5r4 -5mult -multi3 -3mum -mun2 -4mup -mu4u -4mw -1na -2n1a2b -n4abu -4nac. -na4ca -n5act -nag5er. -nak4 -na4li -na5lia -4nalt -na5mit -n2an -nanci4 -nan4it -nank4 -nar3c -4nare -nar3i -nar4l -n5arm -n4as -nas4c -nas5ti -n2at -na3tal -nato5miz -n2au -nau3se -3naut -nav4e -4n1b4 -ncar5 -n4ces. -n3cha -n5cheo -n5chil -n3chis -nc1in -nc4it -ncour5a -n1cr -n1cu -n4dai -n5dan -n1de -nd5est. -ndi4b -n5d2if -n1dit -n3diz -n5duc -ndu4r -nd2we -2ne. -n3ear -ne2b -neb3u -ne2c -5neck -2ned -ne4gat -neg5ativ -5nege -ne4la -nel5iz -ne5mi -ne4mo -1nen -4nene -3neo -ne4po -ne2q -n1er -nera5b -n4erar -n2ere -n4er5i -ner4r -1nes -2nes. -4nesp -2nest -4nesw -3netic -ne4v -n5eve -ne4w -n3f -n4gab -n3gel -nge4n4e -n5gere -n3geri -ng5ha -n3gib -ng1in -n5git -n4gla -ngov4 -ng5sh -n1gu -n4gum -n2gy -4n1h4 -nha4 -nhab3 -nhe4 -3n4ia -ni3an -ni4ap -ni3ba -ni4bl -ni4d -ni5di -ni4er -ni2fi -ni5ficat -n5igr -nik4 -n1im -ni3miz -n1in -5nine. -nin4g -ni4o -5nis. -nis4ta -n2it -n4ith -3nitio -n3itor -ni3tr -n1j -4nk2 -n5kero -n3ket -nk3in -n1kl -4n1l -n5m -nme4 -nmet4 -4n1n2 -nne4 -nni3al -nni4v -nob4l -no3ble -n5ocl -4n3o2d -3noe -4nog -noge4 -nois5i -no5l4i -5nologis -3nomic -n5o5miz -no4mo -no3my -no4n -non4ag -non5i -n5oniz -4nop -5nop5o5li -nor5ab -no4rary -4nosc -nos4e -nos5t -no5ta -1nou -3noun -nov3el3 -nowl3 -n1p4 -npi4 -npre4c -n1q -n1r -nru4 -2n1s2 -ns5ab -nsati4 -ns4c -n2se -n4s3es -nsid1 -nsig4 -n2sl -ns3m -n4soc -ns4pe -n5spi -nsta5bl -n1t -nta4b -nter3s -nt2i -n5tib -nti4er -nti2f -n3tine -n4t3ing -nti4p -ntrol5li -nt4s -ntu3me -nu1a -nu4d -nu5en -nuf4fe -n3uin -3nu3it -n4um -nu1me -n5umi -3nu4n -n3uo -nu3tr -n1v2 -n1w4 -nym4 -nyp4 -4nz -n3za -4oa -oad3 -o5a5les -oard3 -oas4e -oast5e -oat5i -ob3a3b -o5bar -obe4l -o1bi -o2bin -ob5ing -o3br -ob3ul -o1ce -och4 -o3chet -ocif3 -o4cil -o4clam -o4cod -oc3rac -oc5ratiz -ocre3 -5ocrit -octor5a -oc3ula -o5cure -od5ded -od3ic -odi3o -o2do4 -odor3 -od5uct. -od5ucts -o4el -o5eng -o3er -oe4ta -o3ev -o2fi -of5ite -ofit4t -o2g5a5r -og5ativ -o4gato -o1ge -o5gene -o5geo -o4ger -o3gie -1o1gis -og3it -o4gl -o5g2ly -3ogniz -o4gro -ogu5i -1ogy -2ogyn -o1h2 -ohab5 -oi2 -oic3es -oi3der -oiff4 -oig4 -oi5let -o3ing -oint5er -o5ism -oi5son -oist5en -oi3ter -o5j -2ok -o3ken -ok5ie -o1la -o4lan -olass4 -ol2d -old1e -ol3er -o3lesc -o3let -ol4fi -ol2i -o3lia -o3lice -ol5id. -o3li4f -o5lil -ol3ing -o5lio -o5lis. -ol3ish -o5lite -o5litio -o5liv -olli4e -ol5ogiz -olo4r -ol5pl -ol2t -ol3ub -ol3ume -ol3un -o5lus -ol2v -o2ly -om5ah -oma5l -om5atiz -om2be -om4bl -o2me -om3ena -om5erse -o4met -om5etry -o3mia -om3ic. -om3ica -o5mid -om1in -o5mini -5ommend -omo4ge -o4mon -om3pi -ompro5 -o2n -on1a -on4ac -o3nan -on1c -3oncil -2ond -on5do -o3nen -on5est -on4gu -on1ic -o3nio -on1is -o5niu -on3key -on4odi -on3omy -on3s -onspi4 -onspir5a -onsu4 -onten4 -on3t4i -ontif5 -on5um -onva5 -oo2 -ood5e -ood5i -oo4k -oop3i -o3ord -oost5 -o2pa -ope5d -op1er -3opera -4operag -2oph -o5phan -o5pher -op3ing -o3pit -o5pon -o4posi -o1pr -op1u -opy5 -o1q -o1ra -o5ra. -o4r3ag -or5aliz -or5ange -ore5a -o5real -or3ei -ore5sh -or5est. -orew4 -or4gu -4o5ria -or3ica -o5ril -or1in -o1rio -or3ity -o3riu -or2mi -orn2e -o5rof -or3oug -or5pe -3orrh -or4se -ors5en -orst4 -or3thi -or3thy -or4ty -o5rum -o1ry -os3al -os2c -os4ce -o3scop -4oscopi -o5scr -os4i4e -os5itiv -os3ito -os3ity -osi4u -os4l -o2so -os4pa -os4po -os2ta -o5stati -os5til -os5tit -o4tan -otele4g -ot3er. -ot5ers -o4tes -4oth -oth5esi -oth3i4 -ot3ic. -ot5ica -o3tice -o3tif -o3tis -oto5s -ou2 -ou3bl -ouch5i -ou5et -ou4l -ounc5er -oun2d -ou5v -ov4en -over4ne -over3s -ov4ert -o3vis -oviti4 -o5v4ol -ow3der -ow3el -ow5est -ow1i -own5i -o4wo -oy1a -1pa -pa4ca -pa4ce -pac4t -p4ad -5pagan -p3agat -p4ai -pain4 -p4al -pan4a -pan3el -pan4ty -pa3ny -pa1p -pa4pu -para5bl -par5age -par5di -3pare -par5el -p4a4ri -par4is -pa2te -pa5ter -5pathic -pa5thy -pa4tric -pav4 -3pay -4p1b -pd4 -4pe. -3pe4a -pear4l -pe2c -2p2ed -3pede -3pedi -pedia4 -ped4ic -p4ee -pee4d -pek4 -pe4la -peli4e -pe4nan -p4enc -pen4th -pe5on -p4era. -pera5bl -p4erag -p4eri -peri5st -per4mal -perme5 -p4ern -per3o -per3ti -pe5ru -per1v -pe2t -pe5ten -pe5tiz -4pf -4pg -4ph. -phar5i -phe3no -ph4er -ph4es. -ph1ic -5phie -ph5ing -5phisti -3phiz -ph2l -3phob -3phone -5phoni -pho4r -4phs -ph3t -5phu -1phy -pi3a -pian4 -pi4cie -pi4cy -p4id -p5ida -pi3de -5pidi -3piec -pi3en -pi4grap -pi3lo -pi2n -p4in. -pind4 -p4ino -3pi1o -pion4 -p3ith -pi5tha -pi2tu -2p3k2 -1p2l2 -3plan -plas5t -pli3a -pli5er -4plig -pli4n -ploi4 -plu4m -plum4b -4p1m -2p3n -po4c -5pod. -po5em -po3et5 -5po4g -poin2 -5point -poly5t -po4ni -po4p -1p4or -po4ry -1pos -pos1s -p4ot -po4ta -5poun -4p1p -ppa5ra -p2pe -p4ped -p5pel -p3pen -p3per -p3pet -ppo5site -pr2 -pray4e -5preci -pre5co -pre3em -pref5ac -pre4la -pre3r -p3rese -3press -pre5ten -pre3v -5pri4e -prin4t3 -pri4s -pris3o -p3roca -prof5it -pro3l -pros3e -pro1t -2p1s2 -p2se -ps4h -p4sib -2p1t -pt5a4b -p2te -p2th -pti3m -ptu4r -p4tw -pub3 -pue4 -puf4 -pul3c -pu4m -pu2n -pur4r -5pus -pu2t -5pute -put3er -pu3tr -put4ted -put4tin -p3w -qu2 -qua5v -2que. -3quer -3quet -2rab -ra3bi -rach4e -r5acl -raf5fi -raf4t -r2ai -ra4lo -ram3et -r2ami -rane5o -ran4ge -r4ani -ra5no -rap3er -3raphy -rar5c -rare4 -rar5ef -4raril -r2as -ration4 -rau4t -ra5vai -rav3el -ra5zie -r1b -r4bab -r4bag -rbi2 -rbi4f -r2bin -r5bine -rb5ing. -rb4o -r1c -r2ce -rcen4 -r3cha -rch4er -r4ci4b -rc4it -rcum3 -r4dal -rd2i -rdi4a -rdi4er -rdin4 -rd3ing -2re. -re1al -re3an -re5arr -5reav -re4aw -r5ebrat -rec5oll -rec5ompe -re4cre -2r2ed -re1de -re3dis -red5it -re4fac -re2fe -re5fer. -re3fi -re4fy -reg3is -re5it -re1li -re5lu -r4en4ta -ren4te -re1o -re5pin -re4posi -re1pu -r1er4 -r4eri -rero4 -re5ru -r4es. -re4spi -ress5ib -res2t -re5stal -re3str -re4ter -re4ti4z -re3tri -reu2 -re5uti -rev2 -re4val -rev3el -r5ev5er. -re5vers -re5vert -re5vil -rev5olu -re4wh -r1f -rfu4 -r4fy -rg2 -rg3er -r3get -r3gic -rgi4n -rg3ing -r5gis -r5git -r1gl -rgo4n -r3gu -rh4 -4rh. -4rhal -ri3a -ria4b -ri4ag -r4ib -rib3a -ric5as -r4ice -4rici -5ricid -ri4cie -r4ico -rid5er -ri3enc -ri3ent -ri1er -ri5et -rig5an -5rigi -ril3iz -5riman -rim5i -3rimo -rim4pe -r2ina -5rina. -rin4d -rin4e -rin4g -ri1o -5riph -riph5e -ri2pl -rip5lic -r4iq -r2is -r4is. -ris4c -r3ish -ris4p -ri3ta3b -r5ited. -rit5er. -rit5ers -rit3ic -ri2tu -rit5ur -riv5el -riv3et -riv3i -r3j -r3ket -rk4le -rk4lin -r1l -rle4 -r2led -r4lig -r4lis -rl5ish -r3lo4 -r1m -rma5c -r2me -r3men -rm5ers -rm3ing -r4ming. -r4mio -r3mit -r4my -r4nar -r3nel -r4ner -r5net -r3ney -r5nic -r1nis4 -r3nit -r3niv -rno4 -r4nou -r3nu -rob3l -r2oc -ro3cr -ro4e -ro1fe -ro5fil -rok2 -ro5ker -5role. -rom5ete -rom4i -rom4p -ron4al -ron4e -ro5n4is -ron4ta -1room -5root -ro3pel -rop3ic -ror3i -ro5ro -ros5per -ros4s -ro4the -ro4ty -ro4va -rov5el -rox5 -r1p -r4pea -r5pent -rp5er. -r3pet -rp4h4 -rp3ing -r3po -r1r4 -rre4c -rre4f -r4reo -rre4st -rri4o -rri4v -rron4 -rros4 -rrys4 -4rs2 -r1sa -rsa5ti -rs4c -r2se -r3sec -rse4cr -rs5er. -rs3es -rse5v2 -r1sh -r5sha -r1si -r4si4b -rson3 -r1sp -r5sw -rtach4 -r4tag -r3teb -rten4d -rte5o -r1ti -rt5ib -rti4d -r4tier -r3tig -rtil3i -rtil4l -r4tily -r4tist -r4tiv -r3tri -rtroph4 -rt4sh -ru3a -ru3e4l -ru3en -ru4gl -ru3in -rum3pl -ru2n -runk5 -run4ty -r5usc -ruti5n -rv4e -rvel4i -r3ven -rv5er. -r5vest -r3vey -r3vic -rvi4v -r3vo -r1w -ry4c -5rynge -ry3t -sa2 -2s1ab -5sack -sac3ri -s3act -5sai -salar4 -sal4m -sa5lo -sal4t -3sanc -san4de -s1ap -sa5ta -5sa3tio -sat3u -sau4 -sa5vor -5saw -4s5b -scan4t5 -sca4p -scav5 -s4ced -4scei -s4ces -sch2 -s4cho -3s4cie -5scin4d -scle5 -s4cli -scof4 -4scopy -scour5a -s1cu -4s5d -4se. -se4a -seas4 -sea5w -se2c3o -3sect -4s4ed -se4d4e -s5edl -se2g -seg3r -5sei -se1le -5self -5selv -4seme -se4mol -sen5at -4senc -sen4d -s5ened -sen5g -s5enin -4sentd -4sentl -sep3a3 -4s1er. -s4erl -ser4o -4servo -s1e4s -se5sh -ses5t -5se5um -5sev -sev3en -sew4i -5sex -4s3f -2s3g -s2h -2sh. -sh1er -5shev -sh1in -sh3io -3ship -shiv5 -sho4 -sh5old -shon3 -shor4 -short5 -4shw -si1b -s5icc -3side. -5sides -5sidi -si5diz -4signa -sil4e -4sily -2s1in -s2ina -5sine. -s3ing -1sio -5sion -sion5a -si2r -sir5a -1sis -3sitio -5siu -1siv -5siz -sk2 -4ske -s3ket -sk5ine -sk5ing -s1l2 -s3lat -s2le -slith5 -2s1m -s3ma -small3 -sman3 -smel4 -s5men -5smith -smol5d4 -s1n4 -1so -so4ce -soft3 -so4lab -sol3d2 -so3lic -5solv -3som -3s4on. -sona4 -son4g -s4op -5sophic -s5ophiz -s5ophy -sor5c -sor5d -4sov -so5vi -2spa -5spai -spa4n -spen4d -2s5peo -2sper -s2phe -3spher -spho5 -spil4 -sp5ing -4spio -s4ply -s4pon -spor4 -4spot -squal4l -s1r -2ss -s1sa -ssas3 -s2s5c -s3sel -s5seng -s4ses. -s5set -s1si -s4sie -ssi4er -ss5ily -s4sl -ss4li -s4sn -sspend4 -ss2t -ssur5a -ss5w -2st. -s2tag -s2tal -stam4i -5stand -s4ta4p -5stat. -s4ted -stern5i -s5tero -ste2w -stew5a -s3the -st2i -s4ti. -s5tia -s1tic -5stick -s4tie -s3tif -st3ing -5stir -s1tle -5stock -stom3a -5stone -s4top -3store -st4r -s4trad -5stratu -s4tray -s4trid -4stry -4st3w -s2ty -1su -su1al -su4b3 -su2g3 -su5is -suit3 -s4ul -su2m -sum3i -su2n -su2r -4sv -sw2 -4swo -s4y -4syc -3syl -syn5o -sy5rin -1ta -3ta. -2tab -ta5bles -5taboliz -4taci -ta5do -4taf4 -tai5lo -ta2l -ta5la -tal5en -tal3i -4talk -tal4lis -ta5log -ta5mo -tan4de -tanta3 -ta5per -ta5pl -tar4a -4tarc -4tare -ta3riz -tas4e -ta5sy -4tatic -ta4tur -taun4 -tav4 -2taw -tax4is -2t1b -4tc -t4ch -tch5et -4t1d -4te. -tead4i -4teat -tece4 -5tect -2t1ed -te5di -1tee -teg4 -te5ger -te5gi -3tel. -teli4 -5tels -te2ma2 -tem3at -3tenan -3tenc -3tend -4tenes -1tent -ten4tag -1teo -te4p -te5pe -ter3c -5ter3d -1teri -ter5ies -ter3is -teri5za -5ternit -ter5v -4tes. -4tess -t3ess. -teth5e -3teu -3tex -4tey -2t1f -4t1g -2th. -than4 -th2e -4thea -th3eas -the5at -the3is -3thet -th5ic. -th5ica -4thil -5think -4thl -th5ode -5thodic -4thoo -thor5it -tho5riz -2ths -1tia -ti4ab -ti4ato -2ti2b -4tick -t4ico -t4ic1u -5tidi -3tien -tif2 -ti5fy -2tig -5tigu -till5in -1tim -4timp -tim5ul -2t1in -t2ina -3tine. -3tini -1tio -ti5oc -tion5ee -5tiq -ti3sa -3tise -tis4m -ti5so -tis4p -5tistica -ti3tl -ti4u -1tiv -tiv4a -1tiz -ti3za -ti3zen -2tl -t5la -tlan4 -3tle. -3tled -3tles. -t5let. -t5lo -4t1m -tme4 -2t1n2 -1to -to3b -to5crat -4todo -2tof -to2gr -to5ic -to2ma -tom4b -to3my -ton4ali -to3nat -4tono -4tony -to2ra -to3rie -tor5iz -tos2 -5tour -4tout -to3war -4t1p -1tra -tra3b -tra5ch -traci4 -trac4it -trac4te -tras4 -tra5ven -trav5es5 -tre5f -tre4m -trem5i -5tria -tri5ces -5tricia -4trics -2trim -tri4v -tro5mi -tron5i -4trony -tro5phe -tro3sp -tro3v -tru5i -trus4 -4t1s2 -t4sc -tsh4 -t4sw -4t3t2 -t4tes -t5to -ttu4 -1tu -tu1a -tu3ar -tu4bi -tud2 -4tue -4tuf4 -5tu3i -3tum -tu4nis -2t3up. -3ture -5turi -tur3is -tur5o -tu5ry -3tus -4tv -tw4 -4t1wa -twis4 -4two -1ty -4tya -2tyl -type3 -ty5ph -4tz -tz4e -4uab -uac4 -ua5na -uan4i -uar5ant -uar2d -uar3i -uar3t -u1at -uav4 -ub4e -u4bel -u3ber -u4bero -u1b4i -u4b5ing -u3ble. -u3ca -uci4b -uc4it -ucle3 -u3cr -u3cu -u4cy -ud5d -ud3er -ud5est -udev4 -u1dic -ud3ied -ud3ies -ud5is -u5dit -u4don -ud4si -u4du -u4ene -uens4 -uen4te -uer4il -3ufa -u3fl -ugh3en -ug5in -2ui2 -uil5iz -ui4n -u1ing -uir4m -uita4 -uiv3 -uiv4er. -u5j -4uk -u1la -ula5b -u5lati -ulch4 -5ulche -ul3der -ul4e -u1len -ul4gi -ul2i -u5lia -ul3ing -ul5ish -ul4lar -ul4li4b -ul4lis -4ul3m -u1l4o -4uls -uls5es -ul1ti -ultra3 -4ultu -u3lu -ul5ul -ul5v -um5ab -um4bi -um4bly -u1mi -u4m3ing -umor5o -um2p -unat4 -u2ne -un4er -u1ni -un4im -u2nin -un5ish -uni3v -un3s4 -un4sw -unt3ab -un4ter. -un4tes -unu4 -un5y -un5z -u4ors -u5os -u1ou -u1pe -uper5s -u5pia -up3ing -u3pl -up3p -upport5 -upt5ib -uptu4 -u1ra -4ura. -u4rag -u4ras -ur4be -urc4 -ur1d -ure5at -ur4fer -ur4fr -u3rif -uri4fic -ur1in -u3rio -u1rit -ur3iz -ur2l -url5ing. -ur4no -uros4 -ur4pe -ur4pi -urs5er -ur5tes -ur3the -urti4 -ur4tie -u3ru -2us -u5sad -u5san -us4ap -usc2 -us3ci -use5a -u5sia -u3sic -us4lin -us1p -us5sl -us5tere -us1tr -u2su -usur4 -uta4b -u3tat -4ute. -4utel -4uten -uten4i -4u1t2i -uti5liz -u3tine -ut3ing -ution5a -u4tis -5u5tiz -u4t1l -ut5of -uto5g -uto5matic -u5ton -u4tou -uts4 -u3u -uu4m -u1v2 -uxu3 -uz4e -1va -5va. -2v1a4b -vac5il -vac3u -vag4 -va4ge -va5lie -val5o -val1u -va5mo -va5niz -va5pi -var5ied -3vat -4ve. -4ved -veg3 -v3el. -vel3li -ve4lo -v4ely -ven3om -v5enue -v4erd -5vere. -v4erel -v3eren -ver5enc -v4eres -ver3ie -vermi4n -3verse -ver3th -v4e2s -4ves. -ves4te -ve4te -vet3er -ve4ty -vi5ali -5vian -5vide. -5vided -4v3iden -5vides -5vidi -v3if -vi5gn -vik4 -2vil -5vilit -v3i3liz -v1in -4vi4na -v2inc -vin5d -4ving -vio3l -v3io4r -vi1ou -vi4p -vi5ro -vis3it -vi3so -vi3su -4viti -vit3r -4vity -3viv -5vo. -voi4 -3vok -vo4la -v5ole -5volt -3volv -vom5i -vor5ab -vori4 -vo4ry -vo4ta -4votee -4vv4 -v4y -w5abl -2wac -wa5ger -wag5o -wait5 -w5al. -wam4 -war4t -was4t -wa1te -wa5ver -w1b -wea5rie -weath3 -wed4n -weet3 -wee5v -wel4l -w1er -west3 -w3ev -whi4 -wi2 -wil2 -will5in -win4de -win4g -wir4 -3wise -with3 -wiz5 -w4k -wl4es -wl3in -w4no -1wo2 -wom1 -wo5ven -w5p -wra4 -wri4 -writa4 -w3sh -ws4l -ws4pe -w5s4t -4wt -wy4 -x1a -xac5e -x4ago -xam3 -x4ap -xas5 -x3c2 -x1e -xe4cuto -x2ed -xer4i -xe5ro -x1h -xhi2 -xhil5 -xhu4 -x3i -xi5a -xi5c -xi5di -x4ime -xi5miz -x3o -x4ob -x3p -xpan4d -xpecto5 -xpe3d -x1t2 -x3ti -x1u -xu3a -xx4 -y5ac -3yar4 -y5at -y1b -y1c -y2ce -yc5er -y3ch -ych4e -ycom4 -ycot4 -y1d -y5ee -y1er -y4erf -yes4 -ye4t -y5gi -4y3h -y1i -y3la -ylla5bl -y3lo -y5lu -ymbol5 -yme4 -ympa3 -yn3chr -yn5d -yn5g -yn5ic -5ynx -y1o4 -yo5d -y4o5g -yom4 -yo5net -y4ons -y4os -y4ped -yper5 -yp3i -y3po -y4poc -yp2ta -y5pu -yra5m -yr5ia -y3ro -yr4r -ys4c -y3s2e -ys3ica -ys3io -3ysis -y4so -yss4 -ys1t -ys3ta -ysur4 -y3thin -yt3ic -y1w -za1 -z5a2b -zar2 -4zb -2ze -ze4n -ze4p -z1er -ze3ro -zet4 -2z1i -z4il -z4is -5zl -4zm -1zo -zo4m -zo5ol -zte4 -4z1z2 -z4zy -} -\def\enhyph{\english}\def\ehyph{\english} -\endinput - diff --git a/macros/ec-plain/enhyphex.tex b/macros/ec-plain/enhyphex.tex deleted file mode 100644 index efc05018d4..0000000000 --- a/macros/ec-plain/enhyphex.tex +++ /dev/null @@ -1,29 +0,0 @@ -% Ascii 7 bits file -% File enhyphex.tex -% English hyphenation exception words. -\message{Enhyphex.tex English exception words.} -\hyphenation{ % Do NOT make any alterations to this list! --- DEK -as-so-ciate -as-so-ciates -dec-li-na-tion -oblig-a-tory -phil-an-thropic -present -presents -project -projects -reci-procity -re-cog-ni-zance -ref-or-ma-tion -ret-ri-bu-tion -ta-ble -} - -% additional exceptions (mjf) -\hyphenation{ -man-u-script -man-u-scripts -equi-sp-a-ced -} -\endinput - diff --git a/macros/ec-plain/eshyph.tex b/macros/ec-plain/eshyph.tex deleted file mode 100644 index f84bacfcf6..0000000000 --- a/macros/ec-plain/eshyph.tex +++ /dev/null @@ -1,114 +0,0 @@ -% File received from Mario Widel at University of Illinois at Chicago. -% Original author unclear. -\patterns{ -a1b a1c a1d a1f a1g a1h a1j a1k a1l a1m a1n - a1p a1q a1r a1s a1t a1v a1w a1x a1y a1z -e1b e1c e1d e1f e1g e1h e1j e1k e1l e1m e1n - e1p e1q e1r e1s e1t e1v e1w e1x e1y e1z -i1b i1c i1d i1f i1g i1h i1j i1k i1l i1m i1n - i1p i1q i1r i1s i1t i1v i1w i1x i1y i1z -o1b o1c o1d o1f o1g o1h o1j o1k o1l o1m o1n - o1p o1q o1r o1s o1t o1v o1w o1x o1y o1z -u1b u1c u1d u1f u1g u1h u1j u1k u1l u1m u1n - u1p u1q u1r u1s u1t u1v u1w u1x u1y u1z -n2s1t n2s1p n2s1c b2s1t b2s1c d2s1c -2b1b 2b1c 2b1d 2b1f 2b1g 2b1h 2b1j 2b1k 2b1m 2b1n - 2b1p 2b1q 2b1s 2b1t 2b1v 2b1w 2b1x 2b1y 2b1z -2c1b 2c1c 2c1d 2c1f 2c1g 2c1j 2c1k 2c1m 2c1n - 2c1p 2c1q 2c1s 2c1t 2c1v 2c1w 2c1x 2c1y 2c1z -2ch1t -2d1b 2d1c 2d1d 2d1f 2d1g 2d1h 2d1j 2d1k 2d1m 2d1n - 2d1p 2d1q 2d1s 2d1t 2d1v 2d1w 2d1x 2d1y 2d1z -2f1b 2f1c 2f1d 2f1f 2f1g 2f1h 2f1j 2f1k 2f1m 2f1n - 2f1p 2f1q 2f1s 2f1t 2f1v 2f1w 2f1x 2f1y 2f1z -2g1b 2g1c 2g1d 2g1f 2g1h 2g1j 2g1k 2g1m 2g1n - 2g1p 2g1q 2g1s 2g1t 2g1v 2g1w 2g1x 2g1y 2g1z -2j1b 2j1c 2j1d 2j1f 2j1g 2j1h 2j1l 2j1m 2j1n - 2j1p 2j1q 2j1r 2j1s 2j1t 2j1v 2j1w -2l1b 2l1c 2l1d 2l1f 2l1g 2l1h 2l1j 2l1k 2l1m 2l1n - 2l1p 2l1q 2l1r 2l1s 2l1t 2l1v 2l1w 2l1x 2l1y 2l1z -2m1b 2m1c 2m1d 2m1f 2m1g 2m1h 2m1j 2m1k 2m1l 2m1m 2m1n - 2m1p 2m1q 2m1r 2m1s 2m1t 2m1v 2m1w 2m1x 2m1y 2m1z -2n1b 2n1c 2n1d 2n1f 2n1g 2n1h 2n1j 2n1k 2n1l 2n1m 2n1n - 2n1p 2n1q 2n1r 2n1s 2n1t 2n1v 2n1w 2n1x 2n1y 2n1z -2p1b 2p1c 2p1d 2p1f 2p1g 2p1j 2p1k 2p1m 2p1n - 2p1p 2p1q 2p1s 2p1t 2p1v 2p1w 2p1x 2p1y 2p1z -2r1b 2r1c 2r1d 2r1f 2r1g 2r1h 2r1j 2r1k 2r1l 2r1m 2r1n - 2r1p 2r1q 2r1s 2r1t 2r1v 2r1w 2r1x 2r1y 2r1z -2s1b 2s1c 2s1d 2s1f 2s1g 2s1h 2s1j 2s1k 2s1l 2s1m 2s1n - 2s1p 2s1q 2s1r 2s1s 2s1t 2s1v 2s1w 2s1x 2s1y 2s1z -2t1b 2t1c 2t1d 2t1f 2t1g 2t1h 2t1j 2t1k 2t1m 2t1n - 2t1p 2t1q 2t1s 2t1t 2t1v 2t1w 2t1x 2t1y 2t1z -2x1b 2x1c 2x1d 2x1f 2x1g 2x1h 2x1j 2x1k 2x1l 2x1m 2x1n - 2x1p 2x1q 2x1r 2x1s 2x1t 2x1v 2x1w 2x1y 2x1z -2y1b 2y1c 2y1d 2y1f 2y1g 2y1h 2y1j 2y1k 2y1l 2y1m 2y1n - 2y1p 2y1q 2y1r 2y1s 2y1t 2y1v 2y1w 2y1x 2y1z -2z1b 2z1c 2z1d 2z1f 2z1g 2z1h 2z1j 2z1k 2z1l 2z1m 2z1n - 2z1p 2z1q 2z1r 2z1s 2z1t 2z1v 2z1w 2z1x -.m2n .p2s .p2t -.a2 .e2 .i2 .o2 .u2 -2a. 2b. 2c. 2d. 2e. 2f. 2g. 2h. 2i. 2j. 2k. 2l. 2m. - 2n. 2o. 2p. 2r. 2s. 2t. 2u. 2v. 2w. 2x. 2y. 2z. -2caca. 2cacas. -2caga. 2cagas. -2cola. 2colas. -2culo. 2culos. -2cular. -2loco. 2locos. 2loca. 2locas. -2moco. 2mocos. -2mula. 2mulas. -2pedo. 2pedos. 2peda. 2pedas. -2pito. 2pitos. -2puto. 2putos. 2puta. 2putas. -.caca2 -a1a2 e1e2 i1i2 o1o2 u1u2 -.de2s1a2 .de2s1e2 .de2s1i2 .de2s1o2 .de2s1u2 -.in1a2 .in1e2 .in1i2 .in1o2 .in1u2 -.co1a2 .co1e2 .co1i2 .co1o2 .co1u2 -.re1a2 .re1e2 .re1i2 .re1o2 .re1u2 -de3s2ea -in2i3ci -} - -%.su2b1a2 .su2b1e2 .su2b1i2 .su2b1o2 .su2b1u2 - -\hyphenation{ -arz-obis-po -coi-to coa-hui-la -de-sa-lar -de-sa-li-na-do-ra -de-seo de-ser-tar -de-ser-tor -de-ser-ti-co -de-si-de-ra-tum -de-si-dia -de-si-dio-so -de-sier-to -de-sig-nar -de-sig-na-cion -de-sig-nio -de-so-la-dor -de-so-la-cion -de-sas-tre -hard-ware -ino-cuo -mi-cro-sco-pio -ohm-me-tro -pe-nin-su-la -post-o-pe-ra-to-rio -sacer-do-te -soft-ware -sub-acua-ti-co -sub-al-ge-bra -sub-al-pi-no -sub-a-rren-dar -sub-al-ter-no -sub-in-di-ce -sub-ins-pec-tor -sub-in-ten-den-te -sub-ur-ba-no -sub-u-ti-li-zar -tungs-te-no -} - -\endinput diff --git a/macros/ec-plain/exmi.mf b/macros/ec-plain/exmi.mf deleted file mode 100644 index c7fdc1bfd8..0000000000 --- a/macros/ec-plain/exmi.mf +++ /dev/null @@ -1,14 +0,0 @@ -% Computer Modern Math Italic 10 point -if unknown cmbase: input cmbase fi - -font_identifier:="EXMI"; font_size ###pt#; - -input dymi### ; - -input ecmathit ; % switch to the driver file - -input dybx### ; - -input ecbxmath ; - -end diff --git a/macros/ec-plain/exmi10.mf b/macros/ec-plain/exmi10.mf deleted file mode 100644 index 4d4506a6d0..0000000000 --- a/macros/ec-plain/exmi10.mf +++ /dev/null @@ -1,14 +0,0 @@ -% Computer Modern Math Italic 10 point -if unknown cmbase: input cmbase fi - -font_identifier:="EXMI"; font_size 10pt#; - -input dymi10 ; - -input ecmathit ; % switch to the driver file - -input dybx10 ; - -input ecbxmath ; - -end diff --git a/macros/ec-plain/exmi10.tfm b/macros/ec-plain/exmi10.tfm Binary files differdeleted file mode 100644 index 83e8cf5803..0000000000 --- a/macros/ec-plain/exmi10.tfm +++ /dev/null diff --git a/macros/ec-plain/exmi12.mf b/macros/ec-plain/exmi12.mf deleted file mode 100644 index 5b097b0685..0000000000 --- a/macros/ec-plain/exmi12.mf +++ /dev/null @@ -1,14 +0,0 @@ -% Computer Modern Math Italic 10 point -if unknown cmbase: input cmbase fi - -font_identifier:="EXMI"; font_size 12pt#; - -input dymi12 ; - -input ecmathit ; % switch to the driver file - -input dybx12 ; - -input ecbxmath ; - -end diff --git a/macros/ec-plain/exmi12.tfm b/macros/ec-plain/exmi12.tfm Binary files differdeleted file mode 100644 index 22d6adab78..0000000000 --- a/macros/ec-plain/exmi12.tfm +++ /dev/null diff --git a/macros/ec-plain/exmi5.mf b/macros/ec-plain/exmi5.mf deleted file mode 100644 index 179d35e15c..0000000000 --- a/macros/ec-plain/exmi5.mf +++ /dev/null @@ -1,14 +0,0 @@ -% Computer Modern Math Italic 10 point -if unknown cmbase: input cmbase fi - -font_identifier:="EXMI"; font_size 5pt#; - -input dymi5 ; - -input ecmathit ; % switch to the driver file - -input dybx5 ; - -input ecbxmath ; - -end diff --git a/macros/ec-plain/exmi5.tfm b/macros/ec-plain/exmi5.tfm Binary files differdeleted file mode 100644 index 86d355b82a..0000000000 --- a/macros/ec-plain/exmi5.tfm +++ /dev/null diff --git a/macros/ec-plain/exmi6.mf b/macros/ec-plain/exmi6.mf deleted file mode 100644 index bb91119739..0000000000 --- a/macros/ec-plain/exmi6.mf +++ /dev/null @@ -1,14 +0,0 @@ -% Computer Modern Math Italic 10 point -if unknown cmbase: input cmbase fi - -font_identifier:="EXMI"; font_size 6pt#; - -input dymi6 ; - -input ecmathit ; % switch to the driver file - -input dybx6 ; - -input ecbxmath ; - -end diff --git a/macros/ec-plain/exmi6.tfm b/macros/ec-plain/exmi6.tfm Binary files differdeleted file mode 100644 index a3c3eb1271..0000000000 --- a/macros/ec-plain/exmi6.tfm +++ /dev/null diff --git a/macros/ec-plain/exmi7.mf b/macros/ec-plain/exmi7.mf deleted file mode 100644 index 238b4dbe8b..0000000000 --- a/macros/ec-plain/exmi7.mf +++ /dev/null @@ -1,14 +0,0 @@ -% Computer Modern Math Italic 10 point -if unknown cmbase: input cmbase fi - -font_identifier:="EXMI"; font_size 7pt#; - -input dymi7 ; - -input ecmathit ; % switch to the driver file - -input dybx7 ; - -input ecbxmath ; - -end diff --git a/macros/ec-plain/exmi7.tfm b/macros/ec-plain/exmi7.tfm Binary files differdeleted file mode 100644 index 1bf9c053bc..0000000000 --- a/macros/ec-plain/exmi7.tfm +++ /dev/null diff --git a/macros/ec-plain/exmi8.mf b/macros/ec-plain/exmi8.mf deleted file mode 100644 index 8ffd90c684..0000000000 --- a/macros/ec-plain/exmi8.mf +++ /dev/null @@ -1,14 +0,0 @@ -% Computer Modern Math Italic 10 point -if unknown cmbase: input cmbase fi - -font_identifier:="EXMI"; font_size 8pt#; - -input dymi8 ; - -input ecmathit ; % switch to the driver file - -input dybx8 ; - -input ecbxmath ; - -end diff --git a/macros/ec-plain/exmi8.tfm b/macros/ec-plain/exmi8.tfm Binary files differdeleted file mode 100644 index 5fe39fb05b..0000000000 --- a/macros/ec-plain/exmi8.tfm +++ /dev/null diff --git a/macros/ec-plain/exmi9.mf b/macros/ec-plain/exmi9.mf deleted file mode 100644 index 04a3675896..0000000000 --- a/macros/ec-plain/exmi9.mf +++ /dev/null @@ -1,14 +0,0 @@ -% Computer Modern Math Italic 10 point -if unknown cmbase: input cmbase fi - -font_identifier:="EXMI"; font_size 9pt#; - -input dymi9 ; - -input ecmathit ; % switch to the driver file - -input dybx9 ; - -input ecbxmath ; - -end diff --git a/macros/ec-plain/exmi9.tfm b/macros/ec-plain/exmi9.tfm Binary files differdeleted file mode 100644 index 066657adc3..0000000000 --- a/macros/ec-plain/exmi9.tfm +++ /dev/null diff --git a/macros/ec-plain/f8hyph1.tex b/macros/ec-plain/f8hyph1.tex deleted file mode 100644 index cb19b8714f..0000000000 --- a/macros/ec-plain/f8hyph1.tex +++ /dev/null @@ -1,1332 +0,0 @@ -% f8hyph1.tex % French hyphenation patterns (8-bit T1 encoding) -\message{f8hyph1.tex french hyphenation patterns. 8-bit T1 encoding (V2.0) updated 31/05/2002 by D. Taupin} -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% *BEFORE* using this file *PLEASE* run checksum on it: % -% checksum -v f8hyph.tex % -% to make sure that it hasn't been damaged. % -% Then if you notice anything wrong in french hyphenation please report to % -% Daniel Flipo and Bernard Gaulle at the email address: cesure-l@ens.fr % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% checksum = "57304 1329 2321 30022" -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%% The most famous good guys who worked hard to obtain something usable. -% Jacques Desarmenien, Universite de Strasbourg : -% - << how to run TeX in a French environment: hyphenation, fonts, -% typography. >> in Tugboat, 5 (1984) 91-102. and TeX85 conference -% - << La division par ordinateur des mots francais : -% application a TeX >> in TSI vol. 5 No 4, 1986 (C) AFCET- -% Gauthier-Villars -% Norman Buckle, UQAH (nb; many additions) -% Michael Ferguson, INRS-Telecommunications (mjf) June 1988 -% Justin Bur, Universite de Montreal (jbb; checked against original list) -% all patterns including apostrophe missing from nb list -% after that, GUTenberg and specially Daniel Flipo and Bernard Gaulle -% did their best effort to improve the list of patterns. -\begingroup -%%%%%%% Adaptation to T1 encoding by Yannis Haralambous : -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Villeneuve d'Ascq 10/7/91 -% unused \catcode(s) and \uccode(s) removed --bg 29/05/92 -% reset \catcode(s) to 11 (these might be active characters) --bg 14/10/92 -\catcode`\^^e0=11\lccode`\^^e0=`\^^e0 % \`a -\catcode`\^^e2=11\lccode`\^^e2=`\^^e2 % \^a -\catcode`\^^e7=11\lccode`\^^e7=`\^^e7 % \c{c} -\catcode`\^^e9=11\lccode`\^^e9=`\^^e9 % \'e -\catcode`\^^e8=11\lccode`\^^e8=`\^^e8 % \`e -\catcode`\^^ea=11\lccode`\^^ea=`\^^ea % \^e -\catcode`\^^eb=11\lccode`\^^eb=`\^^eb % \"e -\catcode`\^^ee=11\lccode`\^^ee=`\^^ee % \^\i{} -\catcode`\^^ef=11\lccode`\^^ef=`\^^ef % \"\i{} -\catcode`\^^f4=11\lccode`\^^f4=`\^^f4 % \^o -\catcode`\^^f6=11\lccode`\^^f6=`\^^f6 % \"o -\catcode`\^^fb=11\lccode`\^^fb=`\^^fb % \^u -\catcode`\^^f7=11\lccode`\^^f7=`\^^f7 % \oe{} -\lccode`\'=`\' -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% The following is the common part produced automatically from f7hyph.tex -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\patterns{ -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%* -2'2 -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%a -.a4 -'a4 -.^^e24 -'^^e24 -ab2h % df-bg 1998/02/07 for abhorrer - .ab3r^^e9a - 'ab3r^^e9a -ad2h % df-bg 1998/02/07 for adh\`esion & co - a1^^e82dre - .ae3s4ch - 'ae3s4ch - 1alcool - a2l1algi - .amino1a2c - 'amino1a2c - .ana3s4tr - 'ana3s4tr - 1a2nesth^^e9si - .anti1a2 - 'anti1a2 - .anti1e2 - 'anti1e2 - .anti1^^e92 - .anti2enne - 'anti2enne - 'anti1^^e92 - .anti1s2 - 'anti1s2 - .apo2s3ta - 'apo2s3ta - apo2s3tr - archi1^^e92pis - .as2ta - 'as2ta - a2s3tro -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%b -1ba -1b^^e2 - .bai2se3main % hyphen disappeared from french 5/2/94 -1be -1b^^e9 -1b^^e8 -1b^^ea -4be. -4bes. -2bent. % mute syllable: tombent (df) 22/02/94 -1bi -1b^^ee - .bi1a2c - .bi1a2t % like .tri1a2t for tri-athlon bg 12/27/93 - .bi1au - .bio1a2 - .bi2s1a2 - .bi1u2 -1b2l -4ble. -4bles. -2blent. % mute syllable: troublent (df) 28/02/94 -1bo -1b^^f4 -1b2r -4bre. -4bres. -2brent. % mute syllable: palabrent (df) 28/02/94 -1bu -1b^^fb -1by -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%c -1^^e7 -1ca -1c^^e2 -ca3ou3t2 % pour caoutchou... added 3/1/94 df-bg -1ce -1c^^e9 -1c^^e8 -1c^^ea -4ce. -4ces. -% words ending with -cent (df) 22/02/94 - 2cent. - ja3cent. - ac3cent. - ^^e93cent. - munifi3cent. - r^^e9ti3cent. -privatdo3cent. - inno3cent. - es3cent. - acquies4cent. - is3cent. - immis4cent. -% -.ch4 -1c2h -4ch. -2chb -4che. -4ches. -2chent. % mute syllable: touchent (df) 22/02/94 - .ch^^e82vre3feuille % hyphen disappeared from french 5/2/94 -2chg -ch2l -4chle. -4chles. - chlo2r3a2c - chlo2r3^^e92t -2chm -2chn -2chp -ch2r -4chre. -4chres. -2chs -2cht -2chw -1ci -1c^^ee - .ci2s1alp -1c2k -4ck. -2ckb -4cke. -4ckes. -2ckent. % mute syllable: stockent (df) 22/02/94 -2ckf -2ckg -2ck3h -2ckp -2cks -2ckt -1c2l -4cle. -4cles. -2clent. % mute syllable: encerclent (df) 28/02/94 -1co -1c^^f4 - co1acc - co1acq - co1a2d - co1ap - co1ar - co1assoc - co1assur - co1au - co1ax -1c^^f7 - co1^^e92 - co1ef - co1en - co1ex - .con4 % missing from nb list - .cons4 % missing from nb list - .contre1s2c - .contre3ma^^eetre % hyphen disappeared from french 5/2/94 - co2nurb - .co1o2 - .co2o3lie -1c2r -4cre. -4cres. -2crent. % mute syllable: massacrent (df) 28/02/94 -1cu -1c^^fb -1cy -.cul4 % -- as .con4 .cons4 (march 92) -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%d -1d' -1da -1d^^e2 - .dacryo1a2 -d1d2h -1de -1d^^e9 -1d^^e8 -1d^^ea -4de. -4des. -% words ending with -dent (df) 22/02/94 - 2dent. -d^^e9ca3dent. - ^^e93dent. - cci3dent. - inci3dent. - confi3dent. - tri3dent. - dissi3dent. - chien3dent. - .ar3dent. - impu3dent. - pru3dent. -% - .d^^e91a2 - .d^^e91io - .d^^e91o2 - .d^^e92s % originaly in JD file - %.d^^e92s1a2 removed 09/17/92 because wrong for the - % original JD 500 words test - .d^^e93s2a3cr - .d^^e9s2a3m % .d^^e9s2a2mi introduced 09/17/92 bec. i - % can't see why d^^e9samidonner ran in JD. - % Moved to .d^^e9s2a3m df 12/27/93. - .d^^e93s2a3tell - .d^^e93s2astr - .d^^e93s2c % 1 moved 3 due to .d^^e92s 09/17/92 - %.d^^e92s1e2 removed 09/17/92 because wrong for the - % original JD 500 words test - .d^^e92s1^^e92 - .d^^e93s2^^e93gr - .d^^e93s2ensib - .d^^e93s2ert - .d^^e93s2exu - %.d^^e92s3h removed 09/17/92 because wrong for the - % original JD 500 words test - .d^^e92s1i2 - .d^^e93s2i3d - .d^^e93s2i3gn - .d^^e93s2i3li - .d^^e93s2i3nen - .d^^e93s2invo - .d^^e93s2i3r - .d^^e93s2ist - %.d^^e92s1o2 removed 09/17/92 because wrong for the - % original JD 500 words test - .d^^e93s2o3d^^e9 - .d^^e92s1^^f70 % final zero essential to terminate cs - .d^^e93s2o3l - .d^^e93s2o3pil - .d^^e93s2orm - .d^^e93s2orp - .d^^e93s2oufr - .d^^e93s2p % 1 moved 3 due to .d^^e92s 09/17/92 - .d^^e93s2t % 1 moved 3 due to .d^^e92s 09/17/92 - .d^^e92s1u2n - 3d2hal - 3d2houd -1di -1d^^ee - di2s3cop - .di1a2c^^e9 - .di1a2cid - dia2g3n - .di1ald - .di1a2mi - .di1a2tom - .di1e2n - .di2s3h -2dlent. % mute syllable: jodlent (df) 28/02/94 -1do -1d^^f4 -1d2r -4dre. -4dres. -2drent. % mute syllable: engendrent (df) 28/02/94 -d1s2 -1du -1d^^fb -1dy - .dy2s3 - .dy2s1a2 - .dy2s1i2 - .dy2s1o2 % missing from nb list - .dy2s1u2 -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%e -.e4 -'e4 -.^^ea4 -'^^ea4 -.^^e94 -'^^e94 -.^^e84 -'^^e84 -^^e9ed2hi % df-bg 1998/02/07 for r\'edhibitoire - 1^^e92drie - 1^^e92drique - 1^^e92lectr - 1^^e92l^^e9ment - .en1a2 - 'en1a2 - 1^^e92nerg - e2n1i2vr - .en1o2 - 'en1o2 - ^^e9pi2s3cop - ^^e9pi3s4cope - e2s3cop - .eu2r1a2 - 'eu2r1a2 - eu1s2tat - extra1 - extra2c - extra2i -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%f -1fa -1f^^e2 -1fe -1f^^e9 -1f^^e8 -1f^^ea -4fe. -4fes. -2fent. % mute syllable: agrafent chauffent (df) 22/02/94 -% -1fi -1f^^ee -1f2l -4fle. -4fles. -2flent. % mute syllable: gonflent (df) 28/02/94 -1fo -1f^^f4 -1f2r -4fre. -4fres. -2frent. % mute syllable: balafrent (df) 28/02/94 -f1s2 -1fu -1f^^fb -1fy -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%g -1ga -1g^^e2 -1ge -1g^^e9 -1g^^e8 -1g^^ea -4ge. -4ges. -% words ending with -gent (df) 22/02/94 - 2gent. - r^^e93gent. - entre3gent. - indi3gent. - dili3gent. -intelli3gent. - indul3gent. - tan3gent. - rin3gent. - contin3gent. - .ar3gent. - 'ar3gent. - ser3gent. - ter3gent. -r^^e9sur3gent. -% -1g2ha -1g2he -1g2hi -1g2ho -1g2hy -1gi -1g^^ee -1g2l -4gle. -4gles. -2glent. % mute syllable: meuglent (df) 28/02/94 - 1g2n -.sta2g3n - wa2g3n -4gne. -4gnes. -2gnent. % mute syllable: accompagnent (df) 28/02/94 -1go -1g^^f4 -1g2r -4gre. -4gres. -2grent. % mute syllable: immigrent (df) 28/02/94 -1gu -1g^^fb -g1s2 -4gue. -4gues. -% words ending with -guent (df) 22/02/94 - 2guent. -.on3guent. -'on3guent. -% -1gy -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%h -1ha -1h^^e2 -1he -1h^^e9 -1h^^e8 -1h^^ea - h^^e9mi1^^e9 - h^^e9mo1p2t -4he. -4hes. -1hi -1h^^ee -1ho -1h^^f4 -1hu -1h^^fb -1hy - hypera2 - hypere2 - hyper^^e92 - hyperi2 - hypero2 - hypers2 - hype4r1 - hyperu2 - hypo1a2 - hypo1e2 % missing from nb list - hypo1^^e92 - hypo1i2 - hypo1o2 - hypo1s2 - hypo1u2 -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%i -.i4 -'i4 -.^^ee4 -'^^ee4 - i1algi - i1arthr - i1^^e82dre -% ill patterns missing from nb list - il2l - cil3l - rcil4l - ucil4l - vacil4l - gil3l - hil3l - lil3l - l3lion - mil3l - mil4let -^^e9mil4l - semil4l - rmil4l - armil5l - capil3l - papil3la - papil3le - papil3li - papil3lom - pupil3l - piril3l - thril3l - cyril3l - ibril3l - pusil3l - .stil3l -distil3l -instil3l -fritil3l -boutil3l - vanil3lin - vanil3lis - vil3l - avil4l -chevil4l - uevil4l - uvil4l - xil3l -% end of ill patterns - 1informat % missing from nb list - .in1a2 - 'in1a2 - .in2a3nit - 'in2a3nit - .in2augur - 'in2augur - .in1e2 - 'in1e2 - .in1^^e92 - 'in1^^e92 - .in2effab % missing from nb list - 'in2effab - .in2^^e93lucta - 'in2^^e93lucta - .in2^^e93narra - 'in2^^e93narra - .in2ept - 'in2ept - .in2er - 'in2er - .in2exora % missing from nb list - 'in2exora - .in1i2 - 'in1i2 - .in2i3miti - 'in2i3miti - .in2i3q - 'in2i3q - .in2i3t - 'in2i3t - .in1o2 - 'in1o2 - .in2o3cul - 'in2o3cul - .in2ond - 'in2ond - .in1s2tab - 'in1s2tab - 'inte4r3 - .intera2 - 'intera2 - .intere2 - 'intere2 - .inter^^e92 - 'inter^^e92 - .interi2 - 'interi2 - .intero2 - 'intero2 - .inte4r3 - .interu2 - 'interu2 - .inters2 - 'inters2 - .in1u2 - 'in1u2 - .in2uit - 'in2uit - .in2u3l - 'in2u3l - io1a2ct - i1oxy - i1s2tat -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%j -1j -2jk -4je. -4jes. -2jent. % mute syllable: gal^^e8jent (df) 22/02/94 -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%k -1ka -1k^^e2 -1ke -1k^^e9 -1k^^e8 -1k^^ea -4ke. -4kes. -2kent. % mute syllable: jerkent (df) 22/02/94 -1k2h -4kh. -.kh4 -1ki -1k^^ee -1ko -1k^^f4 -1k2r -1ku -1k^^fb -1ky -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%l -1la -1l^^e2 -1l^^e0 - la2w3re -1le -1l^^e9 -1l^^e8 -1l^^ea -4le. -4les. -% words ending with -lent (df) 22/02/94 - 2lent. - .ta3lent. - iva3lent. -^^e9quiva4lent. - monova3lent. - polyva3lent. - re3lent. - .do3lent. - indo3lent. - inso3lent. - turbu3lent. - succu3lent. - f^^e9cu3lent. - trucu3lent. - opu3lent. - corpu3lent. - ru3lent. - sporu4lent. -% -1li -1l^^ee -1lo -1l^^f4 -l1s2t -1lu -1l^^fb -1ly -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%m -1ma -1m^^e2 - .ma2c3k - .macro1s2c - .ma2l1a2dres - .ma2l1a2dro - .ma2l1ais^^e9 - .ma2l1ap - .ma2l1a2v - .ma2l1en - .ma2l1int - .ma2l1oc - .ma2l1o2d - .ma2r1x % nb (jbb: ?) -1me -1m^^e9 -1m^^e8 -1m^^ea - .m^^e92g1oh - .m^^e92sa % missing from nb list - .m^^e93san % missing from nb list - .m^^e92s1es - .m^^e92s1i - .m^^e92s1u2s - .m^^e9ta1s2ta -4me. -4mes. -% words ending with -ment (df) 22/02/94 - ^^e22ment. - da2ment. - fa2ment. - amalga2ment. - cla2ment. - ra2ment. -temp^^e9ra3ment. - ta2ment. - testa3ment. - qua2ment. - ^^e82ment. - car^^ea2ment. - diaphrag2ment. - ryth2ment. - ai2ment. - rai3ment. - ab^^ee2ment. - ^^e9ci2ment. - vidi2ment. - subli2ment. - ^^e9li2ment. - reli2ment. - mi2ment. - ani2ment. - veni2ment. - ri2ment. - d^^e9tri3ment. - nutri3ment. - inti2ment. - esti2ment. - l2ment. - flam2ment. - gram2ment. - .gem2ment. - om2ment. - .com3ment. - ^^f42ment. - slalo2ment. - chro2ment. - to2ment. - ar2ment. - .sar3ment. - er2ment. - antifer3ment. - .ser3ment. - fir2ment. - or2ment. - as2ment. - au2ment. - ^^e9cu2ment. - fu2ment. - hu2ment. - fichu3ment. - llu2ment. - plu2ment. - bou2ment. - bru2ment. - su2ment. - tu2ment. -% -1mi -1m^^ee - .milli1am - 1m2n^^e9mo - 1m2n^^e8s - 1m2n^^e9si -1mo -1m^^f4 -1m^^f70 % final zero essential to terminate cs - .mono1a2 - .mono1e2 - .mono1^^e92 - .mono1i2 - .mono1^^ef2d^^e9 - .mono1o2 - .mono1u2 - .mono1s2 - mon2t3r^^e9al % missing from nb list -m1s2 -1mu -1m^^fb -1my - moye2n1^^e22g -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%n -1na -1n^^e2 -1ne -1n^^e9 -1n^^e8 -1n^^ea -4ne. -4nes. -% words ending with -nent (df) 22/02/94 - 2nent. % fric-tionnent - syllable muette - bg 27/12/93 - r^^e9ma3nent. - imma3nent. - perma3nent. - .^^e9mi3nent. -pr^^e9^^e9mi3nent. - pro^^e9mi3nent. - sur^^e9mi3nent. - immi3nent. - conti3nent. - perti3nent. - absti3nent. -% -1ni -1n^^ee -1no -1n^^f4 -1n^^f70 % final zero essential to terminate cs - .no2n1obs -1nu -1n^^fb - n3s2at. - n3s2ats. -n1x -1ny -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%o -.o4 -'o4 -'^^f44 -.^^f44 -%'^^f62 % mjf % deleted 3/1/94 df-bg - o2b3long - 1octet % missing from nb list - o1d2l - o1^^e82dre - o1ioni - ombud2s3 - omni1s2 - o1s2tas - o1s2tat - o1s2t^^e9ro - o1s2tim - o1s2tom - o1s2trad - o1s2tratu - o1s2triction - .oua1ou - 'oua1ou - .ovi1s2c - 'ovi1s2c - oxy1a2 -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%p -1pa -1p^^e2 - pal^^e9o1^^e92 - .pa2n1a2f - .pa2n1a2m^^e9 - .pa2n1a2ra - .pa2n1is - .pa2n1o2ph - .pa2n1opt - .pa2r1a2che - .pa2r1a2ch^^e8 - .para1s2 - .pa2r3h^^e9 -1pe -1p^^e9 -1p^^e8 -1p^^ea -4pe. -4pes. -% words ending with -pent (df) 22/02/94 - 2pent. - re3pent. -.ar3pent. -'ar3pent. -ser3pent. -% - .pen2ta % pent- or penta- but never pen-ta bg 12/27/93 - per3h - p^^e92nul % p^^e92n1ul moved back 09/17/92 to JD def. - .pe4r - .per1a2 - .per1e2 - .per1^^e92 - .per1i2 - .per1o2 - .per1u2 - p^^e91r2^^e92q % 2r1 moved 09/17/92 to 1r2(it was a typo) - .p^^e9ri1os - .p^^e9ri1s2 - .p^^e9ri2s3s - .p^^e9ri2s3ta - .p^^e9ri1u2 -1p2h -.ph4 -4ph. - .phalan3s2t -4phe. -4phes. -2phent. % mute syllable: triomphent (df) 22/02/94 -ph2l -4phle. -4phles. -2phn - photo1s2 -ph2r -4phre. -4phres. -2phs -2pht - 3ph2tal^^e9 - 3ph2tis -%%%% Here is an example of a pb involving phonetic and etymologic patterns 5/94 -%%%% .phyto3ph2 % originaly, but wrong for phy-toph-thora 9/92 -%%%% .phy2topha % for -pharmacie but wrong for phyto-biol.. 5/94 -1pi -1p^^ee -1p2l -4ple. -4ples. -2plent. % mute syllable: accouplent (df) 28/02/94 - .pluri1a - 1p2n^^e9 - 1p2neu -1po -1p^^f4 - po1astre - poly1a2 - poly1e2 - poly1^^e92 - poly1^^e82 - poly1i2 - poly1o2 - poly1s2 - poly1u2 - .pon2tet % JD hypenated it asis 09/17/92, exception - .pos2t3h - .pos2t1in - .pos2t1o2 - .pos2t3r - .post1s2 -1p2r -4pre. -4pres. -2prent. % mute syllable: empourprent (df) 28/02/94 - .pr^^e91a2 - .pr^^e92a3la % missing from nb list - .pr^^e92au - .pr^^e91^^e92 - .pr^^e91e2 - .pr^^e91i2 - .pr^^e91o2 - .pr^^e91u2 - .pr^^e91s2 - .pro1^^e92 - .pro1s2c^^e9 - pro2s3tat - .prou3d2h - 1p2sych - .psycho1a2n - 1p2t^^e8r - 1p2t^^e9r -1pu - .pud1d2l -1p^^fb -1py -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%q -1q -4que. -4ques. -% words ending with -quent (df) 22/02/94 - 2quent. - ^^e93quent. - ^^e9lo3quent. -grandilo3quent. -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%r -1ra -1r^^e2 - radio1a2 % missing from nb list -1re -1r^^e9 -1r^^e8 -1r^^ea - .r^^e91a2 - .r^^e92a3le - .r^^e92a3lis - .r^^e92a3lit - .r^^e92aux - .r^^e91^^e92 - .r^^e91e2 - .r^^e92el - .r^^e92er - .r^^e92^^e8r - .r^^e91i2 - .r^^e92i3fi - .r^^e91o2 - .re1s2 - .re2s3cap - .re2s3cisi % for res-cision 09/17/92 (missing from nb) - .re2s3ciso % for res-cisoire 09/17/92(missing from nb) - .re2s3cou - .re2s3cri - .re2s3pect - .re2s3pir - .re2s3plend - .re2s3pons - .re2s3quil - .re2s3s - .re2s3t - .re3s4tab - .re3s4tag - .re3s4tand - .re3s4tat - .re3s4t^^e9n - .re3s4t^^e9r - .re3s4tim - .re3s4tip - .re3s4toc - .re3s4top - .re3s4tr - .re4s5trein - .re4s5trict - .re4s5trin - .re3s4tu - .re3s4ty - .r^^e9u2 %.r^^e91u2 % pattern rejected 12/2/92 - % (don't hyphenate as r^^e9-union nor r^^e9u-nion) - .r^^e92uss - .r^^e9tro1a2 -4re. -4res. -% words ending with -rent (df) 22/02/94 - 2rent. % es-p^^e8rent - syllable muette - bg 27/12/93 - .pa3rent. - appa3rent. -transpa3rent. - ^^e93rent. - tor3rent. - cur3rent. -% -1r2h -4rhe. -4rhes. - 2r3heur - 2r3hydr -1ri -1r^^ee -1ro -1r^^f4 -1ru -1r^^fb -1ry -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%s -1sa -1s^^e2 -.sch4 - 1s2caph - 1s2cl^^e9r - 1s2cop - 1s2ch -e2s3ch -i2s3ch^^e9 -i2s3chia -i2s3chio -4sch. -4sche. -4sches. -2schs -1se -1s^^e9 -1s^^e8 -1s^^ea - sesqui1a2 -4se. -4ses. -% words ending with -sent (df) 22/02/94 - 2sent. % massent - syllable muette - bg 27/12/93 - ab3sent. -pr^^e93sent. - .res3sent. -% -.seu2le % jbb -.sh4 -1s2h -4sh. -4she. -4shes. -2shent. % mute syllable: smashent (df) 22/02/94 -2shm - 2s3hom -2shr -2shs -1si -1s^^ee - 1s2lav - 1s2lov -1so -1s^^f4 -1s^^f70 % final zero essential to terminate cs - 1s2patia - 1s2perm - 1s2por - 1s2ph^^e8r - 1s2ph^^e9r - 1s2piel - 1s2piros - 1s2tandard - 1s2tein - st^^e9r^^e9o1s2 - 1s2tigm - 1s2tock - 1s2tomos - 1s2troph - 1s2tructu - 1s2tyle -1su -1s^^fb - .su2b1a2 - .su3b2alt - .su2b1^^e92 - .su3b2^^e93r - .su2b1in - .su2b3limin - .su2b3lin - .su2b3lu - sub1s2 - .su2b1ur - supero2 - supe4r1 - supers2 - .su2r1a2 - su3r2ah - .su3r2a3t - .su2r1e2 - .su3r2eau - .su3r2ell - .su3r2et - .su2r1^^e92 - .su2r3h - .su2r1i2m - .su2r1inf - .su2r1int - .su2r1of - .su2r1ox -1sy -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%t -1ta -1t^^e2 -1t^^e0 - tachy1a2 - tchin3t2 -1te -1t^^e9 -1t^^e8 -1t^^ea - t^^e9l^^e91e2 - t^^e9l^^e91i2 - t^^e9l^^e91o2b - t^^e9l^^e91o2p - t^^e9l^^e91s2 -4te. -4tes. -% words ending with -tent (df) 22/02/94 - 2tent. % mentent - syllable muette - bg 27/12/93 - .la3tent. - .pa3tent. - comp^^e93tent. - ^^e9ni3tent. - m^^e9con3tent. - omnipo3tent. -ventripo3tent. -^^e9quipo3tent. - impo3tent. - mit3tent. -% -.th4 -1t2h -4th. -4the. -4thes. - thermo1s2 - 2t3heur -2thl % th2l was wrong for ...ath-lon (jd said 2thl) df 12/27/93 -2thm -2thn -th2r -4thre. -4thres. -2ths -1ti -1t^^ee -1to -1t^^f4 -1t2r - tran2s1a2 - tran3s2act - tran3s2ats - tran2s3h - tran2s1o2 - tran2s3p - tran2s1u2 -4tre. -4tres. -2trent. % mute syllable: infiltrent (df) 28/02/94 - .tri1a2c - .tri1a2n - .tri1a2t - .tri1o2n - t1t2l -1tu -1t^^fb -tung2s3 -1ty -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%u -.u4 -'u4 -.^^fb4 -'^^fb4 - uni1o2v - uni1a2x - u2s3tr -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%v -1va -1v^^e2 -1ve -1v^^e9 -1v^^e8 -1v^^ea - v^^e9lo1s2ki -4ve. -4ves. -% words ending with -vent (df) 22/02/94 - 2vent. -conni3vent. - .sou3vent. -% -1vi -1v^^ee -1vo -1v^^f4 - vol2t1amp -1v2r -4vre. -4vres. -2vrent. % mute syllable: recouvrent (df) 28/02/94 -1vu -1v^^fb -1vy -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%w -1wa -1we -4we. -4wes. -2went. % mute syllable: interviewent (df) 22/02/94 -1wi -1wo -1wu -1w2r -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%x -2xent. % mute syllable: malaxent (df) 22/02/94 -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%y -.y4 -'y4 - y1asth - y1s2tom - y1algi -%-------------------%-----------------------% -% phonetic patterns % etymological patterns % -%-------------------%-----------------------% -%%z -1za -1ze -1z^^e9 -1z^^e8 -4ze. -4zes. -% words ending with -zent (df) 22/02/94 - 2zent. -privatdo3zent. -% -1zi -1zo -1zu -1zy -} -\endgroup -\endinput -%Fin du fichier f8hyph.tex -%%%%%%%%%%%%%%%%%%%%%%%%%% - diff --git a/macros/ec-plain/frhyphx1.tex b/macros/ec-plain/frhyphx1.tex deleted file mode 100644 index e3216c5c30..0000000000 --- a/macros/ec-plain/frhyphx1.tex +++ /dev/null @@ -1,19 +0,0 @@ -% frhyphx1.tex % French hyphenation exceptions provided with accent macros. -% -% Usually \hyphenation doesn't allow accent macros in its argument, just -% only characters, but french.sty and hyconfig.tex allows this. Thus this -% file can be reloaded each time you change your input encoding. The keyboard -% package do it via kbconfig.tex (and \kbencoding macro). -% -\message{frhyphex.tex french exceptions.}% -% Do NOT make any alterations to this french hyphenation exceptions list! --bg -% This WAS the official one from GUTenberg V3.0)}% 99/08/10 -% But you can -%have your private one via language.dat and \frhyphex % look at the% -%documentation... % -% Syntax corrected May 2002 by D. Taupin to avoid errors due to empty lines in -% \hyphenation specifications -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\hyphenation{GUTenberg fichier fichiers} % end of exceptions -%\endinput%%%%%%%%%%%%%%%%%%%%%% - diff --git a/macros/ec-plain/ghyph31.tex b/macros/ec-plain/ghyph31.tex deleted file mode 100644 index de252327ef..0000000000 --- a/macros/ec-plain/ghyph31.tex +++ /dev/null @@ -1,848 +0,0 @@ -% This is `ghyph31.tex' as of 13. Feb 94. -% -% Copyright (C) 1988,1991 Rechenzentrum der Ruhr-Universitaet Bochum -% [german hyphen patterns] -% Copyright (C) 1993,1994 Bernd Raichle/DANTE e.V. -% [macros, adaption for TeX 2] -% -% General permission for use and non-profit redistribution is granted. -% For special commercial use, contact the below address. -% -% Commercial use is generally granted, if a reference copy -% - for use by the Rechenzentrum of the Ruhr-Universitaet - -% is received. -% -% -% This file contains 5719 german hyphen patterns with umlauts -% in the recommended version of September 27, 1990. -% It is an experimental version for testing the integration of -% umlauts and `es-zett', but without `c-k' and triple consonants. -% -% For use with TeX generated by -% -% Norbert Schwarz -% Rechenzentrum Ruhr-Universitaet Bochum -% Universitaetsstrasse 150 -% D-44721 Bochum, FRG -% -% Email (X.400): -% Norbert.Schwarz@RUBA.RZ.RUHR-UNI-BOCHUM.DBP.DE -% -% -% Adaption of these patterns for TeX, Version 2.x and 3.x and -% all fonts in `Cork'/EC/DC and/or CM encoding by -% -% Bernd Raichle -% Stettener Str. 73 -% D-73732 Esslingen, FRG -% Email: raichle@Informatik.Uni-Stuttgart.DE -% -% -% Error reports in case of UNCHANGED versions to -% -% DANTE e.V., Koordinator `german.sty' -% Postfach 10 18 40 -% D-69008 Heidelberg, FRG -% Email: german@Dante.DE -% -% or one of the addresses given above. -% -% Changes: -% 1990-09-27 First version of `ghyphen3.tex' (Norbert Schwarz) -% 1991-02-13 PC umlauts changed to ^^xx (Norbert Schwarz) -% 1993-08-27 Umlauts/\ss changed to "a/\3 macros, added macro -% definitions and additional logic to select correct -% patterns/encoding (Bernd Raichle) -% 1994-02-13 Release of `ghyph31.tex' -% -% -% For more informations see the additional documentation -% at the end of this file. -% -% ----------------------------------------------------------------- -% -\message{German Hyphenation Patterns `ghyphen' Version 3.1a <94/02/13>} -% -\begingroup -\ifnum 0\ifx\inputlineno\undefined \else - \ifnum\inputlineno<1 \else 1\fi\fi<1 - \let\x=\endgroup -\else - \def\x{\endgroup -% -% The following commands ensure correct \catcodes, \lccodes and -% \uccodes if your TeX implementations uses these character codes. -% -\catcode"E4=11 \catcode"C4=11 % \"a \"A -\catcode"F6=11 \catcode"D6=11 % \"o \"O -\catcode"FC=11 \catcode"DC=11 % \"u \"U -\catcode"FF=11 \catcode"DF=11 % \ss SS -% -\lccode"C4="E4 \uccode"C4="C4 \lccode"E4="E4 \uccode"E4="C4 -\lccode"D6="F6 \uccode"D6="D6 \lccode"F6="F6 \uccode"F6="D6 -\lccode"DC="FC \uccode"DC="DC \lccode"FC="FC \uccode"FC="DC -\lccode"DF="FF \uccode"DF="DF \lccode"FF="FF \uccode"FF="DF -% -} -\fi -% Now execute the changes of the above \*codes for TeX 3.x -\x - - -% -% Next we define some commands, which are used inside the patterns. -% To keep them local, we enclose the rest of the file in a group -% (The \patterns command globally changes the hyphenation trie!). -% -\begingroup -% -% Because we use ^^e4, ^^f6, ... in the following definition, -% we have to ensure that the catcodes of ^^e and ^^f are ok -% for TeX 2. (The macro is not used for TeX 2.) -\catcode"0E=12 \catcode"0F=12 -% -% And we have to change the \lccode of ^^Y to make sure that -% we can include this character in the hyphenation patterns. -\catcode`\^^Y=11 \lccode`\^^Y=`\^^Y -% -% Define a simple " macro... -\catcode`\"=13 -\def"#1{\ifx#1a^^e4\else \ifx#1o^^f6\else - \ifx#1u^^fc\else - \errmessage{Hyphenation pattern file corrupted!}% - \fi\fi\fi} -% -% ... and define a macro to allow the use of this file -% with TeX 2 and TeX 3. -\ifnum 0\ifx\inputlineno\undefined \else - \ifnum\inputlineno<1 \else 1\fi\fi<1 - % for TeX 2: - % ignore the patterns with umlauts - \def\n#1{} - % ignore the duplicated patterns with \ss - \def\c#1{} - % define \3 to be code ^^Y - \def\3{^^Y} -\else - % for TeX 3: - % patterns with umlauts are ok - \def\n#1{#1} - % duplicated patterns are ok (for CM fonts) - \def\c#1{#1} - % >>>>>> UNCOMMENT the next line, if you do not want - % >>>>>> to use fonts with CM layout - %\def\c#1{} - % define \3 to be code `\^^ff (\ss in DC/EC font layout) - % define \9 to be code `\^^Y (\ss in CM font layout) - \def\3{^^ff} - \def\9{^^Y} -\fi -% -% -\patterns{% -.aa6l .ab3a4s .ab3ei .abi2 .ab3it .ab1l .ab1r .ab3u .ad3o4r .alti6 -.ana3c .an5alg .an1e .ang8s .an1s .ap1p .ar6sc .ar6ta .ar6tei .as2z -.au2f1 .au2s3 .be5erb .be3na .ber6t5r .bie6r5 .bim6s5t .brot3 .bru6s -.ch6 .che6f5 .da8c .da2r .dar5in .dar5u .den6ka .de5r6en .des6pe -.de8spo .de3sz .dia3s4 .dien4 .dy2s1 .ehren5 .eine6 .ei6n5eh .ei8nen -.ein5sa .en6der .en6d5r .en3k4 .en8ta8 .en8tei .en4t3r .epo1 .er6ban -.er6b5ei .er6bla .er6d5um .er3ei .er5er .er3in .er3o4b .erwi5s .es1p -.es8t .ex1a2 .ex3em .fal6sc .fe6st5a .flu4g3 .furch8 .ga6ner .ge3n4a -\n{.ge5r"o} .ges6 .halb5 .halbe6 .hal6br .haup4 .hau4t .heima6 .he4r3e -.her6za .he5x .hin3 .hir8sc .ho4c .hu3sa .hy5o .ibe5 .ima6ge .in1 -.ini6 .is5chi .jagd5 .kal6k5o .ka6ph .ki4e .kop6f3 .kraf6 \n{.k"u5ra} -.lab6br .liie6 .lo6s5k \n{.l"o4s3t} .ma5d .mi2t1 .no6th .no6top -.obe8ri .ob1l .obs2 .ob6st5e .or3c .ort6s5e .ost3a .oste8r .pe4re -.pe3ts .ph6 .po8str .rau4m3 .re5an .ro8q .ru5the \n{.r"u5be} -\n{.r"u8stet} .sch8 .se6e .se5n6h .se5ra .si2e .spi6ke .st4 .sy2n -.tages5 .tan6kl .ta8th .te6e .te8str .to6der .to8nin .to6we .um1 -.umpf4 .un1 .une6 .unge5n .ur1c .ur5en .ve6rin .vora8 .wah6l5 .we8ges -.wo6r .wor3a .wun4s .zi4e .zuch8 \n{."ande8re} \n{."och8} aa1c aa2gr -aal5e aa6r5a a5arti aa2s1t aat2s 6aba ab3art 1abdr 6abel aben6dr -ab5erk ab5err ab5esse 1abf 1abg \n{1abh"a} ab1ir 1abko a1bl ab1la -5ablag a6bla\3 \c{a6bla\9} ab4ler ab1lu \n{a8bl"a} \n{5a6bl"o} abma5c -1abn ab1ra ab1re 5a6brec ab1ro ab1s ab8sk abs2z 3abtei ab1ur 1abw -5abze 5abzu \n{ab1"an} \n{ab"au8} a4ce. a5chal ach5art ach5au a1che -a8chent ach6er. a6ch5erf a1chi ach1l ach3m ach5n a1cho ach3re a1chu -ach1w a1chy \n{ach5"af} ack1o acks6t ack5sta a1d 8ad. a6d5ac ad3ant -ad8ar 5addi a8dein ade5o8 adi5en 1adj 1adle ad1op a2dre 3adres adt1 -1adv \n{a6d"a} a1e2d ae1r a1er. 1aero 8afa a3fal af1an a5far a5fat -af1au a6fentl a2f1ex af1fr af5rau af1re 1afri af6tent af6tra aft5re -a6f5um \n{8af"a} ag5abe 5a4gent ag8er ages5e 1aggr ag5las ag1lo a1gn -ag2ne 1agog a6g5und a1ha a1he ah5ein a4h3erh a1hi ahl1a ah1le ah4m3ar -ahn1a a5ho ahra6 ahr5ab ah1re ah8rei ahren8s ahre4s3 ahr8ti ah1ru a1hu -\n{ah8"o} ai3d2s ai1e aif6 a3inse ai4re. a5isch. ais8e a3ismu ais6n -aiso6 a1j 1akad a4kade a1ke a1ki 1akko 5akro1 a5lal al5ans 3al8arm -al8beb al8berw alb5la 3album al1c a1le a6l5e6be a4l3ein a8lel a8lerb -a8lerh a6lert 5a6l5eth 1algi al4gli al3int al4lab al8lan al4l3ar -alle3g a1lo a4l5ob al6schm al4the altist5 al4t3re 8a1lu alu5i a6lur -alu3ta \n{a1l"a} a6mate 8ame. 5a6meise am6m5ei am6mum am2n ampf3a -am6schw am2ta a1mu \n{a1m"a} a3nac a1nad anadi5e an3ako an3alp 3analy -an3ame an3ara a1nas an5asti a1nat anat5s an8dent ande4s3 an1ec an5eis -an1e2k 4aner. a6n5erd a8nerf a6n5erke 1anfa 5anfert \n{1anf"a} 3angab -5angebo an3gli ang6lis an2gn 3angri ang5t6 \n{5anh"a} ani5g ani4ka -an5i8on an1kl an6kno an4kro 1anl anma5c anmar4 3annah anne4s3 a1no -5a6n1o2d 5a6n3oma 5a6nord 1anr an1sa 5anschl an4soz an1st 5anstal -an1s2z 5antenn an1th \n{5anw"a} a5ny an4z3ed 5anzeig 5anzieh 3anzug -\n{an1"a} \n{5an"as} \n{a1n"o} \n{an"o8d} a1os a1pa 3apfel a2ph1t -\n{aph5"a6} a1pi 8apl apo1c apo1s a6poste a6poth 1appa ap1pr a1pr -\n{a5p"a} \n{a3p"u} a1ra a4r3af ar3all 3arbei 2arbt ar1c 2a1re ar3ein -ar2gl 2a1ri ari5es ar8kers ar6les ar4nan ar5o6ch ar1o2d a1rol ar3ony -a8ror a3ros ar5ox ar6schl 8artei ar6t5ri a1ru a1ry 1arzt arz1w -\n{ar8z"a} \n{ar"a8m} \n{ar"o6} \n{ar5"om} \n{ar1"u2} a1sa a6schec -asch5l asch3m a6schn a3s4hi as1pa asp5l a8steb as5tev 1asth a6stoc -a1str ast3re 8a1ta ata5c ata3la a6tapf ata5pl a1te a6teli aten5a -ate5ran 6atf 6atg a1th at3hal 1athl 2a1ti 5atlant 3atlas 8atmus 6atn -a1to a6t5ops ato6ra a6t5ort. 4a1tr a6t5ru at2t1h \n{at5t6h"a} 6a1tu -atz1w \n{a1t"a} \n{a1t"u} au1a au6bre auch3a au1e aue4l 5aufent -\n{3auff"u} 3aufga 1aufn auf1t 3auftr 1aufw 3auge. au4kle aule8s 6aum -au8mar aum5p 1ausb 3ausd 1ausf 1ausg au8sin 3auss au4sta 1ausw 1ausz -aut5eng au1th 1auto au\3e8 \c{au\9e8} a1v ave5r6a aver6i a1w a6wes a1x -a2xia a6xio a1ya a1z azi5er. 8a\3 \c{8a\9} 1ba 8ba8del ba1la ba1na -ban6k5r ba5ot bardi6n ba1ro basten6 bau3sp 2b1b bb6le b2bli 2b1c 2b1d -1be be1a be8at. be1ch 8becht 8becke. be5el be1en bee8rei be5eta bef2 -8beff be1g2 \n{beh"o8} bei1s 6b5eisen bei3tr b8el bel8o belu3t be3nac -bend6o be6ners be6nerw be4nor ben4se6 bens5el \n{be1n"a} \n{be1n"u} -be1o2 b8er. be1ra be8rac ber8gab. ber1r \n{be1r"u} bes8c bes5erh -bes2p be5tha bet5sc be1un be1ur 8bex be6zwec 2b1f8 bfe6st5e 2b1g2 -bga2s5 bge1 2b1h bhole6 1bi bi1bl b6ie bi1el bi1la \n{bil"a5} bi1na -bi4nok bi5str bi6stu bi5tr bit4t5r b1j 2b1k2 \n{bk"u6} bl8 b6la. -6b1lad 6blag 8blam 1blat b8latt 3blau. b6lav 3ble. b1leb b1led -8b1leg 8b1leh 8bleid 8bleih 6b3lein blei3s ble4m3o 4blich b4lind -8bling b2lio 5blit b4litz b1loh 8b1los 1blu 5blum 2blun blut3a blut5sc -\n{3bl"a} \n{bl"as5c} \n{5bl"o} \n{3bl"u} \n{bl"u8sc} 2b1m 2b1n 1bo -bo1ch bo5d6s boe5 8boff 8bonk bo1ra b1ort 2b1p2 b1q 1br brail6 brast8 -bre4a b5red 8bref 8b5riem b6riga bro1s b1rup b2ruz \n{8br"oh} -\n{br"os5c} 8bs b1sa b8sang b2s1ar b1sc bs3erl bs3erz b8sof b1s2p -bst1h b3stru \n{b5st"a} b6sun 2b1t b2t1h 1bu bu1ie bul6k b8ure bu6sin -6b1v 2b1w 1by1 by6te. 8b1z bzi1s \n{1b"a} \n{b5"a6s5} \n{1b"u} -\n{b6"u5bere} \n{b"uge6} \n{b"ugel5e} \n{b"ur6sc} 1ca cag6 ca5la ca6re -ca5y c1c 1ce celi4c celich5 ce1ro c8h 2ch. 1chae ch1ah ch3akt cha6mer -8chanz 5chara 3chari 5chato 6chb 1chef 6chei ch3eil ch3eis 6cherkl -6chf 4chh 5chiad 5chias 6chins 8chj chl6 5chlor 6ch2m 2chn6 ch8nie -5cho. 8chob choi8d 6chp ch3ren ch6res \n{ch3r"u} 2chs 2cht cht5ha -cht3hi 5chthon ch6tin 6chuh chu4la 6ch3unt chut6t 8chw 1ci ci5tr c2k -2ck. ck1ei 4ckh ck3l ck3n ck5o8f ck1r 2cks ck5stra ck6s5u c2l 1c8o -con6ne 8corb cos6t c3q 1c6r 8c1t 1cu 1cy \n{5c"a1} \n{c"o5} 1da. -8daas 2dabg 8dabr 6dabt 6dabw 1dac da2gr 6d5alk 8d5amt dan6ce. -dani5er dan8ker 2danl danla6 6dans 8danzi 6danzu d1ap da2r1a8 2d1arb -d3arc dar6men 4d3art 8darz 1dat 8datm 2d1auf 2d1aus 2d1b 2d1c 2d1d -d5de d3d2h \n{dd"amme8} 1de 2deal de5an de3cha de1e defe6 6deff 2d1ehr -5d4eic de5isc de8lar del6s5e del6spr de4mag de8mun de8nep dene6r -8denge. 8dengen de5o6d 2deol de5ram 8derdb der5ein de1ro der1r d8ers -der5um de4s3am de4s3an de4sau de6sil de4sin de8sor de4spr de2su 8deul -de5us. 2d1f df2l 2d1g 2d1h 1di dia5c di5ara dice5 di3chr di5ena di1gn -di1la dil8s di1na 8dind 6dinf 4d3inh 2d1ins di5o6d di3p4t di8sen dis1p -di5s8per di6s5to dis5tra di8tan di8tin d1j 6dje 2dju 2d1k 2d1l 2d1m -2d1n6 dni6 dnje6 1do 6d5obe do6berf 6d5ony do3ran 6dord 2d1org dor4t3h -do6ste 6doth dott8e 2d1p d5q dr4 1drah 8drak d5rand 6dre. 4drech -d6reck 4d3reg 8d3reic d5reife 8drem 8d1ren 2drer 8dres. 6d5rh 1dria -d1ric 8drind droi6 dro5x 1dru 8drut \n{dr"os5c} \n{1dr"u} \n{dr"u5b} -\n{dr"u8sc} 2ds d1sa d6san dsat6 d1sc 5d6scha. 5dschik dse8e d8serg -8dsl d1sp d4spak ds2po \n{d8sp"a} d1st \n{d1s"u} 2dt d1ta d1te d1ti -d1to dt1s6 d1tu \n{d5t"a} 1du du5als du1b6 du1e duf4t3r 4d3uh du5ie -8duml 8dumw 2d1und du8ni 6d5unt dur2c durch3 6durl 6dursa 8durt du1s -du8schr 2d1v 2d1w dwa8l 2d1z \n{1d"a} \n{6d"ah} \n{8d"and} \n{d"a6r} -\n{d"o8bl} \n{d5"ol} \n{d"or6fl} \n{d"o8sc} \n{d5"o4st} \n{d"os3te} -\n{1d"u} ea4ben e1ac e1ah e1akt e1al. e5alf e1alg e5a8lin e1alk e1all -e5alp e1alt e5alw e1am e1and ea6nim e1ar. e5arf e1ark e5arm e3art -e5at. e6ate e6a5t6l e8ats e5att e6au. e1aus e1b e6b5am ebens5e -eb4lie eb4ser eb4s3in e1che e8cherz e1chi ech3m 8ech3n ech1r ech8send -ech4su e1chu eck5an e5cl e1d ee5a ee3e ee5g e1ei ee5isc eei4s3t -ee6lend e1ell \n{ee5l"o} e1erd ee3r4e ee8reng eere6s5 \n{ee5r"a} -ee6tat e1ex e1f e6fau e8fe8b 3effek ef3rom ege6ra eglo6si 1egy e1ha -e6h5ach eh5ans e6hap eh5auf e1he e1hi ehl3a eh1le ehl5ein eh1mu ehn5ec -e1ho ehr1a eh1re ehre6n eh1ri eh1ru ehr5um e1hu eh1w e1hy \n{e1h"a} -\n{e1h"o} \n{e3h"ut} ei1a eia6s ei6bar eich3a eich5r ei4dar ei6d5ei -ei8derf ei3d4sc ei1e 8eifen 3eifri 1eign eil1d ei6mab ei8mag ein1a4 -ei8nat ei8nerh ei8ness ei6nete ein1g e8ini ein1k ei6n5od ei8nok ei4nor -\n{e3ins"a} ei1o e1irr ei5ru ei8sab ei5schn ei6s5ent ei8sol ei4t3al -eit3ar eit1h ei6thi ei8tho eit8samt ei6t5um e1j 1ekd e1ke e1ki e1k2l -e1kn ekni4 e1la e2l1al 6elan e6lanf e8lanl e6l5ans el3arb el3arm -e6l3art 5e6lasti e6lauge elbst5a e1le 6elef ele6h e6l5ehe e8leif -e6l5einh 1elek e8lel 3eleme e6lemen e6lente el5epi e4l3err e6l5ersc -elf2l elg2 e6l5ins ell8er 4e1lo e4l3ofe el8soh el8tent 5eltern e1lu -elut2 \n{e1l"a} \n{e1l"u} em8dei em8meis 4emo emo5s 1emp1f 1empt 1emto -e1mu emurk4 emurks5 \n{e1m"a} en5a6ben en5achs en5ack e1nad en5af -en5all en3alt en1am en3an. en3ant en3anz en1a6p en1ar en1a6s 6e1nat -en3auf en3aus en2ce enda6l end5erf end5erg en8dess 4ene. en5eck -e8neff e6n5ehr e6n5eim en3eis 6enem. 6enen e4nent 4ener. e8nerd -e6n3erf e4nerg 5energi e6n5erla en5ers e6nerst en5erw 6enes e6n5ess -e2nex en3glo 2eni enni6s5 ennos4 enns8 e1no e6nober eno8f en5opf -e4n3ord en8sers ens8kl en1sp ens6por en5t6ag enta5go en8terbu en6tid -3entla ent5ric 5entwic 5entwu 1entz enu5i e3ny en8zan \n{en1"of} -\n{e1n"os} \n{e1n"ug} eo1c e5o6fe e5okk e1on. e3onf e5onk e5onl e5onr -e5opf e5ops e5or. e1ord e1org eo5r6h eo1t e1pa e8pee e6p5e6g ep5ent -e1p2f e1pi 5epid e6pidem e1pl 5epos e6pos. ep4p3a e1pr \n{e1p"a} e1q -e1ra. er5aal 8eraba e5rabel er5a6ben e5rabi er3abs er3ach era5e -era5k6l er3all er3amt e3rand e3rane er3ans e5ranz. e1rap er3arc -e3rari er3a6si e1rat erat3s er3auf e3raum 3erbse er1c e1re 4e5re. -er3eck er5egg er5e2h 2erei e3rei. e8reine er5einr 6eren. e4r3enm -4erer. e6r5erm er5ero er5erst e4r3erz er3ess \n{5erf"ul} er8gan. -5ergebn er2g5h \n{5erg"anz} \n{5erh"ohu} 2e1ri eri5ak e6r5iat e4r3ind -e6r5i6n5i6 er5ins e6r5int er5itio er1kl \n{3erkl"a} \n{5erl"os.} -ermen6s er6nab 3ernst 6e1ro. e1rod er1o2f e1rog 6e3roi ero8ide e3rol -e1rom e1ron e3rop8 e2r1or e1ros e1rot er5ox ersch4 5erstat er6t5ein -er2t1h er5t6her 2e1ru eruf4s3 e4r3uhr er3ums e5rus 5erwerb e1ry er5zwa -er3zwu \n{er"a8m} \n{er5"as} \n{er"o8} \n{e3r"os.} \n{e6r1"u2b} e1sa -esa8b e8sap e6s5a6v e1sc esch4l ese1a es5ebe eserve5 e8sh es5ill -es3int es4kop e2sl eso8b e1sp espei6s5 es2po es2pu 5essenz e6stabs -e6staf e6st5ak est3ar e8stob e1str est5res es3ur e2sz \n{e1s"u} e1ta -et8ag etari5e eta8ta e1te eten6te et5hal e5thel e1ti 1etn e1to e1tr -et3rec e8tscha et8se et6tei et2th et2t1r e1tu etu1s et8zent et8zw -\n{e1t"a} \n{e1t"o} \n{e1t"u} eu1a2 eu1e eue8rei eu5fe euin5 euk2 -e1um. eu6nio e5unter eu1o6 eu5p 3europ eu1sp eu5str eu8zo e1v eval6s -eve5r6en ever4i e1w e2wig ex1or 1exp 1extr ey3er. e1z \n{e1"a2} -\n{e5"o8} \n{e1"u} e8\3es \c{e8\9es} fa6ch5i fade8 fa6del fa5el. -fal6lo falt8e fa1na fan4gr 6fanl 6fap far6ba far4bl far6r5a 2f1art -fa1sc fau8str fa3y 2f1b2 6f1c 2f1d 1fe 2f1eck fe6dr feh6lei f6eim -8feins f5eis fel5en 8feltern 8femp fe5rant 4ferd. ferri8 fe8stof -fe6str fe6stum fe8tag fet6ta fex1 2ff f1fa f6f5arm f5fe ffe5in ffe6la -ffe8ler ff1f f1fla ff3lei ff4lie ff8sa ff6s5ta 2f1g2 fgewen6 4f1h 1fi -fid4 fi3ds fieb4 fi1la fi8lei fil4m5a f8in. fi1na 8finf fi8scho fi6u -6f1j 2f1k2 f8lanz fl8e 4f3lein 8flib 4fling f2lix 6f3lon 5flop 1flor -\n{5f8l"ac} \n{3fl"ot} 2f1m 2f1n 1fo foh1 f2on fo6na 2f1op fo5ra -for8mei for8str for8th for6t5r fo5ru 6f5otte 2f1p8 f1q fr6 f5ram -1f8ran f8ra\3 \c{f8ra\9} f8re. frei1 5frei. f3reic f3rest f1rib -8f1ric 6frig 1fris fro8na \n{fr"as5t} 2fs f1sc f2s1er f5str -\n{fs3t"at} 2ft f1tak f1te ft5e6h ftere6 ft1h f1ti f5to f1tr ft5rad -ft1sc ft2so f1tu ftwi3d4 ft1z 1fu 6f5ums 6funf fun4ka fu8\3end -\c{fu8\9end} 6f1v 2f1w 2f1z \n{1f"a} \n{f"a1c} \n{8f"arm} \n{6f"aug} -\n{f"a8\3} \n{\c{f"a8\9}} \n{f"ode3} \n{8f"of} \n{3f"or} \n{1f"u} -\n{f"un4f3u} 1ga ga6bl 6gabw 8gabz g3a4der ga8ho ga5isc 4gak ga1la -6g5amt ga1na gan5erb gan6g5a ga5nj 6ganl 8gansc 6garb 2g1arc 2g1arm -ga5ro 6g3arti ga8sa ga8sc ga6stre 2g1atm 6g5auf gau5fr g5aus 2g1b g5c -6gd g1da 1ge ge1a2 ge6an ge8at. ge1e2 ge6es gef2 8geff ge1g2l ge1im -4g3eise geist5r gel8bra gelt8s \n{ge5l"o} ge8nin gen3k 6g5entf -\n{ge3n"a} ge1or ge1ra ge6rab ger8au \n{8gerh"o} ger8ins ge1ro 6g5erz. -\n{ge1r"a} \n{ge1r"u} ge1s ges2p ge5unt 4g3ex3 2g1f8 2g1g g1ha 6g1hei -5ghel. g5henn 6g1hi g1ho 1ghr \n{g1h"o} 1gi gi5la gi8me. gi1na -4g3ins gi3str g1j 2g1k 8gl. 1glad g5lag glan4z3 1glas 6glass 5glaub -g3lauf 1gle. g5leb 3gleic g3lein 5gleis 1glem 2gler 8g3leu gli8a -g2lie 3glied 1g2lik 1g2lim g6lio 1gloa 5glom 1glon 1glop g1los g4loss -g5luf 1g2ly \n{1gl"u} 2g1m gn8 6gn. 1gna 8gnach 2gnah g1nas g8neu -g2nie g3nis 1gno 8gnot 1go goe1 8gof 2gog 5gogr 6g5oh goni5e 6gonist -go1ra 8gord 2g1p2 g1q 1gr4 g5rahm gra8m gra4s3t 6g1rec gre6ge 4g3reic -g5reit 8grenn gri4e g5riem 5grif 2grig g5ring 6groh 2grot gro6\3 -\c{gro6\9} 4grut 2gs gs1ab g5sah gs1ak gs1an gs8and gs1ar gs1au g1sc -gs1ef g5seil gs5ein g2s1er gs1in g2s1o gso2r gs1pr g2s1u 2g1t g3te -g2t1h 1gu gu5as gu2e 2gue. 6gued 4g3uh 8gums 6g5unt gu1s gut3h gu2tu -4g1v 2g1w gy1n g1z \n{1g"a} \n{8g"a8m} \n{6g"arm} \n{1g"o} \n{1g"u} -\n{6g"ub} 1haa hab8r ha8del hade4n 8hae ha5el. haf6tr 2hal. ha1la -hal4b5a 6hale 8han. ha1na han6dr han6ge. 2hani h5anth 6hanz 6harb -h3arbe h3arme ha5ro ha2t1h h1atm hau6san ha8\3 \c{ha8\9} h1b2 h1c h1d -he2bl he3cho h3echt he5d6s 5heft h5e6he. hei8ds h1eif 2hein he3ism -he5ist. heit8s3 hek6ta hel8lau 8helt he6mer 1hemm 6h1emp hen5end -hen5klo hen6tri he2nu 8heo he8q her3ab he5rak her3an 4herap her3au -h3erbi he1ro he8ro8b he4r3um her6z5er he4spe he1st heta6 het5am he5th -heu3sc he1xa hey5e h1f2 h1g hgol8 h1h h1iat hie6r5i hi5kt hil1a2 -hil4fr hi5nak hin4ta hi2nu hi5ob hirn5e hir6ner hi1sp hi1th hi5tr -5hitz h1j h6jo h1k2 hlabb4 hla4ga hla6gr h5lai hl8am h1las h1la\3 -\c{h1la\9} hl1c h1led h3lein h5ler. h2lif h2lim h8linf hl5int h2lip -h2lit h4lor h3lose \n{h1l"as} hme5e h2nee h2nei hn3eig h2nel hne8n -hne4p3f hn8erz h6netz h2nip h2nit h1nol hn5sp h2nuc h2nud h2nul hoch1 -1hoh hoh8lei 2hoi ho4l3ar 1holz h2on ho1ra 6horg 5horn. ho3sl hos1p -ho4spi h1p hpi6 h1q 6hr h1rai h8rank h5raum hr1c hrcre8 h1red h3reg -h8rei. h4r3erb h8rert hrg2 h1ric hr5ins h2rom hr6t5erl hr2t1h hr6t5ra -hr8tri h6rum hr1z hs3ach h6s5amt h1sc h6s5ec h6s5erl hs8erle h4sob -h1sp h8spa\3 \c{h8spa\9} h8spel hs6po h4spun h1str h4s3tum hs3und -\n{h1s"u} h5ta. h5tab ht3ac ht1ak ht3ang h5tanz ht1ar ht1at h5taub -h1te h2t1ec ht3eff ht3ehe h4t3eif h8teim h4t3ein ht3eis h6temp h8tentf -hte8ren \n{h6terf"u} h8tergr h4t3erh h6t5ersc h8terst h8tese h8tess -h2t1eu h4t3ex ht1he ht5hu h1ti ht5rak hts3ah ht1sc ht6sex ht8sk ht8so -h1tu htz8 \n{h5t"um} hub5l hu6b5r huh1l h5uhr. huld5a6 hu8lent -\n{hu8l"a} h5up. h1v h5weib h3weis h1z \n{h"a8kl} \n{h"al8s} -\n{h"ama8tu8} \n{h"a8sche.} \n{h"at1s} \n{h"au4s3c} \n{2h"o.} -\n{2h"oe} \n{8h"oi} \n{h"o6s} \n{h"os5c} \n{h"uhne6} \n{h"ul4s3t} -\n{h"utte8re} i5adn i1af i5ak. i1al. i1al1a i1alb i1ald i5alei i1alf -i1alg i3alh i1alk i1all i1alp i1alr i1als i1alt i1alv i5alw i3alz -i1an. ia5na i3and ian8e ia8ne8b i1ang i3ank i5ann i1ant i1anz i6apo -i1ar. ia6rab i5arr i1as. i1asm i1ass i5ast. i1at. i5ats i1au i5azz -i6b5eig i6b5eis ib2le i4blis i6brig i6b5unt \n{i6b"ub} i1che ich5ei -i6cherb i1chi ich5ins ich1l ich3m ich1n i1cho icht5an icht3r i1chu -ich1w ick6s5te ic5l i1d id3arm 3ideal ide8na 3ideol \n{ide5r"o} i6diot -id5rec id1t ie1a ie6b5ar iebe4s3 ie2bl ieb1r ie8bra ie4bre \n{ie8b"a} -ie2dr ie1e8 ie6f5ad ief5f ie2f1l ie4fro ief1t i1ei ie4l3ec ie8lei -ie4lek i3ell i1en. i1end ien6e i3enf i5enn ien6ne. i1enp i1enr -i5ensa ien8stal i5env i1enz ie5o ier3a4b ie4rap i2ere ie4rec ie6r5ein -ie6r5eis ier8er i3ern. ie8rum ie8rund ie6s5che ie6tau ie8tert ie5the -ie6t5ri i1ett ie5un iex5 2if i1fa if5ang i6fau if1fr if5lac i5f6lie -i1fre ift5a if6t5r ig3art 2ige i8gess ig5he i5gla ig2ni i5go ig3rot -ig3s2p i1ha i8ham i8hans i1he i1hi ih1n ih1r i1hu i8hum ih1w 8i1i ii2s -ii2t i1j i1k i6kak i8kerz i6kes ik4ler i6k5unt 2il i5lac i1lag il3ans -i5las i1lau il6auf i1le ile8h i8lel il2fl il3ipp il6l5enn i1lo ilt8e -i1lu \n{i1l"a} i8mart imb2 i8mele i8mid imme6l5a i1mu \n{i1m"a} -\n{i5m"o} ina5he i1nat in1au inau8s 8ind. in4d3an 5index ind2r 3indus -i5nec i2n1ei i8nerw 3infek 1info 5ingeni ing5s6o 5inhab ini5er. 5inj -\n{in8k"at} in8nan i1no inoi8d in3o4ku in5sau in1sp 5inspe 5instit -5instru ins4ze 5intere 5interv in3the in5t2r i5ny \n{in"a2} \n{i1n"ar} -\n{in1"as} \n{in"o8} \n{in5"od} \n{i1n"os} 2io io1a8 io1c iode4 io2di -ioi8 i1ol. i1om. i1on. i5onb ion2s1 i1ont i5ops i5o8pt i1or. -i3oral io3rat i5orc i1os. i1ot. i1o8x 2ip i1pa i1pi i1p2l i1pr i1q -i1ra ir6bl i1re i1ri ir8me8d ir2m1o2 ir8nak i1ro ir5rho ir6schl -ir6sch5r i5rus i5ry \n{i5r"a} i1sa i8samt i6sar i2s1au i8scheh i8schei -isch5m isch3r \n{isch"a8} is8ele ise3ra i4s3erh is3err isi6de i8sind -is4kop ison5e is6por i8s5tum i5sty \n{i5s"o} i1ta it5ab. i2t1a2m -i8tax i1te i8tersc i1thi i1tho i5thr \n{it8h"a} i1ti i8ti8d iti6kl -itmen4 i1to i8tof it3ran it3rau i1tri itri5o it1sc it2se it5spa it8tru -i1tu it6z5erg it6z1w \n{i1t"a} \n{it"a6r5e} \n{it"at2} \n{it"ats5} -\n{i1t"u} i1u iu6r 2i1v i6vad iva8tin i8vei i6v5ene i8verh i2vob i8vur -i1w iwi2 i5xa i1xe i1z ize8n i8zir i6z5w \n{i"a8m} \n{i1"a6r} -\n{i5"at.} \n{i5"av} \n{i1"o8} \n{i"u8} i6\35ers \c{i6\95ers} ja5la -je2t3r 6jm 5jo jo5as jo1ra jou6l ju5cha jugen4 jugend5 jung5s6 ju1s -\n{3j"a} 1ka 8kachs 8kakz ka1la kal5d kam5t ka1na 2kanl 8kapf ka6pl -ka5r6a 6k3arbe ka1ro kar6p5f 4k3arti 8karz \n{ka1r"a} kasi5e ka6teb -kat8ta kauf6s kau3t2 2k1b 2k1c 4k1d kehr6s kehrs5a 8keic 2k1eig 6k5ein -6k5eis ke6lar ke8leis ke8lo 8kemp k5ente. k3entf 8k5ents 6kentz ke1ra -k5erlau 2k1f8 2k1g 2k1h ki5fl 8kik king6s5 6kinh ki5os ki5sp ki5th -\n{8ki8"o} 2k1k2 kl8 1kla 8klac k5lager kle4br k3leib 3kleid kle5isc -4k3leit k3lek 6k5ler. 5klet 2klic 8klig k2lim k2lin 5klip 5klop k3lor -\n{1kl"a} 2k1m kmani5e kn8 6kner k2ni \n{kn"a8} 1k2o ko1a2 ko6de. -ko1i koi8t ko6min ko1op ko1or ko6pht ko3ra kor6d5er ko5ru ko5t6sc k3ou -3kow 6k5ox 2k1p2 k1q 1kr8 4k3rad 2k1rec 4k3reic kre5ie 2krib 6krig -2krip 6kroba 2ks k1sa k6sab ksal8s k8samt k6san k1sc k2s1ex k5spat -k5spe k8spil ks6por k1spr kst8 k2s1uf 2k1t kta8l kt5a6re k8tein kte8re -k2t1h k8tinf kt3rec kt1s 1ku ku1ch kuck8 k3uhr ku5ie kum2s1 kunfts5 -kun2s kunst3 ku8rau ku4ro kurz1 ku1st 4kusti ku1ta ku8\3 \c{ku8\9} -6k1v 2k1w ky5n 2k1z \n{1k"a} \n{k"a4m} \n{4k3"ami} \n{k"ase5} \n{1k"o} -\n{k"o1c} \n{k"o1s} \n{1k"u} \n{k"u1c} \n{k"ur6sc} \n{k"u1s} 1la. -8labf 8labh lab2r 2l1abs lach3r la8dr 5ladu 8ladv 6laff laf5t la2gn -5laken 8lamb la6mer 5lampe. 2l1amt la1na 1land lan4d3a lan4d3r lan4gr -8lanme 6lann 8lanw \n{6lan"a} 8lappa lap8pl lap6pr l8ar. la5ra lar4af -la8rag la8ran la6r5a6s l3arbe la8rei 6larm. la8sa la1sc la8sta lat8i -6l5atm 4lauss 4lauto 1law 2lb l8bab l8bauf l8bede l4b3ins l5blo -lbst5an lbst3e 8lc l1che l8chert l1chi lch3m l5cho lch5w 6ld l4d3ei -ld1re \n{l6d"ub} le2bl le8bre lecht6s5 led2r 6leff le4gas 1lehr lei6br -le8inf 8leinn 5leistu 4lektr le6l5ers lemo2 8lemp l8en. 8lends -6lendun le8nend len8erw 6l5ents 4l3entw 4lentz 8lenzy 8leoz 6lepi -le6pip 8lepo 1ler l6er. 8lerbs 6l5erde le8reis le8rend le4r3er 4l3erg -l8ergr 6lerkl 6l5erzie \n{8ler"o} 8lesel lesi5e le3sko le3tha let1s -5leuc 4leuro leu4s3t le5xe 6lexp l1f 2l1g lgend8 l8gh lglie3 lglied6 -6l1h 1li li1ar li1as 2lick li8dr li1en lien6n li8ers li8ert 2lie\3 -\c{2lie\9} 3lig li8ga8b li1g6n li1l8a 8limb li1na 4l3indu lings5 -4l3inh 6linj link4s3 4linkt 2lint 8linv lion5s6t 4lipp 5lipt 4lisam -livi5e 6l1j 6l1k l8keim l8kj lk2l lko8f lkor8 lk2sa lk2se 6ll l1la -ll3a4be l8labt ll8anl ll1b ll1c ll1d6 l1le l4l3eim l6l5eise ller3a -l4leti l5lip l1lo ll3ort ll5ov ll6spr llte8 l1lu ll3urg \n{l1l"a} -\n{l5l"u} \n{l6l"ub} 2l1m l6m5o6d 6ln l1na l1no 8lobl lo6br 3loch. -l5o4fen 5loge. 5lohn 4l3ohr 1lok l2on 4l3o4per lo1ra 2l1ord 6lorg -4lort lo1ru 1los. lo8sei 3losig lo6ve lowi5 6l1p lp2f l8pho l8pn -lp4s3te l2pt l1q 8l1r 2ls l1sa l6sarm l1sc l8sec l6s5erg l4s3ers l8sh -l5s6la l1sp ls4por ls2pu l1str l8suni \n{l1s"u} 2l1t lt5amp l4t3ein -l5ten l6t5eng l6t5erp l4t3hei lt3her l2t1ho l6t5i6b lti1l \n{l8tr"o} -lt1sc lt6ser lt4s3o lt5ums lu8br lu2dr lu1en8 8lu8fe luft3a luf8tr -lu6g5r 2luh l1uhr lu5it 5luk 2l1umf 2l1umw 1lun 6l5u6nio 4l3unte lu5ol -4lurg 6lurs l3urt lu4sto lu3str lu6st5re lu8su lu6tal lu6t5e6g lu8terg -lu3the lu6t5or lu2t1r lu6\35 \c{lu6\95} l1v lve5r6u 2l1w 1ly lya6 -6lymp ly1no l8zess l8zo8f l3zwei lz5wu \n{3l"and} \n{l"a5on} -\n{l"a6sc} \n{l"at1s} \n{5l"auf} \n{2l"aug} \n{l"au6s5c} \n{l"a5v} -\n{l1"ol} \n{1l"os} \n{l"o1\36t} \n{\c{l"o1\96t}} \n{6l1"ube} 1ma -8mabg ma5chan mad2 ma5el 4magg mag8n ma1la ma8lau mal5d 8malde mali5e -malu8 ma8lut 2m1amp 3man mand2 man3ds 8mangr mani5o 8m5anst 6mappa -4m3arbe mar8kr ma1r4o mar8schm 3mas ma1sc \n{ma1t"o} 4m5auf ma5yo 2m1b -mb6r 2m1c 2m1d \n{md6s"a} 1me me1ch me5isc 5meld mel8sa 8memp me5nal -men4dr men8schl men8schw 8mentsp me1ra mer4gl me1ro 3mes me6s5ei me1th -me8\3 \c{me8\9} 2m1f6 2m1g 2m1h 1mi mi1a mi6ale mi1la 2m1imm mi1na -\n{mi5n"u} mi4s3an mit1h mi5t6ra 3mitt mitta8 mi6\35 \c{mi6\95} 6mj -2m1k8 2m1l 2m1m m6mad m6m5ak m8menth m8mentw mme6ra m2mn mm5sp mm5ums -mmut5s \n{m8m"an} m1n8 m5ni 1mo mo5ar mo4dr 8mof mo8gal mo4kla mol5d -m2on mon8do mo4n3od mont8a 6m5ony mopa6 mo1ra mor8d5a mo1sc mo1sp 5mot -moy5 2mp m1pa mpfa6 mpf3l mphe6 m1pi mpin6 m1pl mp2li m2plu mpo8ste -m1pr \n{mpr"a5} mp8th mput6 mpu5ts \n{m1p"o} 8m1q 2m1r 2ms ms5au m1sc -msch4l ms6po m3spri m1str 2m1t mt1ar m8tein m2t1h mt6se \n{mt8s"a} -mu5e 6m5uh mumi1 1mun mun6dr muse5e mu1ta 2m1v mvol2 mvoll3 2m1w 1my -2m1z \n{m"a6kl} \n{1m"an} \n{m"a1s} \n{m"a5tr} \n{m"au4s3c} \n{3m"a\3} -\n{\c{3m"a\9}} \n{m"ob2} \n{6m"ol} \n{1m"u} \n{5m"un} \n{3m"ut} 1na. -n5ab. 8nabn n1abs n1abz \n{na6b"a} na2c nach3e 3nacht 1nae na5el -n1afr 1nag 1n2ah na8ha na8ho 1nai 6nair na4kol n1akt nal1a 8naly 1nama -na4mer na1mn n1amp 8n1amt 5nanc nan6ce n1and n6and. 2n1ang 1nani -1nann n1ans 8nanw 5napf. 1n2ar. na2ra 2n1arc n8ard 1nari n8ark -6n1arm 5n6ars 2n1art n8arv 6natm nat6s5e 1naue 4nauf n3aug 5naui n5auk -na5um 6nausb 6nauto 1nav 2nax 3naz 1na\3 \c{1na\9} n1b2 nbau5s n1c -nche5e nch5m 2n1d nda8d n2d1ak nd5ans n2d1ei nde8lac ndel6sa n8derhi -nde4se nde8stal n2dj ndnis5 n6d5or6t nd3rec nd3rot nd8samt nd6sau -ndt1h n8dumd 1ne ne5as ne2bl 6n5ebn 2nec 5neei ne5en ne1g4l 2negy -4n1ein 8neis 4n3e4lem 8nemb 2n1emp nen1a 6n5energ nen3k 8nentb -4n3en3th 8nentl 8n5entn 8n5ents ne1ra ne5r8al ne8ras 8nerbi 6n5erde. -nere5i6d nerfor6 \n{6n5erh"o} \n{8nerl"o} 2n1err n8ers. 6n5ertra -2n1erz nesi3e net1h neu4ra neu5sc 8neu\3 \c{8neu\9} n1f nf5f nf2l -nflei8 nf5lin nft8st n8g5ac ng5d ng8en nge8ram ngg2 ng1h n6glic ng3rip -ng8ru ng2se4 ng2si n2g1um n1gy \n{n8g"al} n1h nhe6r5e 1ni ni1bl -\n{ni5ch"a} ni8dee n6ie ni1en nie6s5te niet5h ni8etn 4n3i6gel n6ik -ni1la 2n1imp ni5na 2n1ind 8ninf 6n5inh ni8nit 6n5inn 2n1ins 4n1int -n6is ni3str ni1th ni1tr n1j n6ji n8kad nk5ans n1ke n8kerla n1ki nk5inh -\n{n5kl"o} n1k2n n8k5not nk3rot \n{n8kr"u} nk5spo nk6t5r n8kuh -\n{n6k"ub} n5l6 nli4mi n1m nmen4s n1na n8nerg nni5o n1no nn4t3ak nnt1h -nnu1e n1ny \n{n1n"a} \n{n1n"o} \n{n1n"u} no5a no4b3la 4n3obs 2nobt -noche8 no6die no4dis no8ia no5isc 6n5o6leu no4mal noni6er 2n1onk n1ony -4n3o4per 6nopf 6nopti no3ra no4ram nor6da 4n1org 2n1ort n6os no1st -8nost. no8tan no8ter noty6pe 6n5ox n1p2 n1q n1r \n{nr"os3} 6ns n1sac -ns3ang n1sc n8self n8s5erf n8serg n6serk ns5erw n8sint n1s2pe n1spr -n6s5tat. n5s6te. n6stob n1str n1ta n4t3a4go nt5anh nt3ark nt3art -n1te nt3eis nte5n6ar nte8nei nter3a nte6rei nt1ha nt6har n3ther nt5hie -n3thus n1ti nti1c n8tinh nti1t ntlo6b ntmen8 n1to nt3o4ti n1tr ntra5f -ntra5ut nt8rea nt3rec nt8rep n4t3rin nt8rop n4t3rot \n{n4tr"u} nt1s -nts6an nt2sk n1tu nt1z \n{n1t"a} \n{n1t"o} \n{n8t"ol} \n{n1t"u} 1nu -nu1a nu5el nu5en 4n1uhr nu5ie 8numl 6n5ums 6n5umw 2n1und 6nuni 6n5unr -2n1unt 2nup 2nu6r n5uri nu3skr nu5ta n1v 8n1w 1nys n1za n6zab n2z1ar -n6zaus nzi4ga n8zof n6z5unt n1zw n6zwir \n{1n"ac} \n{5n"ae} \n{5n"ai} -\n{n8"al} \n{n"a6m} \n{n"a6re} \n{n5"arz} \n{5n"aus} \n{n1"ol} -\n{1n"ot} \n{n5"oz} \n{5n"u.} \n{6n1"u2b} \n{5n"u\3} \n{\c{5n"u\9}} -o5ab. oa2l o8ala o1a2m o1an ob1ac obe4ra o6berh 5o4bers o4beru -obe6ser 1obj o1bl o2bli ob5sk 3obst. ob8sta obst5re ob5sz o1che -oche8b o8chec o3chi och1l och3m ocho8f o3chro och3to o3chu och1w o1d -o2d1ag od2dr ode5i ode6n5e od1tr o5e6b o5e6der. oe8du o1ef o1e2l -o1e2p o1er. o5e8x o1fa of8fan 1offi of8fin of6f5la o5fla o1fr 8o1g -og2n o1ha o1he o6h5eis o1hi ohl1a oh1le oh4l3er 5ohm. oh2ni o1ho -oh1re oh1ru o1hu oh1w o1hy \n{o1h"a} o5ia o1id. o8idi oi8dr o5ids -o5isch. oiset6 o1ism o3ist. o5i6tu o1j o1k ok2l ok3lau \n{o8kl"a} -1okta o1la old5am old5r o1le ole5in ole1r ole3u ol6gl ol2kl olk4s1 -ol8lak ol8lauf. ol6lel ol8less o1lo ol1s ol6sk o1lu oly1e2 5olym -o2mab om6an o8mau ombe4 o8merz om5sp o1mu o8munt \n{o1m"a} \n{o1m"o} -o1na ona8m on1ax on8ent o6n5erb 8oni oni5er. on1k on6n5a6b o1no ono1c -o4nokt 1ons onts8 \n{o1n"a} oo8f 1oog oo2pe oo2sa o1pa 3o4pera o3pfli -opf3lo opf3r o1pi o1pl o2pli o5p6n op8pa op6pl o1pr o3p4ter 1opti -\n{o1p"a} \n{o5p"o} o1q o1ra. o3rad o8radd 1oram o6rang o5ras o8rauf -or5cha or4d3a4m or8dei or8deu 1ordn or4dos o1re o5re. ore2h o8r5ein -ore5isc or6enn or8fla or8fli 1orga 5orgel. or2gl o1ri 5o6rient or8nan -\n{or8n"a} o1ro or1r2h or6t5an or8tau or8tere o1rus o1ry \n{o1r"a} -\n{or1"u2} o1sa osa3i 6ose o8serk o1sk o6ske o6ski os2kl os2ko os2kr -osni5e o2s1o2d o3s4per o4stam o6stau o3stra ost3re osu6 o6s5ur o5s6ze -o1ta ot3auf o6taus o1te o6terw o1th othe5u o2th1r o1ti o1to oto1a -ot1re o1tri o1tro ot1sc o3tsu ot6t5erg ot2t3h ot2t5r \n{ot8t"o} o1tu -ou3e ouf1 ou5f6l o5u6gr ou5ie ou6rar ou1t6a o1v o1wa o1we o6wer. o1wi -owid6 o1wo o5wu o1xe oy5al. oy1e oy1i o5yo o1z oza2r 1o2zea ozo3is -\n{o"o8} o\35elt \c{o\95elt} o\31t \c{o\91t} 3paa pa6ce 5pad pag2 1pak -pa1la pa8na8t pani5el pa4nor pan1s2 1pap pap8s pa8rei par8kr paro8n -par5o6ti part8e 5partei 3partn pas6sep pa4tha 1pau 6paug pau3sc p1b -8p5c 4p1d 1pe 4peic pe5isc 2pek pen3k pen8to8 p8er pe1ra pere6 per5ea -per5eb pe4rem 2perr per8ran 3pers 4persi \n{pe3r"u} pe4sta pet2s -p2f1ec p4fei pf1f pf2l 5pflanz pf8leg pf3lei 2pft pf3ta p1g 1ph 2ph. -2p1haf 6phb 8phd 6p5heit ph5eme 6phg phi6e 8phk 6phn p5holl pht2 -ph3tha 4ph3the phu6 6phz pi1en pi5err pi1la pi1na 5pinse pioni8e 1pis -pi1s2k pi1th p1k pl8 5pla p2lau 4plei p3lein 2pler 6p5les 2plig p6lik -6p5ling p2liz plo8min 6p1m p1n 1p2o 8poh 5pol po8lan poly1 po3ny po1ra -2porn por4t3h \n{po5r"o} 5poti p1pa p6p5ei ppe6la pp5f p2p1h p1pi pp1l -ppp6 pp5ren pp1s \n{p5p"o} pr6 3preis 1pres 2p3rig 5prinz 1prob 1prod -5prog pro8pt pro6t5a prote5i 8pro\3 \c{8pro\9} \n{pr"a3l} \n{1pr"as} -\n{pr"ate4} \n{1pr"uf} p5schl 2pst 1p2sy p1t p8to8d pt1s 5p6ty 1pu -pu1b2 2puc pu2dr puf8fr 6p5uh pun8s pu8rei pu5s6h pu1ta p1v p3w 5py -py5l p1z \n{p"a6der} \n{p5"a6m} \n{p"a8nu} \n{8p"ar} \n{p"at5h} -\n{p"at1s} qu6 1qui 8rabk ra6bla 3rable ra2br r1abt 6rabz ra4dan ra2dr -5rafal ra4f3er ra5gla ra2g3n 6raha ral5am 5rald 4ralg ra8lins 2rall -ral5t 8ramei r3anal r6and ran8der ran4dr 8ranf 6ranga 5rangi ran8gli -r3angr rans5pa 8ranw r8anz. ra5or 6rapf ra5pl rap6s5er 2r1arb 1rarh -r1arm ra5ro 2r1art 6r1arz ra8tei ra6t5he 6ratl ra4t3ro r5atta raue4n -6raus. r5austa rau8tel raut5s ray1 r1b rb5lass r6bler rb4lie rbon6n -r8brecht \n{rb6s5t"a} r8ces r1che rch1l rch3m rch3re rch3tr rch1w 8rd -r1da r8dachs r8dap rda5ro rde5ins rdio5 r8dir rd3ost r1dr r8drau 1re. -re1ak 3reakt re3als re6am. re1as 4reben re6bl rech5a r8edi re3er -8reff 3refl 2reh 5reha r4ei. reich6s5 8reier 6reign re5imp 4r3eina -6r3einb 6reing 6r5einn 6reinr 4r3eins r3eint reli3e 8r5elt 6rempf -2remt ren5a6b ren8gl r3enni 1reno 5rente 4r3enth 8rentl 4r3entw 8rentz -ren4zw re1on requi5 1rer rer4bl 6rerbs 4r3erd \n{8rerh"o} 8rerkl -4r3erla \n{8rerl"o} 4r3erns \n{6r5ern"a} rer5o 6r5erreg r5ertr r5erwec -\n{r5er"o} re2sa re8schm 2ress re5u8ni 6rewo 2r1ex r1f r8ferd rf4lie -8r1g r8gah rge4bl rge5na rgest4 rg6ne r2gni2 r8gob r4g3ret rg8sel r1h8 -r2hy 5rhyt ri1ar ri5cha rid2g r2ie rieg4s5 ri8ei ri1el ri6ele ri1en -ri3er. ri5ers. ri6fan ri8fer ri8fr 1r2ig ri8kn ri5la \n{rim"a8} -ri1na r8inde rin4ga rin6gr 1rinn 6rinner rino1 r8insp 4rinst -\n{ri1n"a} ri5o6ch ri1o2d ri3o6st 2r1ir r2is ri3sko ri8spr \n{ri8st"u} -ri5sv r2it 6r5i6tal ri5tr ri6ve. 8r1j 6rk r1ke rkehrs5 r1ki r3klin -r1k2n rk3str rk4t3an rk6to r6kuh \n{rk"a4s3t} r1l r5li rline5a 6r1m -r6manl rma4p r4m3aph r8minf r8mob rm5sa 2rn r1na rna8be r5ne rn2ei -r6neif r6nex r6nh rn1k r1no r6n5oc rn1sp \n{r1n"a} \n{r1n"u} ro6bern -6robs ro1ch 3rock. ro5de ro1e 4rofe ro8hert 1rohr ro5id ro1in ro5isc -6rolym r2on 6roog ro6phan r3ort ro1s2p ro5s6w ro4tau ro1tr ro6ts 5rout -r1p rpe8re rp2f r2ps r2pt r1q 2rr r1ra r1re rrer6 rr6hos \n{r5rh"o} -r1ri r1ro rro8f rr8or rror5a r1ru r3ry \n{r1r"a} \n{r1r"o} \n{r1r"u} -2r1s r6sab r4sanf rse6e rse5na r2sh r6ska r6ski rs2kl r8sko r2sl rs2p -r6stauf r8sterw r8stran rswi3d4 r2sz 2r1t rt3art r8taut r5tei rt5eige -r8tepe r4t3erh r8terla r4t3hei r5t6hu r4t3int rt5reif rt1sc rt6ser -rt6s5o rt6s5u rt5und r8turt rube6 ru1en 1r4uf ruf4st ru1ie 2r1umg -2r1uml 2rums run8der run4d5r 6rundz 6runf 8runs 2r1unt 2r1ur r6us -ru6sta ru3str ru6tr 1ruts r1v rven1 rvi2c r1w r1x r1za rz5ac r6z5al -r8z1ar r8zerd r6z5erf rz8erh rz4t3h r8zum \n{r"a4ste} \n{r"au8sc} -\n{r1"of} \n{5r"ohr} \n{r"o5le} \n{3r"oll} \n{5r"omis} \n{r1"or} -\n{r"o2sc} \n{3r"ump} 1sa. 1saa s3a4ben sa2bl 2s1abs 6s1abt 6sabw -3sack. 6s3a4der 1saf sa1fa 4s1aff sa5fr 1sag 1sai sa1i2k1 4s1akt 1sal -sa1la 4s3alpi 6salter salz3a 1sam s5anb san2c 1sand s5angeh 6sanl -2s1ans 6s3antr 8s1anw s1ap s6aph 8sapo sap5p6 s8ar. 2s1arb 3sarg -s1arm sa5ro 2s1art 6s1arz 1sas 1sat sat8a 2s1atl sa8tom 3s8aue s5auff -sau5i s6aur 2s1aus 5s6ause 2s1b2 2sca s4ce 8sch. 3scha. 5schade -3schaf 3schal sch5ame 8schanc 8schb 1sche 6schef 8schex 2schf 2schg -2schh 1schi 2schk 5schlag 5schlu \n{6schm"a\3} \n{\c{6schm"a\9}} -6schna\3 \c{6schna\9} 1scho 6schord 6schp 3schri 8schric 8schrig -8schrou 6schs 2scht sch3ta sch3tr 1schu 8schunt 6schv 2schz \n{5sch"o} -\n{5sch"u} 2sco scre6 6scu 2s1d 1se se5an se1ap se6ben se5ec see5i6g -se3erl 8seff se6han se8hi \n{se8h"o} 6s5eid. 2s1eig s8eil 5sein. -sei5n6e 6s5einh 3s8eit 3sel. se4lar selb4 6s3e4lem se8lerl 2s1emp -sen3ac se5nec 6s5ents 4sentz s8er. se8reim ser5inn \n{8serm"a} -8s5erzi \n{6ser"of} se1um 8sexa 6sexp 2s1f2 sfal8ler 2s3g2 sge5b2 s1h -s8hew 5s6hip 5s4hop 1si 2siat si1b sicht6s 6s5i6dee siege6s5 si1en -si5err si1f2 si1g2n si6g5r si8kau sik1i si4kin si2kl \n{si8k"u} si1la -sil6br si1na 2s1inf sin5gh 2s1inh sinne6s5 2s1ins si5ru si5str 4s1j -s1k2 6sk. 2skau skel6c skelch5 s6kele 1s2ki. 3s4kin. s6kiz s8kj -6skn 2skow 3skrib 3skrip 2sku \n{8sk"u} s1l s8lal slei3t s4low 2s1m -s1n 6sna 6snot 1so so1ch 2s1odo so4dor 6s5o4fen solo3 s2on so5of 4sope -so1ra 2s1ord 4sorga sou5c so3un 4s3ox sp2 8spaa 5spal 1span 2spap -s2pec s4peis 1spek s6perg 4spers s6pes 2s1pf 8sphi \n{1s2ph"a} 1spi -spi4e 6s5pig 6spinse 2spis 2spla 2spol 5s6pom 6s5pos 6spoti 1spra -3s8prec 6spreis 5spring 6sprob 1spru s2pul 1s2pur 6spy \n{5sp"an} -\n{1sp"u} s1q 2s1r 2s1s2 sse8nu ssini6s ssoi6r 2st. 1sta 4stafe 2stag -sta3la 6stale 4stalg 8stalk 8stamt 6st5anf 4stans 6stanw 6starb sta4te -6staus 2stb 6stc 6std 1ste 4steil 3s2tel st3elb 8stemb 6steppi 8stese -8stesse 6stf 2stg 2sth st1ha st3hei s8t1hi st1ho st5hu 1sti sti4el -4stigm sti3na 6stind 4stinf sti8r 2stk 2stl 2stm 1sto 6stoll. 4st3ope -6stopf. 6stord 6stp 5stra. 4strai 3s4tral 6s5traum 3stra\3 -\c{3stra\9} 3strec 6s3tref 8streib 5streif 6streno 6stres 6strev -5s6tria 6strig 5strik 8strisi 3s4troa s8troma st5rose 4struf 3strum -\n{6str"ag} 2st1s6 2stt 1stu stu5a 4stuc 2stue 8stun. 2stv 2stw s2tyl -6stz \n{1st"a} \n{8st"ag} \n{1st"o} \n{1st"u} \n{8st"uch} \n{4st"ur.} -1su su2b1 3suc su1e su2fe su8mar 6sumfa 8sumk 2s1unt sup1p2 6s5u6ran -6surte 2s1v 2s1w 1sy 8syl. sy5la syn1 sy2na syne4 s1z s4zend 5s6zene. -8szu \n{1s"a} \n{6s5"and} \n{6s"augi} \n{6s"au\3} \n{\c{6s"au\9}} -\n{5s"om} \n{2s1"u2b} \n{1s"uc} \n{s"u8di} \n{1s"un} \n{5s"u\3} -\n{\c{5s"u\9}} taats3 4tab. taba6k ta8ban tab2l ta6bre 4tabs t3absc -8tabz 6t3acht ta6der 6tadr tad6s tad2t 1tafe4 1tag ta6ga6 ta8gei -tage4s tag6s5t tah8 tahl3 tai6ne. ta5ir. tak8ta tal3au 1tale ta8leng -tal5ert 6t5a6mer 6tamp tampe6 2t1amt tan5d6a tan8dr tands5a tani5e -6tanl 2tanr t3ans 8t5antr tanu6 t5anw 8tanwa tan8zw ta8rau 6tarbe -1tari 2tark 2t1arm ta1ro 2tart t3arti 6tarz ta1sc ta6sien ta8stem -ta8sto t5aufb 4taufn 8taus. 5tause 8tausf 6tausg t5ausl 2t1b2 2t1c -t6chu 2t1d te2am tea4s te8ben 5techn 4teff te4g3re te6hau 2tehe te4hel -2t1ehr te5id. teig5l 6teign tei8gr 1teil 4teinh t5einhe 4teis t5eisen -8teiw te8lam te4lar 4telek 8telem te6man te6n5ag ten8erw ten5k tens4p -ten8tro 4t3entw 8tentz te6pli 5teppi ter5a6b te3ral ter5au 8terbar -t5erbe. 6terben 8terbs 4t3erbt t5erde. ter5ebe ter5ein te8rers terf4 -\n{8terh"o} \n{6terkl"a} ter8nor ter6re. t8erscha t5e6sel te8stau -t3euro te1xa tex3e 8texp tex6ta 2t1f2 2t1g2 2th. th6a 5tha. 2thaa -6t1hab 6t5haf t5hah 8thak 3thal. 6thals 6t3hand 2t1hau 1the. 3t4hea -t1heb t5heil t3heit t3helf 1theo 5therap 5therf 6t5herz 1thes 1thet -5thi. 2t1hil t3him 8thir 3this t5hj 2th1l 2th1m th1n t5hob t5hof -4tholz 6thopti 1thr6 4ths t1hum 1thy \n{4t1h"a} \n{2t1h"o} \n{t1h"u} -ti1a2m ti1b tie6fer ti1en ti8gerz tig3l ti8kin ti5lat 1tilg t1ind -tin4k3l ti3spa ti5str 5tite ti5tr ti8vel ti8vr 2t1j 2t1k2 2t1l tl8a -2t1m8 2t1n 3tobe 8tobj to3cha 5tocht 8tock tode4 to8del to8du to1e -6t5o6fen to1in toi6r 5toll. to8mene t2ons 2t1ony to4per 5topf. 6topt -to1ra to1s to6ska tos2l 2toti to1tr t8ou 2t1p2 6t1q tr6 tra5cha -tra8far traf5t 1trag tra6gl tra6gr t3rahm 1trai t6rans tra3sc tra6st -3traue t4re. 2trec t3rech t8reck 6t1red t8ree 4t1reg 3treib 4treif -8t3reis 8trepo tre6t5r t3rev 4t3rez 1trib t6rick tri6er 2trig t8rink -tri6o5d trizi5 tro1a 3troc trocke6 troi8d tro8man. tro3ny 5tropf -6t5rosa t5ro\3 \c{t5ro\9} 5trub 5trup trut5 \n{1tr"ag} \n{6t1r"oh} -\n{5tr"ub} \n{tr"u3bu} \n{t1r"uc} \n{t1r"us} 2ts ts1ab t1sac tsa8d -ts1ak t6s5alt ts1an ts1ar ts3auf t3schr \n{t5sch"a} tse6e tsee5i -tsein6s ts3ent ts1er t8serf t4serk t8sh 5t6sik t4s3int ts5ort. -t5s6por t6sprei t1st t6s5tanz ts1th t6stit t4s3tor 1t2sua t2s1uf -t8sum. t2s1u8n t2s1ur 2t1t tt5eif tte6sa tt1ha tt8ret tt1sc tt8ser -tt5s6z 1tuc tuch5a 1tu1e 6tuh t5uhr tu1i tu6it 1tumh 6t5umr 1tums -8tumt 6tund 6tunf 2t1unt tu5ra tu6rau tu6re. tu4r3er 2t1v 2t1w 1ty1 -ty6a ty8la 8tym 6ty6o 2tz tz5al tz1an tz1ar t8zec tzeh6 tzehn5 t6z5ei. -t6zor t4z3um \n{t6z"au} \n{5t"ag} \n{6t"ah} \n{t5"alt} \n{t8"an} -\n{t"are8} \n{8t"a8st} \n{6t"au\3} \n{\c{6t"au\9}} \n{t5"offen} -\n{8t"o8k} \n{1t"on} \n{4t"ub} \n{t6"u5ber.} \n{5t"uch} \n{1t"ur.} -u3al. u5alb u5alf u3alh u5alk u3alp u3an. ua5na u3and u5ans u5ar. -ua6th u1au ua1y u2bab ubi5er. u6b5rit ubs2k \n{u5b"o} \n{u8b"ub} 2uc -u1che u6ch5ec u1chi uch1l uch3m uch5n uch1r uch5to ucht5re u1chu uch1w -uck1a uck5in u1d ud4a u1ei u6ela uene8 u6ep u1er uer1a ue8rerl uer5o -u8esc u2est u8ev u1fa u2f1ei u4f3ent u8ferh uf1fr uf1l uf1ra uf1re -\n{uf1r"a} \n{uf1r"u} uf1s2p uf1st uft1s u8gabt u8gad u6gap ugeb8 u8gn -ugo3s4 u1ha u1he u1hi uh1le u1ho uh1re u1hu uh1w \n{u1h"a} \n{u1h"o} -6ui ui5en u1ig u3ins uin8tes u5isch. u1j 6uk u1ke u1ki u1kl u8klu -u1k6n u5ky u1la uld8se u1le ul8lac ul6lau ul6le6l ul6lo ulni8 u1lo -ulo6i ult6a ult8e u1lu ul2vr \n{u1l"a} \n{u1l"o} 3umfan 5umlau umo8f -um8pho u1mu umu8s \n{u5m"o} u1n1a un2al un6at unau2 6und. 5undein -un4d3um 3undzw \n{und"u8} \n{un8d"ub} une2b un1ec une2h un3eis 3unfal -\n{1unf"a} 5ungea \n{3ungl"u} ung2s1 \n{un8g"a} 1u2nif un4it un8kro -unk5s u1no unpa2 uns2p unvol4 unvoll5 u5os. u1pa u1pi u1p2l u1pr -up4s3t up2t1a u1q u1ra ur5abs ura8d ur5ah u6rak ur3alt u6rana u6r5ans -u8rap ur5a6ri u8ratt u1re ur3eig ur8gri u1ri ur5ins 3urlau urmen6 -ur8nan u1ro 3ursac ur8sau ur8sei ur4sk 3urtei u1ru uru5i6 uru6r u1ry -ur2za \n{ur6z"a} \n{ur5"a6m} \n{u5r"o} \n{u1r"u} \n{ur"uck3} u1sa -usa4gi u2s1ar u2s1au u8schec usch5wi u2s1ei use8kel u8sl u4st3a4b -us3tau u3s4ter u2s1uf u8surn ut1ac u1tal uta8m u1tan ut1ar u1tas ut1au -u1te u8teic u4tent u8terf u6terin u4t3hei ut5ho ut1hu u1ti utine5 -uti6q u1to uto5c u1tr ut1sa ut1s6p ut6stro u1tu utz5w u1u u1v uve5n -\n{uve3r4"a} u1w u1xe u5ya uy5e6 u1yi u2z1eh u8zerh \n{u5"o} u\3e6n -\c{u\9e6n} u\3en5e \c{u\9en5e} 8vanb 6vang 6varb var8d va6t5a va8tei -va2t1r 2v1b 6v5c 6vd 1ve 6ve5g6 ver1 ver5b verb8l ve2re2 verg8 ve2ru8 -ve1s ve2s3p ve3xe 2v1f 2v1g 6v5h vi6el vie6w5 vi1g4 vi8leh vil6le. -8vint vi1ru vi1tr 2v1k 2v1l 2v1m 4v5n 8vo8f voi6le vol8lend vol8li -v2or1 vo2re vo8rin vo2ro 2v1p 8vra v6re 2v1s 2v1t 2v1v 4v3w 2v1z -waffe8 wa6g5n 1wah wah8n wa5la wal8din wal6ta wan4dr 5ware wa8ru -war4za 1was w5c w1d 5wech we6fl 1weg we8geng weg5h weg3l we2g1r -weh6r5er 5weise weit3r wel2t welt3r we6rat 8werc 5werdu wer4fl 5werk. -wer4ka wer8ku wer4ta wer8term we2sp we8stend we6steu we8str -\n{we8st"o} wet8ta wich6s5t 1wid wi2dr wiede4 wieder5 wik6 wim6ma -win4d3r 5wirt wisch5l 1wj 6wk 2w1l 8w1n wo1c woche6 wol6f wor6t5r 6ws2 -w1sk 6w5t 5wunde. wun6gr wu1sc wu2t1 6w5w wy5a \n{w"arme5} \n{w"a1sc} -1xag x1ak x3a4men 8xamt x1an 8x1b x1c 1xe. x3e4g 1xen xe1ro x1erz -1xes 8xf x1g 8x1h 1xi 8xid xi8so 4xiste x1k 6x1l x1m 8xn 1xo 8x5o6d -8x3p2 x1r x1s6 8x1t x6tak x8terf x2t1h 1xu xu1e x5ul 6x3w x1z 5ya. -y5an. y5ank y1b y1c y6cha y4chia y1d yen6n y5ern y1g y5h y5in y1j -y1k2 y1lak yl1al yla8m y5lax y1le y1lo y5lu y8mn ym1p2 y3mu y1na yno2d -yn1t y1on. y1o4p y5ou ypo1 y1pr y8ps y1r yri3e yr1r2 y1s ys5iat ys8ty -y1t y3w y1z \n{y"a8m} z5a6b zab5l 8za6d 1zah za5is 4z3ak 6z1am 5zange. -8zanl 2z1ara 6z5as z5auf 3zaun 2z1b 6z1c 6z1d 1ze ze4dik 4z3eff 8zein -zei4ta zei8ters ze6la ze8lec zel8th 4zemp 6z5engel zen8zin \n{8zerg"a} -zer8i ze1ro zers8 zerta8 zer8tab zer8tag 8zerz ze8ste zeu6gr 2z1ex -2z1f8 z1g 4z1h 1zi zi1en zi5es. 4z3imp zi1na 6z5inf 6z5inni zin6s5er -8zinsuf zist5r zi5th zi1tr 6z1j 2z1k 2z1l 2z1m 6z1n 1zo zo6gl 4z3oh -zo1on zor6na8 4z1p z5q 6z1r 2z1s8 2z1t z4t3end z4t3hei z8thi 1zu zu3al -zu1b4 zu1f2 6z5uhr zun2a 8zunem zunf8 8zungl zu1o zup8fi zu1s8 zu1z -2z1v zw8 z1wal 5zweck zwei3s z1wel z1wer z6werg 8z5wes 1zwi zwi1s -6z1wo 1zy 2z1z zz8a zzi1s \n{1z"a} \n{1z"o} \n{6z"ol.} \n{z"o1le} -\n{1z"u} \n{2z1"u2b} \n{"a1a6} \n{"ab1l} \n{"a1che} \n{"a3chi} -\n{"ach8sc} \n{"ach8sp} \n{"a5chu} \n{"ack5a} \n{"ad1a} \n{"ad5era} -\n{"a6d5ia} \n{"a1e} \n{"a5fa} \n{"af1l} \n{"aft6s} \n{"ag1h} -\n{"ag3le} \n{"a6g5nan} \n{"ag5str} \n{"a1he} \n{"a1hi} \n{"ah1le} -\n{"ah5ne} \n{1"ahnl} \n{"ah1re} \n{"ah5ri} \n{"ah1ru} \n{"a1hu} -\n{"ah1w} \n{6"ai} \n{"a1isc} \n{"a6ische} \n{"a5ism} \n{"a5j} -\n{"a1k} \n{"al1c} \n{"a1le} \n{"a8lei} \n{"al6schl} \n{"ami1e} -\n{"am8n} \n{"am8s} \n{"a5na} \n{5"anderu} \n{"ane5i8} \n{"ang3l} -\n{"ank5l} \n{"a1no} \n{"an6s5c} \n{"a1pa} \n{"ap6s5c} \n{3"aq} -\n{"ar1c} \n{"a1re} \n{"are8m} \n{5"argern} \n{"ar6gl} \n{"a1ri} -\n{3"armel} \n{"a1ro} \n{"art6s5} \n{"a1ru} \n{3"arztl} \n{"a5r"o} -\n{"a6s5chen} \n{"asen8s} \n{"as1th} \n{"ata8b} \n{"a1te} \n{"ateri4} -\n{"ater5it} \n{"a6thy} \n{"a1ti} \n{3"atk} \n{"a1to} \n{"at8schl} -\n{"ats1p} \n{"a5tu} \n{"aub1l} \n{"au1e} \n{1"aug} \n{"au8ga} -\n{"au5i} \n{"a1um.} \n{"a1us.} \n{1"au\3} \n{\c{1"au\9}} \n{"a1z} -\n{"o1b} \n{"o1che} \n{"o5chi} \n{"och8stei} \n{"och8str} \n{"ocht6} -\n{5"o6dem} \n{5"offn} \n{"o1he} \n{"oh1l8} \n{"oh1re} \n{"o1hu} -\n{"o1is} \n{"o1ke} \n{1"o2ko} \n{1"ol.} \n{"ol6k5l} \n{"ol8pl} -\n{"o1mu} \n{"o5na} \n{"onig6s3} \n{"o1no} \n{"o5o6t} \n{"opf3l} -\n{"op6s5c} \n{"o1re} \n{"or8gli} \n{"o1ri} \n{"or8tr} \n{"o1ru} -\n{5"osterr} \n{"o1te} \n{"o5th} \n{"o1ti} \n{"o1tu} \n{"o1v} \n{"o1w} -\n{"owe8} \n{"o2z} \n{"ub6e2} \n{3"u4ber1} \n{"ub1l} \n{"ub1r} -\n{5"u2bu} \n{"u1che} \n{"u1chi} \n{"u8ch3l} \n{"uch6s5c} \n{"u8ck} -\n{"uck1a} \n{"uck5ers} \n{"ud1a2} \n{"u6deu} \n{"udi8t} \n{"u2d1o4} -\n{"ud5s6} \n{"uge4l5a} \n{"ug1l} \n{"uh5a} \n{"u1he} \n{"u8heh} -\n{"u6h5erk} \n{"uh1le} \n{"uh1re} \n{"uh1ru} \n{"u1hu} \n{"uh1w} -\n{"u3k} \n{"u1le} \n{"ul4l5a} \n{"ul8lo} \n{"ul4ps} \n{"ul6s5c} -\n{"u1lu} \n{"un8da} \n{"un8fei} \n{"unk5l} \n{"un8za} \n{"un6zw} -\n{"u5pi} \n{"u1re} \n{"u8rei} \n{"ur8fl} \n{"ur8fr} \n{"ur8geng} -\n{"u1ri} \n{"u1ro} \n{"ur8sta} \n{"ur8ster} \n{"u1ru} \n{"use8n} -\n{"u8sta} \n{"u8stes} \n{"u6s5tete} \n{"u3ta} \n{"u1te} \n{"u1ti} -\n{"ut8tr} \n{"u1tu} \n{"ut8zei} \n{"u1v} \31a8 \c{\91a8} 5\3a. -\c{5\9a.} \38as \c{\98as} \31b8 \c{\91b8} \31c \c{\91c} \31d \c{\91d} -1\3e \c{1\9e} \35ec \c{\95ec} 8\3e8g \c{8\9e8g} 8\3e8h \c{8\9e8h} -2\31ei \c{2\91ei} 8\3em \c{8\9em} \31f8 \c{\91f8} \31g \c{\91g} \31h -\c{\91h} 1\3i \c{1\9i} \31k \c{\91k} \31l \c{\91l} \31m \c{\91m} -\3mana8 \c{\9mana8} \31n \c{\91n} \31o \c{\91o} \31p8 \c{\91p8} \35q -\c{\95q} \31r \c{\91r} \31s2 \c{\91s2} \3st8 \c{\9st8} \31ta \c{\91ta} -\31te \c{\91te} \3t3hei \c{\9t3hei} \31ti \c{\91ti} \35to \c{\95to} -\31tr \c{\91tr} 1\3u8 \c{1\9u8} 6\35um \c{6\95um} \31v \c{\91v} \31w -\c{\91w} \31z \c{\91z} -}% -\endgroup -\relax\endinput -% -% ----------------------------------------------------------------- -% -% =============== Additional Documentation =============== -% -% -% Older Versions of German Hyphenation Patterns: -% ---------------------------------------------- -% -% All older versions of `ghyphen.tex' distributed as -% -% ghyphen.tex/germhyph.tex as of 1986/11/01 -% ghyphen.min/ghyphen.max as of 1988/10/10 -% ghyphen3.tex as of 90/09/27 & 91/02/13 -% -% are out of date and it is recommended to replace them -% with the new version `ghyph31.tex'. -% -% If you are using `ghyphen.min' (a minor version of `ghyphen') -% because of limited trie memory space, try this version and if -% the space is exceeded get a newer TeX implementation with -% larger or configurable trie memory sizes. -% -% -% -% Trie Memory Requirements/Space for Hyphenation Patterns: -% -------------------------------------------------------- -% -% To load this set of german hyphenation patterns the parameters -% of TeX has to have at least these values: -% -% TeX 3.x: -% IniTeX: trie_size >= 9733 trie_op_size >= 207 -% VirTeX: trie_size >= 8375 trie_op_size >= 207 -% -% TeX 2.x: -% IniTeX: trie_size >= 8675 trie_op_size >= 198 -% VirTeX: trie_size >= 7560 trie_op_size >= 198 -% -% If you want to load more than one set of hyphenation patterns -% (in TeX 3.x), the parameters have to be set to a value larger -% than or equal to the sum of all required values for each set. -% -% -% Setting Trie Memory Parameters: -% ------------------------------- -% -% Some implementations allow the user to change the default value -% of a set of the internal TeX parameters including the trie memory -% size parameter specifying the used memory for the hyphenation -% patterns. -% -% emTeX (PC): -% You can set the used memory size of the trie using the -% `-mt<number>' option on the command line or in the -% TEXOPTIONS environment variable. -% -% PasTeX (Amiga): -% The values for the parameters can be set using the keywords -% `triesize', `itriesize' and `trieopsize' in the configuration -% file. -% -% others (binaries only): -% See the documentation of the implementation if it is possible -% and how to change these values without recompilation. -% -% others (with sources, e.g. PublicTeX (PC), web2c (Unix et.al.)): -% If the trie memory is too small, you have to recompile TeX -% using larger values for `trie_size' and `trie_op_size'. -% Modify the change file pctex.ch/ctex.ch and recompile TeX. -% For details see the documentation included in the sources. -% -% -% -% Necessary Settings in TeX macro files: -% -------------------------------------- -% -% \lefthyphenmin, \righthyphenmin: -% You can set both parameters to 2. -% -% \lccode <char>: -% To get correct hyphenation points within words containing -% umlauts or \ss, it's necessary to assign values > 0 to the -% appropriate \lccode <char> positions. -% -% These changes are done when reading this file (\lccode for umlauts) -% or are included in the language switching mechanism of `german.sty' -% (\lccode change for \ss, \left-/\righthyphenmin settings). -% -% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% -\endinput -%% -%% End of file `ghyph31.tex'. diff --git a/macros/ec-plain/hyacceur.tex b/macros/ec-plain/hyacceur.tex deleted file mode 100644 index bf82e6fa18..0000000000 --- a/macros/ec-plain/hyacceur.tex +++ /dev/null @@ -1,143 +0,0 @@ -% -%%%%%% adaptation pour le codage ed/dc: Yannis Haralambous -%%%%%% complete par D. Taupin pour tout ce qui passe de maj a min -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Villeneuve d'Ascq 10/7/91 Orsay 28/2/92 -% -\catcode`\^^c0=11\uccode`\^^c0=`\^^c0\lccode`\^^c0=`\^^e0 -\catcode`\^^c1=11\uccode`\^^c1=`\^^c1\lccode`\^^c1=`\^^e1 -\catcode`\^^c2=11\uccode`\^^c2=`\^^c2\lccode`\^^c2=`\^^e2 -\catcode`\^^c3=11\uccode`\^^c3=`\^^c3\lccode`\^^c3=`\^^e3 -\catcode`\^^c4=11\uccode`\^^c4=`\^^c4\lccode`\^^c4=`\^^e4 -\catcode`\^^c5=11\uccode`\^^c5=`\^^c5\lccode`\^^c5=`\^^e5 -\catcode`\^^c6=11\uccode`\^^c6=`\^^c6\lccode`\^^c6=`\^^e6 -\catcode`\^^c7=11\uccode`\^^c7=`\^^c7\lccode`\^^c7=`\^^e7 -\catcode`\^^c8=11\uccode`\^^c8=`\^^c8\lccode`\^^c8=`\^^e8 -\catcode`\^^c9=11\uccode`\^^c9=`\^^c9\lccode`\^^c9=`\^^e9 -\catcode`\^^ca=11\uccode`\^^ca=`\^^ca\lccode`\^^ca=`\^^ea -\catcode`\^^cb=11\uccode`\^^cb=`\^^cb\lccode`\^^cb=`\^^eb -\catcode`\^^cc=11\uccode`\^^cc=`\^^cc\lccode`\^^cc=`\^^ec -\catcode`\^^cd=11\uccode`\^^cd=`\^^cd\lccode`\^^cd=`\^^ed -\catcode`\^^ce=11\uccode`\^^ce=`\^^ce\lccode`\^^ce=`\^^ee -\catcode`\^^cf=11\uccode`\^^cf=`\^^cf\lccode`\^^cf=`\^^ef -% -\catcode`\^^d0=11\uccode`\^^d0=`\^^d0\lccode`\^^d0=`\^^f0 -\catcode`\^^d1=11\uccode`\^^d1=`\^^d1\lccode`\^^d1=`\^^f1 -\catcode`\^^d2=11\uccode`\^^d2=`\^^d2\lccode`\^^d2=`\^^f2 -\catcode`\^^d3=11\uccode`\^^d3=`\^^d3\lccode`\^^d3=`\^^f3 -\catcode`\^^d4=11\uccode`\^^d4=`\^^d4\lccode`\^^d4=`\^^f4 -\catcode`\^^d5=11\uccode`\^^d5=`\^^d5\lccode`\^^d5=`\^^f5 -\catcode`\^^d6=11\uccode`\^^d6=`\^^d6\lccode`\^^d6=`\^^f6 -\catcode`\^^d7=11\uccode`\^^d7=`\^^d7\lccode`\^^d7=`\^^f7 -\catcode`\^^d8=11\uccode`\^^d8=`\^^d8\lccode`\^^d8=`\^^f8 -\catcode`\^^d9=11\uccode`\^^d9=`\^^d9\lccode`\^^d9=`\^^f9 -\catcode`\^^da=11\uccode`\^^da=`\^^da\lccode`\^^da=`\^^fa -\catcode`\^^db=11\uccode`\^^db=`\^^db\lccode`\^^db=`\^^fb -\catcode`\^^dc=11\uccode`\^^dc=`\^^dc\lccode`\^^dc=`\^^fc -\catcode`\^^dd=11\uccode`\^^dd=`\^^dd\lccode`\^^dd=`\^^fd -\catcode`\^^de=11\uccode`\^^de=`\^^de\lccode`\^^de=`\^^fe -\catcode`\^^df=11\uccode`\^^df=`\^^df\lccode`\^^df=`\^^ff -% -\catcode`\^^e0=11\uccode`\^^e0=`\^^c0\lccode`\^^e0=`\^^e0 -\catcode`\^^e1=11\uccode`\^^e1=`\^^c1\lccode`\^^e1=`\^^e1 -\catcode`\^^e2=11\uccode`\^^e2=`\^^c2\lccode`\^^e2=`\^^e2 -\catcode`\^^e3=11\uccode`\^^e3=`\^^c3\lccode`\^^e3=`\^^e3 -\catcode`\^^e4=11\uccode`\^^e4=`\^^c4\lccode`\^^e4=`\^^e4 -\catcode`\^^e5=11\uccode`\^^e5=`\^^c5\lccode`\^^e5=`\^^e5 -\catcode`\^^e6=11\uccode`\^^e6=`\^^c6\lccode`\^^e6=`\^^e6 -\catcode`\^^e7=11\uccode`\^^e7=`\^^c7\lccode`\^^e7=`\^^e7 -\catcode`\^^e8=11\uccode`\^^e8=`\^^c8\lccode`\^^e8=`\^^e8 -\catcode`\^^e9=11\uccode`\^^e9=`\^^c9\lccode`\^^e9=`\^^e9 -\catcode`\^^ea=11\uccode`\^^ea=`\^^ca\lccode`\^^ea=`\^^ea -\catcode`\^^eb=11\uccode`\^^eb=`\^^cb\lccode`\^^eb=`\^^eb -\catcode`\^^ec=11\uccode`\^^ec=`\^^cc\lccode`\^^ec=`\^^ec -\catcode`\^^ed=11\uccode`\^^ed=`\^^cd\lccode`\^^ed=`\^^ed -\catcode`\^^ee=11\uccode`\^^ee=`\^^ce\lccode`\^^ee=`\^^ee -\catcode`\^^ef=11\uccode`\^^ef=`\^^cf\lccode`\^^ef=`\^^ef -% -\catcode`\^^f0=11\uccode`\^^f0=`\^^d0\lccode`\^^f0=`\^^f0 -\catcode`\^^f1=11\uccode`\^^f1=`\^^d1\lccode`\^^f1=`\^^f1 -\catcode`\^^f2=11\uccode`\^^f2=`\^^d2\lccode`\^^f2=`\^^f2 -\catcode`\^^f3=11\uccode`\^^f3=`\^^d3\lccode`\^^f3=`\^^f3 -\catcode`\^^f4=11\uccode`\^^f4=`\^^d4\lccode`\^^f4=`\^^f4 -\catcode`\^^f5=11\uccode`\^^f5=`\^^d5\lccode`\^^f5=`\^^f5 -\catcode`\^^f6=11\uccode`\^^f6=`\^^d6\lccode`\^^f6=`\^^f6 -\catcode`\^^f7=11\uccode`\^^f7=`\^^d7\lccode`\^^f7=`\^^f7 -\catcode`\^^f8=11\uccode`\^^f8=`\^^d8\lccode`\^^f8=`\^^f8 -\catcode`\^^f9=11\uccode`\^^f9=`\^^d9\lccode`\^^f9=`\^^f9 -\catcode`\^^fa=11\uccode`\^^fa=`\^^da\lccode`\^^fa=`\^^fa -\catcode`\^^fb=11\uccode`\^^fb=`\^^db\lccode`\^^fb=`\^^fb -\catcode`\^^fc=11\uccode`\^^fc=`\^^dc\lccode`\^^fc=`\^^fc -\catcode`\^^fd=11\uccode`\^^fd=`\^^dd\lccode`\^^fd=`\^^fd -\catcode`\^^fe=11\uccode`\^^fe=`\^^de\lccode`\^^fe=`\^^fe -\catcode`\^^ff=11\uccode`\^^ff=`\^^df\lccode`\^^ff=`\^^ff -% -% -\catcode`\^^80=11\uccode`\^^80=`\^^80\lccode`\^^80=`\^^a0 -\catcode`\^^81=11\uccode`\^^81=`\^^81\lccode`\^^81=`\^^a1 -\catcode`\^^82=11\uccode`\^^82=`\^^82\lccode`\^^82=`\^^a2 -\catcode`\^^83=11\uccode`\^^83=`\^^83\lccode`\^^83=`\^^a3 -\catcode`\^^84=11\uccode`\^^84=`\^^84\lccode`\^^84=`\^^a4 -\catcode`\^^85=11\uccode`\^^85=`\^^85\lccode`\^^85=`\^^a5 -\catcode`\^^86=11\uccode`\^^86=`\^^86\lccode`\^^86=`\^^a6 -\catcode`\^^87=11\uccode`\^^87=`\^^87\lccode`\^^87=`\^^a7 -\catcode`\^^88=11\uccode`\^^88=`\^^88\lccode`\^^88=`\^^a8 -\catcode`\^^89=11\uccode`\^^89=`\^^89\lccode`\^^89=`\^^a9 -\catcode`\^^8a=11\uccode`\^^8a=`\^^8a\lccode`\^^8a=`\^^aa -\catcode`\^^8b=11\uccode`\^^8b=`\^^8b\lccode`\^^8b=`\^^ab -\catcode`\^^8c=11\uccode`\^^8c=`\^^8c\lccode`\^^8c=`\^^ac -\catcode`\^^8d=11\uccode`\^^8d=`\^^8d\lccode`\^^8d=`\^^ad -\catcode`\^^8e=11\uccode`\^^8e=`\^^8e\lccode`\^^8e=`\^^ae -\catcode`\^^8f=11\uccode`\^^8f=`\^^8f\lccode`\^^8f=`\^^af -% -\catcode`\^^90=11\uccode`\^^90=`\^^90\lccode`\^^90=`\^^b0 -\catcode`\^^91=11\uccode`\^^91=`\^^91\lccode`\^^91=`\^^b1 -\catcode`\^^92=11\uccode`\^^92=`\^^92\lccode`\^^92=`\^^b2 -\catcode`\^^93=11\uccode`\^^93=`\^^93\lccode`\^^93=`\^^b3 -\catcode`\^^94=11\uccode`\^^94=`\^^94\lccode`\^^94=`\^^b4 -\catcode`\^^95=11\uccode`\^^95=`\^^95\lccode`\^^95=`\^^b5 -\catcode`\^^96=11\uccode`\^^96=`\^^96\lccode`\^^96=`\^^b6 -\catcode`\^^97=11\uccode`\^^97=`\^^97\lccode`\^^97=`\^^b7 -\catcode`\^^98=11\uccode`\^^98=`\^^98\lccode`\^^98=`\^^b8 -\catcode`\^^99=11\uccode`\^^99=`\^^99\lccode`\^^99=`\^^b9 -\catcode`\^^9a=11\uccode`\^^9a=`\^^9a\lccode`\^^9a=`\^^ba -\catcode`\^^9b=11\uccode`\^^9b=`\^^9b\lccode`\^^9b=`\^^bb -\catcode`\^^9c=11\uccode`\^^9c=`\^^9c\lccode`\^^9c=`\^^bc -\catcode`\^^9d=11\uccode`\^^9d=`\^^9d\lccode`\^^9d=`\^^69 % Idot -> i -\catcode`\^^9e=11\uccode`\^^9e=`\^^d0\lccode`\^^9e=`\^^9e -%\catcode`\^^9f=11\uccode`\^^9f=`\^^9f\lccode`\^^9f=`\^^bf -% -\catcode`\^^a0=11\uccode`\^^a0=`\^^80\lccode`\^^a0=`\^^a0 -\catcode`\^^a1=11\uccode`\^^a1=`\^^81\lccode`\^^a1=`\^^a1 -\catcode`\^^a2=11\uccode`\^^a2=`\^^82\lccode`\^^a2=`\^^a2 -\catcode`\^^a3=11\uccode`\^^a3=`\^^83\lccode`\^^a3=`\^^a3 -\catcode`\^^a4=11\uccode`\^^a4=`\^^84\lccode`\^^a4=`\^^a4 -\catcode`\^^a5=11\uccode`\^^a5=`\^^85\lccode`\^^a5=`\^^a5 -\catcode`\^^a6=11\uccode`\^^a6=`\^^86\lccode`\^^a6=`\^^a6 -\catcode`\^^a7=11\uccode`\^^a7=`\^^87\lccode`\^^a7=`\^^a7 -\catcode`\^^a8=11\uccode`\^^a8=`\^^88\lccode`\^^a8=`\^^a8 -\catcode`\^^a9=11\uccode`\^^a9=`\^^89\lccode`\^^a9=`\^^a9 -\catcode`\^^aa=11\uccode`\^^aa=`\^^8a\lccode`\^^aa=`\^^aa -\catcode`\^^ab=11\uccode`\^^ab=`\^^8b\lccode`\^^ab=`\^^ab -\catcode`\^^ac=11\uccode`\^^ac=`\^^8c\lccode`\^^ac=`\^^ac -\catcode`\^^ad=11\uccode`\^^ad=`\^^8d\lccode`\^^ad=`\^^ad -\catcode`\^^ae=11\uccode`\^^ae=`\^^8e\lccode`\^^ae=`\^^ae -\catcode`\^^af=11\uccode`\^^af=`\^^8f\lccode`\^^af=`\^^af -% -\catcode`\^^b0=11\uccode`\^^b0=`\^^90\lccode`\^^b0=`\^^b0 -\catcode`\^^b1=11\uccode`\^^b1=`\^^91\lccode`\^^b1=`\^^b1 -\catcode`\^^b2=11\uccode`\^^b2=`\^^92\lccode`\^^b2=`\^^b2 -\catcode`\^^b3=11\uccode`\^^b3=`\^^93\lccode`\^^b3=`\^^b3 -\catcode`\^^b4=11\uccode`\^^b4=`\^^94\lccode`\^^b4=`\^^b4 -\catcode`\^^b5=11\uccode`\^^b5=`\^^95\lccode`\^^b5=`\^^b5 -\catcode`\^^b6=11\uccode`\^^b6=`\^^96\lccode`\^^b6=`\^^b6 -\catcode`\^^b7=11\uccode`\^^b7=`\^^97\lccode`\^^b7=`\^^b7 -\catcode`\^^b8=11\uccode`\^^b8=`\^^98\lccode`\^^b8=`\^^b8 -\catcode`\^^b9=11\uccode`\^^b9=`\^^99\lccode`\^^b9=`\^^b9 -\catcode`\^^ba=11\uccode`\^^ba=`\^^9a\lccode`\^^ba=`\^^ba -\catcode`\^^bb=11\uccode`\^^bb=`\^^9b\lccode`\^^bb=`\^^bb -\catcode`\^^bc=11\uccode`\^^bc=`\^^9c\lccode`\^^bc=`\^^bc -%\catcode`\^^bd=11\uccode`\^^bd=`\^^9d\lccode`\^^bd=`\^^bd -%\catcode`\^^be=11\uccode`\^^be=`\^^9e\lccode`\^^be=`\^^be -%\catcode`\^^bf=11\uccode`\^^bf=`\^^9f\lccode`\^^bf=`\^^bf -% -\endinput diff --git a/macros/ec-plain/hyconfig.ptx b/macros/ec-plain/hyconfig.ptx deleted file mode 100644 index fab2b200e9..0000000000 --- a/macros/ec-plain/hyconfig.ptx +++ /dev/null @@ -1,98 +0,0 @@ -% hyconfig.tex -% Hyphenation configuration code -% Updates: -% 02/28/92 language number setting was wrong. -% 03/20/92 allow hyphenation exceptions file (in language.dat) loading. -% 06/23/92 call the appropriate hymltex* file when using MlTeX -% 07/03/92 add \accenthypencodes -% 08/24/92 introduce \l@<language> being the language number -% 08/26/92 suppress absolute font character references normally unneeded -% 03/03/93 add dialect feature via ``='' sign. -% 04/02/93 add \input compatible.tex when \csubinverse undefined. -% 08/19/93 apply \c mods from MJF -- July 14, 92 -% 08/20/93 insert space after \input X for NFSS2 (H. Soulard) -% 01/13/94 add \j def for non french languages (noted by R. Lemieux). -% 03/22/94 \LANGUAGESinFORMAT now contains all languages names (proposed -% by Michel Lavaud). -% \input hyphen replaced by \input ushyphen (sugg. of M.Lavaud). -% 05/05/94 \patterns@loaded replace \LANGUAGESinFORMAT as in Babel. -% 08/10/94 \input replaced by \@@input if already defined. -% 10/18/94 Load compatible.tex only outside MlTeX. -% 12/13/94 Allow nothing else than =name in language.dat -% 12/17/94 Let language counter progress when equal sign after first language. -% 12/22/94 Don't load compatible.tex whith 2e any way. -% 03/02/95 " " " " any other format not OT1, this -% was clearly pointed by Thierry Bouche. -% 03/22/95 \encodingdefault may be undefined (as pointed by Loic Prylli). -% 96/09/10 Allow exception file to be blank in language.dat. -% 96/10/29 Messages numbered. -% 96/12/31 TeX 2 no more supported. taking in acount new frhyph.tex, no more -% usage of compatible.tex. -% -\message{languages: patterns and exceptions,} -%% -%% checksum = "05842 98 440 4335" -%% -\ifx\@@input\undefined\let\@@input\input\fi% -\def\@temp{}% -%\let\charsubdef\undefined% for testing purposes only -\ifx\charsubdef\undefined\else\def\@temp{\@@input hymltex3.tex \endinput}\fi -\@temp -%%%%%%%%%%%%%% pure TeX usage -\language=0 -% ======== Load Patterns as described in language.dat ====== - -% (language.dat was introduced by Johannes Braams) - -{\newcount\l@nguage\newcount\initl@\newcount\workl@% - % Compatibility with TeX 2: \language count - \ifx\language\let\language\l@nguage\fi - -\initl@=\language\l@nguage=\initl@\workl@=\l@nguage -\xdef\patterns@loaded{}% will contain all languages names -\def\@newlanguage[#1]#2{\language=#1% - \workl@=#1\advance\workl@ by -\initl@ - \message{-38- The #2 language is used as language number \the\workl@}% - \expandafter\xdef\csname l@#2\endcsname{\the\workl@}% 08/24/92 - \xdef\patterns@loaded{\patterns@loaded\space #2} - \expandafter\xdef\csname#2\endcsname{\language=\the\workl@\relax}%2/28/92 -\ifx\undefined\defaultlanguage\gdef\defaultlanguage{\csname#2\endcsname}\fi}% -% test if #1 equal ``='' that means same language hyphenation but a dialect. -\edef\test{=}% -\def\@language#1#2 #3 #4/#5{\def\@tempa{=}\def\@tempb{#1}% - \ifx\@tempa\@tempb% - \ifnum\l@nguage > \initl@ \advance\l@nguage by -1\fi% - \@newlanguage[\the\l@nguage]{#2}% - \ifnum\l@nguage \test \initl@ \advance\l@nguage by -1\fi% - \else\edef\test{<}\@l@ngu@ge#1#2 #3 #4/{#5}% - \fi}% -\def\@l@ngu@ge#1 #2 #3/#4{\begingroup\@newlanguage[#4]{#1}%20/3/92 mods - \def\@tempa{#2} - \ifx\@tempa\empty\else\expandafter\@@input#2 \relax\fi%% loading of patterns - \edef\@tempa{#3}\edef\@tempb{\space\space} - \ifx\@tempa\space\else - \ifx\@tempb\@tempa\else\expandafter% - \@@input#3 \relax\fi%% loading of exceptions - \fi% - \ifx\@tempb\@tempa\else\expandafter\@@input#3 \relax\fi%% loading of exceptions - \endgroup} -\newif\if@more\@moretrue -\openin1 = language.dat -\ifeof1\message{-39- Error: file language.dat not found, trying to load % - US-english hyphenation file}\language=0\input ushyphen -\else\advance\l@nguage by -1 -\loop \endlinechar=-1 \read1 to \@lineD \endlinechar`\^^M - \ifx\@lineD\empty \else \advance\l@nguage by 1% - \edef\@lineD{\@lineD\space\space/{\the\l@nguage}}% - \expandafter\@language\@lineD - \fi - \ifeof1 \@morefalse \fi - \if@more\repeat -\fi\closein1 - -}\defaultlanguage% go to the default language (first defined in language.dat) -\endinput - - - - diff --git a/macros/ec-plain/ithyph.tex b/macros/ec-plain/ithyph.tex deleted file mode 100644 index 36c20829d0..0000000000 --- a/macros/ec-plain/ithyph.tex +++ /dev/null @@ -1,107 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%% file ithyph.tex %%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Prepared by Claudio Beccari e-mail beccari@polito.it -% -% Dipartimento di Elettronica -% Politecnico di Torino -% Corso Duca degli Abruzzi, 24 -% 10129 TORINO -% -% \versionnumber{3.4} \versiondate{8 february 1994} -% -% These hyphenation patterns for the Italian language comply with the -% Reccomendation UNI 6461 on hyphenation issued by the Italian Standards -% Institution (Ente Nazionale di Unificazione UNI). -% -% For documentation see: -% C. Beccari, "Computer aided hyphenation for Italian and Modern -% Latin", TUG vol. 13, n. 1, pp. 23-33 (1992) -% -% The following set of patterns is a slightly modified subset of the one -% described in the preceeding paper, which includes also patterns specific -% for the Latin language; the latter patterns have been eliminated and the -% remaining ones accordingly modified in order to reduce the number of ops -% (this file requires just 37 ops and no hyphenation exceptions). -% -% This set of patterns is compatible with the existing sets of macros and -% fonts for TeX and LaTeX that map national characters in a suitable way so -% as to have the hyphenation algorithm behave properly in the presence -% of accented characters. In facts the following patterns do not include -% any accented characters because: -% -% 1) The Regulation UNI 6015 on accents specifies that compulsory accents -% appear only on the ending vowel of accented words; this means that it is almost -% indifferent to have or to miss special facilities for national characters -% because the only difference consists in how TeX evaluates the end of the -% word; in practice if you have these special facilities you get -% "qua-li-t\`a", while if you miss them, you get "qua-lit\`a" (assuming -% that \righthyphenmin > 1). -% 2) Optional accents are so rare in Italian, that if you absolutely want -% to use them in those rare instances, and you miss the national character -% facilities, you should also provide explicit discretionary hyphens -% as in "s\'e\-gui\-to". -% -% There is no explicit hyphenation exception list because these patterns -% proved to hyphenate correctly a very large set of words suitably chosen in -% order to test them in the most heavy circumstances; these patterns were used -% in the preparation of a number of books and no errors were discovered. -% Should you find any word that gets hyphenated in a wrong way, please, AFTER -% CHECKING ON A RELIABLE MODERN DICTIONARY, report to the author, preferably -% by e-mail. -% -\lccode`\'=`\' % Apostrophe has its own lccode so that it is treated - % as a letter - % -\patterns{ -.an1ti3 .an1ti3m4n -.di2s3ci3ne -.e2x3 -.cir1cu2m3 -.wa2g3n -.ca6p5s -.o2p3to3 -.pa1ra3i .pa1ra3u -.pre3i .pro3i -.p4s % In case you set \lefthyphenmin=1 (brrrr !) -4l. 4n. 4r. 4t. 4s. % in case you set \righthyphenmin=1 (brrrr !) -.ri3a .ri3e .re3i .ri3o .ri3u -.su4b3lu .su4b3r -5p4si3c4 -3p4neu1 -a1a a2e a2i a2j a1o a2u a2y -a2y3o a3i2a a3i2e a3i2o a3i2u ae3u -e1a e1e e2i e2j e2o e2u e2y e3iu -i2a i2e i1i i2o i2u io3i -o1a o2e o2i o2j o1o o2u o2y -o3i2a o3i2e o3i2o o3i2u -u2a u2e u2i u2o u1u uo3u -% -1b2 2b3b 4b3d 2b3n 2b3s -1c2 2c3c 2c3m 4c3n 2c3q 2c3s 2c3t 2c3z 4ch3h -1d2 2d3d 2d3g 4d3m 4d3s 4d3v 4d3w -1f2 2f3f 2f3t -1g2 2g3g 4g3d 4g3f 4g3m 4g3s 4g3v -1h2 -1j2 -1k2 2k3k -1l2 2l3b 2l3c 2l3d 2l3f4 2l3g 2l3k 2l3l 4l3m 2l3n 2l3p - 2l3q 2l3r 2l3s 2l3t 2l3v 2l3z -1m2 2m3m 2m3b 2m3p 2m3l 2m3n 2m3r 4m3w -1n2 2n3c 2n3d 2n3f 2n3g 2n3k 2n3n 2n3q 2n3s 2n3t - 2n3v 2n3z 2n' 2n4g3n -1p2 2p3p 4p3s 2p3n 4p3t 2p3z -1q2 2q3q -1r2 2r3b 2r3c 2r3d 2r3f 2r3g 2r3k 2r3l 2r3m 2r3n 2r3p - 2r3q 2r3r 2r3s 2r3t 2r3v 2r3z -1s2 2s3s 2s2t3m 2s' -1t2 2t3t 4t3m 4t3n 4t3w 2t3z -1v2 2v3v -1w2 wa4r -1x2 -y2a y2e y2i y2o y2u -1z2 2z3z 2z3t -} % Pattern end - -\endinput - - diff --git a/macros/ec-plain/language.dat b/macros/ec-plain/language.dat deleted file mode 100644 index 5a1c24d0ee..0000000000 --- a/macros/ec-plain/language.dat +++ /dev/null @@ -1,24 +0,0 @@ -% This is language.dat as of March 13th, 1991 at (your site) -% -% This file tells which are the languages and the usable hyphenation files. -% First language will have language number 0 when used by hyconfig.tex -% at an INITeX time or used by french.sty Version 3 -% (once INITeX is done don't change the language order!) -% -%============================================================================% -%| Name | patterns file | exceptions file % comments |% -%============================================================================% - english enhyph.tex enhyphex.tex % default language is "english" - french f8hyph.tex frhyphex.tex % pas d'exceptions francaises ? - german ghyph31.tex % (german) - spanish eshyph.tex % (spanish) - italian ithyph.tex % (italian) -% dumylang dumyhyph.tex % for testing a new language without hyphen files - -% INITeX hyconfig.tex % master hyphenation code used at my site to - % congigurate each [*]plain format at INITeX time. - % \input hyphen is replaced here by \input hyconfig - % which does the job of loading files. - - % Donald Knuth's hyphen.tex file is left unchanged - % (in fact in 2 parts: patterns and exceptions). diff --git a/macros/ec-plain/make-musixtex-format.bat b/macros/ec-plain/make-musixtex-format.bat deleted file mode 100644 index fbcfae5aa0..0000000000 --- a/macros/ec-plain/make-musixtex-format.bat +++ /dev/null @@ -1,2 +0,0 @@ -initex &ec-plain musixtex.ins - diff --git a/macros/ec-plain/ofgreekl.mf b/macros/ec-plain/ofgreekl.mf deleted file mode 100644 index 640e25a1ee..0000000000 --- a/macros/ec-plain/ofgreekl.mf +++ /dev/null @@ -1,491 +0,0 @@ -% This lowercase Greek alphabet was prepared by D. E. Knuth in December, 1979, -% inspired by the Monotype faces used in {\sl The Art of Computer Programming}. -% (It has been designed for math formulas, not Greek texts.) -% The programs were revised for the new \MF\ conventions in 1985. - -% Character codes \0013--\0047 are generated. - -cmchar "Lowercase Greek alpha"; -beginchar(character_offset+oct"013",11u#,x_height#,0); -italcorr max(1/3x_height#*slant+.5hair#+.5u#,x_height#*slant-.5u#); -adjust_fit(0,0); pickup fine.nib; -pos0(hair,0); pos1(vair,-90); pos2(curve,-180); pos3(vair,-270); -z4=(w-3.25u,9/16h); z5=(w-2.75u,.5[vair,y4]); -numeric theta; theta=angle(z4-z5)-90; -pos4(stem,theta); pos5(stem,theta); -pos6(vair,90); pos7(hair,180); -rt x0r=hround(w-u); x1=x3=.5w-u; lft x2r=hround(1.5u-.5curve); -x6=w-u; x7+.5hair=hround(w+.5hair-epsilon); -top y0=vround .8[bar_height,h]; bot y1r=bot y6l=-oo; -y2=.5[y1,y3]; top y3r=h+oo; y7=1/4bar_height; -filldraw stroke z0e{down}...pulled_arc.e(1,2) & pulled_arc.e(2,3) - ...z4e---z5e...z6e{right}...{up}z7e; % diagonal, bowl, and hook -math_fit(-.3x_height#*slant+.5curve#-u#,1/3x_height#*slant+.5hair#+.5u#); -penlabels(0,1,2,3,4,5,6,7); endchar; - -cmchar "Lowercase Greek beta"; -beginchar(character_offset+oct"014",9.5u#,asc_height#,desc_depth#); -italcorr .5[x_height#,asc_height#]*slant-u#; -adjust_fit(0,0); pickup fine.nib; -pos0(hair,180); pos1(hair,180); pos2(vair,90); -pos3(stem,0); pos4(vair,-90); pos5(hair,-180); -pos6(vair,-270); pos7(curve,-360); pos8(vair,-450); pos9(hair,-540); -x0=x1=x9; lft x0l=hround(1.5u-.5hair); x2=x4=x6=x8=.5w+.25u; -rt x3r=hround(w-1.5u); rt x7r=hround(w-1.5u+.5curve); rt x5l=hround(x4-u); -bot y0=-d; y1=top y6r=x_height; top y2r=h+oo; y3=.5[y2,y4]; -y5=.5[y4,y6]; top y6r-bot y4r=vstem+eps; bot y8=-oo; y7=y9=.5[y6,y8]; -if y6l<y4l: y6l:=y4l:=y5; fi -filldraw stroke z0e---z1e...pulled_arc.e(2,3) - & pulled_arc.e(3,4)...{up}z5e; % stem and upper bowl -filldraw stroke z5e{up}...pulled_arc.e(6,7) - & pulled_arc.e(7,8)...{up}z9e; % lower bowl -math_fit(desc_depth#*slant+.5hair#-u#,.7x_height#*slant+.5curve#-1.5u#); -penlabels(0,1,2,3,4,5,6,7,8,9); endchar; - -cmchar "Lowercase Greek gamma"; -beginchar(character_offset+oct"015",10u#,x_height#,desc_depth#); -italcorr x_height#*slant-.5u#; -adjust_fit(0,0); pickup fine.nib; -pos1(hair,180); pos2(vstem+dw,90); -pos4(hair,0); pos5(vair,-90); pos6(hair,-180); pos7(hair,-180); -bot y1=.5772156649h; top y2r=h+oo; y4=y6=-.5d; -bot y5r=-d-o; top y7=h; -lft x1r=hround(.5u-.5hair); x2=3u; rt x4r=hround(w-2u); x5=.5[x4,x6]; -rt x4r-lft x6r=hround 1/3[hair,stem]+eps; rt x7l=hround(w-u); -if x4l<x6l: x4l:=x6l:=x5; fi -pos3(hair,angle(z4-z2)+90); x3=superness[x2,x4]; y3=superness[y4,y2]; -filldraw stroke z1e{up}...z2e{right}...z3e{z4-z2} - ...z4e{down}...{left}z5e; % arc -filldraw stroke z5e{left}...z6e{up}..{2(x7-x6),y7-y6}z7e; % stem -math_fit(-.5772156649x_height#*slant,ic#-u#); -penlabels(1,2,3,4,5,6,7); endchar; - -cmchar "Lowercase Greek delta"; -beginchar(character_offset+oct"016",8u#,asc_height#,0); -italcorr .9asc_height#*slant+.5hair#-1.5u#; -adjust_fit(0,0); pickup fine.nib; -x0=-u; y0=1.1h; -numeric light_flare; light_flare=2/3[vair,flare]; -x1=w-2u-.5light_flare; y1=h-.5light_flare; -numeric theta; theta=angle (z1-z0); -pos1(light_flare,theta-90); pos2(.2[vair,light_flare],-90); pos3(vair,theta); -x2=x3+u; y2=h; -x4=x6=.5w+.5u; top y8r=x_height+oo; z4=z8; -pos6(vair,-90); pos7(stem,-180); pos8(vair,-270); -pos4(stem,angle(z4-z0)+90); pos5(stem,30); -z3=.5[.5[z1,z4],z0]; -y5+.1x_height=y7=.5[y6,y8]; bot y6=-oo; -lft x7r=hround(1.4u-.5stem); rt x5r=hround(w-u); -filldraw stroke z1e{z0-z1e}....z2e....z3e{(z0-z1)rotated 90} - ...z4e{z4e-.8[z4,z0]} - ....z5e{down}...pulled_arc.e(6,7) & pulled_arc.e(7,8); % hook and bowl -filldraw z1r{z1r-z0}...z1l{z0-z1l}--cycle; % bulb -math_fit(-.3x_height#*slant+.5curve#-u#,.7x_height#*slant-.5u#); -penlabels(0,1,2,3,4,5,6,7,8); endchar; - -cmchar "Lowercase Greek epsilon"; -beginchar(character_offset+oct"017",8u#,x_height#,0); -italcorr x_height#*slant+.5hair#-2u#; -adjust_fit(0,0); pickup fine.nib; -pos0(bar,90); pos1(bar,90); pos2(curve,180); -pos3(vair,270); pos4(hair,300); pos6(bar,90); pos7(bar,90); -x1=.5w+.5u; x0=x1+u; lft x2r=hround(1.5u-.5curve); x3=.5[x0,x1]; -x4r=good.x(w-u); x5=w+.5u; x6=x0; z7=z2l; -top y0r=top y1r=h; y2=y5=y6=bar_height; bot y3r=-oo; -path p; p=z3r{right}...{up}z5; -numeric t; t=ypart(((x4r,y3r)--(x4r,y5))intersectiontimes p); -y4r=ypart point t of p; -filldraw circ_stroke z0e..pulled_arc.e(1,2) & pulled_arc.e(2,3) - ...z4e{direction t of p}; % arc -filldraw circ_stroke z6e--z7e; % bar -math_fit(-.3x_height#*slant+.5curve#-u#,ic#); -penlabels(0,1,2,3,4,5,6,7); endchar; - -cmchar "Lowercase Greek zeta"; -beginchar(character_offset+oct"020",9u#,asc_height#,desc_depth#); -italcorr .75[x_height#,asc_height#]*slant-1.5u#; -adjust_fit(0,0); pickup fine.nib; -pos0(hair,-360); pos1(vair,-270); pos2(hair,-180); pos3(vair,-90); -numeric theta; theta=90-angle(25u,x_height); slope:=-x_height/25u; -pos6(stem,theta); pos7(vair,-90); pos8(vair,-135); -lft x0l=hround 3.5u; x1=x3=.5[x0,x2]; rt x2l=hround max(rt x0r,w-2u)+eps; -top y0=h; top y3l=bot y1l+vstem+eps=vround(y0-.25(h-x_height)); y2=.5[y1,y3]; -if y1r>y3r: y1r:=y3r:=y2; fi -lft x4l=hround u; x4r-x4l=(hround .6[vair,stem])-fine; -x6+.5u=x7=w-2u; x8=.5w+.75u; -y6=-.1d; y8=-3/4d-oo; bot y7r=-d-oo; -ellipse_set(3l,4l,5l,6l); ellipse_set(3r,4r,5r,6r); -y4l:=.9[y6,y4l]; y4=y4r:=.9[y6,y4r]; -filldraw circ_stroke z0e{down}...z1e{right}...{up}z2e; % opening hook -filldraw circ_stroke z8e{x7-x8,2(y7-y8)}...z7e{right} - ...z6e---z5e....{up}z4e - ..tension 1 and atleast1.5..{right}z3e...{down}z2e; % main stroke -math_fit(-.2asc_height#*slant-.5u#,0); -penlabels(0,1,2,3,4,5,6,7,8); endchar; - -cmchar "Lowercase Greek eta"; -beginchar(character_offset+oct"021",9u#,x_height#,desc_depth#); -italcorr .8x_height#*slant+.5stem#-u#; -adjust_fit(0,0); pickup fine.nib; -x0=0; x1=x2; pos2(stem,0); lft x2l=hround(2.5u-.5stem); y2-.5stem=-oo; -hook_in(0,a,1); % opening hook -filldraw circ_stroke z2e--z1e; % left stem -x4+.5stem=hround(w-1.5u+.5stem); ital_arch(2,3,4); % arch -pos5(stem,0); x5=x4; y5-.5stem=-d-o; -filldraw circ_stroke z5e--z4e; % right stem -math_fit(-2/3x_height#*slant+.5hair#+.5u#,ic#-1/3x_height#*slant); -penlabels(0,a,1,2,3,4,5); endchar; - -cmchar "Lowercase Greek theta"; -beginchar(character_offset+oct"022",8.25u#,asc_height#,0); -italcorr .7asc_height#*slant+.5curve#-u#; -adjust_fit(0,0); pickup fine.nib; -pos1(vair,90); pos2(curve,180); pos3(vair,270); pos4(curve,360); -x1=x3=.5w; lft x2r=hround(1.5u-.5curve); x4=w-x2; -top y1r=h+oo; y2=y4=.5[y1,y3]; bot y3r=-oo; -filldraw stroke pulled_arc.e(1,2) & pulled_arc.e(2,3) - & pulled_arc.e(3,4) & pulled_arc.e(4,1); % bowl -pos2'(bar,90); pos4'(bar,90); z2'=z2l; z4'=z4l; -filldraw stroke z2'e--z4'e; % bar -math_fit(-.3asc_height#*slant-u#+.5curve#,ic#-.5u#); -penlabels(1,2,3,4); endchar; - -cmchar "Lowercase Greek iota"; -beginchar(character_offset+oct"023",5u#,x_height#,0); -italcorr 1/3x_height#*slant+.5hair#+.5u#; -adjust_fit(if monospace: u#,u# else: 0,0 fi); pickup fine.nib; -pos1(stem,0); lft x1l=hround(1.5u-.5stem); y1+.5stem=h+oo; -x2=x1-.25u; x4=w; hook_out(2,3,4)(skewed); % closing hook -filldraw circ_stroke z1e{down}...{-u,-x_height}z2e; % stem -math_fit(0,ic#); penlabels(1,2,3,4); endchar; - -cmchar "Lowercase Greek kappa"; -beginchar(character_offset+oct"024",9u#,x_height#,0); -italcorr 1/3x_height#*slant+.5hair#+.5u#; -adjust_fit(0,0); pickup fine.nib; -pos1(stem,0); pos2(stem,0); pos3(vair,90); pos4(vair,90); pos5(flare,90); -x1=x2=x3; lft x1l=hround(1.5u-.5stem); y1+.5stem=h+oo; y2-.5stem=-oo; -filldraw z1l---z2l..z2r---z1r..cycle; % stem -y3=bar_height; top y4r=h; x4+.5flare=hround(w-1.5u); z5r=z4r; -path p,q; p=z3l{right}..{right}z4l; q=z5r{right}..z5l{left}...cycle; -numeric t; t=ypart(p intersectiontimes q); -filldraw stroke z3e{right}..{right}z4e; % upper diagonal -filldraw subpath(0,t) of q--cycle; % bulb -pos7(stem,0); pos8(vair,90); pos9(hair,180); -x9+.5hair=hround(w+.5hair-epsilon); y9=1/3x_height; -lft x7l=hround(w-2.75u-.5stem); y7=1/2y3; x8=w-1.2u; bot y8l=-oo; -filldraw stroke z3e{right}...z7e{down} - ...z8e{right}...{up}z9e; % lower diagonal -math_fit(0,ic#); penlabels(1,2,3,4,5,7,8,9); endchar; - -cmchar "Lowercase Greek lambda"; -beginchar(character_offset+oct"025",10.5u#,asc_height#,0); -adjust_fit(0,0); pickup fine.nib; -pos1(vair,90); lft x1=hround .1u; top y1r=h; -x2=x1+2u; y2=.7[x_height,h]; x3=w-2u; bot y4=-oo; y3=max(.07h,y4+eps); -z4-(.25u,0)=whatever[z2,z3]; numeric theta; theta=angle(z2-z3)-90; -pos2(stem,theta); pos3(stem,theta); pos4(stem,0); -filldraw circ_stroke z1e{right}...z2e---z3e - ...{2(x4e-x3e),y4e-y3e}z4e; % long diagonal -y5=.5[bar_height,x_height]; z5=whatever[z2,z3]; -x6=1.5u; y6-.5stem=-oo; pos5(hair,theta-90); pos6(stem,angle(z5-z6)-90); -filldraw circ_stroke z6e--z5e; % short diagonal -penlabels(1,2,3,4,5,6); endchar; - -cmchar "Lowercase Greek mu"; -beginchar(character_offset+oct"026",9u#,x_height#,desc_depth#); -italcorr 1/3x_height#*slant+.5hair#+.5u#; -adjust_fit(0,0); pickup fine.nib; interim superness:=more_super; -pos1(stem,-180); pos2(stem,-180); x1=x2=x3; lft x1r=hround(1.5u-.5stem); -y1+.5stem=h+oo; y2-.5stem=-d-o; -filldraw z1r---z2r..z2l---z1l..cycle; % left stem -pos3(stem,-180); pos4(vair,-90); pos5(hair,0); x4=.5[x3,x5]; -pos6(stem,0); rt x6r=hround(w-2.5u+.5stem); -x5=x6=x7; x9=w; hook_out(7,8,9); % closing hook -y3=.7[y4,y5]; bot y4r=-oo; y5=.57h; y6+.5stem=h; -filldraw stroke super_arc.e(3,4)...{up}z5e; % left stem and arc -filldraw circ_stroke z6e--z7e; % right stem -math_fit(desc_depth#*slant+.5stem#-u#,ic#); -penlabels(1,2,3,4,5,6,7,8,9); endchar; - -cmchar "Lowercase Greek nu"; -beginchar(character_offset+oct"027",8.5u#,x_height#,0); -italcorr x_height#*slant+.5stem#-u#; -adjust_fit(0,0); pickup fine.nib; -pos3(vair,-90); pos4(stem,0); bot y3r=0; y4+.5stem=h+oo; -x3-.5stem=hround(1.5u-.5stem); x4+.5stem=hround(w-1.5u+.5stem); -filldraw circ_stroke z4e{down}...{-36u,-h}z3e; % diagonal -pickup tiny.nib; pos1(stem,0); pos2(stem,0); -top y1=h+min(oo,serif_drop); bot y2=0; x1=x2=x3; -z=((z4{down}...{-36u,-h}z3)intersectionpoint((x2r,0)--(x2r,h))); -filldraw z1l--z2l--z--z1r--cycle; % stem -sloped_serif.l(1,2,a,1/3,jut,serif_drop); % upper left serif -math_fit(0,ic#-1/3x_height#*slant-.5u#); penlabels(1,2,3,4); endchar; - -cmchar "Lowercase Greek xi"; -beginchar(character_offset+oct"030",9u#,asc_height#,desc_depth#); -italcorr .75[x_height#,asc_height#]*slant-2u#; -adjust_fit(0,0); pickup fine.nib; -pos10(hair,-720); pos11(vair,-630); pos12(hair,-540); pos13(vair,-450); -lft x10l=hround 1/3w; x11=x13=.5[x10,x12]; rt x12l=hround(w-2.5u); -top y10=h; top y13l=bot y11l+vstem+eps=vround(y10-.25(h-x_height)); -y12=.5[y11,y13]; if y11r>y13r: y11r:=y13r:=y12; fi -pos0(curve,-360); pos1(vair,-270); pos2(hair,-180); pos3(vair,-90); -numeric theta; theta=90-angle(22u,x_height); slope:=-x_height/22u; -pos6(stem,theta); pos7(vair,-90); pos8(vair,-135); -lft x0l=hround u; x1=x3=x11; x2=x12; -y0=.5[y13,y1]; top y3l=vround .5h=bot y1l+vstem+eps; y2=.5[y1,y3]; -if y1r>y3r: y1r:=y3r:=y2; fi -lft x4l=hround u; x4r-x4l=hround .5[vair,stem]-fine; -x6=x7=w-2u; x8=.5w+.5u; y6=-.3d; bot y7r=-d-oo; y8=max(-3/4d-oo,y7l); -ellipse_set(3l,4l,5l,6l); ellipse_set(3r,4r,5r,6r); -y4l:=.9[y6,y4l]; y4=y4r:=.9[y6,y4r]; -filldraw circ_stroke z10e{down}...z11e{right}...{up}z12e; % opening hook -filldraw stroke z12e{up}...z13e{left}...z0e{down} - ...z1e{right}...{up}z2e; % upper arc -filldraw circ_stroke z8e{x7-x8,2(y7-y8)}...z7e{right}...z6e - ---z5e...{up}z4e...{right}z3e...{down}z2e; % main stroke -math_fit(-.2asc_height#*slant-.5u#,0); -penlabels(0,1,2,3,4,5,6,7,8,10,11,12,13); endchar; - -cmchar "Lowercase Greek pi"; -beginchar(character_offset+oct"031",10u#,x_height#,0); -italcorr x_height#*slant+.5stem#-u#; -adjust_fit(0,0); pi_stroke; % hook and bar -pos4(hair,0); pos6(hair,0); x4=3.5u; x6=w-4u; y4=y6=y2; -x5=3u; x7=w-2.5u; y5=y7=.5stem-oo; -pair v[]; v1=(z4-z5) xscaled 3.14159; v2=(z6-z7) xscaled 3.14159; -pos5(stem,angle v1-90); pos7(stem,angle v2-90); -filldraw circ_stroke z5e{v1}...{up}z4e; % left stem -filldraw circ_stroke z7e{v2}...{up}z6e; % right stem -math_fit(-.7x_height#*slant+.5hair#+.5u#,ic#-1/3x_height#*slant); -penlabels(1,2,3,4,5,6,7); endchar; - -cmchar "Lowercase Greek rho"; -beginchar(character_offset+oct"032",8.25u#,x_height#,desc_depth#); -italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; -adjust_fit(0,0); pickup fine.nib; -pos1(stem,180); pos2(stem,180); pos3(vair,90); -pos4(curve,0); pos5(vair,-90); pos6(hair,-180); -lft x2r=hround(1.5u-.5stem); x1=x2=x6; x3=x5=.5[x2,x4]; -rt x4r=hround(w-1.5u+.5curve); -y1-.5stem=-d-o; y2=y4=y6=.5[y3,y5]; top y3r=h+oo; bot y5r=-oo; -filldraw circ_stroke z1e..pulled_arc.e(2,3) & pulled_arc.e(3,4) - & pulled_arc.e(4,5) & pulled_arc.e(5,6); % stem and bowl -math_fit(desc_depth#*slant+.5stem#-u#,ic#); -penlabels(1,2,3,4,5,6); endchar; - -cmchar "Lowercase Greek sigma"; -beginchar(character_offset+oct"033",10.25u#,x_height#,0); -italcorr x_height#*slant+.5stem#-u#; -adjust_fit(0,0); pickup fine.nib; -pos1(vstem,90); pos2(stem,0); pos3(vair,-90); -pos4(stem,-180); pos5(vstem,-270); pos6(vstem,-270); -x1=x3=x5=.5[x2,x4]; rt x2r=hround(w-2.5u); -lft x4r=hround(1.5u-.5curve);x6=w-1.5u; -top y1r=h; y2=y4=.5[y1,y3]; bot y3r=-oo; y5=y6=y1; -filldraw circ_stroke z6e..pulled_arc.e(5,4) & pulled_arc.e(4,3) - & pulled_arc.e(3,2) & pulled_arc.e(2,1); % ear and bowl -math_fit(-.3x_height#*slant+.5curve#-u#,ic#-1/3x_height#*slant); -penlabels(1,2,3,4,5,6); endchar; - -cmchar "Lowercase Greek tau"; -beginchar(character_offset+oct"034",9u#,x_height#,0); -italcorr x_height#*slant+.5stem#-u#; -adjust_fit(0,0); pi_stroke; % hook and bar -pos4(hair,0); pos5(stem,0); -x4=x5; x5-.5stem=hround(.5w-.5u-.5stem); y4=y2; y5-.5stem=-oo; -filldraw circ_stroke z5e--z4e; % stem -math_fit(-.7x_height#*slant+.5hair#+.5u#,-.5u#); -penlabels(1,2,3,4,5); endchar; - -cmchar "Lowercase Greek upsilon"; -beginchar(character_offset+oct"035",9u#,x_height#,0); -italcorr x_height#*slant; -adjust_fit(0,0); pickup fine.nib; interim superness:=more_super; -x0=0; x2=x3+.25u; pos3(stem,-180); lft x3r=hround(2.5u-.5stem); -hook_in(0,1,2)(skewed); % opening hook -pos2'(stem,-180); z2'=z2; pos4(vair,-90); pos5(hair,0); -x4=.5w+u; rt x5r=hround(w-.5u); y3=.7[y4,y5]; bot y4r=-oo; y5=.57h; -filldraw stroke z2'e{-u,-x_height}...super_arc.e(3,4) - ..tension atleast 1.05..{up}z5e; % left stem and arc -v_bulb(5,6); % closing bulb -math_fit(-2/3x_height#*slant+.5hair#+.5u#,2/3ic#); -penlabels(0,1,2,3,4,5,6); endchar; - -cmchar "Lowercase Greek phi"; -beginchar(character_offset+oct"036",11u#,asc_height#,desc_depth#); -italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; -adjust_fit(0,0); pickup fine.nib; -numeric light_curve; light_curve=hround(.5[stem,curve]-2stem_corr); -pos1(vair,90); pos2(light_curve,180); pos3(vair,270); pos4(light_curve,360); -x1=x3=.5w; lft x2r=hround(1.5u-.5light_curve); x4=w-x2; -top y1=x_height+oo; y2=y4=.5[y1,y3]; bot y3=-oo; -filldraw stroke pulled_arc.e(1,2) & pulled_arc.e(2,3) - & pulled_arc.e(3,4) & pulled_arc.e(4,1); % bowl -pos5(hair,0); pos6(hair,0); x5=x6=.5w; top y5=h; bot y6=-d-oo; -filldraw stroke z5e--z6e; % stem -math_fit(-.3x_height#*slant+.5curve#-u#,ic#); -penlabels(1,2,3,4,5,6); endchar; - -cmchar "Lowercase Greek chi"; -beginchar(character_offset+oct"037",11u#,x_height#,desc_depth#); -italcorr x_height#*slant+.5hair#-1.5u#; -adjust_fit(0,0); pickup fine.nib; -pos1(hair,180); pos2(vair,80); pos5(vair,80); pos6(hair,180); -x1-.5hair=hround-.5hair; x6=w-x1; x2=w-x5=u; -y1=y2l-h/8; top y2r=h+oo; bot y5l=-d-oo; y6=y5r+h/8; -z0=.5[z2,z5]; z2'=z2l+(.5u,0); z5'=z5r-(.5u,0); -numeric theta; theta=angle(z5'-z2')+90; -pos3(stem,theta); pos4(stem,theta); -y3r=y2r-h/8; y4l=y5l+h/8; z3l=whatever[z2',z0]; z4r=whatever[z0,z5']; -filldraw stroke z1e{up}...z2e{right}...z3e{z4r-z3l} - ..z4e{z4r-z3l}...{right}z5e...{up}z6e; % major diagonal and hooks -x8=w-x7=2u; y7+.5hair=h; y8-.5hair=-d; -numeric theta; theta=angle(z7-z8)-90; -pos7(hair,theta); pos8(hair,theta); -filldraw z7l---z8l..z8r---z7r..cycle; % minor diagonal -math_fit((desc_depth#-x_height#)*slant+ic#,ic#); -penlabels(0,1,2,2',3,4,5',5,6,7,8); endchar; - -cmchar "Lowercase Greek psi"; -beginchar(character_offset+oct"040",11u#,asc_height#,desc_depth#); -italcorr x_height#*slant; -adjust_fit(0,0); pickup fine.nib; interim superness:=more_super; -x0=0; x2=x3+.25u; pos3(stem,-180); lft x3r=hround(2.5u-.5stem); -hook_in(0,1,2)(skewed); % opening hook -pos2'(stem,-180); z2'=z2; pos4(vair,-90); pos5(hair,0); -x4=.5w+u; rt x5r=hround(w-.5u); -y3=.7[y4,y5]; bot y4r=-oo; y5=.57x_height; -filldraw stroke z2'e{-u,-x_height}...super_arc.e(3,4) - ..tension atleast 1.05..{up}z5e; % left stem and arc -v_bulb(5,6); % closing bulb -pos7(hair,0); pos8(hair,0); x7=x8=.5w+.5u; top y7=h; bot y8=-d-oo; -filldraw stroke z7e--z8e; % stem -math_fit(-2/3x_height#*slant+.5hair#+.5u#,2/3ic#); -penlabels(0,1,2,3,4,5,6,7,8); endchar; - -cmchar "Lowercase Greek omega"; -beginchar(character_offset+oct"041",11u#,x_height#,0); -italcorr x_height#*slant; -adjust_fit(0,0); pickup fine.nib; -pos2(hair,-180); lft x2r=hround.5u; y2=y4=y6=y8=bar_height; -y1+.5hair=h; x1=x2+.75u; pos1(hair,angle(2(x1-x2),y1-y2)+90); -pos3(vstem+dw,-90); pos4(hair,0); pos5(vair,90); -pos6(hair,180); pos7(vstem+dw,270); pos8(hair,360); -bot y3r=bot y7r=-oo; top y5r=vround(.2[y4,h]+.5vair); -x3=.5[x2,x4]; x7+.25u=.5[x6,x8]; rt x8r=hround(w-.5u); -x5+.5stem=hround(.5w+.5stem)+eps; -x5=.5[x4,x6]; rt x4r-lft x6r=min(stem,2hair)+2eps; -if x4l<x6l: x4l:=x6l:=x5; fi -filldraw circ_stroke z1e{2(x2-x1),y2-y1}...z2e{down}...z3e{right} - ...{up}z4e...{left}z5e; % left arc -filldraw stroke z5e{left}...z6e{down}...z7e{right}...{up}z8e; % right arc -v_bulb(8,9); % closing bulb -math_fit(-bar_height#*slant,2/3ic#); penlabels(1,2,3,4,5,6,7,8,9); endchar; - -cmchar "Variant lowercase Greek epsilon"; -beginchar(character_offset+oct"042",8u#,x_height#,0); -italcorr x_height#*slant-.5u#; -adjust_fit(0,0); pickup fine.nib; -numeric light_vstem; light_vstem=Vround 2/3[vair,vstem]; -pos2(light_vstem,90); x2=x8=.5w+.5u; top y2r=h+o; -x1+.5light_vstem=hround(w-u); y1=.2[y2,bar_height]; -pos1(light_vstem,angle(x1-x2,2(y1-y2))+90); pos3(hair,180); pos4(vair,270); -pos5(hair,360); pos6(vair,450); pos7(hair,540); pos8(light_vstem,630); -lft x3r=hround u; x4=x6=.5w; rt x5r=hround(w-2.5u); x7=x3; -y3=.5[y2,y4]; y5=bar_height=.5[y4,y6]; y7=.5[y6,y8]; bot y8r=-o; -top y6r-bot y4r=vstem+eps; if y6l<y4l: y6l:=y4l:=y5; fi -x9+.5vair=hround(w-.5u); y9=1/3[y8,bar_height]; -pos9(vair,angle(x8-x9,2(y8-y9))+90); -filldraw circ_stroke z1e{x2-x1,2(y2-y1)}...pulled_super_arc.e(2,3)(.5superpull) - & super_arc.e(3,4)...{up}z5e; % upper arc -filldraw circ_stroke z9e{x8-x9,8(y8-y9)}...pulled_arc.e(8,7) - & super_arc.e(7,6)...{down}z5e; % lower arc -math_fit(-.5bar_height#*slant-.5u#,ic#); -penlabels(1,2,3,4,5,6,7,8,9); endchar; - -cmchar "Variant lowercase Greek theta"; -beginchar(character_offset+oct"043",9u#,asc_height#,0); -italcorr .5[bar_height#,x_height#]*slant+.5vair#+.5u#; -adjust_fit(0,0); pickup fine.nib; -numeric light_curve; light_curve=hround .5[stem,curve]; -x0=0; x2-.5stem=hround(2.5u-.5stem); hook_in(0,1,2); % opening hook -pos2'(stem,-180); z2'=z2; pos3(stem,-180); pos4(vair,-90); -pos5(light_curve,0); pos6(vair,90); pos7(hair,180); pos8(vair,270); -x3=x2; x4=x6=.5[x3,x5]; rt x5r=hround(w-1.5u+.5light_curve); -lft x7r=hround(3.25u-.5hair); x8+.5vair=hround(w+.5vair-epsilon); -y3=.4x_height; bot y4r=-oo; y5=.5[y4,y6]; top y6r=h+oo; -y7=.5[x_height,h]; y8=.5[bar_height,x_height]; -filldraw stroke z2'e..{{interim superness:=hein_super; super_arc.e(3,4)}} - & pulled_arc.e(4,5) & pulled_arc.e(5,6) - ...{down}z7e...{4(x8-x7),y8-y7}z8e; % bowl and loop -math_fit(-2/3x_height#*slant+.5hair#+.5u#,ic#); -penlabels(0,a,1,2,3,4,5,6,7,8); endchar; - -cmchar "Variant lowercase Greek pi"; -beginchar(character_offset+oct"044",14.5u#,x_height#,0); -italcorr x_height#*slant+.5stem#-u#; -adjust_fit(0,0); pi_stroke; % hook and bar -pos4(hair,-180); pos5(hair,-180); pos6(vstem,-90); -pos7(hair,0); pos7'(hair,-180); z7'=z7; -pos8(vstem,-90); pos9(hair,0); pos0(hair,0); -x4=x5+1.5u; lft x5r=hround 2u; x6=x4+.5u; lft x7l=hround(.5w+.25u-.5hair); -x8=w-4.5u; rt x9r=hround(w-1.5u); x0=x9-1.25u; -top y4=top y0=h; y5+.1h=y7-.1h=y9=bar_height; bot y6r=bot y8r=-oo; -filldraw stroke z4e{2(x5-x4),y5-y4}...z5e{down} - ...z6e{right}...z7e{up}; % left bowl -filldraw stroke z0e{2(x9-x0),y9-y0}...z9e{down} - ...z8e{left}...z7'e{up}; % right bowl -math_fit(-.7x_height#*slant+.5hair#+.5u#,ic#-.5u#); -penlabels(0,1,2,3,4,5,6,7,8,9); endchar; - -cmchar "Variant lowercase Greek rho"; -beginchar(character_offset+oct"045",8.25u#,x_height#,desc_depth#); -italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; -adjust_fit(0,0); pickup fine.nib; -pos2(stem,180); pos3(vair,90); pos4(curve,0); pos5(vair,-90); pos6(stem,-180); -lft x2r=hround(1.5u-.5stem); x2=x6; x3=x5=.5[x2,x4]; -rt x4r=hround(w-1.5u+.5curve); -y2=y4=y6=.5[y3,y5]; top y3r=h+oo; bot y5r=-oo; -filldraw circ_stroke pulled_arc.e(2,3) & pulled_arc.e(3,4) - & pulled_arc.e(4,5) & pulled_arc.e(5,6); % bowl -pos2'(hair,-180); z2'r=z2r; pos1(vstem,-90); pos1'(vstem,90); z1'=z1; -pos0(hair,0); rt x0r=hround(w-u); bot y0=-d; bot y1r=vround-.9d; x1=x5; -interim superness:=sqrt superness; -filldraw stroke pulled_arc.e(0,1'); filldraw stroke pulled_arc.e(1,2'); % tail -math_fit(desc_depth#*slant+.5stem#-u#,ic#); -penlabels(0,1,2,3,4,5,6); endchar; - -cmchar "Variant lowercase Greek sigma"; -beginchar(character_offset+oct"046",8u#,x_height#,.5min(desc_depth#,.5x_height#)); -italcorr x_height#*slant-.5u#; -adjust_fit(0,0); pickup fine.nib; -numeric heavy_vair; heavy_vair=.25[vair,vstem]; -pos1(heavy_vair,-110); pos2(vair,-90); -x1+.5heavy_vair=hround(w-u); y1=.1[y2r,bar_height]; -x2=min(.5w+u,x1r-eps); top y2l=h+oo; -filldraw circ_stroke z1e{x2-x1,2(y2-y1)}...{left}z2e; % upper bulb -numeric theta; theta=90-angle(16u,x_height); slope:=-x_height/16u; -pos6(stem,theta); pos7(vair,-90); pos8(vair,-135); -lft x4l=hround u; x4r-x4l=(hround .5[vair,stem])-fine; -x6=x7=w-2u; x8=.5w+u; y6=.25[y8,y2]; y8=y7+1/8d; bot y7r=-d-oo; -ellipse_set(2l,4l,5l,6l); ellipse_set(2r,4r,5r,6r); y4=y4r; -filldraw circ_stroke z8e{x7-x8,2(y7-y8)}...z7e{right}...z6e - ---z5e...{up}z4e...{right}z2e; % main stroke -math_fit(-.5x_height#*slant-.5u#,0); penlabels(1,2,4,5,6,7,8); endchar; - -cmchar "Variant lowercase Greek phi"; -beginchar(character_offset+oct"047",11u#,x_height#,desc_depth#); -italcorr .7x_height#*slant; -adjust_fit(0,0); pickup fine.nib; -pos1(hair,-180); x1=x2+.75u; top y1=h; -pos2(hair,-180); lft x2r=hround .5u; y2=bar_height; -pos3(vstem,-90); x3=.5(w+u); bot y3r=-oo; -pos4(hair,0); rt x4r=hround(w-.5u); y4=y2; -pos5(vstem,90); x5=.52[x6,x4]; top y5r=h+oo; -pos6(hair,180); x6=x7; y6=1/3h; -pos7(stem,180); lft x7r=hround(.5w-.5u-.5stem); y7-.5stem=-d-o; -filldraw circ_stroke z7e---z6e...{right}z5e...{down}z4e...{left}z3e - ...{up}z2e...{3(x1-x2),y1-y2}z1e; % bowl and stem -math_fit(-.3x_height#*slant,ic#); penlabels(1,2,3,4,5,6,7); endchar; diff --git a/macros/ec-plain/ofgreeku.mf b/macros/ec-plain/ofgreeku.mf deleted file mode 100644 index f6e8021196..0000000000 --- a/macros/ec-plain/ofgreeku.mf +++ /dev/null @@ -1,255 +0,0 @@ -% Computer Modern Greek caps, analogous to the uppercase Roman letters. - -% Character codes \0000 through \0012 are generated, -% using plain \TeX's standard text font layout conventions. - -cmchar "Uppercase Greek Gamma"; -beginchar(character_offset+oct"000",11u#-width_adj#,cap_height#,0); -italcorr cap_height#*slant-beak_jut#-.25u#; -adjust_fit(cap_serif_fit#,0); -h:=vround(h-stem_corr); -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pickup crisp.nib; pos3(slab,90); pos4(hair,0); -top y3r=h; x3=x1; rt x4r=hround(w-.75u); y4=good.y(y3l-beak)-eps; -arm(3,4,e,beak_darkness,beak_jut); % arm and beak -if serifs: nodish_serif(1,2,a,1/3,cap_jut,b,1/3,.5cap_jut); % upper serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,1.25cap_jut); fi % lower serif -math_fit(0,ic#-2.5u#); penlabels(1,2,3,4); endchar; - -cmchar "Uppercase Greek Delta"; -beginchar(character_offset+oct"001",15u#,cap_height#,0); -adjust_fit(0,0); -numeric left_stem,alpha; -left_stem=cap_hair if hefty: -3stem_corr fi; -x1l=w-x4r=.75u; y1=y4=0; -x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo; -alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); -penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); -penpos3(alpha*cap_stem,0); penpos4(alpha*cap_stem,0); -fill diag_end(2l,1l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l)--cycle; % triangle -z0=whatever[z1r,z2r]=whatever[z3l,z4l]; -y5=y6=cap_vstem; z5=whatever[z1r,z2r]; z6=whatever[z3l,z4l]; -if y0<h-cap_notch_cut: y0:=h-cap_notch_cut; - unfill z0+.5right{down}...{z4-z3}z6--z5{z2-z1} - ...{up}z0+.5left--cycle; % counter -else: unfill z0--z5--z6--cycle; fi % counter -penlabels(0,1,2,3,4,5,6); endchar; - -cmchar "Uppercase Greek Theta"; -beginchar(character_offset+oct"002",14u#,cap_height#,0); -italcorr .7cap_height#*slant-.5u#; -adjust_fit(0,0); -numeric light_curve; light_curve=hround(cap_curve-2stem_corr); -penpos1(vair,90); penpos3(vround(vair+.5vair_corr),-90); -penpos2(light_curve,180); penpos4(light_curve,0); -if monospace: x2r=hround 1.5u; - interim superness:=sqrt superness; % make |"O"|, not |"0"| -else: x2r=hround u; fi -x4r=w-x2r; x1=x3=.5w; y1r=h+o; y2=y4=.5h-vair_corr; y3r=-o; -penstroke pulled_super_arc.e(1,2)(.5superpull) - & pulled_super_arc.e(2,3)(.5superpull) - & pulled_super_arc.e(3,4)(.5superpull) - & pulled_super_arc.e(4,1)(.5superpull) & cycle; % bowl -pickup crisp.nib; pos5(cap_vstem,90); pos6(cap_vstem,90); -lft x5=w-rt x6=hround(x2l+u)+1; y5=y6=.5[y1l,y3l]; -filldraw stroke z5e--z6e; % bar -if serifs: pos7(hair,0); pos8(hair,0); pos9(hair,0); pos10(hair,0); - x7l=x8l=x5; x9r=x10r=x6; - y7-y5r=y9-y6r=y5l-y8=y6l-y10=vround .05h; - filldraw stroke z7e--z8e; % left serif - filldraw stroke z9e--z10e; fi % right serif -math_fit(-.3cap_height#*slant-.5u#,ic#-.5u#); -penlabels(1,2,3,4,5,6,7,8,9,10); endchar; - -cmchar "Uppercase Greek Lambda"; -beginchar(character_offset+oct"003",12u#,cap_height#,0); -adjust_fit(cap_serif_fit#,cap_serif_fit#); -numeric left_stem,outer_jut,alpha; -left_stem=cap_hair if hefty: -3stem_corr fi; -outer_jut=.7cap_jut; x1l=w-x4r=l+letter_fit+outer_jut+.5u; y1=y4=0; -x2-x1=x4-x3; x3r=x2r+apex_corr; y2=y3=h+apex_o+apex_oo; -alpha=diag_ratio(2,left_stem,y2-y1,x4r-x1l-apex_corr); -penpos1(alpha*left_stem,0); penpos2(alpha*left_stem,0); -penpos3(alpha*cap_stem,0); penpos4(alpha*cap_stem,0); -z0=whatever[z1r,z2r]=whatever[z3l,z4l]; -if y0<h-cap_notch_cut: y0:=h-cap_notch_cut; - fill z0+.5right{down}...{z4-z3}diag_end(3l,4l,1,1,4r,3r) - --diag_end(4r,3r,1,1,2l,1l)--diag_end(2l,1l,1,1,1r,2r){z2-z1} - ...{up}z0+.5left--cycle; % left and right diagonals -else: fill z0--diag_end(0,4l,1,1,4r,3r)--diag_end(4r,3r,1,1,2l,1l) - --diag_end(2l,1l,1,1,1r,0)--cycle; fi % left and right diagonals -if serifs: numeric inner_jut; pickup tiny.nib; - prime_points_inside(1,2); prime_points_inside(4,3); - if rt x1'r+cap_jut+.5u+1<=lft x4'l-cap_jut: inner_jut=cap_jut; - else: rt x1'r+inner_jut+.5u+1=lft x4'l-inner_jut; fi - dish_serif(1',2,a,1/2,outer_jut,b,.6,inner_jut)(dark); % left serif - dish_serif(4',3,c,1/2,inner_jut,d,1/3,outer_jut); fi % right serif -penlabels(0,1,2,3,4,5,6); endchar; - -cmchar "Uppercase Greek Xi"; -beginchar(character_offset+oct"004",12u#,cap_height#,0); -italcorr cap_height#*slant-.35u#; -adjust_fit(0,0); -h:=vround(h-2stem_corr); -numeric shaved_stem; shaved_stem=hround .9[vair,.85cap_stem]; -if shaved_stem<crisp.breadth: shaved_stem:=crisp.breadth; fi -pickup crisp.nib; pos1(shaved_stem,90); pos2(hair,0); -top y1r=h; x1=.5w; rt x2r=hround(w-.85u); y2=good.y(y1l-4/9beak)-eps; -arm(1,2,a,.4beak_darkness,.3beak_jut); % upper right arm and beak -pos3(hair,180); x3=w-x2; y3=y2; -arm(1,3,b,.4beak_darkness,-.3beak_jut); % upper left arm and beak -pos4(shaved_stem,-90); pos5(hair,0); -bot y4r=0; x4=.5w; rt x5r=hround(w-.75u); y5=good.y(y4l+.5beak)+eps; -arm(4,5,c,.4beak_darkness,.3beak_jut); % lower right arm and beak -pos6(hair,180); x6=w-x5; y6=y5; -arm(4,6,d,.4beak_darkness,-.3beak_jut); % lower left arm and beak -pos7(shaved_stem,90); pos8(shaved_stem,90); -lft x7=w-rt x8=hround if serifs: 2.5 else: 2 fi\\ u; -top y7r=top y8r=vround(.52h+.5shaved_stem); -filldraw stroke z7e--z8e; % middle bar -if serifs: numeric xjut; - if bot y2>top y7r+.75cap_jut: xjut=.5cap_jut; - else: bot y2=top y7r+1.5xjut; fi - pos11(hair,0); pos12(hair,0); y11=y12; - pos13(hair,0); pos14(hair,0); y13=y14; - lft x11l=lft x13l=w-rt x12r=w-rt x14r=hround 2.5u; - top y11-bot y13=shaved_stem+2xjut; .5[y11,y13]=y7; - filldraw stroke z11e--z13e; filldraw stroke z12e--z14e; fi % middle serifs -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8,11,12,13,14); endchar; - -cmchar "Uppercase Greek Pi"; -beginchar(character_offset+oct"005",13u#+width_adj#,cap_height#,0); -italcorr cap_height#*slant-cap_serif_fit#+cap_jut#-2.5u#+min(.5cap_stem#,u#); -adjust_fit(cap_serif_fit#,cap_serif_fit#); pickup tiny.nib; -h:=vround(h-stem_corr); -pos1(cap_stem,0); pos2(cap_stem,0); pos3(cap_stem,0); pos4(cap_stem,0); -lft x1l=lft x2l=hround max(2u,3u-.5cap_stem); x3=x4=w-x1; -top y1=top y3=h; bot y2=bot y4=0; -filldraw stroke z1e--z2e; % left stem -filldraw stroke z3e--z4e; % right stem -penpos5(cap_bar,90); penpos6(cap_bar,90); -x5=x1; x6=x3; y5r=y6r=h; -fill stroke z5e--z6e; % bar -if serifs: numeric inner_jut; - if rt x1r+cap_jut+.5u+1<=lft x3l-cap_jut: inner_jut=cap_jut; - else: rt x1r+inner_jut+.5u+1=lft x3l-inner_jut; fi - nodish_serif(1,2,a,1/3,cap_jut,b,1/3,eps); % upper left serif - dish_serif(2,1,c,1/3,cap_jut,d,1/3,inner_jut); % lower left serif - nodish_serif(3,4,e,1/3,eps,f,1/3,cap_jut); % upper right serif - dish_serif(4,3,g,1/3,inner_jut,h,1/3,cap_jut); fi % lower right serif -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6); endchar; - -cmchar "Uppercase Greek Sigma"; -beginchar(character_offset+oct"006",13u#,cap_height#,0); -italcorr cap_height#*slant-beak_jut#-.5u#; -adjust_fit(0,0); -numeric bot_arm_thickness; -bot_arm_thickness=Vround .25[slab,cap_vstem]; -pickup tiny.nib; lft x1l=hround u; x1l=x2l=x4l; -top y1=h; bot y2=h-slab-eps; bot y4=0; x3l-x1l=4/11(w-2u); y3=.5h; -numeric alpha[]; alpha1=((x3l-x1l)++(y2-y3))/(y2-y3); -penpos1(alpha1*(cap_stem-tiny),0); penpos2(alpha1*(cap_stem-tiny),0); -penpos3(alpha1*(cap_stem-tiny),0); -alpha2=diag_ratio(1,cap_hair-tiny,y3-y4,x3r-x4l); -penpos4(alpha2*(cap_hair-tiny),0); -z0=whatever[z2l,z3l]=z4l+whatever*(z3r-z4r); -filldraw z1l--z2l--z0--z4l--z4r--z3r--z2r--z1r--cycle; % diagonals -pickup crisp.nib; pos5(slab,90); pos6(hair,0); -top y5r=h; x5=x1; rt x6r=hround(w-u); y6=good.y(y5l-beak)-eps; -arm(5,6,a,beak_darkness,beak_jut); % upper arm and beak -pos7(bot_arm_thickness,-90); pos8(hair,0); -bot y7r=0; z7l=whatever[z4,z3]; x7r:=x4; x8=x6; y8=good.y(y7l+beak)+eps; -arm(7,8,b,beak_darkness,beak_jut); % lower arm and beak -math_fit(0,.5ic#); penlabels(0,1,2,3,4,5,6,7,8); endchar; - -cmchar "Uppercase Greek Upsilon"; -beginchar(character_offset+oct"007",14u#,cap_height#,0); -italcorr .8cap_height#*slant-.5u#; -adjust_fit(0,0); -pickup tiny.nib; pos1(cap_stem,0); pos2(cap_stem,0); -lft x1l=lft x2l=hround(.5w-.5cap_stem); y1=.5h; bot y2=0; -filldraw stroke z1e--z2e; % stem -penpos3(.6cap_stem,0); penpos4(.75cap_curve,90); penpos5(cap_hair,180); -z3l=lft z1l; x5r=hround u; y5=bot .8h; x4=.61803[x3l,x5l]; y4r=h+o; -penpos5'(cap_hair,180); x5'=x5; y5'=h; -fill z3r{up}...z4r{left}...{down}diag_end(5'r,5r,1,1,5l,5'l){up} - ...{right}z4l...{down}z3l--cycle; % left arc -penpos6(.6cap_stem,0); penpos7(.75cap_curve,-90); penpos8(cap_hair,-180); -z6r=rt z1r; x8=w-x5; y8=y5; x7=w-x4; y7=y4; -penpos8'(cap_hair,-180); x8'=x8; y8'=h; -fill z6r{up}...z7r{right}...{down}diag_end(8'r,8r,1,1,8l,8'l){up} - ...{left}z7l...{down}z6l--cycle; % right arc -if serifs: dish_serif(2,1,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); fi % serif -math_fit(-.8cap_height#*slant-.5u#,ic#-2.5u#); -penlabels(1,2,3,4,5,6,7,8); endchar; - -cmchar "Uppercase Greek Phi"; -beginchar(character_offset+oct"010",13u#,cap_height#,0); -italcorr .5cap_height#*slant-.5u#; -adjust_fit(0,0); -numeric shaved_stem,light_curve; -shaved_stem=cap_stem-hround 2stem_corr; -light_curve=cap_curve-hround stem_corr; -pickup tiny.nib; pos1(shaved_stem,0); pos2(shaved_stem,0); -lft x1l=lft x2l=hround(.5w-.5shaved_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -penpos3(vair,90); penpos5(vair,-90); -penpos4(light_curve,180); penpos6(light_curve,0); -x4r=hround u; x6r=w-x4r; x3=x5=.5w; -y3r=vround(.85h if serifs:-slab fi); y4=y6=.5[y3,y5]; -y5r=vround(.15h if serifs:+slab fi); -penstroke pulled_arc.e(3,4) & pulled_arc.e(4,5) - & pulled_arc.e(5,6) & pulled_arc.e(6,3) & cycle; % bowl -if serifs: dish_serif(1,2,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); % upper serif - dish_serif(2,1,c,1/3,1.25cap_jut,d,1/3,1.25cap_jut); fi % lower serif -math_fit(-.5cap_height#*slant-.5u#,ic#); penlabels(1,2,3,4,5,6); endchar; - -cmchar "Uppercase Greek Psi"; -beginchar(character_offset+oct"011",14u#,cap_height#,0); -italcorr .8cap_height#*slant-.5u#; -adjust_fit(0,0); -numeric shaved_stem; -shaved_stem=cap_stem-hround 2stem_corr; -pickup tiny.nib; pos1(shaved_stem,0); pos2(shaved_stem,0); -lft x1l=lft x2l=hround(.5w-.5shaved_stem); top y1=h; bot y2=0; -filldraw stroke z1e--z2e; % stem -pos3(shaved_stem,-180); pos4(shaved_stem,-180); -pos5(vair,-90); x5=x1; bot y5r=vround(.15h if serifs:+slab fi); -pos6(shaved_stem,0); pos7(shaved_stem,0); -lft x3r=hround u; x7=w-x3; lft x4r=hround(3u-.5shaved_stem); x6=w-x4; -pos3'(vair,90); pos7'(vair,90); z3'r=z3r; z7'r=z7r; -y3=y7; y4=y6=.6h; y3=good.y(y3+.84h if serifs:-slab fi-y3'); -interim superness:=more_super; -filldraw z3'l{right}...z4r{down} & super_arc.r(4,5) - & super_arc.r(5,6) & z6r{up}...z7'l{right} - --z7r---z7l...z6l{down} & super_arc.l(6,5) - & super_arc.l(5,4) & z4l{up}...z3l---z3r--cycle; % stroke -if serifs: dish_serif(1,2,a,1/3,1.25cap_jut,b,1/3,1.25cap_jut); % upper serif - dish_serif(2,1,c,1/3,1.25cap_jut,d,1/3,1.25cap_jut); fi % lower serif -math_fit(-.8cap_height#*slant-.5u#,.4cap_height#*slant-1.25u#); -penlabels(1,2,3,4,5,6,7); endchar; - -cmchar "Uppercase Greek Omega"; -beginchar(character_offset+oct"012",13u#,cap_height#,0); -italcorr .75cap_height#*slant-.5u#; -adjust_fit(0,0); -pickup tiny.nib; pos1(vair,90); pos2(cap_curve,180); -pos3(vair,180); pos4(cap_curve,0); pos5(vair,0); -x1=.5w; top y1r=h+o; lft x2r=hround u; y2=y4=2/3h; x4=w-x2; -rt x3l=hround(1/3(w+.5u)+.5hair); bot y3=bot y5=0; x5=w-x3; -filldraw stroke z3e{up}...{up}z2e - & pulled_super_arc.e(2,1)(.5superpull) - & pulled_super_arc.e(1,4)(.5superpull) - & z4e{down}...{down}z5e; % bowl -numeric arm_thickness; path p; p=z3{up}...{up}z2; -arm_thickness=Vround(if hefty:slab+2stem_corr else:.75[slab,cap_vstem] fi); -pickup crisp.nib; pos6(arm_thickness,-90); pos7(fudged.hair,-180); -bot y6r=0; x6=x3; lft x7r=hround .8u; y7=good.y(y6l+.5beak)+eps; -(x,y)=p intersectionpoint((0,y6l)--(w,y6l)); x6l:=x; -arm(6,7,a,.5beak_darkness,-1.2beak_jut); % left arm and beak -pos8(arm_thickness,-90); pos9(fudged.hair,0); -y8=y6; y9=y7; x8+x6=x9+x7=w; x8l:=w-x6l; -arm(8,9,b,.5beak_darkness,1.2beak_jut); % right arm and beak -math_fit(0,.5ic#); penlabels(1,2,3,4,5,6,7,8,9); endchar; diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index bc2be5f112..885a059c97 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2024/01/30}{2024R} +\ProvidesExplClass{easybook}{2024/01/31}{2024S} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -297,7 +297,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2024/01/30}{2024R} +\ProvidesExplPackage{easybase}{2024/01/31}{2024S} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -384,7 +384,6 @@ \seq_map_function:NN \l_tmpb_seq \eb_match_load_package:n } -\msg_redirect_module:nnn { hooks } { warning } { info } \bool_set_true:N \l__eb_class_mode_book_bool \bool_set_false:N \l__eb_compile_draft_bool @@ -1416,6 +1415,7 @@ { #1 .meta:nn = { ctex/#1 } {##1}, #1/between .tl_set:c = l__eb_toc_#1_between_hook_tl, + #1/between .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} }, #1/tocline .cs_set:cp = { eb@tocline@#1 } ##1##2, #1/tocline .initial:n = \listnumberline{##1}##2 } @@ -1487,6 +1487,7 @@ { \ctex_define:n { + #1 .meta:nn = { ctex/#1 } {##1}, #1/tocformat .tl_set:c = l__eb_toc_#1_format_tl, #1/tocformat+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1}, #1/tocformat~+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1}, @@ -1504,6 +1505,12 @@ {\eb_toc_entry_if_hang:n {#1}}{} {\tl_use:c { l__eb_toc_#1_rule_tl }} [\tl_use:c { l__eb_toc_#1_below_tl }] + \ctex_set:nn {#1} + { + tocindent = 0em, + tocrule = \tocrule{$\cdot$}, + tocafter = \hspace{1em} + } } \cs_new_protected:Npn \RegisterTocName #1 { @@ -1512,13 +1519,6 @@ } \seq_map_function:NN \c__ctex_headings_seq \RegisterTocName -\seq_remove_all:Nn \c__ctex_headings_seq { table } -\seq_remove_all:Nn \c__ctex_headings_seq { figure } -\seq_remove_all:Nn \c__ctex_headings_seq { lstlisting } -\cs_new_protected:Npn \eb@key@path@meta@define #1 - { \ctex_define:n { #1 .meta:nn = { ctex/#1 } {##1} } } -\seq_map_function:NN -\c__ctex_headings_seq \eb@key@path@meta@define \eb_seq_map_inline:nn { tocformat,tocformat+,tocformat~+, @@ -1627,17 +1627,7 @@ } }, subsection = - { - tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em }, - tocrule = \tocrule{$\cdot$} - }, - float = - { - tocindent = 0em, - tocrule = \tocrule{$\cdot$}, - between = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} } - }, - tocset/tocafter-every = \hspace{1em} + { tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em } } } \ctex_at_end_package:nn { imakeidx } @@ -2330,7 +2320,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/30}{2024R} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/31}{2024S} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex 97d9370cd9..f7a0a541b1 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index b0291dfb82..6ac54ffeee 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -23,8 +23,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v2024R, - date = 2024/01/30, + version = v2024S, + date = 2024/01/31, authors = 瞿毅, info = 简便地排版ä¸æ–‡å¦ä½è®ºæ–‡æˆ–书ç±, email = toquyi@163.com, @@ -832,7 +832,7 @@ \begin{commands} \command{RegisterTocName}[\marg{æ¡ç›®å}] - ç»™æ¡ç›®ç±»åž‹å称为 \meta{æ¡ç›®å} çš„æ ‡é¢˜æ³¨å†Œç”¨äºŽè®¾ç½®ç›®å½•æ ·å¼çš„选项，å³é€‰é¡¹å‰æœ‰ç¬¦å· \ding{73} 表示需è¦æ³¨å†ŒåŽä½¿ç”¨ã€‚å‰é¢æ到的æ¡ç›®ç±»åž‹å‡å·²æ³¨å†Œï¼Œéœ€è¦æ³¨æ„新类型的æ¡ç›®æ³¨å†ŒåŽé€‰é¡¹åˆå§‹å€¼\textbf{å‡ä¸ºç©º}。 + ç»™æ¡ç›®ç±»åž‹å称为 \meta{æ¡ç›®å} çš„æ ‡é¢˜æ³¨å†Œç”¨äºŽè®¾ç½®ç›®å½•æ ·å¼çš„选项，å³é€‰é¡¹å‰æœ‰ç¬¦å· \ding{73} 表示需è¦æ³¨å†ŒåŽä½¿ç”¨ã€‚å‰é¢æ到的æ¡ç›®ç±»åž‹å‡å·²æ³¨å†Œï¼Œæ–°ç±»åž‹çš„æ¡ç›®æ³¨å†ŒåŽé€‰é¡¹åˆå§‹å€¼ä¸Žå›¾è¡¨æ¡ç›®ç›¸åŒã€‚ \command{contentsuse}[\marg{æ¡ç›®å}\marg{扩展å}] 激活æ¡ç›®ç±»åž‹å称为 \meta{æ¡ç›®å} 的目录定制功能，它使用的目录文件åŽç¼€ä¸º \meta{扩展å}。需è¦åœ¨æ¿€æ´»æ¡ç›®åŽå†ä½¿ç”¨å‘½ä»¤ \cs{RegisterTocName} 注册选项。 \command{DeclareFloatList}[\marg{æ¡ç›®å}\marg{扩展å}] @@ -981,7 +981,7 @@ \end{commands} \subsection[ä¸Šæ ‡å’Œä¸‹æ ‡]{ä¸Šæ ‡å’Œä¸‹æ ‡\smodule{style}} -ä¸Šæ ‡å’Œä¸‹æ ‡çš„åŠŸèƒ½æ¥è‡ª \pkg*{spbmark} å®åŒ…，下é¢æœ‰ä¸‰ä¸ªå‘½ä»¤å¯ä»¥ç”¨äºŽè¾“å‡ºä¸Šæ ‡å’Œä¸‹æ ‡ã€‚å¯ä»¥ä½¿ç”¨é”®å€¼åˆ—表的形å¼å¯¹ä¸Šä¸‹æ ‡æ ¼å¼è¿›è¡Œå±€éƒ¨æˆ–全局设置，下é¢å‘½ä»¤ä¸ä¸¤ä¸ªå¯é€‰å‚数的键值列表是ç‰æ•ˆçš„。全局设置的详情è§\ref{subsubsec:super-sub-script}。 +ä¸Šæ ‡å’Œä¸‹æ ‡çš„åŠŸèƒ½æ¥è‡ª \pkg*{spbmark} å®åŒ…，下é¢æœ‰ä¸‰ä¸ªå‘½ä»¤å¯ä»¥ç”¨äºŽè¾“å‡ºä¸Šæ ‡å’Œä¸‹æ ‡ã€‚å¯ä»¥ä½¿ç”¨é”®å€¼åˆ—表的形å¼å¯¹ä¸Šä¸‹æ ‡æ ¼å¼è¿›è¡Œå±€éƒ¨æˆ–全局设置，下é¢å‘½ä»¤ä¸ä¸¤ä¸ªå¯é€‰å‚数的键值列表是ç‰æ•ˆçš„。全局设置的详情è§\ref{subsubsec:super-sub-script}ï¼Œæ›´å¤šå‘½ä»¤å’Œè¯¦ç»†ç”¨æ³•è§ \pkg*{spbmark} å®åŒ…说明文档。 \begin{commands} \command{super}[\sarg\oarg{键值列表1}\marg{内容}\oarg{键值列表2}] è¾“å‡ºä¸Šæ ‡çš„å‘½ä»¤ï¼Œå¯ç”¨äºŽæ–‡æœ¬å’Œæ•°å¦æ¨¡å¼ï¼Œåœ¨æ•°å¦æ¨¡å¼ä¸å¯ä»£æ›¿ \code{\^{}} 符å·å’Œ \cs*{sp} 命令。 @@ -1350,7 +1350,7 @@ \shortversion{v = 1.638,date = 2022/03/04,changes = å¢žåŠ ç›®å½•æ¡ç›®æ ·å¼é€‰é¡¹æ³¨å†Œå‘½ä»¤ \cs{RegisterTocName}。} \shortversion{v = 1.644,date = 2022/03/10,changes = å¢žåŠ æµ®åŠ¨çŽ¯å¢ƒç›®å½•å£°æ˜Žå‘½ä»¤ \cs{DeclareFloatList} é…åˆ \pkg*{caption} å®åŒ…。} \shortversion{v = 1.682,date = 2022/05/01,changes = å°†è¿·ä½ é¡µåˆ¤æ–命令 \cs{notminipage} 改为被ä¿æŠ¤å‘½ä»¤å…¼å®¹ \pkg*{circledtext} å®åŒ…。} - \begin{version}[v = 2024R,date = 2024/01/30,simple] + \begin{version}[v = 2024S,date = 2024/01/31,simple] \item æ ¸å¯¹ä¾èµ–å®åŒ…的更新改动，优化使用手册的内容细节。 \item ä¿®å¤å›¾è¡¨ç‰æµ®åŠ¨çŽ¯å¢ƒé¢˜æ³¨ç›®å½•ä¸æ¡ç›®æ ‡ç¾ç¼–å·çš„计数器值显示错误问题。 \item ä¿®å¤é™„录命令 \cs{appendix} çš„å¯é€‰å‚数设置英文目录ä¸æ¡ç›®åå—和编å·å¤±æ•ˆçš„问题。 diff --git a/macros/latex/contrib/hvextern/Changes b/macros/latex/contrib/hvextern/Changes index 3f870a713e..2d7f41812e 100644 --- a/macros/latex/contrib/hvextern/Changes +++ b/macros/latex/contrib/hvextern/Changes @@ -1,5 +1,6 @@ hvextern.sty ---------------- +v 0.39 2024-01-30 - fixed bug with check for force option v 0.38 2023-12-08 - change internal macroname \Write@Ex to \hv@Write@EX v 0.37b 2023-11-22 - fix typo in documentation v 0.37a 2023-11-20 - fix bug in documentation diff --git a/macros/latex/contrib/hvextern/doc/hvextern.pdf b/macros/latex/contrib/hvextern/doc/hvextern.pdf Binary files differindex d78c943a84..793507b058 100644 --- a/macros/latex/contrib/hvextern/doc/hvextern.pdf +++ b/macros/latex/contrib/hvextern/doc/hvextern.pdf diff --git a/macros/latex/contrib/hvextern/doc/hvextern.tex b/macros/latex/contrib/hvextern/doc/hvextern.tex index 6dcdf79d54..7172969db8 100644 --- a/macros/latex/contrib/hvextern/doc/hvextern.tex +++ b/macros/latex/contrib/hvextern/doc/hvextern.tex @@ -1,4 +1,4 @@ -%% $Id: hvextern.tex 822 2023-11-22 12:16:48Z herbert $ +%% $Id: hvextern.tex 853 2024-01-30 20:34:00Z herbert $ \DocumentMetadata{}% for lualatex and pstricks \documentclass[english,paper=a4,twoside,usegeometry]{scrartcl} \usepackage{babel} @@ -16,8 +16,7 @@ \usepackage[automark]{scrlayer-scrpage} \pagestyle{scrheadings} \usepackage{hvlogos} -\usepackage%[checkCode] -{hvextern} +\usepackage[checkCode]{hvextern} \usepackage{hvindex} \usepackage{hvdoctools} \usepackage{listings} @@ -32,7 +31,6 @@ - \begin{document} \title{Writing, running and including the output of external documents from within a main\newline \LaTeX\ document~--v. \hvexternFileversion} @@ -43,8 +41,7 @@ Werner Lemberg; Rolf Niepraschk}} %\newpage -\setkeys{hv}{moveToExampleDir,ExampleDir=Exa, -showFilename,verbose} +\setkeys{hv}{moveToExampleDir,ExampleDir=Exa,showFilename,verbose,force=false} %\clearpage @@ -118,7 +115,7 @@ outside of the main document and then to insert the output we can do this from within this \LuaLaTeX\ document itself. The external document is compiled with \XeLaTeX\ and the output is insert as pdf image: \begin{externalDocument}[% - compiler=xelatex, inline, force=true, runs=2, grfOptions={height=8pt},% + compiler=xelatex, inline, runs=2, grfOptions={height=8pt},% crop, cropmargin=0, cleanup, docType=latex,vshift=-1pt]{voss} \documentclass{ctexart} \pagestyle{empty} @@ -138,7 +135,7 @@ shown by the environment \Lenv{externalDocument}. \begin{minipage}{.59\linewidth} \begin{lstlisting} \begin{externalDocument}[ - compiler=pdflatex,force=true,cleanup]{voss} + compiler=pdflatex,cleanup]{voss} \documentclass{standalone} %StartVisiblePreamble \usepackage{fontenc} @@ -151,7 +148,7 @@ shown by the environment \Lenv{externalDocument}. [VP [DP] [V’ - [V] + [V] [DP] ] ] @@ -162,7 +159,7 @@ shown by the environment \Lenv{externalDocument}. \end{minipage} \begin{minipage}{.39\linewidth} \begin{externalDocument}[ - compiler=pdflatex,force=true,cleanup={log,aux},showFilename=false]{voss} + compiler=pdflatex,cleanup={log,aux},showFilename=false]{voss} \documentclass{standalone} %StartVisiblePreamble \usepackage{fontenc} @@ -218,7 +215,6 @@ catagory, which is done internally by the package. The complete definition of th compiler=python3, code, ext=py, - force=true, docType=py, usefancyvrb, grfOptions={width=\linewidth}]{python} @@ -268,7 +264,6 @@ line in the above code shows how it can be done with Python. \begin{externalDocument}[ compiler=python3, progpath=/usr/local/bin/, - force=true, runs=1, code, ext=py, @@ -328,7 +323,7 @@ e.g. \texttt{shiftFN=5ex}. \begin{externalDocument}[grfOptions={width=0.95\linewidth}, compiler=xelatex,code,mpwidth=0.6\linewidth, - crop,cleanup,force=true,usefancyvrb=false,ext=tex,showFilename=false]{voss} + crop,cleanup,usefancyvrb=false,ext=tex,showFilename=false]{voss} \documentclass{article} %StartVisiblePreamble \usepackage{tikz} @@ -438,9 +433,7 @@ runsequence={lualatex,biber,xindex -l de -c AU,lualatex,lualatex} pagesep=2pt, frame, runsequence={lualatex,biber,xindex -l de -c AU,lualatex,lualatex}, - , verbose, - force=true, cleanup={log,aux,toc,bbl,blg}, code,docType=latex, lstOptions={columns=fixed}]{voss} @@ -479,7 +472,7 @@ the environment \Lenv{externalDocument} is: \begin{externalDocument}[ verbose, compiler=java,ext=java,code, - force=true,docType=java,includegraphic, + docType=java,includegraphic, usefancyvrb,grfOptions={width=0.9\linewidth}]{java} import java.awt.Color; import java.awt.Graphics; @@ -558,7 +551,7 @@ the follwing example. \begin{externalDocument}[grfOptions={angle=90,width=\linewidth}, compiler=xelatex,code,mpwidth=0.6\linewidth, - crop,cleanup,force]{voss} + crop,cleanup]{voss} \documentclass{article} %StartVisiblePreamble \usepackage{tikz} @@ -610,7 +603,6 @@ to \Lcs{VerbatimInput}. The following example uses mpwidth=0.6\linewidth, crop, cleanup, - force=true, docType=latex]{voss} \RequirePackage{pdfmanagement-testphase} \DeclareDocumentMetadata{} @@ -658,7 +650,6 @@ The color of the frame is set to the same values, hence not seen. The following mpwidth=0.6\linewidth, crop, cleanup, - force=true, usefancyvrb, docType=latex]{voss} \RequirePackage{pdfmanagement-testphase} @@ -745,7 +736,6 @@ The following example uses: % mpwidth=0.6\linewidth, % crop, cleanup, - force=true, frame, % usefancyvrb, % float, @@ -798,7 +788,6 @@ which is the default. Using a caption and a label are optional. % mpwidth=0.6\linewidth, crop, cleanup, - force=true, usefancyvrb, float, floatsetting=!ht, @@ -861,7 +850,6 @@ The follwoing example was created with % mpwidth=0.6\linewidth, crop, cropmargin=5, cleanup, - force=true, frame, % usefancyvrb, % float, @@ -922,7 +910,6 @@ or \Lkeyval{b}. showFilename=false, crop, cleanup, - force=true, aboveskip=0pt,belowskip=0pt, docType=latex]{voss} \documentclass{article} @@ -947,7 +934,6 @@ or \Lkeyval{b}. code, crop, cleanup, - force=true, aboveskip=0pt,belowskip=0pt, docType=latex]{voss} \documentclass{article} @@ -973,7 +959,6 @@ or \Lkeyval{b}. showFilename=false, crop, cleanup, - force=true, aboveskip=0pt,belowskip=0pt, docType=latex]{voss} \documentclass{article} @@ -999,7 +984,6 @@ or \Lkeyval{b}. crop, showFilename=false, cleanup, - force=true, mpwidth=0.5\linewidth, aboveskip=0pt,belowskip=0pt, docType=latex]{voss} @@ -1025,7 +1009,6 @@ or \Lkeyval{b}. showFilename=false, crop, cleanup, - force=true, mpwidth=0.5\linewidth, aboveskip=0pt,belowskip=0pt, docType=latex]{voss} @@ -1052,7 +1035,6 @@ or \Lkeyval{b}. showFilename=false, crop, cleanup, - force=true, mpwidth=0.5\linewidth, aboveskip=0pt,belowskip=0pt, docType=latex]{voss} @@ -1083,7 +1065,7 @@ next Chinese characters \label{inline-exa} \begin{externalDocument}[ compiler=xelatex, inline, runs=2, grfOptions={height=8pt}, crop, cropmargin=0, vshift=-1pt,usefancyvrb, - cleanup, force=true, docType=latex]{voss}% + cleanup, docType=latex]{voss}% \documentclass{ctexart} \pagestyle{empty} \begin{document} @@ -1100,7 +1082,7 @@ With \Lkeyset{inline} the optional argument \Lkeyword{code} is automatically set to false. The next Chinese characters \begin{externalDocument}[vshift=-1pt, compiler=xelatex, inline, runs=2, grfOptions={height=8pt}, - crop, cropmargin=0, cleanup, force=true, docType=latex]{voss} + crop, cropmargin=0, cleanup, docType=latex]{voss} \documentclass{ctexart} \pagestyle{empty} \begin{document} @@ -1140,7 +1122,7 @@ sorted digits of the number $A$: $495=954-459$. \begin{externalDocument}[ - compiler=perl, force=true, docType=pl, ext=pl, includegraphic=false, + compiler=perl, docType=pl, ext=pl, includegraphic=false, code, mpwidth=0.6\linewidth]{voss} #!/usr/bin/perl # @@ -1195,7 +1177,7 @@ outFile = io.open(shortFN..".txt","w+") -- open external file \begin{externalDocument}[ - compiler=lua, force=true, docType=lua, ext=lua, includegraphic=false, + compiler=lua, docType=lua, ext=lua, includegraphic=false, code, usefancyvrb=false,textOptions={basicstyle=\ttfamily\footnotesize}, shiftFN=6ex]{voss} #!/usr/bin/env lua @@ -1270,7 +1252,6 @@ The following examples uses pages=2, crop, cleanup, - force=true, xindex, xindexOptions={-l DE --config AU}, mpwidth=0.6\linewidth, @@ -1326,7 +1307,6 @@ runsequence={lualatex,biber,{xindex -l de -c AU},lualatex,lualatex} frame, runsequence={lualatex,biber,xindex -l de -c AU,lualatex,lualatex}, verbose, - force=true, cleanup={log,aux,toc,bbl,blg}, code,docType=latex, lstOptions={columns=fixed}]{voss} @@ -1366,7 +1346,7 @@ The default is using \Lcs{lstinputlisting} for the printed code sequences. pages={1,3}, frame,compiler=pdflatex, % crop, - force=true,runs=2,code,docType=latex, + runs=2,code,docType=latex, frame, lstOptions={columns=fixed}]{voss} %StartVisiblePreamble @@ -1426,7 +1406,7 @@ it makes no difference using the optional argument \Lkeyword{usefancyvrb} or not frame,compiler=pdflatex, showFilename, % crop, - force=true,runs=2,code,docType=latex, + runs=2,code,docType=latex, frame,framesep=0pt,usefancyvrb]{voss} %StartVisiblePreamble \documentclass[chapterprefix=on,parskip=half-,DIV=12,fontsize=12pt]{scrbook} @@ -1520,7 +1500,7 @@ other examples, you can set \Lkeyword{showoutput} to false. showoutput=false, frame,compiler=pdflatex, crop, - force=true,runs=2,code,docType=latex, + runs=2,code,docType=latex, frame,usefancyvrb]{voss} %StartVisiblePreamble \documentclass[chapterprefix=on,parskip=half-,DIV=12,fontsize=12pt]{scrbook} @@ -1596,7 +1576,6 @@ Whith this definition and the setting \Lkeyset{docType=ltx} the last example loo frame, compiler=pdflatex, showFilename, - force=true, runs=2,code,docType=ltx, usefancyvrb]{voss} \documentclass[chapterprefix=on,parskip=half-,DIV=12,fontsize=12pt]{scrreprt} @@ -1660,7 +1639,6 @@ It is already internally defined. compiler=mpost, showFilename, % crop, - force=true, cleanup, code, docType=mp, @@ -1696,7 +1674,6 @@ It is already internally defined. compiler=tex, showFilename, % crop, - force=true, code, docType=tex, ext=tex,]{voss} @@ -1762,7 +1739,6 @@ not needed. The \texttt{pdf} is directly created. compiler=lualatex, showFilename, crop, - force=true, code, docType=latex, ext=tex,]{voss} @@ -1804,7 +1780,6 @@ not needed. The \texttt{pdf} is directly created. compiler=context, showFilename, runs=2, - force=true, code, docType=context, ext=tex,]{voss} diff --git a/macros/latex/contrib/hvextern/latex/hvextern.sty b/macros/latex/contrib/hvextern/latex/hvextern.sty index cfdd56053d..bfe8f75e8f 100644 --- a/macros/latex/contrib/hvextern/latex/hvextern.sty +++ b/macros/latex/contrib/hvextern/latex/hvextern.sty @@ -1,7 +1,7 @@ -%% $Id: hvextern.sty 833 2023-12-08 19:31:08Z herbert $ +%% $Id: hvextern.sty 853 2024-01-30 20:34:00Z herbert $ %% This is file `hvextern.sty', %% -%% Copyright (C) 2016-23 +%% Copyright (C) 2016-24 %% Herbert Voss %% %% It may be distributed and/or modified under the @@ -12,8 +12,8 @@ %% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\def\hvexternFileversion{0.38} -\ProvidesFile{hvextern}[2023/12/08 v\hvexternFileversion: package for running external documents (HV)] +\def\hvexternFileversion{0.39} +\ProvidesFile{hvextern}[2024/01/30 v\hvexternFileversion: package for running external documents (HV)] \newif\ifhv@extern@checkCode \hv@extern@checkCodefalse @@ -72,6 +72,8 @@ \newlength\hv@extern@mpwidth \setlength\hv@extern@mpwidth{\z@} +\newif\ifhv@extern@save@force@state + \define@key{hv}{progpath}{\def\hv@extern@progpath{#1}} \define@key{hv}{runsequence}[]{\def\hv@extern@runsequence{#1}} \define@key{hv}{runs}[1]{\setcounter{hv@extern@runs}{#1}} @@ -106,7 +108,7 @@ \define@key{hv}{shiftFN}[0pt]{\setlength\hv@extern@shiftFN{#1}} \define@key{hv}{vshift}[0pt]{\setlength\hv@extern@vshift{#1}}% \define@boolkey{hv}[hv@extern@]{code}[true]{} -\define@boolkey{hv}[hv@extern@]{force}[true]{} +\define@boolkey{hv}[hv@extern@]{force}[true]{\@nameuse{hv@extern@save@force@state#1}} \define@boolkey{hv}[hv@extern@]{crop}[true]{} \define@boolkey{hv}[hv@extern@]{tcbox}[true]{} \define@boolkey{hv}[hv@extern@]{biber}[true]{} @@ -119,7 +121,7 @@ \define@key{hv}{framesep}[\the\fboxsep]{\setlength\hv@extern@framesep{#1}} \define@boolkey{hv}[hv@extern@]{float}[true]{} \define@key{hv}{floatsetting}[]{\def\hv@extern@floatsetting{#1}} -\define@key{hv}{cleanup}[{aux,log}]{\def\hv@extern@cleanup{#1}}% +\define@key{hv}{cleanup}[{aux,log,psaux}]{\def\hv@extern@cleanup{#1}}% \define@boolkey{hv}[hv@extern@]{moveToExampleDir}[true]{} \define@key{hv}{align}[\centering]{\def\hv@extern@align{#1}} \define@key{hv}{ExampleDir}[Examples]{% @@ -151,64 +153,64 @@ \def\ResetKeys{% \setkeys{hv}{% - showFilename=false,% Filenamen im Rand angeben - outerFN=false,% use fullwidth in twocolumn mode (starred floats) - shiftFN=\z@,% raise printed filename - vshift=\z@,% raise object (pdf) with \raisebox{}{} - ext=tex,% file extension - code=false,% show Code - crop=false,% erzeugte PDF "croppen" - compiler=pdflatex,% zu verwendener Compiler - shellesc=false,% use shell-escape - redirect=false,% write output into a file *.txt - tcbox=true,% use tcolorbox - grfOptions={},% Optionen der einzubindenden Grafik - lstOptions={},% Optionen für das Listing - textOptions={},% Options for text output + align=\centering,% Ausgabe zentrieren + aboveskip=\medskipamount,% space above everything + belowpreambleskip=2pt, %\smallskipamount,% space below preamble + belowbodyskip=2pt, %\smallskipamount,% space below body + belowskip=\medskipamount,% space below everything BGpreamble=black!12,% Backgroundcolor for preamble BGbody=black!8,% Backgroundcolor for body BOpreamble=black!12,% Bodercolor for preamble BObody=black!8,% Bodercolor for body - showoutput=true,% with false only code is shown - includegraphic=true,% Grafik einbinden oder User überlassen - inline=false,% Grafik nicht in derselben Zeile - runs=1,% Anzahl Compiler-Durchläufe - runsAfter=0, % Anzahl Durchläufe nach makeindex - runsequence={},% Im Moment nicht aktiv biber=false,% Biber laufen lassen? - xindex=false,% xindex laufen lassen? - xindexOptions={},% options for xindex + caption=,% keine Caption + cleanup={},% Hilfsdateien nicht löschen + code=false,% show Code + compiler=pdflatex,% zu verwendener Compiler + crop=false,% erzeugte PDF "croppen" + cropmargin=2,% 2pb margin + docType=latex,% LaTeX example Code + eps=false,% create an eps output? + ExampleDir=Examples,% Unterverzeichnis für Beispiele + ext=tex,% file extension + float=false,% nicht als Gleitumgebung + floatsetting=!htb,% placement force=false,% Compiler, auch wenn PDF existiert? frame=false,% keinen Rahmen um Abbildung framesep=\the\fboxsep,% - float=false,% nicht als Gleitumgebung - floatsetting=!htb,% placement - caption=,% keine Caption + grfOptions={},% Optionen der einzubindenden Grafik + includegraphic=true,% Grafik einbinden oder User überlassen + inline=false,% Grafik nicht in derselben Zeile label=,% kein Label - pages=1,% welche Seiten auszugeben sind - pagesep=1em,% horizontal sep between pages - docType=latex,% LaTeX example Code - cleanup={},% Hilfsdateien nicht löschen + lstOptions={},% Optionen für das Listing moveToExampleDir=false,% Verschieben nach ExamplesDir - ExampleDir=Examples,% Unterverzeichnis für Beispiele - align=\centering,% Ausgabe zentrieren mpwidth=0pt,% no minipage mpsep=1em,% sep between two minipages mpvalign=t,% if side by side output the vertical alignment - usefancyvrb=false,% use VerbatimInput instead of listings + outerFN=false,% use fullwidth in twocolumn mode (starred floats) + pages=1,% welche Seiten auszugeben sind + pagesep=1em,% horizontal sep between pages progpath={}, - cropmargin=2,% 2pb margin - eps=false,% create an eps output? - aboveskip=\medskipamount,% space above everything - belowpreambleskip=2pt, %\smallskipamount,% space below preamble - belowbodyskip=2pt, %\smallskipamount,% space below body - belowskip=\medskipamount,% space below everything + redirect=false,% write output into a file *.txt + runs=1,% Anzahl Compiler-Durchläufe + runsAfter=0, % Anzahl Durchläufe nach makeindex + runsequence={},% Im Moment nicht aktiv + shellesc=false,% use shell-escape + shiftFN=\z@,% raise printed filename + showFilename=false,% Filenamen im Rand angeben + showoutput=true,% with false only code is shown + tcbox=true,% use tcolorbox + textOptions={},% Options for text output + usefancyvrb=false,% use VerbatimInput instead of listings + verbose=false,% no extra output in the logfile + vshift=\z@,% raise object (pdf) with \raisebox{}{} + xindex=false,% xindex laufen lassen? + xindexOptions={},% options for xindex }% } \ResetKeys - \ifhv@extern@checkCode \ifluatex \hv@ex@typeout{Loading hvextern.lua}% @@ -464,8 +466,9 @@ \let\endfilecontents\endcomment \fi \filecontents[force,noheader]{\hvExternFilename\hv@extern@ext}% - } - {\endfilecontents + }% end \begin{externaldocument} env + {% start \end{externaldocument} env + \endfilecontents \ifhv@extern@shellescape\hv@ex@typeout{... done}\fi \global\stepcounter{hv@example@counter}% \endgroup @@ -489,7 +492,7 @@ \global\hv@extern@forcefalse \else \hv@ex@typeout{current file is newer: force run }% - \global\hv@extern@forcetrue + \hv@extern@forcetrue \fi \ifhv@extern@verbose\else\ShellEscape{\hv@rm \hvExternFilename\hv@extern@ext.diff}\fi \fi @@ -564,7 +567,7 @@ \ifhv@extern@eps \ShellEscape{pdftops -eps -f 1 -l 1 \hvExternFilename.pdf}% \fi - \else + \else % if force ... \hv@ex@typeout{force=false: NOT running \hvExternFilename\hv@extern@ext ...}% \fi% end force \hfuzz=\maxdimen @@ -713,6 +716,11 @@ \expandafter\run@hv@extern@cleanup\expandafter{\hv@extern@cleanup}% \fi% cleanup \vspace{\hv@extern@belowskip}% + \ifhv@extern@save@force@state + \global\hv@extern@forcetrue + \else + \global\hv@extern@forcefalse + \fi% restore value } \newcommand\runExtCmd[3][]{% #1:options; #2:comamnd; #3:filename @@ -894,6 +902,7 @@ \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternFilename.pdf}{}{% \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternFilename.png}{}{% \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternFilename.txt}{}{% + \gdef\hv@extern@save@force@state{} \global\hv@extern@forcetrue}}}% set force, if no pdf or png exists \begingroup \hv@ex@typeout{writing file \hvExternFilename\hv@extern@ext ...}% diff --git a/macros/latex/contrib/hvextern/script/hvextern-checkfile.lua b/macros/latex/contrib/hvextern/script/hvextern-checkfile.lua index ea163c6a72..ea163c6a72 100644..100755 --- a/macros/latex/contrib/hvextern/script/hvextern-checkfile.lua +++ b/macros/latex/contrib/hvextern/script/hvextern-checkfile.lua diff --git a/macros/latex/contrib/leftindex/README.md b/macros/latex/contrib/leftindex/README.md index 7832b57454..8e2ae62c88 100644 --- a/macros/latex/contrib/leftindex/README.md +++ b/macros/latex/contrib/leftindex/README.md @@ -7,10 +7,11 @@ providing much better spacing in general. ---------------------------------------------------------------- leftindex -- left indices with better spacing -Version: 0.1beta +Version: 0.2beta Maintained by Sebastian Ørsted E-mail: sorsted@gmail.com Released under the LaTeX Project Public License v1.3c or later + See http://www.latex-project.org/lppl.txt ---------------------------------------------------------------- diff --git a/macros/latex/contrib/leftindex/leftindex.pdf b/macros/latex/contrib/leftindex/leftindex.pdf Binary files differindex 01950aa9a3..abeefe6113 100644 --- a/macros/latex/contrib/leftindex/leftindex.pdf +++ b/macros/latex/contrib/leftindex/leftindex.pdf diff --git a/macros/latex/contrib/leftindex/leftindex.sty b/macros/latex/contrib/leftindex/leftindex.sty index fdd7a6a822..406c7a973e 100644 --- a/macros/latex/contrib/leftindex/leftindex.sty +++ b/macros/latex/contrib/leftindex/leftindex.sty @@ -1,9 +1,9 @@ \RequirePackage{xparse,mathtools} -\ProvidesExplPackage{leftindex}{2020/08/25}{0.1beta}{} +\ProvidesExplPackage{leftindex}{2024/01/31}{0.2beta}{} %---------------------------------------------------------------- % leftindex -- left indices with better spacing -% Version: 0.1beta +% Version: 0.2beta % Maintained by Sebastian Ørsted % E-mail: sorsted@gmail.com % Released under the LaTeX Project Public License v1.3c or later @@ -35,7 +35,7 @@ \manualleftindex { #2 } { #1 } { #3 } { #4 } } { - \manualleftindex { #5 } { #1 } { #3 } { #4 } + \manualleftindex { #1 } { #1 } { #3 } { #4 } } } { @@ -44,6 +44,27 @@ #5 } +\DeclareDocumentCommand\LeftIndex { o o E{^_}{{}{}} } +{ + % #1 = slanting phantom + % #2 = height phantom + % #3 = left superscript + % #4 = left subscript + \IfValueTF {#1} + { + \IfValueTF{#2} + { + \manualleftindex { #2 } { #1 } { #3 } { #4 } + } + { + \manualleftindex { #1 } { #1 } { #3 } { #4 } + } + } + { + \manualleftindex { } { } { #3 } { #4 } + } +} + \ExplSyntaxOn \cs_new_protected:Npn\leftindex_kern_horizontal:n#1 @@ -131,13 +152,13 @@ \box_wd:N \l__leftindex_subscript_temp_box } } + \mathop{} \leftindex_kern_horizontal:n { \dim_max:nn { \l__leftindex_width_of_superscript_dim } { \l__leftindex_width_of_subscript_dim } } - \mathop{} \mathopen{ \vphantom { #2 } } \tl_if_blank:nF { #4 } { diff --git a/macros/latex/contrib/leftindex/leftindex.tex b/macros/latex/contrib/leftindex/leftindex.tex index 45f21c4c20..dd7161dec8 100644 --- a/macros/latex/contrib/leftindex/leftindex.tex +++ b/macros/latex/contrib/leftindex/leftindex.tex @@ -5,7 +5,7 @@ \usepackage{babel} \usepackage{kpfonts,microtype} -\usepackage{leftindex,listings,showexpl,xspace} +\usepackage{leftindex,listings,showexpl} \usepackage[hidelinks]{hyperref} @@ -35,9 +35,9 @@ explpreset={numbers=none,}, } -\newcommand\pkgleftindex{\texttt{leftindex}\xspace} +\newcommand\pkgleftindex{\texttt{leftindex}} -\title{\pkgleftindex\ -- left indices with better spacing (v0.1$\beta$)} +\title{\pkgleftindex\ -- left indices with better spacing (v0.2$\beta$)} \date{\today} \author{Sebastian \O rsted (\href{mailto:sorsted@gmail.com}{sorsted@gmail.com})} @@ -51,8 +51,8 @@ \maketitle \noindent -The package \pkgleftindex provides commands for typesetting left indices. -Unlike any other similar package I know of, \pkgleftindex also indents the left superscript, providing much better spacing in general: +The package \pkgleftindex\ provides commands for typesetting left indices. +Unlike any other similar package I know of, \pkgleftindex\ also indents the left superscript, producing much better spacing in general: \[ \leftindex^a_b{f} \qquad\text{(compare to $\leftindex[]^a_b{f}$)} @@ -62,14 +62,14 @@ As \TeX\ provides no metrics for the indentation of left superscripts, the only way to accomplish this is to measure the negative indentation of the right subscript and then use that value. This works well for most symbols, with a few exceptions, which can be dealt with by supplying a few extra arguments. -The package is a generalization of egreg's excellent code on +The package is a generalization of egreg's excellent code found at \begin{center} \url{https://tex.stackexchange.com/questions/557655/low-level-command-for-controlling-left-superscript-spacing/} \end{center} \chapter*{The commands} -The fundamental, user-level command of~\pkgleftindex is called~\lstinline!\leftindex! and has +The main user-level command of~\pkgleftindex\ is called~\lstinline!\leftindex! and has the syntax \begin{lstlisting} \leftindex^{@<left superscript>@}_{@<left subscript>@}{@<symbol>@} @@ -87,7 +87,7 @@ $ \leftindex{A} $, f(x)\, dx \] \end{LTXexample} -For the indentaiton of the left superscript, the package always +For the indentaiton of the left superscript, the package by default uses the negative indentation of the right subscript. This yields good results most of the time, as seen above. However, there are cases where this goes wrong, the most notable example being the Greek letter~$ \Gamma $ in many fonts (not in Computer Modern, though). Less serious examples arise with letters like $P$ and $L$: @@ -115,27 +115,42 @@ $\leftindex[]^a_b {\Gamma}$, $\leftindex[I]^a_b {L}$, $\leftindex[I]^a_b {P}$ \end{LTXexample} -The <slanting phantom> will never be used for calculating the height of the indices. -For this, you can supply a <height phantom>: +By default, the <slanting phantom> is also used for calculating the height of the indices. +If this is not the behaviour you want, you can supply an additional <height phantom>: \begin{LTXexample} $\leftindex[][\Bigg|]^a_b{x}$ \end{LTXexample} I doubt anyone will ever really need this much in practice, but the option is provided for completeness. -I provide a more primitive, underlying command with four mandatory arguments: +Sometimes, having to include the symbol as a mandatory argument can be a burden. For these cases, I also provide the command~\lstinline!\LeftIndex! with the syntax: +\begin{lstlisting} +\LeftIndex[@<slanting phantom>@][@<height phantom>@] + ^{@<left superscript>@}_{@<left subscript>@} +\end{lstlisting} +Here, all arguments are optional. +With this, we can do stuff like: +\begin{LTXexample} +$\LeftIndex^a_b \Gamma $, +$\LeftIndex[]^a_b L $, +$\LeftIndex[I]^a_b$, +$\LeftIndex[I]^a_b$ +\end{LTXexample} + + +I also provide the more primitive, underlying command with four mandatory arguments: \begin{lstlisting} \manualleftindex{@<height phantom>@}{@<slanting phantom>@} {@<left superscript>@}{@<left subscript>@} \end{lstlisting} This one is mainly intended for use in commands and by other packages. Note that the arguments <height phantom> and <slanting phantom> have -switched places compared to the command~\lstinline!\leftindex!. +switched places compared to the commands \lstinline!\leftindex! and~\lstinline!\LeftIndex!. This is because <height phantom> is regarded as a ``more important'' argument than <slanting phantom> from an implementation point of view, but the user is probably less likely to change it. Therefore, -the user-level command~\lstinline!\leftindex! has <slanting phantom> +the user-level commands \lstinline!\leftindex! and~\lstinline!\LeftIndex! have <slanting phantom> before <height phantom>. -Note also that \lstinline!\manualleftindex! does not take a <symbol>; +Note also that \lstinline!\manualleftindex! (like \lstinline!\LeftIndex!) does not take a <symbol>; you will have to write this yourself afterwards: \begin{LTXexample} $\manualleftindex{P}{I}{a}{b}$ diff --git a/macros/latex/contrib/litetable/doc/favicon.png b/macros/latex/contrib/litetable/doc/favicon.png Binary files differnew file mode 100644 index 0000000000..4e105b2ce0 --- /dev/null +++ b/macros/latex/contrib/litetable/doc/favicon.png diff --git a/macros/latex/contrib/litetable/doc/litetable-demo.pdf b/macros/latex/contrib/litetable/doc/litetable-demo.pdf Binary files differindex f9ed4fafbb..3ee841c94d 100644 --- a/macros/latex/contrib/litetable/doc/litetable-demo.pdf +++ b/macros/latex/contrib/litetable/doc/litetable-demo.pdf diff --git a/macros/latex/contrib/litetable/doc/litetable-demo.tex b/macros/latex/contrib/litetable/doc/litetable-demo.tex index c40f8e3415..33d6f53b41 100644 --- a/macros/latex/contrib/litetable/doc/litetable-demo.tex +++ b/macros/latex/contrib/litetable/doc/litetable-demo.tex @@ -1,32 +1,68 @@ \documentclass[libertinus]{litetable} \begin{document} -\begin{tikzpicture}[scale=0.05] - \makeframe{Timetable -- Semester 5}% make title & background + +\timelist{ +8:05,8:55,10:00,10:50,11:40,13:30,14:20,15:15,16:05,18:30,19:20,20:10; +8:50,9:40,10:45,11:35,12:25,14:15,15:05,16:00,16:50,19:15,20:05,20:55} +\sticker{favicon} + +\begin{tikzpicture} + \makeframe{Axia\!\texttt{'}\!s Timetable -- Semester 5}% make title & background % Mon. - \course{H1}{1}{1}{2}{Badminton}{Badminton Court}{Yongsheng Yu}{Week 1 -- 18} - \course{H7}{1}{3}{5}{Lens Design Expt}{Building 6·South 402}{Hao Ying}{Week 5 -- 15} - % Tue. - \course{H9}{2}{3}{5}{Marx's Principles}{Building 6·320}{Yang Wang}{Week 1 -- 18} - \course{H8}{2}{6}{8}{Photoelectric Det}{Building 6·320}{Xuefeng Huang}{Week 1 -- 18} - % Wed. - \course{H7}{3}{3}{4}{Laster Tech}{Building 6·301}{Haidan Mao}{Week 1 -- 18} - \course{H9}{3}{6}{7}{Empt 3 | Situ 5}{Bldg 6·301 | Situ 6·208}{Mjh | Qxr}{Week 5 -- 14} - \course{H5}{3}{8}{9}{Computational Phys}{Building 6·215}{Wenjia Rao}{Week 1 -- 18} - \course{H1}{3}{10}{11}{Essay Writing}{Building 6·416}{Yueqin Shi}{Week 1 -- 18} - % Thu. - \course{H6}{4}{1}{2}{Sensing System}{Building 6·110}{Benxiao Cai}{Week 1 -- 18} - \course{H5}{4}{3}{5}{AQM}{Building 6·225}{Yuan Li \& Mengnan Chen}{Week 1 -- 18} - \course{H3}{4}{6}{8}{Modern Phys Expt 2}{Building 6·South}{Xiangxiang Chen}{Week 5 -- 16} - \course{H8}{4}{10}{12}{OE Info Expt 1}{Building 6·South 302}{Yu Zhou}{Week 5 -- 15} - % Fri. - \course{H7}{5}{1}{2}{Lens Design}{Building 6·422}{Hao Ying}{Week 1 -- 18} - \course{H5}{5}{3}{5}{Optoelectronics}{Building 6·202}{Ruixue Li \& Yuan Li}{Week 1 -- 18} - \course{H8}{5}{6}{7}{Innovative Practice 4}{Building 7·216B}{Qinglong Huang}{Week 5 -- 16} - \course{H5}{5}{8}{9}{Group Meeting}{Building 6·Middle}{Yuan Li}{Week 1 -- 18} - \more{\textbf{·School Starts}: 11/09/2023 \textbf{·Winter Vacation}: 26/01/2024 \textbf{·Hangzhou Asian Games}: 23/09/2023 -- 08/10/2023} + \course{H1}{1}{2}{Badminton}{Badminton Court}{Yongsheng Yu}{Week 1 -- 18} + \course{H7}{3}{5}{Lens Design Expt}{Building 6·South 402}{Hao Ying}{Week 5 -- 15} + \newday % Tue. + \course{H9}{3}{5}{Marx's Principles}{Building 6·320}{Yang Wang}{Week 1 -- 18} + \course{H8}{6}{8}{Photoelectric Det}{Building 6·320}{Xuefeng Huang}{Week 1 -- 18} + \newday % Wed. + \course{H7}{3}{4}{Laster Tech}{Building 6·301}{Haidan Mao}{Week 1 -- 18} + \course{H9}{6}{7}{Empt 3 | Situ 5}{Bldg 6·301 | Situ 6·208}{Mjh | Qxr}{Week 5 -- 14} + \course{H5}{8}{9}{Computational Phys}{Building 6·215}{Wenjia Rao}{Week 1 -- 18} + \course{H1}{10}{11}{Essay Writing}{Building 6·416}{Yueqin Shi}{Week 1 -- 18} + \newday % Thu. + \course{H6}{1}{2}{Sensing System}{Building 6·110}{Benxiao Cai}{Week 1 -- 18} + \course{H5}{3}{5}{AQM}{Building 6·225}{Yuan Li \& Mengnan Chen}{Week 1 -- 18} + \course{H3}{6}{8}{Modern Phys Expt 2}{Building 6·South}{Xiangxiang Chen}{Week 5 -- 16} + \course{H8}{10}{12}{OE Info Expt 1}{Building 6·South 302}{Yu Zhou}{Week 5 -- 15} + \newday % Fri. + \course{H7}{1}{2}{Lens Design}{Building 6·422}{Hao Ying}{Week 1 -- 18} + \course{H5}{3}{5}{Optoelectronics}{Building 6·202}{Ruixue Li \& Yuan Li}{Week 1 -- 18} + \course{H8}{6}{7}{Innovative Practice 4}{Building 7·216B}{Qinglong Huang}{Week 5 -- 16} + \course{H5}{8}{9}{Group Meeting}{Building 6·Middle}{Yuan Li}{Week 1 -- 18} + \more{·School Starts: 11 / 09 / 2023 ·Winter Vacation: 26 / 01 / 2024 ·Hangzhou Asian Games: 23 / 09 / 2023 -- 08 / 10 / 2023} \end{tikzpicture} -\begin{tikzpicture}[scale=0.05] - \makeframe{Timetable -- Semester 6}% make title & background + + + + + + + +\begin{tikzpicture} + \makeframe{Axia\!\texttt{'}\!s Timetable -- Semester 6} + + % Mon. + \course{H5}{7}{8}{Introduction to Cond.}{Building 6·225}{Mn Chen}{Week 1 -- 16} + + \newday % Tue. + \course{H1}{8}{9}{Group Theory}{Building 6·211}{Li Ge}{Week 1 -- 16} + \course{H5}{10}{11}{Mesoscopic Physics}{Building 6·211}{Yuan Li \& Mn Chen}{Week 1 -- 16} + + \newday % Wed. + \course{H6}{1}{2}{Engineering Drawing}{Building 7·3012}{Hc Wang}{Week 1 -- 16} + \course{H9}{8}{9}{Situation \& Policy 6}{Building 6·302}{Xr Qi}{Double Week 10 -- 16} + \course{H9}{10}{11}{Operational Simu.}{Building 4·411 -- 413}{Li Zhang}{Week 1 -- 8} + + \newday % Thu. + \course{H4}{1}{2}{Intercultural Comm.}{Building 3·422}{Cl Zuo}{Week 1 -- 16} + \course{H2}{3}{4}{Radio Direction}{Athletic Field}{Ys Yu}{Week 1 -- 16} + \course{H5}{6}{8}{Solid State Physics}{Building 6·408}{Kw Sun}{Week 1 -- 16} + + \newday % Fri. + \course{H8}{1}{2}{OE. Display}{Building 7·3012}{Wt Su}{Week 1 -- 16} + \course{H3}{6}{8}{Group Meeting}{Building 6·Middle}{Yuan Li}{Week 1 -- 16} + + \more{·School Start: 04 / 03 / 2024 ·Summer Vacation: 05 / 07 / 2024} \end{tikzpicture} \end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/litetable/doc/litetable-doc-cn.pdf b/macros/latex/contrib/litetable/doc/litetable-doc-cn.pdf Binary files differnew file mode 100644 index 0000000000..67810c50cd --- /dev/null +++ b/macros/latex/contrib/litetable/doc/litetable-doc-cn.pdf diff --git a/macros/latex/contrib/litetable/doc/litetable-doc-cn.tex b/macros/latex/contrib/litetable/doc/litetable-doc-cn.tex new file mode 100644 index 0000000000..498167f8c3 --- /dev/null +++ b/macros/latex/contrib/litetable/doc/litetable-doc-cn.tex @@ -0,0 +1,210 @@ +%% ****************************************************** +%% * This work may be distributed and/or modified under * +%% * the conditions of the LaTeX Project Public License * +%% * http://www.latex-project.org/lppl.txt * +%% * either version 1.3c of this license or any later * +%% * version. * +%% ****************************************************** +\PassOptionsToPackage{quiet}{xeCJK} +\PassOptionsToPackage{quiet}{fontspec} +\PassOptionsToPackage{no-math}{fontspec} +\documentclass[11pt]{article} +\usepackage{geometry} +\usepackage{indentfirst,setspace} +\usepackage[toc]{multitoc} +\setlength{\parindent}{2em} +\setstretch{1.25} +\usepackage{pdfpages} +\usepackage[level]{datetime} +\usepackage{unicode-math,xeCJK} +\usepackage{authblk} +\setmainfont{Libertinus Serif} +\setsansfont{Libertinus Sans} +\setCJKmainfont{SimSong}[BoldFont=Chiron Sung HK, ItalicFont=Kaiti SC] +\makeatletter +\usepackage{listings,dirtree} +\lstdefinestyle{TeX}{ + language = [LaTeX]TeX, + texcsstyle = *\color{H7}, + numbers = none, + basicstyle = {\small\color{H6}\tt}, + mathescape = false, + breaklines = true, + columns = fixed, + keywordstyle = \color{H3}, + commentstyle = \color{darkgray}, + tabsize = 2, + keywords = {mail,flyleaf,sticker,logo,notebook,chapter,newnote,newnotesss,newnotessss,emptynote,newhdunote, + makeframe,course,more} +} +\usepackage{hyperref,xcolor,verbatim} + +\definecolor{pkgcolor}{Hsb}{103,.8,.5} +\definecolor{moducolor}{Hsb}{290,.8,.5} +\definecolor{cmdcolor}{Hsb}{188,.8,.5} +\definecolor{filecolor}{Hsb}{207,.6,.7} +\definecolor{H1}{Hsb}{349,.8,.8}% æµ·æ£ ç´… (Hangzhou MTR L 1 ) +\definecolor{H2}{Hsb}{23, .8,.8}% 丹桂橙 (Hangzhou Metro 2 ) +\definecolor{H3}{Hsb}{48, .8,.8}% æŸ æª¬é»„ (Hangzhou Metro 3 ) +\definecolor{H4}{Hsb}{103,.8,.8}% 香樟绿 (Hangzhou Metro 4 ) +\definecolor{H5}{Hsb}{188,.8,.8}% é’è—色 (Hangzhou MTR L 5 ) +\definecolor{H6}{Hsb}{207,.8,.8}% æµ·æ´‹è“ (Hangzhou Metro 6 ) +\definecolor{H7}{Hsb}{290,.8,.8}% 浪漫紫 (Hangzhou Metro 7 ) +\hypersetup{colorlinks,urlcolor=H1,linkcolor=H2,filecolor=filecolor,pdfstartview=FitH,pdfview=FitH,pdfcreator=XeTeX output} + +\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.1em}} +\def\pkg#1{\texorpdfstring{\textcolor{pkgcolor}{\textsf{#1}}}{“#1â€}} +\def\mode#1{\texorpdfstring{\textcolor{moducolor}{\textsf{#1}}}{“#1â€}} +\def\cmd#1{\texorpdfstring{\textcolor{cmdcolor}{\textsf{#1}}}{“#1â€}} +\def\datechange#1#2{% + \noindent{\makebox[\textwidth][r]{\color{H7}\rule{1.15\textwidth}{.4pt}}} + \noindent\makebox[0pt][r]{\makebox[-3em][r]{\small\textbf{\textcolor{H7}{#1}}}\;\;}{\sffamily Update: \ignorespaces#2}} +\makeatother + +\title{The \pkg{LiteTable} Template} +\author[1]{Xia Mingyu, \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}} +\yyyymmdddate +\date{\today} +\affil[1]{\href{mailto:xiamyphys@gmail.com}{\texttt{xiamyphys@gmail.com}}} +\date{\today\quad Version 2.2a\thanks{% + \url{https://github.com/xiamyphys/litetable}}} +\begin{document} +\maketitle + +\vspace{-2em} +\begin{abstract} +\pkg{LiteTable} 模æ¿æ供了一个多彩的课程表设计，本文档为\pkg{LiteTable} 模æ¿çš„说明文档. + +\end{abstract} + +\tableofcontents\clearpage + +\section{Introduction} + +\subsection{本模æ¿çš„目的} +本模æ¿æ供了一个多彩的课程表设计. + +å¦‚æžœä½ åœ¨ä½¿ç”¨æœ¬æ¨¡æ¿æ—¶é‡åˆ°é—®é¢˜ï¼Œæˆ–è€…æœ‰æ›´å¥½çš„å»ºè®®ï¼Œæˆ–è€…ä½ æƒ³å‚与本模æ¿æˆ–本人其他模æ¿çš„å¼€å‘，欢迎通过邮件 \href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com} è”络我. + +åŒæ ·ï¼Œä½ 也å¯ä»¥åŠ 入我的\textsf\LaTeX{} 技術交æµç¾¤ \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group: 760570712} 与我交æµï¼Œæ¥èŽ·å–模æ¿çš„内测版本. + +\subsection{所需å®é›†} +本模æ¿åŸºäºŽ \pkg{standalone} 文档类开å‘. å…¶éœ€è¦ \pkg{tikz} å®é›†åŽ»ç»˜åˆ¶å›¾å½¢ï¼Œ\pkg{kvoptions} å’Œ \pkg{etoolbox} å®é›†ç”¨äºŽæ供全局选项，\pkg{expl3} å®åŸºç”¨äºŽæ”¯æŒæ•°ç»„，\pkg{ctex}å®é›†ç”¨äºŽæ”¯æŒä¸æ–‡è¯è¨€ï¼Œ\pkg{fontawesome5} å®é›†æä¾›ä¸€ç³»åˆ—ç²¾ç¾Žçš„å›¾æ ‡. + +我强烈建议您使用终端机去执行以下命令，以将所有å®é›†æ›´æ–°åˆ°æœ€æ–°ç‰ˆæœ¬ +\begin{verbatim} + tlmgr update --self + tlmgr update --all +\end{verbatim} + +如果您所在的地区å˜åœ¨ç½‘è·¯å°é”ï¼Œä½ å¯ä»¥é€‰æ‹©åˆé€‚çš„é•œåƒç½‘站或其他方法\footnote{请éµå¾ªå½“地的网路æ¡ä¾‹.}. 欲详细了解，请å‰å¾€ \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my TEX distribution?} + +\subsection{载入 \pkg{LiteTable} 和其模å¼} +将文件 \verb|litetable.cls| ä¿å˜è‡³ä½ çš„é¡¹ç›®æ ¹ç›®å½•ï¼Œç„¶åŽåˆ›ç«‹ä¸€ä¸ª \verb|.tex| 文件，åªéœ€åœ¨ç¬¬ä¸€è¡Œè¾“入命令 \verb|\documentclass{litetable}| å³å¯. + +本模æ¿æ供了三个模å¼ï¼š\mode{date}，\mode{style} å’Œ \mode{font}. åªéœ€å°†ä½ 想è¦ä½¿ç”¨çš„模å¼é€‰é¡¹åˆ†åˆ«æ·»åŠ åœ¨ä½ çš„ \verb|.tex| 文件ä¸å‘½ä»¤ \verb|\documentclass[options]{litetable}| 的方括å·ä¸å³å¯. + +\newpage +\section{\pkg{LiteTable} 的模å¼} +\begin{verbatim} + \documentclass[options]{litetable} +\end{verbatim} +\subsection{\mode{date} 模å¼} +æ¤æ¨¡å¼æœ‰ä¸¤ä¸ªé€‰é¡¹ï¼Œ\mode{en} å’Œ \mode{cn}，å¯åˆ†åˆ«ä½¿å·¥ä½œæ—¥ä»¥è‹±æ–‡æˆ–大陆简体显示，默认为英文. + +\subsection{\mode{style} 模å¼} +æ¤æ¨¡å¼æœ‰ä¸¤ä¸ªé€‰é¡¹ï¼Œ\mode{round} å’Œ \mode{sharp}，å¯åˆ†åˆ«ä½¿è¯¾ç¨‹å—圆角或直角显示，默认为直角. + +\subsection{\mode{font} 模å¼} +æ¤æ¨¡å¼æœ‰ä¸¤ä¸ªé€‰é¡¹ï¼Œ\mode{times} å’Œ \mode{libertinus}，å¯åˆ†åˆ«ä½¿å—体为 ``Times New Roman'' 或 ``Libertinus''，默认为 ``Times New Roman''.\footnote{在使用 ``Libertinus'' 选项å‰è¯·ç¡®ä¿ç”µè„‘ä¸å·²å®‰è£…该å—体.} + +\section{\pkg{LiteTable} 的命令} + +\subsection{\cmd{makeframe} 命令} +\begin{verbatim} + \makeframe{Timetable -- Semester 5} +\end{verbatim} + +æ¤å‘½ä»¤å¯å»ºç«‹ä¸€ä¸ªæ ‡é¢˜ä¸º ``Timetable -- Semester 5'' 的空白课程表. + +\subsection{The \cmd{timelist} command} +\begin{verbatim} + \timelist{ + 8:05,8:55,10:00,10:50,11:40,13:30,14:20,15:15,16:05,18:30,19:20,20:10; + 8:50,9:40,10:45,11:35,12:25,14:15,15:05,16:00,16:50,19:15,20:05,20:55 + } +\end{verbatim} + +æ¤å‘½ä»¤å¯å°†æ—¶é—´æ·»åŠ 至课程表的左侧，内容的第一行是æ¯èŠ‚课程开始时间，第二行是æ¯èŠ‚课程的结æŸæ—¶é—´ï¼Œæ—¶é—´ä¹‹é—´ç”¨é€—å·ï¼ˆ\verb|,|）分隔，第一行与第二行之间用分å·ï¼ˆ\verb|;|）分隔. + +本课程表目å‰åªæ”¯æŒæ¯å¤©12节课. 在åŽç»æ›´æ–°ä¸ï¼Œå°†æ”¯æŒè‡ªå®šä¹‰æ¯å¤©çš„è¯¾ç¨‹èŠ‚æ•°ï¼Œæ•¬è¯·æœŸå¾…ï¼ + +\subsection{\cmd{course} 命令} +\begin{verbatim} + \course{H5}{3}{5}{AQM}{Building 6·225}{Yuan Li \& Mengnan Chen}{Week 1 -- 18} +\end{verbatim} + +æ¤å‘½ä»¤å…±æœ‰7个å˜é‡. +\begin{itemize} + \item ç¬¬ä¸€ä¸ªä¸ºä½ æƒ³é€‰æ‹©çš„è¯¾ç¨‹å—颜色，从 ``H1'' 到 ``H9'' å¯é€‰. + \item 第二个和第三个为课程的起始节数和结æŸèŠ‚æ•°. + \item 第四个为课程的å称. + \item 第五个为课程的地å€. + \item 第å…个为教师的åå—. + \item 第七个为课程的起始周和结æŸå‘¨. +\end{itemize} + +\subsection{\cmd{newday} 命令} +æ¤å‘½ä»¤å¯åˆ‡æ¢å½“å‰æ—¥åˆ°ç¬¬äºŒå¤©ï¼Œæ¤æ—¶è¯¾ç¨‹å—会å³ç§»ä¸€æ ¼. + +\subsection{\cmd{more} 命令} +\begin{verbatim} + \more{·School Start: 04 / 03 / 2024 ·Summer Vacation: 05 / 07 / 2024} +\end{verbatim} +æ¤å‘½ä»¤å¯åœ¨è¯¾ç¨‹è¡¨æœ«å°¾æ·»åŠ 备注信æ¯. + +\subsection{\cmd{sticker} 命令} +\begin{verbatim} + \sticker{favicon} +\end{verbatim} +在使用æ¤å‘½ä»¤åŽé¡µé¢çš„å³ä¸‹æ–¹ä¼šæ·»åŠ ä¸€å¼ è´´çº¸. + +\newpage +\section{版本历å²} + +课程表的设计æºäºŽæ电助手（\href{https://www.hdu.edu.cn}{æ州电å科技大å¦}\footnote{https://en.wikipedia.org/wiki/Hangzhou\_Dianzi\_University}）å¦ç”Ÿè¯¾è¡¨é¡µé¢\footnote{ä»…æœ¬æ ¡å¸ˆç”Ÿå¯è®¿é—®.} 页é¢æŽ’版å分精美，于是本人使用\LaTeX{} å¤åˆ»å‡ºäº†è¯¾ç¨‹è¡¨æ ·å¼ï¼Œå¹¶åˆ¶ä½œæˆæ¨¡æ¿åˆ†äº«ç»™å¤§å®¶. + +\textsf{\bfseries Version 1.0} 于01/09/2023完æˆå¼€å‘，并å‘布在\href{https://www.latexstudio.net/index/details/index/mid/3625.html}{LaTeX 工作室} (æå·žè§å±±)å’Œ\href{http://xhslink.com/od7Ycw}{å°çº¢ä¹¦}上，赢得了许多人的喜爱. + +\textsf{\bfseries Version 2.0a}于01/11/2023完æˆå¼€å‘，并å‘布在\href{https://www.latexstudio.net/index/details/index/mid/3636.html}{LaTeX 工作室} (æå·žè§å±±)å’Œ\href{http://xhslink.com/od7Ycw}{å°çº¢ä¹¦}上. æ¤ç‰ˆæœ¬ä½¿ç”¨ \verb|.cls| 文件，使 \verb|main.tex| 文件更简æ´. åŒæ—¶ï¼Œæ¤ç‰ˆæœ¬æ·»åŠ 了全局选项，å¯è®¾ç½® ``课程å—" 显示为圆角或直角. æ¤ç‰ˆæœ¬ä¹Ÿæ”¯æŒä¸€ä¸ª \verb|.tex| 文件ä¸ç”Ÿæˆå¤šå¼ 课表. + +\textsf{\bfseries Version 2.1a} 于05/11/2023完æˆå¼€å‘. æ”¯æŒ libertinus å—体. + +\textsf{\bfseries Version 2.2a} 于31/01/2024完æˆå¼€å‘. æ¤ç‰ˆæœ¬ä¿®å¤äº†åˆ†è¾¨çŽ‡è¶…出的bugï¼Œæ›´æ”¹çº¸å¼ ç±»åž‹ä¸ºç¾Žå›½ä¿¡çº¸å¹¶æ”¯æŒè‡ªå®šä¹‰è¯¾ç¨‹èµ·å§‹å’Œç»“æŸæ—¶é—´. + +\datechange{01/09/2023}{Version 2.0a} +\begin{itemize} + \item 支æŒè¯¾ç¨‹å—显示为圆角或直角. + \item 支æŒä¸€ä¸ª \verb|.tex| 文件ä¸ç”Ÿæˆå¤šå¼ 课表. +\end{itemize} + +\datechange{05/11/2023}{Version 2.1a} +\begin{itemize} + \item æ”¯æŒ libertinus å—体. +\end{itemize} + +\datechange{31/01/2024}{Version 2.2a} +\begin{itemize} + \item ä¿®å¤äº†åˆ†è¾¨çŽ‡è¶…出的bug. + \item æ›´æ”¹çº¸å¼ ç±»åž‹ä¸ºç¾Žå›½ä¿¡çº¸. + \item 支æŒè‡ªå®šä¹‰è¯¾ç¨‹èµ·å§‹å’Œç»“æŸæ—¶é—´. + \item 支æŒåœ¨é¡µé¢å³ä¸‹è§’æ·»åŠ ä¸€ä¸ªä½ å–œæ¬¢çš„å°è´´çº¸. +\end{itemize} + +\newpage\setstretch{1} +\appendix +\section{代ç 示例} +\lstinputlisting[style=TeX]{litetable-demo.tex} + +\includepdf[pages=last-1,nup=1x2,angle=90]{litetable-demo.pdf} +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/litetable/doc/litetable-doc-en.pdf b/macros/latex/contrib/litetable/doc/litetable-doc-en.pdf Binary files differnew file mode 100644 index 0000000000..1a201097da --- /dev/null +++ b/macros/latex/contrib/litetable/doc/litetable-doc-en.pdf diff --git a/macros/latex/contrib/litetable/doc/litetable-doc.tex b/macros/latex/contrib/litetable/doc/litetable-doc-en.tex index ffe0a79b26..e799e32b6f 100644 --- a/macros/latex/contrib/litetable/doc/litetable-doc.tex +++ b/macros/latex/contrib/litetable/doc/litetable-doc-en.tex @@ -5,11 +5,14 @@ %% * either version 1.3c of this license or any later * %% * version. * %% ****************************************************** +\PassOptionsToPackage{quiet}{xeCJK} +\PassOptionsToPackage{quiet}{fontspec} +\PassOptionsToPackage{no-math}{fontspec} \documentclass[11pt]{article} \usepackage{geometry} \usepackage{pdfpages} \usepackage[level]{datetime} -\usepackage{unicode-math} +\usepackage{unicode-math,xeCJK} \usepackage{authblk} \setmainfont{Libertinus Serif} \setsansfont{Libertinus Sans} @@ -36,6 +39,7 @@ makeframe,course,more} } \usepackage{hyperref,xcolor,verbatim} + \definecolor{pkgcolor}{Hsb}{103,.8,.5} \definecolor{moducolor}{Hsb}{290,.8,.5} \definecolor{cmdcolor}{Hsb}{188,.8,.5} @@ -50,10 +54,7 @@ \hypersetup{colorlinks,urlcolor=H1,linkcolor=H2,filecolor=filecolor,pdfstartview=FitH,pdfview=FitH,pdfcreator=XeTeX output} \renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.1em}} -\def\@pkg#1{\texorpdfstring{\href{https://www.ctan.org/pkg/#1}% -{\textcolor{pkgcolor}{\textsf{#1}}}}{“#1â€}} -\def\s@pkg#1{\texorpdfstring{\textcolor{pkgcolor}{\textsf{#1}}}{“#1â€}} -\DeclareRobustCommand\pkg{\@ifstar\s@pkg\@pkg} +\def\pkg#1{\texorpdfstring{\textcolor{pkgcolor}{\textsf{#1}}}{“#1â€}} \def\mode#1{\texorpdfstring{\textcolor{moducolor}{\textsf{#1}}}{“#1â€}} \def\cmd#1{\texorpdfstring{\textcolor{cmdcolor}{\textsf{#1}}}{“#1â€}} \def\datechange#1#2{% @@ -63,10 +64,10 @@ \title{The \pkg{LiteTable} Template} \author[1]{Xia Mingyu, \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}} -\ddmmyyyydate +\yyyymmdddate \date{\today} \affil[1]{\href{mailto:xiamyphys@gmail.com}{\texttt{xiamyphys@gmail.com}}} -\date{\today\quad Version 2.0a\thanks{% +\date{\today\quad Version 2.2a\thanks{% \url{https://github.com/xiamyphys/litetable}}} \begin{document} \maketitle @@ -88,7 +89,7 @@ If you meet bugs when using this template, or you have better suggestions or ide Also, you can join my \textsf\LaTeX{} Template Discussion \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group: 760570712} to communicate with me and get the insider preview edition of the template. \subsection{Packages required} -This template is based on the template \pkg{standalone}. And it requires \pkg{tikz} package to plot some graphics, \pkg{kvoptions} and \pkg{etoolbox} packages to provide global opinions, \pkg{ctex} package to supports the \textbf{Chinese, Simplified} language and \pkg{fontawesome5} package to provides a set of beautiful icons. +This template is based on the template \pkg{standalone}. And it requires \pkg{tikz} package to plot some graphics, \pkg{kvoptions} and \pkg{etoolbox} packages to provide global options, \pkg{expl3} package to support \cmd{timelist} array, \pkg{ctex} package to supports the \textbf{Chinese, Simplified} language and \pkg{fontawesome5} package to provides a set of beautiful icons. I strongly suggest that you should use cmd to implement the commands to update all the packages to the latest version or switch to portable version instead. \begin{verbatim} @@ -101,18 +102,23 @@ If you are in some areas with awful Internet environment, you can choose proper \subsection{Loading \pkg{LiteTable} and its modes} Save the file \verb|litetable.cls| to your project's root directory, and then create a \verb|.tex| file, just input the command \verb|\documentclass{litetable}| on the first line. -The template provides two modes, \mode{style} and \mode{date}. Just add the options of the modes you want separately in the square bracket of the command \verb|\documentclass[options]{litetable}| in your \verb|.tex| file. +The template provides three modes, \mode{date}, \mode{style} and \mode{font}. Just add the options of the modes you want separately in the square bracket of the command \verb|\documentclass[options]{litetable}| in your \verb|.tex| file. +\newpage \section{Modes of \pkg{LiteTable}} \begin{verbatim} \documentclass[options]{litetable} \end{verbatim} -\subsection{The \mode{round} \& \mode{sharp} modes} -This mode can make the course block's corners be round or sharp, and the default opinion is sharp. -\subsection{The \mode{times} \& \mode{libertinus} mode} -This mode can make the font to be ``Times New Roman'' or ``Libertinus'', and the default opinion is ``Libertinus''.\footnote{Please ensure that your computer has been already installed the font ``Libertinus'' when using this opinion.} +\subsection{The \mode{date} mode} +This mode has two options, \mode{en} and \mode{cn}, which can make the weekdays display in English or 大陆简体, and the dafault option is English. + +\subsection{The \mode{style} mode} +This mode has two options, \mode{round} and \mode{sharp}, which can make the course block's corners be round or sharp, and the default option is sharp. -\section{Environment and commands of \pkg{LiteTable}} +\subsection{The \mode{font} mode} +This mode has two options, \mode{times} and \mode{libertinus}, which can make the font to be ``Times New Roman'' or ``Libertinus'', and the default option is ``Times New Roman''.\footnote{Please ensure that your computer has been already installed the font ``Libertinus'' when using this option.} + +\section{Commands of \pkg{LiteTable}} \subsection{The \cmd{makeframe} command} \begin{verbatim} @@ -120,28 +126,53 @@ This mode can make the font to be ``Times New Roman'' or ``Libertinus'', and the \end{verbatim} This command can create an empty class schedule with the title ``Timetable -- Semester 5''. -\subsection{The \cmd{course} command} +\subsection{The \cmd{timelist} command} +\begin{verbatim} + \timelist{ + 8:05,8:55,10:00,10:50,11:40,13:30,14:20,15:15,16:05,18:30,19:20,20:10; + 8:50,9:40,10:45,11:35,12:25,14:15,15:05,16:00,16:50,19:15,20:05,20:55 + } +\end{verbatim} + +This command can add time to the left side of the timetable, and the first line of the content is the start time of the class while the second line of the content is the end time of the class, each time separates with comma (\verb|,|), the first line and the second line separates with semicolon (\verb|;|). + +The timetable currently only supports 12 classes per day. In the future updates, customization of the number of courses per day will be supported. + +\subsection{The \cmd{course} command} \begin{verbatim} - \course{H5}{4}{3}{5}{AQM}{Building 6·225}{Yuan Li \& Mengnan Chen}{Week 1 -- 18} + \course{H5}{3}{5}{AQM}{Building 6·225}{Yuan Li \& Mengnan Chen}{Week 1 -- 18} \end{verbatim} -There are 8 variables in this command. +There are 7 variables in this command. \begin{itemize} \item The 1st one is the color of the class that you want, from ``H1'' to ``H5''. - \item The 2nd one is the workday of the class. - \item The 3rd and 4th ones is the starting number and ending number of the class. - \item The 5th one is the name of the class. - \item The 6th one is the address of the class. - \item The 7th one is the name of the teacher(s). + \item The 2nd and 3rd ones is the starting number and ending number of the class. + \item The 4th one is the name of the class. + \item The 5th one is the address of the class. + \item The 6th one is the name of the teacher(s). \item The last one is the start week and end week of the class. \end{itemize} + +\subsection{The \cmd{newday} command} +This command can switch the current weekday to the next day, then the course will move right one grid. + \subsection{The \cmd{more} command} +\begin{verbatim} + \more{·School Start: 04 / 03 / 2024 ·Summer Vacation: 05 / 07 / 2024} +\end{verbatim} This command can add remark at the end of the class schedule. + +\subsection{The \cmd{sticker} command} +\begin{verbatim} + \sticker{favicon} +\end{verbatim} +There will be a sticker on the southeast of the page after you add,otherwise it won't. + \newpage \section{Version History} -I am a college student studying at \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}\footnote{https://en.wikipedia.org/wiki/Hangzhou\_Dianzi\_University} in China. An official club named \href{https://www.hduhelp.cn/}{HDUHelp} in my school has created a web page \href{https://cinnamon.hduhelp.com/navigation/schedule}{schedule}\footnote{Only those studying at or graduated from Hangzhou Dianzi University can have the permission of access.}. Every students and teachers can view their own class schedule on it. The layout is very beautiful and then I used LaTeX to imitate that style and made a class schedule template to share with everyone. +The design of this course schedule originated from the student course schedule web page\footnote{Only those studying at or graduated from Hangzhou Dianzi University can have the permission of access.} of the \href{https://www.hduhelp.cn/}{HDUHelp} in \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}\footnote{https://en.wikipedia.org/wiki/Hangzhou\_Dianzi\_University}. The layout is very beautiful and then I used \LaTeX{} to imitate that style and made a class schedule template to share with everyone. \textsf{\bfseries Version 1.0} was finished on 1 September, 2023 and released on \href{https://www.latexstudio.net/index/details/index/mid/3625.html}{LaTeX Studio} (Xiaoshan, Hangzhou) and \href{http://xhslink.com/od7Ycw}{Xiaohongshu}, where won the favor of many people. @@ -149,6 +180,8 @@ I am a college student studying at \href{https://www.hdu.edu.cn}{Hangzhou Dianzi \textsf{\bfseries Version 2.1a} was finished developing on 5 November, 2023. Supports the libertinus font. +\textsf{\bfseries Version 2.2a} was finished developing on 31 January, 2024. This Version fixed the bug of resolution exceeded, changed paper type to US letter and support custom course start time and end time. + \datechange{01/09/2023}{Version 2.0a} \begin{itemize} \item Supports the course block's corners be round or sharp. @@ -160,6 +193,14 @@ I am a college student studying at \href{https://www.hdu.edu.cn}{Hangzhou Dianzi \item Supports the libertinus font. \end{itemize} +\datechange{31/01/2024}{Version 2.2a} +\begin{itemize} + \item Fixed the bug of resolution exceeded. + \item Changed paper type to US letter. + \item Support custom course start time and end time. + \item Support add sticker as you like at the southeast of the page. +\end{itemize} + \newpage \appendix \section{Document Example} diff --git a/macros/latex/contrib/litetable/doc/litetable-doc.pdf b/macros/latex/contrib/litetable/doc/litetable-doc.pdf Binary files differdeleted file mode 100644 index 92cfe2a9ca..0000000000 --- a/macros/latex/contrib/litetable/doc/litetable-doc.pdf +++ /dev/null diff --git a/macros/latex/contrib/litetable/tex/litetable.cls b/macros/latex/contrib/litetable/tex/litetable.cls index 50c979fdd0..647d078520 100644 --- a/macros/latex/contrib/litetable/tex/litetable.cls +++ b/macros/latex/contrib/litetable/tex/litetable.cls @@ -6,14 +6,17 @@ %% * either version 1.3c of this license or any later * * * ** * ***** * * %% * version. * * * ** * * * * * %% ****************************************************** ***** ** * * *** * * * -%% start of file `notebeamer.cls'. * +%% start of file `litetable.cls'. * %% Copyright 2023 LiteLaTeX (xiamyphys@gmail.com) * %% available at https://github.com/xiamyphys/LiteTable * %% !Mode:: "TeX:UTF-8" * %% ************************************************************************************************************ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{litetable}[2023/11/05 v2.1a LiteTable document class] -\LoadClass[tikz,margin=10pt]{standalone} +\PassOptionsToPackage{quiet}{xeCJK} +\PassOptionsToPackage{quiet}{fontspec} +\PassOptionsToPackage{no-math}{fontspec} +\ProvidesClass{litetable}[2024/01/31/ v2.2a LiteTable document class] + % ---------- 全局选项 ---------- % \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,28 +33,18 @@ \DeclareStringOption[times]{font} \DeclareVoidOption{times}{\ekv{date=times}} -\DeclareVoidOption{libertinus}{\ekv{date=libertinus}} +\DeclareVoidOption{libertinuTs}{\ekv{date=libertinus}} -\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{book}} +\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{standalone}} \ProcessKeyvalOptions*\relax - -% ---------- ä¸æ–‡å—体 ---------- % -\RequirePackage{ctex} +\LoadClass[tikz,margin=6pt]{standalone} % ---- 文本ä¸çš„æ•°å— & å—æ¯è®¾ç½® ---- % -\PassOptionsToPackage{no-math}{fontspec} -\PassOptionsToPackage{quiet}{fontspec} +\RequirePackage{ctex} \ifdefstring{\LITE@font}{libertinus}{ \setmainfont{Libertinus Serif} \setsansfont{Libertinus Sans} -\setmonofont{NotoSansMono}[ - Scale=MatchLowercase, - Extension=.ttf, - UprightFont=*-Light, - BoldFont=*-Medium -] }{\relax} -\RequirePackage{iftex} \ifdefstring{\LITE@font}{times}{ \ifXeTeX \RequirePackage[no-math]{fontspec} @@ -79,7 +72,7 @@ % ---------- è‰²å½©ç»„åˆ ---------- % \definecolor{darkgray}{HTML}{727477}% 时间颜色 \definecolor{darkergray}{HTML}{F1F3F5}% æ·±è‰²å— -\definecolor{lightergray}{HTML}{F8F9FA}% æµ…è‰²å— +\definecolor{lightergray}{HTML}{FCFDFE}% æµ…è‰²å— \definecolor{blackgray}{HTML}{1A1D21}% åºå·é¢œè‰² \definecolor{H1}{HTML}{74A7A2}% 深绿 \definecolor{H1*}{HTML}{E9EEED} @@ -109,107 +102,114 @@ \definecolor{H9*}{HTML}{F2E0D0} \definecolor{H9**}{HTML}{C96F1C} \pagecolor{lightergray} -\newcommand{\xscale}{2.2733} -\newcommand{\yscale}{0.4291} - -\usetikzlibrary{calc} -\ifdefstring{\LITE@style}{round}{ -\newcommand{\course}[8]{ - \fill [#1,rounded corners=5pt] ($({(-23+32*(#2))*\xscale},{-\yscale*(21+93*#3)-0.2})$) rectangle ($({(9+32*(#2))*\xscale},{-\yscale*(114+93*#4)+0.2})$); - \fill [#1*,rounded corners=5pt] ($({(-23+32*(#2))*\xscale+0.1},{-\yscale*(42+93*#3)})$) -- ($({(-23+32*(#2))*\xscale+0.1},{-\yscale*(114+93*#4)+0.3})$) -- ($({(9+32*(#2))*\xscale-0.1},{-\yscale*(114+93*#4)+0.3})$) -- ($({(9+32*(#2))*\xscale-0.1},{-\yscale*(42+93*#3)})$); - \node [#1**,anchor=south] at ($({((-23+32*(#2))*\xscale+(9+32*(#2))*\xscale)/2},{(-\yscale*(21+93*#3)-\yscale*(114+93*#4))/2})$) {\heiti\bfseries #5}; - \node [#1**,anchor=north] at ($({((-23+32*(#2))*\xscale+(9+32*(#2))*\xscale)/2},{(-\yscale*(21+93*#3)-\yscale*(114+93*#4))/2-21*\yscale})$) {\heiti\bfseries\footnotesize #6}; - \node [#1**,anchor=north] at ($({((-23+32*(#2))*\xscale+(9+32*(#2))*\xscale)/2},{(-\yscale*(21+93*#3)-\yscale*(114+93*#4))/2-42*\yscale})$) {\heiti\footnotesize #7}; - \node [#1**,anchor=south east] at ($({(9+32*(#2))*\xscale-0.1},{-\yscale*(114+93*#4)+0.3})$) {\heiti\footnotesize #8}; - } - }{\relax} -\ifdefstring{\LITE@style}{sharp}{ -\newcommand{\course}[8]{ - \fill [#1] ($({(-23+32*(#2))*\xscale},{-\yscale*(21+93*#3)-0.2})$) rectangle ($({(9+32*(#2))*\xscale},{-\yscale*(114+93*#4)+0.2})$); - \fill [#1*] ($({(-23+32*(#2))*\xscale+0.1},{-\yscale*(42+93*#3)})$) rectangle ($({(9+32*(#2))*\xscale-0.1},{-\yscale*(114+93*#4)+0.3})$); - \node [#1**,anchor=south] at ($({((-23+32*(#2))*\xscale+(9+32*(#2))*\xscale)/2},{(-\yscale*(21+93*#3)-\yscale*(114+93*#4))/2})$) {\heiti\bfseries #5}; - \node [#1**,anchor=north] at ($({((-23+32*(#2))*\xscale+(9+32*(#2))*\xscale)/2},{(-\yscale*(21+93*#3)-\yscale*(114+93*#4))/2-21*\yscale})$) {\heiti\bfseries\footnotesize #6}; - \node [#1**,anchor=north] at ($({((-23+32*(#2))*\xscale+(9+32*(#2))*\xscale)/2},{(-\yscale*(21+93*#3)-\yscale*(114+93*#4))/2-42*\yscale})$) {\heiti\footnotesize #7}; - \node [#1**,anchor=south east] at ($({(9+32*(#2))*\xscale-0.1},{-\yscale*(114+93*#4)+0.3})$) {\heiti\footnotesize #8}; - } - }{\relax} - -\newcounter{number} -\RequirePackage{fontawesome5} \definecolor{丹色}{HTML}{E45E32} \definecolor{ç´…ç·‹}{HTML}{E83929} \definecolor{紺碧}{HTML}{007BBB} \definecolor{é’碧}{HTML}{478384} \definecolor{金色}{HTML}{E6B422} + +\def\pagewidth{8.5 in} +\def\pageheight{-11 in} +\usetikzlibrary{calc} +\ifdefstring{\LITE@style}{round}{\def\corners{round corners=6pt}}{\relax} +\ifdefstring{\LITE@style}{sharp}{\def\corners{}}{\relax} + +\ExplSyntaxOn % 二维数组 +\seq_new:N \l_node_row_seq +\seq_new:N \l_node_tmp_seq +\cs_set:Npn \timelist #1 { + \gdef\@timelist{#1} % 用于判æ–\@timelist是å¦å˜åœ¨ + \seq_set_split:Nnn \l_node_row_seq {;} {#1} + \int_step_inline:nn{\seq_count:N \l_node_row_seq} + { + \seq_if_exist:cF {l_node_row_##1_seq} + { + \seq_new:c {l_node_row_##1_seq} + } + \exp_args:Ncx\seq_set_from_clist:Nn {l_node_row_##1_seq} {\seq_item:Nn \l_node_row_seq{##1}} + } +} + +\cs_set:Npn \PrintTime [#1][#2] { + \tl_if_empty:nTF { #1 } + { + \tl_if_empty:nTF { #2 } + { + \seq_use:Nn \l_node_row_seq {,} + } + { + \int_step_inline:nn{\seq_count:N \l_node_row_seq} + { + \seq_put_right:Nn \l_node_tmp_seq {\seq_item:cn {l_node_row_##1_seq}{#2}} + } + \seq_use:Nn \l_node_tmp_seq {,} + } + } + { + \tl_if_empty:nTF {#2} + { + \seq_use:cn {l_node_row_#1_seq}{,} + } + { + \seq_item:cn {l_node_row_#1_seq}{#2} + } + } +} +\ExplSyntaxOff +\RequirePackage{fontawesome5} +\newcounter{number} +\def\sticker{\gdef\@sticker} \newcommand{\makeframe}[1]{ - \ifdefstring{\LITE@style}{round}{ - \fill [fill=darkergray,rounded corners=8pt] (0,0) rectangle ($({169*\xscale},{-\yscale*72})$);% 顶部深ç°è‰²å— + \draw [gray!75] (0,0) rectangle (8.5 in,-11 in); + \fill [fill=darkergray,\corners] (0,0) rectangle (\pagewidth,1.5*\pageheight/27.5);% 顶部深ç°è‰²å— + \node at (.5*\pagewidth,.75*\pageheight/27.5) {\huge\bfseries\sffamily #1}; \foreach \a in {2,4,...,12} - \fill [fill=darkergray,yshift=\yscale*72 cm-\yscale*93*\a cm,rounded corners=8pt] (0,0) rectangle ($({169*\xscale},{-\yscale*93})$);% ä¸é—´æ·±ç°è‰²å—（循环） - \fill [fill=darkergray,yshift=-\yscale*114 cm-\yscale*93*12 cm,rounded corners=8pt] (0,0) rectangle ($({169*\xscale},{-\yscale*36})$);% 底部深ç°è‰²å— - }{\relax} - \ifdefstring{\LITE@style}{sharp}{ - \fill [fill=darkergray] (0,0) rectangle ($({169*\xscale},{-\yscale*72})$);% 顶部深ç°è‰²å— - \foreach \a in {2,4,...,12} - \fill [fill=darkergray,yshift=\yscale*72 cm-\yscale*93*\a cm] (0,0) rectangle ($({169*\xscale},{-\yscale*93})$);% ä¸é—´æ·±ç°è‰²å—（循环） - \fill [fill=darkergray,yshift=-\yscale*114 cm-\yscale*93*12 cm] (0,0) rectangle ($({169*\xscale},{-\yscale*36})$);% 底部深ç°è‰²å— - }{\relax} + \fill [fill=darkergray,yshift=2.5*\pageheight/27.5+2*(\a-2)*\pageheight/27.5,\corners] (0,0) rectangle (\pagewidth,2*\pageheight/27.5);% ä¸é—´æ·±ç°è‰²å—（循环） + \fill [fill=darkergray,yshift=2.5*\pageheight/27.5+2*12*\pageheight/27.5,\corners] (0,0) rectangle (\pagewidth,\pageheight/27.5);% 底部深ç°è‰²å— \foreach \a in {0,1,2,...,12} - \draw [densely dashed,gray!75,yshift=-\yscale*114 cm-\yscale*93*\a cm] ($({9*\xscale},0)$)--($({169*\xscale},0)$);% 分割虚线 - \node at ($({169*\xscale/2},{-\yscale*72/2})$) {\huge\bfseries\sffamily #1}; + \draw [densely dashed,gray!75,yshift=2.5*\pageheight/27.5+2*\a*\pageheight/27.5,] (0,0)--(\pagewidth,0);% 分割虚线 % æ—¶é—´æ ‡æ³¨ \setcounter{number}{0} \foreach \a in {1,2,...,12} - \node [yshift=-93*\yscale*(\a-1)*0.05 cm] at ($({9*\xscale/2},{-\yscale*135})$) {\bfseries\color{blackgray}\texttt{\textit{\refstepcounter{number}\thenumber}}}; - \node at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{8:05}}; - \node at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{8:50}}; - - \node [yshift=-93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{8:55}}; - \node [yshift=-93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{9:40}}; - - \node [yshift=-2*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{10:00}}; - \node [yshift=-2*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{10:45}}; - - \node [yshift=-3*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{10:50}}; - \node [yshift=-3*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{11:35}}; - - \node [yshift=-4*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{11:40}}; - \node [yshift=-4*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{12:25}}; - - \node [yshift=-5*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{13:30}}; - \node [yshift=-5*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{14:15}}; - - \node [yshift=-6*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{14:20}}; - \node [yshift=-6*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{15:05}}; - - \node [yshift=-7*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{15:15}}; - \node [yshift=-7*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{16:00}}; - - \node [yshift=-8*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{16:05}}; - \node [yshift=-8*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{16:50}}; - - \node [yshift=-9*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{18:30}}; - \node [yshift=-9*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{19:15}}; - - \node [yshift=-10*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{19:20}}; - \node [yshift=-10*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{20:05}}; - - \node [yshift=-11*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*171})$) {\footnotesize\color{darkgray}\texttt{20:10}}; - \node [yshift=-11*93*\yscale*0.05 cm] at ($({9*\xscale/2},{-\yscale*195})$) {\footnotesize\color{darkgray}\texttt{20:55}}; + \node [yshift=2.5*\pageheight/27.5+2*(\a-.8)*\pageheight/27.5] at (\pagewidth/32,0) {\bfseries\color{blackgray}\texttt{\refstepcounter{number}\thenumber}}; + \ifcsname @timelist\endcsname % è‹¥ `\@timelist == empty', 跳过该函数 + \foreach \x in {1,2,...,12} + { + \node[yshift=2.5*\pageheight/27.5+2*(\x-.475)*\pageheight/27.5] at (\pagewidth/32,0) {\color{darkgray}\texttt{\PrintTime[1][\x]}}; + \node[yshift=2.5*\pageheight/27.5+2*(\x-.2)*\pageheight/27.5] at (\pagewidth/32,0) {\color{darkgray}\texttt{\PrintTime[2][\x]}}; + }\fi % æ˜ŸæœŸæ ‡æ³¨ \ifdefstring{\LITE@date}{en}{ - \node [xshift=\xscale*25*0.05 cm] at ($(0,{-\yscale*93})$) {\color{丹色}\faIcon{moon}\;\bfseries\heiti{Monday}}; - \node [xshift=\xscale*57*0.05 cm] at ($(0,{-\yscale*93})$) {\color{ç´…ç·‹}\faIcon{fire}\;\bfseries\heiti{Tuesday}}; - \node [xshift=\xscale*89*0.05 cm] at ($(0,{-\yscale*93})$) {\color{紺碧}\faIcon{water}\;\bfseries\heiti{Wednesday}}; - \node [xshift=\xscale*121*0.05 cm] at ($(0,{-\yscale*93})$) {\color{é’碧}\faIcon{tree}\;\bfseries\heiti{Thursday}}; - \node [xshift=\xscale*153*0.05 cm] at ($(0,{-\yscale*93})$) {\color{金色}\faIcon{sun}\;\bfseries\heiti{Friday}}; + \node [xshift=2.5*\pagewidth/16] at (0,2*\pageheight/27.5) {\color{丹色}\faIcon{moon}\;\bfseries\heiti{Monday}}; + \node [xshift=5.5*\pagewidth/16] at (0,2*\pageheight/27.5) {\color{ç´…ç·‹}\faIcon{fire}\;\bfseries\heiti{Tuesday}}; + \node [xshift=8.5*\pagewidth/16] at (0,2*\pageheight/27.5) {\color{紺碧}\faIcon{water}\;\bfseries\heiti{Wednesday}}; + \node [xshift=11.5*\pagewidth/16] at (0,2*\pageheight/27.5) {\color{é’碧}\faIcon{tree}\;\bfseries\heiti{Thursday}}; + \node [xshift=14.5*\pagewidth/16] at (0,2*\pageheight/27.5) {\color{金色}\faIcon{sun}\;\bfseries\heiti{Friday}}; }{\relax} \ifdefstring{\LITE@date}{cn}{ - \node [xshift=\xscale*25*0.05 cm] at ($(0,{-\yscale*93})$) {\color{丹色}\faIcon{moon}\;\bfseries\heiti{星期一}}; - \node [xshift=\xscale*57*0.05 cm] at ($(0,{-\yscale*93})$) {\color{ç´…ç·‹}\faIcon{fire}\;\bfseries\heiti{星期二}}; - \node [xshift=\xscale*89*0.05 cm] at ($(0,{-\yscale*93})$) {\color{紺碧}\faIcon{water}\;\bfseries\heiti{星期三}}; - \node [xshift=\xscale*121*0.05 cm] at ($(0,{-\yscale*93})$) {\color{é’碧}\faIcon{tree}\;\bfseries\heiti{星期四}}; - \node [xshift=\xscale*153*0.05 cm] at ($(0,{-\yscale*93})$) {\color{金色}\faIcon{sun}\;\bfseries\heiti{星期五}}; + \node [xshift=2.5*\pagewidth/16] at (0,2*\pageheight/27.5) {\color{丹色}\faIcon{moon}\;\bfseries\heiti{星期一}}; + \node [xshift=5.5*\pagewidth/16] at (0,2*\pageheight/27.5) {\color{ç´…ç·‹}\faIcon{fire}\;\bfseries\heiti{星期二}}; + \node [xshift=8.5*\pagewidth/16] at (0,2*\pageheight/27.5) {\color{紺碧}\faIcon{water}\;\bfseries\heiti{星期三}}; + \node [xshift=11.5*\pagewidth/16] at (0,2*\pageheight/27.5) {\color{é’碧}\faIcon{tree}\;\bfseries\heiti{星期四}}; + \node [xshift=14.5*\pagewidth/16] at (0,2*\pageheight/27.5) {\color{金色}\faIcon{sun}\;\bfseries\heiti{星期五}}; }{\relax} + \ifcsname @sticker\endcsname + \node [opacity=.3,anchor=south east,yshift=1.5*\pageheight/27.5+2*12*\pageheight/27.5,inner sep=0pt,scale=3] at (\pagewidth,\pageheight/27.5) {\includegraphics[width=\dimeval{\pagewidth/16}]{\@sticker}};\fi } -\newcommand{\more}[1]{\node [yshift=-\yscale*0.05*114 cm-\yscale*0.05*93*12 cm,anchor=east] at ($({169*\xscale},{-\yscale*18})$) {\small\color{darkgray}#1};}
\ No newline at end of file + +\newcounter{weekday} +\def\newday{\addtocounter{weekday}{1}} +\AtEndEnvironment{tikzpicture}{\setcounter{weekday}{0}} +\newcommand{\course}[7] +{ + \fill [#1,\corners,yshift=2*(#2-1)*\pageheight/27.5,xshift=3*\theweekday*\pagewidth/16] (\pagewidth/16,2.5*\pageheight/27.5) rectangle ($({4*\pagewidth/16},{(4.5+2*(#3-#2))*\pageheight/27.5})$); % frame + \fill [#1*,\corners,yshift=(2*(#2-1)+.5)*\pageheight/27.5,xshift=3*\theweekday*\pagewidth/16] (\pagewidth/16,2.5*\pageheight/27.5) rectangle ($({4*\pagewidth/16},{(4+2*(#3-#2))*\pageheight/27.5})$); % content + \node [#1**,yshift=(#2+#3-1.25)*\pageheight/27.5,xshift=3*\theweekday*\pagewidth/16] at (2.5*\pagewidth/16,2.5*\pageheight/27.5) {\heiti\large\bfseries #4}; % course + \node [#1**,anchor=south,yshift=(#2+#3-.2)*\pageheight/27.5,xshift=3*\theweekday*\pagewidth/16] at (2.5*\pagewidth/16,2.5*\pageheight/27.5) {\heiti\bfseries\small #5}; % location + \node [#1**,anchor=north,yshift=(#2+#3-.2)*\pageheight/27.5,xshift=3*\theweekday*\pagewidth/16] at (2.5*\pagewidth/16,2.5*\pageheight/27.5) {\heiti\bfseries\small #6}; % teacher + \node [#1**,anchor=south east,yshift=2*#3*\pageheight/27.5,xshift=3*\theweekday*\pagewidth/16] at (4*\pagewidth/16,2.5*\pageheight/27.5) {\heiti\footnotesize #7}; % weeks +} + +\def\more#1{ + \node [xshift=-1em,yshift=2.5*\pageheight/27.5+2*12*\pageheight/27.5,anchor=east] at (\pagewidth,.5*\pageheight/27.5){\small\bfseries\color{darkgray}#1}; +}
\ No newline at end of file diff --git a/macros/latex/contrib/refstyle/README b/macros/latex/contrib/refstyle/README index e33a537d59..93d23dc15e 100644 --- a/macros/latex/contrib/refstyle/README +++ b/macros/latex/contrib/refstyle/README @@ -1,70 +1,70 @@ - The refstyle package
- For extended references
-
-File: README
-Author: Danie Els
-
-DESCRIPTION
-===========
-
-The package provides a user interface to define sets of reference
-and label commands for each referable object such as an equation or
-a table, etc.
-
-Copyright: 2002--2010 Danie Els
-Licence: LPPL
-
-FILES IN DISTRIBUTION
-=====================
-
- BASE DISTRIBUTION:
-
- README This file.
- refstyle.ins Package installation file.
- refstyle.dtx Package source file.
- refconfig.dtx Package configuration source file.
-
- refstyle.sty
- refstyle.cfg Package style and config files. Was produced by
- executing "latex refstyle.ins".
-
- DOCUMENTATION:
-
- refstyle.pdf User manual for refstyle package. It was
- produced by executing:
-
- latex refstyle.ins
-
- pdflatex refstyle.dtx
- pdflatex refstyle.dtx
- makeindex -s gglo.ist -o refstyle.gls refstyle.glo
- makeindex -s gind.ist -o refstyle.ind refstyle.idx
- pdflatex refstyle.dtx
- pdflatex refstyle.dtx
-
- refconfig.pdf Configuration manual for refstyle package. Produced
- form refconfig.dtx in the same manner as above.
-
-
-BASIC INSTALLATION
-====================
-
- The minimum requirement to use the package is the to have
- refstyle.sty and refstyle.cfg in a directory where TeX can find it.
-
- For a basic installation on a TDS compliant system, move the following
- files to the following directories:
-
- <texmf>/tex/latex/refstyle/
- refstyle.sty
- refstyle.cfg
-
- <texmf>/source/latex/refstyle/
- refstyle.ins
- refstyle.dtx
- refconfig.dtx
-
- <texmf>/doc/latex/refstyle/
- README
- refstyle.pdf
- refconfig.pdf
+ The refstyle package + For extended references + +File: README +Author: Danie Els + +DESCRIPTION +=========== + +The package provides a user interface to define sets of reference +and label commands for each referable object such as an equation or +a table, etc. + +Copyright: 2002--2024 Danie Els +Licence: LPPL + +FILES IN DISTRIBUTION +===================== + + BASE DISTRIBUTION: + + README This file. + refstyle.ins Package installation file. + refstyle.dtx Package source file. + refconfig.dtx Package configuration source file. + + refstyle.sty + refstyle.cfg Package style and config files. Was produced by + executing "latex refstyle.ins". + + DOCUMENTATION: + + refstyle.pdf User manual for refstyle package. It was + produced by executing: + + latex refstyle.ins + + pdflatex refstyle.dtx + pdflatex refstyle.dtx + makeindex -s gglo.ist -o refstyle.gls refstyle.glo + makeindex -s gind.ist -o refstyle.ind refstyle.idx + pdflatex refstyle.dtx + pdflatex refstyle.dtx + + refconfig.pdf Configuration manual for refstyle package. Produced + form refconfig.dtx in the same manner as above. + + +BASIC INSTALLATION +==================== + + The minimum requirement to use the package is the to have + refstyle.sty and refstyle.cfg in a directory where TeX can find it. + + For a basic installation on a TDS compliant system, move the following + files to the following directories: + + <texmf>/tex/latex/refstyle/ + refstyle.sty + refstyle.cfg + + <texmf>/source/latex/refstyle/ + refstyle.ins + refstyle.dtx + refconfig.dtx + + <texmf>/doc/latex/refstyle/ + README + refstyle.pdf + refconfig.pdf diff --git a/macros/latex/contrib/refstyle/refconfig.dtx b/macros/latex/contrib/refstyle/refconfig.dtx index a603d8e135..22a675b8ac 100644 --- a/macros/latex/contrib/refstyle/refconfig.dtx +++ b/macros/latex/contrib/refstyle/refconfig.dtx @@ -1,1212 +1,1209 @@ -% \iffalse
-%
-% refconfig.dtx
-% Copyright (C) 2002--2010 Danie Els
-%
-% -------------------------------------------------------------------
-% The refstyle package
-% for the formatting of references
-% -------------------------------------------------------------------
-% This work may be distributed and/or modified under the conditions
-% of the LaTeX Project Public License, either version 1.3c of this
-% license or (at your option) any later version. The latest version
-% of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work is "maintained" (as per LPPL maintenance status)
-% by Danie Els (dnjels@sun.ac.za).
-%
-% This package consists of the files: refstyle.dtx
-% refconfig.dtx
-% refstyle.ins
-% and the derived files: refstyle.sty
-% refstyle.cfg
-% -------------------------------------------------------------------
-%
-%
-%<*driver>
-\documentclass[a4paper]{ltxdoc}
- \EnableCrossrefs
- \CodelineIndex
- \RecordChanges
-\usepackage{color}
-\usepackage{framed}
- \setlength{\FrameSep}{1\fboxsep}
- \definecolor{shadecolor}{gray}{0.9}
- \newenvironment{RSframed}{\shaded}{\endshaded}
-\usepackage{xspace}
-\usepackage{varioref}
-\usepackage{refstyle}
-
-%-- macrocode env changes ------------------------------
-
-\setlength{\MacroIndent}{1.5em}
-
-%-- Indented environments ------------------------------
-
-\newlength{\tdima}
-\newsavebox{\tboxa}
-\newlength{\mytab}
-\setlength{\mytab}{2\parindent}
-
-\newenvironment{IndentPara}[1][1]
- {\list{}{\setlength{\leftmargin}{#1\mytab}%
- \setlength{\labelwidth}{0pt}%
- \setlength{\labelsep}{0pt}%
- \setlength{\itemindent}{\parindent}%
- \setlength{\listparindent}{\parindent}%
- }\item[]}%
- {\endlist}
-\newenvironment{Ipara}[1][\small]%
- {\begin{IndentPara}\noindent#1\ignorespaces}%
- {\end{IndentPara}}
-\newenvironment{Itabb}[1][\small]%
- {\begin{IndentPara}#1\ignorespaces\begin{tabbing}\ignorespaces}%
- {\end{tabbing}\end{IndentPara}}
-
-%-- Additional documenting commands --------------------
-
-\makeatletter
-\def\meta@font@select{\normalfont\slshape}
-\makeatother
-
-\newcommand*{\file}[1]{\texttt{#1}}
-\newcommand*{\pkg}[1]{\textsf{#1}}
-\newcommand*{\env}[1]{\texttt{#1}}
-\newcommand*{\opt}[1]{\texttt{\slshape#1}}
-\newcommand*{\RS}{\pkg{refstyle}\xspace}
-
-\newcommand*{\ArTab}{\>\quad$\rightarrow$\quad}
-
-%-------------------------------------------------------
-
-\setlength\hfuzz{15pt}
-\hbadness=7000
-\begin{document}
- \DocInput{refconfig.dtx}
-\end{document}
-
-%</driver>
-% \fi
-%
-% \CheckSum{1098}
-%
-% \CharacterTable
-% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-% Digits \0\1\2\3\4\5\6\7\8\9
-% Exclamation \! Double quote \" Hash (number) \#
-% Dollar \$ Percent \% Ampersand \&
-% Acute accent \' Left paren \( Right paren \)
-% Asterisk \* Plus \+ Comma \,
-% Minus \- Point \. Solidus \/
-% Colon \: Semicolon \; Less than \<
-% Equals \= Greater than \> Question mark \?
-% Commercial at \@ Left bracket \[ Backslash \\
-% Right bracket \] Circumflex \^ Underscore \_
-% Grave accent \` Left brace \{ Vertical bar \|
-% Right brace \} Tilde \~}
-%
-% \changes{v0.0}{2002/04/01}{Initial version}
-% \changes{v0.2}{2003/07/30}{Updated version}
-% \changes{v0.3}{2006/09/07}{Documentation update}
-% \changes{v0.4}{2010/10/21}{Add \cmd{\RSlsttwotxt} for lists}
-% \changes{v0.5}{2010/11/02}{Bug fixes}
-%
-% \DoNotIndex{
-% \",\@chapapp,\@ifpackageloaded,\AtBeginDocument,
-% \begingroup,\def,\edef,\else,\endgroup,
-% \fi,\ifx, \let, \newcommand,\newref,
-% \providecommand,\ProvidesFile,\ref,\relax,
-% \renewcommand,\RS@ifundefined,\RS@tmpa,\RS@tmpb,
-% \S,\space,\ss,\string,\textup,\unrestored@protected@xdef}
-%
-%^^A-- Titling --------------------------------------------
-% \GetFileInfo{refstyle.cfg}
-% \title{\vskip -2em
-% Configuration file for \RS\ package\thanks{
-% This file has version number
-% \fileversion, last revised
-% \filedate.}}
-% \author{Danie Els\\[1ex]
-% \small Department of Mechanical and Mechatroncs Engineering\\
-% \small University of Stellenbosch, South Africa.\\
-% \normalsize e-mail: \texttt{dnjels@sun.ac.za}}
-% \date{\filedate}
-% \maketitle
-%
-% \tableofcontents
-% \clearpage
-%
-%
-% \section{The \RS\ configuration file}
-%
-% \subsubsection*{Reference templates}
-% The default configuration file, \file{refstyle.cfg}, makes the
-% following reference declarations:
-% \begin{Ipara}
-% |\newref{part}{...}| \quad$\rightarrow$ Parts\\
-% |\newref{chap}{...}| \quad$\rightarrow$ Chapters and Appendices\\
-% |\newref{sec}{...} | \quad$\rightarrow$ Sections\\
-% |\newref{eq}{...} | \quad$\rightarrow$ Equations\\
-% |\newref{fig}{...} | \quad$\rightarrow$ Figures\\
-% |\newref{tab}{...} | \quad$\rightarrow$ Tables\\
-% |\newref{fn}{...} | \quad$\rightarrow$ Footnotes
-% \end{Ipara}
-% If there is a need for more reference types, this standard
-% list can be expanded.
-%
-% \subsubsection*{Language definitions}
-% The \RS\ package also provides the following language definitions
-% options for references, when loaded together with \pkg{babel}:
-% \begin{itemize}
-% \item afrikaans
-% \item danish
-% \item english, USenglish, american, canadian, UKenglish, british
-% \item french
-% \item german, ngerman, austrian, naustrian
-% \item italian
-% \item norwegian, nynorsk, norsk, bokmal\footnote{Norwegian Bokm{\aa}l
-% is not defined in \pkg{babel} yet.}
-% \item portuges, portuguese, brazilian, brazil
-% \item swedish
-% \end{itemize}
-%
-% \noindent See \secref[vref]{Thm} for an example of how to link your
-% own definitions to an exsiting language setup.
-% \StopEventually{\PrintChanges}
-% \clearpage
-% \section{Implementation}
-% \begin{macrocode}
-%<*cfg>
-% \end{macrocode}
-% \subsection{Identification}
-% \begin{RSframed}
-% \begin{macrocode}
-\ProvidesFile{refstyle.cfg}[2010/11/02\space
- 0.5\space
- Configuration file for refstyle (DNJ Els)]
-% \end{macrocode}
-% \end{RSframed}
-%
-% \subsection{Language Definitions for \RS\ Package}
-%
-% \subsubsection{English}
-%
-% \begin{macro}{\RSenglish,\RSukenglish}
-% Support provided by the author.
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- ENGLISH ------------------------------------
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSukenglish{%
- \def\RSrngtxt{\space to~}%........... Range: figures 5 to 6
- \def\RSlsttwotxt{\space and~}%....... List two: figures 5 and 6
- \def\RSlsttxt{, and~}%............... List more: figures 5, 6, and 7
- \def\RSparttxt{Part~}%............... Part lowercase singular
- \def\RSpartstxt{Parts~}%............. lowercase plural
- \def\RSParttxt{Part~}%............... uppercase singular (sentence start)
- \def\RSPartstxt{Parts~}%............. uppercase plural (sentence start)
- \def\RSappendixname{appendix~}%...... Appendix lowercase singular
- \def\RSappendicesname{appendices~}%.. lowercase plural
- \def\RSAppendixname{Appendix~}%...... uppercase singular (sentence start)
- \def\RSAppendicesname{Appendices~}%.. uppercase plural (sentence start)
- \def\RSchaptername{chapter~}%........ Chapter lowercase singular
- \def\RSchaptersname{chapters~}%...... lowercase plural
- \def\RSChaptername{Chapter~}%........ uppercase singular (sentence start)
- \def\RSChaptersname{Chapters~}%...... uppercase plural (sentence start)
- \def\RSsectxt{section~}%............. Section lowercase singular
- \def\RSsecstxt{sections~}%........... lowercase plural
- \def\RSSectxt{Section~}%............. uppercase singular (sentence start)
- \def\RSSecstxt{Sections~}%........... uppercase plural (sentence start)
- \def\RSeqtxt{equation~}%............. Equation lowercase singular
- \def\RSeqstxt{equations~}%........... lowercase plural
- \def\RSEqtxt{Equation~}%............. uppercase singular (sentence start)
- \def\RSEqstxt{Equations~}%........... uppercase plural (sentence start)
- \def\RSfigtxt{figure~}%.............. Figure lowercase singular
- \def\RSfigstxt{figures~}%............ lowercase plural
- \def\RSFigtxt{Figure~}%.............. uppercase singular (sentence start)
- \def\RSFigstxt{Figures~}%............ uppercase plural (sentence start)
- \def\RStabtxt{table~}%............... Table lowercase singular
- \def\RStabstxt{tables~}%............. lowercase plural
- \def\RSTabtxt{Table~}%............... uppercase singular (sentence start)
- \def\RSTabstxt{Tables~}%............. uppercase plural (sentence start)
- \def\RSfootntxt{footnote~}%.......... Footnote lowercase singular
- \def\RSfootnstxt{footnotes~}%........ lowercase plural
- \def\RSFootntxt{Footnote~}%.......... uppercase singular (sentence start)
- \def\RSFootnstxt{Footnotes~}%........ uppercase plural (sentence start)
-}
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSenglish{%
- \def\RSrngtxt{\space to~}%
- \def\RSlsttwotxt{\space and~}%
- \def\RSlsttxt{\space and~}%
- \def\RSparttxt{Part~}%
- \def\RSpartstxt{Parts~}%
- \def\RSParttxt{Part~}%
- \def\RSPartstxt{Parts~}%
- \def\RSappendixname{appendix~}%
- \def\RSappendicesname{appendices~}%
- \def\RSAppendixname{Appendix~}%
- \def\RSAppendicesname{Appendices~}%
- \def\RSchaptername{chapter~}%
- \def\RSchaptersname{chapters~}%
- \def\RSChaptername{Chapter~}%
- \def\RSChaptersname{Chapters~}%
- \def\RSsectxt{section~}%
- \def\RSsecstxt{sections~}%
- \def\RSSectxt{Section~}%
- \def\RSSecstxt{Sections~}%
- \def\RSeqtxt{equation~}%
- \def\RSeqstxt{equations~}%
- \def\RSEqtxt{Equation~}%
- \def\RSEqstxt{Equations~}%
- \def\RSfigtxt{figure~}%
- \def\RSfigstxt{figures~}%
- \def\RSFigtxt{Figure~}%
- \def\RSFigstxt{Figures~}%
- \def\RStabtxt{table~}%
- \def\RStabstxt{tables~}%
- \def\RSTabtxt{Table~}%
- \def\RSTabstxt{Tables~}%
- \def\RSfootntxt{footnote~}%
- \def\RSfootnstxt{footnotes~}%
- \def\RSFootntxt{Footnote~}%
- \def\RSFootnstxt{Footnotes~}%
-}
-% \end{macrocode}
-% \end{RSframed}
-% \end{macro}
-%
-% \noindent Make English the default.
-% \begin{RSframed}
-% \begin{macrocode}
-\RSenglish% Default
-% \end{macrocode}
-% \end{RSframed}
-%
-% \noindent Options
-% \begin{RSframed}
-% \begin{macrocode}
-\DeclareLangOpt{english}{\RSenglish}
-\DeclareLangOpt{USenglish}{\RSenglish}
-\DeclareLangOpt{american}{\RSenglish}
-\DeclareLangOpt{canadian}{\RSenglish}
-\DeclareLangOpt{UKenglish}{\RSukenglish}
-\DeclareLangOpt{british}{\RSukenglish}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-% \subsubsection{Afrikaans}
-%
-% \begin{macro}{\RSafrikaans}
-% Support provided by the author.
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- AFRIKAANS ----------------------------------
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSafrikaans{%
- \def\RSrngtxt{\space tot~}%
- \def\RSlsttwotxt{\space en~}%
- \def\RSlsttxt{\space en~}%
- \def\RSparttxt{Deel~}%
- \def\RSpartstxt{Dele~}%
- \def\RSParttxt{Deel~}%
- \def\RSPartstxt{Dele~}%
- \def\RSappendixname{bylae~}%
- \def\RSappendicesname{bylaes~}%
- \def\RSAppendixname{Bylae~}%
- \def\RSAppendicesname{Bylaes~}%
- \def\RSchaptername{hoofstuk~}%
- \def\RSchaptersname{hoofstukke~}%
- \def\RSChaptername{Hoofstuk~}%
- \def\RSChaptersname{Hoofstukke~}%
- \def\RSsectxt{afdeling~}%
- \def\RSsecstxt{afdelings~}%
- \def\RSSectxt{Afdeling~}%
- \def\RSSecstxt{Afdelings~}%
- \def\RSeqtxt{vergelyking~}%
- \def\RSeqstxt{vergelykings~}%
- \def\RSEqtxt{Vergelyking~}%
- \def\RSEqstxt{Vergelyking~}%
- \def\RSfigtxt{figuur~}%
- \def\RSfigstxt{figure~}%
- \def\RSFigtxt{Figuur~}%
- \def\RSFigstxt{Figure~}%
- \def\RStabtxt{tabel~}%
- \def\RStabstxt{tabelle~}%
- \def\RSTabtxt{Tabel~}%
- \def\RSTabstxt{Tabelle~}%
- \def\RSfootntxt{footnota~}%
- \def\RSfootnstxt{footnotas~}%
- \def\RSFootntxt{Footnota~}%
- \def\RSFootnstxt{Footnotas~}%
-}
-% \end{macrocode}
-% \end{RSframed}
-% \end{macro}
-%
-% \noindent Options
-% \begin{RSframed}
-% \begin{macrocode}
-\DeclareLangOpt{afrikaans}{\RSafrikaans}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-% \subsubsection{Danish}
-%
-% \begin{macro}{\RSdanish}
-% \changes{v0.2}{2003/07/30}{Add Danish language support}
-% Thomas Widmann: \texttt{<\,thomas.widmann AT harpercollins DOT co DOT uk>}
-% provided the definitions for Danish.
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- DANISH -------------------------------------
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSdanish{%
- \def\RSrngtxt{\space til~}%
- \def\RSlsttwotxt{\space og~}%
- \def\RSlsttxt{\space og~}%
- \def\RSparttxt{del~}%
- \def\RSpartstxt{del~}%
- \def\RSParttxt{Del~}%
- \def\RSPartstxt{Del~}%
- \def\RSappendixname{bilag~}% % 'appendiks' is also possible,
- \def\RSappendicesname{bilag~}% % but 'bilag' is used in Babel
- \def\RSAppendixname{Bilag~}%
- \def\RSAppendicesname{Bilag~}%
- \def\RSchaptername{kapitel~}%
- \def\RSchaptersname{kapitel~}%
- \def\RSChaptername{Kapitel~}%
- \def\RSChaptersname{Kapitel~}%
- \def\RSsectxt{afsnit~}%
- \def\RSsecstxt{afsnit~}%
- \def\RSSectxt{Afsnit~}%
- \def\RSSecstxt{Afsnit~}%
- \def\RSeqtxt{ligning~}%
- \def\RSeqstxt{ligning~}%
- \def\RSEqtxt{Ligning~}%
- \def\RSEqstxt{Ligning~}%
- \def\RSfigtxt{figur~}%
- \def\RSfigstxt{figur~}%
- \def\RSFigtxt{Figur~}%
- \def\RSFigstxt{Figur~}%
- \def\RStabtxt{tabel~}%
- \def\RStabstxt{tablel~}%
- \def\RSTabtxt{Tabel~}%
- \def\RSTabstxt{Tabel~}%
- \def\RSfootntxt{fodnote~}%
- \def\RSfootnstxt{fodnote~}%
- \def\RSFootntxt{Fodnote~}%
- \def\RSFootnstxt{Fodnote~}%
-}
-% \end{macrocode}
-% \end{RSframed}
-% \end{macro}
-%
-% \noindent Options
-% \begin{RSframed}
-% \begin{macrocode}
-\DeclareLangOpt{danish}{\RSdanish}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-% \subsubsection{French}
-%
-% \begin{macro}{\RSfrench}
-% \changes{v0.4}{2010/10/21}{Add French language support}
-% Jean-Pierre Chr\'etien \texttt{<\,jeanpierre.chretien AT free DOT fr>}
-% provided the definitions for French.
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- FRENCH -------------------------------------
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSfrench{%
- \def\RSrngtxt{\space \`{a}~}%
- \def\RSlsttwotxt{\space et~}%
- \def\RSlsttxt{\space et~}%
- \def\RSparttxt{partie~}%
- \def\RSpartstxt{parties~}%
- \def\RSParttxt{La partie~}%
- \def\RSPartstxt{Les parties~}%
- \def\RSappendixname{appendice~}%
- \def\RSappendicesname{appendices~}%
- \def\RSAppendixname{L'appendice~}%
- \def\RSAppendicesname{Les appendices~}%
- \def\RSchaptername{chapitre~}%
- \def\RSchaptersname{chapitres~}%
- \def\RSChaptername{Le chapitre~}%
- \def\RSChaptersname{Les chapitres~}%
- \def\RSsectxt{section~}%
- \def\RSsecstxt{sections~}%
- \def\RSSectxt{La section~}%
- \def\RSSecstxt{Les sections~}%
- \def\RSeqtxt{\'{e}quation~}%
- \def\RSeqstxt{\'{e}quations~}%
- \def\RSEqtxt{L'\'{e}quation~}%
- \def\RSEqstxt{Les \'{e}quations~}%
- \def\RSfigtxt{figure~}%
- \def\RSfigstxt{figures~}%
- \def\RSFigtxt{La figure~}%
- \def\RSFigstxt{Les figures~}%
- \def\RStabtxt{tableau~}%
- \def\RStabstxt{tableaux~}%
- \def\RSTabtxt{Le tableau~}%
- \def\RSTabstxt{Les tableaux~}%
- \def\RSfootntxt{note~}%
- \def\RSfootnstxt{notes~}%
- \def\RSFootntxt{La note~}%
- \def\RSFootnstxt{Les notes~}%
-}
-% \end{macrocode}
-% \end{RSframed}
-% \end{macro}
-%
-% \noindent Options
-% \begin{RSframed}
-% \begin{macrocode}
-\DeclareLangOpt{french}{\RSfrench}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-%
-% \subsubsection{German}
-%
-% \begin{macro}{\RSgerman}
-% \changes{v0.2}{2003/07/30}{Add German language support}
-% Harald Harders: \texttt{<\,h.harders AT tu-bs DOT de>}
-% provided the definitions for German.
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- GERMAN -------------------------------------
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSgerman{%
- \def\RSrngtxt{\space bis~}%
- \def\RSlsttwotxt{\space und~}%
- \def\RSlsttxt{\space und~}%
- \def\RSparttxt{Teil~}%
- \def\RSpartstxt{Teile~}%
- \def\RSParttxt{Teil~}%
- \def\RSPartstxt{Teile~}%
- \def\RSappendixname{Anhang~}%
- \def\RSappendicesname{Anh\"{a}nge~}%
- \def\RSAppendixname{Anhang~}%
- \def\RSAppendicesname{Anh\"{a}nge~}%
- \def\RSchaptername{Kapitel~}%
- \def\RSchaptersname{Kapitel~}%
- \def\RSChaptername{Kapitel~}%
- \def\RSChaptersname{Kapitel~}%
- \def\RSsectxt{Abschnitt~}%
- \def\RSsecstxt{Abschnitt~}%
- \def\RSSectxt{Abschnitt~}%
- \def\RSSecstxt{Abschnitt~}%
- \def\RSeqtxt{Gleichung~}%
- \def\RSeqstxt{Gleichungen~}%
- \def\RSEqtxt{Gleichung~}%
- \def\RSEqstxt{Gleichungen~}%
- \def\RSfigtxt{Abbildung~}%
- \def\RSfigstxt{Abbildung~}%
- \def\RSFigtxt{Abbildung~}%
- \def\RSFigstxt{Abbildung~}%
- \def\RStabtxt{Tabelle~}%
- \def\RStabstxt{Tabellen~}%
- \def\RSTabtxt{Tabelle~}%
- \def\RSTabstxt{Tabellen~}%
- \def\RSfootntxt{Fu\ss note~}%
- \def\RSfootnstxt{Fu\ss noten~}%
- \def\RSFootntxt{Fu\ss note~}%
- \def\RSFootnstxt{Fu\ss noten~}%
-}
-% \end{macrocode}
-% \end{RSframed}
-% \end{macro}
-%
-% \noindent Options
-% \begin{RSframed}
-% \begin{macrocode}
-\DeclareLangOpt{german}{\RSgerman}
-\DeclareLangOpt{ngerman}{\RSgerman}
-\DeclareLangOpt{austrian}{\RSgerman}
-\DeclareLangOpt{naustrian}{\RSgerman}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-% \subsubsection{Italian}
-%
-% \begin{macro}{\RSitalian}
-% \changes{v0.4}{2010/10/21}{Add Italian language support}
-% Nicola Lunghi: \texttt{<\,nick83ola AT gmail DOT com>}
-% provided the definitions for Italian.
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- ITALIAN ------------------------------------
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSitalian{%
- \def\RSrngtxt{--}%
- \def\RSlsttwotxt{\space e~}%
- \def\RSlsttxt{\space e~}%
- \def\RSparttxt{Parte~}%
- \def\RSpartstxt{Parti~}%
- \def\RSParttxt{Parte~}%
- \def\RSPartstxt{Parti~}%
- \def\RSappendixname{l'appendice~}%
- \def\RSappendicesname{le appendici~}%
- \def\RSAppendixname{l'Appendice~}%
- \def\RSAppendicesname{le Appendici~}%
- \def\RSchaptername{il capitolo~}%
- \def\RSchaptersname{i capitoli~}%
- \def\RSChaptername{il Capitolo~}%
- \def\RSChaptersname{i Capitoli~}%
- \def\RSsectxt{la sezione~}%
- \def\RSsecstxt{le sezioni~}%
- \def\RSSectxt{la Sezione~}%
- \def\RSSecstxt{la Sezioni~}%
- \def\RSeqtxt{l'equazione~}%
- \def\RSeqstxt{le equazioni~}%
- \def\RSEqtxt{l'Equazione~}%
- \def\RSEqstxt{le Equazioni~}%
- \def\RSfigtxt{la figura~}%
- \def\RSfigstxt{le figure~}%
- \def\RSFigtxt{la Figura~}%
- \def\RSFigstxt{le Figure~}%
- \def\RStabtxt{la tabella~}%
- \def\RStabstxt{le tabelle~}%
- \def\RSTabtxt{la Tabella~}%
- \def\RSTabstxt{le Tabelle~}%
- \def\RSfootntxt{la nota~}%
- \def\RSfootnstxt{le note~}%
- \def\RSFootntxt{la Nota~}%
- \def\RSFootnstxt{le Note~}%
-}
-% \end{macrocode}
-% \end{RSframed}
-% \end{macro}
-%
-% \noindent Options
-% \begin{RSframed}
-% \begin{macrocode}
-\DeclareLangOpt{italian}{\RSitalian}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-%
-% \subsubsection{Norwegian}
-%
-% \begin{macro}{\RSnorwegian}
-% \changes{v0.3}{2006/09/07}{Add Norwegian language support}
-% Karl Ove Hufthammer: \texttt{<\,karloh AT mi DOT uib DOT no>}
-% provided the definitions for Norwegian.
-%
-% Norway has two official languages Norwegian Nynorsk and
-% Norwegian Bokm{\aa}l (commonly 'nynorsk' and 'norsk' in LaTeX),
-% but the \pkg{refstyle} definitions are identically in both variants.
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- NORWEGIAN -------------------------------------
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSnorwegian{%
- \def\RSrngtxt{\space til~}%
- \def\RSlsttwotxt{\space og~}%
- \def\RSlsttxt{\space og~}%
- \def\RSparttxt{del~}%
- \def\RSpartstxt{del~}%
- \def\RSParttxt{Del~}%
- \def\RSPartstxt{Del~}%
- \def\RSappendixname{tillegg~}%
- \def\RSappendicesname{tillegg~}%
- \def\RSAppendixname{Tillegg~}%
- \def\RSAppendicesname{Tillegg~}%
- \def\RSchaptername{kapittel~}%
- \def\RSchaptersname{kapittel~}%
- \def\RSChaptername{Kapittel~}%
- \def\RSChaptersname{Kapittel~}%
- \def\RSsectxt{avsnitt~}%
- \def\RSsecstxt{avsnitt~}%
- \def\RSSectxt{Avsnitt~}%
- \def\RSSecstxt{Avsnitt~}%
- \def\RSeqtxt{formel~}%
- \def\RSeqstxt{formel~}%
- \def\RSEqtxt{Formel~}%
- \def\RSEqstxt{Formel~}%
- \def\RSfigtxt{figur~}%
- \def\RSfigstxt{figur~}%
- \def\RSFigtxt{Figur~}%
- \def\RSFigstxt{Figur~}%
- \def\RStabtxt{tabell~}%
- \def\RStabstxt{tabell~}%
- \def\RSTabtxt{Tabell~}%
- \def\RSTabstxt{Tabell~}%
- \def\RSfootntxt{fotnote~}%
- \def\RSfootnstxt{fotnote~}%
- \def\RSFootntxt{Fotnote~}%
- \def\RSFootnstxt{Fotnote~}%
-}
-% \end{macrocode}
-% \end{RSframed}
-% \end{macro}
-%
-% \noindent Options
-% \begin{RSframed}
-% \begin{macrocode}
-\DeclareLangOpt{norwegian}{\RSnorwegian}
-\DeclareLangOpt{nynorsk}{\RSnorwegian}
-\DeclareLangOpt{bokmal}{\RSnorwegian}% Not in babel yet
-\DeclareLangOpt{norsk}{\RSnorwegian}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-% \subsubsection{Portuguese/Brazilian}
-%
-% \begin{macro}{\RSportuguese,\RSbrazilian}
-% \changes{v0.4}{2010/10/21}{Add Portuguese language support}
-% Bernhard Enders and Flavio Costa \texttt{<\,flaviocosta AT yahoo DOT com DOT br>}
-% provided the definitions for Portuguese.
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- PORTUGUESE -----------------------------------
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSportuguese{%
- \def\RSrngtxt{\space a~}%
- \def\RSlsttwotxt{\space e~}%
- \def\RSlsttxt{\space e~}%
- \def\RSparttxt{Parte~}%
- \def\RSpartstxt{Partes~}%
- \def\RSParttxt{Parte~}%
- \def\RSPartstxt{Partes~}%
- \def\RSappendixname{ap\^{e}ndice~}%
- \def\RSappendicesname{ap\^{e}ndices~}%
- \def\RSAppendixname{Ap\^{e}ndice~}%
- \def\RSAppendicesname{Ap\^{e}ndices~}%
- \def\RSchaptername{cap\'{i}tulo~}%
- \def\RSchaptersname{cap\'{i}tulos~}%
- \def\RSChaptername{Cap\'{i}tulo~}%
- \def\RSChaptersname{Cap\'{i}tulos~}%
- \def\RSsectxt{se\c{c}\~{a}o~}%
- \def\RSsecstxt{se\c{c}\~{o}es~}%
- \def\RSSectxt{Se\c{c}\~{a}o~}%
- \def\RSSecstxt{Se\c{c}\~{o}es~}%
- \def\RSeqtxt{equa\c{c}\~{a}o~}%
- \def\RSeqstxt{equa\c{c}\~{o}es~}%
- \def\RSEqtxt{Equa\c{c}\~{a}o~}%
- \def\RSEqstxt{Equa\c{c}\~{o}es~}%
- \def\RSfigtxt{figura~}%
- \def\RSfigstxt{figuras~}%
- \def\RSFigtxt{Figura~}%
- \def\RSFigstxt{Figuras~}%
- \def\RStabtxt{tabela~}%
- \def\RStabstxt{tabelas~}%
- \def\RSTabtxt{Tabela~}%
- \def\RSTabstxt{Tabelas~}%
- \def\RSfootntxt{nota de rodap\'{e}~}%
- \def\RSfootnstxt{notas de rodap\'{e}~}%
- \def\RSFootntxt{Nota de rodap\'{e}~}%
- \def\RSFootnstxt{Notas de rodap\'{e}~}%
-}
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSbrazilian{%
- \def\RSrngtxt{\space a~}%
- \def\RSlsttwotxt{\space e~}%
- \def\RSlsttxt{\space e~}%
- \def\RSparttxt{Parte~}%
- \def\RSpartstxt{Partes~}%
- \def\RSParttxt{Parte~}%
- \def\RSPartstxt{Partes~}%
- \def\RSappendixname{ap\^{e}ndice~}%
- \def\RSappendicesname{ap\^{e}ndices~}%
- \def\RSAppendixname{Ap\^{e}ndice~}%
- \def\RSAppendicesname{Ap\^{e}ndices~}%
- \def\RSchaptername{cap\'{i}tulo~}%
- \def\RSchaptersname{cap\'{i}tulos~}%
- \def\RSChaptername{Cap\'{i}tulo~}%
- \def\RSChaptersname{Cap\'{i}tulos~}%
- \def\RSsectxt{sec\c{c}\~{a}o~}%<---------------
- \def\RSsecstxt{sec\c{c}\~{o}es~}%<-------------
- \def\RSSectxt{Sec\c{c}\~{a}o~}%<---------------
- \def\RSSecstxt{Sec\c{c}\~{o}es~}%<-------------
- \def\RSeqtxt{equa\c{c}\~{a}o~}%
- \def\RSeqstxt{equa\c{c}\~{o}es~}%
- \def\RSEqtxt{Equa\c{c}\~{a}o~}%
- \def\RSEqstxt{Equa\c{c}\~{o}es~}%
- \def\RSfigtxt{figura~}%
- \def\RSfigstxt{figuras~}%
- \def\RSFigtxt{Figura~}%
- \def\RSFigstxt{Figuras~}%
- \def\RStabtxt{tabela~}%
- \def\RStabstxt{tabelas~}%
- \def\RSTabtxt{Tabela~}%
- \def\RSTabstxt{Tabelas~}%
- \def\RSfootntxt{nota de rodap\'{e}~}%
- \def\RSfootnstxt{notas de rodap\'{e}~}%
- \def\RSFootntxt{Nota de rodap\'{e}~}%
- \def\RSFootnstxt{Notas de rodap\'{e}~}%
-}
-% \end{macrocode}
-% \end{RSframed}
-% \end{macro}
-%
-% \noindent Options
-% \begin{RSframed}
-% \begin{macrocode}
-\DeclareLangOpt{portuges}{\RSportuguese}
-\DeclareLangOpt{portuguese}{\RSportuguese}
-\DeclareLangOpt{brazilian}{\RSbrazilian}
-\DeclareLangOpt{brazil}{\RSbrazilian}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-%
-% \subsubsection{Swedish}
-%
-% \begin{macro}{\RSswedish}
-% \changes{v0.2}{2003/07/30}{Add Swedish language support}
-% Bj\"{o}rn Thors \texttt{<\,bjorn.thors AT alfvenlab DOT kth DOT se>}
-% provided the definitions for Swedish.
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- SWEDISH ------------------------------------
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand\RSswedish{%
- \def\RSrngtxt{\space till~}%
- \def\RSlsttwotxt{\space och~}%
- \def\RSlsttxt{\space och~}%
- \def\RSparttxt{del~}%
- \def\RSpartstxt{del~}%
- \def\RSParttxt{Del~}%
- \def\RSPartstxt{Del~}%
- \def\RSappendixname{appendix~}%
- \def\RSappendicesname{appendix~}%
- \def\RSAppendixname{Appendix~}%
- \def\RSAppendicesname{Appendix~}%
- \def\RSchaptername{kapitel~}%
- \def\RSchaptersname{kapitel~}%
- \def\RSChaptername{Kapitel~}%
- \def\RSChaptersname{Kapitel~}%
- \def\RSsectxt{sektion~}%
- \def\RSsecstxt{sektion~}%
- \def\RSSectxt{Sektion~}%
- \def\RSSecstxt{Sektion~}%
- \def\RSeqtxt{ekvation~}%
- \def\RSeqstxt{ekvation~}%
- \def\RSEqtxt{Ekvation~}%
- \def\RSEqstxt{Ekvation~}%
- \def\RSfigtxt{figur~}%
- \def\RSfigstxt{figur~}%
- \def\RSFigtxt{Figur~}%
- \def\RSFigstxt{Figur~}%
- \def\RStabtxt{tabell~}%
- \def\RStabstxt{tabell~}%
- \def\RSTabtxt{Tabell~}%
- \def\RSTabstxt{Tabell~}%
- \def\RSfootntxt{fotnot~}%
- \def\RSfootnstxt{fotnot~}%
- \def\RSFootntxt{Fotnot~}%
- \def\RSFootnstxt{Fotnot~}%
-}
-% \end{macrocode}
-% \end{RSframed}
-% \end{macro}
-% \noindent Options
-% \begin{RSframed}
-% \begin{macrocode}
-\DeclareLangOpt{swedish}{\RSswedish}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-%
-%
-% \subsection{Templates for the \RS Package}
-%
-% The user can also define his or her own templates and put it
-% in a separate configuration file to ensure uniformity
-% of reference formats in your documents.
-%
-% \subsubsection{Parts}
-%
-% References to parts are usually straight forward, except that the
-% document division ``Part'' must be distinguished from the normal
-% usage of the word ``part'' in a sentence. A personal preference
-% is to use small caps.
-%
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- TEMPLATE FOR PARTS -------------------------
-% \end{macrocode}
-% \begin{macrocode}
- \newref{part}{%
- name = \RSparttxt,
- names = \RSpartstxt,
- Name = \RSPparttxt,
- Names = \RSPartstxt,
- rngtxt = \RSrngtxt,
- lsttxt = \RSlsttxt}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-%
-% \subsubsection{Chapters and Appendices}
-%
-% A major problem with a reference to a chapter is that at the time
-% when the reference label, |\label|\marg{chap-label}, is created,
-% it is unknown whether it would eventually ends up in the main
-% matter or the appendix part of a book or report.
-%
-% A simple solution is to use the prefix to the \meta{chapter}
-% counter, |\p@chapter|, to write the definition of |\@chapapp| to
-% the auxiliary file (|.aux|) together with information of the
-% label. The command |\@chapapp| expands to either |\chaptername| or
-% |\appendixname| depending on whether the reference label is
-% defined in the main matter or after the |\appendix| was called.
-% (Note that |\@chapapp| is not defined in the AMS book class.)
-%
-% \begin{Ipara}
-% |\renewcommand*{\p@chapter}{\string\chname{\@chapapp}}|\\
-% |\newcommand*{\chname}[1]{}%<-make it harmless |\\
-% |\newcommand*{\chapref}[1]{{\renewcommand*{\chname}[1]{##1~}\ref{#1}}}|
-% \end{Ipara}
-%
-% \noindent The reference to a chapter, |\chapref|\marg{chap-label},
-% will then be prefixed with |\chaptername| or |\appendixname| and
-% it does not matter where it was defined or where it was called.
-%
-% To utilize the full functionality of the \RS package for
-% references to chapters and appendices, a complex form of
-% \cmd{\newref} needs to be implemented.
-% The following is a template for a book or report classes.
-%
-%
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- TEMPLATE FOR CHAPTERS & APPENDIXES ---------
-% \end{macrocode}
-% Prevent crashes for non-book type classes.
-% \begin{macrocode}
-\providecommand*{\p@chapter}{}
-% \end{macrocode}
-% Add \cmd{\@chapapp} to \cmd{\p@chapter} for writeout to auxiliary file.
-% If an AMS book class is loaded, then \cmd{\chaptername} must
-% be used.
-% \begin{macrocode}
-\AtBeginDocument{%
- \RS@ifundefined{chapter}{}{%
- \RS@ifundefined{@chapapp}%
- {\renewcommand*{\p@chapter}{\string\chpname{\chaptername}}}%AMS
- {\renewcommand*{\p@chapter}{\string\chpname{\@chapapp}}}% Normal
- }%
- }
-% \end{macrocode}
-% Define \cmd{\chpname} to gobble its contents outside the
-% reference commands.
-% \begin{macrocode}
-\newcommand*{\chpname}[1]{}
-% \end{macrocode}
-% Define the \cmd{\RSchpname} to typeset all the different
-% perturbations of chapter and appendix names.
-% Use the conditionals to switch between the
-% different options.
-%
-% \begin{macrocode}
-\newcommand*{\RS@chpname}[1]{%
- \ifRSnameon
- \edef\RS@tmpa{#1}%
- \edef\RS@tmpb{\appendixname}%
- \ifx\RS@tmpa\RS@tmpb\relax%
- \ifRSplural
- \ifRScapname \RSAppendicesname \else \RSappendicesname \fi
- \else
- \ifRScapname \RSAppendixname \else \RSappendixname \fi
- \fi
- \else
- \ifRSplural
- \ifRScapname \RSChaptersname \else \RSchaptersname \fi
- \else
- \ifRScapname \RSChaptername \else \RSchaptername \fi
- \fi
- \fi
- \fi}
-% \end{macrocode}
-% Define the \cmd{\newref} for chapters.
-% \begin{macrocode}
- \newref{chap}{%
- refcmd = {{\let\chpname=\RS@chpname\ref{#1}}},
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-% \subsubsection{Sections and paragraphs}\seclabel{secTempl}
-%
-% A template for references to sections is given below. References
-% to paragraphs are similar and is left as an exercise to the users.
-%
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- TEMPLATE FOR SECTIONS ----------------------
-% \end{macrocode}
-% \begin{macrocode}
- \newref{sec}{%
- name = \RSsectxt,
- names = \RSsecstxt,
- Name = \RSSectxt,
- Names = \RSSecstxt,
- refcmd = {\S\ref{#1}},
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-% \end{macrocode}
-% \end{RSframed}
-%
-% \subsubsection{Equations}\seclabel{EqTempl}
-%
-% The equation number in references to equations are traditionally
-% written in an upright text, irrespective of the surrounding text.
-%
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- TEMPLATE FOR EQUATIONS ---------------------
-% \end{macrocode}
-% The standard equation ref format if \pkg{amsmath.sty} is not loaded.
-% \begin{macrocode}
-\newcommand*{\RSeqrefform}[1]{\textup{(\ref{#1})}}
-% \end{macrocode}
-% If \pkg{amsmath.sty} is loaded, store \cmd{\eqref}
-% and then undefine it before the template is created.
-% \begin{macrocode}
-\@ifpackageloaded{amsmath}%
- {\let\AMSeqref\eqref
- \let\eqref\relax}%
- {}
-% \end{macrocode}
-% \begin{macrocode}
-\newref{eq}{%
- name = \RSeqtxt,
- names = \RSeqstxt,
- Name = \RSEqtxt,
- Names = \RSEqstxt,
- refcmd = \RSeqrefform{#1},
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-% \end{macrocode}
-% Make way for \pkg{amsmath.sty} definitions
-% \begin{macrocode}
-\let\RSeqref\eqref
-\let\eqref\relax
-% \end{macrocode}
-% Some footwork to bring the AMS definition of
-% \cmd{\eqref} back if \pkg{amsmath.sty} is loaded
-% afterwards.
-% \begin{macrocode}
-\AtBeginDocument{%
- \@ifpackageloaded{amsmath}%
- {\RS@ifundefined{AMSeqref}{\let\AMSeqref\eqref}{}%
- \let\RSeqrefform\AMSeqref}%
- {}%
- \let\eqref=\RSeqref
- }
-% \end{macrocode}
-% \end{RSframed}
-%
-%
-% \subsubsection{Figures and Tables}\seclabel{tabtemp}
-% References to figures and tables are usually
-% straight forward.
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- TEMPLATE FOR FIGURES -----------------------
-% \end{macrocode}
-% \begin{macrocode}
- \newref{fig}{%
- name = \RSfigtxt,
- names = \RSfigstxt,
- Name = \RSFigtxt,
- Names = \RSFigstxt,
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-% \end{macrocode}
-% \end{RSframed}
-%
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- TEMPLATE FOR TABLES ------------------------
-% \end{macrocode}
-% \begin{macrocode}
- \newref{tab}{%
- name = \RStabtxt,
- names = \RStabstxt,
- Name = \RSTabtxt,
- Names = \RSTabstxt,
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-% \end{macrocode}
-% \end{RSframed}
-%
-% \pagebreak[2]
-% \subsubsection{Footnotes}\seclabel{fnTempl}
-%
-% A reference to a footnote differs from other references in that
-% it is only defined inside the footnote definition itself:
-% \begin{Ipara}
-% |\footnote{This is a footnote with ... \label{fn:xx}}|
-% \end{Ipara}
-% It can then be referred to with |\ref{fn:xx}|.
-%
-% A useful application of the \RS package is for references to
-% footnotes, were you need a duplicate footnote mark that refers to
-% a previously defined footnote.\footnote{^^A
-% This is a footnote with \cmd{\fnlabel}\texttt{\{xx\}} ...\fnlabel{xx}}
-% You can use the stared form of the reference
-% command to format the reference as a footnote mark, while the
-% reference commands without a star behave as normal.
-% \begin{Itabb}
-% \hspace*{2cm}\=\kill
-% |\fnref*{xx}| \ArTab \fnref*{xx}\\
-% |\fnref{xx}| \ArTab \fnref{xx}\\
-% \end{Itabb}
-%
-% \begin{RSframed}
-% \begin{macrocode}
-%%-- TEMPLATE FOR FOOTNOTES ---------------------
-% \end{macrocode}
-% Define the \cmd{\RSfnmark} to reproduce the footnote mark.
-% Use the |\ifRSstar| conditional to switch between a superscripted
-% and a normal reference.
-% \begin{macrocode}
- \newcommand{\RSfnmark}[1]{%
- \begingroup
- \unrestored@protected@xdef\@thefnmark{\ref{#1}}%
- \endgroup
- \@footnotemark}
-% \end{macrocode}
-% \begin{macrocode}
- \newref{fn}{%
- name = \RSfootntxt,
- names = \RSfootnstxt,
- Name = \RSFootntxt,
- Names = \RSFootnstxt,
- refcmd = {\ifRSstar\RSfnmark{#1}\else(\ref{#1})\fi},
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-% \end{macrocode}
-% \end{RSframed}
-%
-% \subsubsection{Enumerated lists}
-%
-% A reference to an item in an enumerated list can be obtained
-% by placing the labelling command after the \cmd{\item} command
-% inside the list. The second level numbering of the \cmd{\ref}
-% label in the standard \LaTeX{} is: 2a, 2b, etc.
-%
-% If you want to change the reference labels to 2(a), 2(b),
-% etc., without effecting the display in the \env{enumerate}
-% environment, you can make the following redefinition:
-% \begin{Ipara}
-% |\makeatletter|\\
-% |\renewcommand{\p@enumii}{\expandafter\p@@enumii}|\\
-% |\newcommand{\p@@enumii}[1]{\theenumi(#1)}|\\
-% |\makeatother|
-% \end{Ipara}
-% The contents of the \cmd{\@currentlable} is then
-% \begin{Ipara}
-% |{\expandafter\p@@enumii\theenumii}| ~$\rightarrow$~
-% |{\theenumi(\theenumii)}|
-% \end{Ipara}
-%
-% Writing a template for enumerated lists is left to the user.
-%
-%
-% \subsubsection{Theorems, lemmas, etc.}\seclabel{Thm}
-%
-% There exists many perturbations to the theorem environment such
-% as, Theorem, Lemma, Exercise, etc., and it is left to the user as
-% an exercise to construct his or her own templates.
-%
-% As an example to add reference for theorems to an exiting setup:
-%
-% \begin{Ipara}
-% |\usepackage{refstyle} |\\
-% |\newref{thm}{ |\\
-% | name = {theorem~}, |\\
-% | names = {theorems~},|\\
-% | Name = {Theorem~}, |\\
-% | Names = {Theorems~},|\\
-% | rngtxt = \RSrngtxt,|\\
-% | lsttwotxt = \RSlsttxt,|\\
-% | lsttxt = \RSlsttxt}|
-% \end{Ipara}
-%
-% If you want to add it to a specific language setup with \pkg{babel} then
-% you can do the following, for example for a dual language document with
-% English and Norwegian:
-% \begin{Ipara}
-% |\documentclass[english, norwegian]{article}% NB: Languages as global opts! |\\
-% |\usepackage{babel} %Use global languages |\\
-% |\usepackage{varioref} %Use global languages |\\
-% |\usepackage{refstyle} %Use global languages |\\
-% |\RSaddto{\RSnorwegian}{% |\\
-% | \def\RSthmtxt{teorem~}% |\\
-% | \def\RSthmstxt{teorem~}% |\\
-% | \def\RSThmtxt{Teorem~}% |\\
-% | \def\RSThmstxt{Teorem~}} |\\
-% |\RSaddto{\RSenglish}{% |\\
-% | \def\RSthmtxt{theorem~}% |\\
-% | \def\RSthmstxt{theorems~}% |\\
-% | \def\RSThmtxt{Theorem~}% |\\
-% | \def\RSThmstxt{Theorems~}} |\\
-% |\newref{thm}{ |\\
-% | name = \RSthmtxt, |\\
-% | names = \RSthmstxt, |\\
-% | Name = \RSThmtxt, |\\
-% | Names = \RSThmstxt, |\\
-% | rngtxt = \RSrngtxt, |\\
-% | lsttwotxt = \RSlsttxt, |\\
-% | lsttxt = \RSlsttwotxt} |
-% \end{Ipara}
-%
-% \noindent All \pkg{babel} language changes will then activate
-% the proper code setup. In this example the \pkg{refstyle}
-% mechanism is used where the code is appended to the |\RSenglish|
-% and |\RSnorwegian| container functions. These functions are added
-% by the package
-% to the \pkg{babel} containers |\extrasenglish| and |\extrasnorwegian|,
-% that is called every time a language change occurs.
-% Please see the contents of \pkg{refstyle.cfg} for the names of the
-% \pkg{refstyle} containers associated with the different languages.
-%
-% Note that the extended definitions
-% can also be added directly to the \pkg{babel} containers without using
-% \pkg{refstyle}'s mechanism.
-%
-% \begin{macrocode}
-%</cfg>
-% \end{macrocode}
-%
-% \Finale
-\endinput
+% \iffalse +% +% refconfig.dtx +% Copyright (C) 2002--2024 Danie Els +% +% ------------------------------------------------------------------- +% The refstyle package +% for the formatting of references +% ------------------------------------------------------------------- +% This work may be distributed and/or modified under the conditions +% of the LaTeX Project Public License, either version 1.3c of this +% license or (at your option) any later version. The latest version +% of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2008/12/01 or later. +% +% This work has the LPPL maintenance status 'maintained'. +% +% This Current Maintainer of this work is Danie Els (dnjels@gmail.com) +% +% This package consists of the files: refstyle.dtx +% refconfig.dtx +% refstyle.ins +% and the derived files: refstyle.sty +% refstyle.cfg +% ------------------------------------------------------------------- +% +%<*driver> +\documentclass[a4paper]{ltxdoc} + \EnableCrossrefs + \CodelineIndex + \RecordChanges +\usepackage{color} +\usepackage{framed} + \setlength{\FrameSep}{1\fboxsep} + \definecolor{shadecolor}{gray}{0.9} + \newenvironment{RSframed}{\shaded}{\endshaded} +\usepackage{xspace} +\usepackage{varioref} +\usepackage{refstyle} + +%-- macrocode env changes ------------------------------ + +\setlength{\MacroIndent}{1.5em} + +%-- Indented environments ------------------------------ + +\newlength{\tdima} +\newsavebox{\tboxa} +\newlength{\mytab} +\setlength{\mytab}{2\parindent} + +\newenvironment{IndentPara}[1][1] + {\list{}{\setlength{\leftmargin}{#1\mytab}% + \setlength{\labelwidth}{0pt}% + \setlength{\labelsep}{0pt}% + \setlength{\itemindent}{\parindent}% + \setlength{\listparindent}{\parindent}% + }\item[]}% + {\endlist} +\newenvironment{Ipara}[1][\small]% + {\begin{IndentPara}\noindent#1\ignorespaces}% + {\end{IndentPara}} +\newenvironment{Itabb}[1][\small]% + {\begin{IndentPara}#1\ignorespaces\begin{tabbing}\ignorespaces}% + {\end{tabbing}\end{IndentPara}} + +%-- Additional documenting commands -------------------- + +\makeatletter +\def\meta@font@select{\normalfont\slshape} +\makeatother + +\newcommand*{\file}[1]{\texttt{#1}} +\newcommand*{\pkg}[1]{\textsf{#1}} +\newcommand*{\env}[1]{\texttt{#1}} +\newcommand*{\opt}[1]{\texttt{\slshape#1}} +\newcommand*{\RS}{\pkg{refstyle}\xspace} + +\newcommand*{\ArTab}{\>\quad$\rightarrow$\quad} + +%------------------------------------------------------- + +\setlength\hfuzz{15pt} +\hbadness=7000 +\begin{document} + \DocInput{refconfig.dtx} +\end{document} + +%</driver> +% \fi +% +% \CheckSum{1092} +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% \changes{v0.0}{2002/04/01}{Initial version} +% \changes{v0.2}{2003/07/30}{Updated version} +% \changes{v0.3}{2006/09/07}{Documentation update} +% \changes{v0.4}{2010/10/21}{Add \cmd{\RSlsttwotxt} for lists} +% \changes{v0.5}{2010/11/02}{Bug fixes} +% \changes{v0.6}{2024/01/31}{robustification of AMS' \cmd{\eqref}} +% +% \DoNotIndex{ +% \",\@chapapp,\@ifpackageloaded,\AtBeginDocument, +% \begingroup,\def,\edef,\else,\endgroup, +% \fi,\ifx, \let, \newcommand,\newref, +% \providecommand,\ProvidesFile,\ref,\relax, +% \renewcommand,\RS@ifundefined,\RS@tmpa,\RS@tmpb, +% \S,\space,\ss,\string,\textup,\unrestored@protected@xdef} +% +%^^A-- Titling -------------------------------------------- +% \GetFileInfo{refstyle.cfg} +% \title{\vskip -2em +% Configuration file for \RS\ package\thanks{ +% This file has version number +% \fileversion, last revised +% \filedate.}} +% \author{Danie Els\\[1ex] +% \normalsize e-mail: \texttt{dnjels@gmail}} +% \date{\filedate} +% \maketitle +% +% \tableofcontents +% \clearpage +% +% +% \section{The \RS\ configuration file} +% +% \subsubsection*{Reference templates} +% The default configuration file, \file{refstyle.cfg}, makes the +% following reference declarations: +% \begin{Ipara} +% |\newref{part}{...}| \quad$\rightarrow$ Parts\\ +% |\newref{chap}{...}| \quad$\rightarrow$ Chapters and Appendices\\ +% |\newref{sec}{...} | \quad$\rightarrow$ Sections\\ +% |\newref{eq}{...} | \quad$\rightarrow$ Equations\\ +% |\newref{fig}{...} | \quad$\rightarrow$ Figures\\ +% |\newref{tab}{...} | \quad$\rightarrow$ Tables\\ +% |\newref{fn}{...} | \quad$\rightarrow$ Footnotes +% \end{Ipara} +% If there is a need for more reference types, this standard +% list can be expanded. +% +% \subsubsection*{Language definitions} +% The \RS\ package also provides the following language definitions +% options for references, when loaded together with \pkg{babel}: +% \begin{itemize} +% \item afrikaans +% \item danish +% \item english, USenglish, american, canadian, UKenglish, british +% \item french +% \item german, ngerman, austrian, naustrian +% \item italian +% \item norwegian, nynorsk, norsk, bokmal\footnote{Norwegian Bokm{\aa}l +% is not defined in \pkg{babel} yet.} +% \item portuges, portuguese, brazilian, brazil +% \item swedish +% \end{itemize} +% +% \noindent See \secref[vref]{Thm} for an example of how to link your +% own definitions to an exsiting language setup. +% \StopEventually{\PrintChanges} +% \clearpage +% \section{Implementation} +% \begin{macrocode} +%<*cfg> +% \end{macrocode} +% \subsection{Identification} +% \begin{RSframed} +% \begin{macrocode} +\ProvidesFile{refstyle.cfg}[2024/01/31\space + v0.6\space + Configuration file for refstyle (DNJ Els)] +% \end{macrocode} +% \end{RSframed} +% +% \subsection{Language Definitions for \RS\ Package} +% +% \subsubsection{English} +% +% \begin{macro}{\RSenglish,\RSukenglish} +% Support provided by the author. +% \begin{RSframed} +% \begin{macrocode} +%%-- ENGLISH ------------------------------------ +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSukenglish{% + \def\RSrngtxt{\space to~}%........... Range: figures 5 to 6 + \def\RSlsttwotxt{\space and~}%....... List two: figures 5 and 6 + \def\RSlsttxt{, and~}%............... List more: figures 5, 6, and 7 + \def\RSparttxt{Part~}%............... Part lowercase singular + \def\RSpartstxt{Parts~}%............. lowercase plural + \def\RSParttxt{Part~}%............... uppercase singular (sentence start) + \def\RSPartstxt{Parts~}%............. uppercase plural (sentence start) + \def\RSappendixname{appendix~}%...... Appendix lowercase singular + \def\RSappendicesname{appendices~}%.. lowercase plural + \def\RSAppendixname{Appendix~}%...... uppercase singular (sentence start) + \def\RSAppendicesname{Appendices~}%.. uppercase plural (sentence start) + \def\RSchaptername{chapter~}%........ Chapter lowercase singular + \def\RSchaptersname{chapters~}%...... lowercase plural + \def\RSChaptername{Chapter~}%........ uppercase singular (sentence start) + \def\RSChaptersname{Chapters~}%...... uppercase plural (sentence start) + \def\RSsectxt{section~}%............. Section lowercase singular + \def\RSsecstxt{sections~}%........... lowercase plural + \def\RSSectxt{Section~}%............. uppercase singular (sentence start) + \def\RSSecstxt{Sections~}%........... uppercase plural (sentence start) + \def\RSeqtxt{equation~}%............. Equation lowercase singular + \def\RSeqstxt{equations~}%........... lowercase plural + \def\RSEqtxt{Equation~}%............. uppercase singular (sentence start) + \def\RSEqstxt{Equations~}%........... uppercase plural (sentence start) + \def\RSfigtxt{figure~}%.............. Figure lowercase singular + \def\RSfigstxt{figures~}%............ lowercase plural + \def\RSFigtxt{Figure~}%.............. uppercase singular (sentence start) + \def\RSFigstxt{Figures~}%............ uppercase plural (sentence start) + \def\RStabtxt{table~}%............... Table lowercase singular + \def\RStabstxt{tables~}%............. lowercase plural + \def\RSTabtxt{Table~}%............... uppercase singular (sentence start) + \def\RSTabstxt{Tables~}%............. uppercase plural (sentence start) + \def\RSfootntxt{footnote~}%.......... Footnote lowercase singular + \def\RSfootnstxt{footnotes~}%........ lowercase plural + \def\RSFootntxt{Footnote~}%.......... uppercase singular (sentence start) + \def\RSFootnstxt{Footnotes~}%........ uppercase plural (sentence start) +} +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSenglish{% + \def\RSrngtxt{\space to~}% + \def\RSlsttwotxt{\space and~}% + \def\RSlsttxt{\space and~}% + \def\RSparttxt{Part~}% + \def\RSpartstxt{Parts~}% + \def\RSParttxt{Part~}% + \def\RSPartstxt{Parts~}% + \def\RSappendixname{appendix~}% + \def\RSappendicesname{appendices~}% + \def\RSAppendixname{Appendix~}% + \def\RSAppendicesname{Appendices~}% + \def\RSchaptername{chapter~}% + \def\RSchaptersname{chapters~}% + \def\RSChaptername{Chapter~}% + \def\RSChaptersname{Chapters~}% + \def\RSsectxt{section~}% + \def\RSsecstxt{sections~}% + \def\RSSectxt{Section~}% + \def\RSSecstxt{Sections~}% + \def\RSeqtxt{equation~}% + \def\RSeqstxt{equations~}% + \def\RSEqtxt{Equation~}% + \def\RSEqstxt{Equations~}% + \def\RSfigtxt{figure~}% + \def\RSfigstxt{figures~}% + \def\RSFigtxt{Figure~}% + \def\RSFigstxt{Figures~}% + \def\RStabtxt{table~}% + \def\RStabstxt{tables~}% + \def\RSTabtxt{Table~}% + \def\RSTabstxt{Tables~}% + \def\RSfootntxt{footnote~}% + \def\RSfootnstxt{footnotes~}% + \def\RSFootntxt{Footnote~}% + \def\RSFootnstxt{Footnotes~}% +} +% \end{macrocode} +% \end{RSframed} +% \end{macro} +% +% \noindent Make English the default. +% \begin{RSframed} +% \begin{macrocode} +\RSenglish% Default +% \end{macrocode} +% \end{RSframed} +% +% \noindent Options +% \begin{RSframed} +% \begin{macrocode} +\DeclareLangOpt{english}{\RSenglish} +\DeclareLangOpt{USenglish}{\RSenglish} +\DeclareLangOpt{american}{\RSenglish} +\DeclareLangOpt{canadian}{\RSenglish} +\DeclareLangOpt{UKenglish}{\RSukenglish} +\DeclareLangOpt{british}{\RSukenglish} +% \end{macrocode} +% \end{RSframed} +% +% +% \subsubsection{Afrikaans} +% +% \begin{macro}{\RSafrikaans} +% Support provided by the author. +% \begin{RSframed} +% \begin{macrocode} +%%-- AFRIKAANS ---------------------------------- +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSafrikaans{% + \def\RSrngtxt{\space tot~}% + \def\RSlsttwotxt{\space en~}% + \def\RSlsttxt{\space en~}% + \def\RSparttxt{Deel~}% + \def\RSpartstxt{Dele~}% + \def\RSParttxt{Deel~}% + \def\RSPartstxt{Dele~}% + \def\RSappendixname{bylae~}% + \def\RSappendicesname{bylaes~}% + \def\RSAppendixname{Bylae~}% + \def\RSAppendicesname{Bylaes~}% + \def\RSchaptername{hoofstuk~}% + \def\RSchaptersname{hoofstukke~}% + \def\RSChaptername{Hoofstuk~}% + \def\RSChaptersname{Hoofstukke~}% + \def\RSsectxt{afdeling~}% + \def\RSsecstxt{afdelings~}% + \def\RSSectxt{Afdeling~}% + \def\RSSecstxt{Afdelings~}% + \def\RSeqtxt{vergelyking~}% + \def\RSeqstxt{vergelykings~}% + \def\RSEqtxt{Vergelyking~}% + \def\RSEqstxt{Vergelyking~}% + \def\RSfigtxt{figuur~}% + \def\RSfigstxt{figure~}% + \def\RSFigtxt{Figuur~}% + \def\RSFigstxt{Figure~}% + \def\RStabtxt{tabel~}% + \def\RStabstxt{tabelle~}% + \def\RSTabtxt{Tabel~}% + \def\RSTabstxt{Tabelle~}% + \def\RSfootntxt{footnota~}% + \def\RSfootnstxt{footnotas~}% + \def\RSFootntxt{Footnota~}% + \def\RSFootnstxt{Footnotas~}% +} +% \end{macrocode} +% \end{RSframed} +% \end{macro} +% +% \noindent Options +% \begin{RSframed} +% \begin{macrocode} +\DeclareLangOpt{afrikaans}{\RSafrikaans} +% \end{macrocode} +% \end{RSframed} +% +% +% \subsubsection{Danish} +% +% \begin{macro}{\RSdanish} +% \changes{v0.2}{2003/07/30}{Add Danish language support} +% Thomas Widmann: \texttt{<\,thomas.widmann AT harpercollins DOT co DOT uk>} +% provided the definitions for Danish. +% \begin{RSframed} +% \begin{macrocode} +%%-- DANISH ------------------------------------- +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSdanish{% + \def\RSrngtxt{\space til~}% + \def\RSlsttwotxt{\space og~}% + \def\RSlsttxt{\space og~}% + \def\RSparttxt{del~}% + \def\RSpartstxt{del~}% + \def\RSParttxt{Del~}% + \def\RSPartstxt{Del~}% + \def\RSappendixname{bilag~}% % 'appendiks' is also possible, + \def\RSappendicesname{bilag~}% % but 'bilag' is used in Babel + \def\RSAppendixname{Bilag~}% + \def\RSAppendicesname{Bilag~}% + \def\RSchaptername{kapitel~}% + \def\RSchaptersname{kapitel~}% + \def\RSChaptername{Kapitel~}% + \def\RSChaptersname{Kapitel~}% + \def\RSsectxt{afsnit~}% + \def\RSsecstxt{afsnit~}% + \def\RSSectxt{Afsnit~}% + \def\RSSecstxt{Afsnit~}% + \def\RSeqtxt{ligning~}% + \def\RSeqstxt{ligning~}% + \def\RSEqtxt{Ligning~}% + \def\RSEqstxt{Ligning~}% + \def\RSfigtxt{figur~}% + \def\RSfigstxt{figur~}% + \def\RSFigtxt{Figur~}% + \def\RSFigstxt{Figur~}% + \def\RStabtxt{tabel~}% + \def\RStabstxt{tablel~}% + \def\RSTabtxt{Tabel~}% + \def\RSTabstxt{Tabel~}% + \def\RSfootntxt{fodnote~}% + \def\RSfootnstxt{fodnote~}% + \def\RSFootntxt{Fodnote~}% + \def\RSFootnstxt{Fodnote~}% +} +% \end{macrocode} +% \end{RSframed} +% \end{macro} +% +% \noindent Options +% \begin{RSframed} +% \begin{macrocode} +\DeclareLangOpt{danish}{\RSdanish} +% \end{macrocode} +% \end{RSframed} +% +% +% \subsubsection{French} +% +% \begin{macro}{\RSfrench} +% \changes{v0.4}{2010/10/21}{Add French language support} +% Jean-Pierre Chr\'etien \texttt{<\,jeanpierre.chretien AT free DOT fr>} +% provided the definitions for French. +% \begin{RSframed} +% \begin{macrocode} +%%-- FRENCH ------------------------------------- +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSfrench{% + \def\RSrngtxt{\space \`{a}~}% + \def\RSlsttwotxt{\space et~}% + \def\RSlsttxt{\space et~}% + \def\RSparttxt{partie~}% + \def\RSpartstxt{parties~}% + \def\RSParttxt{La partie~}% + \def\RSPartstxt{Les parties~}% + \def\RSappendixname{appendice~}% + \def\RSappendicesname{appendices~}% + \def\RSAppendixname{L'appendice~}% + \def\RSAppendicesname{Les appendices~}% + \def\RSchaptername{chapitre~}% + \def\RSchaptersname{chapitres~}% + \def\RSChaptername{Le chapitre~}% + \def\RSChaptersname{Les chapitres~}% + \def\RSsectxt{section~}% + \def\RSsecstxt{sections~}% + \def\RSSectxt{La section~}% + \def\RSSecstxt{Les sections~}% + \def\RSeqtxt{\'{e}quation~}% + \def\RSeqstxt{\'{e}quations~}% + \def\RSEqtxt{L'\'{e}quation~}% + \def\RSEqstxt{Les \'{e}quations~}% + \def\RSfigtxt{figure~}% + \def\RSfigstxt{figures~}% + \def\RSFigtxt{La figure~}% + \def\RSFigstxt{Les figures~}% + \def\RStabtxt{tableau~}% + \def\RStabstxt{tableaux~}% + \def\RSTabtxt{Le tableau~}% + \def\RSTabstxt{Les tableaux~}% + \def\RSfootntxt{note~}% + \def\RSfootnstxt{notes~}% + \def\RSFootntxt{La note~}% + \def\RSFootnstxt{Les notes~}% +} +% \end{macrocode} +% \end{RSframed} +% \end{macro} +% +% \noindent Options +% \begin{RSframed} +% \begin{macrocode} +\DeclareLangOpt{french}{\RSfrench} +% \end{macrocode} +% \end{RSframed} +% +% +% +% \subsubsection{German} +% +% \begin{macro}{\RSgerman} +% \changes{v0.2}{2003/07/30}{Add German language support} +% Harald Harders: \texttt{<\,h.harders AT tu-bs DOT de>} +% provided the definitions for German. +% \begin{RSframed} +% \begin{macrocode} +%%-- GERMAN ------------------------------------- +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSgerman{% + \def\RSrngtxt{\space bis~}% + \def\RSlsttwotxt{\space und~}% + \def\RSlsttxt{\space und~}% + \def\RSparttxt{Teil~}% + \def\RSpartstxt{Teile~}% + \def\RSParttxt{Teil~}% + \def\RSPartstxt{Teile~}% + \def\RSappendixname{Anhang~}% + \def\RSappendicesname{Anh\"{a}nge~}% + \def\RSAppendixname{Anhang~}% + \def\RSAppendicesname{Anh\"{a}nge~}% + \def\RSchaptername{Kapitel~}% + \def\RSchaptersname{Kapitel~}% + \def\RSChaptername{Kapitel~}% + \def\RSChaptersname{Kapitel~}% + \def\RSsectxt{Abschnitt~}% + \def\RSsecstxt{Abschnitt~}% + \def\RSSectxt{Abschnitt~}% + \def\RSSecstxt{Abschnitt~}% + \def\RSeqtxt{Gleichung~}% + \def\RSeqstxt{Gleichungen~}% + \def\RSEqtxt{Gleichung~}% + \def\RSEqstxt{Gleichungen~}% + \def\RSfigtxt{Abbildung~}% + \def\RSfigstxt{Abbildung~}% + \def\RSFigtxt{Abbildung~}% + \def\RSFigstxt{Abbildung~}% + \def\RStabtxt{Tabelle~}% + \def\RStabstxt{Tabellen~}% + \def\RSTabtxt{Tabelle~}% + \def\RSTabstxt{Tabellen~}% + \def\RSfootntxt{Fu\ss note~}% + \def\RSfootnstxt{Fu\ss noten~}% + \def\RSFootntxt{Fu\ss note~}% + \def\RSFootnstxt{Fu\ss noten~}% +} +% \end{macrocode} +% \end{RSframed} +% \end{macro} +% +% \noindent Options +% \begin{RSframed} +% \begin{macrocode} +\DeclareLangOpt{german}{\RSgerman} +\DeclareLangOpt{ngerman}{\RSgerman} +\DeclareLangOpt{austrian}{\RSgerman} +\DeclareLangOpt{naustrian}{\RSgerman} +% \end{macrocode} +% \end{RSframed} +% +% +% \subsubsection{Italian} +% +% \begin{macro}{\RSitalian} +% \changes{v0.4}{2010/10/21}{Add Italian language support} +% Nicola Lunghi: \texttt{<\,nick83ola AT gmail DOT com>} +% provided the definitions for Italian. +% \begin{RSframed} +% \begin{macrocode} +%%-- ITALIAN ------------------------------------ +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSitalian{% + \def\RSrngtxt{--}% + \def\RSlsttwotxt{\space e~}% + \def\RSlsttxt{\space e~}% + \def\RSparttxt{Parte~}% + \def\RSpartstxt{Parti~}% + \def\RSParttxt{Parte~}% + \def\RSPartstxt{Parti~}% + \def\RSappendixname{l'appendice~}% + \def\RSappendicesname{le appendici~}% + \def\RSAppendixname{l'Appendice~}% + \def\RSAppendicesname{le Appendici~}% + \def\RSchaptername{il capitolo~}% + \def\RSchaptersname{i capitoli~}% + \def\RSChaptername{il Capitolo~}% + \def\RSChaptersname{i Capitoli~}% + \def\RSsectxt{la sezione~}% + \def\RSsecstxt{le sezioni~}% + \def\RSSectxt{la Sezione~}% + \def\RSSecstxt{la Sezioni~}% + \def\RSeqtxt{l'equazione~}% + \def\RSeqstxt{le equazioni~}% + \def\RSEqtxt{l'Equazione~}% + \def\RSEqstxt{le Equazioni~}% + \def\RSfigtxt{la figura~}% + \def\RSfigstxt{le figure~}% + \def\RSFigtxt{la Figura~}% + \def\RSFigstxt{le Figure~}% + \def\RStabtxt{la tabella~}% + \def\RStabstxt{le tabelle~}% + \def\RSTabtxt{la Tabella~}% + \def\RSTabstxt{le Tabelle~}% + \def\RSfootntxt{la nota~}% + \def\RSfootnstxt{le note~}% + \def\RSFootntxt{la Nota~}% + \def\RSFootnstxt{le Note~}% +} +% \end{macrocode} +% \end{RSframed} +% \end{macro} +% +% \noindent Options +% \begin{RSframed} +% \begin{macrocode} +\DeclareLangOpt{italian}{\RSitalian} +% \end{macrocode} +% \end{RSframed} +% +% +% +% \subsubsection{Norwegian} +% +% \begin{macro}{\RSnorwegian} +% \changes{v0.3}{2006/09/07}{Add Norwegian language support} +% Karl Ove Hufthammer: \texttt{<\,karloh AT mi DOT uib DOT no>} +% provided the definitions for Norwegian. +% +% Norway has two official languages Norwegian Nynorsk and +% Norwegian Bokm{\aa}l (commonly 'nynorsk' and 'norsk' in LaTeX), +% but the \pkg{refstyle} definitions are identically in both variants. +% \begin{RSframed} +% \begin{macrocode} +%%-- NORWEGIAN ------------------------------------- +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSnorwegian{% + \def\RSrngtxt{\space til~}% + \def\RSlsttwotxt{\space og~}% + \def\RSlsttxt{\space og~}% + \def\RSparttxt{del~}% + \def\RSpartstxt{del~}% + \def\RSParttxt{Del~}% + \def\RSPartstxt{Del~}% + \def\RSappendixname{tillegg~}% + \def\RSappendicesname{tillegg~}% + \def\RSAppendixname{Tillegg~}% + \def\RSAppendicesname{Tillegg~}% + \def\RSchaptername{kapittel~}% + \def\RSchaptersname{kapittel~}% + \def\RSChaptername{Kapittel~}% + \def\RSChaptersname{Kapittel~}% + \def\RSsectxt{avsnitt~}% + \def\RSsecstxt{avsnitt~}% + \def\RSSectxt{Avsnitt~}% + \def\RSSecstxt{Avsnitt~}% + \def\RSeqtxt{formel~}% + \def\RSeqstxt{formel~}% + \def\RSEqtxt{Formel~}% + \def\RSEqstxt{Formel~}% + \def\RSfigtxt{figur~}% + \def\RSfigstxt{figur~}% + \def\RSFigtxt{Figur~}% + \def\RSFigstxt{Figur~}% + \def\RStabtxt{tabell~}% + \def\RStabstxt{tabell~}% + \def\RSTabtxt{Tabell~}% + \def\RSTabstxt{Tabell~}% + \def\RSfootntxt{fotnote~}% + \def\RSfootnstxt{fotnote~}% + \def\RSFootntxt{Fotnote~}% + \def\RSFootnstxt{Fotnote~}% +} +% \end{macrocode} +% \end{RSframed} +% \end{macro} +% +% \noindent Options +% \begin{RSframed} +% \begin{macrocode} +\DeclareLangOpt{norwegian}{\RSnorwegian} +\DeclareLangOpt{nynorsk}{\RSnorwegian} +\DeclareLangOpt{bokmal}{\RSnorwegian}% Not in babel yet +\DeclareLangOpt{norsk}{\RSnorwegian} +% \end{macrocode} +% \end{RSframed} +% +% +% \subsubsection{Portuguese/Brazilian} +% +% \begin{macro}{\RSportuguese,\RSbrazilian} +% \changes{v0.4}{2010/10/21}{Add Portuguese language support} +% Bernhard Enders and Flavio Costa \texttt{<\,flaviocosta AT yahoo DOT com DOT br>} +% provided the definitions for Portuguese. +% \begin{RSframed} +% \begin{macrocode} +%%-- PORTUGUESE ----------------------------------- +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSportuguese{% + \def\RSrngtxt{\space a~}% + \def\RSlsttwotxt{\space e~}% + \def\RSlsttxt{\space e~}% + \def\RSparttxt{Parte~}% + \def\RSpartstxt{Partes~}% + \def\RSParttxt{Parte~}% + \def\RSPartstxt{Partes~}% + \def\RSappendixname{ap\^{e}ndice~}% + \def\RSappendicesname{ap\^{e}ndices~}% + \def\RSAppendixname{Ap\^{e}ndice~}% + \def\RSAppendicesname{Ap\^{e}ndices~}% + \def\RSchaptername{cap\'{i}tulo~}% + \def\RSchaptersname{cap\'{i}tulos~}% + \def\RSChaptername{Cap\'{i}tulo~}% + \def\RSChaptersname{Cap\'{i}tulos~}% + \def\RSsectxt{se\c{c}\~{a}o~}% + \def\RSsecstxt{se\c{c}\~{o}es~}% + \def\RSSectxt{Se\c{c}\~{a}o~}% + \def\RSSecstxt{Se\c{c}\~{o}es~}% + \def\RSeqtxt{equa\c{c}\~{a}o~}% + \def\RSeqstxt{equa\c{c}\~{o}es~}% + \def\RSEqtxt{Equa\c{c}\~{a}o~}% + \def\RSEqstxt{Equa\c{c}\~{o}es~}% + \def\RSfigtxt{figura~}% + \def\RSfigstxt{figuras~}% + \def\RSFigtxt{Figura~}% + \def\RSFigstxt{Figuras~}% + \def\RStabtxt{tabela~}% + \def\RStabstxt{tabelas~}% + \def\RSTabtxt{Tabela~}% + \def\RSTabstxt{Tabelas~}% + \def\RSfootntxt{nota de rodap\'{e}~}% + \def\RSfootnstxt{notas de rodap\'{e}~}% + \def\RSFootntxt{Nota de rodap\'{e}~}% + \def\RSFootnstxt{Notas de rodap\'{e}~}% +} +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSbrazilian{% + \def\RSrngtxt{\space a~}% + \def\RSlsttwotxt{\space e~}% + \def\RSlsttxt{\space e~}% + \def\RSparttxt{Parte~}% + \def\RSpartstxt{Partes~}% + \def\RSParttxt{Parte~}% + \def\RSPartstxt{Partes~}% + \def\RSappendixname{ap\^{e}ndice~}% + \def\RSappendicesname{ap\^{e}ndices~}% + \def\RSAppendixname{Ap\^{e}ndice~}% + \def\RSAppendicesname{Ap\^{e}ndices~}% + \def\RSchaptername{cap\'{i}tulo~}% + \def\RSchaptersname{cap\'{i}tulos~}% + \def\RSChaptername{Cap\'{i}tulo~}% + \def\RSChaptersname{Cap\'{i}tulos~}% + \def\RSsectxt{sec\c{c}\~{a}o~}%<--------------- + \def\RSsecstxt{sec\c{c}\~{o}es~}%<------------- + \def\RSSectxt{Sec\c{c}\~{a}o~}%<--------------- + \def\RSSecstxt{Sec\c{c}\~{o}es~}%<------------- + \def\RSeqtxt{equa\c{c}\~{a}o~}% + \def\RSeqstxt{equa\c{c}\~{o}es~}% + \def\RSEqtxt{Equa\c{c}\~{a}o~}% + \def\RSEqstxt{Equa\c{c}\~{o}es~}% + \def\RSfigtxt{figura~}% + \def\RSfigstxt{figuras~}% + \def\RSFigtxt{Figura~}% + \def\RSFigstxt{Figuras~}% + \def\RStabtxt{tabela~}% + \def\RStabstxt{tabelas~}% + \def\RSTabtxt{Tabela~}% + \def\RSTabstxt{Tabelas~}% + \def\RSfootntxt{nota de rodap\'{e}~}% + \def\RSfootnstxt{notas de rodap\'{e}~}% + \def\RSFootntxt{Nota de rodap\'{e}~}% + \def\RSFootnstxt{Notas de rodap\'{e}~}% +} +% \end{macrocode} +% \end{RSframed} +% \end{macro} +% +% \noindent Options +% \begin{RSframed} +% \begin{macrocode} +\DeclareLangOpt{portuges}{\RSportuguese} +\DeclareLangOpt{portuguese}{\RSportuguese} +\DeclareLangOpt{brazilian}{\RSbrazilian} +\DeclareLangOpt{brazil}{\RSbrazilian} +% \end{macrocode} +% \end{RSframed} +% +% +% +% \subsubsection{Swedish} +% +% \begin{macro}{\RSswedish} +% \changes{v0.2}{2003/07/30}{Add Swedish language support} +% Bj\"{o}rn Thors \texttt{<\,bjorn.thors AT alfvenlab DOT kth DOT se>} +% provided the definitions for Swedish. +% \begin{RSframed} +% \begin{macrocode} +%%-- SWEDISH ------------------------------------ +% \end{macrocode} +% \begin{macrocode} +\newcommand\RSswedish{% + \def\RSrngtxt{\space till~}% + \def\RSlsttwotxt{\space och~}% + \def\RSlsttxt{\space och~}% + \def\RSparttxt{del~}% + \def\RSpartstxt{del~}% + \def\RSParttxt{Del~}% + \def\RSPartstxt{Del~}% + \def\RSappendixname{appendix~}% + \def\RSappendicesname{appendix~}% + \def\RSAppendixname{Appendix~}% + \def\RSAppendicesname{Appendix~}% + \def\RSchaptername{kapitel~}% + \def\RSchaptersname{kapitel~}% + \def\RSChaptername{Kapitel~}% + \def\RSChaptersname{Kapitel~}% + \def\RSsectxt{sektion~}% + \def\RSsecstxt{sektion~}% + \def\RSSectxt{Sektion~}% + \def\RSSecstxt{Sektion~}% + \def\RSeqtxt{ekvation~}% + \def\RSeqstxt{ekvation~}% + \def\RSEqtxt{Ekvation~}% + \def\RSEqstxt{Ekvation~}% + \def\RSfigtxt{figur~}% + \def\RSfigstxt{figur~}% + \def\RSFigtxt{Figur~}% + \def\RSFigstxt{Figur~}% + \def\RStabtxt{tabell~}% + \def\RStabstxt{tabell~}% + \def\RSTabtxt{Tabell~}% + \def\RSTabstxt{Tabell~}% + \def\RSfootntxt{fotnot~}% + \def\RSfootnstxt{fotnot~}% + \def\RSFootntxt{Fotnot~}% + \def\RSFootnstxt{Fotnot~}% +} +% \end{macrocode} +% \end{RSframed} +% \end{macro} +% \noindent Options +% \begin{RSframed} +% \begin{macrocode} +\DeclareLangOpt{swedish}{\RSswedish} +% \end{macrocode} +% \end{RSframed} +% +% +% +% +% \subsection{Templates for the \RS Package} +% +% The user can also define his or her own templates and put it +% in a separate configuration file to ensure uniformity +% of reference formats in your documents. +% +% \subsubsection{Parts} +% +% References to parts are usually straight forward, except that the +% document division ``Part'' must be distinguished from the normal +% usage of the word ``part'' in a sentence. A personal preference +% is to use small caps. +% +% \begin{RSframed} +% \begin{macrocode} +%%-- TEMPLATE FOR PARTS ------------------------- +% \end{macrocode} +% \begin{macrocode} + \newref{part}{% + name = \RSparttxt, + names = \RSpartstxt, + Name = \RSPparttxt, + Names = \RSPartstxt, + rngtxt = \RSrngtxt, + lsttxt = \RSlsttxt} +% \end{macrocode} +% \end{RSframed} +% +% +% +% \subsubsection{Chapters and Appendices} +% +% A major problem with a reference to a chapter is that at the time +% when the reference label, |\label|\marg{chap-label}, is created, +% it is unknown whether it would eventually ends up in the main +% matter or the appendix part of a book or report. +% +% A simple solution is to use the prefix to the \meta{chapter} +% counter, |\p@chapter|, to write the definition of |\@chapapp| to +% the auxiliary file (|.aux|) together with information of the +% label. The command |\@chapapp| expands to either |\chaptername| or +% |\appendixname| depending on whether the reference label is +% defined in the main matter or after the |\appendix| was called. +% (Note that |\@chapapp| is not defined in the AMS book class.) +% +% \begin{Ipara} +% |\renewcommand*{\p@chapter}{\string\chname{\@chapapp}}|\\ +% |\newcommand*{\chname}[1]{}%<-make it harmless |\\ +% |\newcommand*{\chapref}[1]{{\renewcommand*{\chname}[1]{##1~}\ref{#1}}}| +% \end{Ipara} +% +% \noindent The reference to a chapter, |\chapref|\marg{chap-label}, +% will then be prefixed with |\chaptername| or |\appendixname| and +% it does not matter where it was defined or where it was called. +% +% To utilize the full functionality of the \RS package for +% references to chapters and appendices, a complex form of +% \cmd{\newref} needs to be implemented. +% The following is a template for a book or report classes. +% +% +% \begin{RSframed} +% \begin{macrocode} +%%-- TEMPLATE FOR CHAPTERS & APPENDIXES --------- +% \end{macrocode} +% Prevent crashes for non-book type classes. +% \begin{macrocode} +\providecommand*{\p@chapter}{} +% \end{macrocode} +% Add \cmd{\@chapapp} to \cmd{\p@chapter} for writeout to auxiliary file. +% If an AMS book class is loaded, then \cmd{\chaptername} must +% be used. +% \begin{macrocode} +\AtBeginDocument{% + \RS@ifundefined{chapter}{}{% + \RS@ifundefined{@chapapp}% + {\renewcommand*{\p@chapter}{\string\chpname{\chaptername}}}%AMS + {\renewcommand*{\p@chapter}{\string\chpname{\@chapapp}}}% Normal + }% + } +% \end{macrocode} +% Define \cmd{\chpname} to gobble its contents outside the +% reference commands. +% \begin{macrocode} +\newcommand*{\chpname}[1]{} +% \end{macrocode} +% Define the \cmd{\RSchpname} to typeset all the different +% perturbations of chapter and appendix names. +% Use the conditionals to switch between the +% different options. +% +% \begin{macrocode} +\newcommand*{\RS@chpname}[1]{% + \ifRSnameon + \edef\RS@tmpa{#1}% + \edef\RS@tmpb{\appendixname}% + \ifx\RS@tmpa\RS@tmpb\relax% + \ifRSplural + \ifRScapname \RSAppendicesname \else \RSappendicesname \fi + \else + \ifRScapname \RSAppendixname \else \RSappendixname \fi + \fi + \else + \ifRSplural + \ifRScapname \RSChaptersname \else \RSchaptersname \fi + \else + \ifRScapname \RSChaptername \else \RSchaptername \fi + \fi + \fi + \fi} +% \end{macrocode} +% Define the \cmd{\newref} for chapters. +% \begin{macrocode} + \newref{chap}{% + refcmd = {{\let\chpname=\RS@chpname\ref{#1}}}, + rngtxt = \RSrngtxt, + lsttwotxt = \RSlsttwotxt, + lsttxt = \RSlsttxt} +% \end{macrocode} +% \end{RSframed} +% +% +% \subsubsection{Sections and paragraphs}\seclabel{secTempl} +% +% A template for references to sections is given below. References +% to paragraphs are similar and is left as an exercise to the users. +% +% \begin{RSframed} +% \begin{macrocode} +%%-- TEMPLATE FOR SECTIONS ---------------------- +% \end{macrocode} +% \begin{macrocode} + \newref{sec}{% + name = \RSsectxt, + names = \RSsecstxt, + Name = \RSSectxt, + Names = \RSSecstxt, + refcmd = {\S\ref{#1}}, + rngtxt = \RSrngtxt, + lsttwotxt = \RSlsttwotxt, + lsttxt = \RSlsttxt} +% \end{macrocode} +% \end{RSframed} +% +% \subsubsection{Equations}\seclabel{EqTempl} +% +% The equation number in references to equations are traditionally +% written in an upright text, irrespective of the surrounding text. +% +% \begin{RSframed} +% \begin{macrocode} +%%-- TEMPLATE FOR EQUATIONS --------------------- +% \end{macrocode} +% The standard equation ref format if \pkg{amsmath.sty} is not loaded. +% \begin{macrocode} +\newcommand*{\RSeqrefform}[1]{\textup{(\ref{#1})}} +% \end{macrocode} +% If \pkg{amsmath.sty} is loaded, store \cmd{\eqref} +% and then undefine it before the template is created. +% \begin{macrocode} +\AddToHook{package/amsmath/after}% + {\NewCommandCopy\AMSeqref\eqref + \RS@removedef{eqref}}% +% \end{macrocode} +% \begin{macrocode} +\newref{eq}{% + name = \RSeqtxt, + names = \RSeqstxt, + Name = \RSEqtxt, + Names = \RSEqstxt, + refcmd = \RSeqrefform{#1}, + rngtxt = \RSrngtxt, + lsttwotxt = \RSlsttwotxt, + lsttxt = \RSlsttxt} +% \end{macrocode} +% Make way for \pkg{amsmath.sty} definitions +% \begin{macrocode} +\let\RSeqref\eqref +\let\eqref\relax +% \end{macrocode} +% Some footwork to bring the AMS definition of +% \cmd{\eqref} back if \pkg{amsmath.sty} is loaded +% afterwards. +% \begin{macrocode} +\AtBeginDocument{% + \@ifpackageloaded{amsmath}% + {\DeclareCommandCopy\RSeqrefform\AMSeqref}% + {}% + \let\eqref=\RSeqref + } +% \end{macrocode} +% \end{RSframed} +% +% +% \subsubsection{Figures and Tables}\seclabel{tabtemp} +% References to figures and tables are usually +% straight forward. +% \begin{RSframed} +% \begin{macrocode} +%%-- TEMPLATE FOR FIGURES ----------------------- +% \end{macrocode} +% \begin{macrocode} + \newref{fig}{% + name = \RSfigtxt, + names = \RSfigstxt, + Name = \RSFigtxt, + Names = \RSFigstxt, + rngtxt = \RSrngtxt, + lsttwotxt = \RSlsttwotxt, + lsttxt = \RSlsttxt} +% \end{macrocode} +% \end{RSframed} +% +% \begin{RSframed} +% \begin{macrocode} +%%-- TEMPLATE FOR TABLES ------------------------ +% \end{macrocode} +% \begin{macrocode} + \newref{tab}{% + name = \RStabtxt, + names = \RStabstxt, + Name = \RSTabtxt, + Names = \RSTabstxt, + rngtxt = \RSrngtxt, + lsttwotxt = \RSlsttwotxt, + lsttxt = \RSlsttxt} +% \end{macrocode} +% \end{RSframed} +% +% \pagebreak[2] +% \subsubsection{Footnotes}\seclabel{fnTempl} +% +% A reference to a footnote differs from other references in that +% it is only defined inside the footnote definition itself: +% \begin{Ipara} +% |\footnote{This is a footnote with ... \label{fn:xx}}| +% \end{Ipara} +% It can then be referred to with |\ref{fn:xx}|. +% +% A useful application of the \RS package is for references to +% footnotes, were you need a duplicate footnote mark that refers to +% a previously defined footnote.\footnote{^^A +% This is a footnote with \cmd{\fnlabel}\texttt{\{xx\}} ...\fnlabel{xx}} +% You can use the stared form of the reference +% command to format the reference as a footnote mark, while the +% reference commands without a star behave as normal. +% \begin{Itabb} +% \hspace*{2cm}\=\kill +% |\fnref*{xx}| \ArTab \fnref*{xx}\\ +% |\fnref{xx}| \ArTab \fnref{xx}\\ +% \end{Itabb} +% +% \begin{RSframed} +% \begin{macrocode} +%%-- TEMPLATE FOR FOOTNOTES --------------------- +% \end{macrocode} +% Define the \cmd{\RSfnmark} to reproduce the footnote mark. +% Use the |\ifRSstar| conditional to switch between a superscripted +% and a normal reference. +% \begin{macrocode} + \newcommand{\RSfnmark}[1]{% + \begingroup + \unrestored@protected@xdef\@thefnmark{\ref{#1}}% + \endgroup + \@footnotemark} +% \end{macrocode} +% \begin{macrocode} + \newref{fn}{% + name = \RSfootntxt, + names = \RSfootnstxt, + Name = \RSFootntxt, + Names = \RSFootnstxt, + refcmd = {\ifRSstar\RSfnmark{#1}\else(\ref{#1})\fi}, + rngtxt = \RSrngtxt, + lsttwotxt = \RSlsttwotxt, + lsttxt = \RSlsttxt} +% \end{macrocode} +% \end{RSframed} +% +% \subsubsection{Enumerated lists} +% +% A reference to an item in an enumerated list can be obtained +% by placing the labelling command after the \cmd{\item} command +% inside the list. The second level numbering of the \cmd{\ref} +% label in the standard \LaTeX{} is: 2a, 2b, etc. +% +% If you want to change the reference labels to 2(a), 2(b), +% etc., without effecting the display in the \env{enumerate} +% environment, you can make the following redefinition: +% \begin{Ipara} +% |\makeatletter|\\ +% |\renewcommand{\p@enumii}{\expandafter\p@@enumii}|\\ +% |\newcommand{\p@@enumii}[1]{\theenumi(#1)}|\\ +% |\makeatother| +% \end{Ipara} +% The contents of the \cmd{\@currentlable} is then +% \begin{Ipara} +% |{\expandafter\p@@enumii\theenumii}| ~$\rightarrow$~ +% |{\theenumi(\theenumii)}| +% \end{Ipara} +% +% Writing a template for enumerated lists is left to the user. +% +% +% \subsubsection{Theorems, lemmas, etc.}\seclabel{Thm} +% +% There exists many perturbations to the theorem environment such +% as, Theorem, Lemma, Exercise, etc., and it is left to the user as +% an exercise to construct his or her own templates. +% +% As an example to add reference for theorems to an exiting setup: +% +% \begin{Ipara} +% |\usepackage{refstyle} |\\ +% |\newref{thm}{ |\\ +% | name = {theorem~}, |\\ +% | names = {theorems~},|\\ +% | Name = {Theorem~}, |\\ +% | Names = {Theorems~},|\\ +% | rngtxt = \RSrngtxt,|\\ +% | lsttwotxt = \RSlsttxt,|\\ +% | lsttxt = \RSlsttxt}| +% \end{Ipara} +% +% If you want to add it to a specific language setup with \pkg{babel} then +% you can do the following, for example for a dual language document with +% English and Norwegian: +% \begin{Ipara} +% |\documentclass[english, norwegian]{article}% NB: Languages as global opts! |\\ +% |\usepackage{babel} %Use global languages |\\ +% |\usepackage{varioref} %Use global languages |\\ +% |\usepackage{refstyle} %Use global languages |\\ +% |\RSaddto{\RSnorwegian}{% |\\ +% | \def\RSthmtxt{teorem~}% |\\ +% | \def\RSthmstxt{teorem~}% |\\ +% | \def\RSThmtxt{Teorem~}% |\\ +% | \def\RSThmstxt{Teorem~}} |\\ +% |\RSaddto{\RSenglish}{% |\\ +% | \def\RSthmtxt{theorem~}% |\\ +% | \def\RSthmstxt{theorems~}% |\\ +% | \def\RSThmtxt{Theorem~}% |\\ +% | \def\RSThmstxt{Theorems~}} |\\ +% |\newref{thm}{ |\\ +% | name = \RSthmtxt, |\\ +% | names = \RSthmstxt, |\\ +% | Name = \RSThmtxt, |\\ +% | Names = \RSThmstxt, |\\ +% | rngtxt = \RSrngtxt, |\\ +% | lsttwotxt = \RSlsttxt, |\\ +% | lsttxt = \RSlsttwotxt} | +% \end{Ipara} +% +% \noindent All \pkg{babel} language changes will then activate +% the proper code setup. In this example the \pkg{refstyle} +% mechanism is used where the code is appended to the |\RSenglish| +% and |\RSnorwegian| container functions. These functions are added +% by the package +% to the \pkg{babel} containers |\extrasenglish| and |\extrasnorwegian|, +% that is called every time a language change occurs. +% Please see the contents of \pkg{refstyle.cfg} for the names of the +% \pkg{refstyle} containers associated with the different languages. +% +% Note that the extended definitions +% can also be added directly to the \pkg{babel} containers without using +% \pkg{refstyle}'s mechanism. +% +% \begin{macrocode} +%</cfg> +% \end{macrocode} +% +% \Finale +\endinput diff --git a/macros/latex/contrib/refstyle/refconfig.pdf b/macros/latex/contrib/refstyle/refconfig.pdf Binary files differindex f4dcb8d15a..c16ae09cca 100644 --- a/macros/latex/contrib/refstyle/refconfig.pdf +++ b/macros/latex/contrib/refstyle/refconfig.pdf diff --git a/macros/latex/contrib/refstyle/refstyle.cfg b/macros/latex/contrib/refstyle/refstyle.cfg deleted file mode 100644 index 2ca7d62dd2..0000000000 --- a/macros/latex/contrib/refstyle/refstyle.cfg +++ /dev/null @@ -1,571 +0,0 @@ -%%
-%% This is file `refstyle.cfg',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% refconfig.dtx (with options: `cfg')
-%%
-%% -------------------------------------------------------------------
-%% The refstyle package
-%% for the formatting of references
-%% -------------------------------------------------------------------
-%% This file may be customized to suit specific user requirements.
-%%
-%% Original by Danie Els <dnjels@sun.ac.za>
-%% -------------------------------------------------------------------
-%%
-\ProvidesFile{refstyle.cfg}[2010/11/02\space
- 0.5\space
- Configuration file for refstyle (DNJ Els)]
-%%-- ENGLISH ------------------------------------
-\newcommand\RSukenglish{%
- \def\RSrngtxt{\space to~}%........... Range: figures 5 to 6
- \def\RSlsttwotxt{\space and~}%....... List two: figures 5 and 6
- \def\RSlsttxt{, and~}%............... List more: figures 5, 6, and 7
- \def\RSparttxt{Part~}%............... Part lowercase singular
- \def\RSpartstxt{Parts~}%............. lowercase plural
- \def\RSParttxt{Part~}%............... uppercase singular (sentence start)
- \def\RSPartstxt{Parts~}%............. uppercase plural (sentence start)
- \def\RSappendixname{appendix~}%...... Appendix lowercase singular
- \def\RSappendicesname{appendices~}%.. lowercase plural
- \def\RSAppendixname{Appendix~}%...... uppercase singular (sentence start)
- \def\RSAppendicesname{Appendices~}%.. uppercase plural (sentence start)
- \def\RSchaptername{chapter~}%........ Chapter lowercase singular
- \def\RSchaptersname{chapters~}%...... lowercase plural
- \def\RSChaptername{Chapter~}%........ uppercase singular (sentence start)
- \def\RSChaptersname{Chapters~}%...... uppercase plural (sentence start)
- \def\RSsectxt{section~}%............. Section lowercase singular
- \def\RSsecstxt{sections~}%........... lowercase plural
- \def\RSSectxt{Section~}%............. uppercase singular (sentence start)
- \def\RSSecstxt{Sections~}%........... uppercase plural (sentence start)
- \def\RSeqtxt{equation~}%............. Equation lowercase singular
- \def\RSeqstxt{equations~}%........... lowercase plural
- \def\RSEqtxt{Equation~}%............. uppercase singular (sentence start)
- \def\RSEqstxt{Equations~}%........... uppercase plural (sentence start)
- \def\RSfigtxt{figure~}%.............. Figure lowercase singular
- \def\RSfigstxt{figures~}%............ lowercase plural
- \def\RSFigtxt{Figure~}%.............. uppercase singular (sentence start)
- \def\RSFigstxt{Figures~}%............ uppercase plural (sentence start)
- \def\RStabtxt{table~}%............... Table lowercase singular
- \def\RStabstxt{tables~}%............. lowercase plural
- \def\RSTabtxt{Table~}%............... uppercase singular (sentence start)
- \def\RSTabstxt{Tables~}%............. uppercase plural (sentence start)
- \def\RSfootntxt{footnote~}%.......... Footnote lowercase singular
- \def\RSfootnstxt{footnotes~}%........ lowercase plural
- \def\RSFootntxt{Footnote~}%.......... uppercase singular (sentence start)
- \def\RSFootnstxt{Footnotes~}%........ uppercase plural (sentence start)
-}
-\newcommand\RSenglish{%
- \def\RSrngtxt{\space to~}%
- \def\RSlsttwotxt{\space and~}%
- \def\RSlsttxt{\space and~}%
- \def\RSparttxt{Part~}%
- \def\RSpartstxt{Parts~}%
- \def\RSParttxt{Part~}%
- \def\RSPartstxt{Parts~}%
- \def\RSappendixname{appendix~}%
- \def\RSappendicesname{appendices~}%
- \def\RSAppendixname{Appendix~}%
- \def\RSAppendicesname{Appendices~}%
- \def\RSchaptername{chapter~}%
- \def\RSchaptersname{chapters~}%
- \def\RSChaptername{Chapter~}%
- \def\RSChaptersname{Chapters~}%
- \def\RSsectxt{section~}%
- \def\RSsecstxt{sections~}%
- \def\RSSectxt{Section~}%
- \def\RSSecstxt{Sections~}%
- \def\RSeqtxt{equation~}%
- \def\RSeqstxt{equations~}%
- \def\RSEqtxt{Equation~}%
- \def\RSEqstxt{Equations~}%
- \def\RSfigtxt{figure~}%
- \def\RSfigstxt{figures~}%
- \def\RSFigtxt{Figure~}%
- \def\RSFigstxt{Figures~}%
- \def\RStabtxt{table~}%
- \def\RStabstxt{tables~}%
- \def\RSTabtxt{Table~}%
- \def\RSTabstxt{Tables~}%
- \def\RSfootntxt{footnote~}%
- \def\RSfootnstxt{footnotes~}%
- \def\RSFootntxt{Footnote~}%
- \def\RSFootnstxt{Footnotes~}%
-}
-\RSenglish% Default
-\DeclareLangOpt{english}{\RSenglish}
-\DeclareLangOpt{USenglish}{\RSenglish}
-\DeclareLangOpt{american}{\RSenglish}
-\DeclareLangOpt{canadian}{\RSenglish}
-\DeclareLangOpt{UKenglish}{\RSukenglish}
-\DeclareLangOpt{british}{\RSukenglish}
-%%-- AFRIKAANS ----------------------------------
-\newcommand\RSafrikaans{%
- \def\RSrngtxt{\space tot~}%
- \def\RSlsttwotxt{\space en~}%
- \def\RSlsttxt{\space en~}%
- \def\RSparttxt{Deel~}%
- \def\RSpartstxt{Dele~}%
- \def\RSParttxt{Deel~}%
- \def\RSPartstxt{Dele~}%
- \def\RSappendixname{bylae~}%
- \def\RSappendicesname{bylaes~}%
- \def\RSAppendixname{Bylae~}%
- \def\RSAppendicesname{Bylaes~}%
- \def\RSchaptername{hoofstuk~}%
- \def\RSchaptersname{hoofstukke~}%
- \def\RSChaptername{Hoofstuk~}%
- \def\RSChaptersname{Hoofstukke~}%
- \def\RSsectxt{afdeling~}%
- \def\RSsecstxt{afdelings~}%
- \def\RSSectxt{Afdeling~}%
- \def\RSSecstxt{Afdelings~}%
- \def\RSeqtxt{vergelyking~}%
- \def\RSeqstxt{vergelykings~}%
- \def\RSEqtxt{Vergelyking~}%
- \def\RSEqstxt{Vergelyking~}%
- \def\RSfigtxt{figuur~}%
- \def\RSfigstxt{figure~}%
- \def\RSFigtxt{Figuur~}%
- \def\RSFigstxt{Figure~}%
- \def\RStabtxt{tabel~}%
- \def\RStabstxt{tabelle~}%
- \def\RSTabtxt{Tabel~}%
- \def\RSTabstxt{Tabelle~}%
- \def\RSfootntxt{footnota~}%
- \def\RSfootnstxt{footnotas~}%
- \def\RSFootntxt{Footnota~}%
- \def\RSFootnstxt{Footnotas~}%
-}
-\DeclareLangOpt{afrikaans}{\RSafrikaans}
-%%-- DANISH -------------------------------------
-\newcommand\RSdanish{%
- \def\RSrngtxt{\space til~}%
- \def\RSlsttwotxt{\space og~}%
- \def\RSlsttxt{\space og~}%
- \def\RSparttxt{del~}%
- \def\RSpartstxt{del~}%
- \def\RSParttxt{Del~}%
- \def\RSPartstxt{Del~}%
- \def\RSappendixname{bilag~}% % 'appendiks' is also possible,
- \def\RSappendicesname{bilag~}% % but 'bilag' is used in Babel
- \def\RSAppendixname{Bilag~}%
- \def\RSAppendicesname{Bilag~}%
- \def\RSchaptername{kapitel~}%
- \def\RSchaptersname{kapitel~}%
- \def\RSChaptername{Kapitel~}%
- \def\RSChaptersname{Kapitel~}%
- \def\RSsectxt{afsnit~}%
- \def\RSsecstxt{afsnit~}%
- \def\RSSectxt{Afsnit~}%
- \def\RSSecstxt{Afsnit~}%
- \def\RSeqtxt{ligning~}%
- \def\RSeqstxt{ligning~}%
- \def\RSEqtxt{Ligning~}%
- \def\RSEqstxt{Ligning~}%
- \def\RSfigtxt{figur~}%
- \def\RSfigstxt{figur~}%
- \def\RSFigtxt{Figur~}%
- \def\RSFigstxt{Figur~}%
- \def\RStabtxt{tabel~}%
- \def\RStabstxt{tablel~}%
- \def\RSTabtxt{Tabel~}%
- \def\RSTabstxt{Tabel~}%
- \def\RSfootntxt{fodnote~}%
- \def\RSfootnstxt{fodnote~}%
- \def\RSFootntxt{Fodnote~}%
- \def\RSFootnstxt{Fodnote~}%
-}
-\DeclareLangOpt{danish}{\RSdanish}
-%%-- FRENCH -------------------------------------
-\newcommand\RSfrench{%
- \def\RSrngtxt{\space \`{a}~}%
- \def\RSlsttwotxt{\space et~}%
- \def\RSlsttxt{\space et~}%
- \def\RSparttxt{partie~}%
- \def\RSpartstxt{parties~}%
- \def\RSParttxt{La partie~}%
- \def\RSPartstxt{Les parties~}%
- \def\RSappendixname{appendice~}%
- \def\RSappendicesname{appendices~}%
- \def\RSAppendixname{L'appendice~}%
- \def\RSAppendicesname{Les appendices~}%
- \def\RSchaptername{chapitre~}%
- \def\RSchaptersname{chapitres~}%
- \def\RSChaptername{Le chapitre~}%
- \def\RSChaptersname{Les chapitres~}%
- \def\RSsectxt{section~}%
- \def\RSsecstxt{sections~}%
- \def\RSSectxt{La section~}%
- \def\RSSecstxt{Les sections~}%
- \def\RSeqtxt{\'{e}quation~}%
- \def\RSeqstxt{\'{e}quations~}%
- \def\RSEqtxt{L'\'{e}quation~}%
- \def\RSEqstxt{Les \'{e}quations~}%
- \def\RSfigtxt{figure~}%
- \def\RSfigstxt{figures~}%
- \def\RSFigtxt{La figure~}%
- \def\RSFigstxt{Les figures~}%
- \def\RStabtxt{tableau~}%
- \def\RStabstxt{tableaux~}%
- \def\RSTabtxt{Le tableau~}%
- \def\RSTabstxt{Les tableaux~}%
- \def\RSfootntxt{note~}%
- \def\RSfootnstxt{notes~}%
- \def\RSFootntxt{La note~}%
- \def\RSFootnstxt{Les notes~}%
-}
-\DeclareLangOpt{french}{\RSfrench}
-%%-- GERMAN -------------------------------------
-\newcommand\RSgerman{%
- \def\RSrngtxt{\space bis~}%
- \def\RSlsttwotxt{\space und~}%
- \def\RSlsttxt{\space und~}%
- \def\RSparttxt{Teil~}%
- \def\RSpartstxt{Teile~}%
- \def\RSParttxt{Teil~}%
- \def\RSPartstxt{Teile~}%
- \def\RSappendixname{Anhang~}%
- \def\RSappendicesname{Anh\"{a}nge~}%
- \def\RSAppendixname{Anhang~}%
- \def\RSAppendicesname{Anh\"{a}nge~}%
- \def\RSchaptername{Kapitel~}%
- \def\RSchaptersname{Kapitel~}%
- \def\RSChaptername{Kapitel~}%
- \def\RSChaptersname{Kapitel~}%
- \def\RSsectxt{Abschnitt~}%
- \def\RSsecstxt{Abschnitt~}%
- \def\RSSectxt{Abschnitt~}%
- \def\RSSecstxt{Abschnitt~}%
- \def\RSeqtxt{Gleichung~}%
- \def\RSeqstxt{Gleichungen~}%
- \def\RSEqtxt{Gleichung~}%
- \def\RSEqstxt{Gleichungen~}%
- \def\RSfigtxt{Abbildung~}%
- \def\RSfigstxt{Abbildung~}%
- \def\RSFigtxt{Abbildung~}%
- \def\RSFigstxt{Abbildung~}%
- \def\RStabtxt{Tabelle~}%
- \def\RStabstxt{Tabellen~}%
- \def\RSTabtxt{Tabelle~}%
- \def\RSTabstxt{Tabellen~}%
- \def\RSfootntxt{Fu\ss note~}%
- \def\RSfootnstxt{Fu\ss noten~}%
- \def\RSFootntxt{Fu\ss note~}%
- \def\RSFootnstxt{Fu\ss noten~}%
-}
-\DeclareLangOpt{german}{\RSgerman}
-\DeclareLangOpt{ngerman}{\RSgerman}
-\DeclareLangOpt{austrian}{\RSgerman}
-\DeclareLangOpt{naustrian}{\RSgerman}
-%%-- ITALIAN ------------------------------------
-\newcommand\RSitalian{%
- \def\RSrngtxt{--}%
- \def\RSlsttwotxt{\space e~}%
- \def\RSlsttxt{\space e~}%
- \def\RSparttxt{Parte~}%
- \def\RSpartstxt{Parti~}%
- \def\RSParttxt{Parte~}%
- \def\RSPartstxt{Parti~}%
- \def\RSappendixname{l'appendice~}%
- \def\RSappendicesname{le appendici~}%
- \def\RSAppendixname{l'Appendice~}%
- \def\RSAppendicesname{le Appendici~}%
- \def\RSchaptername{il capitolo~}%
- \def\RSchaptersname{i capitoli~}%
- \def\RSChaptername{il Capitolo~}%
- \def\RSChaptersname{i Capitoli~}%
- \def\RSsectxt{la sezione~}%
- \def\RSsecstxt{le sezioni~}%
- \def\RSSectxt{la Sezione~}%
- \def\RSSecstxt{la Sezioni~}%
- \def\RSeqtxt{l'equazione~}%
- \def\RSeqstxt{le equazioni~}%
- \def\RSEqtxt{l'Equazione~}%
- \def\RSEqstxt{le Equazioni~}%
- \def\RSfigtxt{la figura~}%
- \def\RSfigstxt{le figure~}%
- \def\RSFigtxt{la Figura~}%
- \def\RSFigstxt{le Figure~}%
- \def\RStabtxt{la tabella~}%
- \def\RStabstxt{le tabelle~}%
- \def\RSTabtxt{la Tabella~}%
- \def\RSTabstxt{le Tabelle~}%
- \def\RSfootntxt{la nota~}%
- \def\RSfootnstxt{le note~}%
- \def\RSFootntxt{la Nota~}%
- \def\RSFootnstxt{le Note~}%
-}
-\DeclareLangOpt{italian}{\RSitalian}
-%%-- NORWEGIAN -------------------------------------
-\newcommand\RSnorwegian{%
- \def\RSrngtxt{\space til~}%
- \def\RSlsttwotxt{\space og~}%
- \def\RSlsttxt{\space og~}%
- \def\RSparttxt{del~}%
- \def\RSpartstxt{del~}%
- \def\RSParttxt{Del~}%
- \def\RSPartstxt{Del~}%
- \def\RSappendixname{tillegg~}%
- \def\RSappendicesname{tillegg~}%
- \def\RSAppendixname{Tillegg~}%
- \def\RSAppendicesname{Tillegg~}%
- \def\RSchaptername{kapittel~}%
- \def\RSchaptersname{kapittel~}%
- \def\RSChaptername{Kapittel~}%
- \def\RSChaptersname{Kapittel~}%
- \def\RSsectxt{avsnitt~}%
- \def\RSsecstxt{avsnitt~}%
- \def\RSSectxt{Avsnitt~}%
- \def\RSSecstxt{Avsnitt~}%
- \def\RSeqtxt{formel~}%
- \def\RSeqstxt{formel~}%
- \def\RSEqtxt{Formel~}%
- \def\RSEqstxt{Formel~}%
- \def\RSfigtxt{figur~}%
- \def\RSfigstxt{figur~}%
- \def\RSFigtxt{Figur~}%
- \def\RSFigstxt{Figur~}%
- \def\RStabtxt{tabell~}%
- \def\RStabstxt{tabell~}%
- \def\RSTabtxt{Tabell~}%
- \def\RSTabstxt{Tabell~}%
- \def\RSfootntxt{fotnote~}%
- \def\RSfootnstxt{fotnote~}%
- \def\RSFootntxt{Fotnote~}%
- \def\RSFootnstxt{Fotnote~}%
-}
-\DeclareLangOpt{norwegian}{\RSnorwegian}
-\DeclareLangOpt{nynorsk}{\RSnorwegian}
-\DeclareLangOpt{bokmal}{\RSnorwegian}% Not in babel yet
-\DeclareLangOpt{norsk}{\RSnorwegian}
-%%-- PORTUGUESE -----------------------------------
-\newcommand\RSportuguese{%
- \def\RSrngtxt{\space a~}%
- \def\RSlsttwotxt{\space e~}%
- \def\RSlsttxt{\space e~}%
- \def\RSparttxt{Parte~}%
- \def\RSpartstxt{Partes~}%
- \def\RSParttxt{Parte~}%
- \def\RSPartstxt{Partes~}%
- \def\RSappendixname{ap\^{e}ndice~}%
- \def\RSappendicesname{ap\^{e}ndices~}%
- \def\RSAppendixname{Ap\^{e}ndice~}%
- \def\RSAppendicesname{Ap\^{e}ndices~}%
- \def\RSchaptername{cap\'{i}tulo~}%
- \def\RSchaptersname{cap\'{i}tulos~}%
- \def\RSChaptername{Cap\'{i}tulo~}%
- \def\RSChaptersname{Cap\'{i}tulos~}%
- \def\RSsectxt{se\c{c}\~{a}o~}%
- \def\RSsecstxt{se\c{c}\~{o}es~}%
- \def\RSSectxt{Se\c{c}\~{a}o~}%
- \def\RSSecstxt{Se\c{c}\~{o}es~}%
- \def\RSeqtxt{equa\c{c}\~{a}o~}%
- \def\RSeqstxt{equa\c{c}\~{o}es~}%
- \def\RSEqtxt{Equa\c{c}\~{a}o~}%
- \def\RSEqstxt{Equa\c{c}\~{o}es~}%
- \def\RSfigtxt{figura~}%
- \def\RSfigstxt{figuras~}%
- \def\RSFigtxt{Figura~}%
- \def\RSFigstxt{Figuras~}%
- \def\RStabtxt{tabela~}%
- \def\RStabstxt{tabelas~}%
- \def\RSTabtxt{Tabela~}%
- \def\RSTabstxt{Tabelas~}%
- \def\RSfootntxt{nota de rodap\'{e}~}%
- \def\RSfootnstxt{notas de rodap\'{e}~}%
- \def\RSFootntxt{Nota de rodap\'{e}~}%
- \def\RSFootnstxt{Notas de rodap\'{e}~}%
-}
-\newcommand\RSbrazilian{%
- \def\RSrngtxt{\space a~}%
- \def\RSlsttwotxt{\space e~}%
- \def\RSlsttxt{\space e~}%
- \def\RSparttxt{Parte~}%
- \def\RSpartstxt{Partes~}%
- \def\RSParttxt{Parte~}%
- \def\RSPartstxt{Partes~}%
- \def\RSappendixname{ap\^{e}ndice~}%
- \def\RSappendicesname{ap\^{e}ndices~}%
- \def\RSAppendixname{Ap\^{e}ndice~}%
- \def\RSAppendicesname{Ap\^{e}ndices~}%
- \def\RSchaptername{cap\'{i}tulo~}%
- \def\RSchaptersname{cap\'{i}tulos~}%
- \def\RSChaptername{Cap\'{i}tulo~}%
- \def\RSChaptersname{Cap\'{i}tulos~}%
- \def\RSsectxt{sec\c{c}\~{a}o~}%<---------------
- \def\RSsecstxt{sec\c{c}\~{o}es~}%<-------------
- \def\RSSectxt{Sec\c{c}\~{a}o~}%<---------------
- \def\RSSecstxt{Sec\c{c}\~{o}es~}%<-------------
- \def\RSeqtxt{equa\c{c}\~{a}o~}%
- \def\RSeqstxt{equa\c{c}\~{o}es~}%
- \def\RSEqtxt{Equa\c{c}\~{a}o~}%
- \def\RSEqstxt{Equa\c{c}\~{o}es~}%
- \def\RSfigtxt{figura~}%
- \def\RSfigstxt{figuras~}%
- \def\RSFigtxt{Figura~}%
- \def\RSFigstxt{Figuras~}%
- \def\RStabtxt{tabela~}%
- \def\RStabstxt{tabelas~}%
- \def\RSTabtxt{Tabela~}%
- \def\RSTabstxt{Tabelas~}%
- \def\RSfootntxt{nota de rodap\'{e}~}%
- \def\RSfootnstxt{notas de rodap\'{e}~}%
- \def\RSFootntxt{Nota de rodap\'{e}~}%
- \def\RSFootnstxt{Notas de rodap\'{e}~}%
-}
-\DeclareLangOpt{portuges}{\RSportuguese}
-\DeclareLangOpt{portuguese}{\RSportuguese}
-\DeclareLangOpt{brazilian}{\RSbrazilian}
-\DeclareLangOpt{brazil}{\RSbrazilian}
-%%-- SWEDISH ------------------------------------
-\newcommand\RSswedish{%
- \def\RSrngtxt{\space till~}%
- \def\RSlsttwotxt{\space och~}%
- \def\RSlsttxt{\space och~}%
- \def\RSparttxt{del~}%
- \def\RSpartstxt{del~}%
- \def\RSParttxt{Del~}%
- \def\RSPartstxt{Del~}%
- \def\RSappendixname{appendix~}%
- \def\RSappendicesname{appendix~}%
- \def\RSAppendixname{Appendix~}%
- \def\RSAppendicesname{Appendix~}%
- \def\RSchaptername{kapitel~}%
- \def\RSchaptersname{kapitel~}%
- \def\RSChaptername{Kapitel~}%
- \def\RSChaptersname{Kapitel~}%
- \def\RSsectxt{sektion~}%
- \def\RSsecstxt{sektion~}%
- \def\RSSectxt{Sektion~}%
- \def\RSSecstxt{Sektion~}%
- \def\RSeqtxt{ekvation~}%
- \def\RSeqstxt{ekvation~}%
- \def\RSEqtxt{Ekvation~}%
- \def\RSEqstxt{Ekvation~}%
- \def\RSfigtxt{figur~}%
- \def\RSfigstxt{figur~}%
- \def\RSFigtxt{Figur~}%
- \def\RSFigstxt{Figur~}%
- \def\RStabtxt{tabell~}%
- \def\RStabstxt{tabell~}%
- \def\RSTabtxt{Tabell~}%
- \def\RSTabstxt{Tabell~}%
- \def\RSfootntxt{fotnot~}%
- \def\RSfootnstxt{fotnot~}%
- \def\RSFootntxt{Fotnot~}%
- \def\RSFootnstxt{Fotnot~}%
-}
-\DeclareLangOpt{swedish}{\RSswedish}
-%%-- TEMPLATE FOR PARTS -------------------------
- \newref{part}{%
- name = \RSparttxt,
- names = \RSpartstxt,
- Name = \RSPparttxt,
- Names = \RSPartstxt,
- rngtxt = \RSrngtxt,
- lsttxt = \RSlsttxt}
-%%-- TEMPLATE FOR CHAPTERS & APPENDIXES ---------
-\providecommand*{\p@chapter}{}
-\AtBeginDocument{%
- \RS@ifundefined{chapter}{}{%
- \RS@ifundefined{@chapapp}%
- {\renewcommand*{\p@chapter}{\string\chpname{\chaptername}}}%AMS
- {\renewcommand*{\p@chapter}{\string\chpname{\@chapapp}}}% Normal
- }%
- }
-\newcommand*{\chpname}[1]{}
-\newcommand*{\RS@chpname}[1]{%
- \ifRSnameon
- \edef\RS@tmpa{#1}%
- \edef\RS@tmpb{\appendixname}%
- \ifx\RS@tmpa\RS@tmpb\relax%
- \ifRSplural
- \ifRScapname \RSAppendicesname \else \RSappendicesname \fi
- \else
- \ifRScapname \RSAppendixname \else \RSappendixname \fi
- \fi
- \else
- \ifRSplural
- \ifRScapname \RSChaptersname \else \RSchaptersname \fi
- \else
- \ifRScapname \RSChaptername \else \RSchaptername \fi
- \fi
- \fi
- \fi}
- \newref{chap}{%
- refcmd = {{\let\chpname=\RS@chpname\ref{#1}}},
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-%%-- TEMPLATE FOR SECTIONS ----------------------
- \newref{sec}{%
- name = \RSsectxt,
- names = \RSsecstxt,
- Name = \RSSectxt,
- Names = \RSSecstxt,
- refcmd = {\S\ref{#1}},
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-%%-- TEMPLATE FOR EQUATIONS ---------------------
-\newcommand*{\RSeqrefform}[1]{\textup{(\ref{#1})}}
-\@ifpackageloaded{amsmath}%
- {\let\AMSeqref\eqref
- \let\eqref\relax}%
- {}
-\newref{eq}{%
- name = \RSeqtxt,
- names = \RSeqstxt,
- Name = \RSEqtxt,
- Names = \RSEqstxt,
- refcmd = \RSeqrefform{#1},
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-\let\RSeqref\eqref
-\let\eqref\relax
-\AtBeginDocument{%
- \@ifpackageloaded{amsmath}%
- {\RS@ifundefined{AMSeqref}{\let\AMSeqref\eqref}{}%
- \let\RSeqrefform\AMSeqref}%
- {}%
- \let\eqref=\RSeqref
- }
-%%-- TEMPLATE FOR FIGURES -----------------------
- \newref{fig}{%
- name = \RSfigtxt,
- names = \RSfigstxt,
- Name = \RSFigtxt,
- Names = \RSFigstxt,
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-%%-- TEMPLATE FOR TABLES ------------------------
- \newref{tab}{%
- name = \RStabtxt,
- names = \RStabstxt,
- Name = \RSTabtxt,
- Names = \RSTabstxt,
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-%%-- TEMPLATE FOR FOOTNOTES ---------------------
- \newcommand{\RSfnmark}[1]{%
- \begingroup
- \unrestored@protected@xdef\@thefnmark{\ref{#1}}%
- \endgroup
- \@footnotemark}
- \newref{fn}{%
- name = \RSfootntxt,
- names = \RSfootnstxt,
- Name = \RSFootntxt,
- Names = \RSFootnstxt,
- refcmd = {\ifRSstar\RSfnmark{#1}\else(\ref{#1})\fi},
- rngtxt = \RSrngtxt,
- lsttwotxt = \RSlsttwotxt,
- lsttxt = \RSlsttxt}
-\endinput
-%%
-%% End of file `refstyle.cfg'.
diff --git a/macros/latex/contrib/refstyle/refstyle.dtx b/macros/latex/contrib/refstyle/refstyle.dtx index c2c3acab8e..1b5b6509d6 100644 --- a/macros/latex/contrib/refstyle/refstyle.dtx +++ b/macros/latex/contrib/refstyle/refstyle.dtx @@ -1,1796 +1,1795 @@ -% \iffalse
-%
-% refstyle.dtx
-% Copyright (C) 2002--2010 Danie Els
-%
-% -------------------------------------------------------------------
-% The refstyle package
-% for the formatting of references
-% -------------------------------------------------------------------
-% This work may be distributed and/or modified under the conditions
-% of the LaTeX Project Public License, either version 1.3c of this
-% license or (at your option) any later version. The latest version
-% of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work is "maintained" (as per LPPL maintenance status)
-% by Danie Els (dnjels@sun.ac.za).
-%
-% This package consists of the files: refstyle.dtx
-% refconfig.dtx
-% refstyle.ins
-% and the derived files: refstyle.sty
-% refstyle.cfg
-% -------------------------------------------------------------------
-%
-%<*pkg>
-\newcommand*{\RefstyleFileDate}{2010/11/02}
-\newcommand*{\RefstyleFileVersion}{v0.5}
-%</pkg>
-%
-%
-%<*driver>
-\documentclass[a4paper]{ltxdoc}
-\let\RefstyleFileDate\relax
-\let\RefstyleFileVersion\relax
-\usepackage{amsmath}
-\usepackage{amsfonts}
- \DeclareMathSymbol{\square} {\mathord}{AMSa}{"03}
- \DeclareMathSymbol{\blacksquare}{\mathord}{AMSa}{"04}
-\usepackage{calc}
-\usepackage{rotating}
-\usepackage[rounded]{syntax}
-\usepackage{varioref}
-\usepackage{refstyle}
-\usepackage{color}
- \definecolor{hrefcol}{rgb}{0.00,0.00,1.00}
-\usepackage[pdfpagelabels]{hyperref}
-\hypersetup{breaklinks=true,
- linktocpage,
- pdfstartview=FitH,
- colorlinks = true,
- linkcolor = hrefcol,
- urlcolor = hrefcol,
- menucolor = hrefcol,
- filecolor = hrefcol,
- citecolor = hrefcol,
- linkbordercolor = {0.8 0.8 0.8},
- urlbordercolor = {0.8 0.8 0.8},
- menubordercolor = {0.8 0.8 0.8},
- filebordercolor = {0.8 0.8 0.8},
- runbordercolor = {0.8 0.8 0.8},
- citebordercolor = {0.8 0.8 0.8},
- pdftitle={refstyle},
- pdfauthor={Danie Els}}
-
-%---- macrocode env changes -------------------------------
-
-\setlength{\MacroIndent}{1.5em}
-
-%---- Scratches -------------------------------------------
-
-\newlength{\tdima}
-\newsavebox{\tboxa}
-
-%---- Spacing ---------------------------------------------
-
-\newlength{\myskip}
-\setlength{\myskip}{\topsep}
- \addtolength{\myskip}{\parskip}
- \addtolength{\myskip}{\partopsep}
-\newcommand*{\blankline}{\par\addvspace{\myskip}}
-\newlength{\mytab}
-\setlength{\mytab}{2\parindent}
-\newcommand{\tab}{\hspace*{\mytab}}
-
-%---- Indented environments -------------------------------
-
-\newenvironment{IndentPara}[1][1]
- {\list{}{\setlength{\leftmargin}{#1\mytab}%
- \setlength{\labelwidth}{0pt}%
- \setlength{\labelsep}{0pt}%
- \setlength{\itemindent}{\parindent}%
- \setlength{\listparindent}{\parindent}%
- }\item[]}%
- {\endlist}
-\newenvironment{IndentParaX}[1][1]
- {\list{}{\setlength{\leftmargin}{#1\mytab}%
- \setlength{\topsep}{0pt}%
- \setlength{\partopsep}{0pt}%
- \setlength{\labelwidth}{0pt}%
- \setlength{\labelsep}{0pt}%
- \setlength{\itemindent}{\parindent}%
- \setlength{\listparindent}{\parindent}%
- }\item[]}%
- {\endlist}
-\newcommand\bNP{\begin{IndentParaX}}
-\newcommand\eNP{\end{IndentParaX}}
-\newenvironment{Ipara}[1][\small]%
- {\begin{IndentPara}\noindent#1\ignorespaces}%
- {\end{IndentPara}}
-\newenvironment{Itabb}[1][\small]%
- {\begin{IndentPara}#1\ignorespaces\begin{tabbing}\ignorespaces}%
- {\end{tabbing}\end{IndentPara}}
-
-%---- Ruled & colored minipage ----------------------------
-
-\definecolor{shadecolor}{gray}{0.9}
-
-\newenvironment{fminipage}[1][\linewidth]
- {\setlength{\tdima}{#1-2\fboxsep-2\fboxrule}%
- \begin{lrbox}{\tboxa}\begin{minipage}{\tdima}}%
- {\end{minipage}\end{lrbox}\noindent\fbox{\usebox{\tboxa}}}
-\newenvironment{cminipage}[1][\linewidth]
- {\setlength{\tdima}{#1-2\fboxsep-2\fboxrule}%
- \begin{lrbox}{\tboxa}\begin{minipage}{\tdima}}%
- {\end{minipage}\end{lrbox}%
- \noindent\colorbox{shadecolor}{\usebox{\tboxa}}}
-
-%---- Additional documenting commands ---------------------
-
-\def\lcbrack{\symbol{`\{}}
-\def\rcbrack{\symbol{`\}}}
-\makeatletter
-\def\meta@font@select{\normalfont\slshape}
-\makeatother
-\DeclareRobustCommand{\cmeta}[1]{%<- \<xxx>
- \texttt{\bslash}\meta{#1}}
-\DeclareRobustCommand{\cmarg}[1]{%<- {\<xxx>}
- \texttt{\lcbrack}\cmeta{#1}\texttt{\rcbrack}}
-\DeclareRobustCommand{\coarg}[1]{%<- [\<xxx>]
- \texttt{[}\cmeta{#1}\texttt{]}}
-\DeclareRobustCommand{\argcmd}[2]{%<- \<xxx>yyy
- \cmeta{#1}\texttt{#2}}
-\newcommand{\rmeta}[3][]{%
- \texttt{\lcbrack#1}\meta{#2}\texttt{#3\rcbrack}}
-\newcommand{\refmeta}[3][]{\cmd{\brref}\rmeta[#1]{#2}{#3}}
-
-\newcommand*{\file}[1]{\texttt{#1}}
-\newcommand*{\pkg}[1]{\textsf{#1}}
-\newcommand*{\env}[1]{\texttt{#1}}
-\newcommand*{\opt}[1]{\texorpdfstring{\normalfont\texttt{\slshape#1}}{#1}}
-\newcommand*{\RS}{\pkg{refstyle}}
-\newcommand*{\RScfg}{\file{refstyle.cfg}}
-\newcommand*{\rtp}{type}
-\newcommand*{\Rtp}{Type}
-\newcommand*{\okeylst}{\oarg{key\_lst}}
-\newcommand*{\mkeylst}{\marg{key\_lst}}
-
-%---- Special eq tag command ------------------------------
-
-\def\spestag#1{\stepcounter{equation}%
- \gdef\tagextra##1{%
- \makebox[0pt][l]{\small\quad%
- \cmd{\eqlabel}\texttt{\lcbrack##1\rcbrack}}%
- \gdef\tagextra####1{}}%
- \tag{\theequation\tagextra{#1}}\eqlabel{#1}}
-
-%---- other stuff -----------------------------------------
-
-\newcommand*{\ArTab}{\>\quad$\rightarrow$\quad}
-
-%----------------------------------------------------------
-
-\EnableCrossrefs
-\CodelineIndex
-\RecordChanges
-\setlength\hfuzz{15pt}
-\hbadness=7000
-\begin{document}
- \DocInput{refstyle.dtx}
-\end{document}
-
-%</driver>
-% \fi
-%
-% \CheckSum{552}
-%
-% \CharacterTable
-% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-% Digits \0\1\2\3\4\5\6\7\8\9
-% Exclamation \! Double quote \" Hash (number) \#
-% Dollar \$ Percent \% Ampersand \&
-% Acute accent \' Left paren \( Right paren \)
-% Asterisk \* Plus \+ Comma \,
-% Minus \- Point \. Solidus \/
-% Colon \: Semicolon \; Less than \<
-% Equals \= Greater than \> Question mark \?
-% Commercial at \@ Left bracket \[ Backslash \\
-% Right bracket \] Circumflex \^ Underscore \_
-% Grave accent \` Left brace \{ Vertical bar \|
-% Right brace \} Tilde \~}
-%
-% \changes{v0.0}{2002/12/01}{Initial version}
-% \changes{v0.1}{2003/04/01}{First stable version}
-% \changes{v0.2}{2003/07/30}{First updated version}
-% \changes{v0.3}{2006/09/09}{Documentation update}
-% \changes{v0.4}{2010/10/21}{Documentation update}
-% \changes{v0.4}{2010/10/21}{Add \texttt{nokeyprefix} option}
-% \changes{v0.5}{2010/11/02}{Documentation update}
-%
-% \DoNotIndex{
-% \@backslashchar, \@carcube, \@ehc, \@empty, \@firstoftwo,
-% \@ifnextchar, \@ifpackageloaded, \@ifstar, \@ifundefined, \@nil,
-% \@qend, \@qrelax, \@secondoftwo, \@tempa, \@undefined,
-% \AtEndOfPackage, \begingroup, \csname, \CurrentOption,
-% \DeclareOption, \def, \edef, \else, \endcsname, \endgroup,
-% \expandafter, \fi, \gdef, \iffalse, \ifx, \InputIfFileExists,
-% \let, \long, \lowercase, \MakeLowercase, \mbox, \MessageBreak,
-% \NeedsTeXFormat, \newcommand, \newif, \noexpand, \PackageError, \PackageInfo,
-% \PassOptionsToPackage, \RS@pkgname, \ProcessOptions, \protect,
-% \providecommand, \ProvidesPackage, \relax, \renewcommand,
-% \RequirePackage, \reserved@a, \reserved@b, \RS@tmpa,
-% \RS@tmpb, \S, \RS@setkeys, \space, \string, \textsc, \textup,
-% \unrestored@protected@xdef, \unskip, \uppercase,
-% \zap@space}
-%
-%^^A==== Titling ==========================================
-% \GetFileInfo{refstyle.sty}
-% \title{\vspace*{-1cm}
-% The \RS\ package\thanks{This file has version number
-% \fileversion, last revised
-% \filedate.}}
-% \author{Danie Els\\[1ex]
-% \small Department of Mechanical and Mechatronics Engineering\\
-% \small University of Stellenbosch, South Africa.\\
-% \normalsize e-mail: \texttt{\href{mailto:dnjels@sun.ac.za}%
-% {dnjels@sun.ac.za}}}
-% \date{\filedate}
-% \maketitle
-% \begin{center}
-% \textbf{Overview of the \RS\ package}
-% \end{center}
-% \noindent
-% When writing complex documents, often a large number of commands
-% for different type of references are defined, for example:
-% \begin{Ipara}
-% |\newcommand*{\eqref}[1]{eqn~(\ref{#1})}|\\
-% |\newcommand*{\Eqref}[1]{Equation~(\ref{#1})}|
-% \end{Ipara}
-% The \RS\ package was developed to automate this process. The
-% package provides a user interface to define sets of reference
-% and label commands for each referable object such as an equation
-% or a table, etc. When you declare, for example, a set of
-% reference commands to an equation:
-% \begin{Ipara}
-% \cmd{\newref}|{eq}|\mkeylst\
-% \end{Ipara}
-% \noindent
-% a series of commands of the format \cmd{\eq...} and \cmd{\Eq...}
-% are produced. The configuration options are set with a list of
-% key-values. Prefixes, inserts and other options for all the
-% different perturbations such as capitalized first letters,
-% singular and plural from, etc.\ can be defined. The
-% configuration can be changed temporarily with an optional list
-% of key-values when the commands are used. A direct interface to
-% the \pkg{varioref} package is also provided.
-% This enables compact reference formats:
-% \begin{Itabb}
-% \hspace{14em}\=\kill
-% |\eqref{e1} ...| \ArTab\eqref{e1} ...\\
-% |\Eqref[vref]{e1} ...| \ArTab\Eqref[vref]{e1} ...\\
-% |\eqref[s]{e1} and ...| \ArTab\eqref[s]{e1} and ...\\
-% |\eqref[name=eq.~]{e1} ...| \ArTab\eqref[name=eq.~]{e1} ...
-% \end{Itabb}
-% A range or a list of references can also be referred to in a
-% consistent way.
-% \begin{Itabb}
-% \hspace{14em}\=\kill
-% |\eqref{e1,e2,e3} ...| \ArTab\eqref{e1,e2,e3} ...\\
-% |\eqrangeref[vref]{e1}{e3} ...| \ArTab\eqrangeref[vref]{e1}{e3} ...
-% \end{Itabb}
-%
-% Templates for the different reference types and different
-% languages can be loaded with a configuring file.
-%
-% The package is aimed at large projects, enabling a consistent
-% way of producing references throughout a project. Enough
-% flexibility is provided to make local changes to a single
-% reference. For large projects such as a series of books or a
-% multi volume thesis, written as freestanding documents, a
-% facility is provided to interface to the \pkg{xr} package for
-% external document references.
-%
-% \medskip
-%
-% \begin{center}
-% \begin{fminipage}[.6\textwidth]
-% See also \pkg{refconfig.pdf} for setup and examples.
-% \end{fminipage}
-% \end{center}
-
-% \clearpage
-%
-% \tableofcontents
-% \clearpage
-%
-%
-% \section{Loading the \RS\ Package}
-%
-% \subsection{Document preamble}
-%
-% The \RS\ package is loaded in the preamble of the document:
-% \begin{enumerate}
-% \item[(a)] With a config file with \pkg{babel} language support
-% \begin{Ipara}
-% |\usepackage{varioref}[2001/09/04]%|~
-% ${\leftarrow}$ To use the \opt{vref} option\\
-% |\usepackage{refstyle}|
-% \end{Ipara}
-% When the package is loaded, it first searchers for a local user defined
-% configuration file \file{refstyle.def}. If it is not available it
-% looks for the global default config file \RScfg\ provided with this package.
-% These configuration files are loaded before the package options are precess.
-% It can therefore contain option commands using globally defined language
-% options and can interface to \pkg{babel} for language changes. The macro
-% \begin{Ipara}
-% |\DeclareLangOpt{|\meta{language}|}{|\meta{definitions}|}|
-% \end{Ipara}
-% is provided to declare the package option \meta{language} and add
-% \meta{definitions} to the |\extras|\meta{language} token for \pkg{babel}.
-% It can only be used inside \RScfg\ or \file{refstyle.def}.
-%
-% \item[(b)]
-% Or with an existing configuration with language support and addition
-% of your own extensions
-% \begin{Ipara}
-% |\documentclass[norwegian]{article}|\\
-% |\usepackage{babel} |\\
-% |\usepackage{refstyle} |\\
-% |\RSaddto{\RSnorwegian}{% |\\
-% | \def\RSthmtxt{teorem~}% |\\
-% | \def\RSthmstxt{teorem~}% |\\
-% | \def\RSThmtxt{Teorem~}% |\\
-% | \def\RSThmstxt{Teorem~}} |\\
-% |\newref{thm}{ |\\
-% | name = \RSthmtxt, |\\
-% | names = \RSthmstxt, |\\
-% | Name = \RSThmtxt, |\\
-% | Names = \RSThmstxt, |\\
-% | rngtxt = \RSrngtxt, |\\
-% | lsttxt = \RSlsttxt, |\\
-% | lsttwotxt = \RSlsttwotxt} |
-% \end{Ipara}
-%
-% \item[(c)]
-% Or without any configuration file, but by declaring your own
-% reference commands in the preamble.
-% \begin{Itabb}
-% \cmd{\usepackage}|[noconfig]{refstyle}|\\
-% \qquad\cmd{\newref}\marg{reftype$_{\,1}$}\mkeylst \\
-% \qquad\cmd{\newref}\marg{reftype$_{\,2}$}\mkeylst\\
-% \tab$\vdots$
-% \end{Itabb}
-%
-% \item[(d)]
-% Or with your own configuration file (without babel language support) for a specific project:
-% \begin{Itabb}
-% |\usepackage[noconfig]{refstyle}|\\
-% |\input{thisproject.ref}|
-% \end{Itabb}
-%
-% \end{enumerate}
-%
-% \subsection{Package options}
-%
-% \begin{description}
-% \item[\opt{noconfig}] Neither of the user supplied \file{refstyle.def} config
-% file or \file{refstyle.cfg} the config file supplied with this package
-% are loaded. The user must declare his or her own definitions and templates.
-% Note that these definitions are not passed on to \pkg{babel}'s language
-% changing mechanisms.
-%
-% \item[\opt{nokeyprefix}] Custom labeling commands \argcmd{\rtp}{label} are generated
-% by \pkg{refstyle} for every \meta{type} definition. It defaults to
-% \begin{Itabb}
-% \hspace{5em}\=hspace{5em}\=\kill
-% \argcmd{\rtp}{label}|{abc}|
-% \>\>~ $\rightarrow$ \cmd{\label}\rmeta{type\,:\,}{abc}
-% \end{Itabb}
-% With the \opt{nokeyprefix} option, the prefix is turned of and the
-% labeling commands defaults to
-% \begin{Itabb}
-% \hspace{5em}\=hspace{5em}\=\kill
-% \argcmd{\rtp}{label}|{abc}|
-% \>\>~ $\rightarrow$ \cmd{\label}|{abc}|
-% \end{Itabb}
-% This is useful for old documents with existing labeling commands or
-% where the user prefer not to use the \argcmd{\rtp}{label} commands.
-%
-%
-% \end{description}
-%
-%
-%
-%
-% \subsection{Companion packages}
-%
-% The \RS\ packages is intended for large projects. It is therefore
-% important that it works together with, or has direct interfaces
-% to the following packages:
-% \begin{description}
-% \item[\pkg{varioref}:\footnotemark]
-% \footnotetext{\pkg{varioref} v1.3c, 2001/09/04 or later,
-% because the starred versions of the commands
-% are used.}
-% Produce sophisticated page and page range references.
-%
-% \item[\pkg{hyperref}:\footnotemark]
-% \footnotetext{\pkg{hyperref} v6.72r, 2002/05/27 or later,
-% where a bug for interference with
-% \pkg{varioref} was fixed.}
-% To establish hyper links between the references and the
-% labels.
-%
-% \item[\pkg{xr, xr-hyper}:]
-% To establish references to external documents.
-%
-% \item[\pkg{showkeys}:]
-% To show all the labels and references. This is very useful
-% to find labels in large documents.
-% \end{description}
-%
-% \clearpage
-% \section{User Interface}
-%
-% The \RS\ package has one configuring command, \DescribeMacro{\newref}
-% \cmd{\newref}, that internally creates a series of label and
-% reference commands:
-% \blankline
-%
-% \begin{cminipage}[\linewidth]
-% \newcommand*{\crsi}{\smash{\rule[0pt]{.4pt}{1.25em}\rule[.5ex]{1.5em}{.4pt}}}^^A
-% \newcommand*{\crsl}{\smash{\rule[.5ex]{.4pt}{1.5em}\rule[.5ex]{1.5em}{.4pt}}}^^A
-% \begin{Itabb}
-% \hspace*{2em}\=\hspace{2em}\=\hspace{10em}\=\kill
-% \cmd{\newref}\marg{\rtp}\mkeylst\tab\mbox{}\\[.75ex]
-% \>\crsi \>\argcmd{{\rtp}}{key} \> Reference argument prefix \\[.75ex]
-% \>\crsl \>\argcmd{{\rtp}}{label} \> Custom label \\[.75ex]
-% \>\crsl \>\argcmd{{\rtp}}{ref} \> In text reference \\[.75ex]
-% \>\crsl \>\argcmd{{\Rtp}}{ref} \> Start of sentence reference \\[.75ex]
-% \>\crsl \>\argcmd{{\rtp}}{rangeref} \> In text range reference \\[.75ex]
-% \>\crsl \>\argcmd{{\Rtp}}{rangeref} \> Start of sentence range reference\quad\mbox{}\\[.75ex]
-% \>\crsl \>\argcmd{{\rtp}}{pageref} \> Page reference
-% \end{Itabb}
-% \end{cminipage}
-% \blankline
-%
-% \noindent
-% All the \cmeta{\rtp}... commands, excluding \argcmd{{\rtp}}{key}
-% and \argcmd{{\rtp}}{label} are robust.
-% All the options for the referencing commands are set with a
-% key-value list. \Tabref[vref=far]{refopt} gives a full list of all the
-% key-values and defaults.
-%
-% The \RS\ package do not redefine any internal \LaTeX\ commands and
-% depends only on the \cmd{\label}, \cmd{\ref}, \cmd{\pageref} and
-% the \pkg{varioref} commands.
-% The internally defined commands do not overwrite any
-% existing command with the same name, and an error results if a command
-% already exists. The exception is commands declared with a previous
-% \cmd{\newref} call, can be redefined by calling \cmd{\newref} again
-% with a new set of parameter.
-% If the \pkg{amsmath} package is loaded, and you define
-% \cmd{\newref}|{eq}| for references to equations, you need to
-% undefine \cmd{\eqref} before issuing \cmd{\newref} by
-% \begin{Ipara}
-% \cmd{\let}\cmd{\eqref}|=|\cmd{\relax}
-% \end{Ipara}
-%
-%
-% \section{Command Descriptions}
-%
-% The structure of the label and reference commands is given by the
-% syntax diagrams that follows. Examples are included for references
-% to equations, defined according to the template in
-% \RScfg\ with the
-% \cmd{\newref}|{eq}|\mkeylst. See also \secref{keyvals} for
-% explanations of the key-values.
-%
-% \subsection{The reference key}
-%
-% \begin{cminipage}[\linewidth]
-% \begin{syntdiag}
-% \tok{\argcmd{\rtp}{key}}
-% \end{syntdiag}
-% \end{cminipage}
-% \blankline
-% \noindent
-% The \argcmd{\rtp}{key} command returns the prefix added to the
-% argument of the label and the reference commands, for example:
-%
-% \begin{Itabb}
-% \hspace{10em}\=hspace{5em}\=\kill
-% \cmd{\newref}\marg{\rtp}|{}|
-% \>\>\argcmd{\rtp}{key} $\rightarrow$ \meta{type\,:\,}\\
-% \cmd{\newref}\marg{\rtp}|{key=xxx-}|
-% \>\>\argcmd{\rtp}{key} $\rightarrow$ |xxx-|
-% \end{Itabb}
-%
-% \noindent
-% The \argcmd{\rtp}{key} command is not a general command, but was
-% provided only as a link to the standard \LaTeX{} \cmd{\ref} and
-% \cmd{\pageref} commands:
-%
-% \begin{Itabb}
-% \hspace{10em}\=hspace{5em}\=\kill
-% \cmd{\label}|{|\argcmd{\rtp}{key}| abc}|
-% \>\>~ $\rightarrow$ \cmd{\label}\rmeta{type\,:\,}{abc}\\
-% \cmd{\ref}|{|\argcmd{\rtp}{key}| abc}|
-% \>\>~ $\rightarrow$ \cmd{\ref}\rmeta{type\,:\,}{abc}
-% \end{Itabb}
-% Note if the the \opt{nokeyprefix} option is active then the \argcmd{\rtp}{key}
-% is empty.
-%
-% \blankline
-% \noindent
-% \textbf{\slshape Examples:} equations
-% with \cmd{\newref}|{eq}|\mkeylst:
-%
-% \begin{Itabb}
-% \hspace*{18em}\=\kill
-% |\eqkey| \> \eqkey \\
-% |in eq.~\ref{\eqkey e1} ...| \>in eq.~\ref{\eqkey e1} ... \\
-% |on page \pageref{\eqkey e1} ...|\>on page \pageref{\eqkey e1} ... \\
-% |\vpageref*{\eqkey e1} ... | \>\vpageref*{\eqkey e1} ...
-% \end{Itabb}
-%
-% \subsection{Reference label}
-%
-% \begin{cminipage}[\linewidth]
-% \begin{syntdiag}
-% \tok{\argcmd{\rtp}{label}"{"<lbl>"}"}
-% \end{syntdiag}
-% \end{cminipage}
-% \blankline
-%
-% \noindent
-% The command \argcmd{\rtp}{label} prefix the reference
-% string in the \cmd{\label} with the string \meta{type\,:\,}, or its
-% redefinition with the \opt{key} option.
-%
-% \begin{Itabb}
-% \hspace{10em}\=hspace{5em}\=\kill
-% \argcmd{\rtp}{label}|{abc}|
-% \>\>~ $\rightarrow$ \cmd{\label}\rmeta{type\,:\,}{abc}
-% \end{Itabb}
-% \blankline
-%
-% \noindent
-% \textbf{\slshape Examples:}
-%
-% \begingroup
-% \begin{Ipara}
-% Let $z = x+\mathrm{i} y$ and $\alpha = \beta + \mathrm{i}
-% \gamma$, with $\mathrm{i}^2 = -1$, then
-% \begin{align}
-% &\mathrm{e}^z = \mathrm{e}^x \left(\cos y + \mathrm{i} \sin y \right)
-% \spestag{e1}\\
-% &z^\alpha = \mathrm{e}^{\alpha \ln z}
-% \spestag{e2}\\
-% \intertext{\Eqref{e1,e2} lead to the following interesting results:}
-% &\mathrm{e}^{\mathrm{i} \pi} + 1 = 0 \spestag{e3}\\
-% &\mathrm{i}^\mathrm{i} = \mathrm{e}^{-\pi/2}\spestag{e4}
-% \end{align}
-% \end{Ipara}
-% \endgroup
-%
-%
-% \subsection{Reference commands}
-%
-% \begin{cminipage}[1.05\textwidth]
-% \begin{syntdiag}
-% \tok{\argcmd{\rtp}{ref}}
-% \begin{stack}\\ \tok{$\ast$} \end{stack}
-% \begin{stack}\\ \tok{\okeylst} \end{stack}
-% "{"
-% \begin{rep} \tok{<lbl>} \\ ~,~ \end{rep}
-% "}"
-% \end{syntdiag}
-% \end{cminipage}
-% \smallskip
-%
-% \begin{cminipage}[1.05\textwidth]
-% \begin{syntdiag}
-% \tok{\argcmd{\Rtp}{ref}}
-% \begin{stack}\\ \tok{$\ast$} \end{stack}
-% \begin{stack}\\ \tok{\okeylst} \end{stack}
-% \tok{"{"}
-% \begin{rep} \tok{<lbl>} \\ ~,~ \end{rep}
-% \tok{"}"}
-% \end{syntdiag}
-% \end{cminipage}
-% \blankline
-% \noindent
-% The |*| optional form of the \argcmd{\rtp}{ref} and
-% \argcmd{\Rtp}{ref} commands eliminates the
-% name prefix. The |[s]| optional key-value argument is for the
-% plural form of the name prefix.
-% \blankline
-%
-% \noindent
-% \textbf{\slshape Examples:}
-% \begin{Itabb}
-% \hspace*{21em}\=\kill
-% |in \eqref{e1} ...| \>in \eqref{e1} ... \\
-% |in \eqref[s]{e1}--\eqref*{e4} ...|\>in \eqref[s]{e1}--\eqref*{e4} ...\\
-% |in \eqref[name=eq.~]{e2} ...| \>in \eqref[name=eq.~]{e2} ...
-% \end{Itabb}
-% \pagebreak[1]
-% \noindent
-% A list of references can be used:
-% \begin{Itabb}
-% \hspace*{21em}\=\kill
-% |in \eqref{e1,e2} ...| \>in \eqref{e1,e2} ... \\
-% |in \eqref{e1,e2,e3} ...| \>in \eqref{e1,e2,e3} ... \\
-% |in \eqref[lsttxt={, and~}]{e1,e2,e3} ...| \>in \eqref[lsttxt={, and~}]{e1,e2,e3} ...
-% \end{Itabb}
-% \pagebreak[2]
-% The reference to the page can be included with the \opt{vref} or \opt{vref=far}
-% options that activates the \pkg{varioref} reference.
-% \begin{Itabb}
-% \hspace*{18em}\=\kill
-% |in \eqref[vref]{e1} ...| \>in \eqref[vref]{e1} ...\\
-% |in \eqref[vref=far]{e1} ...| \>in \eqref[vref=far]{e1} ...
-% \end{Itabb}
-% The \argcmd{\Rtp}{ref} command is identical to the
-% \argcmd{\rtp}{ref} command except that it uses the \opt{Name} and
-% \opt{Names} key-value options.
-% \begin{Itabb}
-% \hspace*{18em}\=\kill
-% |\Eqref{e1} is ...| \>\Eqref{e1} is ... \\
-% |\Eqref{e1,e2} are ...| \>\Eqref{e1,e2} are ... \\
-% |\Eqref[lsttxt={\ or~}]{e1,e2,e3}| \>\Eqref[lsttxt={\ or~}]{e1,e2,e3}
-% \end{Itabb}
-% \noindent
-% References to external documents can be added with the \opt{xr}
-% option. Please read the documentation of the \pkg{xr} package.
-%
-% \begin{Itabb}
-% \hspace{10em}\=hspace{5em}\=\kill
-% \cmd{\eqref}|[|\opt{xr}|=A-]{xyz}| \> \>$\rightarrow$~
-% |equation~\ref{A-eq:xyz}|
-% \end{Itabb}
-%
-%
-% \subsection{Range reference commands}
-%
-% \begin{cminipage}[\linewidth]
-% \begin{syntdiag}
-% \tok{\argcmd{\rtp}{rangeref}}
-% \begin{stack}\\ \tok{$\ast$} \end{stack}
-% \begin{stack}\\ \tok{\okeylst} \end{stack}
-% \tok{"{"<lbl>$_1$"}{"<lbl>$_2$"}"}
-% \end{syntdiag}
-% \end{cminipage}
-% \smallskip
-%
-% \begin{cminipage}[\linewidth]
-% \begin{syntdiag}
-% \tok{\argcmd{\Rtp}{rangeref}}
-% \begin{stack}\\ \tok{$\ast$} \end{stack}
-% \begin{stack}\\ \tok{\okeylst} \end{stack}
-% \tok{"{"<lbl>$_1$"}{"<lbl>$_2$"}"}
-% \end{syntdiag}
-% \end{cminipage}
-% \blankline
-%
-% \noindent
-% The \argcmd{\rtp}{rangeref} and \argcmd{\Rtp}{rangeref} commands
-% return a range of references and take two arguments. The |*|
-% optional form again eliminates the name prefix.
-% \blankline
-%
-% \noindent
-% \textbf{\slshape Examples:}
-% \begin{Itabb}
-% \hspace*{19em}\=\kill
-% |in \eqrangeref{e1}{e4} ...| \>in \eqrangeref{e1}{e4} ... \\
-% |... and \eqrangeref*{e1}{e4} ...| \>... and \eqrangeref*{e1}{e4} ... \\
-% |\Eqrangeref{e1}{e4} are ...| \>\Eqrangeref{e1}{e4} are ... \\
-% |\Eqrangeref[vref,rngtxt=--]{e1}{e4}| \>\Eqrangeref[rngtxt=--,vref]{e1}{e4}
-% \end{Itabb}
-%
-%
-% \subsection{Page reference command}\seclabel{PRefCmds}
-%
-% \begin{cminipage}
-% \begin{syntdiag}
-% \tok{\argcmd{\rtp}{pageref}}
-% \begin{stack}\\ \tok{\okeylst} \end{stack}
-% \tok{"{"<lbl>"}"}
-% \end{syntdiag}
-% \end{cminipage}
-% \blankline
-% \noindent
-% The \argcmd{\rtp}{pageref} commands returns the page number of a
-% reference.
-% \blankline
-%
-% \noindent
-% \textbf{\slshape Examples:}
-% \begin{Itabb}
-% \hspace*{18em}\=\kill
-% |it is on page \eqpageref{e1} ...| \>it is on page \eqpageref{e1} ...\\
-% |it is \eqpageref[vref]{e1} ...| \>it is \eqpageref[vref]{e1} ...
-% \end{Itabb}
-%
-%
-%^^A=================================================================
-% \begin{table}
-% \newcommand*{\Q}{\ensuremath{\blacksquare}}^^A
-% \newcommand*{\X}{\ensuremath{\square}}^^A
-% \setlength{\fboxsep}{1em}^^A
-% \centering
-% \caption[The available options and key-value parameters]^^A
-% {The available options and key-value parameters for
-% the label and reference commands of the \RS\ package.}
-% \tablabel{refopt}
-% \blankline
-% \begin{cminipage}[.9\textwidth]
-% \renewcommand{\thempfootnote}{\fnsymbol{mpfootnote}}
-% \renewcommand{\footnoterule}{}
-% \begin{tabular*}{\linewidth}{@{\extracolsep{\fill}}llccccccc@{}}
-% & & \multicolumn{7}{c}{Commands\footnote{^^A
-% The commands are obtained by calling the configuring command
-% \cmd{\newref} and setting the default key-values. The
-% active key-values can be changed temporarily inside the
-% commands.}} \\
-% \cline{3-9}
-% Parameter & Default &
-% \begin{turn}{90}\argcmd{{\rtp}}{key}~ \end{turn}&
-% \begin{turn}{90}\argcmd{{\rtp}}{label}~ \end{turn}&
-% \begin{turn}{90}\argcmd{{\rtp}}{ref}~ \end{turn}&
-% \begin{turn}{90}\argcmd{{\Rtp}}{ref}~ \end{turn}&
-% \begin{turn}{90}\argcmd{{\rtp}}{rangeref}~ \end{turn}&
-% \begin{turn}{90}\argcmd{{\Rtp}}{rangeref}~ \end{turn}&
-% \begin{turn}{90}\argcmd{{\rtp}}{pageref}~ \end{turn}\\
-% \hline
-% \noalign{\smallskip}
-% ~$\ast$ & &\X &\X &\Q &\Q &\Q &\Q &\X\\
-% \okeylst & &\X &\X &\Q &\Q &\Q &\Q &\Q\\[1ex]
-% \opt{key} &|={|\meta{\rtp:}|},| &\X &\X &\Q &\Q &\Q &\Q &\Q\\
-% \opt{s} & |={true}|\footnote{^^A
-% Options defaults to \opt{true} but is initialized
-% as \opt{false}. The \argcmd{{\rtp}}{ref}\texttt{[s]}\marg{lbl}
-% command results in the plural: \opt{names}.
-% The same principle is also valid for the \opt{vref}
-% option.\fnlabel{b}}|,|
-% &\X &\X &\Q &\Q &\X &\X &\X\\
-% \opt{vref} &|={true}|\fnref*{b}|,|
-% &\X &\X &\Q &\Q &\Q &\Q &\Q\\
-% \opt{xr} &|={},| &\X &\X &\Q &\Q &\Q &\Q &\Q\\[1ex]
-% \opt{name} &|={},| &\X &\X &\Q &\X &\X &\X &\X\\
-% \opt{names}\footnote{^^A
-% Option depends on the selection of the \texttt{s=true/false}
-% optional key-value for singular or plural.\fnlabel{c}}
-% &|={},| &\X &\X &\Q &\X &\Q &\X &\X\\
-% \opt{Name} &|={},| &\X &\X &\X &\Q &\X &\X &\X\\
-% \opt{Names}\fnref*{c}
-% &|={},| &\X &\X &\X &\Q &\X &\Q &\X\\
-% \opt{lsttwotxt} &|={\space and~},| &\X &\X &\Q &\Q &\X &\X &\X\\
-% \opt{lsttxt} &|={\space and~},| &\X &\X &\Q &\Q &\X &\X &\X\\
-% \opt{rngtxt} &|={\space to~},| &\X &\X &\X &\X &\Q &\Q &\X\\[1ex]
-% \opt{refcmd} &|=\ref{#1},| &\X &\X &\Q &\Q &\Q &\Q &\Q\\
-%
-% \hline
-% \noalign{\smallskip}
-%
-% \footnotesize \Q\ -- \makebox[0pt][l]{\footnotesize Available}\\
-% \footnotesize \X\ -- \makebox[0pt][l]{Not available}
-% \end{tabular*}
-% \end{cminipage}
-% \end{table}
-%^^A=================================================================
-%
-%
-%
-% \clearpage
-% \section{\pkg{Keyval} Optional Arguments}\seclabel{keyvals}
-%
-% Al the options for the referencing commands are set with a key-value
-% list. \Tabref[vref]{refopt} gives a full list of all the key-values and
-% defaults. The options can also be changed locally with the
-% \okeylst\ optional arguments.
-%
-%
-% \subsection{Identifier: \opt{key}}
-%
-% The \opt{key} key-value is the prefix to the reference label
-% of the \cmd{\ref} and \cmd{\pageref} commands.
-% The default is \opt{key=}\meta{type\,:\,}.
-% With the default \RScfg:
-%
-% \begin{Itabb}
-% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill
-% \cmd{\newref}|{tab}{...}|\\[1ex]
-% \>|\tablabel{abc}|
-% \>~ $\rightarrow$ |\label{tab:abc}|\\
-% \>|\tabref{abc}|
-% \>~ $\rightarrow$ |table~\ref{tab:abc}|\\[1ex]
-% \cmd{\newref}|{tab}{key=xxx-,...}|\\[1ex]
-% \>|\tablabel{abc}|
-% \>~ $\rightarrow$ |\label{xxx-abc}|\\
-% \>|\tabref{abc}|
-% \>~ $\rightarrow$ |table~\ref{xxx-abc}|
-% \end{Itabb}
-% For existing documents containing labels such as |\label{tab:xx}|,
-% you can use the \opt{nokeyprefix} option which defines \opt{key}|={}|. The
-% normal \cmd{\label} command can then be used and the reference
-% commands defaults to
-% \begin{Itabb}
-% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill
-% \>\cmd{\label}|{tab:xx}| \\
-% \>|\tabref{tab:xx}| \>~ $\rightarrow$ |table~\ref{tab:xx}|
-% \end{Itabb}
-%
-%
-% \subsection{Plural form: \opt{s}}
-%
-% The \opt{s} conditional option (\texttt{true/false}) switches the
-% singular/plural form of the reference on and off. The default is
-% \opt{s}\texttt{=true}, but it is initialized to \texttt{false}.
-% \begin{Itabb}
-% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill
-% |\tabref{abc}|
-% \>\>~ $\rightarrow$ |table~\ref{tab:abc}|\\
-% |\tabref[s]{abc}|
-% \>\>~ $\rightarrow$ |tables~\ref{tab:abc}|
-% \end{Itabb}
-%
-%
-% \subsection{Extended reference: \opt{vref}}
-%
-% The \opt{vref} conditional option (\texttt{true/far/false}) switches the
-% \pkg{varioref} page referencing on and off. The default is
-% \opt{vref}\texttt{=true}, but it is initialized to \texttt{false}.
-%
-% \begin{Itabb}
-% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill
-% |\tabref{abc}|
-% \>\>~ $\rightarrow$ |table~\ref{tab:abc}|\\
-% |\tabref[vref]{abc}|
-% \>\>~ $\rightarrow$ |table~\ref{tab:abc}|
-% |\vpageref[\unskip]{tab:abc}|\\
-% |\tabref[vref=far]{abc}|^^A
-% \>\>~ $\rightarrow$ |table~\ref{tab:abc}|
-% |\reftextfaraway{tab:abc}|
-% \end{Itabb}
-%
-%
-% \subsection{External interfaces: \opt{xr}}
-%
-% The \opt{xr} option is for references to external documents.
-% It inserts a prefix in the reference label, compatible with the
-% \pkg{xr} package. The default is \opt{xr}|={}|.
-%
-% External document can be defined in the preamble with the
-% \pkg{xr} or \pkg{xr-hyper} packages:
-% \begin{Ipara}
-% \cmd{\usepackage}|{xr}|\\
-% \cmd{\externaldocument}\oarg{xr\_key}\marg{filename}
-% \end{Ipara}
-%
-% \noindent
-% If, for example, an external document defined with
-% \meta{xr\_key}\texttt{=\{A-\}}, uses an identical setup (e.g.\ the same
-% \RScfg), then it can be referenced with
-%
-% \begin{Itabb}
-% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill
-% |\tabref[xr=A-]{abc}|
-% \>\>~ $\rightarrow$ |table~\ref{A-tab:abc}|
-% \end{Itabb}
-% \noindent or otherwise
-% \begin{Itabb}
-% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill
-% |\tabref[xr=A-,key=]{abc}|
-% \>\>~ $\rightarrow$ |table~\ref{A-abc}|
-% \end{Itabb}
-%
-%
-% \subsection{Language parameters: \opt{name}, \opt{names},
-% \opt{Name}, \opt{Names}, \opt{rngtxt}, \opt{lsttwotxt}, \opt{lsttxt}}
-% \seclabel{langopts}
-%
-% This key-values contain the text prefixes and insertions.
-% Every house style or user has his or her own preference for naming the reference types,
-% therefore are there no defaults provided.
-%
-% \begin{Itabb}
-% \hspace*{1.5cm}\=\hspace{7cm}\=\kill
-% \opt{name} \> ---~Inside sentence reference prefix (singular)
-% \> default=|{}|\\
-% \opt{names}\> ---~Inside sentence reference prefix (plural)
-% \> default=|{}|\\
-% \opt{Name} \> ---~First word reference prefix (singular)
-% \> default=|{}|\\
-% \opt{Names}\> ---~First word reference prefix (plural)
-% \> default=|{}|\\
-% \opt{rngtxt}\> ---~Range of references
-% \> default=|{\ to~}|\\
-% \opt{lsttwotxt}\> ---~List of references (two)
-% \> default=|{\ and~}|\\
-% \opt{lsttxt}\> ---~List of references (more than two)
-% \> default=|{\ and~}|
-% \end{Itabb}
-% \noindent
-% Good typographic style manuals recommend the minimum use of
-% capital letters and punctuation that breaks the flow of a sentence
-% or paragraph. For abbreviations, Bringhurst\cite{Bring1996}
-% recommends the Oxford house style: Use a period only when the word
-% stops prematurely. The period is omitted if the abbreviation
-% begins with the first letter and end with the last. As an example
-% for equations, use eq.~(1) or eqn~(1).
-% A good guideline is not to abbreviate any reference type names.
-% If a sentence starts with a
-% reference then the type name must always be written in full.
-% A typical example for references to a table is:
-% \begin{Ipara}
-% \opt{name}| ={table~}, |\opt{names}| ={tables~},|\\
-% \opt{Name}| ={Table~}, |\opt{Names}| ={Tables~},|\\
-% \opt{rngtxt}|={\ to~}, |\opt{lsttxt}|={, and~}, |\opt{lsttwotxt}|={\ and~},|
-% \end{Ipara}
-% Note the hardspace after the text. It is needed to keep the text
-% and the reference together on the same line.
-%
-% The \RS\ configuration file can be setup to interface with \pkg{babel}
-% for different languages or for automatic language changes inside a
-% document. The language specific key-values can be added to the
-% \pkg{babel} hook |\extras|\meta{language}. The command
-% \DescribeMacro{\DeclareLangOpt}\cmd{\DeclareLangOpt}\footnote{^^A
-% Only for use in \RScfg\ the default config file}
-% is provided to supply a \meta{language} option to the package
-% and to add the option contents to |\extras|\meta{language}. The
-% default config file contains the following lines for equations:
-% \begin{Ipara}
-% |\newcommand\RSenglish{% |\\
-% | \def\RSeqtxt{equation~}% |\\
-% | \def\RSeqstxt{equations~}%|\\
-% | \def\RSEqtxt{Equation~}% |\\
-% | \def\RSEqstxt{Equations~}%|\\
-% | : |\\
-% | } |\\
-% |\DeclareLangOpt{english}{\RSenglish}|
-% \end{Ipara}
-% \DescribeMacro{\RSaddto}or manually with the \cmd{\RSaddto} command
-% \begin{Ipara}
-% |\RSaddto{\extrasenglish}{\RSenglish}|
-% \end{Ipara}
-% The key-value options for language specific options
-% are then set as:
-% \begin{Ipara}
-% |\newref{eq}{% |\\
-% | name = \RSeqtxt, |\\
-% | names = \RSeqstxt,|\\
-% | Name = \RSEqtxt, |\\
-% | Names = \RSEqstxt,|\\
-% | : |\\
-% | } |
-% \end{Ipara}
-%
-% \noindent\LaTeX{}/\pkg{babel} provides some language specific
-% names that can be utilized.
-%
-% \begin{Ipara}
-% |\chaptername \appendixname|\\
-% |\figurename \tablename|\\
-% |\partname \pagename|
-% \end{Ipara}
-%
-% To setup a multilingual document with \pkg{babel},
-% \emph{always} make the language options global so that other
-% language compliant packages can detect it.
-% A typical setup for an Afrikaans/English document would be:
-% {\makeatletter\def\meta@font@select{\normalfont\ttfamily\slshape}
-% \begin{Ipara}
-% |\documentclass[UKenglish,afrikaans,|\meta{options}|]{|\meta{LaTeX\_class}|}|\\
-% |\usepackage[T1]{fontenc}%..|\texttt{\slshape hyphenation of words with accents}\\
-% |\usepackage{babel}%........|\texttt{\slshape language def's}\\
-% |\usepackage{varioref}%.....|\texttt{\slshape for \opt{vref} option}\\
-% |\usepackage{refstyle}|
-% \end{Ipara}}
-%
-%
-% \subsection{Reference formatting command: \opt{refcmd}}
-%
-% The \opt{refcmd} key-value holds the contents of the internal
-% command that formats the reference. The |#1| parameter
-% passed to the command is the full reference label.
-% For example:
-% \begin{Itabb}
-% \hspace{10em}\=hspace{5em}\=\kill
-% \opt{refcmd}|=(\ref{#1})| \> $\rightarrow$~
-% |(\ref{|\meta{label}|})|
-% \end{Itabb}
-%
-% External commands can be employed. For example, to make references
-% to equations identical to the \AmS\ \cmd{\eqref} command:
-% \begin{Itabb}
-% \opt{refcmd}|={\textup{\tagform@{\ref{#1}}}}%|~~It needs \file{amsmath.sty}
-% \end{Itabb}
-%
-% The \opt{refcmd} can be used in conjuntion with the |\ifRSstar|,
-% |\ifRSnameon|, |\ifRSplural| and |\ifRScapname| internal
-% conditional variables to format the reference. As an example for a
-% reference to a footnote, where a duplicate footnote mark is needed,
-% can the \opt{refcmd} be configured so that the starred form of the
-% reference command produce a superscripted duplicate mark:
-% \begin{Itabb}
-% |\newcommand{\RSfnmark}[1]{%|\\
-% | \begingroup |\\
-% | \unrestored@protected@xdef\@thefnmark{#1}%|\\
-% | \endgroup |\\
-% | \@footnotemark} |\\[1ex]
-% \opt{refcmd}|={\ifRSstar\RSfnmark{\ref{#1}}\else(\ref{#1})\fi}|
-% \end{Itabb}
-% \noindent The second footnote mark, \fnref*[name]{b}, in
-% \tabref[vref]{refopt}, was obtained in this way with the reference
-% |\fnref*{b}|. See \RScfg\ for another
-% example for references to chapters and appendices.
-%
-% The \pkg{nameref} package can easily be incorporated if you need elaborate
-% references which include the section or chapter name:
-% \begin{Ipara}
-% |\Secref[vref, refcmd={\S\ref{#1}, `\nameref{#1}'}]{PRefCmds}|
-% \end{Ipara}
-% gives
-% \begin{Ipara}
-% \Secref[vref, refcmd={\S\ref{#1}, `\nameref{#1}'}]{PRefCmds}
-% \end{Ipara}
-%
-% \section{Default configuration files}
-%
-% The \pkg{refstyle} package first searches for the \file{refstyle.def}
-% configuration file, and if it not found, then it uses the default
-% configuration file \RScfg\ that is supplied with the package.
-%
-% The default configuration file, \RScfg, makes a
-% number of default reference declarations and provides language
-% definitions for the language parameters. See the file
-% \file{refconfig.pdf} for the documentation.
-% \medskip
-%
-% \begin{center}
-% \begin{fminipage}[.55\textwidth]
-% \slshape Any user is welcome to customize the
-% local copy of the \RScfg\ file or copy
-% the relevant contents to your own \file{refstyle.def}
-% configuration file.
-% \end{fminipage}
-% \end{center}
-%
-% \begin{thebibliography}{99}
-% \bibitem{Bring1996}
-% {Bringhurst, R.} (1996), \emph{The elements of typographic style},
-% Hartley \& Marks Publishers, Point Roberts, WA, USA and Vancouver,
-% BC, Canada, second edn.
-% \end{thebibliography}
-%
-% \StopEventually{\PrintChanges\PrintIndex}
-% \clearpage
-%
-% \section{Implementation: \pkg{refstyle.sty}}
-%
-% \subsection{Identification}
-% \begin{macrocode}
-%<*pkg>
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{refstyle}[\RefstyleFileDate\space
- \RefstyleFileVersion\space
- Reference formatting (DNJ Els)]
-\newcommand*{\RS@pkgname}{refstyle}
-% \end{macrocode}
-%
-%
-% \subsection{External packages}
-%
-% Load all the external packages.
-% \begin{macrocode}
-\RequirePackage{keyval}
-% \end{macrocode}
-%
-% \begin{macro}{\RS@setkeys}
-% \changes{v0.3}{2006/09/09}{original \cmd{\setkeys} copy}
-% Note if \pkg{xkeyval} is loaded, it redefines \pkg{keyval}'s
-% macros. To fix this bug, we need the original \cmd{\setkeys}
-% command.
-% \begin{macrocode}
-\def\RS@setkeys#1#2{%
- \def\KV@prefix{KV@#1@}%
- \let\@tempc\relax
- \KV@do#2,\relax,}
-% \end{macrocode}
-% \end{macro}
-%
-% \noindent A small bug-fix for \pkg{showkeys}. Will be removed
-% after release of new version.
-%
-% \begin{macrocode}
-\@ifundefined{vref@space}{\let\vref@space\space}{}
-% \end{macrocode}
-%
-% \begin{macro}{\@safe@activestrue}
-% \changes{v0.5}{2010/11/02}{Add \cmd{\@safe@activesfalse}}
-% \begin{macro}{\@safe@activesfalse}
-% \changes{v0.5}{2010/11/02}{Add \cmd{\@safe@activestrue}}
-% If \pkg{babel} is not loaded, make the following
-% commands inactive.
-% \begin{macrocode}
-\providecommand*{\@safe@activestrue}{}
-\providecommand*{\@safe@activesfalse}{}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \subsection{Utility commands}
-%
-% \begin{macro}{\RS@namelet}
-% \begin{macro}{\RS@nameuse}
-% \begin{macro}{\RS@namedef}
-% \begin{macro}{\RS@robustnamedef}
-% \noindent
-% The following is a list of commands that take a variable \marg{name}
-% as argument. This enables on-the-fly definitions of user commands.
-% \begin{Itabb}
-% Usage:~\=\cmd{\RS@robustnamedef}\marg{name}~\=\kill
-% Usage:
-% \>\cmd{\RS@namelet}\marg{name}
-% \> $\rightarrow$ \cmd{\let}\cmeta{name}\\
-% \>\cmd{\RS@nameuse}\marg{name}
-% \> $\rightarrow$ \cmeta{name}\\
-% \>\cmd{\RS@namedef}\marg{name}
-% \> $\rightarrow$ \cmd{\def}\cmeta{name}\\
-% \>\cmd{\RS@robustnamedef}\marg{name}
-% \> $\rightarrow$
-% \cmd{\def}\cmeta{name}|{\protect|\cmeta{name\textvisiblespace}|}|^^A
-% \cmd{\def}\cmeta{name\textvisiblespace}
-% \end{Itabb}
-% \begin{macrocode}
-\newcommand*{\RS@namelet}[1]{\expandafter\let\csname #1\endcsname}
-\newcommand*{\RS@nameuse}[1]{\csname #1\endcsname}
-\newcommand*{\RS@namedef}[1]{\expandafter\def\csname #1\endcsname}
-\newcommand*{\RS@robustnamedef}[1]{%
- \expandafter\edef\csname #1\endcsname{%
- \noexpand\protect\RS@nameuse{#1 }}%
- \RS@namedef{#1 }}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\RS@ifundefined}
-% This is an improved definition\footnote{Posted by Markus Kohm
-% on c.t.t. 2002/11/11} for the \LaTeX{} kernel command
-% \cmd{\@ifundefined} that do not leave an undefined command
-% defined as \cmd{\relax} after the test.
-%
-% The usage is:
-% \cmd{\RS@ifundefined}\marg{name}\marg{true}\marg{false} executes
-% the contents of \meta{true} if \cmeta{name} is not defined and
-% \meta{false} if defined.
-% \begin{macrocode}
-\def\RS@ifundefined#1{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname#1\endcsname\relax
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@removedef}
-% The command removes the definition of a command, including
-% robust definitions.
-% \begin{macrocode}
-\newcommand*{\RS@removedef}[1]{%
- \RS@namelet{#1}\@undefined%
- \RS@ifundefined{#1 }{}{\RS@namelet{#1 }\@undefined}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@testednamedef}
-% \begin{macro}{\RS@testedrobustnamedef}
-% These command are identical to \cmd{\RS@namedef} and
-% \cmd{\RS@robustnamedef}, but only define the \cmeta{name}
-% command if it is legal. Otherwise an error message
-% is written to the log file and the program is terminated.
-% \begin{macrocode}
-\newcommand*{\RS@testednamedef}[1]{%
- \RS@ifnamedefinable{#1}\RS@namedef{#1}}
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand*{\RS@testedrobustnamedef}[1]{%
- \RS@ifnamedefinable{#1}\RS@robustnamedef{#1}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\RS@ifnamedefinable}
-% A modified version of the \LaTeX{} kernel command
-% (from ltdefns.dtx).
-% \begin{macrocode}
-\long\def\RS@ifnamedefinable #1{%
- \edef\reserved@a{#1}%
- \RS@ifundefined\reserved@a
- {\edef\reserved@b{\expandafter\@carcube \reserved@a xxx\@nil}%
- \ifx \reserved@b\@qend \RS@notdefinable\else
- \ifx \reserved@a\@qrelax \RS@notdefinable\else
- \PackageInfo{\RS@pkgname}{\@backslashchar\reserved@a\space created}%
- \fi
- \fi}%
- \RS@notdefinable}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@notdefinable}
-% The error message when an illegal definition is attempted.
-% \begin{macrocode}
-\gdef\RS@notdefinable{%
- \PackageError{\RS@pkgname}{%
- Command \@backslashchar\reserved@a\space
- already defined.\MessageBreak
- Or name \@backslashchar\@qend... illegal.\MessageBreak
- It can not be redefined by the \@backslashchar newref%
- }{%
- If \@backslashchar\reserved@a\space is not important\MessageBreak
- then \protect\let\@backslashchar\reserved@a%
- =\protect\relax,\MessageBreak
- else use a different \@backslashchar newref.}%
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@setbool}
-% The command\footnote{Taken from the \pkg{ifthen} package.}
-% \cmd{\RS@setbool}\marg{conditional}\marg{true/false}
-% sets the \meta{conditional} to |true| or |false|.
-% \begin{Itabb}
-% Usage:~\=
-% \cmd{\RS@setbool}|{RSplural}{false}|\quad\=$\rightarrow$\quad
-% |\RSpluralfalse|\\
-% \>\cmd{\RS@setbool}|{RSplural}{true}|\quad\>$\rightarrow$\quad
-% |\RSpluraltrue|
-% \end{Itabb}
-%
-% \begin{macrocode}
-\newcommand*{\RS@setbool}[2]{%
- \lowercase{\def\@tempa{#2}}%
- \@ifundefined{@tempswa\@tempa}%
- {\PackageError{\RS@pkgname}%
- {You can only set the option to `true' or `false'}\@ehc}%
- {\csname#1\@tempa\endcsname}}
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \subsection{First character case changes}
-%
-% \begin{macro}{\RS@firstcap}
-% This macro\footnote{Posted by Dan Luecking on c.t.t.} change the
-% first character of a string to uppercase and returns the result
-% in \cmd{\RS@cap}.
-% \begin{Ipara}
-% Usage:~|\RS@fistcap xxxx\@nil| then |\RS@cap| $\rightarrow$ |Xxxx|
-% \end{Ipara}
-% \begin{macrocode}
-\def\RS@firstcap#1#2\@nil{%
- \iffalse{\fi
- \uppercase{\edef\RS@cap{\iffalse}\fi#1}#2}}%
-% \end{macrocode}
-% \end{macro}
-%
-%
-%
-% \subsection{Reference building commands}
-%
-% \begin{macro}{\ifRS@keyactive}
-% \changes{v0.4}{2010/10/21}{Add \opt{nokeyprefix} to turn of the key prefix}
-% We need to peek into the options list for the \opt{nokeyprefix} option
-% before the options are processed to find out if the key prefix must be
-% included in the |\|\meta{key}|label| command. Make \opt{nokeyprefix}
-% not used afterwards.
-% \begin{macrocode}
-\newif\ifRS@keyactive
-\@ifpackagewith{\@currname}{nokeyprefix}%
- {\RS@keyactivefalse}%
- {\RS@keyactivetrue}
-\DeclareOption{nokeyprefix}{\OptionNotUsed}
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \begin{macro}{\ifRSstar}
-% \begin{macro}{\ifRSnameon}
-% \begin{macro}{\ifRScapname}
-% \begin{macro}{\ifRSplural}
-% \begin{macro}{\ifRSlsttwo}
-% \changes{v0.4}{2010/10/21}{Add \cmd{\ifRSlsttwo} test for list containing only two parameter}
-% The |\if| conditional values that are set by the reference commands.
-% These values can be accessed by user defined key-values.
-% \begin{macrocode}
-\newif\ifRSstar\RSstarfalse
-\newif\ifRSnameon\RSnameontrue
-\newif\ifRScapname\RScapnamefalse
-\newif\ifRSplural\RSpluralfalse
-\newif\ifRSlsttwo\RSlsttwofalse
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \begin{macro}{\newref}
-% The main user interface for template setup. It take the |#1| or
-% \meta{key} parameter and make it lowercase before passing it on to
-% \cmd{\RS@newref}.
-%
-%
-% \begin{macrocode}
-\newcommand*{\newref}[1]{%
- \lowercase{\def\RS@tempa{#1}}%
- \expandafter\RS@newref\expandafter{\RS@tempa}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@newref}
-% \changes{v0.4}{2010/10/21}{Ad \texttt{lsttwotxt} option}
-% This command configures a new template.
-% \begin{macrocode}
-\newcommand*{\RS@newref}[2]{%
-% \end{macrocode}
-% \bNP[2.0]\noindent Clears an existing template before defining a new one.\eNP
-% \begin{macrocode}
- \RS@clearref{#1}%
-% \end{macrocode}
-% \bNP[2.0]\noindent Create |\ifRS@|\meta{key}|vref| conditional \eNP
-% \begin{macrocode}
-% \expandafter\newif\csname ifRS@#1vref\endcsname%
-% \end{macrocode}
-% \bNP[2.0]\noindent Creates a series of key-values for every template
-% that stores the setup for the specific template.\eNP
-% \begin{macrocode}
- \ifRS@keyactive
- \define@key{RS@#1}{key}[#1:]{\RS@namedef{RS@#1@key}{##1}}%
- \else
- \define@key{RS@#1}{key}[]{\RS@namedef{RS@#1@key}{##1}}%
- \fi
- \define@key{RS@#1}{s}[true]{\RS@setbool{RSplural}{##1}}%
- \define@key{RS@#1}{name}[]{\RS@namedef{RS@#1@name}{##1}}%
- \define@key{RS@#1}{names}[]{\RS@namedef{RS@#1@names}{##1}}%
- \define@key{RS@#1}{Name}[]{\RS@namedef{RS@#1@Name}{##1}}%
- \define@key{RS@#1}{Names}[]{\RS@namedef{RS@#1@Names}{##1}}%
- \define@key{RS@#1}{rngtxt}[\space to~]{\RS@namedef{RS@#1@rngtxt}{##1}}%
- \define@key{RS@#1}{lsttwotxt}[\space and~]{\RS@namedef{RS@#1@lsttwotxt}{##1}}%
- \define@key{RS@#1}{lsttxt}[\space and~]{\RS@namedef{RS@#1@lsttxt}{##1}}%
- \define@key{RS@#1}{refcmd}[\ref{####1}]{\RS@namedef{RS@#1@rcmd}####1{##1}}%
- \define@key{RS@#1}{xr}[]{\RS@namedef{RS@#1@xr}{##1}}%
- \define@key{RS@#1}{vref}[true]{\RS@namedef{RS@#1vref}{##1}}%
-% \end{macrocode}
-% \bNP[2.0]\noindent Set default key-value parameters.\eNP
-% \begin{macrocode}
- \RS@setkeys{RS@#1}{key,
- s=false,
- name,names,Name,Names,
- rngtxt,lsttwotxt,lsttxt,
- refcmd,
- xr,
- vref=false}%
-% \end{macrocode}
-% \bNP[2.0]\noindent Set key-values according to user definitions.\eNP
-% \begin{macrocode}
- \RS@setkeys{RS@#1}{#2}%
-% \end{macrocode}
-% \bNP[2.0]\noindent Build the reference commands.\eNP
-% \begin{macrocode}
- \RS@buildref{#1}%
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@clearref}
-% Clear a reference template for redefinition. It check
-% if the template already exists and clear it if it does.
-%
-% \begin{macrocode}
-\newcommand*{\RS@clearref}[1]{%
- \RS@ifundefined{RS@#1@template}
- {\RS@namedef{RS@#1@template}{#1}%
- \PackageInfo{\RS@pkgname}%
- {New reference template \protect\newref{#1}}{}}
- {\PackageInfo{\RS@pkgname}%
- {Reference template \protect\newref{#1} redefined}{}
- \RS@firstcap#1\@nil
- \RS@removedef{#1key}%
- \RS@removedef{#1label}%
- \RS@removedef{#1ref}%
- \RS@removedef{\RS@cap ref}%
- \RS@removedef{#1rangeref}%
- \RS@removedef{\RS@cap rangeref}%
- \RS@removedef{#1pageref}%
- }%
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@buildref}
-% Build the reference commands. See \tabref{refopt} for the list of
-% commands. The \cmd{\RS@buildref}\marg{key} build commands to
-% call \cmd{\RS@cmd}\marg{cmd}\marg{key}, for example:
-% \begin{Ipara}
-% \cmeta{key}|ref| \quad$\rightarrow$\quad
-% |{\RScapnamefalse\RS@cmd{ref}|\marg{key}|}|
-% \end{Ipara}
-% \changes{v0.2}{2003/07/30}{Remove robust def of \argcmd{{\rtp}}{label}}
-% \begin{macrocode}
-\newcommand*{\RS@buildref}[1]{%
- \RS@firstcap#1\@nil
- \RS@testednamedef{#1key}{\RS@nameuse{RS@#1@key}}
- \RS@testednamedef{#1label}##1{\label{\RS@nameuse{RS@#1@key}##1}}
- \RS@testedrobustnamedef{#1ref}{\RScapnamefalse\RS@cmd{ref}{#1}}
- \RS@testedrobustnamedef{\RS@cap ref}{\RScapnametrue\RS@cmd{ref}{#1}}
- \RS@testedrobustnamedef{#1rangeref}{\RScapnamefalse\RS@cmd{rangeref}{#1}}
- \RS@testedrobustnamedef{\RS@cap rangeref}{\RScapnametrue\RS@cmd{rangeref}{#1}}
- \RS@testedrobustnamedef{#1pageref}{\RScapnamefalse\RS@cmd{pageref}{#1}}
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@cmd}
-% \begin{macro}{\RS@@cmd}
-% The command \cmd{\RS@cmd}\marg{cmd}\marg{key} calls the final
-% reference formatting commands.
-% It checks for the starred form and set the conditionals
-% |\ifRSstar| and |\ifRSnameon| accordingly.
-% It also extracts the optional key-value list.
-% \begin{Itabb}
-% \hspace*{4.5cm}\=\kill
-% \cmd{\RS@cmd}|{ref}|\marg{key} \>$\rightarrow$\quad
-% |\RS@ref|\marg{key}\okeylst\\
-% \cmd{\RS@cmd}|{rangeref}|\marg{key} \>$\rightarrow$\quad
-% |\RS@rangeref|\marg{key}\okeylst\\
-% \cmd{\RS@cmd}|{pageref}|\marg{key} \>$\rightarrow$\quad
-% |\RS@pageref|\marg{key}\okeylst
-% \end{Itabb}
-% \begin{macrocode}
-\newcommand*{\RS@cmd}[2]{%
- \@ifstar{\RSstartrue\RSnameonfalse\RS@@cmd{#1}{#2}}%
- {\RSstarfalse\RSnameontrue\RS@@cmd{#1}{#2}}}
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand*{\RS@@cmd}[2]{%
- \@ifnextchar[%
- {\RS@nameuse{RS@#1}{#2}}%
- {\RS@nameuse{RS@#1}{#2}[]}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-%
-% \subsection{Reference formatting commands}
-%
-% \begin{macro}{\RS@ref}
-% \changes{v0.5}{2010/11/02}{Add \cmd{\@safe@activestrue} to avoid active chars is ref list}
-% \begin{macro}{\RS@@ref}
-% \begin{macro}{\RS@@@ref}
-% \changes{v0.4}{2010/10/21}{Add \cmd{\ifRSlsttwo} test for list containing only two parameter}
-% The command \cmd{\RS@ref}\marg{key}\okeylst\marg{label\_lst}
-% typeset the references to the comma-separated reference
-% label list according to the configuration for \meta{key}.
-%
-% First of all, remove all spaces for the reference label list.
-% \begin{macrocode}
-\def\RS@ref#1[#2]#3{%
- \begingroup
- \RS@setkeys{RS@#1}{#2}%
- \@safe@activestrue%
- \edef\RS@tmpa{\zap@space#3 \@empty}%
- \@safe@activesfalse%
- \edef\RS@tmpa{\noexpand\RS@@ref{#1} \RS@tmpa,\relax\noexpand\@eolst}%
- \RS@tmpa%
- \endgroup}
-% \end{macrocode}
-% \end{macro}
-% Check if there is a single or multiple references in the
-% reference label list. If a single reference label then use the
-% form set by the \opt{s} key-value. If multiple reference labels
-% the use the plural form of the name prefix.\footnote{
-% The list of reference commands came from the \pkg{typedref} package.}
-%
-% \begin{macrocode}
-\def\RS@@ref#1 #2,#3\@eolst{%
- \ifx\relax#3\relax
- \RS@makename{#1}%
- \RS@makeref{#1}{#2}%
- \RS@makevpageref{#1}{#2}%
- \else
- \RSpluraltrue%
- \RS@makename{#1}%
- \RS@makeref{#1}{#2}%
- \RS@makevpageref{#1}{#2}%
- \RSnameonfalse%
- \RSlsttwotrue%
- \RS@@@ref{#1} #3\@eolst%
- \fi}
-% \end{macrocode}
-% \end{macro}
-% For more than one reference in the reference list, typeset the
-% rest of the references.
-% \begin{macrocode}
-\def\RS@@@ref#1 #2,#3\@eolst{%
- \ifx\relax#3\relax
- \ifRSlsttwo
- \RS@nameuse{RS@#1@lsttwotxt}%
- \else
- \RS@nameuse{RS@#1@lsttxt}%
- \fi
- \RS@makeref{#1}{#2}%
- \RS@makevpageref{#1}{#2}%
- \else
- \RSlsttwofalse%
- \unskip,\space%
- \RS@makeref{#1}{#2}%
- \RS@makevpageref{#1}{#2}%
- \RS@@@ref{#1} #3\@eolst%
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@rangeref}
-% The command \cmd{\RS@rangeref}\marg{key}\okeylst\marg{lbl1}\marg{lbl2}
-% typeset the references as a range.
-% \begin{macrocode}
-\def\RS@rangeref#1[#2]#3#4{%
- \begingroup
- \RS@setkeys{RS@#1}{#2}%
- \RSpluraltrue%
- \RS@makename{#1}%
- \RS@makeref{#1}{#3}%
- \RS@nameuse{RS@#1@rngtxt}%
- \RSnameonfalse%
- \RS@makeref{#1}{#4}%
- \RS@makevpagerefrange{#1}{#3}{#4}%
- \endgroup}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@pageref}
-% The command \cmd{\RS@pageref}\marg{key}\okeylst\marg{lbl} type
-% the page where \marg{lbl} was defined.
-% \begin{macrocode}
-\def\RS@pageref#1[#2]#3{%
- \begingroup%
- \RS@setkeys{RS@#1}{#2}%
- \RS@ifvref{#1}%
- {\mbox{}\vpageref*{\RS@lbl{#1}{#3}}}%
- {\reftextfaraway{\RS@lbl{#1}{#3}}}%
- {\pageref{\RS@lbl{#1}{#3}}}%
- \endgroup}
-% \end{macrocode}
-% \end{macro}
-%
-% \changes{v0.2}{2003/07/30}{Remove redundant \cmd{\RS@label}}
-%
-% \begin{macrocode}
-\newcommand*{\RS@true}{true}
-\newcommand*{\RS@false}{false}
-\newcommand*{\RS@far}{far}
-% \end{macrocode}
-%
-% \begin{macro}{\RS@ifvref}
-% The command \cmd{\RS@ifvref}\marg{key}\marg{true}\marg{faraway}\marg{false}
-% executes the contents of \meta{true} if the \opt{vref} option for
-% the \meta{key} reference type is true and \meta{false} otherwise.
-% \begin{macrocode}
-\newcommand{\RS@ifvref}[4]{%
- \edef\RS@tempa{\RS@nameuse{RS@#1vref}}%
- \ifx\RS@tempa\RS@true\relax
- #2%
- \else\ifx\RS@tempa\RS@far\relax
- #3%
- \else\ifx\RS@tempa\RS@false\relax
- #4%
- \else
- \PackageError{\RS@pkgname}%
- {You can only set the vref option to `true', `far' or `false'}\@ehc
- \fi\fi\fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@makename}
-% The command \cmd{\RS@makename}\marg{key} build the prefix
-% to the reference commands.
-% \begin{macrocode}
-\newcommand{\RS@makename}[1]{%
- \ifRSstar\else\ifRSnameon
- \ifRSplural
- \ifRScapname
- \RS@nameuse{RS@#1@Names}%
- \else
- \RS@nameuse{RS@#1@names}%
- \fi
- \else
- \ifRScapname
- \RS@nameuse{RS@#1@Name}%
- \else
- \RS@nameuse{RS@#1@name}%
- \fi
- \fi
- \fi\fi
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@lbl}
-% This command builds the full label string for the \cmd{\ref}
-% command.
-% \begin{Ipara}
-% \cmd{\RS@lbl}\marg{key}\marg{label} \quad$\rightarrow$\quad
-% |{|\meta{xr_key}\meta{key}\meta{label}|}|
-% \end{Ipara}
-% \begin{macrocode}
-\newcommand*{\RS@lbl}[2]{%
- \RS@nameuse{RS@#1@xr}\RS@nameuse{RS@#1@key}#2%
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@makeref}
-% The command \cmd{\RS@makeref}\marg{key}\marg{label} formats
-% the \cmd{\ref} output
-% \begin{Ipara}
-% \cmd{\RS@makeref}\marg{key}\marg{label} \quad$\rightarrow$\quad
-% \cmeta{rcmd}|{\ref{|\meta{xr_key}\meta{key}\meta{label}|}}|
-% \end{Ipara}
-% \begin{macrocode}
-\newcommand{\RS@makeref}[2]{%
- \RS@nameuse{RS@#1@rcmd}{\RS@lbl{#1}{#2}}%
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@makevpageref}
-% The command \cmd{\RS@makevpageref}\marg{key}\marg{label} adds the
-% \pkg{varioref} page reference if the \opt{vref} option is true.
-% \begin{macrocode}
-\newcommand{\RS@makevpageref}[2]{%
- \RS@ifvref{#1}%
- {\vpageref[\unskip]{\RS@lbl{#1}{#2}}}%
- { \reftextfaraway{\RS@lbl{#1}{#2}}}%
- {}%
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\RS@makevpagerefrange}
-% The command \cmd{\RS@makevpagerefrange}\marg{key}\marg{lbl1}\marg{lbl1}
-% adds the \pkg{varioref} page range reference if the \opt{vref}
-% option is true.
-% \begin{macrocode}
-\newcommand{\RS@makevpagerefrange}[3]{%
- \RS@ifvref{#1}%
- {\space\vpagerefrange[\unskip]{\RS@lbl{#1}{#2}}{\RS@lbl{#1}{#3}}}%
- {\space\vpagerefrange[\unskip]{\RS@lbl{#1}{#2}}{\RS@lbl{#1}{#3}}}%
- {}%
- }
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \subsection{\pkg{varioref} command predefinitions}
-%
-% \begin{macrocode}
-\AtBeginDocument{%
- \providecommand{\vpageref}{%
- \PackageError{\RS@pkgname}%
- {The vref option used, but varioref.sty not loaded.}%
- {Load varioref.sty}}
- \providecommand{\reftextfaraway}{%
- \PackageError{\RS@pkgname}%
- {The vref=far option used, but varioref.sty not loaded.}%
- {Load varioref.sty}}
- \providecommand{\vpagerefrange}{%
- \PackageError{\RS@pkgname}%
- {The vref option used, but varioref.sty not loaded.}%
- {Load varioref.sty}}
- }
-% \end{macrocode}
-%
-%
-% \subsection{Support for language option inclusions in config file}
-%
-% \begin{macro}{\RSaddto}
-% \changes{v0.2}{2003/07/30}{Rename \cmd{\RS@addto} to \cmd{\RSaddto}}
-% Command from the \pkg{varioref} package is used to add
-% language definitions to the |\extras|\meta{language} token
-% for \pkg{babel}.
-% \begin{macrocode}
-\def\RSaddto#1#2{%
- #2%
- \@temptokena{#2}%
- \ifx#1\relax
- \let#1\@empty
- \fi
- \ifx#1\undefined
- \edef#1{\the\@temptokena}%
- \else
- \toks@\expandafter{#1}%
- \edef#1{\the\toks@\the\@temptokena}%
- \fi
- \@temptokena{}\toks@\@temptokena}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\DeclareLangOpt}
-% \changes{v0.5}{2010/11/02}{Add \cmd{\extras}\meta{language} to beginning of document.}
-% Command to declare a language option and add
-% language definitions to the |\extras|\meta{language} token
-% for \pkg{babel}.
-% \begin{macrocode}
-\def\DeclareLangOpt#1#2{%
- \edef\RS@tempa{\expandafter\@gobble\string#2}%
- \RS@ifundefined{\RS@tempa}%
- {\PackageError{\RS@pkgname}{%
- Unknown definitions \@backslashchar\RS@tempa\MessageBreak
- for language option `#1'}{}}%
- {\DeclareOption{#1}{%
- \AtBeginDocument{\expandafter\RSaddto\csname extras#1\endcsname #2}}}%
- }
-% \end{macrocode}
-% \end{macro}
-%
-%
-%
-% \subsection{Configuration files}
-%
-% \begin{macro}{\RS@cfgfile,\RS@reffile}
-% \changes{v0.4}{2010/10/21}{Ad alternative definition file \cmd{refstyle.def}}
-% Define the config file and alternate definition file names.
-% \begin{macrocode}
-\newcommand*{\RS@cfgfile}{refstyle.cfg}
-\newcommand*{\RS@reffile}{refstyle.def}
-% \end{macrocode}
-% \end{macro}
-%
-% We need to peek into the options list before the
-% options are processed to find out if the config
-% file is to be loaded or not. The config file can
-% contain options and must be loaded before
-% \cmd{\ProcessOptions}. Make \opt{noconfig} not used
-% afterwards.
-%
-% We first test for a local config file \file{refstyle.def}
-% and then for the global config file \file{refstyle.cfg}.
-% \begin{macrocode}
-\@ifpackagewith{\@currname}{noconfig}%
- {\PackageInfo{\RS@pkgname}{No config file loaded}}%
- {\InputIfFileExists{\RS@reffile}%
- {\PackageInfo{\RS@pkgname}{Local config file \RS@reffile\space used}}
- {\InputIfFileExists{\RS@cfgfile}%
- {\PackageInfo{\RS@pkgname}{Config file \RS@cfgfile\space used}}%
- {\PackageInfo{\RS@pkgname}{No config file found}}}}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareOption{noconfig}{\OptionNotUsed}%
-% \end{macrocode}
-%
-% Process the options, including options in config file.
-% \begin{macrocode}
-\ProcessOptions*\relax
-% \end{macrocode}
-%
-% The end of this package.
-% \begin{macrocode}
-%</pkg>
-% \end{macrocode}
-%
-% \Finale
-\endinput
+% \iffalse +% +% refstyle.dtx +% Copyright (C) 2002--2024 Danie Els +% +% ------------------------------------------------------------------- +% The refstyle package +% for the formatting of references +% ------------------------------------------------------------------- +% This work may be distributed and/or modified under the conditions +% of the LaTeX Project Public License, either version 1.3c of this +% license or (at your option) any later version. The latest version +% of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2008/12/01 or later. +% +% This work has the LPPL maintenance status 'maintained'. +% +% This Current Maintainer of this work is Danie Els (dnjels@gmail.com) +% +% This package consists of the files: refstyle.dtx +% refconfig.dtx +% refstyle.ins +% and the derived files: refstyle.sty +% refstyle.cfg +% ------------------------------------------------------------------- +% +%<*pkg> +\newcommand*{\RefstyleFileDate}{2024/01/31} +\newcommand*{\RefstyleFileVersion}{v0.6} +%</pkg> +% +% +%<*driver> +\documentclass[a4paper]{ltxdoc} +\let\RefstyleFileDate\relax +\let\RefstyleFileVersion\relax +\usepackage{amsmath} +\usepackage{amsfonts} + \DeclareMathSymbol{\square} {\mathord}{AMSa}{"03} + \DeclareMathSymbol{\blacksquare}{\mathord}{AMSa}{"04} +\usepackage{calc} +\usepackage{rotating} +\usepackage[rounded]{syntax} +\usepackage{varioref} +\usepackage{refstyle} +\usepackage{color} + \definecolor{hrefcol}{rgb}{0.00,0.00,1.00} +\usepackage[pdfpagelabels]{hyperref} +\hypersetup{breaklinks=true, + linktocpage, + pdfstartview=FitH, + colorlinks = true, + linkcolor = hrefcol, + urlcolor = hrefcol, + menucolor = hrefcol, + filecolor = hrefcol, + citecolor = hrefcol, + linkbordercolor = {0.8 0.8 0.8}, + urlbordercolor = {0.8 0.8 0.8}, + menubordercolor = {0.8 0.8 0.8}, + filebordercolor = {0.8 0.8 0.8}, + runbordercolor = {0.8 0.8 0.8}, + citebordercolor = {0.8 0.8 0.8}, + pdftitle={refstyle}, + pdfauthor={Danie Els}} + +%---- macrocode env changes ------------------------------- + +\setlength{\MacroIndent}{1.5em} + +%---- Scratches ------------------------------------------- + +\newlength{\tdima} +\newsavebox{\tboxa} + +%---- Spacing --------------------------------------------- + +\newlength{\myskip} +\setlength{\myskip}{\topsep} + \addtolength{\myskip}{\parskip} + \addtolength{\myskip}{\partopsep} +\newcommand*{\blankline}{\par\addvspace{\myskip}} +\newlength{\mytab} +\setlength{\mytab}{2\parindent} +\newcommand{\tab}{\hspace*{\mytab}} + +%---- Indented environments ------------------------------- + +\newenvironment{IndentPara}[1][1] + {\list{}{\setlength{\leftmargin}{#1\mytab}% + \setlength{\labelwidth}{0pt}% + \setlength{\labelsep}{0pt}% + \setlength{\itemindent}{\parindent}% + \setlength{\listparindent}{\parindent}% + }\item[]}% + {\endlist} +\newenvironment{IndentParaX}[1][1] + {\list{}{\setlength{\leftmargin}{#1\mytab}% + \setlength{\topsep}{0pt}% + \setlength{\partopsep}{0pt}% + \setlength{\labelwidth}{0pt}% + \setlength{\labelsep}{0pt}% + \setlength{\itemindent}{\parindent}% + \setlength{\listparindent}{\parindent}% + }\item[]}% + {\endlist} +\newcommand\bNP{\begin{IndentParaX}} +\newcommand\eNP{\end{IndentParaX}} +\newenvironment{Ipara}[1][\small]% + {\begin{IndentPara}\noindent#1\ignorespaces}% + {\end{IndentPara}} +\newenvironment{Itabb}[1][\small]% + {\begin{IndentPara}#1\ignorespaces\begin{tabbing}\ignorespaces}% + {\end{tabbing}\end{IndentPara}} + +%---- Ruled & colored minipage ---------------------------- + +\definecolor{shadecolor}{gray}{0.9} + +\newenvironment{fminipage}[1][\linewidth] + {\setlength{\tdima}{#1-2\fboxsep-2\fboxrule}% + \begin{lrbox}{\tboxa}\begin{minipage}{\tdima}}% + {\end{minipage}\end{lrbox}\noindent\fbox{\usebox{\tboxa}}} +\newenvironment{cminipage}[1][\linewidth] + {\setlength{\tdima}{#1-2\fboxsep-2\fboxrule}% + \begin{lrbox}{\tboxa}\begin{minipage}{\tdima}}% + {\end{minipage}\end{lrbox}% + \noindent\colorbox{shadecolor}{\usebox{\tboxa}}} + +%---- Additional documenting commands --------------------- + +\def\lcbrack{\symbol{`\{}} +\def\rcbrack{\symbol{`\}}} +\makeatletter +\def\meta@font@select{\normalfont\slshape} +\makeatother +\DeclareRobustCommand{\cmeta}[1]{%<- \<xxx> + \texttt{\bslash}\meta{#1}} +\DeclareRobustCommand{\cmarg}[1]{%<- {\<xxx>} + \texttt{\lcbrack}\cmeta{#1}\texttt{\rcbrack}} +\DeclareRobustCommand{\coarg}[1]{%<- [\<xxx>] + \texttt{[}\cmeta{#1}\texttt{]}} +\DeclareRobustCommand{\argcmd}[2]{%<- \<xxx>yyy + \cmeta{#1}\texttt{#2}} +\newcommand{\rmeta}[3][]{% + \texttt{\lcbrack#1}\meta{#2}\texttt{#3\rcbrack}} +\newcommand{\refmeta}[3][]{\cmd{\brref}\rmeta[#1]{#2}{#3}} + +\newcommand*{\file}[1]{\texttt{#1}} +\newcommand*{\pkg}[1]{\textsf{#1}} +\newcommand*{\env}[1]{\texttt{#1}} +\newcommand*{\opt}[1]{\texorpdfstring{\normalfont\texttt{\slshape#1}}{#1}} +\newcommand*{\RS}{\pkg{refstyle}} +\newcommand*{\RScfg}{\file{refstyle.cfg}} +\newcommand*{\rtp}{type} +\newcommand*{\Rtp}{Type} +\newcommand*{\okeylst}{\oarg{key\_lst}} +\newcommand*{\mkeylst}{\marg{key\_lst}} + +%---- Special eq tag command ------------------------------ + +\def\spestag#1{\stepcounter{equation}% + \gdef\tagextra##1{% + \makebox[0pt][l]{\small\quad% + \cmd{\eqlabel}\texttt{\lcbrack##1\rcbrack}}% + \gdef\tagextra####1{}}% + \tag{\theequation\tagextra{#1}}\eqlabel{#1}} + +%---- other stuff ----------------------------------------- + +\newcommand*{\ArTab}{\>\quad$\rightarrow$\quad} + +%---------------------------------------------------------- + +\EnableCrossrefs +\CodelineIndex +\RecordChanges +\setlength\hfuzz{15pt} +\hbadness=7000 +\begin{document} + \DocInput{refstyle.dtx} +\end{document} + +%</driver> +% \fi +% +% \CheckSum{552} +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% \changes{v0.0}{2002/12/01}{Initial version} +% \changes{v0.1}{2003/04/01}{First stable version} +% \changes{v0.2}{2003/07/30}{First updated version} +% \changes{v0.3}{2006/09/09}{Documentation update} +% \changes{v0.4}{2010/10/21}{Documentation update} +% \changes{v0.4}{2010/10/21}{Add \texttt{nokeyprefix} option} +% \changes{v0.5}{2010/11/02}{Documentation update} +% +% \DoNotIndex{ +% \@backslashchar, \@carcube, \@ehc, \@empty, \@firstoftwo, +% \@ifnextchar, \@ifpackageloaded, \@ifstar, \@ifundefined, \@nil, +% \@qend, \@qrelax, \@secondoftwo, \@tempa, \@undefined, +% \AtEndOfPackage, \begingroup, \csname, \CurrentOption, +% \DeclareOption, \def, \edef, \else, \endcsname, \endgroup, +% \expandafter, \fi, \gdef, \iffalse, \ifx, \InputIfFileExists, +% \let, \long, \lowercase, \MakeLowercase, \mbox, \MessageBreak, +% \NeedsTeXFormat, \newcommand, \newif, \noexpand, \PackageError, \PackageInfo, +% \PassOptionsToPackage, \RS@pkgname, \ProcessOptions, \protect, +% \providecommand, \ProvidesPackage, \relax, \renewcommand, +% \RequirePackage, \reserved@a, \reserved@b, \RS@tmpa, +% \RS@tmpb, \S, \RS@setkeys, \space, \string, \textsc, \textup, +% \unrestored@protected@xdef, \unskip, \uppercase, +% \zap@space} +% +%^^A==== Titling ========================================== +% \GetFileInfo{refstyle.sty} +% \title{\vspace*{-1cm} +% The \RS\ package\thanks{This file has version number +% \fileversion, last revised +% \filedate.}} +% \author{Danie Els\\[1ex] +% \normalsize e-mail: \texttt{\href{mailto:dnjels@gmail.com}% +% {dnjels@gmail.com}}} +% \date{\filedate} +% \maketitle +% \begin{center} +% \textbf{Overview of the \RS\ package} +% \end{center} +% \noindent +% When writing complex documents, often a large number of commands +% for different type of references are defined, for example: +% \begin{Ipara} +% |\newcommand*{\eqref}[1]{eqn~(\ref{#1})}|\\ +% |\newcommand*{\Eqref}[1]{Equation~(\ref{#1})}| +% \end{Ipara} +% The \RS\ package was developed to automate this process. The +% package provides a user interface to define sets of reference +% and label commands for each referable object such as an equation +% or a table, etc. When you declare, for example, a set of +% reference commands to an equation: +% \begin{Ipara} +% \cmd{\newref}|{eq}|\mkeylst\ +% \end{Ipara} +% \noindent +% a series of commands of the format \cmd{\eq...} and \cmd{\Eq...} +% are produced. The configuration options are set with a list of +% key-values. Prefixes, inserts and other options for all the +% different perturbations such as capitalized first letters, +% singular and plural from, etc.\ can be defined. The +% configuration can be changed temporarily with an optional list +% of key-values when the commands are used. A direct interface to +% the \pkg{varioref} package is also provided. +% This enables compact reference formats: +% \begin{Itabb} +% \hspace{14em}\=\kill +% |\eqref{e1} ...| \ArTab\eqref{e1} ...\\ +% |\Eqref[vref]{e1} ...| \ArTab\Eqref[vref]{e1} ...\\ +% |\eqref[s]{e1} and ...| \ArTab\eqref[s]{e1} and ...\\ +% |\eqref[name=eq.~]{e1} ...| \ArTab\eqref[name=eq.~]{e1} ... +% \end{Itabb} +% A range or a list of references can also be referred to in a +% consistent way. +% \begin{Itabb} +% \hspace{14em}\=\kill +% |\eqref{e1,e2,e3} ...| \ArTab\eqref{e1,e2,e3} ...\\ +% |\eqrangeref[vref]{e1}{e3} ...| \ArTab\eqrangeref[vref]{e1}{e3} ... +% \end{Itabb} +% +% Templates for the different reference types and different +% languages can be loaded with a configuring file. +% +% The package is aimed at large projects, enabling a consistent +% way of producing references throughout a project. Enough +% flexibility is provided to make local changes to a single +% reference. For large projects such as a series of books or a +% multi volume thesis, written as freestanding documents, a +% facility is provided to interface to the \pkg{xr} package for +% external document references. +% +% \medskip +% +% \begin{center} +% \begin{fminipage}[.6\textwidth] +% See also \pkg{refconfig.pdf} for setup and examples. +% \end{fminipage} +% \end{center} + +% \clearpage +% +% \tableofcontents +% \clearpage +% +% +% \section{Loading the \RS\ Package} +% +% \subsection{Document preamble} +% +% The \RS\ package is loaded in the preamble of the document: +% \begin{enumerate} +% \item[(a)] With a config file with \pkg{babel} language support +% \begin{Ipara} +% |\usepackage{varioref}[2001/09/04]%|~ +% ${\leftarrow}$ To use the \opt{vref} option\\ +% |\usepackage{refstyle}| +% \end{Ipara} +% When the package is loaded, it first searchers for a local user defined +% configuration file \file{refstyle.def}. If it is not available it +% looks for the global default config file \RScfg\ provided with this package. +% These configuration files are loaded before the package options are precess. +% It can therefore contain option commands using globally defined language +% options and can interface to \pkg{babel} for language changes. The macro +% \begin{Ipara} +% |\DeclareLangOpt{|\meta{language}|}{|\meta{definitions}|}| +% \end{Ipara} +% is provided to declare the package option \meta{language} and add +% \meta{definitions} to the |\extras|\meta{language} token for \pkg{babel}. +% It can only be used inside \RScfg\ or \file{refstyle.def}. +% +% \item[(b)] +% Or with an existing configuration with language support and addition +% of your own extensions +% \begin{Ipara} +% |\documentclass[norwegian]{article}|\\ +% |\usepackage{babel} |\\ +% |\usepackage{refstyle} |\\ +% |\RSaddto{\RSnorwegian}{% |\\ +% | \def\RSthmtxt{teorem~}% |\\ +% | \def\RSthmstxt{teorem~}% |\\ +% | \def\RSThmtxt{Teorem~}% |\\ +% | \def\RSThmstxt{Teorem~}} |\\ +% |\newref{thm}{ |\\ +% | name = \RSthmtxt, |\\ +% | names = \RSthmstxt, |\\ +% | Name = \RSThmtxt, |\\ +% | Names = \RSThmstxt, |\\ +% | rngtxt = \RSrngtxt, |\\ +% | lsttxt = \RSlsttxt, |\\ +% | lsttwotxt = \RSlsttwotxt} | +% \end{Ipara} +% +% \item[(c)] +% Or without any configuration file, but by declaring your own +% reference commands in the preamble. +% \begin{Itabb} +% \cmd{\usepackage}|[noconfig]{refstyle}|\\ +% \qquad\cmd{\newref}\marg{reftype$_{\,1}$}\mkeylst \\ +% \qquad\cmd{\newref}\marg{reftype$_{\,2}$}\mkeylst\\ +% \tab$\vdots$ +% \end{Itabb} +% +% \item[(d)] +% Or with your own configuration file (without babel language support) for a specific project: +% \begin{Itabb} +% |\usepackage[noconfig]{refstyle}|\\ +% |\input{thisproject.ref}| +% \end{Itabb} +% +% \end{enumerate} +% +% \subsection{Package options} +% +% \begin{description} +% \item[\opt{noconfig}] Neither of the user supplied \file{refstyle.def} config +% file or \file{refstyle.cfg} the config file supplied with this package +% are loaded. The user must declare his or her own definitions and templates. +% Note that these definitions are not passed on to \pkg{babel}'s language +% changing mechanisms. +% +% \item[\opt{nokeyprefix}] Custom labeling commands \argcmd{\rtp}{label} are generated +% by \pkg{refstyle} for every \meta{type} definition. It defaults to +% \begin{Itabb} +% \hspace{5em}\=hspace{5em}\=\kill +% \argcmd{\rtp}{label}|{abc}| +% \>\>~ $\rightarrow$ \cmd{\label}\rmeta{type\,:\,}{abc} +% \end{Itabb} +% With the \opt{nokeyprefix} option, the prefix is turned of and the +% labeling commands defaults to +% \begin{Itabb} +% \hspace{5em}\=hspace{5em}\=\kill +% \argcmd{\rtp}{label}|{abc}| +% \>\>~ $\rightarrow$ \cmd{\label}|{abc}| +% \end{Itabb} +% This is useful for old documents with existing labeling commands or +% where the user prefer not to use the \argcmd{\rtp}{label} commands. +% +% +% \end{description} +% +% +% +% +% \subsection{Companion packages} +% +% The \RS\ packages is intended for large projects. It is therefore +% important that it works together with, or has direct interfaces +% to the following packages: +% \begin{description} +% \item[\pkg{varioref}:\footnotemark] +% \footnotetext{\pkg{varioref} v1.3c, 2001/09/04 or later, +% because the starred versions of the commands +% are used.} +% Produce sophisticated page and page range references. +% +% \item[\pkg{hyperref}:\footnotemark] +% \footnotetext{\pkg{hyperref} v6.72r, 2002/05/27 or later, +% where a bug for interference with +% \pkg{varioref} was fixed.} +% To establish hyper links between the references and the +% labels. +% +% \item[\pkg{xr, xr-hyper}:] +% To establish references to external documents. +% +% \item[\pkg{showkeys}:] +% To show all the labels and references. This is very useful +% to find labels in large documents. +% \end{description} +% +% \clearpage +% \section{User Interface} +% +% The \RS\ package has one configuring command, \DescribeMacro{\newref} +% \cmd{\newref}, that internally creates a series of label and +% reference commands: +% \blankline +% +% \begin{cminipage}[\linewidth] +% \newcommand*{\crsi}{\smash{\rule[0pt]{.4pt}{1.25em}\rule[.5ex]{1.5em}{.4pt}}}^^A +% \newcommand*{\crsl}{\smash{\rule[.5ex]{.4pt}{1.5em}\rule[.5ex]{1.5em}{.4pt}}}^^A +% \begin{Itabb} +% \hspace*{2em}\=\hspace{2em}\=\hspace{10em}\=\kill +% \cmd{\newref}\marg{\rtp}\mkeylst\tab\mbox{}\\[.75ex] +% \>\crsi \>\argcmd{{\rtp}}{key} \> Reference argument prefix \\[.75ex] +% \>\crsl \>\argcmd{{\rtp}}{label} \> Custom label \\[.75ex] +% \>\crsl \>\argcmd{{\rtp}}{ref} \> In text reference \\[.75ex] +% \>\crsl \>\argcmd{{\Rtp}}{ref} \> Start of sentence reference \\[.75ex] +% \>\crsl \>\argcmd{{\rtp}}{rangeref} \> In text range reference \\[.75ex] +% \>\crsl \>\argcmd{{\Rtp}}{rangeref} \> Start of sentence range reference\quad\mbox{}\\[.75ex] +% \>\crsl \>\argcmd{{\rtp}}{pageref} \> Page reference +% \end{Itabb} +% \end{cminipage} +% \blankline +% +% \noindent +% All the \cmeta{\rtp}... commands, excluding \argcmd{{\rtp}}{key} +% and \argcmd{{\rtp}}{label} are robust. +% All the options for the referencing commands are set with a +% key-value list. \Tabref[vref=far]{refopt} gives a full list of all the +% key-values and defaults. +% +% The \RS\ package do not redefine any internal \LaTeX\ commands and +% depends only on the \cmd{\label}, \cmd{\ref}, \cmd{\pageref} and +% the \pkg{varioref} commands. +% The internally defined commands do not overwrite any +% existing command with the same name, and an error results if a command +% already exists. The exception is commands declared with a previous +% \cmd{\newref} call, can be redefined by calling \cmd{\newref} again +% with a new set of parameter. +% If the \pkg{amsmath} package is loaded, and you define +% \cmd{\newref}|{eq}| for references to equations, you need to +% undefine \cmd{\eqref} before issuing \cmd{\newref} by +% \begin{Ipara} +% \cmd{\let}\cmd{\eqref}|=|\cmd{\relax} +% \end{Ipara} +% +% +% \section{Command Descriptions} +% +% The structure of the label and reference commands is given by the +% syntax diagrams that follows. Examples are included for references +% to equations, defined according to the template in +% \RScfg\ with the +% \cmd{\newref}|{eq}|\mkeylst. See also \secref{keyvals} for +% explanations of the key-values. +% +% \subsection{The reference key} +% +% \begin{cminipage}[\linewidth] +% \begin{syntdiag} +% \tok{\argcmd{\rtp}{key}} +% \end{syntdiag} +% \end{cminipage} +% \blankline +% \noindent +% The \argcmd{\rtp}{key} command returns the prefix added to the +% argument of the label and the reference commands, for example: +% +% \begin{Itabb} +% \hspace{10em}\=hspace{5em}\=\kill +% \cmd{\newref}\marg{\rtp}|{}| +% \>\>\argcmd{\rtp}{key} $\rightarrow$ \meta{type\,:\,}\\ +% \cmd{\newref}\marg{\rtp}|{key=xxx-}| +% \>\>\argcmd{\rtp}{key} $\rightarrow$ |xxx-| +% \end{Itabb} +% +% \noindent +% The \argcmd{\rtp}{key} command is not a general command, but was +% provided only as a link to the standard \LaTeX{} \cmd{\ref} and +% \cmd{\pageref} commands: +% +% \begin{Itabb} +% \hspace{10em}\=hspace{5em}\=\kill +% \cmd{\label}|{|\argcmd{\rtp}{key}| abc}| +% \>\>~ $\rightarrow$ \cmd{\label}\rmeta{type\,:\,}{abc}\\ +% \cmd{\ref}|{|\argcmd{\rtp}{key}| abc}| +% \>\>~ $\rightarrow$ \cmd{\ref}\rmeta{type\,:\,}{abc} +% \end{Itabb} +% Note if the the \opt{nokeyprefix} option is active then the \argcmd{\rtp}{key} +% is empty. +% +% \blankline +% \noindent +% \textbf{\slshape Examples:} equations +% with \cmd{\newref}|{eq}|\mkeylst: +% +% \begin{Itabb} +% \hspace*{18em}\=\kill +% |\eqkey| \> \eqkey \\ +% |in eq.~\ref{\eqkey e1} ...| \>in eq.~\ref{\eqkey e1} ... \\ +% |on page \pageref{\eqkey e1} ...|\>on page \pageref{\eqkey e1} ... \\ +% |\vpageref*{\eqkey e1} ... | \>\vpageref*{\eqkey e1} ... +% \end{Itabb} +% +% \subsection{Reference label} +% +% \begin{cminipage}[\linewidth] +% \begin{syntdiag} +% \tok{\argcmd{\rtp}{label}"{"<lbl>"}"} +% \end{syntdiag} +% \end{cminipage} +% \blankline +% +% \noindent +% The command \argcmd{\rtp}{label} prefix the reference +% string in the \cmd{\label} with the string \meta{type\,:\,}, or its +% redefinition with the \opt{key} option. +% +% \begin{Itabb} +% \hspace{10em}\=hspace{5em}\=\kill +% \argcmd{\rtp}{label}|{abc}| +% \>\>~ $\rightarrow$ \cmd{\label}\rmeta{type\,:\,}{abc} +% \end{Itabb} +% \blankline +% +% \noindent +% \textbf{\slshape Examples:} +% +% \begingroup +% \begin{Ipara} +% Let $z = x+\mathrm{i} y$ and $\alpha = \beta + \mathrm{i} +% \gamma$, with $\mathrm{i}^2 = -1$, then +% \begin{align} +% &\mathrm{e}^z = \mathrm{e}^x \left(\cos y + \mathrm{i} \sin y \right) +% \spestag{e1}\\ +% &z^\alpha = \mathrm{e}^{\alpha \ln z} +% \spestag{e2}\\ +% \intertext{\Eqref{e1,e2} lead to the following interesting results:} +% &\mathrm{e}^{\mathrm{i} \pi} + 1 = 0 \spestag{e3}\\ +% &\mathrm{i}^\mathrm{i} = \mathrm{e}^{-\pi/2}\spestag{e4} +% \end{align} +% \end{Ipara} +% \endgroup +% +% +% \subsection{Reference commands} +% +% \begin{cminipage}[1.05\textwidth] +% \begin{syntdiag} +% \tok{\argcmd{\rtp}{ref}} +% \begin{stack}\\ \tok{$\ast$} \end{stack} +% \begin{stack}\\ \tok{\okeylst} \end{stack} +% "{" +% \begin{rep} \tok{<lbl>} \\ ~,~ \end{rep} +% "}" +% \end{syntdiag} +% \end{cminipage} +% \smallskip +% +% \begin{cminipage}[1.05\textwidth] +% \begin{syntdiag} +% \tok{\argcmd{\Rtp}{ref}} +% \begin{stack}\\ \tok{$\ast$} \end{stack} +% \begin{stack}\\ \tok{\okeylst} \end{stack} +% \tok{"{"} +% \begin{rep} \tok{<lbl>} \\ ~,~ \end{rep} +% \tok{"}"} +% \end{syntdiag} +% \end{cminipage} +% \blankline +% \noindent +% The |*| optional form of the \argcmd{\rtp}{ref} and +% \argcmd{\Rtp}{ref} commands eliminates the +% name prefix. The |[s]| optional key-value argument is for the +% plural form of the name prefix. +% \blankline +% +% \noindent +% \textbf{\slshape Examples:} +% \begin{Itabb} +% \hspace*{21em}\=\kill +% |in \eqref{e1} ...| \>in \eqref{e1} ... \\ +% |in \eqref[s]{e1}--\eqref*{e4} ...|\>in \eqref[s]{e1}--\eqref*{e4} ...\\ +% |in \eqref[name=eq.~]{e2} ...| \>in \eqref[name=eq.~]{e2} ... +% \end{Itabb} +% \pagebreak[1] +% \noindent +% A list of references can be used: +% \begin{Itabb} +% \hspace*{21em}\=\kill +% |in \eqref{e1,e2} ...| \>in \eqref{e1,e2} ... \\ +% |in \eqref{e1,e2,e3} ...| \>in \eqref{e1,e2,e3} ... \\ +% |in \eqref[lsttxt={, and~}]{e1,e2,e3} ...| \>in \eqref[lsttxt={, and~}]{e1,e2,e3} ... +% \end{Itabb} +% \pagebreak[2] +% The reference to the page can be included with the \opt{vref} or \opt{vref=far} +% options that activates the \pkg{varioref} reference. +% \begin{Itabb} +% \hspace*{18em}\=\kill +% |in \eqref[vref]{e1} ...| \>in \eqref[vref]{e1} ...\\ +% |in \eqref[vref=far]{e1} ...| \>in \eqref[vref=far]{e1} ... +% \end{Itabb} +% The \argcmd{\Rtp}{ref} command is identical to the +% \argcmd{\rtp}{ref} command except that it uses the \opt{Name} and +% \opt{Names} key-value options. +% \begin{Itabb} +% \hspace*{18em}\=\kill +% |\Eqref{e1} is ...| \>\Eqref{e1} is ... \\ +% |\Eqref{e1,e2} are ...| \>\Eqref{e1,e2} are ... \\ +% |\Eqref[lsttxt={\ or~}]{e1,e2,e3}| \>\Eqref[lsttxt={\ or~}]{e1,e2,e3} +% \end{Itabb} +% \noindent +% References to external documents can be added with the \opt{xr} +% option. Please read the documentation of the \pkg{xr} package. +% +% \begin{Itabb} +% \hspace{10em}\=hspace{5em}\=\kill +% \cmd{\eqref}|[|\opt{xr}|=A-]{xyz}| \> \>$\rightarrow$~ +% |equation~\ref{A-eq:xyz}| +% \end{Itabb} +% +% +% \subsection{Range reference commands} +% +% \begin{cminipage}[\linewidth] +% \begin{syntdiag} +% \tok{\argcmd{\rtp}{rangeref}} +% \begin{stack}\\ \tok{$\ast$} \end{stack} +% \begin{stack}\\ \tok{\okeylst} \end{stack} +% \tok{"{"<lbl>$_1$"}{"<lbl>$_2$"}"} +% \end{syntdiag} +% \end{cminipage} +% \smallskip +% +% \begin{cminipage}[\linewidth] +% \begin{syntdiag} +% \tok{\argcmd{\Rtp}{rangeref}} +% \begin{stack}\\ \tok{$\ast$} \end{stack} +% \begin{stack}\\ \tok{\okeylst} \end{stack} +% \tok{"{"<lbl>$_1$"}{"<lbl>$_2$"}"} +% \end{syntdiag} +% \end{cminipage} +% \blankline +% +% \noindent +% The \argcmd{\rtp}{rangeref} and \argcmd{\Rtp}{rangeref} commands +% return a range of references and take two arguments. The |*| +% optional form again eliminates the name prefix. +% \blankline +% +% \noindent +% \textbf{\slshape Examples:} +% \begin{Itabb} +% \hspace*{19em}\=\kill +% |in \eqrangeref{e1}{e4} ...| \>in \eqrangeref{e1}{e4} ... \\ +% |... and \eqrangeref*{e1}{e4} ...| \>... and \eqrangeref*{e1}{e4} ... \\ +% |\Eqrangeref{e1}{e4} are ...| \>\Eqrangeref{e1}{e4} are ... \\ +% |\Eqrangeref[vref,rngtxt=--]{e1}{e4}| \>\Eqrangeref[rngtxt=--,vref]{e1}{e4} +% \end{Itabb} +% +% +% \subsection{Page reference command}\seclabel{PRefCmds} +% +% \begin{cminipage} +% \begin{syntdiag} +% \tok{\argcmd{\rtp}{pageref}} +% \begin{stack}\\ \tok{\okeylst} \end{stack} +% \tok{"{"<lbl>"}"} +% \end{syntdiag} +% \end{cminipage} +% \blankline +% \noindent +% The \argcmd{\rtp}{pageref} commands returns the page number of a +% reference. +% \blankline +% +% \noindent +% \textbf{\slshape Examples:} +% \begin{Itabb} +% \hspace*{18em}\=\kill +% |it is on page \eqpageref{e1} ...| \>it is on page \eqpageref{e1} ...\\ +% |it is \eqpageref[vref]{e1} ...| \>it is \eqpageref[vref]{e1} ... +% \end{Itabb} +% +% +%^^A================================================================= +% \begin{table} +% \newcommand*{\Q}{\ensuremath{\blacksquare}}^^A +% \newcommand*{\X}{\ensuremath{\square}}^^A +% \setlength{\fboxsep}{1em}^^A +% \centering +% \caption[The available options and key-value parameters]^^A +% {The available options and key-value parameters for +% the label and reference commands of the \RS\ package.} +% \tablabel{refopt} +% \blankline +% \begin{cminipage}[.9\textwidth] +% \renewcommand{\thempfootnote}{\fnsymbol{mpfootnote}} +% \renewcommand{\footnoterule}{} +% \begin{tabular*}{\linewidth}{@{\extracolsep{\fill}}llccccccc@{}} +% & & \multicolumn{7}{c}{Commands\footnote{^^A +% The commands are obtained by calling the configuring command +% \cmd{\newref} and setting the default key-values. The +% active key-values can be changed temporarily inside the +% commands.}} \\ +% \cline{3-9} +% Parameter & Default & +% \begin{turn}{90}\argcmd{{\rtp}}{key}~ \end{turn}& +% \begin{turn}{90}\argcmd{{\rtp}}{label}~ \end{turn}& +% \begin{turn}{90}\argcmd{{\rtp}}{ref}~ \end{turn}& +% \begin{turn}{90}\argcmd{{\Rtp}}{ref}~ \end{turn}& +% \begin{turn}{90}\argcmd{{\rtp}}{rangeref}~ \end{turn}& +% \begin{turn}{90}\argcmd{{\Rtp}}{rangeref}~ \end{turn}& +% \begin{turn}{90}\argcmd{{\rtp}}{pageref}~ \end{turn}\\ +% \hline +% \noalign{\smallskip} +% ~$\ast$ & &\X &\X &\Q &\Q &\Q &\Q &\X\\ +% \okeylst & &\X &\X &\Q &\Q &\Q &\Q &\Q\\[1ex] +% \opt{key} &|={|\meta{\rtp:}|},| &\X &\X &\Q &\Q &\Q &\Q &\Q\\ +% \opt{s} & |={true}|\footnote{^^A +% Options defaults to \opt{true} but is initialized +% as \opt{false}. The \argcmd{{\rtp}}{ref}\texttt{[s]}\marg{lbl} +% command results in the plural: \opt{names}. +% The same principle is also valid for the \opt{vref} +% option.\fnlabel{b}}|,| +% &\X &\X &\Q &\Q &\X &\X &\X\\ +% \opt{vref} &|={true}|\fnref*{b}|,| +% &\X &\X &\Q &\Q &\Q &\Q &\Q\\ +% \opt{xr} &|={},| &\X &\X &\Q &\Q &\Q &\Q &\Q\\[1ex] +% \opt{name} &|={},| &\X &\X &\Q &\X &\X &\X &\X\\ +% \opt{names}\footnote{^^A +% Option depends on the selection of the \texttt{s=true/false} +% optional key-value for singular or plural.\fnlabel{c}} +% &|={},| &\X &\X &\Q &\X &\Q &\X &\X\\ +% \opt{Name} &|={},| &\X &\X &\X &\Q &\X &\X &\X\\ +% \opt{Names}\fnref*{c} +% &|={},| &\X &\X &\X &\Q &\X &\Q &\X\\ +% \opt{lsttwotxt} &|={\space and~},| &\X &\X &\Q &\Q &\X &\X &\X\\ +% \opt{lsttxt} &|={\space and~},| &\X &\X &\Q &\Q &\X &\X &\X\\ +% \opt{rngtxt} &|={\space to~},| &\X &\X &\X &\X &\Q &\Q &\X\\[1ex] +% \opt{refcmd} &|=\ref{#1},| &\X &\X &\Q &\Q &\Q &\Q &\Q\\ +% +% \hline +% \noalign{\smallskip} +% +% \footnotesize \Q\ -- \makebox[0pt][l]{\footnotesize Available}\\ +% \footnotesize \X\ -- \makebox[0pt][l]{Not available} +% \end{tabular*} +% \end{cminipage} +% \end{table} +%^^A================================================================= +% +% +% +% \clearpage +% \section{\pkg{Keyval} Optional Arguments}\seclabel{keyvals} +% +% Al the options for the referencing commands are set with a key-value +% list. \Tabref[vref]{refopt} gives a full list of all the key-values and +% defaults. The options can also be changed locally with the +% \okeylst\ optional arguments. +% +% +% \subsection{Identifier: \opt{key}} +% +% The \opt{key} key-value is the prefix to the reference label +% of the \cmd{\ref} and \cmd{\pageref} commands. +% The default is \opt{key=}\meta{type\,:\,}. +% With the default \RScfg: +% +% \begin{Itabb} +% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill +% \cmd{\newref}|{tab}{...}|\\[1ex] +% \>|\tablabel{abc}| +% \>~ $\rightarrow$ |\label{tab:abc}|\\ +% \>|\tabref{abc}| +% \>~ $\rightarrow$ |table~\ref{tab:abc}|\\[1ex] +% \cmd{\newref}|{tab}{key=xxx-,...}|\\[1ex] +% \>|\tablabel{abc}| +% \>~ $\rightarrow$ |\label{xxx-abc}|\\ +% \>|\tabref{abc}| +% \>~ $\rightarrow$ |table~\ref{xxx-abc}| +% \end{Itabb} +% For existing documents containing labels such as |\label{tab:xx}|, +% you can use the \opt{nokeyprefix} option which defines \opt{key}|={}|. The +% normal \cmd{\label} command can then be used and the reference +% commands defaults to +% \begin{Itabb} +% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill +% \>\cmd{\label}|{tab:xx}| \\ +% \>|\tabref{tab:xx}| \>~ $\rightarrow$ |table~\ref{tab:xx}| +% \end{Itabb} +% +% +% \subsection{Plural form: \opt{s}} +% +% The \opt{s} conditional option (\texttt{true/false}) switches the +% singular/plural form of the reference on and off. The default is +% \opt{s}\texttt{=true}, but it is initialized to \texttt{false}. +% \begin{Itabb} +% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill +% |\tabref{abc}| +% \>\>~ $\rightarrow$ |table~\ref{tab:abc}|\\ +% |\tabref[s]{abc}| +% \>\>~ $\rightarrow$ |tables~\ref{tab:abc}| +% \end{Itabb} +% +% +% \subsection{Extended reference: \opt{vref}} +% +% The \opt{vref} conditional option (\texttt{true/far/false}) switches the +% \pkg{varioref} page referencing on and off. The default is +% \opt{vref}\texttt{=true}, but it is initialized to \texttt{false}. +% +% \begin{Itabb} +% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill +% |\tabref{abc}| +% \>\>~ $\rightarrow$ |table~\ref{tab:abc}|\\ +% |\tabref[vref]{abc}| +% \>\>~ $\rightarrow$ |table~\ref{tab:abc}| +% |\vpageref[\unskip]{tab:abc}|\\ +% |\tabref[vref=far]{abc}|^^A +% \>\>~ $\rightarrow$ |table~\ref{tab:abc}| +% |\reftextfaraway{tab:abc}| +% \end{Itabb} +% +% +% \subsection{External interfaces: \opt{xr}} +% +% The \opt{xr} option is for references to external documents. +% It inserts a prefix in the reference label, compatible with the +% \pkg{xr} package. The default is \opt{xr}|={}|. +% +% External document can be defined in the preamble with the +% \pkg{xr} or \pkg{xr-hyper} packages: +% \begin{Ipara} +% \cmd{\usepackage}|{xr}|\\ +% \cmd{\externaldocument}\oarg{xr\_key}\marg{filename} +% \end{Ipara} +% +% \noindent +% If, for example, an external document defined with +% \meta{xr\_key}\texttt{=\{A-\}}, uses an identical setup (e.g.\ the same +% \RScfg), then it can be referenced with +% +% \begin{Itabb} +% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill +% |\tabref[xr=A-]{abc}| +% \>\>~ $\rightarrow$ |table~\ref{A-tab:abc}| +% \end{Itabb} +% \noindent or otherwise +% \begin{Itabb} +% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill +% |\tabref[xr=A-,key=]{abc}| +% \>\>~ $\rightarrow$ |table~\ref{A-abc}| +% \end{Itabb} +% +% +% \subsection{Language parameters: \opt{name}, \opt{names}, +% \opt{Name}, \opt{Names}, \opt{rngtxt}, \opt{lsttwotxt}, \opt{lsttxt}} +% \seclabel{langopts} +% +% This key-values contain the text prefixes and insertions. +% Every house style or user has his or her own preference for naming the reference types, +% therefore are there no defaults provided. +% +% \begin{Itabb} +% \hspace*{1.5cm}\=\hspace{7cm}\=\kill +% \opt{name} \> ---~Inside sentence reference prefix (singular) +% \> default=|{}|\\ +% \opt{names}\> ---~Inside sentence reference prefix (plural) +% \> default=|{}|\\ +% \opt{Name} \> ---~First word reference prefix (singular) +% \> default=|{}|\\ +% \opt{Names}\> ---~First word reference prefix (plural) +% \> default=|{}|\\ +% \opt{rngtxt}\> ---~Range of references +% \> default=|{\ to~}|\\ +% \opt{lsttwotxt}\> ---~List of references (two) +% \> default=|{\ and~}|\\ +% \opt{lsttxt}\> ---~List of references (more than two) +% \> default=|{\ and~}| +% \end{Itabb} +% \noindent +% Good typographic style manuals recommend the minimum use of +% capital letters and punctuation that breaks the flow of a sentence +% or paragraph. For abbreviations, Bringhurst\cite{Bring1996} +% recommends the Oxford house style: Use a period only when the word +% stops prematurely. The period is omitted if the abbreviation +% begins with the first letter and end with the last. As an example +% for equations, use eq.~(1) or eqn~(1). +% A good guideline is not to abbreviate any reference type names. +% If a sentence starts with a +% reference then the type name must always be written in full. +% A typical example for references to a table is: +% \begin{Ipara} +% \opt{name}| ={table~}, |\opt{names}| ={tables~},|\\ +% \opt{Name}| ={Table~}, |\opt{Names}| ={Tables~},|\\ +% \opt{rngtxt}|={\ to~}, |\opt{lsttxt}|={, and~}, |\opt{lsttwotxt}|={\ and~},| +% \end{Ipara} +% Note the hardspace after the text. It is needed to keep the text +% and the reference together on the same line. +% +% The \RS\ configuration file can be setup to interface with \pkg{babel} +% for different languages or for automatic language changes inside a +% document. The language specific key-values can be added to the +% \pkg{babel} hook |\extras|\meta{language}. The command +% \DescribeMacro{\DeclareLangOpt}\cmd{\DeclareLangOpt}\footnote{^^A +% Only for use in \RScfg\ the default config file} +% is provided to supply a \meta{language} option to the package +% and to add the option contents to |\extras|\meta{language}. The +% default config file contains the following lines for equations: +% \begin{Ipara} +% |\newcommand\RSenglish{% |\\ +% | \def\RSeqtxt{equation~}% |\\ +% | \def\RSeqstxt{equations~}%|\\ +% | \def\RSEqtxt{Equation~}% |\\ +% | \def\RSEqstxt{Equations~}%|\\ +% | : |\\ +% | } |\\ +% |\DeclareLangOpt{english}{\RSenglish}| +% \end{Ipara} +% \DescribeMacro{\RSaddto}or manually with the \cmd{\RSaddto} command +% \begin{Ipara} +% |\RSaddto{\extrasenglish}{\RSenglish}| +% \end{Ipara} +% The key-value options for language specific options +% are then set as: +% \begin{Ipara} +% |\newref{eq}{% |\\ +% | name = \RSeqtxt, |\\ +% | names = \RSeqstxt,|\\ +% | Name = \RSEqtxt, |\\ +% | Names = \RSEqstxt,|\\ +% | : |\\ +% | } | +% \end{Ipara} +% +% \noindent\LaTeX{}/\pkg{babel} provides some language specific +% names that can be utilized. +% +% \begin{Ipara} +% |\chaptername \appendixname|\\ +% |\figurename \tablename|\\ +% |\partname \pagename| +% \end{Ipara} +% +% To setup a multilingual document with \pkg{babel}, +% \emph{always} make the language options global so that other +% language compliant packages can detect it. +% A typical setup for an Afrikaans/English document would be: +% {\makeatletter\def\meta@font@select{\normalfont\ttfamily\slshape} +% \begin{Ipara} +% |\documentclass[UKenglish,afrikaans,|\meta{options}|]{|\meta{LaTeX\_class}|}|\\ +% |\usepackage[T1]{fontenc}%..|\texttt{\slshape hyphenation of words with accents}\\ +% |\usepackage{babel}%........|\texttt{\slshape language def's}\\ +% |\usepackage{varioref}%.....|\texttt{\slshape for \opt{vref} option}\\ +% |\usepackage{refstyle}| +% \end{Ipara}} +% +% +% \subsection{Reference formatting command: \opt{refcmd}} +% +% The \opt{refcmd} key-value holds the contents of the internal +% command that formats the reference. The |#1| parameter +% passed to the command is the full reference label. +% For example: +% \begin{Itabb} +% \hspace{10em}\=hspace{5em}\=\kill +% \opt{refcmd}|=(\ref{#1})| \> $\rightarrow$~ +% |(\ref{|\meta{label}|})| +% \end{Itabb} +% +% External commands can be employed. For example, to make references +% to equations identical to the \AmS\ \cmd{\eqref} command: +% \begin{Itabb} +% \opt{refcmd}|={\textup{\tagform@{\ref{#1}}}}%|~~It needs \file{amsmath.sty} +% \end{Itabb} +% +% The \opt{refcmd} can be used in conjuntion with the |\ifRSstar|, +% |\ifRSnameon|, |\ifRSplural| and |\ifRScapname| internal +% conditional variables to format the reference. As an example for a +% reference to a footnote, where a duplicate footnote mark is needed, +% can the \opt{refcmd} be configured so that the starred form of the +% reference command produce a superscripted duplicate mark: +% \begin{Itabb} +% |\newcommand{\RSfnmark}[1]{%|\\ +% | \begingroup |\\ +% | \unrestored@protected@xdef\@thefnmark{#1}%|\\ +% | \endgroup |\\ +% | \@footnotemark} |\\[1ex] +% \opt{refcmd}|={\ifRSstar\RSfnmark{\ref{#1}}\else(\ref{#1})\fi}| +% \end{Itabb} +% \noindent The second footnote mark, \fnref*[name]{b}, in +% \tabref[vref]{refopt}, was obtained in this way with the reference +% |\fnref*{b}|. See \RScfg\ for another +% example for references to chapters and appendices. +% +% The \pkg{nameref} package can easily be incorporated if you need elaborate +% references which include the section or chapter name: +% \begin{Ipara} +% |\Secref[vref, refcmd={\S\ref{#1}, `\nameref{#1}'}]{PRefCmds}| +% \end{Ipara} +% gives +% \begin{Ipara} +% \Secref[vref, refcmd={\S\ref{#1}, `\nameref{#1}'}]{PRefCmds} +% \end{Ipara} +% +% \section{Default configuration files} +% +% The \pkg{refstyle} package first searches for the \file{refstyle.def} +% configuration file, and if it not found, then it uses the default +% configuration file \RScfg\ that is supplied with the package. +% +% The default configuration file, \RScfg, makes a +% number of default reference declarations and provides language +% definitions for the language parameters. See the file +% \file{refconfig.pdf} for the documentation. +% \medskip +% +% \begin{center} +% \begin{fminipage}[.55\textwidth] +% \slshape Any user is welcome to customize the +% local copy of the \RScfg\ file or copy +% the relevant contents to your own \file{refstyle.def} +% configuration file. +% \end{fminipage} +% \end{center} +% +% \begin{thebibliography}{99} +% \bibitem{Bring1996} +% {Bringhurst, R.} (1996), \emph{The elements of typographic style}, +% Hartley \& Marks Publishers, Point Roberts, WA, USA and Vancouver, +% BC, Canada, second edn. +% \end{thebibliography} +% +% \StopEventually{\PrintChanges\PrintIndex} +% \clearpage +% +% \section{Implementation: \pkg{refstyle.sty}} +% +% \subsection{Identification} +% \begin{macrocode} +%<*pkg> +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{refstyle}[\RefstyleFileDate\space + \RefstyleFileVersion\space + Reference formatting (DNJ Els)] +\newcommand*{\RS@pkgname}{refstyle} +% \end{macrocode} +% +% +% \subsection{External packages} +% +% Load all the external packages. +% \begin{macrocode} +\RequirePackage{keyval} +% \end{macrocode} +% +% \begin{macro}{\RS@setkeys} +% \changes{v0.3}{2006/09/09}{original \cmd{\setkeys} copy} +% Note if \pkg{xkeyval} is loaded, it redefines \pkg{keyval}'s +% macros. To fix this bug, we need the original \cmd{\setkeys} +% command. +% \begin{macrocode} +\def\RS@setkeys#1#2{% + \def\KV@prefix{KV@#1@}% + \let\@tempc\relax + \KV@do#2,\relax,} +% \end{macrocode} +% \end{macro} +% +% \noindent A small bug-fix for \pkg{showkeys}. Will be removed +% after release of new version. +% +% \begin{macrocode} +\@ifundefined{vref@space}{\let\vref@space\space}{} +% \end{macrocode} +% +% \begin{macro}{\@safe@activestrue} +% \changes{v0.5}{2010/11/02}{Add \cmd{\@safe@activesfalse}} +% \begin{macro}{\@safe@activesfalse} +% \changes{v0.5}{2010/11/02}{Add \cmd{\@safe@activestrue}} +% If \pkg{babel} is not loaded, make the following +% commands inactive. +% \begin{macrocode} +\providecommand*{\@safe@activestrue}{} +\providecommand*{\@safe@activesfalse}{} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \subsection{Utility commands} +% +% \begin{macro}{\RS@namelet} +% \begin{macro}{\RS@nameuse} +% \begin{macro}{\RS@namedef} +% \begin{macro}{\RS@robustnamedef} +% \noindent +% The following is a list of commands that take a variable \marg{name} +% as argument. This enables on-the-fly definitions of user commands. +% \begin{Itabb} +% Usage:~\=\cmd{\RS@robustnamedef}\marg{name}~\=\kill +% Usage: +% \>\cmd{\RS@namelet}\marg{name} +% \> $\rightarrow$ \cmd{\let}\cmeta{name}\\ +% \>\cmd{\RS@nameuse}\marg{name} +% \> $\rightarrow$ \cmeta{name}\\ +% \>\cmd{\RS@namedef}\marg{name} +% \> $\rightarrow$ \cmd{\def}\cmeta{name}\\ +% \>\cmd{\RS@robustnamedef}\marg{name} +% \> $\rightarrow$ +% \cmd{\def}\cmeta{name}|{\protect|\cmeta{name\textvisiblespace}|}|^^A +% \cmd{\def}\cmeta{name\textvisiblespace} +% \end{Itabb} +% \begin{macrocode} +\newcommand*{\RS@namelet}[1]{\expandafter\let\csname #1\endcsname} +\newcommand*{\RS@nameuse}[1]{\csname #1\endcsname} +\newcommand*{\RS@namedef}[1]{\expandafter\def\csname #1\endcsname} +\newcommand*{\RS@robustnamedef}[1]{% + \expandafter\edef\csname #1\endcsname{% + \noexpand\protect\RS@nameuse{#1 }}% + \RS@namedef{#1 }} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\RS@ifundefined} +% This is an improved definition\footnote{Posted by Markus Kohm +% on c.t.t. 2002/11/11} for the \LaTeX{} kernel command +% \cmd{\@ifundefined} that do not leave an undefined command +% defined as \cmd{\relax} after the test. +% +% The usage is: +% \cmd{\RS@ifundefined}\marg{name}\marg{true}\marg{false} executes +% the contents of \meta{true} if \cmeta{name} is not defined and +% \meta{false} if defined. +% \begin{macrocode} +\def\RS@ifundefined#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname#1\endcsname\relax + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@removedef} +% The command removes the definition of a command, including +% robust definitions. +% \begin{macrocode} +\newcommand*{\RS@removedef}[1]{% + \RS@namelet{#1}\@undefined% + \RS@ifundefined{#1 }{}{\RS@namelet{#1 }\@undefined}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@testednamedef} +% \begin{macro}{\RS@testedrobustnamedef} +% These command are identical to \cmd{\RS@namedef} and +% \cmd{\RS@robustnamedef}, but only define the \cmeta{name} +% command if it is legal. Otherwise an error message +% is written to the log file and the program is terminated. +% \begin{macrocode} +\newcommand*{\RS@testednamedef}[1]{% + \RS@ifnamedefinable{#1}\RS@namedef{#1}} +% \end{macrocode} +% \begin{macrocode} +\newcommand*{\RS@testedrobustnamedef}[1]{% + \RS@ifnamedefinable{#1}\RS@robustnamedef{#1}} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\RS@ifnamedefinable} +% A modified version of the \LaTeX{} kernel command +% (from ltdefns.dtx). +% \begin{macrocode} +\long\def\RS@ifnamedefinable #1{% + \edef\reserved@a{#1}% + \RS@ifundefined\reserved@a + {\edef\reserved@b{\expandafter\@carcube \reserved@a xxx\@nil}% + \ifx \reserved@b\@qend \RS@notdefinable\else + \ifx \reserved@a\@qrelax \RS@notdefinable\else + \PackageInfo{\RS@pkgname}{\@backslashchar\reserved@a\space created}% + \fi + \fi}% + \RS@notdefinable} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@notdefinable} +% The error message when an illegal definition is attempted. +% \begin{macrocode} +\gdef\RS@notdefinable{% + \PackageError{\RS@pkgname}{% + Command \@backslashchar\reserved@a\space + already defined.\MessageBreak + Or name \@backslashchar\@qend... illegal.\MessageBreak + It can not be redefined by the \@backslashchar newref% + }{% + If \@backslashchar\reserved@a\space is not important\MessageBreak + then \protect\let\@backslashchar\reserved@a% + =\protect\relax,\MessageBreak + else use a different \@backslashchar newref.}% + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@setbool} +% The command\footnote{Taken from the \pkg{ifthen} package.} +% \cmd{\RS@setbool}\marg{conditional}\marg{true/false} +% sets the \meta{conditional} to |true| or |false|. +% \begin{Itabb} +% Usage:~\= +% \cmd{\RS@setbool}|{RSplural}{false}|\quad\=$\rightarrow$\quad +% |\RSpluralfalse|\\ +% \>\cmd{\RS@setbool}|{RSplural}{true}|\quad\>$\rightarrow$\quad +% |\RSpluraltrue| +% \end{Itabb} +% +% \begin{macrocode} +\newcommand*{\RS@setbool}[2]{% + \lowercase{\def\@tempa{#2}}% + \@ifundefined{@tempswa\@tempa}% + {\PackageError{\RS@pkgname}% + {You can only set the option to `true' or `false'}\@ehc}% + {\csname#1\@tempa\endcsname}} +% \end{macrocode} +% \end{macro} +% +% +% \subsection{First character case changes} +% +% \begin{macro}{\RS@firstcap} +% This macro\footnote{Posted by Dan Luecking on c.t.t.} change the +% first character of a string to uppercase and returns the result +% in \cmd{\RS@cap}. +% \begin{Ipara} +% Usage:~|\RS@fistcap xxxx\@nil| then |\RS@cap| $\rightarrow$ |Xxxx| +% \end{Ipara} +% \begin{macrocode} +\def\RS@firstcap#1#2\@nil{% + \iffalse{\fi + \uppercase{\edef\RS@cap{\iffalse}\fi#1}#2}}% +% \end{macrocode} +% \end{macro} +% +% +% +% \subsection{Reference building commands} +% +% \begin{macro}{\ifRS@keyactive} +% \changes{v0.4}{2010/10/21}{Add \opt{nokeyprefix} to turn of the key prefix} +% We need to peek into the options list for the \opt{nokeyprefix} option +% before the options are processed to find out if the key prefix must be +% included in the |\|\meta{key}|label| command. Make \opt{nokeyprefix} +% not used afterwards. +% \begin{macrocode} +\newif\ifRS@keyactive +\@ifpackagewith{\@currname}{nokeyprefix}% + {\RS@keyactivefalse}% + {\RS@keyactivetrue} +\DeclareOption{nokeyprefix}{\OptionNotUsed} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\ifRSstar} +% \begin{macro}{\ifRSnameon} +% \begin{macro}{\ifRScapname} +% \begin{macro}{\ifRSplural} +% \begin{macro}{\ifRSlsttwo} +% \changes{v0.4}{2010/10/21}{Add \cmd{\ifRSlsttwo} test for list containing only two parameter} +% The |\if| conditional values that are set by the reference commands. +% These values can be accessed by user defined key-values. +% \begin{macrocode} +\newif\ifRSstar\RSstarfalse +\newif\ifRSnameon\RSnameontrue +\newif\ifRScapname\RScapnamefalse +\newif\ifRSplural\RSpluralfalse +\newif\ifRSlsttwo\RSlsttwofalse +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% +% \begin{macro}{\newref} +% The main user interface for template setup. It take the |#1| or +% \meta{key} parameter and make it lowercase before passing it on to +% \cmd{\RS@newref}. +% +% +% \begin{macrocode} +\newcommand*{\newref}[1]{% + \lowercase{\def\RS@tempa{#1}}% + \expandafter\RS@newref\expandafter{\RS@tempa}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@newref} +% \changes{v0.4}{2010/10/21}{Ad \texttt{lsttwotxt} option} +% This command configures a new template. +% \begin{macrocode} +\newcommand*{\RS@newref}[2]{% +% \end{macrocode} +% \bNP[2.0]\noindent Clears an existing template before defining a new one.\eNP +% \begin{macrocode} + \RS@clearref{#1}% +% \end{macrocode} +% \bNP[2.0]\noindent Create |\ifRS@|\meta{key}|vref| conditional \eNP +% \begin{macrocode} +% \expandafter\newif\csname ifRS@#1vref\endcsname% +% \end{macrocode} +% \bNP[2.0]\noindent Creates a series of key-values for every template +% that stores the setup for the specific template.\eNP +% \begin{macrocode} + \ifRS@keyactive + \define@key{RS@#1}{key}[#1:]{\RS@namedef{RS@#1@key}{##1}}% + \else + \define@key{RS@#1}{key}[]{\RS@namedef{RS@#1@key}{##1}}% + \fi + \define@key{RS@#1}{s}[true]{\RS@setbool{RSplural}{##1}}% + \define@key{RS@#1}{name}[]{\RS@namedef{RS@#1@name}{##1}}% + \define@key{RS@#1}{names}[]{\RS@namedef{RS@#1@names}{##1}}% + \define@key{RS@#1}{Name}[]{\RS@namedef{RS@#1@Name}{##1}}% + \define@key{RS@#1}{Names}[]{\RS@namedef{RS@#1@Names}{##1}}% + \define@key{RS@#1}{rngtxt}[\space to~]{\RS@namedef{RS@#1@rngtxt}{##1}}% + \define@key{RS@#1}{lsttwotxt}[\space and~]{\RS@namedef{RS@#1@lsttwotxt}{##1}}% + \define@key{RS@#1}{lsttxt}[\space and~]{\RS@namedef{RS@#1@lsttxt}{##1}}% + \define@key{RS@#1}{refcmd}[\ref{####1}]{\RS@namedef{RS@#1@rcmd}####1{##1}}% + \define@key{RS@#1}{xr}[]{\RS@namedef{RS@#1@xr}{##1}}% + \define@key{RS@#1}{vref}[true]{\RS@namedef{RS@#1vref}{##1}}% +% \end{macrocode} +% \bNP[2.0]\noindent Set default key-value parameters.\eNP +% \begin{macrocode} + \RS@setkeys{RS@#1}{key, + s=false, + name,names,Name,Names, + rngtxt,lsttwotxt,lsttxt, + refcmd, + xr, + vref=false}% +% \end{macrocode} +% \bNP[2.0]\noindent Set key-values according to user definitions.\eNP +% \begin{macrocode} + \RS@setkeys{RS@#1}{#2}% +% \end{macrocode} +% \bNP[2.0]\noindent Build the reference commands.\eNP +% \begin{macrocode} + \RS@buildref{#1}% + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@clearref} +% Clear a reference template for redefinition. It check +% if the template already exists and clear it if it does. +% +% \begin{macrocode} +\newcommand*{\RS@clearref}[1]{% + \RS@ifundefined{RS@#1@template} + {\RS@namedef{RS@#1@template}{#1}% + \PackageInfo{\RS@pkgname}% + {New reference template \protect\newref{#1}}{}} + {\PackageInfo{\RS@pkgname}% + {Reference template \protect\newref{#1} redefined}{} + \RS@firstcap#1\@nil + \RS@removedef{#1key}% + \RS@removedef{#1label}% + \RS@removedef{#1ref}% + \RS@removedef{\RS@cap ref}% + \RS@removedef{#1rangeref}% + \RS@removedef{\RS@cap rangeref}% + \RS@removedef{#1pageref}% + }% + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@buildref} +% Build the reference commands. See \tabref{refopt} for the list of +% commands. The \cmd{\RS@buildref}\marg{key} build commands to +% call \cmd{\RS@cmd}\marg{cmd}\marg{key}, for example: +% \begin{Ipara} +% \cmeta{key}|ref| \quad$\rightarrow$\quad +% |{\RScapnamefalse\RS@cmd{ref}|\marg{key}|}| +% \end{Ipara} +% \changes{v0.2}{2003/07/30}{Remove robust def of \argcmd{{\rtp}}{label}} +% \begin{macrocode} +\newcommand*{\RS@buildref}[1]{% + \RS@firstcap#1\@nil + \RS@testednamedef{#1key}{\RS@nameuse{RS@#1@key}} + \RS@testednamedef{#1label}##1{\label{\RS@nameuse{RS@#1@key}##1}} + \RS@testedrobustnamedef{#1ref}{\RScapnamefalse\RS@cmd{ref}{#1}} + \RS@testedrobustnamedef{\RS@cap ref}{\RScapnametrue\RS@cmd{ref}{#1}} + \RS@testedrobustnamedef{#1rangeref}{\RScapnamefalse\RS@cmd{rangeref}{#1}} + \RS@testedrobustnamedef{\RS@cap rangeref}{\RScapnametrue\RS@cmd{rangeref}{#1}} + \RS@testedrobustnamedef{#1pageref}{\RScapnamefalse\RS@cmd{pageref}{#1}} + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@cmd} +% \begin{macro}{\RS@@cmd} +% The command \cmd{\RS@cmd}\marg{cmd}\marg{key} calls the final +% reference formatting commands. +% It checks for the starred form and set the conditionals +% |\ifRSstar| and |\ifRSnameon| accordingly. +% It also extracts the optional key-value list. +% \begin{Itabb} +% \hspace*{4.5cm}\=\kill +% \cmd{\RS@cmd}|{ref}|\marg{key} \>$\rightarrow$\quad +% |\RS@ref|\marg{key}\okeylst\\ +% \cmd{\RS@cmd}|{rangeref}|\marg{key} \>$\rightarrow$\quad +% |\RS@rangeref|\marg{key}\okeylst\\ +% \cmd{\RS@cmd}|{pageref}|\marg{key} \>$\rightarrow$\quad +% |\RS@pageref|\marg{key}\okeylst +% \end{Itabb} +% \begin{macrocode} +\newcommand*{\RS@cmd}[2]{% + \@ifstar{\RSstartrue\RSnameonfalse\RS@@cmd{#1}{#2}}% + {\RSstarfalse\RSnameontrue\RS@@cmd{#1}{#2}}} +% \end{macrocode} +% \begin{macrocode} +\newcommand*{\RS@@cmd}[2]{% + \@ifnextchar[% + {\RS@nameuse{RS@#1}{#2}}% + {\RS@nameuse{RS@#1}{#2}[]}} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% +% \subsection{Reference formatting commands} +% +% \begin{macro}{\RS@ref} +% \changes{v0.5}{2010/11/02}{Add \cmd{\@safe@activestrue} to avoid active chars is ref list} +% \begin{macro}{\RS@@ref} +% \begin{macro}{\RS@@@ref} +% \changes{v0.4}{2010/10/21}{Add \cmd{\ifRSlsttwo} test for list containing only two parameter} +% The command \cmd{\RS@ref}\marg{key}\okeylst\marg{label\_lst} +% typeset the references to the comma-separated reference +% label list according to the configuration for \meta{key}. +% +% First of all, remove all spaces for the reference label list. +% \begin{macrocode} +\def\RS@ref#1[#2]#3{% + \begingroup + \RS@setkeys{RS@#1}{#2}% + \@safe@activestrue% + \edef\RS@tmpa{\zap@space#3 \@empty}% + \@safe@activesfalse% + \edef\RS@tmpa{\noexpand\RS@@ref{#1} \RS@tmpa,\relax\noexpand\@eolst}% + \RS@tmpa% + \endgroup} +% \end{macrocode} +% \end{macro} +% Check if there is a single or multiple references in the +% reference label list. If a single reference label then use the +% form set by the \opt{s} key-value. If multiple reference labels +% the use the plural form of the name prefix.\footnote{ +% The list of reference commands came from the \pkg{typedref} package.} +% +% \begin{macrocode} +\def\RS@@ref#1 #2,#3\@eolst{% + \ifx\relax#3\relax + \RS@makename{#1}% + \RS@makeref{#1}{#2}% + \RS@makevpageref{#1}{#2}% + \else + \RSpluraltrue% + \RS@makename{#1}% + \RS@makeref{#1}{#2}% + \RS@makevpageref{#1}{#2}% + \RSnameonfalse% + \RSlsttwotrue% + \RS@@@ref{#1} #3\@eolst% + \fi} +% \end{macrocode} +% \end{macro} +% For more than one reference in the reference list, typeset the +% rest of the references. +% \begin{macrocode} +\def\RS@@@ref#1 #2,#3\@eolst{% + \ifx\relax#3\relax + \ifRSlsttwo + \RS@nameuse{RS@#1@lsttwotxt}% + \else + \RS@nameuse{RS@#1@lsttxt}% + \fi + \RS@makeref{#1}{#2}% + \RS@makevpageref{#1}{#2}% + \else + \RSlsttwofalse% + \unskip,\space% + \RS@makeref{#1}{#2}% + \RS@makevpageref{#1}{#2}% + \RS@@@ref{#1} #3\@eolst% + \fi} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@rangeref} +% The command \cmd{\RS@rangeref}\marg{key}\okeylst\marg{lbl1}\marg{lbl2} +% typeset the references as a range. +% \begin{macrocode} +\def\RS@rangeref#1[#2]#3#4{% + \begingroup + \RS@setkeys{RS@#1}{#2}% + \RSpluraltrue% + \RS@makename{#1}% + \RS@makeref{#1}{#3}% + \RS@nameuse{RS@#1@rngtxt}% + \RSnameonfalse% + \RS@makeref{#1}{#4}% + \RS@makevpagerefrange{#1}{#3}{#4}% + \endgroup} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@pageref} +% The command \cmd{\RS@pageref}\marg{key}\okeylst\marg{lbl} type +% the page where \marg{lbl} was defined. +% \begin{macrocode} +\def\RS@pageref#1[#2]#3{% + \begingroup% + \RS@setkeys{RS@#1}{#2}% + \RS@ifvref{#1}% + {\mbox{}\vpageref*{\RS@lbl{#1}{#3}}}% + {\reftextfaraway{\RS@lbl{#1}{#3}}}% + {\pageref{\RS@lbl{#1}{#3}}}% + \endgroup} +% \end{macrocode} +% \end{macro} +% +% \changes{v0.2}{2003/07/30}{Remove redundant \cmd{\RS@label}} +% +% \begin{macrocode} +\newcommand*{\RS@true}{true} +\newcommand*{\RS@false}{false} +\newcommand*{\RS@far}{far} +% \end{macrocode} +% +% \begin{macro}{\RS@ifvref} +% The command \cmd{\RS@ifvref}\marg{key}\marg{true}\marg{faraway}\marg{false} +% executes the contents of \meta{true} if the \opt{vref} option for +% the \meta{key} reference type is true and \meta{false} otherwise. +% \begin{macrocode} +\newcommand{\RS@ifvref}[4]{% + \edef\RS@tempa{\RS@nameuse{RS@#1vref}}% + \ifx\RS@tempa\RS@true\relax + #2% + \else\ifx\RS@tempa\RS@far\relax + #3% + \else\ifx\RS@tempa\RS@false\relax + #4% + \else + \PackageError{\RS@pkgname}% + {You can only set the vref option to `true', `far' or `false'}\@ehc + \fi\fi\fi} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@makename} +% The command \cmd{\RS@makename}\marg{key} build the prefix +% to the reference commands. +% \begin{macrocode} +\newcommand{\RS@makename}[1]{% + \ifRSstar\else\ifRSnameon + \ifRSplural + \ifRScapname + \RS@nameuse{RS@#1@Names}% + \else + \RS@nameuse{RS@#1@names}% + \fi + \else + \ifRScapname + \RS@nameuse{RS@#1@Name}% + \else + \RS@nameuse{RS@#1@name}% + \fi + \fi + \fi\fi + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@lbl} +% This command builds the full label string for the \cmd{\ref} +% command. +% \begin{Ipara} +% \cmd{\RS@lbl}\marg{key}\marg{label} \quad$\rightarrow$\quad +% |{|\meta{xr_key}\meta{key}\meta{label}|}| +% \end{Ipara} +% \begin{macrocode} +\newcommand*{\RS@lbl}[2]{% + \RS@nameuse{RS@#1@xr}\RS@nameuse{RS@#1@key}#2% + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@makeref} +% The command \cmd{\RS@makeref}\marg{key}\marg{label} formats +% the \cmd{\ref} output +% \begin{Ipara} +% \cmd{\RS@makeref}\marg{key}\marg{label} \quad$\rightarrow$\quad +% \cmeta{rcmd}|{\ref{|\meta{xr_key}\meta{key}\meta{label}|}}| +% \end{Ipara} +% \begin{macrocode} +\newcommand{\RS@makeref}[2]{% + \RS@nameuse{RS@#1@rcmd}{\RS@lbl{#1}{#2}}% + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@makevpageref} +% The command \cmd{\RS@makevpageref}\marg{key}\marg{label} adds the +% \pkg{varioref} page reference if the \opt{vref} option is true. +% \begin{macrocode} +\newcommand{\RS@makevpageref}[2]{% + \RS@ifvref{#1}% + {\vpageref[\unskip]{\RS@lbl{#1}{#2}}}% + { \reftextfaraway{\RS@lbl{#1}{#2}}}% + {}% + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RS@makevpagerefrange} +% The command \cmd{\RS@makevpagerefrange}\marg{key}\marg{lbl1}\marg{lbl1} +% adds the \pkg{varioref} page range reference if the \opt{vref} +% option is true. +% \begin{macrocode} +\newcommand{\RS@makevpagerefrange}[3]{% + \RS@ifvref{#1}% + {\space\vpagerefrange[\unskip]{\RS@lbl{#1}{#2}}{\RS@lbl{#1}{#3}}}% + {\space\vpagerefrange[\unskip]{\RS@lbl{#1}{#2}}{\RS@lbl{#1}{#3}}}% + {}% + } +% \end{macrocode} +% \end{macro} +% +% +% \subsection{\pkg{varioref} command predefinitions} +% +% \begin{macrocode} +\AtBeginDocument{% + \providecommand{\vpageref}{% + \PackageError{\RS@pkgname}% + {The vref option used, but varioref.sty not loaded.}% + {Load varioref.sty}} + \providecommand{\reftextfaraway}{% + \PackageError{\RS@pkgname}% + {The vref=far option used, but varioref.sty not loaded.}% + {Load varioref.sty}} + \providecommand{\vpagerefrange}{% + \PackageError{\RS@pkgname}% + {The vref option used, but varioref.sty not loaded.}% + {Load varioref.sty}} + } +% \end{macrocode} +% +% +% \subsection{Support for language option inclusions in config file} +% +% \begin{macro}{\RSaddto} +% \changes{v0.2}{2003/07/30}{Rename \cmd{\RS@addto} to \cmd{\RSaddto}} +% Command from the \pkg{varioref} package is used to add +% language definitions to the |\extras|\meta{language} token +% for \pkg{babel}. +% \begin{macrocode} +\def\RSaddto#1#2{% + #2% + \@temptokena{#2}% + \ifx#1\relax + \let#1\@empty + \fi + \ifx#1\undefined + \edef#1{\the\@temptokena}% + \else + \toks@\expandafter{#1}% + \edef#1{\the\toks@\the\@temptokena}% + \fi + \@temptokena{}\toks@\@temptokena} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\DeclareLangOpt} +% \changes{v0.5}{2010/11/02}{Add \cmd{\extras}\meta{language} to beginning of document.} +% Command to declare a language option and add +% language definitions to the |\extras|\meta{language} token +% for \pkg{babel}. +% \begin{macrocode} +\def\DeclareLangOpt#1#2{% + \edef\RS@tempa{\expandafter\@gobble\string#2}% + \RS@ifundefined{\RS@tempa}% + {\PackageError{\RS@pkgname}{% + Unknown definitions \@backslashchar\RS@tempa\MessageBreak + for language option `#1'}{}}% + {\DeclareOption{#1}{% + \AtBeginDocument{\expandafter\RSaddto\csname extras#1\endcsname #2}}}% + } +% \end{macrocode} +% \end{macro} +% +% +% +% \subsection{Configuration files} +% +% \begin{macro}{\RS@cfgfile,\RS@reffile} +% \changes{v0.4}{2010/10/21}{Ad alternative definition file \cmd{refstyle.def}} +% Define the config file and alternate definition file names. +% \begin{macrocode} +\newcommand*{\RS@cfgfile}{refstyle.cfg} +\newcommand*{\RS@reffile}{refstyle.def} +% \end{macrocode} +% \end{macro} +% +% We need to peek into the options list before the +% options are processed to find out if the config +% file is to be loaded or not. The config file can +% contain options and must be loaded before +% \cmd{\ProcessOptions}. Make \opt{noconfig} not used +% afterwards. +% +% We first test for a local config file \file{refstyle.def} +% and then for the global config file \file{refstyle.cfg}. +% \begin{macrocode} +\@ifpackagewith{\@currname}{noconfig}% + {\PackageInfo{\RS@pkgname}{No config file loaded}}% + {\InputIfFileExists{\RS@reffile}% + {\PackageInfo{\RS@pkgname}{Local config file \RS@reffile\space used}} + {\InputIfFileExists{\RS@cfgfile}% + {\PackageInfo{\RS@pkgname}{Config file \RS@cfgfile\space used}}% + {\PackageInfo{\RS@pkgname}{No config file found}}}} +% \end{macrocode} +% +% \begin{macrocode} +\DeclareOption{noconfig}{\OptionNotUsed}% +% \end{macrocode} +% +% Process the options, including options in config file. +% \begin{macrocode} +\ProcessOptions*\relax +% \end{macrocode} +% +% The end of this package. +% \begin{macrocode} +%</pkg> +% \end{macrocode} +% +% \Finale +\endinput diff --git a/macros/latex/contrib/refstyle/refstyle.ins b/macros/latex/contrib/refstyle/refstyle.ins index ced9ef9722..5d69497509 100644 --- a/macros/latex/contrib/refstyle/refstyle.ins +++ b/macros/latex/contrib/refstyle/refstyle.ins @@ -1,97 +1,92 @@ -% refstyle.ins
-% Copyright (C) 2002--2010 Danie Els
-%
-% -------------------------------------------------------------------
-% The refstyle package
-% for the formatting of references
-% -------------------------------------------------------------------
-% This work may be distributed and/or modified under the conditions
-% of the LaTeX Project Public License, either version 1.3c of this
-% license or (at your option) any later version. The latest version
-% of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work is "maintained" (as per LPPL maintenance status)
-% by Danie Els (dnjels@sun.ac.za).
-%
-% This package consists of the files: refstyle.dtx
-% refconfig.dtx
-% refstyle.ins
-% and the derived files: refstyle.sty
-% refstyle.cfg
-% -------------------------------------------------------------------
-% This file will generate fast loadable files and documentation
-% driver files from the doc files in this package when run through
-% LaTeX or TeX.
-% -------------------------------------------------------------------
-
-\def\batchfile{refstyle.ins}
-\def\filedate{2010/10/21}
-\input docstrip.tex
-\keepsilent
-
-\declarepreamble\package
-
-Copyright (C) 2002--2010 Danie Els
-
--------------------------------------------------------------------
- The refstyle package
- for the formatting of references
--------------------------------------------------------------------
-This work may be distributed and/or modified under the conditions
-of the LaTeX Project Public License, either version 1.3c of this
-license or (at your option) any later version. The latest version
-of this license is in
- http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
-version 2005/12/01 or later.
-
-This work is "maintained" (as per LPPL maintenance status)
-by Danie Els (dnjels@sun.ac.za).
--------------------------------------------------------------------
-
-\endpreamble
-
-\generate{%
- \askforoverwritefalse
- \usepreamble\package
- \file{refstyle.sty}{\from{refstyle.dtx}{pkg}}}
-
-
-
-
-\declarepreamble\config
-
--------------------------------------------------------------------
- The refstyle package
- for the formatting of references
--------------------------------------------------------------------
-This file may be customized to suit specific user requirements.
-
-Original by Danie Els <dnjels@sun.ac.za>
--------------------------------------------------------------------
-
-\endpreamble
-\generate{%
- \askforoverwritefalse
- \usepreamble\config
- \file{refstyle.cfg}{\from{refconfig.dtx}{cfg}}}
-
-
-\obeyspaces
-\Msg{**********************************************************}
-\Msg{* *}
-\Msg{* To finish the installation you have to move the *}
-\Msg{* following files into a directory searched by TeX: *}
-\Msg{* *}
-\Msg{* refstyle.sty *}
-\Msg{* refstyle.cfg *}
-\Msg{* *}
-\Msg{* To produce the documentation run the file ustitle.dtx *}
-\Msg{* through LaTeX. *}
-\Msg{* *}
-\Msg{* Happy TeXing! *}
-\Msg{**********************************************************}
-\endbatchfile
+% refstyle.ins +% Copyright (C) 2002--2024 Danie Els +% +% ------------------------------------------------------------------- +% The refstyle package +% for the formatting of references +% ------------------------------------------------------------------- +% This work may be distributed and/or modified under the conditions +% of the LaTeX Project Public License, either version 1.3c of this +% license or (at your option) any later version. The latest version +% of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2008/12/01 or later. +% +% This work has the LPPL maintenance status 'maintained'. +% +% This Current Maintainer of this work is Danie Els (dnjels@gmail.com) +% +% This package consists of the files: refstyle.dtx +% refconfig.dtx +% refstyle.ins +% and the derived files: refstyle.sty +% refstyle.cfg +% ------------------------------------------------------------------- + +\def\batchfile{refstyle.ins} +\def\filedate{2024/01/31} +\input docstrip.tex +\keepsilent + +\declarepreamble\package + +Copyright (C) 2002--2024 Danie Els + +------------------------------------------------------------------- + The refstyle package + for the formatting of references +------------------------------------------------------------------- +This work may be distributed and/or modified under the conditions +of the LaTeX Project Public License, either version 1.3c of this +license or (at your option) any later version. The latest version +of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3c or later is part of all distributions of LaTeX +version 2008/12/01 or later. + +This work has the LPPL maintenance status 'maintained'. + +This Current Maintainer of this work is Danie Els (dnjels@gmail.com) +------------------------------------------------------------------- + +\endpreamble + +\generate{% + \askforoverwritefalse + \usepreamble\package + \file{refstyle.sty}{\from{refstyle.dtx}{pkg}}} + + +\declarepreamble\config + +------------------------------------------------------------------- + The refstyle package + for the formatting of references +------------------------------------------------------------------- +This file may be customized to suit specific user requirements. + +Original by Danie Els (dnjels@gmail.com) +------------------------------------------------------------------- + +\endpreamble +\generate{% + \askforoverwritefalse + \usepreamble\config + \file{refstyle.cfg}{\from{refconfig.dtx}{cfg}}} + + +\obeyspaces +\Msg{*************************************************************} +\Msg{* To finish the installation you have to move the *} +\Msg{* following files into a directory searched by TeX: *} +\Msg{* refstyle.sty *} +\Msg{* refstyle.cfg *} +\Msg{* *} +\Msg{* To produce the documentation run through LaTeX the files: *} +\Msg{* refstyle.dtx *} +\Msg{* refconfig.dtx *} +\Msg{* *} +\Msg{* Happy TeXing! *} +\Msg{*************************************************************} +\endbatchfile diff --git a/macros/latex/contrib/refstyle/refstyle.pdf b/macros/latex/contrib/refstyle/refstyle.pdf Binary files differindex 0e94b7db28..a7bc463295 100644 --- a/macros/latex/contrib/refstyle/refstyle.pdf +++ b/macros/latex/contrib/refstyle/refstyle.pdf diff --git a/macros/latex/contrib/refstyle/refstyle.sty b/macros/latex/contrib/refstyle/refstyle.sty deleted file mode 100644 index 11f0c3606b..0000000000 --- a/macros/latex/contrib/refstyle/refstyle.sty +++ /dev/null @@ -1,327 +0,0 @@ -%%
-%% This is file `refstyle.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% refstyle.dtx (with options: `pkg')
-%%
-%% Copyright (C) 2002--2010 Danie Els
-%%
-%% -------------------------------------------------------------------
-%% The refstyle package
-%% for the formatting of references
-%% -------------------------------------------------------------------
-%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3c of this
-%% license or (at your option) any later version. The latest version
-%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This work is "maintained" (as per LPPL maintenance status)
-%% by Danie Els (dnjels@sun.ac.za).
-%% -------------------------------------------------------------------
-%%
-\newcommand*{\RefstyleFileDate}{2010/11/02}
-\newcommand*{\RefstyleFileVersion}{v0.5}
-
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{refstyle}[\RefstyleFileDate\space
- \RefstyleFileVersion\space
- Reference formatting (DNJ Els)]
-\newcommand*{\RS@pkgname}{refstyle}
-\RequirePackage{keyval}
-\def\RS@setkeys#1#2{%
- \def\KV@prefix{KV@#1@}%
- \let\@tempc\relax
- \KV@do#2,\relax,}
-\@ifundefined{vref@space}{\let\vref@space\space}{}
-\providecommand*{\@safe@activestrue}{}
-\providecommand*{\@safe@activesfalse}{}
-\newcommand*{\RS@namelet}[1]{\expandafter\let\csname #1\endcsname}
-\newcommand*{\RS@nameuse}[1]{\csname #1\endcsname}
-\newcommand*{\RS@namedef}[1]{\expandafter\def\csname #1\endcsname}
-\newcommand*{\RS@robustnamedef}[1]{%
- \expandafter\edef\csname #1\endcsname{%
- \noexpand\protect\RS@nameuse{#1 }}%
- \RS@namedef{#1 }}
-\def\RS@ifundefined#1{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname#1\endcsname\relax
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi}
-\newcommand*{\RS@removedef}[1]{%
- \RS@namelet{#1}\@undefined%
- \RS@ifundefined{#1 }{}{\RS@namelet{#1 }\@undefined}}
-\newcommand*{\RS@testednamedef}[1]{%
- \RS@ifnamedefinable{#1}\RS@namedef{#1}}
-\newcommand*{\RS@testedrobustnamedef}[1]{%
- \RS@ifnamedefinable{#1}\RS@robustnamedef{#1}}
-\long\def\RS@ifnamedefinable #1{%
- \edef\reserved@a{#1}%
- \RS@ifundefined\reserved@a
- {\edef\reserved@b{\expandafter\@carcube \reserved@a xxx\@nil}%
- \ifx \reserved@b\@qend \RS@notdefinable\else
- \ifx \reserved@a\@qrelax \RS@notdefinable\else
- \PackageInfo{\RS@pkgname}{\@backslashchar\reserved@a\space created}%
- \fi
- \fi}%
- \RS@notdefinable}
-\gdef\RS@notdefinable{%
- \PackageError{\RS@pkgname}{%
- Command \@backslashchar\reserved@a\space
- already defined.\MessageBreak
- Or name \@backslashchar\@qend... illegal.\MessageBreak
- It can not be redefined by the \@backslashchar newref%
- }{%
- If \@backslashchar\reserved@a\space is not important\MessageBreak
- then \protect\let\@backslashchar\reserved@a%
- =\protect\relax,\MessageBreak
- else use a different \@backslashchar newref.}%
- }
-\newcommand*{\RS@setbool}[2]{%
- \lowercase{\def\@tempa{#2}}%
- \@ifundefined{@tempswa\@tempa}%
- {\PackageError{\RS@pkgname}%
- {You can only set the option to `true' or `false'}\@ehc}%
- {\csname#1\@tempa\endcsname}}
-\def\RS@firstcap#1#2\@nil{%
- \iffalse{\fi
- \uppercase{\edef\RS@cap{\iffalse}\fi#1}#2}}%
-\newif\ifRS@keyactive
-\@ifpackagewith{\@currname}{nokeyprefix}%
- {\RS@keyactivefalse}%
- {\RS@keyactivetrue}
-\DeclareOption{nokeyprefix}{\OptionNotUsed}
-\newif\ifRSstar\RSstarfalse
-\newif\ifRSnameon\RSnameontrue
-\newif\ifRScapname\RScapnamefalse
-\newif\ifRSplural\RSpluralfalse
-\newif\ifRSlsttwo\RSlsttwofalse
-\newcommand*{\newref}[1]{%
- \lowercase{\def\RS@tempa{#1}}%
- \expandafter\RS@newref\expandafter{\RS@tempa}}
-\newcommand*{\RS@newref}[2]{%
- \RS@clearref{#1}%
- \ifRS@keyactive
- \define@key{RS@#1}{key}[#1:]{\RS@namedef{RS@#1@key}{##1}}%
- \else
- \define@key{RS@#1}{key}[]{\RS@namedef{RS@#1@key}{##1}}%
- \fi
- \define@key{RS@#1}{s}[true]{\RS@setbool{RSplural}{##1}}%
- \define@key{RS@#1}{name}[]{\RS@namedef{RS@#1@name}{##1}}%
- \define@key{RS@#1}{names}[]{\RS@namedef{RS@#1@names}{##1}}%
- \define@key{RS@#1}{Name}[]{\RS@namedef{RS@#1@Name}{##1}}%
- \define@key{RS@#1}{Names}[]{\RS@namedef{RS@#1@Names}{##1}}%
- \define@key{RS@#1}{rngtxt}[\space to~]{\RS@namedef{RS@#1@rngtxt}{##1}}%
- \define@key{RS@#1}{lsttwotxt}[\space and~]{\RS@namedef{RS@#1@lsttwotxt}{##1}}%
- \define@key{RS@#1}{lsttxt}[\space and~]{\RS@namedef{RS@#1@lsttxt}{##1}}%
- \define@key{RS@#1}{refcmd}[\ref{####1}]{\RS@namedef{RS@#1@rcmd}####1{##1}}%
- \define@key{RS@#1}{xr}[]{\RS@namedef{RS@#1@xr}{##1}}%
- \define@key{RS@#1}{vref}[true]{\RS@namedef{RS@#1vref}{##1}}%
- \RS@setkeys{RS@#1}{key,
- s=false,
- name,names,Name,Names,
- rngtxt,lsttwotxt,lsttxt,
- refcmd,
- xr,
- vref=false}%
- \RS@setkeys{RS@#1}{#2}%
- \RS@buildref{#1}%
- }
-\newcommand*{\RS@clearref}[1]{%
- \RS@ifundefined{RS@#1@template}
- {\RS@namedef{RS@#1@template}{#1}%
- \PackageInfo{\RS@pkgname}%
- {New reference template \protect\newref{#1}}{}}
- {\PackageInfo{\RS@pkgname}%
- {Reference template \protect\newref{#1} redefined}{}
- \RS@firstcap#1\@nil
- \RS@removedef{#1key}%
- \RS@removedef{#1label}%
- \RS@removedef{#1ref}%
- \RS@removedef{\RS@cap ref}%
- \RS@removedef{#1rangeref}%
- \RS@removedef{\RS@cap rangeref}%
- \RS@removedef{#1pageref}%
- }%
- }
-\newcommand*{\RS@buildref}[1]{%
- \RS@firstcap#1\@nil
- \RS@testednamedef{#1key}{\RS@nameuse{RS@#1@key}}
- \RS@testednamedef{#1label}##1{\label{\RS@nameuse{RS@#1@key}##1}}
- \RS@testedrobustnamedef{#1ref}{\RScapnamefalse\RS@cmd{ref}{#1}}
- \RS@testedrobustnamedef{\RS@cap ref}{\RScapnametrue\RS@cmd{ref}{#1}}
- \RS@testedrobustnamedef{#1rangeref}{\RScapnamefalse\RS@cmd{rangeref}{#1}}
- \RS@testedrobustnamedef{\RS@cap rangeref}{\RScapnametrue\RS@cmd{rangeref}{#1}}
- \RS@testedrobustnamedef{#1pageref}{\RScapnamefalse\RS@cmd{pageref}{#1}}
- }
-\newcommand*{\RS@cmd}[2]{%
- \@ifstar{\RSstartrue\RSnameonfalse\RS@@cmd{#1}{#2}}%
- {\RSstarfalse\RSnameontrue\RS@@cmd{#1}{#2}}}
-\newcommand*{\RS@@cmd}[2]{%
- \@ifnextchar[%
- {\RS@nameuse{RS@#1}{#2}}%
- {\RS@nameuse{RS@#1}{#2}[]}}
-\def\RS@ref#1[#2]#3{%
- \begingroup
- \RS@setkeys{RS@#1}{#2}%
- \@safe@activestrue%
- \edef\RS@tmpa{\zap@space#3 \@empty}%
- \@safe@activesfalse%
- \edef\RS@tmpa{\noexpand\RS@@ref{#1} \RS@tmpa,\relax\noexpand\@eolst}%
- \RS@tmpa%
- \endgroup}
-\def\RS@@ref#1 #2,#3\@eolst{%
- \ifx\relax#3\relax
- \RS@makename{#1}%
- \RS@makeref{#1}{#2}%
- \RS@makevpageref{#1}{#2}%
- \else
- \RSpluraltrue%
- \RS@makename{#1}%
- \RS@makeref{#1}{#2}%
- \RS@makevpageref{#1}{#2}%
- \RSnameonfalse%
- \RSlsttwotrue%
- \RS@@@ref{#1} #3\@eolst%
- \fi}
-\def\RS@@@ref#1 #2,#3\@eolst{%
- \ifx\relax#3\relax
- \ifRSlsttwo
- \RS@nameuse{RS@#1@lsttwotxt}%
- \else
- \RS@nameuse{RS@#1@lsttxt}%
- \fi
- \RS@makeref{#1}{#2}%
- \RS@makevpageref{#1}{#2}%
- \else
- \RSlsttwofalse%
- \unskip,\space%
- \RS@makeref{#1}{#2}%
- \RS@makevpageref{#1}{#2}%
- \RS@@@ref{#1} #3\@eolst%
- \fi}
-\def\RS@rangeref#1[#2]#3#4{%
- \begingroup
- \RS@setkeys{RS@#1}{#2}%
- \RSpluraltrue%
- \RS@makename{#1}%
- \RS@makeref{#1}{#3}%
- \RS@nameuse{RS@#1@rngtxt}%
- \RSnameonfalse%
- \RS@makeref{#1}{#4}%
- \RS@makevpagerefrange{#1}{#3}{#4}%
- \endgroup}
-\def\RS@pageref#1[#2]#3{%
- \begingroup%
- \RS@setkeys{RS@#1}{#2}%
- \RS@ifvref{#1}%
- {\mbox{}\vpageref*{\RS@lbl{#1}{#3}}}%
- {\reftextfaraway{\RS@lbl{#1}{#3}}}%
- {\pageref{\RS@lbl{#1}{#3}}}%
- \endgroup}
-\newcommand*{\RS@true}{true}
-\newcommand*{\RS@false}{false}
-\newcommand*{\RS@far}{far}
-\newcommand{\RS@ifvref}[4]{%
- \edef\RS@tempa{\RS@nameuse{RS@#1vref}}%
- \ifx\RS@tempa\RS@true\relax
- #2%
- \else\ifx\RS@tempa\RS@far\relax
- #3%
- \else\ifx\RS@tempa\RS@false\relax
- #4%
- \else
- \PackageError{\RS@pkgname}%
- {You can only set the vref option to `true', `far' or `false'}\@ehc
- \fi\fi\fi}
-\newcommand{\RS@makename}[1]{%
- \ifRSstar\else\ifRSnameon
- \ifRSplural
- \ifRScapname
- \RS@nameuse{RS@#1@Names}%
- \else
- \RS@nameuse{RS@#1@names}%
- \fi
- \else
- \ifRScapname
- \RS@nameuse{RS@#1@Name}%
- \else
- \RS@nameuse{RS@#1@name}%
- \fi
- \fi
- \fi\fi
- }
-\newcommand*{\RS@lbl}[2]{%
- \RS@nameuse{RS@#1@xr}\RS@nameuse{RS@#1@key}#2%
- }
-\newcommand{\RS@makeref}[2]{%
- \RS@nameuse{RS@#1@rcmd}{\RS@lbl{#1}{#2}}%
- }
-\newcommand{\RS@makevpageref}[2]{%
- \RS@ifvref{#1}%
- {\vpageref[\unskip]{\RS@lbl{#1}{#2}}}%
- { \reftextfaraway{\RS@lbl{#1}{#2}}}%
- {}%
- }
-\newcommand{\RS@makevpagerefrange}[3]{%
- \RS@ifvref{#1}%
- {\space\vpagerefrange[\unskip]{\RS@lbl{#1}{#2}}{\RS@lbl{#1}{#3}}}%
- {\space\vpagerefrange[\unskip]{\RS@lbl{#1}{#2}}{\RS@lbl{#1}{#3}}}%
- {}%
- }
-\AtBeginDocument{%
- \providecommand{\vpageref}{%
- \PackageError{\RS@pkgname}%
- {The vref option used, but varioref.sty not loaded.}%
- {Load varioref.sty}}
- \providecommand{\reftextfaraway}{%
- \PackageError{\RS@pkgname}%
- {The vref=far option used, but varioref.sty not loaded.}%
- {Load varioref.sty}}
- \providecommand{\vpagerefrange}{%
- \PackageError{\RS@pkgname}%
- {The vref option used, but varioref.sty not loaded.}%
- {Load varioref.sty}}
- }
-\def\RSaddto#1#2{%
- #2%
- \@temptokena{#2}%
- \ifx#1\relax
- \let#1\@empty
- \fi
- \ifx#1\undefined
- \edef#1{\the\@temptokena}%
- \else
- \toks@\expandafter{#1}%
- \edef#1{\the\toks@\the\@temptokena}%
- \fi
- \@temptokena{}\toks@\@temptokena}
-\def\DeclareLangOpt#1#2{%
- \edef\RS@tempa{\expandafter\@gobble\string#2}%
- \RS@ifundefined{\RS@tempa}%
- {\PackageError{\RS@pkgname}{%
- Unknown definitions \@backslashchar\RS@tempa\MessageBreak
- for language option `#1'}{}}%
- {\DeclareOption{#1}{%
- \AtBeginDocument{\expandafter\RSaddto\csname extras#1\endcsname #2}}}%
- }
-\newcommand*{\RS@cfgfile}{refstyle.cfg}
-\newcommand*{\RS@reffile}{refstyle.def}
-\@ifpackagewith{\@currname}{noconfig}%
- {\PackageInfo{\RS@pkgname}{No config file loaded}}%
- {\InputIfFileExists{\RS@reffile}%
- {\PackageInfo{\RS@pkgname}{Local config file \RS@reffile\space used}}
- {\InputIfFileExists{\RS@cfgfile}%
- {\PackageInfo{\RS@pkgname}{Config file \RS@cfgfile\space used}}%
- {\PackageInfo{\RS@pkgname}{No config file found}}}}
-\DeclareOption{noconfig}{\OptionNotUsed}%
-\ProcessOptions*\relax
-\endinput
-%%
-%% End of file `refstyle.sty'.
diff --git a/macros/latex/contrib/schooldocs/schooldocs-examples.pdf b/macros/latex/contrib/schooldocs/schooldocs-examples.pdf Binary files differindex e4277bbdbe..1d653303b0 100644 --- a/macros/latex/contrib/schooldocs/schooldocs-examples.pdf +++ b/macros/latex/contrib/schooldocs/schooldocs-examples.pdf diff --git a/macros/latex/contrib/schooldocs/schooldocs-examples.tex b/macros/latex/contrib/schooldocs/schooldocs-examples.tex new file mode 100644 index 0000000000..0c35f10b7a --- /dev/null +++ b/macros/latex/contrib/schooldocs/schooldocs-examples.tex @@ -0,0 +1,327 @@ + +\documentclass[a4paper,11pt]{article} + +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage[english]{babel} +\usepackage{times,lmodern,charter} +\usepackage{schooldocs} +\usepackage{enumerate} +\usepackage{multicol} +\usepackage{centeredline} +\usepackage{hyperref} +\usepackage{lipsum} + +\definecolor{darkbrown}{rgb}{0.5,0.1,0.1} + +\pagestyle{collection} +\title{The schooldocs package} +\subject{Example file for titles and styles} +\author{Antoine Missier} +\institute{Royal College of Pataphysics} +\date{December 28, 2023} +\renewcommand{\titlestyle}{\Huge} %\sffamily +\hypersetup{colorlinks, linkcolor=blue} +%\setcounter{tocdepth}{0} + +\begin{document} + +\maketitle + +On the following pages we showcase various title formatting options +and the different styles. +This initial page has been created using the \textbf{collection} style, for which +the main title style has been redefined through +\verb|\renewcommand{\titlestyle}{\Huge}|. + + +\medskip +In most examples (dated may 4, 2020), we have utilized +the \textsf{lmodern} package font, which pairs well with a sans-serif title style. +To achieve this, simply redefine the title style using +\smallskip +\centeredline{\verb|\renewcommand\titelstyle{\LARGE\bfseries\sffamily}|.} + +\smallskip +For examples dated january 25 or december 28, 2023, we have opted +for the \textsf{charter}, or \textsf{times} fonts. +For these fonts, the default title style setting +\verb|\LARGE\bfseries| is suitable. + + +\seprule + +\begin{center} \Large \color{darkbrown} +\bfseries Table of contents +\end{center} + +\bigskip + +\begin{multicols}{2} +\begin{enumerate}[\bfseries 1.] + \item \hyperlink{schooldocs-example-center}{\bfseries The standard title} + \item \hyperlink{schooldocs-example-left}{\bfseries A left-aligned title} + \item \hyperlink{schooldocs-example-right}{\bfseries A right-aligned title} + \item \hyperlink{schooldocs-example-norule}{\bfseries + The standard title without rule} + \item \hyperlink{schooldocs-example-boxed}{\bfseries A title in boxed shape} + \item \hyperlink{schooldocs-example-seprule}{\bfseries + The \texttt{\textbackslash seprule} and \texttt{\textbackslash correct} macros} + \item \hyperlink{schooldocs-example-small}{\bfseries A ``small'' title} + \item \hyperlink{schooldocs-example-classic}{\bfseries The classic style layout} + \item \hyperlink{schooldocs-example-elegant}{\bfseries The elegant style layout} + \item \hyperlink{schooldocs-example-modern}{\bfseries The modern style layout} + \item \hyperlink{schooldocs-example-soft}{\bfseries The soft style layout} + \item \hyperlink{schooldocs-example-exam}{\bfseries The exam style layout} + \item \hyperlink{schooldocs-example-examcorrect}{\bfseries + Exam style with the \texttt{\textbackslash correct} macro} + \item \hyperlink{schooldocs-example-collection}{\bfseries The collection style layout} + \item \hyperlink{schooldocs-example-identity}{\bfseries + The identity style in collection} + \item \hyperlink{schooldocs-example-small-identity}{\bfseries + A ``small'' title with identity} + \item \hyperlink{schooldocs-example-modern-small-identity}{\bfseries + Small title, identity and modern style} + \item \hyperlink{schooldocs-example-left-identity}{\bfseries + A left-aligned title with identity} +\end{enumerate} +\end{multicols} + +\newpage +\hypertarget{schooldocs-example-center}{} +\addcontentsline{toc}{section}{The standard title} + +\fontfamily{lmr}\selectfont +\pagestyle{empty} +\lfoot{} +\cfoot{} +\rfoot{} +\renewcommand{\subjectstyle}{} +\renewcommand{\authorstyle}{} +\renewcommand{\datestyle}{} +\renewcommand{\titlestyle}{\LARGE\bfseries\sffamily} +\renewcommand\subjectstyle{\large} +\setlength{\titletopskip}{-1.32cm} +\setlength\titlesep{2\medskipamount} +\schooldocstitles +\title{The standard title} +\subject[Pathography / M2A]{Pathography / Master 2A} +\date{May 4, 2020} + +\maketitle +\lipsum[1] + +\newpage +\hypertarget{schooldocs-example-left}{} +\addcontentsline{toc}{section}{A left-aligned title} + +\renewcommand{\titleflush}{flushleft} +\title{A left-aligned title} +\maketitle +\lipsum[1] + +\newpage +\hypertarget{schooldocs-example-right}{} + +\renewcommand{\titleflush}{flushright} +\title{A right-aligned title} +\maketitle +\lipsum[1] + +\newpage +\hypertarget{schooldocs-example-norule}{} + +\renewcommand{\titleflush}{center} +\title{The standard title without rule} +\maketitle[0pt] +\lipsum[1] + +\newpage +\hypertarget{schooldocs-example-boxed}{} + +\renewcommand{\titlestyle}{\LARGE\sffamily\bfseries\boxedshape} +\title{A title in boxed shape} +\maketitle +\lipsum[1] + +\newpage +\hypertarget{schooldocs-example-seprule}{} + +\renewcommand{\titlestyle}{\LARGE\bfseries\sffamily} +\title{The \textbackslash seprule and \textbackslash correct macros} +\correct +\maketitle +\lipsum[1]\seprule\lipsum[2]\seprule\lipsum[3] + +\newpage +\hypertarget{schooldocs-example-small}{} + +\fontfamily{bch}\selectfont +\title{A ``small'' title} +\date{January 25, 2023} +\makesmalltitle +\lipsum[1] + +\newpage +\hypertarget{schooldocs-example-classic}{} + +\fontfamily{lmr}\selectfont +\setcounter{page}{1} +\pagestyle{classic} +\title[The classic style]{The classic style layout} +\date{May 4, 2020} +\maketitle +\section*{Pellentesque a nulla} +\lipsum[1-3] +\section*{Vestibulum lectus} +\lipsum[5-9] + +\newpage +\hypertarget{schooldocs-example-elegant}{} + +\setcounter{page}{1} +\setcounter{section}{0} +\addtolength{\headheight}{-\baselineskip} +\pagestyle{elegant} +\title[The elegant style]{The elegant style layout} +\schooldocstitles +\maketitle +\section*{Pellentesque a nulla} +\lipsum[1-3] +\section*{Vestibulum lectus} +\lipsum[5-9] + +\newpage +\hypertarget{schooldocs-example-modern}{} + +\setcounter{page}{1} +\setcounter{section}{0} +\renewcommand{\headrulewidth}{0.4pt} +\pagestyle{modern} +\title[The modern style]{The modern style layout} +\maketitle +\section*{Pellentesque a nulla} +\lipsum[1-3] +\section*{Vestibulum lectus} +\lipsum[5-9] + +\newpage +\hypertarget{schooldocs-example-soft}{} + +\setcounter{page}{1} +\setcounter{section}{0} +\pagestyle{soft} +\title[The soft style]{The soft style layout} +\maketitle +\section*{Pellentesque a nulla} +\lipsum[1-3] +\section*{Vestibulum lectus} +\lipsum[5-9] + +\newpage +\hypertarget{schooldocs-example-exam}{} + +\setcounter{page}{1} +\setcounter{section}{0} +\fontfamily{ptm}\selectfont +\pagestyle{exam} +\title[The exam style]{The exam style layout} +\date{December 28, 2023} +\subtitle{Duration of the test: 2\,h} +\maketitle +\section*{Pellentesque a nulla} +\lipsum[1-3] +\section*{Vestibulum lectus} +\lipsum[5-9] + +\newpage +\hypertarget{schooldocs-example-examcorrect}{} + +\setcounter{page}{1} +\setcounter{section}{0} +\correct +\maketitle +\section*{Pellentesque a nulla} +\lipsum[1-3] +\section*{Vestibulum lectus} +\lipsum[5-9] + +\newpage +\hypertarget{schooldocs-example-collection}{} + +\setcounter{page}{1} +\setcounter{section}{0} +\fontfamily{bch}\selectfont +\pagestyle{collection} +\title[The collection style]{The collection style layout} +\date{December 28, 2023} +\subtitle{Duration of the test: 2\,h} +\maketitle +\section*{Ultrices bibendum} +\lipsum +\lipsum[1-3] +\section*{Etiam facilisis} +\lipsum[1-5] + +\newpage +\hypertarget{schooldocs-example-identity}{} + +\thispagestyle{identity} +Here we present a single page with the \textbf{identity} style +within a document using the collection style. +\par\medskip +\textbf{Question:} Analyze the previous text and provide a written summary of its content. + +\newpage +\lfoot{} +\cfoot{\thepage} +\rfoot{} +\renewcommand{\subjectstyle}{} +\renewcommand{\authorstyle}{} +\renewcommand{\datestyle}{} +\hypertarget{schooldocs-example-small-identity}{} + +\setcounter{page}{1} +\renewcommand{\titlestyle}{\LARGE\bfseries} +\renewcommand\subjectstyle{\large} +\renewcommand{\headrulewidth}{0pt} +\setlength{\titletopskip}{-1.32cm} +\setlength\titlesep{2\medskipamount} +\title{A ``small'' title} +\date{January 25, 2023} +\thispagestyle{identity} +\schooldocstitles +\makesmalltitle +\lipsum[1] + +\newpage +\hypertarget{schooldocs-example-modern-small-identity}{} + +\setcounter{page}{1} +\setcounter{section}{0} +\title[The modern style]{The modern style layout} +\pagestyle{modern} +\thispagestyle{identity} +\makesmalltitle +\section*{Pellentesque a nulla} +\lipsum[1-3] +\section*{Vestibulum lectus} +\lipsum[5-6] + +\newpage +\hypertarget{schooldocs-example-left-identity}{} + +\setcounter{page}{1} +\lfoot{} +\cfoot{} +\rfoot{} +\renewcommand{\titleflush}{flushleft} +\title{A left-aligned title} +\pagestyle{empty} +\thispagestyle{identity} +\schooldocstitles +\maketitle +\lipsum[1] + +\setcounter{page}{2} % for the lastpage field in headers or footers +\end{document} diff --git a/macros/latex/contrib/schooldocs/schooldocs.dtx b/macros/latex/contrib/schooldocs/schooldocs.dtx index d1cd9a484b..4b1f1c451e 100644 --- a/macros/latex/contrib/schooldocs/schooldocs.dtx +++ b/macros/latex/contrib/schooldocs/schooldocs.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2020-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr> +% Copyright (C) 2020-2024 by Antoine Missier <antoine.missier@ac-toulouse.fr> % ---------------------------------------------------------------------- % % This file may be distributed and/or modified under the @@ -22,7 +22,7 @@ %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01] %<package>\ProvidesPackage{schooldocs} %<*package> - [2023/12/28 v1.4 .dtx Layout styles for school documents] + [2024/01/31 v1.5 .dtx Layout styles for school documents] %</package> % %<*driver> @@ -80,7 +80,7 @@ %</driver> % \fi % -% \CheckSum{805} +% \CheckSum{863} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -110,11 +110,15 @@ % - sffamily discarded from the default titlestyle % - smalltitletopskip changed from -2.0cm to -1.32cm} % \changes{v1.2}{2023/01/24}{ -% Small changes in the documentation (charter font is now used) +% - Small changes in the documentation (charter font is now used) % and the examples file (with several fonts)} % \changes{v1.3}{2023/08/28}{English corrections in the documentation} % \changes{v1.4}{2023/12/28}{ -% headtitlestyle in exam and collection styles set to scshape instead of MakeUppercase} +% - Headtitlestyle in exam and collection styles set to scshape instead of MakeUppercase} +% \changes{v1.5}{2024/01/30}{ +% - Possibility to call maketitle several times with different information fields +% that can be changed outside the preamble +% - The schooldocs-examples.pdf file is now generated in a single compilation} % % \GetFileInfo{schooldocs.dtx} % @@ -675,20 +679,30 @@ % \medskip % \subsection{Information fields} % +% The PDF information fields are automatically filled in using the information macros, +% but this only works in the preamble, hence the test |\ifx@onlypreamble@notprerr|. +% This allows using these macros outside the preamble, which is the normal behavior +% for |\title|, |\date|, |\author|, etc. with the 'article' class. +% % Once defined, information fields are initially set to empty % to ensure that tests for empty fields work correctly. + % % \begin{macrocode} \renewcommand{\title}[2][]{\long\def\@title{#2} \ifthenelse{\equal{#1}{}}{\def\@headtitle{#2}}{\def\@headtitle{#1}} - \@ifpackageloaded{hyperref}{\hypersetup{pdftitle={\@headtitle}}}{} + \ifx\@onlypreamble\@notprerr\else + \@ifpackageloaded{hyperref}{\hypersetup{pdftitle={\@headtitle}}}{} + \fi } \title{} \author{} \newcommand\school[1]{\long\def\@school{#1} - \@ifpackageloaded{hyperref}{ - \hypersetup{pdfauthor={\@author\ (\@school)}}}{} + \ifx\@onlypreamble\@notprerr\else + \@ifpackageloaded{hyperref}{ + \hypersetup{pdfauthor={\@author\ (\@school)}}}{} + \fi } \school{} \newcommand{\institute}{\school} @@ -696,7 +710,9 @@ \let\subject\relax \newcommand{\subject}[2][]{\long\def\@subject{#2} \ifthenelse{\equal{#1}{}}{\def\@headsubject{#2}}{\def\@headsubject{#1}} - \@ifpackageloaded{hyperref}{\hypersetup{pdfsubject={\@headsubject}}}{} + \ifx\@onlypreamble\@notprerr\else + \@ifpackageloaded{hyperref}{\hypersetup{pdfsubject={\@headsubject}}}{} + \fi } \def\@subject{} \def\@headsubject{} @@ -764,55 +780,64 @@ % % \subsection{Title composition} % +% The first macro, |\schooldocstitles|, aims to define the default composition of titles. +% Several styles redefine their own title composition. +% This macro allows, when using |\maketitle| multiple times at different places +% in the document, to revert to the default definition when a style has modified +% the title definition. % \begin{macrocode} -\renewcommand{\maketitle}[1][\seprulelength]{ - \mbox{}\par\vspace{\titletopskip} - \begin{\titleflush} - {\color{titlecolor} - {\titlestyle{\@title}} - \ifx\@subject\@empty\else - \par\vspace{\titlesep}\subjectstyle\@subject - \fi - \ifthenelse{\equal{\@date}{}}{}{% - \par\vspace{0.5\titlesep} \datestyle\@date} - \par\vspace{0.5\titlesep} - } - \ifthenelse{\lengthtest{#1 > 0cm}}{\rule{#1}{\seprulewidth}}{} - \end{\titleflush} - \vspace{\titlebottomskip} -} +\newcommand{\schooldocstitles}{ + \renewcommand{\maketitle}[1][\seprulelength]{ + \newpage\mbox{}\par\vspace{\titletopskip} + \begin{\titleflush} + {\color{titlecolor} + {\titlestyle{\@title}} + \ifx\@subject\@empty\else + \par\vspace{\titlesep}\subjectstyle\@subject + \fi + \ifthenelse{\equal{\@date}{}}{}{% + \par\vspace{0.5\titlesep} \datestyle\@date} + \par\vspace{0.5\titlesep} + } + \ifthenelse{\lengthtest{##1 > 0cm}}{\rule{##1}{\seprulewidth}}{} + \end{\titleflush} + \vspace{\titlebottomskip} + } -\newcommand{\makesmalltitle}{ - \mbox{}\par\vspace{\smalltitletopskip} - \begin{center} - {\color{titlecolor} - {\titlestyle{\@title}} - \hfill \subjectstyle\@subject - \ifthenelse{\equal{\@date}{}}{}{% - \enskip --\enskip \smalltitledatestyle\@date} - } - \rule{\linewidth}{\seprulewidth} - \end{center} - \vspace{\titlebottomskip} -} + \let\makesmalltitle\relax + \newcommand{\makesmalltitle}{ + \newpage\mbox{}\par\vspace{\smalltitletopskip} + \begin{center} + {\color{titlecolor} + {\titlestyle{\@title}} + \hfill \subjectstyle\@subject + \ifthenelse{\equal{\@date}{}}{}{% + \enskip --\enskip \smalltitledatestyle\@date} + } + \rule{\linewidth}{\seprulewidth} + \end{center} + \vspace{\titlebottomskip} + } -\newcommand\correct{% - \let\@originalheadtitle\@headtitle - \def\@headtitle{\@originalheadtitle ~--~\correctname} - \@ifpackageloaded{hyperref}{% - \AtBeginDocument{\hypersetup{pdftitle={\@headtitle}}}}{} - \let\@originaltitle\@title - \def\@title{\@originaltitle ~--~\correctname} + \let\correct\relax + \newcommand\correct{% + \let\@originalheadtitle\@headtitle + \def\@headtitle{\@originalheadtitle ~--~\correctname} + \ifx\@onlypreamble\@notprerr\else + \@ifpackageloaded{hyperref}{% + \AtBeginDocument{\hypersetup{pdftitle={\@headtitle}}}}{} + \fi + \let\@originaltitle\@title + \def\@title{\@originaltitle ~--~\correctname} + } } +\schooldocstitles \newcommand{\seprule}[1][\seprulelength]{\begin{center} \raisebox{0.25\baselineskip}{\rule{#1}{\seprulewidth}}\end{center}} % \end{macrocode} -% The use of |\AtBeginDocument| is necessary in the |\correct| macro because -% |\correctname| could be redefined by \textsf{babel} at |\begin{document}|. % -% \bigskip % \subsection{Basic styles} % % In the \textbf{classic} style, the header is displayed on two lines, @@ -832,7 +857,7 @@ \cfoot{\footstyle \thepage /\pageref{LastPage}} \setlength{\titletopskip}{-0.67cm} \renewcommand{\maketitle}[1][\seprulelength]{% - \mbox{}\par\vspace{\titletopskip} + \newpage\mbox{}\par\vspace{\titletopskip} \begin{\titleflush} {\color{titlecolor}\titlestyle{\@title}} \par\vspace{0.5\titlesep} @@ -841,7 +866,7 @@ \vspace{\titlebottomskip} } \renewcommand{\makesmalltitle}{ - \mbox{}\par\vspace{\smalltitletopskip} + \newpage\mbox{}\par\vspace{\smalltitletopskip} \begin{center} {\color{titlecolor} {\titlestyle{\@title}} @@ -879,7 +904,7 @@ \headdatestyle\@date\ignorespaces}{} } \renewcommand{\maketitle}[1][\seprulelength]{% - \mbox{}\par\vspace{\titletopskip} + \newpage\mbox{}\par\vspace{\titletopskip} \begin{\titleflush} {\color{titlecolor} {\titlestyle{\@title}} @@ -893,7 +918,7 @@ \vspace{\titlebottomskip} } \renewcommand{\makesmalltitle}{ - \mbox{}\par\vspace{\smalltitletopskip} + \newpage\mbox{}\par\vspace{\smalltitletopskip} \begin{center} {\color{titlecolor} {\titlestyle{\@title}} @@ -922,7 +947,7 @@ } \setlength{\titletopskip}{-0.67cm} \renewcommand{\maketitle}[1][\seprulelength]{% - \mbox{}\par\vspace{\titletopskip} + \newpage\mbox{}\par\vspace{\titletopskip} \begin{\titleflush} {\color{titlecolor}\titlestyle{\@title}} \par\vspace{0.5\titlesep} @@ -931,7 +956,7 @@ \vspace{\titlebottomskip} } \renewcommand{\makesmalltitle}{ - \mbox{}\par\vspace{\smalltitletopskip} + \newpage\mbox{}\par\vspace{\smalltitletopskip} \begin{center} {\color{titlecolor} {\titlestyle{\@title}} @@ -973,18 +998,22 @@ \setlength{\titlesep}{2\bigskipamount} \renewcommand{\titlestyle}{\LARGE\MakeUppercase} \renewcommand{\subjectstyle}{\Large\bfseries} + \let\subtitlestyle\relax \newcommand{\subtitlestyle}{\large\slshape} + \let\titlecorrectstyle\relax \newcommand*{\titlecorrectstyle}{\color{red}\large\scshape} \renewcommand\correct{% \let\@originalheadtitle\@headtitle \def\@headtitle{\@originalheadtitle ~--~\correctname} - \@ifpackageloaded{hyperref}{% - \AtBeginDocument{\hypersetup{pdftitle={\@headtitle}}}}{} + \ifx\@onlypreamble\@notprerr\else + \@ifpackageloaded{hyperref}{% + \AtBeginDocument{\hypersetup{pdftitle={\@headtitle}}}}{} + \fi \renewcommand{\subtitlestyle}{\titlecorrectstyle} \subtitle{\correctname} } \renewcommand{\maketitle}[1][\seprulelength]{% - \mbox{}\par\vspace{\titletopskip} + \newpage\mbox{}\par\vspace{\titletopskip} \begin{center} {\color{titlecolor} {\titlestyle{\@title}} @@ -1004,7 +1033,11 @@ \fancypagestyle{collection}{% \lhead{\headstyle\headtitlestyle\@headtitle} - \AtBeginDocument{\renewcommand{\sectionmark}[1]{\markboth{##1}{}}} + \ifx\@onlypreamble\@notprerr + \renewcommand{\sectionmark}[1]{\markboth{##1}{}} + \else + \AtBeginDocument{\renewcommand{\sectionmark}[1]{\markboth{##1}{}}} + \fi \rhead{\headstyle\headsubjectstyle\leftmark} %\@section \lfoot{\footstyle\schoolstyle \@school} \cfoot{} @@ -1017,7 +1050,7 @@ \renewcommand{\datestyle}{\Large} \renewcommand{\maketitle}[1][\seprulelength]{% \thispagestyle{empty} - \mbox{}\par\vspace{\titletopskip} + \newpage\mbox{}\par\vspace{\titletopskip} \begin{center} {\color{titlecolor} {\titlestyle{\@title}} diff --git a/macros/latex/contrib/schooldocs/schooldocs.ins b/macros/latex/contrib/schooldocs/schooldocs.ins index ec68fae155..4a6e0784ac 100644 --- a/macros/latex/contrib/schooldocs/schooldocs.ins +++ b/macros/latex/contrib/schooldocs/schooldocs.ins @@ -1,5 +1,5 @@ %% -%% Copyright (C) 2020-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr> +%% Copyright (C) 2020-2024 by Antoine Missier <antoine.missier@ac-toulouse.fr> %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license @@ -21,7 +21,7 @@ This is a generated file. -Copyright (C) 2020-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr> +Copyright (C) 2020-2024 by Antoine Missier <antoine.missier@ac-toulouse.fr> This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license diff --git a/macros/latex/contrib/schooldocs/schooldocs.pdf b/macros/latex/contrib/schooldocs/schooldocs.pdf Binary files differindex 18ba710bac..760002f3c5 100644 --- a/macros/latex/contrib/schooldocs/schooldocs.pdf +++ b/macros/latex/contrib/schooldocs/schooldocs.pdf diff --git a/macros/luatex/latex/novel/README.md b/macros/luatex/latex/novel/README.md index 12a511ac4f..81ab14b3e2 100644 --- a/macros/luatex/latex/novel/README.md +++ b/macros/luatex/latex/novel/README.md @@ -2,14 +2,11 @@ The `novel` document class is intended for popular fiction books, printed to paper: murder mystery, historical romance, etc. - Special attention to the needs of print-on-demand. -Site github.com/rallg/novel is the canonical project page for the -Novel document class, as seen in TeXlive and at CTAN. It is now -in version 1.83, November 2023. Only change from 1.82 is a minor typo. +Due to changes in print technology over the years, much of `novel` code +is now unnecessary. Also, it offers many rarely-used features that bloat +the code and its documentation. If you have not already used `novel`, +the simpler `novelette` document class might be better for your +purpose. Expected 2024. -Also see the `novelette` document class, by the same developer. -It is much simpler, yet does what it needs to do. Expected in -late November, 2023. Site github.com/rallg/novelette but not yet -at CTAN, since it is still Alpha stage. diff --git a/macros/luatex/latex/novel/doc/extras/CPmodified.otf b/macros/luatex/latex/novel/doc/extras/CPmodified.otf Binary files differdeleted file mode 100644 index 04ca84e6fb..0000000000 --- a/macros/luatex/latex/novel/doc/extras/CPmodified.otf +++ /dev/null diff --git a/macros/luatex/latex/novel/doc/extras/novel-Gallery-ChapterStart.pdf b/macros/luatex/latex/novel/doc/extras/novel-Gallery-ChapterStart.pdf Binary files differdeleted file mode 100644 index 2e623ca54b..0000000000 --- a/macros/luatex/latex/novel/doc/extras/novel-Gallery-ChapterStart.pdf +++ /dev/null diff --git a/macros/luatex/latex/novel/doc/extras/novel-example.pdf b/macros/luatex/latex/novel/doc/extras/novel-example.pdf deleted file mode 100644 index 06dd430daf..0000000000 --- a/macros/luatex/latex/novel/doc/extras/novel-example.pdf +++ /dev/null @@ -1,1125 +0,0 @@ -%PDF-1.3 -%ÌÕÁÔÅØÐÄÆ -4 0 obj -<< /Type /Metadata /Subtype /XML /Length 2653 >> -stream -<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?> - <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2.1-c043 52.372728, 2009/01/18-15:08:04 "> - <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <rdf:Description rdf:about="" - xmlns:xmp="http://ns.adobe.com/xap/1.0/"> - <xmp:ModifyDate>2023-11-09T11:35:37-08:00</xmp:ModifyDate> - <xmp:CreateDate>2023-11-09T11:35:37-08:00</xmp:CreateDate> - <xmp:CreatorTool>LuaLaTeX with novel and microtype</xmp:CreatorTool> - <xmp:MetadataDate>2023-11-09T11:35:37-08:00</xmp:MetadataDate> - </rdf:Description> - <rdf:Description rdf:about="" - xmlns:dc="http://purl.org/dc/elements/1.1/"> - <dc:format>application/pdf</dc:format> - <dc:title> - <rdf:Alt> - <rdf:li xml:lang="x-default">Dark and Stormy</rdf:li> - </rdf:Alt> - </dc:title> - <dc:creator> - <rdf:Bag> - <rdf:li>Dirk Hardcase</rdf:li> - </rdf:Bag> - </dc:creator> - </rdf:Description> - <rdf:Description rdf:about="" - xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> - <xmpMM:DocumentID>uuid:A12D98E081B6A0EC2CBA2D468474F922</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:93EBAF4EA76B474D4D8883AFAAE9DBA6</xmpMM:InstanceID> - <xmpMM:RenditionClass>default</xmpMM:RenditionClass> - <xmpMM:VersionID>1</xmpMM:VersionID> - </rdf:Description> - <rdf:Description rdf:about="" - xmlns:pdf="http://ns.adobe.com/pdf/1.3/"> - <pdf:Producer>LuaLaTeX with novel-pdfx and hyperref</pdf:Producer> - <pdf:Trapped>False</pdf:Trapped> - </rdf:Description> - <rdf:Description rdf:about="" - xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"> - <pdfx:GTS_PDFXVersion>PDF/X-1a:2001</pdfx:GTS_PDFXVersion> - <pdfx:GTS_PDFXConformance>PDF/X-1a:2001</pdfx:GTS_PDFXConformance> - </rdf:Description> - <rdf:Description rdf:about="" - xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"> - <pdfxid:GTS_PDFXVersion>PDF/X-1a:2001</pdfxid:GTS_PDFXVersion> - </rdf:Description> - </rdf:RDF> - </x:xmpmeta> - <?xpacket end="w"?> -endstream -endobj -7 0 obj -<< /Length 435 >> -stream -0 g 0 G -0 g 0 G -0 g 0 G -1 0 0 1 273.852 438.889 cm -q -1.8 0 0 1.8 0 0 cm -1 0 0 1 -273.852 -438.889 cm -BT -/F95 11.3574 Tf -1 0 0 1 273.852 438.889 Tm [<002500420053004C>-250<0042004F0045>]TJ -ET -1 0 0 1 273.852 438.889 cm -Q -1 0 0 1 -3.911 -29.589 cm -q -2.4 0 0 2.4 0 0 cm -0.5 g 0.5 G -1 0 0 1 -269.941 -409.3 cm -BT -/F95 11.3574 Tf -1 0 0 1 269.941 409.3 Tm [<0034005500500053004E005A>]TJ -0 g 0 G -ET -1 0 0 1 269.941 409.3 cm -Q -0 g 0 G -0 g 0 G - -endstream -endobj -6 0 obj -<< /Type /Page /Contents 7 0 R /Resources 5 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 9 0 R >> -endobj -5 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -12 0 obj -<< /Length 32 >> -stream -0 g 0 G -0 g 0 G -0 g 0 G -0 g 0 G - -endstream -endobj -11 0 obj -<< /Type /Page /Contents 12 0 R /Resources 10 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 9 0 R >> -endobj -10 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet [ /PDF ] >> -endobj -15 0 obj -<< /Length 1288 >> -stream -0 g 0 G -0 g 0 G -0 g 0 G -0 g 0 G -1 0 0 1 120.852 453.684 cm -q -3.6 0 0 3.6 0 0 cm -1 0 0 1 -120.852 -453.684 cm -BT -/F95 11.3574 Tf -1 0 0 1 120.852 453.684 Tm [<002500420053004C>-250<0042004F0045>]TJ -ET -1 0 0 1 120.852 453.684 cm -Q -1 0 0 1 -3.912 -44.384 cm -q -4.8 0 0 4.8 0 0 cm -0.5 g 0.5 G -1 0 0 1 -116.94 -409.3 cm -BT -/F95 11.3574 Tf -1 0 0 1 116.94 409.3 Tm [<0034005500500053004E005A>]TJ -0 g 0 G -ET -1 0 0 1 116.94 409.3 cm -Q -1 0 0 1 29.284 -36.986 cm -q -1.6 0 0 1.6 0 0 cm -1 0 0 1 -146.224 -372.314 cm -BT -/F83 11.3574 Tf -1 0 0 1 146.224 372.314 Tm [<0022>-250<0035>49<0042004D0046>-250<00500047>-250<002F004A0048004900550054>]TJ -ET -1 0 0 1 146.224 372.314 cm -Q -1 0 0 1 -7.368 -71.014 cm -q -6 0 0 6 0 0 cm -1 0 0 1 -138.856 -301.3 cm -BT -/F96 11.3574 Tf -1 0 0 1 138.856 301.3 Tm [<0176>]TJ -ET -1 0 0 1 138.856 301.3 cm -Q -1 0 0 1 -138.856 -301.3 cm -BT -/F83 34.07221 Tf -1 0 0 1 106.742 215.381 Tm [<0025004A0053004C>-250<002900420053>8<00450044004200540046>]TJ -/F83 14.19675 Tf -1 0 0 1 134.49 54.231 Tm [<002F0050004F0046>7<0059004A005400550046004F0055>-250<003100560043004D004A004400420055004A0050004F0054>]TJ -1 0 0 1 109.27 39.437 Tm [<0022004F005A00550050>7<0058004F>-250<06E8>-250<0022004F005A0051004D004200440046>-250<06E8>-250<0022004F005A>-15<0058004900460053>8<0046>]TJ -0 g 0 G -0 g 0 G -ET - -endstream -endobj -14 0 obj -<< /Type /Page /Contents 15 0 R /Resources 13 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 9 0 R >> -endobj -13 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R /F83 16 0 R /F96 17 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -20 0 obj -<< /Length 2311 >> -stream -0 g 0 G -0 g 0 G -0 g 0 G -0 g 0 G -BT -/F101 11.3574 Tf -1 0 0 1 146.785 290.944 Tm [<0025086D087E0877>-250<086D087A0870>-250<00340880>25<087B087E08790885>]TJ -/F101 11.3574 Tf -1 0 0 1 117.136 276.149 Tm [<002400500051>7<005A0053004A004800490055>-250<006908D308D108D208D8>-250<0025004A0053004C>-250<002900420053>8<00450044004200540046>10<000F>]TJ -1 0 0 1 145.053 261.355 Tm [<0022004D004D>-250<0033004A0048004900550054>-250<00330046005400460053>-15<0057>8<0046>-7<0045000F>]TJ -1 0 0 1 135.626 231.766 Tm [<00350049004A0054>-250<004A0054>-250<0042>-250<0058>8<00500053004C>-250<00500047>-250<084A00440055004A0050004F000F>]TJ -1 0 0 1 130.566 216.971 Tm [<0022004D004D>-250<0051>-7<0046005300540050004F0054>-250<0042004F0045>-250<0046>7<0057>8<0046004F00550054>-250<00420053>8<0046>]TJ -1 0 0 1 120.356 202.177 Tm [<00470053>8<0050004E>-250<005500490046>-250<00420056005500490050005306BC0054>-250<004A004E00420048004A004F00420055004A0050004F000F>]TJ -1 0 0 1 118.152 187.382 Tm [<0033004600540046004E0043004D0042004F00440046>-250<00550050>-250<0042004F005A>-250<0053>8<00460042004D>-250<0051>-7<0046005300540050004F000D>]TJ -1 0 0 1 122.707 172.588 Tm [<004D004A0057004A004F0048>-250<00500053>-250<0045004600420045000D>-250<004A0054>-250<00440050004A004F0044004A00450046004F00550042004D000F>]TJ -1 0 0 1 147.466 142.999 Tm [<002A00340023002F>-250<08D1000E08D208D308D408D508D608D708D808D9000E08DA>]TJ -1 0 0 1 93.092 113.41 Tm [<002A004F004500460051>-7<0046004F00450046004F0055004D005A>-250<003100560043004D004A005400490046>-7<0045>-250<0043005A>-250<0025004A0053004C>-250<002900420053>8<00450044004200540046>10<000D>]TJ -1 0 0 1 134.729 98.615 Tm [<0022>50<004F005A00550050>7<0058004F000D>-250<0022>50<004F005A00540055004200550046>-250<003600340022>]TJ -1 0 0 1 92.701 83.82 Tm [<0058>-15<0058>-15<0058>59<000F0046>7<00590042004E0051004D0046>10<000F00440050004E00100045004900420053>8<004500440042005400460010005100560043004D004A004400420055004A0050004F00540010>]TJ -1 0 0 1 92.349 54.231 Tm [<003100560043004D004A005400490046005306BC0054>-250<0024004200550042004D00500048004A004F0048000E002A004F000E003100560043004D004A004400420055004A0050004F>-250<0025004200550042>]TJ -1 0 0 1 137.67 39.437 Tm [<004200570042004A004D00420043004D0046>-250<00560051>-7<0050004F>-250<0053>8<0046>-7<00520056004600540055000F>]TJ -0 g 0 G -0 g 0 G -ET - -endstream -endobj -19 0 obj -<< /Type /Page /Contents 20 0 R /Resources 18 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 9 0 R >> -endobj -18 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F101 21 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -24 0 obj -<< /Length 862 >> -stream -0 g 0 G -0 g 0 G -0 g 0 G -0 g 0 G -BT -/F83 11.3574 Tf -1 0 0 1 110.787 424.095 Tm [<003800490046004F>-250<005500490046>-250<004D0050004F0046>-250<00530042004400440050>-7<0050004F>-250<00490050>7<0058004D0054>-250<00420055>-250<004500560054004C000D>]TJ -1 0 0 1 110.389 409.3 Tm [<0022004F0045>-250<00580049004A00550046>-250<0043004A0053>8<00450054>-250<00440046004200540046>-250<005500490046004A0053>-250<00550058004A0055005500460053>58<000D>]TJ -0.997 0 0 1 110.446 394.506 Tm [<003500490046004F>-250<005400490042004D004D>-251<005500490046>-251<0053004A0057>7<004600530054>-249<0050>6<0057>8<00460053093A0050>7<0058>-250<0058004A00550049>-250<004E004600420045000F>]TJ -1 0 0 1 198.975 379.711 Tm [<06DA>]TJ -/F101 11.3574 Tf -1 0 0 1 207.402 379.711 Tm [<00310053>8<0050005100490046>-7<0044005A>-250<00500047>-250<0024004D004200560045004A00560054>]TJ -0 g 0 G -0 g 0 G -ET - -endstream -endobj -23 0 obj -<< /Type /Page /Contents 24 0 R /Resources 22 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 9 0 R >> -endobj -22 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R /F101 21 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -27 0 obj -<< /Length 32 >> -stream -0 g 0 G -0 g 0 G -0 g 0 G -0 g 0 G - -endstream -endobj -26 0 obj -<< /Type /Page /Contents 27 0 R /Resources 25 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 9 0 R >> -endobj -25 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet [ /PDF ] >> -endobj -30 0 obj -<< /Length 7553 >> -stream -0 g 0 G -0 g 0 G -BT -/F83 18.17191 Tf -1 0 0 1 159.426 489.674 Tm [<0024004900420051005500460053>-250<0030004F0046>]TJ -/F83 11.3574 Tf -0.98 0 0 1 54 394.506 Tm [<002A0055>-178<005800420054>-178<0042>-179<004500420053004C>-178<0042004F0045>-179<0054005500500053004E005A>-178<004F004A004800490055000F>-315<002D00500053>8<0045>-178<0038004A005500490046004F0054>-178<0053>7<0050>-6<00450046>-179<0049004A0054>-178<00490050005300540046>-179<005500490053>8<0050005600480049>]TJ -0.993 0 0 1 54 379.711 Tm [<005500490046>-250<0048004D0050>-7<0050004E000D>-251<00580049004A00440049>-251<005800420054000D>-251<00420054>-251<004900460053>8<004600550050004700500053>8<0046>-250<004E0046004F0055004A0050004F0046>-7<0045000D>-251<004500420053004C000F>-335<002E005000540055>-251<0048004D0050>-7<0050004E>]TJ -1 0 0 1 54 364.917 Tm [<004A0054>-250<004500420053004C000D>-250<00460049>-250<0058>8<005000550020>]TJ -1.002 0 0 1 71.036 350.122 Tm [<002E0050>7<0057004A004F0048>-249<0053004A004800490055>-249<0042004D0050004F0048000D>-249<0049004A0054>-249<00490050005300540046>-249<004200530053004A0057>7<0046>-6<0045>-249<00420055>-249<005500490046>-249<004300420044004C>-249<00450050>-7<00500053>-249<00500047>-250<002D00420045005A>]TJ -1.02 0 0 1 53.455 335.327 Tm [<0038004A00540049004A004F00550042004D0046>24<06DF0054>-256<00520056004200530055004600530054000F>-359<003400420045004D005A>58<000D>-258<002D00500053>7<0045>-255<0038004A005500490046004F0054>-256<005800420054>-256<004F00500055>-256<0050004F>-256<004A0055000D>-259<004900420057004A004F0048>]TJ -0.982 0 0 1 54 320.533 Tm [<0054004D004A00510051>-7<0046>-7<0045>-255<00500938>-256<0049004A0054>-255<0054004200450045004D0046>-256<0042004D0050004F0048>-255<005500490046>-255<00580042005A>60<000F>-341<0035004900420055>-255<005800420054>-256<0043>-10<0046>-7<00440042005600540046>-255<005500490046>-256<0058>8<004600420055004900460053>]TJ -1 0 0 1 53.58 305.738 Tm [<005800420054>-250<0054005500500053004E005A>59<000F>]TJ -0.98 0 0 1 71.036 290.944 Tm [<002D00500053>8<0046004E>-248<004A005100540056004E>-248<00450050004D00500053>-249<0054004A0055>-248<0042004E00460055000D>-250<00440050004F00540046>-7<0044005500460055005600460053>-249<00420045004A0051004A00540044004A004F0048>-249<0046004D004A0055000F>-337<00360055>-249<00510056000E>]TJ -0.985 0 0 1 54 276.149 Tm [<005300560054>-253<0046004D004A0055000D>-253<0057>7<004600540055004A00430056004D0056004E>-252<00560055000D>-253<0051004D004200440046005300420055>-253<00420044000D>-254<00420045004A0051004A00540044004A004F0048>-253<0057004A005500420046>10<000D>-253<00470046004D004A0054000F>-338<00240056005300420043004A005500560053>]TJ -1.02 0 0 1 54 261.355 Tm [<0045004A004400550056004E>-243<0048005300420057004A00450042>-243<004E004200560053004A0054000F>-327<002F0042004E>-243<00420053>7<00440056>-243<004D004A0043>-10<00460053>7<0050>10<000D>-242<004F0050004F0056004E004E005A>-244<0046004800460055000D>-244<00440050004F00540046>-7<0044000E>]TJ -1.02 0 0 1 54 246.56 Tm [<005500460055005600460053>-335<004A0045000D>-358<00570056004D005100560055004200550046>-335<0042000D>-358<004E00420048004F0042000F>-598<00250050004F0046>-7<0044>-335<0057>7<00460049004A00440056004D0042>-335<00420056004800560046>-335<00460056>-335<004F0046>-7<005200560046>9<000F>]TJ -1.02 0 0 1 54 231.766 Tm [<00310046004D004D0046004F005500460054005200560046>-319<004900420043004A00550042004F0055>-320<004E005000530043004A>-320<00550053004A00540055004A005200560046>-320<00540046004F0046>-7<0044005500560054>-320<00460055>-320<004F0046005500560054>-320<00460055>-320<004E0042004D0046000E>]TJ -1.02 0 0 1 54 216.971 Tm [<00540056004200450042>-261<00470042004E00460054>-262<00420044>-261<0055005600530051004A0054>-262<0046004800460054005500420054000F>-376<002E004200560053004A0054>-262<00560055>-262<004D0046>-7<0050>10<000F>-376<0024005300420054>-261<0057004A0057>7<0046005300530042>-261<004E0046005500560054>]TJ -0.98 0 0 1 54 202.177 Tm [<005300490050004F004400560054>-226<00540046004E000F>-331<002F0056004D004D0042>-227<00460055>-226<004D0046>-8<0044005500560054>-226<0057>7<004600540055004A00430056004D0056004E>-226<00560053004F0042>-227<00470053004A004F0048004A004D004D0042>-226<0056004D00550053004A004400460054000F>-331<0031>-13<00490042000E>]TJ -1.004 0 0 1 54 187.382 Tm [<00540046004D004D00560054>-248<00460056>-249<00550046004D004D00560054>-249<0054004A0055>-249<0042004E00460055>-249<005500500053005500500053>-249<0048005300420057004A00450042>-249<0051004D004200440046005300420055000F>-332<002A004F00550046004800460053>-249<005400420051004A0046004F>-249<004600540055000D>]TJ -0.99 0 0 1 54 172.588 Tm [<004A004200440056004D004A0054>-253<004A004F000D>-253<00510053>7<00460055004A0056004E>-253<00520056004A0054000D>-253<0057004A0057>7<0046005300530042>-252<00420044000D>-254<004F0056004F0044000F>-339<003100530042004600540046004F0055>-253<0046004800460055>-254<00540046004E>-253<0057>7<0046004D>-252<004D0046>-7<0050>]TJ -0.99 0 0 1 54 157.793 Tm [<0056004D00550053004A004400460054>-252<0043004A0043>-11<0046004F00450056004E000F>-337<0022>12<0046004F00460042004F>-252<0047004200560044004A004300560054000F>-337<002E005000530043004A>-253<00450050004D00500053>-253<004F0056004D004D0042000D>-252<004E0042004D004600540056004200450042>]TJ -1.02 0 0 1 54 142.999 Tm [<00460056000D>-331<00510056004D0057004A004F00420053>-314<00420055000D>-332<004E0050004D004D004A0054>-314<00420044000D>-332<004F0056004D004D0042000F>-534<00240056005300420043004A005500560053>-315<004200560044005500500053>-314<00540046004E0051>-7<00460053>-314<004F0056004D004D0042000F>]TJ -1.02 0 0 1 54 128.204 Tm [<00250050004F0046>-7<0044>-252<005700420053004A00560054>-253<00500053>8<0044004A>-252<0046004800460055>-253<0053004A005400560054000F>-349<00250056004A0054>-252<004F004A00430049>-253<004E004A000D>-254<00440050004F004800560046>-253<00460056000D>-254<0042004400440056004E00540042004F>]TJ -1.007 0 0 1 54 113.41 Tm [<0046004D0046004A00470046004F0045000D>-249<005400420048004A00550055004A0054>-249<00520056004A0054000D>-250<0045004A0042004E000F>-333<00250056004A0054>-249<0046004800460055>-250<00500053>8<0044004A>-249<0054004A0055>-249<0042004E00460055>-249<00500053>7<0044004A>-248<0045004A0048004F004A00540054004A004E>]TJ -1 0 0 1 54 98.615 Tm [<00530056005500530056004E000F>]TJ -1.02 0 0 1 71.036 83.82 Tm [<002F0042004E>-328<00450056004A>-328<004D004A00480056004D0042000D>-349<00470053004A004F0048004A004D004D0042>-329<0042000D>-349<00460056004A0054004E0050>-7<0045>-328<00540050>-7<00450042004D00460054000D>-349<00540050004D004D004A0044004A005500560045004A004F>-329<0057>7<0046004D000D>]TJ -1.016 0 0 1 53.58 69.026 Tm [<0058004A0054004A000F>-328<002E005000530043004A>-245<004200560044005500500053>-246<004D00500053>7<0046004E>-245<004F0050004F>-246<004B0056005400550050>9<000F>-327<002F0042004E>-245<004D0042004400560054>-246<004D004A0043>-10<00460053>7<0050>10<000D>-245<00510053>7<00460055004A0056004E>-245<00420055000D>]TJ -0.98 0 0 1 54 54.231 Tm [<004D00500043>-10<005000530055004A0054>-215<0057004A005500420046>10<000D>-222<0056004D00550053004A0044004A00460054>-215<00460055000D>-223<00550046004D004D00560054000F>-327<00250050004F0046>-7<0044>-215<0042004D004A0052005600460055000D>-223<005500500053005500500053>-215<00540046>-7<0045>-215<0042004400440056004E00540042004F>]TJ -0.995 0 0 1 54 39.437 Tm [<0043004A0043>-10<0046004F00450056004E000D>-251<0046005300420055>-250<004D004A00480056004D0042>-251<0042004D004A0052005600460055>-251<004E00420048004F0042000D>-250<0057004A005500420046>-251<00500053004F00420053>7<0046>-250<0050>-7<0045004A0050>-251<004E0046005500560054>-250<0042>-251<004E004A000F>]TJ -0 g 0 G -0 g 0 G -ET - -endstream -endobj -29 0 obj -<< /Type /Page /Contents 30 0 R /Resources 28 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 9 0 R >> -endobj -28 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -33 0 obj -<< /Length 10995 >> -stream -0 g 0 G -BT -/F83 10.44878 Tf -1 0 0 1 36 565.121 Tm [<0013>]TJ -/F83 10.44878 Tf -1 0 0 1 151.292 565.121 Tm [<0025>-50<0964>-50<096C>-50<095B>-341<0029>-50<095C>-50<096C>-50<095F>-50<095E>-50<095C>-50<096D>-50<0960>]TJ -0 g 0 G -/F83 11.3574 Tf -1.011 0 0 1 36 542.451 Tm [<002E005000530043004A>-247<00420044>-248<00500053>7<0044004A>-246<00460055>-248<004F004A0054004D>-247<00490046004F00450053>7<00460053004A0055>-247<004E0050004D004D004A0054000F>-330<0034005600540051>-7<0046004F0045004A005400540046>-248<00560055>-248<004E0042005400540042000F>-330<0024005300420054>]TJ -1.02 0 0 1 36 527.656 Tm [<004F0046>-7<0044>-283<0042004F00550046>9<000F>-443<00310046004D004D0046004F005500460054005200560046>-284<0042>-283<004F0056004D004D0042000F>-444<00240056004E>-284<00540050>-6<0044004A004A0054>-284<004F004200550050>-7<005200560046>-284<0051>-7<0046004F00420055004A004300560054>-284<00460055>]TJ -1.02 0 0 1 36 512.862 Tm [<004E00420048004F004A0054>-316<0045004A0054>-316<005100420053005500560053004A0046004F0055>-317<004E0050004F005500460054000D>-334<004F0042005400440046005500560053>-316<0053004A0045004A00440056004D00560054>-316<004E00560054000F>-541<0022004D004A005200560042004E>]TJ -0.999 0 0 1 36 498.067 Tm [<0055004A004F0044004A00450056004F0055>-250<00560053004F0042000F>-336<002F0056004D004D0042>-251<0056004D004D0042004E0044005000530051>-7<00460053>-251<0057>7<004600540055004A00430056004D0056004E>-250<0055005600530051004A0054000F>-335<00310046004D004D0046004F005500460054005200560046>]TJ -1 0 0 1 36 483.273 Tm [<004400560053005400560054>-250<004D00560044005500560054>-250<004E004200560053004A0054000F>]TJ -1.011 0 0 1 53.036 468.478 Tm [<002F0056004D004D0042>-248<004E0042004D004600540056004200450042>-248<0051>-7<0050005300550055004A005500500053>-249<0045004A0042004E000F>-332<00250050004F0046>-7<0044>-249<00470046004D004A0054>-248<0046005300420055000D>-249<00440050004F004800560046>-248<004F0050004F000D>]TJ -0.992 0 0 1 35.716 453.684 Tm [<0057>8<0050004D00560055005100420055>-251<00420055000D>-252<0055004A004F0044004A00450056004F0055>-251<00550053004A00540055004A005200560046>9<000D>-251<004D004A0043>-10<00460053>7<0050>10<000F>-335<0037004A00570042004E00560054>-251<0057004A0057>7<0046005300530042>-251<004700460053004E0046004F00550056004E>]TJ -0.98 0 0 1 36 438.889 Tm [<00470046004D004A0054000F>-329<00250050004F0046>-7<0044>-222<004F0050004F0056004E004E005A>-221<0051>-7<0046004D004D0046004F005500460054005200560046>-222<0042004F00550046>9<000F>-328<0031>-12<0049004200540046004D004D00560054>-222<00420045004A0051004A00540044004A004F0048>-222<00540046004E000E>]TJ -0.98 0 0 1 36 424.095 Tm [<0051>-7<00460053>-226<0046004D004A0055000F>-330<00310053>7<0050004A004F>-225<004700460053004E0046004F00550056004E>-226<004E0042005400540042>-226<00420044>-226<005200560042004E000F>-331<00340046>-7<0045>-226<0045004A0042004E>-226<0055005600530051004A0054000D>-232<004E0050004D004600540055004A0046>]TJ -1.02 0 0 1 35.716 409.3 Tm [<0057004A005500420046>10<000D>-250<0051004D004200440046005300420055>-249<0042000D>-251<004E0050004D004600540055004A0046>-249<004F0046>-7<0044000D>-251<004D0046>-7<0050>9<000F>-338<002E00420046>-7<00440046004F00420054>-250<004D00420044004A004F004A0042000F>-339<002F0042004E>-250<004A005100540056004E>]TJ -1.015 0 0 1 36 394.506 Tm [<004D004A00480056004D0042000D>-246<0046004D0046004A00470046004F0045>-247<00420055000D>-246<0042004400440056004E00540042004F>-247<004F0046>-7<0044000D>-246<0054005600540044004A0051004A0055>-247<0042000D>-247<004A005100540056004E000F>-329<002E005000530043004A>-246<0043004D0042004F0045004A0055>]TJ -1.017 0 0 1 36 379.711 Tm [<004D004A00480056004D0042>-244<0047004600560048004A00420055>-245<004E00420048004F0042000F>-328<002F0056004F0044>-245<0046004D0046004A00470046004F0045>-245<00440050004F00540046>-7<0052005600420055>-245<004D00500053>8<0046004E000F>-327<00340046>-7<0045>-245<004D00420044004A004F004A0042>]TJ -1.02 0 0 1 36 364.917 Tm [<004F0056004D004D0042>-305<0057004A005500420046>-306<0046004F004A004E000F>-510<00310046004D004D0046004F005500460054005200560046>-306<0055004A004F0044004A00450056004F0055>-306<00510056005300560054>-305<0057>7<0046004D>-305<004E00420048004F0042000F>-510<002A004F00550046000E>]TJ -1.004 0 0 1 36 350.122 Tm [<004800460053>-248<004F0050004F>-249<0046004F004A004E000F>-332<003100530042004600540046004F0055>-248<00460056004A0054004E0050>-7<0045>-249<004F0056004F0044>-249<00460056>-248<00510056005300560054000F>-332<00250050004F0046>-7<0044>-249<0043004A0043>-10<0046004F00450056004E>]TJ -1.014 0 0 1 36 335.327 Tm [<005200560042004E>-247<004A004F>-247<00550046004D004D00560054000F>-331<002F0056004D004D0042004E>-247<004400560053005400560054>-247<00510056004D0057004A004F00420053>-247<004D0046>-7<0044005500560054000F>-331<00250050004F0046>-7<0044>-247<00460055>-248<004E004A000F>-330<002F0042004E>]TJ -1 0 0 1 35.716 320.533 Tm [<00570056004D005100560055004200550046>-250<004E0046005500560054>-250<00460056>-250<0046004F004A004E000F>-333<0037>79<004600540055004A00430056004D0056004E>-249<0051>-7<0046004D004D0046004F005500460054005200560046>-250<00470046004D004A0054>-250<00460056>-250<004E0042005400540042000F>]TJ -0.98 0 0 1 53.036 305.738 Tm [<09550056004A0054005200560046>-228<0056004D004D0042004E0044005000530051>-7<00460053>-228<0051004D004200440046005300420055>-228<004A005100540056004E000F>-331<0024005300420054>-228<004F004A00430049000F>-331<002E005000530043004A>-228<0057>7<0046004D>-227<004B0056005400550050>]TJ -0.98 0 0 1 35.716 290.944 Tm [<0057004A005500420046>-236<004D0042004400560054>-237<0055004A004F0044004A00450056004F0055>-236<0056004D00550053004A004400460054000F>-334<002D00500053>7<0046004E>-235<004A005100540056004E>-237<00450050004D00500053>-236<0054004A0055>-237<0042004E00460055000D>-240<00440050004F00540046>-7<004400550046000E>]TJ -0.98 0 0 1 36 276.149 Tm [<0055005600460053>-193<00420045004A0051004A00540044004A004F0048>-193<0046004D004A0055000F>-319<002A004F>-193<004900420044>-193<004900420043004A00550042005400540046>-194<0051004D0042005500460042>-193<0045004A004400550056004E00540055000F>-319<002A004F00550046004800460053>-193<00550046004E005100560054>]TJ -0.996 0 0 1 36 261.355 Tm [<00440050004F00570042004D004D004A0054>-250<00420056004800560046>9<000F>-333<00260055004A0042004E>-251<004700420044004A004D004A0054004A0054000F>-334<002F0056004F0044>-251<0046004D0046004E0046004F00550056004E>-250<004700460053004E0046004F00550056004E>-251<0058004A0054004A000F>]TJ -1.01 0 0 1 35.602 246.56 Tm [<0022>12<0046004F00460042004F>-246<0051004D004200440046005300420055000F>-330<00360055>-247<004A004E0051>-7<00460053>7<0045004A00460055000D>-246<0046004F004A004E>-247<00540046>-7<0045>-247<0048005300420057004A00450042>-246<00540050004D004D004A0044004A005500560045004A004F000D>-247<00470046004D004A0054>]TJ -1.02 0 0 1 36 231.766 Tm [<0050>-7<0045004A0050>-259<0051004D004200440046005300420055>-260<005200560042004E000D>-264<00420044>-260<00510056004D0057004A004F00420053>-260<0046004D004A0055>-260<00510056005300560054>-260<0046004800460055>-260<0046004F004A004E000F>-371<002F0056004F0044>-260<0057004A005500420046>]TJ -1.014 0 0 1 36 216.971 Tm [<005500500053005500500053>59<000F>-330<00310053>7<0050004A004F>-246<00550046004E005100560054>-247<004F004A00430049>-247<0054004A0055>-247<0042004E00460055>-247<004F004A0054004D000F>-331<0037004A00570042004E00560054>-247<00520056004A0054>-247<005500500053005500500053>-247<0057004A005500420046>]TJ -1 0 0 1 36 202.177 Tm [<0053004A005400560054>-250<0051>-7<0050005300550042>-250<0057>8<00460049004A00440056004D0042000F>]TJ -0.999 0 0 1 53.036 187.382 Tm [<00270056005400440046>-250<004E004200560053004A0054000F>-333<0037>80<004600540055004A00430056004D0056004E>-249<004D00560044005500560054>-250<004F004A00430049>-250<00420055>-251<004D0046>-7<0044005500560054000F>-333<00340046>-7<0045>-251<0043004A0043>-10<0046004F00450056004E000D>]TJ -1.004 0 0 1 36 172.588 Tm [<004F0056004D004D0042>-248<0042>-248<0047004200560044004A004300560054>-248<00540046004E0051>-7<00460053>59<000D>-247<004D0046>-7<0050>-248<0057>7<0046004D004A0055>-247<0056004D00550053004A0044004A00460054>-248<00550046004D004D00560054000D>-248<00420044>-248<0057>7<0046004F0046004F00420055004A0054>-247<00420053>7<00440056>]TJ -1.016 0 0 1 35.58 157.793 Tm [<0058004A0054004A>-246<0057>7<0046004D>-245<004F004A0054004D000F>-328<0037>79<004600540055004A00430056004D0056004E>-245<0045004A0042004E000F>-329<0022004D004A005200560042004E>-246<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-245<00420056004800560046>-246<00520056004A0054>]TJ -1.007 0 0 1 36 142.999 Tm [<005400420048004A00550055004A0054>-247<0051>-7<00500054005600460053>7<0046>10<000D>-247<0055005600530051004A0054>-247<004D0042004400560054>-248<00440050004F004800560046>-248<005200560042004E000D>-247<004A004F>-248<00490046004F00450053>7<00460053004A0055>-247<0053004A005400560054>-247<00460053>7<00500054>]TJ -0.98 0 0 1 36 128.204 Tm [<0046004800460055>-237<00470046004D004A0054000F>-334<002E00420046>-7<00440046004F00420054>-237<0046004800460055>-237<0046005300420055>-237<004A004F>-237<005400420051004A0046004F>-237<004E004200550055004A0054>-237<0051>-8<0050005300550055004A005500500053>61<000F>-333<0037>82<004600540055004A00430056004D0056004E>]TJ -1.02 0 0 1 36 113.41 Tm [<0051>-7<0050005300550055004A005500500053>59<000F>-483<002F0056004D004D0042>-297<004700420044004A004D004A0054004A000F>-484<00340046>-7<0045>-297<0042>-298<0055005600530051004A0054>-297<00460056>-297<004D0042004400560054>-298<00440050004E004E0050>-7<00450050>-297<004700420044004A004D004A0054004A0054000F>]TJ -0.982 0 0 1 36 98.615 Tm [<002E005000530043004A>-254<00470053004A004F0048004A004D004D0042000D>-254<0058004A0054004A>-254<004A004F>-254<0045004A0048004F004A00540054004A004E>-254<004A004F005500460053>8<00450056004E000D>-254<004B0056005400550050>-254<004D0046>-7<0044005500560054>-254<005400420048004A00550055004A0054>-254<00450056004A000D>]TJ -1.02 0 0 1 36 83.82 Tm [<00460055>-258<0057>7<00460049004A00440056004D0042>-258<004D004A0043>-10<00460053>7<0050>-258<00450056004A>-259<004400560053005400560054>-258<00450056004A000F>-368<002E004200560053004A0054>-259<00550046004E0051>-7<00500053>-259<004D004A00480056004D0042>-258<00540046>-7<0045>-259<004D0042004400560054000F>]TJ -1.02 0 0 1 36 69.026 Tm [<00250056004A0054>-341<004400560053005400560054>-341<0046004F004A004E>-341<00560055>-341<00420056004800560046>9<000F>-614<0024005300420054>-341<00420044>-341<004E00420048004F0042000F>-615<0024005300420054>-341<004F0056004D004D0042000F>-615<002F0056004D004D0042>]TJ -1.02 0 0 1 36 54.231 Tm [<0046004800460054005500420054000F>-526<00240056005300420043004A005500560053>-312<0042>-311<004D0046>-7<0050>9<000F>-526<09550056004A0054005200560046>-312<0046004800460054005500420054>-311<0058004A0054004A>-312<0046004800460055>-312<004F0056004F0044000F>-526<002F0042004E>]TJ -1 0 0 1 36 39.437 Tm [<0047004600560048004A00420055>-250<004D0042004400560054>-250<0057>8<0046004D>-250<004600540055000F>-333<00240056005300420043004A005500560053>-250<00440050004F00540046>-7<0044005500460055005600460053>58<000F>]TJ -0 g 0 G -0 g 0 G -ET - -endstream -endobj -32 0 obj -<< /Type /Page /Contents 33 0 R /Resources 31 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 9 0 R >> -endobj -31 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -36 0 obj -<< /Length 6171 >> -stream -0 g 0 G -BT -/F83 10.44878 Tf -1 0 0 1 162.868 565.121 Tm [<0025>-50<095C>-50<096C>-50<095B>-341<095C>-50<0968>-50<095F>-342<0034>-50<096E>-25<0969>-50<096C>-50<0967>-50<0973>]TJ -/F83 10.44878 Tf -1 0 0 1 355.141 565.121 Tm [<0014>]TJ -0 g 0 G -/F83 11.3574 Tf -0.98 0 0 1 71.036 542.451 Tm [<0034005600540051>-7<0046004F0045004A005400540046>-249<0057>7<0046004D>-248<00470046004D004A0054000F>-339<00360055>-249<004D00500053>7<0046004E>-248<004D00500053>7<0046004E000D>-249<004A004F005500460053>7<00450056004E>-249<00460056000D>-250<0055004A004F0044004A00450056004F0055>-250<0054004A0055>]TJ -1.015 0 0 1 54 527.656 Tm [<0042004E00460055000D>-246<004D004200500053>7<0046>-6<00460055>-247<0057004A005500420046>9<000D>-246<00420053>7<00440056000F>-329<0022>12<0046004F00460042004F>-246<0047004200560044004A004300560054>-247<0051>-7<0046>-7<00450046>-247<00460056>-247<0042004F00550046>10<000F>-329<003100530042004600540046004F0055>]TJ -1.02 0 0 1 54 512.862 Tm [<0046004F004A004E>-282<0046004D004A0055000D>-293<00530056005500530056004E>-283<00420055000D>-292<004E0050004D004600540055004A0046>-283<004F0050004F000D>-292<004F0050004F0056004E004E005A>-283<0057>7<0046004D000D>-291<004F004A0054004D000F>-440<00360055>-283<004D0046>-7<0044005500560054>]TJ -1.02 0 0 1 54 498.067 Tm [<00460053>8<00500054000D>-318<004E0042004D004600540056004200450042>-304<0054004A0055>-304<0042004E00460055000D>-319<004700460053004E0046004F00550056004E>-304<00460056000D>-319<00540050>-6<00450042004D00460054>-304<004400560053005400560054000D>-319<004E00420048004F0042000F>]TJ -1.007 0 0 1 54 483.273 Tm [<00250050004F0046>-7<0044>-248<00460056>-249<00510056005300560054000F>-332<09550056004A0054005200560046>-249<0057>7<00460049004A00440056004D0042000D>-248<00560053004F0042>-248<00540046>-7<0045>-249<0056004D00550053004A0044004A00460054>-249<004200560044005500500053>59<000D>-248<0051>-7<0046>-7<00450046>]TJ -1.02 0 0 1 54 468.478 Tm [<004D00500053>8<0046004E>-316<0046004800460054005500420054>-316<00450056004A000D>-335<00460055>-316<00440050004F00570042004D004D004A0054>-317<0046004D004A0055>-316<0046005300420055>-316<00540046>-7<0045>-317<004F0056004D004D0042000F>-541<00250050004F0046>-7<0044>-316<004D00560044005500560054000F>]TJ -0.98 0 0 1 54 453.684 Tm [<00240056005300420043004A005500560053>-241<00460055>-242<004F0056004F0044000F>-336<0022004D004A005200560042004E>-242<00450050004D00500053>-242<0050>-7<0045004A0050>10<000D>-244<00440050004E004E0050>-7<00450050>-242<00510053>7<00460055004A0056004E000D>-243<0056004D00550053004A0044004A00460054>]TJ -1.018 0 0 1 54 438.889 Tm [<004F0050004F000D>-244<0051004900420053>7<0046005500530042>-243<004A004F000D>-245<0057>7<0046004D004A0055000F>-326<002A004F00550046004800460053>-244<00420053>7<00440056>-244<004600540055000D>-244<004F0050004F0056004E004E005A>-244<004A004F000D>-245<004700460053004E0046004F00550056004E>]TJ -1 0 0 1 54 424.095 Tm [<0047004200560044004A004300560054000D>-250<0046004800460054005500420054>-250<0057>8<0046004D000D>-250<0050>-7<0045004A0050>10<000F>]TJ -1.005 0 0 1 71.036 409.3 Tm [<00340046>-7<0045>-247<00440050004E004E0050>-7<00450050>-248<0051>-7<00500054005600460053>7<0046>-246<0051>-7<0046>-7<00450046>9<000F>-330<002E004200560053004A0054>-248<00560055>-247<004600540055000F>-332<00360055>-247<00520056004A0054>-247<00510056005300560054000F>-332<00340046>-7<0045>]TJ -1.01 0 0 1 54 394.506 Tm [<00420044>-247<0050>-7<0045004A0050>9<000F>-330<00340046>-7<0045>-248<0057>7<00460049004A00440056004D0042>-247<00490046004F00450053>7<00460053004A0055>-247<00540046004E000F>-331<00250056004A0054>-248<004F0050004F>-247<0050>-8<0045004A0050>10<000F>-330<002E005000530043004A>-248<00560055>-248<00450056004A000F>]TJ -1.02 0 0 1 54 379.711 Tm [<00340046>-7<0045>-316<0042004400440056004E00540042004F>-317<0053004A005400560054>-316<0046004800460055>-317<0050>-7<0045004A0050>9<000F>-541<002A004F>-316<004900420044>-317<004900420043004A00550042005400540046>-317<0051004D0042005500460042>-316<0045004A004400550056004E00540055000F>]TJ -1.02 0 0 1 54 364.917 Tm [<00310046004D004D0046004F005500460054005200560046>-361<004F0050004F>-362<0046004D004A0055000F>-677<00270056005400440046>-361<00540046>-7<0045>-362<004B0056005400550050>-362<00460056>-362<00560053004F0042>-361<0051>-7<0050005300550042>-362<0055004A004F0044004A00450056004F0055000F>]TJ -0.981 0 0 1 54 350.122 Tm [<002E004200560053004A0054>-255<00470046004D004A0054>-255<0050>-7<0045004A0050>9<000D>-254<00540050004D004D004A0044004A005500560045004A004F>-255<00540046>-8<0045000D>-255<0057>7<0050004D0056>1<0055005100420055>-255<0042000D>-255<00500053004F00420053>7<0046>-254<00420044000D>-255<0046005300420055000F>-341<002E005000530043004A>]TJ -1.02 0 0 1 54 335.327 Tm [<00520056004A0054>-270<00450050004D00500053>59<000F>-401<00250050004F0046>-7<0044>-270<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-275<0046005300420055>-270<00420044>-270<005400420048004A00550055004A0054>-270<00540046004E0051>-7<00460053>58<000D>-275<004F0056004F0044>-270<00450056004A>]TJ -1.02 0 0 1 54 320.533 Tm [<004D00500043>-10<005000530055004A0054>-269<00510056005300560054000D>-275<00520056004A0054>-269<00440050004F004800560046>-269<00510056005300560054>-269<004E0046005500560054>-269<0056004D00550053004A0044004A00460054>-269<00550046004D004D00560054000F>-398<00310053>7<0050004A004F>-268<00460055>]TJ -1.02 0 0 1 54 305.738 Tm [<005200560042004E000F>-341<0024004D004200540054>-250<0042005100550046004F0055>-250<005500420044004A0055004A>-250<00540050>-7<0044004A0050005400520056>-250<00420045>-250<004D004A0055005000530042>-250<005500500053>7<005200560046004F0055>-249<0051>-7<00460053>-250<00440050004F00560043004A0042>]TJ -0.98 0 0 1 54 290.944 Tm [<004F00500054005500530042000D>-241<0051>-7<00460053>-238<004A004F004400460051005500500054>-239<0049005A004E0046004F00420046>-7<00500054000F>-334<003100530042004600540046004F0055>-239<005400420051004A0046004F>-238<0055005600530051004A0054000D>-241<004700460053004E0046004F00550056004E>]TJ -1 0 0 1 53.716 276.149 Tm [<0057>8<0046004D000D>-250<0046004D0046004A00470046004F0045>-250<0047004200560044004A004300560054000D>-250<0057>8<00460049004A00440056004D0042>-250<00460056000D>-250<004D0042004400560054000F>]TJ -0 g 0 G -0 g 0 G -ET - -endstream -endobj -35 0 obj -<< /Type /Page /Contents 36 0 R /Resources 34 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 9 0 R >> -endobj -34 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -39 0 obj -<< /Length 7861 >> -stream -0 g 0 G -0 g 0 G -BT -/F83 18.17191 Tf -1 0 0 1 140.517 489.674 Tm [<0024004900420051005500460053>-250<0035>49<0058>8<0050>]TJ -/F83 11.3574 Tf -0.988 0 0 1 35.659 394.506 Tm [<003500490046>-254<004F004A004800490055>-253<005800420054>-254<00540055004A004D004D>-254<004500420053004C>-254<0042004F0045>-254<0054005500500053004E005A>60<000F>-339<00350049004A0054>-254<0054004900500056004D0045>-254<004F00500055>-254<0043>-11<0046>-253<00540056005300510053004A0054004A004F0048000D>]TJ -0.989 0 0 1 36 379.711 Tm [<00540046>-7<0046004A004F0048>-253<00420054>-254<00490050>7<0058>-253<0050004F004D005A>-253<00490042004D0047>-253<0042004F>-254<0049005000560053>-253<004900420054>-254<0046004D0042005100540046>-7<0045>-253<0054004A004F00440046>-254<005500490046>-253<0939005300540055>-253<0044004900420051005500460053>60<000F>]TJ -1.02 0 0 1 35.659 364.917 Tm [<0035004900420055>-281<004A004F004700500053004E00420055004A0050004F>-282<005800420054>-282<004F0046>-7<004400460054005400420053>-15<005A>58<000D>-289<004A004F>-282<0044004200540046>-282<005A>7<00500056>-280<005100560055>-282<005500490046>-282<0043>-10<0050>-7<0050004C>-281<00450050>6<0058004F>]TJ -1 0 0 1 36 350.122 Tm [<0042004F0045>-250<004900420057>8<0046004F06DF0055>-250<0053>8<004600420045>-250<0042004F005A>-250<00500047>-250<004A0055>-250<004700500053>-250<005500490046>-250<004D004200540055>-250<00550058>8<0050>-250<0058>8<0046>-7<0046004C0054000F>]TJ -0.98 0 0 1 53.036 335.327 Tm [<002D00500053>8<0045>-209<0038004A005500490046004F0054000D>-220<0058>8<00460055>-209<0042004F0045>-210<004300530056004A00540046>-8<0045000D>-219<0939004F0042004D004D005A>-210<004200530053004A0057>7<0046>-6<0045>-210<00420055>-210<0049004A0054>-210<0045004600540055004A004F00420055004A0050004F000F>]TJ -0.98 0 0 1 35.659 320.533 Tm [<003500490046>-234<0053>7<0046004200540050004F>-234<00490046>-234<005800420054>-235<0058>7<00460055>-233<005800420054>-235<0043>-10<0046>-8<00440042005600540046>10<000D>-238<00420054>-235<004900420054>-234<0043>-11<0046>-7<0046004F>-235<004F005000550046>-7<0045000D>-239<005500490046>-235<0058>8<004600420055004900460053>]TJ -1 0 0 1 35.58 305.738 Tm [<005800420054>-250<0054005500500053004E005A>59<000F>-333<002A0055>-250<005800420054>-250<004500420053004C000D>-250<00550050>-7<0050>9<000F>]TJ -0.98 0 0 1 53.036 290.944 Tm [<002D00500053>8<0046004E>-248<004A005100540056004E>-248<00450050004D00500053>-249<0054004A0055>-248<0042004E00460055000D>-250<00440050004F00540046>-7<0044005500460055005600460053>-249<00420045004A0051004A00540044004A004F0048>-249<0046004D004A0055000F>-337<00360055>-249<00510056000E>]TJ -0.985 0 0 1 36 276.149 Tm [<005300560054>-253<0046004D004A0055000D>-253<0057>7<004600540055004A00430056004D0056004E>-252<00560055000D>-253<0051004D004200440046005300420055>-253<00420044000D>-254<00420045004A0051004A00540044004A004F0048>-253<0057004A005500420046>10<000D>-253<00470046004D004A0054000F>-338<00240056005300420043004A005500560053>]TJ -1.02 0 0 1 36 261.355 Tm [<0045004A004400550056004E>-243<0048005300420057004A00450042>-243<004E004200560053004A0054000F>-327<002F0042004E>-243<00420053>7<00440056>-243<004D004A0043>-10<00460053>7<0050>10<000D>-242<004F0050004F0056004E004E005A>-244<0046004800460055000D>-244<00440050004F00540046>-7<0044000E>]TJ -1.02 0 0 1 36 246.56 Tm [<005500460055005600460053>-335<004A0045000D>-358<00570056004D005100560055004200550046>-335<0042000D>-358<004E00420048004F0042000F>-598<00250050004F0046>-7<0044>-335<0057>7<00460049004A00440056004D0042>-335<00420056004800560046>-335<00460056>-335<004F0046>-7<005200560046>9<000F>]TJ -1.02 0 0 1 36 231.766 Tm [<00310046004D004D0046004F005500460054005200560046>-319<004900420043004A00550042004F0055>-320<004E005000530043004A>-320<00550053004A00540055004A005200560046>-320<00540046004F0046>-7<0044005500560054>-320<00460055>-320<004F0046005500560054>-320<00460055>-320<004E0042004D0046000E>]TJ -1.02 0 0 1 36 216.971 Tm [<00540056004200450042>-261<00470042004E00460054>-262<00420044>-261<0055005600530051004A0054>-262<0046004800460054005500420054000F>-376<002E004200560053004A0054>-262<00560055>-262<004D0046>-7<0050>10<000F>-376<0024005300420054>-261<0057004A0057>7<0046005300530042>-261<004E0046005500560054>]TJ -0.98 0 0 1 36 202.177 Tm [<005300490050004F004400560054>-226<00540046004E000F>-331<002F0056004D004D0042>-227<00460055>-226<004D0046>-8<0044005500560054>-226<0057>7<004600540055004A00430056004D0056004E>-226<00560053004F0042>-227<00470053004A004F0048004A004D004D0042>-226<0056004D00550053004A004400460054000F>-331<0031>-13<00490042000E>]TJ -1.004 0 0 1 36 187.382 Tm [<00540046004D004D00560054>-248<00460056>-249<00550046004D004D00560054>-249<0054004A0055>-249<0042004E00460055>-249<005500500053005500500053>-249<0048005300420057004A00450042>-249<0051004D004200440046005300420055000F>-332<002A004F00550046004800460053>-249<005400420051004A0046004F>-249<004600540055000D>]TJ -0.99 0 0 1 36 172.588 Tm [<004A004200440056004D004A0054>-253<004A004F000D>-253<00510053>7<00460055004A0056004E>-253<00520056004A0054000D>-253<0057004A0057>7<0046005300530042>-252<00420044000D>-254<004F0056004F0044000F>-339<003100530042004600540046004F0055>-253<0046004800460055>-254<00540046004E>-253<0057>7<0046004D>-252<004D0046>-7<0050>]TJ -0.99 0 0 1 36 157.793 Tm [<0056004D00550053004A004400460054>-252<0043004A0043>-11<0046004F00450056004E000F>-337<0022>12<0046004F00460042004F>-252<0047004200560044004A004300560054000F>-337<002E005000530043004A>-253<00450050004D00500053>-253<004F0056004D004D0042000D>-252<004E0042004D004600540056004200450042>]TJ -1.02 0 0 1 36 142.999 Tm [<00460056000D>-331<00510056004D0057004A004F00420053>-314<00420055000D>-332<004E0050004D004D004A0054>-314<00420044000D>-332<004F0056004D004D0042000F>-534<00240056005300420043004A005500560053>-315<004200560044005500500053>-314<00540046004E0051>-7<00460053>-314<004F0056004D004D0042000F>]TJ -1.02 0 0 1 36 128.204 Tm [<00250050004F0046>-7<0044>-252<005700420053004A00560054>-253<00500053>8<0044004A>-252<0046004800460055>-253<0053004A005400560054000F>-349<00250056004A0054>-252<004F004A00430049>-253<004E004A000D>-254<00440050004F004800560046>-253<00460056000D>-254<0042004400440056004E00540042004F>]TJ -1.007 0 0 1 36 113.41 Tm [<0046004D0046004A00470046004F0045000D>-249<005400420048004A00550055004A0054>-249<00520056004A0054000D>-250<0045004A0042004E000F>-333<00250056004A0054>-249<0046004800460055>-250<00500053>8<0044004A>-249<0054004A0055>-249<0042004E00460055>-249<00500053>7<0044004A>-248<0045004A0048004F004A00540054004A004E>]TJ -1 0 0 1 36 98.615 Tm [<00530056005500530056004E000F>]TJ -1.02 0 0 1 53.036 83.82 Tm [<002F0042004E>-328<00450056004A>-328<004D004A00480056004D0042000D>-349<00470053004A004F0048004A004D004D0042>-329<0042000D>-349<00460056004A0054004E0050>-7<0045>-328<00540050>-7<00450042004D00460054000D>-349<00540050004D004D004A0044004A005500560045004A004F>-329<0057>7<0046004D000D>]TJ -1.016 0 0 1 35.58 69.026 Tm [<0058004A0054004A000F>-328<002E005000530043004A>-245<004200560044005500500053>-246<004D00500053>7<0046004E>-245<004F0050004F>-246<004B0056005400550050>9<000F>-327<002F0042004E>-245<004D0042004400560054>-246<004D004A0043>-10<00460053>7<0050>10<000D>-245<00510053>7<00460055004A0056004E>-245<00420055000D>]TJ -0.98 0 0 1 36 54.231 Tm [<004D00500043>-10<005000530055004A0054>-215<0057004A005500420046>10<000D>-222<0056004D00550053004A0044004A00460054>-215<00460055000D>-223<00550046004D004D00560054000F>-327<00250050004F0046>-7<0044>-215<0042004D004A0052005600460055000D>-223<005500500053005500500053>-215<00540046>-7<0045>-215<0042004400440056004E00540042004F>]TJ -0.995 0 0 1 36 39.437 Tm [<0043004A0043>-10<0046004F00450056004E000D>-251<0046005300420055>-250<004D004A00480056004D0042>-251<0042004D004A0052005600460055>-251<004E00420048004F0042000D>-250<0057004A005500420046>-251<00500053004F00420053>7<0046>-250<0050>-7<0045004A0050>-251<004E0046005500560054>-250<0042>-251<004E004A000F>]TJ -0 g 0 G -0 g 0 G -ET - -endstream -endobj -38 0 obj -<< /Type /Page /Contents 39 0 R /Resources 37 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 9 0 R >> -endobj -37 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -42 0 obj -<< /Length 11010 >> -stream -0 g 0 G -BT -/F83 10.44878 Tf -1 0 0 1 162.868 565.121 Tm [<0025>-50<095C>-50<096C>-50<095B>-341<095C>-50<0968>-50<095F>-342<0034>-50<096E>-25<0969>-50<096C>-50<0967>-50<0973>]TJ -/F83 10.44878 Tf -1 0 0 1 355.141 565.121 Tm [<0016>]TJ -0 g 0 G -/F83 11.3574 Tf -1.011 0 0 1 54 542.451 Tm [<002E005000530043004A>-247<00420044>-248<00500053>7<0044004A>-246<00460055>-248<004F004A0054004D>-247<00490046004F00450053>7<00460053004A0055>-247<004E0050004D004D004A0054000F>-330<0034005600540051>-7<0046004F0045004A005400540046>-248<00560055>-248<004E0042005400540042000F>-330<0024005300420054>]TJ -1.02 0 0 1 54 527.656 Tm [<004F0046>-7<0044>-283<0042004F00550046>9<000F>-443<00310046004D004D0046004F005500460054005200560046>-284<0042>-283<004F0056004D004D0042000F>-444<00240056004E>-284<00540050>-6<0044004A004A0054>-284<004F004200550050>-7<005200560046>-284<0051>-7<0046004F00420055004A004300560054>-284<00460055>]TJ -1.02 0 0 1 54 512.862 Tm [<004E00420048004F004A0054>-316<0045004A0054>-316<005100420053005500560053004A0046004F0055>-317<004E0050004F005500460054000D>-334<004F0042005400440046005500560053>-316<0053004A0045004A00440056004D00560054>-316<004E00560054000F>-541<0022004D004A005200560042004E>]TJ -0.999 0 0 1 54 498.067 Tm [<0055004A004F0044004A00450056004F0055>-250<00560053004F0042000F>-336<002F0056004D004D0042>-251<0056004D004D0042004E0044005000530051>-7<00460053>-251<0057>7<004600540055004A00430056004D0056004E>-250<0055005600530051004A0054000F>-335<00310046004D004D0046004F005500460054005200560046>]TJ -1 0 0 1 54 483.273 Tm [<004400560053005400560054>-250<004D00560044005500560054>-250<004E004200560053004A0054000F>]TJ -1.011 0 0 1 71.036 468.478 Tm [<002F0056004D004D0042>-248<004E0042004D004600540056004200450042>-248<0051>-7<0050005300550055004A005500500053>-249<0045004A0042004E000F>-332<00250050004F0046>-7<0044>-249<00470046004D004A0054>-248<0046005300420055000D>-249<00440050004F004800560046>-248<004F0050004F000D>]TJ -0.992 0 0 1 53.716 453.684 Tm [<0057>8<0050004D00560055005100420055>-251<00420055000D>-252<0055004A004F0044004A00450056004F0055>-251<00550053004A00540055004A005200560046>9<000D>-251<004D004A0043>-10<00460053>7<0050>10<000F>-335<0037004A00570042004E00560054>-251<0057004A0057>7<0046005300530042>-251<004700460053004E0046004F00550056004E>]TJ -0.98 0 0 1 54 438.889 Tm [<00470046004D004A0054000F>-329<00250050004F0046>-7<0044>-222<004F0050004F0056004E004E005A>-221<0051>-7<0046004D004D0046004F005500460054005200560046>-222<0042004F00550046>9<000F>-328<0031>-12<0049004200540046004D004D00560054>-222<00420045004A0051004A00540044004A004F0048>-222<00540046004E000E>]TJ -0.98 0 0 1 54 424.095 Tm [<0051>-7<00460053>-226<0046004D004A0055000F>-330<00310053>7<0050004A004F>-225<004700460053004E0046004F00550056004E>-226<004E0042005400540042>-226<00420044>-226<005200560042004E000F>-331<00340046>-7<0045>-226<0045004A0042004E>-226<0055005600530051004A0054000D>-232<004E0050004D004600540055004A0046>]TJ -1.02 0 0 1 53.716 409.3 Tm [<0057004A005500420046>10<000D>-250<0051004D004200440046005300420055>-249<0042000D>-251<004E0050004D004600540055004A0046>-249<004F0046>-7<0044000D>-251<004D0046>-7<0050>9<000F>-338<002E00420046>-7<00440046004F00420054>-250<004D00420044004A004F004A0042000F>-339<002F0042004E>-250<004A005100540056004E>]TJ -1.015 0 0 1 54 394.506 Tm [<004D004A00480056004D0042000D>-246<0046004D0046004A00470046004F0045>-247<00420055000D>-246<0042004400440056004E00540042004F>-247<004F0046>-7<0044000D>-246<0054005600540044004A0051004A0055>-247<0042000D>-247<004A005100540056004E000F>-329<002E005000530043004A>-246<0043004D0042004F0045004A0055>]TJ -1.017 0 0 1 54 379.711 Tm [<004D004A00480056004D0042>-244<0047004600560048004A00420055>-245<004E00420048004F0042000F>-328<002F0056004F0044>-245<0046004D0046004A00470046004F0045>-245<00440050004F00540046>-7<0052005600420055>-245<004D00500053>8<0046004E000F>-327<00340046>-7<0045>-245<004D00420044004A004F004A0042>]TJ -1.02 0 0 1 54 364.917 Tm [<004F0056004D004D0042>-305<0057004A005500420046>-306<0046004F004A004E000F>-510<00310046004D004D0046004F005500460054005200560046>-306<0055004A004F0044004A00450056004F0055>-306<00510056005300560054>-305<0057>7<0046004D>-305<004E00420048004F0042000F>-510<002A004F00550046000E>]TJ -1.004 0 0 1 54 350.122 Tm [<004800460053>-248<004F0050004F>-249<0046004F004A004E000F>-332<003100530042004600540046004F0055>-248<00460056004A0054004E0050>-7<0045>-249<004F0056004F0044>-249<00460056>-248<00510056005300560054000F>-332<00250050004F0046>-7<0044>-249<0043004A0043>-10<0046004F00450056004E>]TJ -1.014 0 0 1 54 335.327 Tm [<005200560042004E>-247<004A004F>-247<00550046004D004D00560054000F>-331<002F0056004D004D0042004E>-247<004400560053005400560054>-247<00510056004D0057004A004F00420053>-247<004D0046>-7<0044005500560054000F>-331<00250050004F0046>-7<0044>-247<00460055>-248<004E004A000F>-330<002F0042004E>]TJ -1 0 0 1 53.716 320.533 Tm [<00570056004D005100560055004200550046>-250<004E0046005500560054>-250<00460056>-250<0046004F004A004E000F>-333<0037>79<004600540055004A00430056004D0056004E>-249<0051>-7<0046004D004D0046004F005500460054005200560046>-250<00470046004D004A0054>-250<00460056>-250<004E0042005400540042000F>]TJ -0.98 0 0 1 71.036 305.738 Tm [<09550056004A0054005200560046>-228<0056004D004D0042004E0044005000530051>-7<00460053>-228<0051004D004200440046005300420055>-228<004A005100540056004E000F>-331<0024005300420054>-228<004F004A00430049000F>-331<002E005000530043004A>-228<0057>7<0046004D>-227<004B0056005400550050>]TJ -0.98 0 0 1 53.716 290.944 Tm [<0057004A005500420046>-236<004D0042004400560054>-237<0055004A004F0044004A00450056004F0055>-236<0056004D00550053004A004400460054000F>-334<002D00500053>7<0046004E>-235<004A005100540056004E>-237<00450050004D00500053>-236<0054004A0055>-237<0042004E00460055000D>-240<00440050004F00540046>-7<004400550046000E>]TJ -0.98 0 0 1 54 276.149 Tm [<0055005600460053>-193<00420045004A0051004A00540044004A004F0048>-193<0046004D004A0055000F>-319<002A004F>-193<004900420044>-193<004900420043004A00550042005400540046>-194<0051004D0042005500460042>-193<0045004A004400550056004E00540055000F>-319<002A004F00550046004800460053>-193<00550046004E005100560054>]TJ -0.996 0 0 1 54 261.355 Tm [<00440050004F00570042004D004D004A0054>-250<00420056004800560046>9<000F>-333<00260055004A0042004E>-251<004700420044004A004D004A0054004A0054000F>-334<002F0056004F0044>-251<0046004D0046004E0046004F00550056004E>-250<004700460053004E0046004F00550056004E>-251<0058004A0054004A000F>]TJ -1.01 0 0 1 53.602 246.56 Tm [<0022>12<0046004F00460042004F>-246<0051004D004200440046005300420055000F>-330<00360055>-247<004A004E0051>-7<00460053>7<0045004A00460055000D>-246<0046004F004A004E>-247<00540046>-7<0045>-247<0048005300420057004A00450042>-246<00540050004D004D004A0044004A005500560045004A004F000D>-247<00470046004D004A0054>]TJ -1.02 0 0 1 54 231.766 Tm [<0050>-7<0045004A0050>-259<0051004D004200440046005300420055>-260<005200560042004E000D>-264<00420044>-260<00510056004D0057004A004F00420053>-260<0046004D004A0055>-260<00510056005300560054>-260<0046004800460055>-260<0046004F004A004E000F>-371<002F0056004F0044>-260<0057004A005500420046>]TJ -1.014 0 0 1 54 216.971 Tm [<005500500053005500500053>59<000F>-330<00310053>7<0050004A004F>-246<00550046004E005100560054>-247<004F004A00430049>-247<0054004A0055>-247<0042004E00460055>-247<004F004A0054004D000F>-331<0037004A00570042004E00560054>-247<00520056004A0054>-247<005500500053005500500053>-247<0057004A005500420046>]TJ -1 0 0 1 54 202.177 Tm [<0053004A005400560054>-250<0051>-7<0050005300550042>-250<0057>8<00460049004A00440056004D0042000F>]TJ -0.999 0 0 1 71.036 187.382 Tm [<00270056005400440046>-250<004E004200560053004A0054000F>-333<0037>80<004600540055004A00430056004D0056004E>-249<004D00560044005500560054>-250<004F004A00430049>-250<00420055>-251<004D0046>-7<0044005500560054000F>-333<00340046>-7<0045>-251<0043004A0043>-10<0046004F00450056004E000D>]TJ -1.004 0 0 1 54 172.588 Tm [<004F0056004D004D0042>-248<0042>-248<0047004200560044004A004300560054>-248<00540046004E0051>-7<00460053>59<000D>-247<004D0046>-7<0050>-248<0057>7<0046004D004A0055>-247<0056004D00550053004A0044004A00460054>-248<00550046004D004D00560054000D>-248<00420044>-248<0057>7<0046004F0046004F00420055004A0054>-247<00420053>7<00440056>]TJ -1.016 0 0 1 53.58 157.793 Tm [<0058004A0054004A>-246<0057>7<0046004D>-245<004F004A0054004D000F>-328<0037>79<004600540055004A00430056004D0056004E>-245<0045004A0042004E000F>-329<0022004D004A005200560042004E>-246<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-245<00420056004800560046>-246<00520056004A0054>]TJ -1.007 0 0 1 54 142.999 Tm [<005400420048004A00550055004A0054>-247<0051>-7<00500054005600460053>7<0046>10<000D>-247<0055005600530051004A0054>-247<004D0042004400560054>-248<00440050004F004800560046>-248<005200560042004E000D>-247<004A004F>-248<00490046004F00450053>7<00460053004A0055>-247<0053004A005400560054>-247<00460053>7<00500054>]TJ -0.98 0 0 1 54 128.204 Tm [<0046004800460055>-237<00470046004D004A0054000F>-334<002E00420046>-7<00440046004F00420054>-237<0046004800460055>-237<0046005300420055>-237<004A004F>-237<005400420051004A0046004F>-237<004E004200550055004A0054>-237<0051>-8<0050005300550055004A005500500053>61<000F>-333<0037>82<004600540055004A00430056004D0056004E>]TJ -1.02 0 0 1 54 113.41 Tm [<0051>-7<0050005300550055004A005500500053>59<000F>-483<002F0056004D004D0042>-297<004700420044004A004D004A0054004A000F>-484<00340046>-7<0045>-297<0042>-298<0055005600530051004A0054>-297<00460056>-297<004D0042004400560054>-298<00440050004E004E0050>-7<00450050>-297<004700420044004A004D004A0054004A0054000F>]TJ -0.982 0 0 1 54 98.615 Tm [<002E005000530043004A>-254<00470053004A004F0048004A004D004D0042000D>-254<0058004A0054004A>-254<004A004F>-254<0045004A0048004F004A00540054004A004E>-254<004A004F005500460053>8<00450056004E000D>-254<004B0056005400550050>-254<004D0046>-7<0044005500560054>-254<005400420048004A00550055004A0054>-254<00450056004A000D>]TJ -1.02 0 0 1 54 83.82 Tm [<00460055>-258<0057>7<00460049004A00440056004D0042>-258<004D004A0043>-10<00460053>7<0050>-258<00450056004A>-259<004400560053005400560054>-258<00450056004A000F>-368<002E004200560053004A0054>-259<00550046004E0051>-7<00500053>-259<004D004A00480056004D0042>-258<00540046>-7<0045>-259<004D0042004400560054000F>]TJ -1.02 0 0 1 54 69.026 Tm [<00250056004A0054>-341<004400560053005400560054>-341<0046004F004A004E>-341<00560055>-341<00420056004800560046>9<000F>-614<0024005300420054>-341<00420044>-341<004E00420048004F0042000F>-615<0024005300420054>-341<004F0056004D004D0042000F>-615<002F0056004D004D0042>]TJ -1.02 0 0 1 54 54.231 Tm [<0046004800460054005500420054000F>-526<00240056005300420043004A005500560053>-312<0042>-311<004D0046>-7<0050>9<000F>-526<09550056004A0054005200560046>-312<0046004800460054005500420054>-311<0058004A0054004A>-312<0046004800460055>-312<004F0056004F0044000F>-526<002F0042004E>]TJ -1 0 0 1 54 39.437 Tm [<0047004600560048004A00420055>-250<004D0042004400560054>-250<0057>8<0046004D>-250<004600540055000F>-333<00240056005300420043004A005500560053>-250<00440050004F00540046>-7<0044005500460055005600460053>58<000F>]TJ -0 g 0 G -0 g 0 G -ET - -endstream -endobj -41 0 obj -<< /Type /Page /Contents 42 0 R /Resources 40 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 43 0 R >> -endobj -40 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -46 0 obj -<< /Length 6156 >> -stream -0 g 0 G -BT -/F83 10.44878 Tf -1 0 0 1 36 565.121 Tm [<0017>]TJ -/F83 10.44878 Tf -1 0 0 1 151.292 565.121 Tm [<0025>-50<0964>-50<096C>-50<095B>-341<0029>-50<095C>-50<096C>-50<095F>-50<095E>-50<095C>-50<096D>-50<0960>]TJ -0 g 0 G -/F83 11.3574 Tf -0.98 0 0 1 53.036 542.451 Tm [<0034005600540051>-7<0046004F0045004A005400540046>-249<0057>7<0046004D>-248<00470046004D004A0054000F>-339<00360055>-249<004D00500053>7<0046004E>-248<004D00500053>7<0046004E000D>-249<004A004F005500460053>7<00450056004E>-249<00460056000D>-250<0055004A004F0044004A00450056004F0055>-250<0054004A0055>]TJ -1.015 0 0 1 36 527.656 Tm [<0042004E00460055000D>-246<004D004200500053>7<0046>-6<00460055>-247<0057004A005500420046>9<000D>-246<00420053>7<00440056000F>-329<0022>12<0046004F00460042004F>-246<0047004200560044004A004300560054>-247<0051>-7<0046>-7<00450046>-247<00460056>-247<0042004F00550046>10<000F>-329<003100530042004600540046004F0055>]TJ -1.02 0 0 1 36 512.862 Tm [<0046004F004A004E>-282<0046004D004A0055000D>-293<00530056005500530056004E>-283<00420055000D>-292<004E0050004D004600540055004A0046>-283<004F0050004F000D>-292<004F0050004F0056004E004E005A>-283<0057>7<0046004D000D>-291<004F004A0054004D000F>-440<00360055>-283<004D0046>-7<0044005500560054>]TJ -1.02 0 0 1 36 498.067 Tm [<00460053>8<00500054000D>-318<004E0042004D004600540056004200450042>-304<0054004A0055>-304<0042004E00460055000D>-319<004700460053004E0046004F00550056004E>-304<00460056000D>-319<00540050>-6<00450042004D00460054>-304<004400560053005400560054000D>-319<004E00420048004F0042000F>]TJ -1.007 0 0 1 36 483.273 Tm [<00250050004F0046>-7<0044>-248<00460056>-249<00510056005300560054000F>-332<09550056004A0054005200560046>-249<0057>7<00460049004A00440056004D0042000D>-248<00560053004F0042>-248<00540046>-7<0045>-249<0056004D00550053004A0044004A00460054>-249<004200560044005500500053>59<000D>-248<0051>-7<0046>-7<00450046>]TJ -1.02 0 0 1 36 468.478 Tm [<004D00500053>8<0046004E>-316<0046004800460054005500420054>-316<00450056004A000D>-335<00460055>-316<00440050004F00570042004D004D004A0054>-317<0046004D004A0055>-316<0046005300420055>-316<00540046>-7<0045>-317<004F0056004D004D0042000F>-541<00250050004F0046>-7<0044>-316<004D00560044005500560054000F>]TJ -0.98 0 0 1 36 453.684 Tm [<00240056005300420043004A005500560053>-241<00460055>-242<004F0056004F0044000F>-336<0022004D004A005200560042004E>-242<00450050004D00500053>-242<0050>-7<0045004A0050>10<000D>-244<00440050004E004E0050>-7<00450050>-242<00510053>7<00460055004A0056004E000D>-243<0056004D00550053004A0044004A00460054>]TJ -1.018 0 0 1 36 438.889 Tm [<004F0050004F000D>-244<0051004900420053>7<0046005500530042>-243<004A004F000D>-245<0057>7<0046004D004A0055000F>-326<002A004F00550046004800460053>-244<00420053>7<00440056>-244<004600540055000D>-244<004F0050004F0056004E004E005A>-244<004A004F000D>-245<004700460053004E0046004F00550056004E>]TJ -1 0 0 1 36 424.095 Tm [<0047004200560044004A004300560054000D>-250<0046004800460054005500420054>-250<0057>8<0046004D000D>-250<0050>-7<0045004A0050>10<000F>]TJ -1.005 0 0 1 53.036 409.3 Tm [<00340046>-7<0045>-247<00440050004E004E0050>-7<00450050>-248<0051>-7<00500054005600460053>7<0046>-246<0051>-7<0046>-7<00450046>9<000F>-330<002E004200560053004A0054>-248<00560055>-247<004600540055000F>-332<00360055>-247<00520056004A0054>-247<00510056005300560054000F>-332<00340046>-7<0045>]TJ -1.01 0 0 1 36 394.506 Tm [<00420044>-247<0050>-7<0045004A0050>9<000F>-330<00340046>-7<0045>-248<0057>7<00460049004A00440056004D0042>-247<00490046004F00450053>7<00460053004A0055>-247<00540046004E000F>-331<00250056004A0054>-248<004F0050004F>-247<0050>-8<0045004A0050>10<000F>-330<002E005000530043004A>-248<00560055>-248<00450056004A000F>]TJ -1.02 0 0 1 36 379.711 Tm [<00340046>-7<0045>-316<0042004400440056004E00540042004F>-317<0053004A005400560054>-316<0046004800460055>-317<0050>-7<0045004A0050>9<000F>-541<002A004F>-316<004900420044>-317<004900420043004A00550042005400540046>-317<0051004D0042005500460042>-316<0045004A004400550056004E00540055000F>]TJ -1.02 0 0 1 36 364.917 Tm [<00310046004D004D0046004F005500460054005200560046>-361<004F0050004F>-362<0046004D004A0055000F>-677<00270056005400440046>-361<00540046>-7<0045>-362<004B0056005400550050>-362<00460056>-362<00560053004F0042>-361<0051>-7<0050005300550042>-362<0055004A004F0044004A00450056004F0055000F>]TJ -0.981 0 0 1 36 350.122 Tm [<002E004200560053004A0054>-255<00470046004D004A0054>-255<0050>-7<0045004A0050>9<000D>-254<00540050004D004D004A0044004A005500560045004A004F>-255<00540046>-8<0045000D>-255<0057>7<0050004D0056>1<0055005100420055>-255<0042000D>-255<00500053004F00420053>7<0046>-254<00420044000D>-255<0046005300420055000F>-341<002E005000530043004A>]TJ -1.02 0 0 1 36 335.327 Tm [<00520056004A0054>-270<00450050004D00500053>59<000F>-401<00250050004F0046>-7<0044>-270<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-275<0046005300420055>-270<00420044>-270<005400420048004A00550055004A0054>-270<00540046004E0051>-7<00460053>58<000D>-275<004F0056004F0044>-270<00450056004A>]TJ -1.02 0 0 1 36 320.533 Tm [<004D00500043>-10<005000530055004A0054>-269<00510056005300560054000D>-275<00520056004A0054>-269<00440050004F004800560046>-269<00510056005300560054>-269<004E0046005500560054>-269<0056004D00550053004A0044004A00460054>-269<00550046004D004D00560054000F>-398<00310053>7<0050004A004F>-268<00460055>]TJ -1.02 0 0 1 36 305.738 Tm [<005200560042004E000F>-341<0024004D004200540054>-250<0042005100550046004F0055>-250<005500420044004A0055004A>-250<00540050>-7<0044004A0050005400520056>-250<00420045>-250<004D004A0055005000530042>-250<005500500053>7<005200560046004F0055>-249<0051>-7<00460053>-250<00440050004F00560043004A0042>]TJ -0.98 0 0 1 36 290.944 Tm [<004F00500054005500530042000D>-241<0051>-7<00460053>-238<004A004F004400460051005500500054>-239<0049005A004E0046004F00420046>-7<00500054000F>-334<003100530042004600540046004F0055>-239<005400420051004A0046004F>-238<0055005600530051004A0054000D>-241<004700460053004E0046004F00550056004E>]TJ -1 0 0 1 35.716 276.149 Tm [<0057>8<0046004D000D>-250<0046004D0046004A00470046004F0045>-250<0047004200560044004A004300560054000D>-250<0057>8<00460049004A00440056004D0042>-250<00460056000D>-250<004D0042004400560054000F>]TJ -0 g 0 G -0 g 0 G -ET - -endstream -endobj -45 0 obj -<< /Type /Page /Contents 46 0 R /Resources 44 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 43 0 R >> -endobj -44 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -49 0 obj -<< /Length 32 >> -stream -0 g 0 G -0 g 0 G -0 g 0 G -0 g 0 G - -endstream -endobj -48 0 obj -<< /Type /Page /Contents 49 0 R /Resources 47 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 43 0 R >> -endobj -47 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet [ /PDF ] >> -endobj -52 0 obj -<< /Length 32 >> -stream -0 g 0 G -0 g 0 G -0 g 0 G -0 g 0 G - -endstream -endobj -51 0 obj -<< /Type /Page /Contents 52 0 R /Resources 50 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 43 0 R >> -endobj -50 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet [ /PDF ] >> -endobj -1 0 obj -<<>> -endobj -2 0 obj -<<>> -endobj -3 0 obj -<< /pgfprgb [/Pattern /DeviceRGB] >> -endobj -53 0 obj -[ 13 [ 219 333 219 291 ] 34 [ 667 557 616 667 ] 41 [ 673 280 ] 47 [ 666 ] 49 [ 499 ] 51 [ 555 454 544 634 ] 66 [ 486 478 389 489 401 314 477 519 276 ] 76 [ 486 266 783 518 447 489 491 357 353 307 521 472 688 475 503 ] 105 [ 633 ] 1724 [ 268 ] 2122 [ 564 ] 2157 [ 519 ] 2160 [ 551 ] 2167 [ 568 ] 2169 [ 648 591 552 ] 2174 [ 462 ] 2176 [ 492 ] 2181 [ 474 ] 2257 [ 444 444 444 444 445 444 444 444 444 444 ] ] -endobj -55 0 obj -<< /Length 284 >> -stream - -endstream -endobj -56 0 obj -<< /Subtype /CIDFontType0C /Length 10174 >> -stream - -k -Ö „ å š
p"·{îôµ
Þ"‰¨/òÁj;;õ‹ ] # ˆ X ö Å!!w!é"z##‡#õ$Z$ì%ZN‹½ø콋½ø$½‹øˆùPüˆÛý ÷>÷“÷>û“üø¿÷>û“û>û“÷z÷“÷>÷“ü’û\÷Àû>÷“÷èûêû÷w÷»É¸sšž† ›‡š‡yoX\V ˆ‚Žƒ“…÷ §å¿³t£lmnxl ûx÷sÇØ÷¤÷Î÷sšŸ¬š’ˆƒ ûyuqzƒŽ‚’ ûê€õÊ÷ -û3ûDû&ûYe †r‰srûÖû -÷B õ‰¨nøÙn¨÷k×÷Ìælžˆy‰¸Œ±Œ²°°‰î $÷ ÷SË÷Šº ¢¢ ÷/û÷ û5 N‹R‰dfdŒ^ $ˆ‰œˆx†ŠŽˆ¥‰«‰—‡w†Š…Š„ *ü†…kx€i‰n‰l‡‡‡†Š ÷BÂíø‰®’º÷;Äûûmˆm…m û^dûYû;y’ ‹Œ ÷‰ÿ -Óyåûû;<û1û Þ“å²÷&õ©›{oš —rŽfmc…5fS `ocyen`±ô Cû}ÿ -÷CŒŠ§q¦ø*§÷NÕ÷…Ú¸ †w‰í§¹‰Û÷÷$¹÷C° œœ›÷9ÞûpOŠŠV )‰‰‡vˆŠŽ‰Ž¢¤•†}‡Š†Š… xEûÛl„~}mt¸‡‰ˆ‡Š ÷.½Ó÷㤧Ž²÷²B8r‡r†r û$m4kûL|–ž‹Œ ’Š¨o§÷P«÷N§÷ƒ’¸÷~÷Œ¬÷.Ÿ˜—«–ŽŒ Š‹L‰ol<‹ "‰‰‡uˆŠŽŠŸ¥–„|ˆ‹ˆŠ‡ Cûåx‡}ykv‡ˆ‰‡ †v‰‹ß§ªÄ‹ " ‰‡ €r–›Ž‹ŒŽ «÷+¦Š—†™wxðû ‘‚„„…Š‡Š… ˆ~÷&¸¡ŽŒ‡Žˆ†v|Ÿ} û÷J†’ˆ‘Œ‘Œ‘•”¤Ÿ÷î¶Áž²Ž ¡ˆŒ‹_ŠroC‹ "‰Š†uˆ‰Ž˜œŠƒ†‡†|~ û5ûqw|‡wŠâŠ¨€vøJ§÷"’ž’÷âÑ»’¶ø¶øŠ‡gûÑ‹s‰‚vw‡‡‰‡Š †v‰‹Ï§©Ä‹ " †ˆl{Œ¨ ŽŒ²÷㤎½‘Œ ŽŠû‰ûgûøC÷øûˆˆ‡v‰‰¬š‰}‰‹ˆŠˆ (ûäc~…d‡‡‰‡Š ‡vŒ‰¾‹µ§ª¹‹ " ‡ˆm~Œœ‘’• æ÷Æv×ü†‰ ©Š¨xvøR§÷m’°øÝø¡›¡ª ŽŽ ¡ˆŒ‹T‰moF‹ "†‰‡vˆ‰ ¥“{z‡‹‡Šˆ Xû…z‡ˆ‚†‡„’› ûP÷Îûˆˆ‡x‡Š‰°•xy‘ FûÚx‡{skvˆ„‰‡Š †vŽ‰‹Í¦ªÈ‹ " ˆˆ vr‚™œ‹Œ ¿÷‡£–‘’ƒ{” p÷UûÏ{–“…š—•’Ÿ ‚«ø:«ÙÜ÷àÜøÊ÷žœœ÷6Õûû û ûû m ‡w‰yyûÙF÷÷)÷ó÷#© ûe÷cÛÁ[)uˆr…o ûqBA18X¾è Ž£¤ ÷*«ÞÅÖ(ƒ«r¨÷T©—÷J©o§÷ØÖ˜Ój÷Çw‡~kw‡ˆ‰‡Š †v‰‹Ô¦ªÑ‹ "Ž Œˆ‡q€’šŽ‹ŽŒ ÷4Ðœgh šIjŒQؘ¡‘ ˆ£V‰´¥ ŠÛ®q¨j ŒŒ[ƒϼ˜È”Œ’“ÈM¡5 s‹]‰ijcŒm $g†s‰‰©¤‰v ƒ÷sZ8zYv@dk°÷FŽž¢Œ§¿¥e g‚‰‚‰ FŠ¨ø(©mµ÷vÕÃ’÷+§Üø^øD¶”qC §Ž¼»”¸”·sÜ…ˆ€…{ûܼ{ƒ‘‘Š rÜ‚_]z\¤ˆÓ¯œ¥¸¾¢”„|ˆŠ‡Š‡ Cûèw‡}€lv‡ˆˆˆ †v‰‹Ó§©Û‹ " ŽˆŽˆ vr€‘šŽ‹ŒŽ Ó÷棗–§4Š¨ø*§òø_ûïÕà÷kÆw‡~€kw‡ˆˆˆŠ †v‰Ð‹Ô§©Û‹ "Œ ŽŒˆŽˆvq€‘šŽ‹ŽŒ ª÷&÷2÷Z¢ž—“¢œ’ŒŽ {Š]Š„O… $‰Š†u‰ŠŒˆŽ¢›‰ƒ‰ Š‡‡†ƒ€ûû4E÷4ŒŠ‹Œˆ•‰Œ’Œ‘Žš¡ŽŽŒ ¡ŠŒ€Š6Š†M‚ $ˆ‰‡v‡ŠŠ¨˜v” àû^û ®ø®ÍÜ÷}Ü÷ÅøK"%2ûr û'nÍ9÷ -¢½ÎÐû ‰¬ø%•÷ -µ|µ`§ b¦ô¢§ž¡èûOübN©××ÑÄÏ· ªt¸j gd5YI8 ôéøÈÁZfnl*? t›R´¤¨º¿ËÆ û ûK§÷t¯÷Ä©×Ô÷tÓ§û/‰‹‚Ž‚ëŽöºÙÚ÷÷÷1©÷ B®Aû*û !K¥:÷°Á¢§ uH`M^_RS6fC‚÷Þ÷ÅgZk‚r9vнÒÅ÷Ó²Âi"aƒU„s -× øÅ -endstream -endobj -54 0 obj -<< /Type /FontDescriptor /FontName /OKLFSU+LibertinusSerif-Italic /Flags 4 /FontBBox [ -1325 -312 1389 928 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle -12 /StemV 73 /XHeight 429 /FontFile3 56 0 R /CIDSet 55 0 R >> -endobj -57 0 obj -<< /Length 1576 >> -stream -%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OKLFSU-LibertinusSerif-Italic-0) -%%Title: (TeX-OKLFSU-LibertinusSerif-Italic-0 TeX OKLFSU-LibertinusSerif-Italic 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OKLFSU-LibertinusSerif-Italic) -/Supplement 0 ->> def -/CMapName /TeX-Identity-OKLFSU-LibertinusSerif-Italic def -/CMapType 2 def -1 begincodespacerange -<0000> <FFFF> -endcodespacerange -0 beginbfrange -endbfrange -62 beginbfchar -<000D> <002C> -<000E> <002D> -<000F> <002E> -<0010> <002F> -<0022> <0041> -<0023> <0042> -<0024> <0043> -<0025> <0044> -<0029> <0048> -<002A> <0049> -<002F> <004E> -<0031> <0050> -<0033> <0052> -<0034> <0053> -<0035> <0054> -<0036> <0055> -<0042> <0061> -<0043> <0062> -<0044> <0063> -<0045> <0064> -<0046> <0065> -<0047> <0066> -<0048> <0067> -<0049> <0068> -<004A> <0069> -<004C> <006B> -<004D> <006C> -<004E> <006D> -<004F> <006E> -<0050> <006F> -<0051> <0070> -<0052> <0071> -<0053> <0072> -<0054> <0073> -<0055> <0074> -<0056> <0075> -<0057> <0076> -<0058> <0077> -<0059> <0078> -<005A> <0079> -<0069> <00A9> -<06BC> <2019> -<084A> <00660069> -<086D> <0061> -<0870> <0064> -<0877> <006B> -<0879> <006D> -<087A> <006E> -<087B> <006F> -<087E> <0072> -<0880> <0074> -<0885> <0079> -<08D1> <0030> -<08D2> <0031> -<08D3> <0032> -<08D4> <0033> -<08D5> <0034> -<08D6> <0035> -<08D7> <0036> -<08D8> <0037> -<08D9> <0038> -<08DA> <0039> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - -endstream -endobj -21 0 obj -<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OKLFSU+LibertinusSerif-Italic /DescendantFonts [ 58 0 R ] /ToUnicode 57 0 R >> -endobj -58 0 obj -<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OKLFSU+LibertinusSerif-Italic /FontDescriptor 54 0 R /W 53 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> -endobj -59 0 obj -[ 374 [ 2000 ] ] -endobj -61 0 obj -<< /Length 47 >> -stream - -endstream -endobj -62 0 obj -<< /Subtype /CIDFontType0C /Length 472 >> -stream - -¯ -¯ Ú Ú’
-endstream -endobj -60 0 obj -<< /Type /FontDescriptor /FontName /ETXLAD+NovelDeco /Flags 4 /FontBBox [ -392 -234 1985 838 ] /Ascent 894 /CapHeight 537 /Descent -246 /ItalicAngle 0 /StemV 61 /XHeight 429 /FontFile3 62 0 R /CIDSet 61 0 R >> -endobj -63 0 obj -<< /Length 652 >> -stream -%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-ETXLAD-NovelDeco-0) -%%Title: (TeX-ETXLAD-NovelDeco-0 TeX ETXLAD-NovelDeco 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (ETXLAD-NovelDeco) -/Supplement 0 ->> def -/CMapName /TeX-Identity-ETXLAD-NovelDeco def -/CMapType 2 def -1 begincodespacerange -<0000> <FFFF> -endcodespacerange -0 beginbfrange -endbfrange -1 beginbfchar -<0176> <254C> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - -endstream -endobj -17 0 obj -<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ETXLAD+NovelDeco /DescendantFonts [ 64 0 R ] /ToUnicode 63 0 R >> -endobj -64 0 obj -<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ETXLAD+NovelDeco /FontDescriptor 60 0 R /W 59 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> -endobj -65 0 obj -[ 13 [ 220 338 220 ] 19 [ 465 465 ] 22 [ 465 465 ] 32 [ 435 ] 34 [ 695 ] 36 [ 646 701 557 485 ] 41 [ 730 297 ] 45 [ 528 839 699 702 541 ] 52 [ 485 597 661 652 951 ] 66 [ 457 493 428 506 447 310 500 538 271 272 512 264 790 542 504 519 503 372 390 316 531 497 747 490 515 ] 1754 [ 742 ] 1759 [ 268 ] 1768 [ 351 ] 2360 [ 582 560 540 ] 2389 [ 702 ] 2395 [ 554 556 ] 2398 [ 492 565 477 ] 2404 [ 311 ] 2407 [ 667 602 563 ] 2412 [ 511 412 529 ] 2419 [ 489 ] ] -endobj -67 0 obj -<< /Length 303 >> -stream - -endstream -endobj -68 0 obj -<< /Subtype /CIDFontType0C /Length 10921 >> -stream - -s ü
—9…E4/ý~çAH] Ã]òf”a ` 5 l ‹ M Ö!±"="•##Â$!$Ü%„%Ì&''‹(3U‹½ø龋½ø$½‹øˆùNüˆÛý ÷>÷’÷>û’üø½÷>û’û>û’÷z÷’÷>÷’üû\÷¿û>÷‘÷èûâû÷x÷²óêluvol¥ˆ ž‰œ…tvg]W~ „’„ Ç–Å»ÑÇq²c ûl÷sdz÷–÷£÷s˜™§—•‡• ûo~ty‘‚” ûâõÄõĶn£s¨¨££¨¨s£nnssn 2‹Ìø’®¿ÞAÖ@â÷BãÌÈøhvžy œ©¡“‰‘‰’ Ô‰’…”“¤¥¯Ô¯¾r+KtWPO ABä)'{[P‹¾« ÷C«¹‰‹ ˜À•ÖŒ©…~‰DzzrgûF»ÐÏ ðìĶ·×÷ -Œ°ø÷1Mù+÷:‡ŠJˆ……‹v‘…°Œ³Œ©©¹Š¬ $‘‘‹ …‘GŽˆ…Þmø9‡Á™Ï‘‘‹ …‘û‰ûhü‡ˆ‡‰‰ˆ“ˆ Kûaøû%……‹v‘…Ї‘‰„@Mcü0…OrR†……‹v‘…©Œ«Œ££³Š© $‘‘‹ …‘I†ªÃ£±ø%÷cü›„Ž‘ƒ‘‘’“ U÷uø¥÷%–v¨vøü¬ñ¼ø)¼xøÀø”ûÛx‹€„‡|°n ûëøGû……‹v‘…¶ˆ©h‘qü52z…E„ ……‹v‘…¶Œ¸Œ£¢¹Šµ $‘‘‹ …‘E’zæ÷Æ‹š“‘–€uœ ¸÷ñüM|–˜‚›™”—ž ø䜑ђ ‘‘‹ …‘bŠ\Šsv]Œ_ $……‹v‘…xÑ„œ‡0÷(¯ø诰ëøIëù.÷Ý÷cû#÷ûGûVûû.ûVûY÷#û÷>÷ã»Ù ³Ä¡Óßûã÷¹÷öûû^ûG5"ûûû÷÷T÷fîàî ~‰¬÷÷†wóà÷uèìóøŸü%8z†Eˆ ……‹v‘…¸Œ¼Œ¯®ÆŠ½ $‘‘‹ …‘=sÞ÷>„¡£ˆ®÷JÂ÷ àÆdöûM eP„cÜfWŒŒc ……‹v‘…ìшœ†8નš®ÓÐÐtûû -Že ‰‰‰Š ‡^W€[‡•—Š—ÐÛŸ¹¥Í¼°•eN ü8z†;ˆ ……‹v‘…¼Œ¾Œ³±¾Š½ $‘‘‹ …‘;ŽzÞö´øÛ¬âà÷ö¼÷@øŸÞšØŽ ‘‘‹ …‘\ŠZŠddbŒd $……‹v‘…Ljœ†8û¶û`÷dñ÷a¼÷÷F ÷xۜǒ ‘‘‹ …‘eŠbŠtvZŒ] $……‹v‘…Ö„œˆ:ûŠû|ûû=[b¨m Zº‰×Ìí”vù¬Œ÷:÷î÷ øTøúÕ†‹pvUû2ü%‡û4ø+tÇ‘˜Ï’‘‘‹ …‘cŠ^ŠgghŒj $……Œv‘…†“z¦F÷Yü”{‘’„•–’”™‘ ÷cø’žº›²Ê’‘‘‹ …‘mŠhŠtt^Œb $……‹v‘…ø!”vù¬÷4÷B÷ATÂ÷Ä÷ôù¾øÉû0üFˆŒû ø:zÁ®ŽŽ‘‘‹ …‘bŠ_ŠcjhŒk $……‹v‘…ìÀˆ¡l”q¢IŽ‚Šƒƒz ûû¹†Œû&øN®¦®‘‘‹ …‘jŠ_ŠdhnŒn $……‹v‘…¸ˆ’ŠžU÷Pü±{‘€–˜‘•œ’ ÷)÷㟔Ž€z‘ ÷ûàz‘—–’–š ÷]ø¯˜®¢ÂŽ‘‘‹ …‘nŠkŠqq_Œc $……‹v‘…ô´ˆ³ˆ|`*´b»ø¬¯ÞKØ÷5Ù´÷¹»l‘–p½±¯œŸ l‰—‡”€‘…„z~nŠ²¹ ÷'÷"=¦B98URs—¢¨ ˜’Š’‰ ŠŽŠ‘–ªµ–±ºzû„ˆ‡ˆŠ 5v´+sFVG9ÃqÑ®©“· Ÿ›÷Mû~…„ƒ… vqitoYu³ª¸ ¹Õž Nˆvø ·÷^©œ•‹wÙÚ÷iá§÷;ø ……‡”÷L«Ì³‹ ’‡Ž‚ sr@}cˆ‰ƒ{‘…ŽŽ‹Ž·ˆ–‹<ü|dŠyˆ} §ƒ‡—‘‘•”“”•—‘‹–‚x¢©…®ñ÷ è÷3÷1Ö4`ezol ’l¢¥©”¨È½A*û]5,lv¡¤w ÷Ž •˜– û¼ø¬°áø"懔ƒ‚Œ_i`u`BNÕ÷ ÷»ÍÍÆ“hh pŽ™‚ §˜ªÂR³+(!2û"ûÓ2÷ÇÀžÝ½ [º„¦÷ï®÷^©œ•‹w²á÷pÚ§÷â½”Œ„Žs“h‹“ˆŒ‘k¡®šÈ’‘‘‹š…‘K‚ž¼øY̳‹ ’‡Ž‚ ³r@}cˆ‰ƒ{‘…ŽŽ‹Ž·ˆ–‹<û„‰‰„ ‡bœjI_uec ``qPAûÉ1÷ -wãÚ÷XÚ¸÷m²ºŸ³¼ ”Œ„Žr“i‹“ˆŒ‘x¡®šÈ’‘‘‹š…‘K‚ž¼÷T©Ô‹ ŽˆŽ† †Š|Š|kgŒi $……‹v‘…¼ˆ˜I¸ûUx‰ƒ} kfe{rmY™ä ÷J©Ô‹ ŽˆŽ† †Š|Š|kgŒi $……‹v‘…»‡™€JûTF©Hî R”vø.¬’÷/÷i÷ ÷Ùø"Á‡‘vX:ûX{d†‹{µC÷Uy»‡—À’‘‘‹ …‘jŠhŠjjmŒm $……‹v‘…À…’{ŸX÷ûÐ|‘‘…˜•’‘œ’ ÷÷Íž·–¤Ã‘‘‹ …‘wŠsŠqjiŒr $……‹v‘…÷U”vø.¬’÷.ò÷%÷i÷ -÷_ø"‘‘‹ …‘mŠhŠgepŒq $……‹v‘…º†– W÷û×}‘“…•”“‘›’ ð÷ŠòûŒ}‘“…•”“‘š‘ ÷÷Ñ›´œ§¾Ž‘‘‹ …‘wŠuŠmmaŒm $……‹v‘…Ö‡n}h7ûdr‡‹ƒ 5÷oxº•À‘‘‹ …‘mŠcŠmrjŒm $……‹v‘…º‡—n^‘{EûE~j‰Š~«;÷bx»Œ›»ŽK‰¬÷ ã÷ ¬œ÷û÷9û6÷)¯Ò¢÷:û+÷4û÷¦@÷J÷út’Œ¸‘‘‹ …‘pŠ_ŠmmmŒq $……‹v‘…ˆ§z§bâû„‹ˆ‡†¨@7û -÷)w y‚z€{\iccnc³w•™•˜–˜šž ”ÐÅx[÷ - lÖÓ|ßóð°ÆÊ zfI;uY?X™®1 û…ù|÷öûû^ûG5"ûûû÷÷T÷fîàî ‹‰¬÷L÷H¬÷Ú÷A÷.û ÷$ô÷÷æûl8€ˆN† ……‹v‘…±Œ¸Œ¨¨Š¬ $‘‘‹ …‘[‚ŽÞ衤†wš ÷û ™{Œ€~}–Œ¤Œ¥§¼‰‹ $‘‘‹ …‘pŽs–~šû(÷B†‘‡‘“‘–œ áîø©®°³‘‘‹ …‘mŠjŠqnjŒn $……‹v‘…½ˆq>4[`n{jäÞ”Ž» ‘‘‹ …‘kŠjŠln_Œd $……‹v‘…ôȆ–ˆ8‰¬÷
÷¨w‘÷÷§÷.êôw_rV†……‹v‘…Œ¡Œ¥¦±Šª $‘‘‹ …‘U„˜¢½ž¶“ŽŽŽ›÷O U¡UŒƒU†……‹v‘…®Œ²Œ«©¨Š¨ $‘‘‹ …‘V’ˆ“sÅû.ø
|ƒxƒwˆçû¨û+w˜Ÿ“ Õ÷=’ŒM±ø-¬°â÷¸©÷¨Ù»¨Êº ‰’–ƒU]hwH(Qöî÷<Ù®ÖÛº_E— •ˆ•‹•‘´‰µ¸ e^›;û%'û&LŸF¼^ f³ÃwÕ–‰¬ø"¬÷Ú÷“â÷(ø`p^ŒŒd ……‹v‘…ȇ–‡8ûl8€ˆN† ……‹v‘…±Œ¸Œ¨¥³‰Û $÷÷¿÷C÷9óû; Gg‰n³ü÷Ö¤¤‘²÷<¢û #û Mfû?„œ§ >‹ª÷V«÷>¬w÷Úè÷Œ÷uÍŒxf †‹Š¢Š›™Œ«Œ¤ †y‹††^‰‰€JR÷"œ˜–ž ÄݘjR •Š”“؇ى’ŠŒ‰ èˆ}Šzûcn]ŒŒg ……‹v‘…ȇ–‡8ûl8€ˆN† ……‹v‘…Œ¯·Œ«÷.³Í‰‹ —´–Â’µ‚ƒ€ˆP{nY8`a–¬ ÷*û‡žvødw÷Ú÷W÷æÞ–ŽÈ ‘‘‹ …‘eŠ`ŠlmaŒd $……‹v‘…ȇ–‡8ûl8€ˆN† ……‹v‘…°Œ´Œ«·Š® $‘‘‹ …‘N€Þ÷”vªvøC¬£êÿy€ -Ú Ú’
ø¾ -endstream -endobj -66 0 obj -<< /Type /FontDescriptor /FontName /FIJEIL+LibertinusSerif-Regular /Flags 4 /FontBBox [ -1325 -256 1269 928 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle 0 /StemV 73 /XHeight 429 /FontFile3 68 0 R /CIDSet 67 0 R >> -endobj -69 0 obj -<< /Length 1701 >> -stream -%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-FIJEIL-LibertinusSerif-Regular-0) -%%Title: (TeX-FIJEIL-LibertinusSerif-Regular-0 TeX FIJEIL-LibertinusSerif-Regular 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (FIJEIL-LibertinusSerif-Regular) -/Supplement 0 ->> def -/CMapName /TeX-Identity-FIJEIL-LibertinusSerif-Regular def -/CMapType 2 def -1 begincodespacerange -<0000> <FFFF> -endcodespacerange -0 beginbfrange -endbfrange -70 beginbfchar -<000D> <002C> -<000E> <002D> -<000F> <002E> -<0013> <0032> -<0014> <0033> -<0016> <0035> -<0017> <0036> -<0020> <003F> -<0022> <0041> -<0024> <0043> -<0025> <0044> -<0026> <0045> -<0027> <0046> -<0029> <0048> -<002A> <0049> -<002D> <004C> -<002E> <004D> -<002F> <004E> -<0030> <004F> -<0031> <0050> -<0034> <0053> -<0035> <0054> -<0036> <0055> -<0037> <0056> -<0038> <0057> -<0042> <0061> -<0043> <0062> -<0044> <0063> -<0045> <0064> -<0046> <0065> -<0047> <0066> -<0048> <0067> -<0049> <0068> -<004A> <0069> -<004B> <006A> -<004C> <006B> -<004D> <006C> -<004E> <006D> -<004F> <006E> -<0050> <006F> -<0051> <0070> -<0052> <0071> -<0053> <0072> -<0054> <0073> -<0055> <0074> -<0056> <0075> -<0057> <0076> -<0058> <0077> -<0059> <0078> -<005A> <0079> -<06DA> <2014> -<06DF> <2019> -<06E8> <2022> -<0938> <00660066> -<0939> <00660069> -<093A> <0066006C> -<0955> <0051> -<095B> <006B> -<095C> <0061> -<095E> <0063> -<095F> <0064> -<0960> <0065> -<0964> <0069> -<0967> <006D> -<0968> <006E> -<0969> <006F> -<096C> <0072> -<096D> <0073> -<096E> <0074> -<0973> <0079> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - -endstream -endobj -16 0 obj -<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FIJEIL+LibertinusSerif-Regular /DescendantFonts [ 70 0 R ] /ToUnicode 69 0 R >> -endobj -70 0 obj -<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FIJEIL+LibertinusSerif-Regular /FontDescriptor 66 0 R /W 65 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> -endobj -71 0 obj -[ 37 [ 734 ] 52 [ 504 ] 66 [ 506 ] 69 [ 561 ] 76 [ 613 ] 78 [ 905 616 551 ] 83 [ 428 ] 85 [ 358 ] 90 [ 558 ] ] -endobj -73 0 obj -<< /Length 12 >> -stream - -endstream -endobj -74 0 obj -<< /Subtype /CIDFontType0C /Length 2256 >> -stream - -÷´÷»¼b’¦y·Â² ®° l‰—‡““~‡xu…¼ ÷$÷$2¨9BûaIo—u²¯¥¡£Š‘Š‘ ‰•‰••–Œ“—¬µ®yû Hv´"jAn<F±gâ¨Å«¥¬ Œ÷>ûwrr{y`|¨ª°ŽªÒ¢ “Í÷îµ€w÷¤˜‹w°÷ ÷B÷Î÷÷»sz‹Œ“†™°•Ç™Ð”‘‰Ÿ‰‘U€›ÄøV¶ÌŽ°‹ ”„‚ f;€DˆˆŒ~‚ʆŠFûΑxsnûûûûP F¼e o¯¤}æշ™ ‘ºzvVuYdÃ÷ À‘¹žª ¦œ¦›©¥¤ˆj£ ûŠƒ‹‚Œƒ lj÷E³÷-÷˜‹wï÷÷-÷qûc÷Jîï÷8{‚Nˆ ……‹u‘…µŒ¸ŒÂ··Š£ $‘‘‹¡…‘mz“Þݧªˆ{• ¢i§bœf˜oŽ‚|q‰‹‹¸®´ÃŠ° $‘‘‹¡…‘duˆm¸û÷?†’‰“½Âõ«®¦®×“‘‘‹¡…‘uŠLŠqf\Œf $……‹u‘…Á‡›‚ncumuswy€~]zm÷âÌŽ°‹ ”„‚ f;€DˆˆŒ€‚ʆŠF÷ôžvøÕzœí÷÷5÷÷5÷ Ü÷x÷÷[‹£²®•œ³©yR û;7{‚bˆ ……‹u‘…µŒ«Œ»»ªŠ¶ $‘‘‹¡…‘cŽz”ß÷0¤ŠŸˆ• ž±¶—›³§yR û;7{‚bˆ ……‹u‘…µŒ«Œ»Â·Š¶ $‘‘‹¡…‘NŽ{”ß÷0÷c½5f7ckQ ¶|c¨PgCekR ¼ˆ©ˆ¢‹Ü—Šƒ}fO}F‚‰…w…†•ƒRûO8€‰N† ……‹u‘…µŒµŒÀ¹§Š¶ $‘‘‹¡…‘aŽÞÊžvøÕí÷÷<÷÷x÷÷]¦³³Ÿ³©yR û;7{‚bˆ ……‹u‘…µŒ«Œ»Â·Š¶ $‘‘‹¡…‘NŽ{”ß÷0÷\½5cD_eT ˆ®‡©‹—Šƒ}fO}F‚‰…w…†•ƒRûO8€‰N† ……‹u‘…µŒµŒÀ¹§Š¶ $‘‘‹¡…‘aŽÞ‰µøµ°÷ ÷Y÷ °÷cûó5÷ÒÆŸ°´ ¾¸œÏÃ÷2ìû)8Mn^d e_zOP÷s÷WϹ:û û \kg9k÷Õç›ÜÎ ûžv÷Ò÷í÷÷x÷ ¯–š˜š •“”’š”–‚“ ƒ’œƒ¢¨§©µ¥m©ghemI] ‡‰©†¼‹”Šƒ“}\V}I„‰…x…†•‚RûO8€‰N† ……‹u‘…µŒµŒÀÀ´Š¶ $‘‘‹¡…‘N€ŽÞûWÑ÷ؽ÷'”ã÷û÷û÷ðÊøF}|‡€~ n†ŒŠ ̉&ŠûYh”i y x¢¯‚£Âȧ§Ÿ —…‘• ~r‡xuuœ½ ½Šöïð•™” ªˆ† äû ŒÎŽ¹‹‘ˆŽ† è„f€„{ z„n…„‚„‚‡p;û|ï'ó8vù‘÷]÷4÷Nû÷:÷†û<›§š¯—©Û÷U¼÷ -÷ ÷•
ø½ -endstream -endobj -72 0 obj -<< /Type /FontDescriptor /FontName /COAJSK+LibertinusSerif-Bold /Flags 4 /FontBBox [ -1625 -328 1562 1014 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle 0 /StemV 81 /XHeight 433 /FontFile3 74 0 R /CIDSet 73 0 R >> -endobj -75 0 obj -<< /Length 848 >> -stream -%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-COAJSK-LibertinusSerif-Bold-0) -%%Title: (TeX-COAJSK-LibertinusSerif-Bold-0 TeX COAJSK-LibertinusSerif-Bold 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (COAJSK-LibertinusSerif-Bold) -/Supplement 0 ->> def -/CMapName /TeX-Identity-COAJSK-LibertinusSerif-Bold def -/CMapType 2 def -1 begincodespacerange -<0000> <FFFF> -endcodespacerange -0 beginbfrange -endbfrange -11 beginbfchar -<0025> <0044> -<0034> <0053> -<0042> <0061> -<0045> <0064> -<004C> <006B> -<004E> <006D> -<004F> <006E> -<0050> <006F> -<0053> <0072> -<0055> <0074> -<005A> <0079> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - -endstream -endobj -8 0 obj -<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /COAJSK+LibertinusSerif-Bold /DescendantFonts [ 76 0 R ] /ToUnicode 75 0 R >> -endobj -76 0 obj -<< /Type /Font /Subtype /CIDFontType0 /BaseFont /COAJSK+LibertinusSerif-Bold /FontDescriptor 72 0 R /W 71 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> -endobj -9 0 obj -<< /Type /Pages /Parent 77 0 R /Count 10 /Kids [ 6 0 R 11 0 R 14 0 R 19 0 R 23 0 R 26 0 R 29 0 R 32 0 R 35 0 R 38 0 R ] >> -endobj -43 0 obj -<< /Type /Pages /Parent 77 0 R /Count 4 /Kids [ 41 0 R 45 0 R 48 0 R 51 0 R ] >> -endobj -77 0 obj -<< /Type /Pages /Count 14 /Kids [ 9 0 R 43 0 R ] >> -endobj -78 0 obj -<< /Type /Catalog /Pages 77 0 R /Metadata 4 0 R/OutputIntents [ <</Type/OutputIntent/S/GTS_PDFX/OutputCondition (SWOP (Publication) printing in USA (Printing process definition: ANSI CGATS.6).)/OutputConditionIdentifier (CGATS TR 001)/Info (U.S. Web Coated (SWOP) v2)/RegistryName (http://www.color.org)>> ]/PageLabels<</Nums[0<</S/r>>6<</S/D>>]>> >> -endobj -79 0 obj -<< /Title(Dark\040and\040Stormy)/Author(Dirk\040Hardcase)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20231109113537-08'00')/ModDate(D:20231109113537-08'00')/Producer(LuaLaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001) >> -endobj -xref -0 80 -0000000000 65535 f -0000062151 00000 n -0000062171 00000 n -0000062191 00000 n -0000000020 00000 n -0000003407 00000 n -0000003256 00000 n -0000002762 00000 n -0000095373 00000 n -0000095732 00000 n -0000003773 00000 n -0000003619 00000 n -0000003527 00000 n -0000005367 00000 n -0000005213 00000 n -0000003865 00000 n -0000091321 00000 n -0000077144 00000 n -0000008037 00000 n -0000007883 00000 n -0000005512 00000 n -0000075146 00000 n -0000009236 00000 n -0000009082 00000 n -0000008160 00000 n -0000009617 00000 n -0000009463 00000 n -0000009371 00000 n -0000017476 00000 n -0000017322 00000 n -0000009709 00000 n -0000028807 00000 n -0000028653 00000 n -0000017598 00000 n -0000035314 00000 n -0000035160 00000 n -0000028929 00000 n -0000043511 00000 n -0000043357 00000 n -0000035436 00000 n -0000054858 00000 n -0000054703 00000 n -0000043633 00000 n -0000095870 00000 n -0000061351 00000 n -0000061196 00000 n -0000054980 00000 n -0000061720 00000 n -0000061565 00000 n -0000061473 00000 n -0000062059 00000 n -0000061904 00000 n -0000061812 00000 n -0000062244 00000 n -0000073268 00000 n -0000062666 00000 n -0000063010 00000 n -0000073510 00000 n -0000075305 00000 n -0000075510 00000 n -0000076206 00000 n -0000075543 00000 n -0000075650 00000 n -0000076432 00000 n -0000077290 00000 n -0000077482 00000 n -0000089319 00000 n -0000077951 00000 n -0000078314 00000 n -0000089560 00000 n -0000091481 00000 n -0000091687 00000 n -0000094226 00000 n -0000091814 00000 n -0000091886 00000 n -0000094465 00000 n -0000095529 00000 n -0000095967 00000 n -0000096036 00000 n -0000096403 00000 n -trailer -<< /Size 80 /Root 78 0 R /Info 79 0 R /ID [ <B51DB24B7183CC4838B38F6093640382> <B51DB24B7183CC4838B38F6093640382> ] >> -startxref -96747 -%%EOF diff --git a/macros/luatex/latex/novel/doc/extras/novel-example.tex b/macros/luatex/latex/novel/doc/extras/novel-example.tex index ce875ab67a..d565c39896 100644 --- a/macros/luatex/latex/novel/doc/extras/novel-example.tex +++ b/macros/luatex/latex/novel/doc/extras/novel-example.tex @@ -11,7 +11,7 @@ % have read/write permissions for any user. If they don't, then % compile will fail at the point where files are written. -\documentclass{novel} % v. 1.83. +\documentclass{novel} % v. 1.86. \SetTitle{Dark and Stormy} \SetSubtitle{A Tale of Nights} \SetAuthor{Dirk Hardcase} diff --git a/macros/luatex/latex/novel/doc/extras/novel-extras-README.html b/macros/luatex/latex/novel/doc/extras/novel-extras-README.html index 2bedaab3a0..095e2d1136 100644 --- a/macros/luatex/latex/novel/doc/extras/novel-extras-README.html +++ b/macros/luatex/latex/novel/doc/extras/novel-extras-README.html @@ -9,21 +9,15 @@ <h2>README for novel extras</h2> -<p>This folder contains items that may be helpful, but are not essential to operation of the <i>novel</i> document class. Version 1.83.</p> +<p>This folder contains items that may be helpful, but are not essential to operation of the <i>novel</i> document class. Version 1.86.</p> <p>File <i>novel-example.tex</i> is a fake short novel. If you wish to compile it, place a copy in your user home folder (or other place where you have read/write privilege) and compile it there.</p> -<p>File <i>novel-testsuite.tex</i> exercises the various capabilities of the document class. You can look at the code, and see how it compiles. You may also change settings, to see what they do. It requires files <i>novel-testimage.png</i>, <i>novel-testimage.jpg</i>, <i>novel-testscript.png</i>, and <i>novel-testscript.jpg</i>. If you wish to compile it, place a copy (along with images) in your user home folder (or other place where you have read/write privilege) and compile it there.</p> - <p>File <i>novel-decoglyphs.pdf</i> shows the decorative characters in the <i>NovelDeco.otf</i> file, along with the codes needed to retrieve them.</p> -<p>File <i>novel-Gallery-ChapterStart.pdf</i> shows a number of different ways to begin a chapter, making use of the ChapterStart environment and related commands. These are only suggestions.</p> - -<p>File <i>CPmodified.otf</i> is not (normally) for use in TeX. I use it when editing my work in a word processor, prior to TeX markup. To use it, install the font in your operating system (not in TeX) where a word processor can find it. This font is nearly-monospaced, with exaggerated punctuation marks. I have found that punctuation errors are most frequently overlooked during editing, since they are so small in many fonts, and the spell-check software doesn't find the errors.</p> - - <div> <h3>novel-scripts.zip</h3> +<p>IMPORTANT: The techniques described in these scripts, are rarely needed nowadays (late 2023).</p> <p>This zip archive contains Windows batch scripts, and Linux/OSX BASH scripts, for automatic image conversion.</p> <p>The scripts are meant to ensure that your use of images complies with commercial printing standards. In particular, they provide a method for converting color cover artwork to CMYK at 240% ink limit, in a PDF/X-1a:2001 file.</p> <p>Complete usage instructions are documented within the zip archive.</p> diff --git a/macros/luatex/latex/novel/doc/extras/novel-testimage.jpg b/macros/luatex/latex/novel/doc/extras/novel-testimage.jpg Binary files differdeleted file mode 100644 index 6e39d29be5..0000000000 --- a/macros/luatex/latex/novel/doc/extras/novel-testimage.jpg +++ /dev/null diff --git a/macros/luatex/latex/novel/doc/extras/novel-testimage.png b/macros/luatex/latex/novel/doc/extras/novel-testimage.png Binary files differdeleted file mode 100644 index 1fabb2ccf2..0000000000 --- a/macros/luatex/latex/novel/doc/extras/novel-testimage.png +++ /dev/null diff --git a/macros/luatex/latex/novel/doc/extras/novel-testscript.jpg b/macros/luatex/latex/novel/doc/extras/novel-testscript.jpg Binary files differdeleted file mode 100644 index e1fac7cd45..0000000000 --- a/macros/luatex/latex/novel/doc/extras/novel-testscript.jpg +++ /dev/null diff --git a/macros/luatex/latex/novel/doc/extras/novel-testscript.png b/macros/luatex/latex/novel/doc/extras/novel-testscript.png Binary files differdeleted file mode 100644 index 77fb7e1da9..0000000000 --- a/macros/luatex/latex/novel/doc/extras/novel-testscript.png +++ /dev/null diff --git a/macros/luatex/latex/novel/doc/extras/novel-testsuite.pdf b/macros/luatex/latex/novel/doc/extras/novel-testsuite.pdf Binary files differdeleted file mode 100644 index f4393f610a..0000000000 --- a/macros/luatex/latex/novel/doc/extras/novel-testsuite.pdf +++ /dev/null diff --git a/macros/luatex/latex/novel/doc/extras/novel-testsuite.tex b/macros/luatex/latex/novel/doc/extras/novel-testsuite.tex deleted file mode 100644 index 09ca6b348f..0000000000 --- a/macros/luatex/latex/novel/doc/extras/novel-testsuite.tex +++ /dev/null @@ -1,318 +0,0 @@ -% !TeX TS-program = lualatex -% !TeX encoding = UTF-8 - -% Copyright 2023 Robert Allgeyer. -% This file may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, version 1.3c. -% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ - -% TEST SUITE FOR NOVEL DOCUMENT CLASS -% -% IF YOU COMPILE THIS DOCUMENT: Be sure that this file, and its generated PDF, -% have read/write permissions for any user. If they don't, then -% compile will fail at the point where files are written. -% -% This document tests the various capabilities of `novel' document class. -% The Preamble settings are originally the defaults. -% Change them to exercise the setting, and see the result. -% In the document body, various commands are exercised. -% -% You need all fonts from the `libertinus' package, -% all fonts from `lmodern' package, -% and the included NovelDeco.otf. -% -% You also need the file` novel-testimage.png' -% in the same folder as this document. -% It is grayscale png, 150x150 pixels, with resolution 300pdi. -% -% The `test' class option is required. You may add others. - -\documentclass[test,shademargins,draft]{novel} % v. 1.83. -\SetTitle{Test Suite} -\SetSubtitle{Novel Document Class} -\SetAuthor{Author Name} -% Additional Preamble, if desired. - - -\begin{document} - -\frontmatter % begins at page i. - -\thispagestyle{footer} -\vspace*{5\nbs} -\begin{center} -\charscale[3.6]{\textbf{Test Suite}}\par -\vspace{1.5\nbs} -\charscale[1.6]{Novel Document Class}\par -\vspace{4\nbs} -\ChapterDeco[6]{\decoglyph{n9548}} -\vspace{2\nbs} -\charscale[1.5]{The following page will be blank!}\par -\vfill -If you choose a head/foot style with footer, then page number i (lowercase roman) will appear in the footer below.\par -But if the head/foot style has no footer, then nothing below.\par -\end{center} -\clearpage - - -% Now to begin at page 1: -\mainmatter - -\begin{ChapterStart}[10] -\vspace*{3\nbs} -\ChapterTitle{Chapter One} -\ChapterSubtitle{Dark and Stormy} -\ChapterDeco[4]{\decoglyph{n9548}} -\end{ChapterStart} - -This tests the ChapterStart environment, plus \string\ChapterTitle, \string\ChapterSubtitle, \string\ChapterDeco, and \string\decoglyph. - -In the TeX document, you can change the height of the environment, the alignment of its components, the decoglyph, and so forth. - -The first paragraph will not be indented, but all following paragraphs will be indented. - -Since this is a recto (odd-numbered) page at right side, the default margins will be a little larger at left, where there is an allowance for binding gutter. - -Unless you change the head/foot style, you should see no heading. Arabic page number 1 should be at the bottom. - -\clearpage - - -% NEXT PAGE: - -This page tests the \string\charscale\space command, and \string\rotatebox. The combined effect is shown below:\par -\vspace{1.5\nbs} % trial and error -\charscale[2,3em,-4em]{\rotatebox[origin=c]{45}{Random Test Items}} -\vspace{7.5\nbs} % trial and error - -Above, you should see the phrase Random Test Items in larger than normal text, tilted 45 degrees, nicely fitting between the text above and this text. Offset has been used, so it is not quite centered. - -If you change the font size or number of lines per page, then the tilted phrase might not fit nicely. That can be fixed by changing the amount of \string\vspace\space above and below the rotated text. - -The amount of \string\vspace\space is not calculated automatically. You have to determine it by trial and error (or do some math). The total amount of \string\vspace, top and bottom, must be an integer. - -If you use \string\rotatebox\space without \string\charscale, then it will create its own vertical gap. Unfortunately, the height of this gap is very difficult for you to calculate, so you would not be able to easily restore the line grid by adding some amount of \string\vspace. So, don't use \string\rotatebox\space without \string\charscale. - -\clearpage - - -% NEXT PAGE: - -This page tests \string\FloatImage\space effects. Remember that \textit{novel} uses its own methods of placing images. - -There will be a gap before the image appears. In the tex code, find \string\vspace\space there, and change the space. At some point, the image will float to the top of the following page. - -\vspace{7\nbs} - -\FloatImage[ht]{novel-testimage.png} - -Above, the top of the image sits where the baseline of text would be. If the image fits where placed, then this paragraph comfortably clears the bottom of the image. If the gap is increased so that the image flats to the top of the next page, then this paragraph will be directly beneath the preceding paragraph. - - - -\clearpage - -% NEXT PAGE: - -This page tests \string\InlineImage\space effects. Note that the command also has a starred version. The difference: Unstarred, the width of the image is taken into account. Starred, the width of the image is ignored. - -\null - -\noindent\InlineImage*[0,\normalXheight]{novel-testimage.png}This paragraph is not indented. The starred command places an image, offset so that its top sits at the X-height of the text. The image underlies the following text. If you use this effect, then be sure that the image is much lighter, or the text will be hard to read. - -\null\null\null - -\noindent\InlineImage[0,b-\normaldescender]{novel-testimage.jpg}This paragraph is not indented. The unstarred command places an image, offset so that its bottom sits at the descender of the text. It was necessary to insert previous blank lines, or the image would overlie (and obscure) the preceding paragraph. - -\null\null - -\noindent\InlineImage[0,1.5em]{novel-testscript.png}This paragraph is not indented. The unstarred command places an image, offset so that it rises above the paragraph, and also descends beneath the following text. - -\null\null - -In all of the above, the alignments will change, if you change the text size or lines per page. - -\clearpage - - -% NEXT PAGE: - -This page tests \string\WrapImage. The command is written following the paragraph you are now reading. - -\WrapImage[r]{novel-testscript.jpg} - -The image will appear at right, with this text flowing around it. the first few lines will be at the left of the image. Then, as the paragraph continues, it eventually is restored to full text width, once it gets past the bottom of the image. Note that the top of the image is aligned to the X-height of the first line of text. - -\null -\null - -\clearpage - -% NEXT 2 PAGES: - -This page, combined with the following page, test the detection mechanism for \string\scenebreak, \string\sceneline, and \string\scenestars. - -In the source document, there is \string\vspace\space following this paragraph. To detect the effects, vary the \string\vspace. - -% Change this to see the effects: -\vspace{20\nbs} % originally 20\nbs - -Following this paragraph is the \string\scenestars\space command. It prints a few asterisks centered in a gap. It is one way to indicate that a scenbreak is present, when the break occurs at the very top or bottom of a page (because a blank line might not be noticed there). - -\scenestars - -If you change the above \string\vspace\space to 25\string\nbs, you will get a Warning about the line being too close to the bottom. Change to 28\string\nbs, and the Warning will say that it is too close to the top (of the following page. Note that \string\scenestars\space is allowed to be at the very bottom or very top, or somewhere in the middle of the page. The same applies to \string\sceneline. - -If you wish, you can always use \string\scenestars\space or \string\sceneline\space to indicate a scene break. But more common practice is to use a blank line, \string\scenebreak, except for those cases where you ``must'' use one of the others. - -\scenebreak - -Above this paragraph is \string\scenebreak, which appears as a blank line. A \string\scenebreak\space cannot be located close to the top or bottom of a page. Unlike \string\sceneline\space or \string\scenestars, you cannot place \string\scenebreak\space at the very top or bottom, either. So, changing the \string\vspace\space to any of 14\string\nbs\space through 17\string\nbs\space will generate a Warning. - -\clearpage - - -% NEXT PAGE: - -This page tests the footnote and endnote capabilities.\footnote{This is the first sample footnote. Unless you change the marker style, it will be marked with an asterisk.} Two footnotes have been placed.\footnote{This is the second footnote. Unless you change the marker style, it will be marked by a dagger.} - -\null - -Test of \string\QuickChapter: - - -\QuickChapter[3em]{Just Before Midnight} - -Above, \string\QuickChapter\space inserted two blank lines, in which a phrase is followed by a short line. The text is slightly larger than normal, and sits slightly above the normal baseline. - -\null - -There is a \string\bigemdash\space between here\makebox[2.5em]{\bigemdash}and here. Its length is set at 2.5em, using \string\makebox. Compare to normal—emdash. Thickness and yoffset is adjustable. - -\null - -This tests the endnote capability.\endnote You will see marker 1 after the last sentence, and marker 2 after this one.\endnote\memo{This text does not print.} But no actual endnotes are created. You may manually place them wherever you wish. For that, you may use the \string\endnotetext\space command (if its style works for you), or any other method. - -\null - -\endnotetext{1}{This tests the \string\endnotetext\space command, although you would not normally place the text of an endnote here. It is only a test.\par} - -\endnotetext{2}{Text for a second endnote.\par} - -\clearpage - - -% NEXT PAGE: - -The following tests the \textit{parascale} environment: - -\begin{parascale}[0.8] -But this text has a different scale than normal. Both the font size and the baseline skip have been proportionately changed. As a result, the lines are not on the normal line grid.\par -If the following normal text needs to be back on grid (usually the case), here is what you must do: Compile, and note the number of lines occupied by the scaled text. Calculate the discrepancy, and fix with \string\vspace. Or let \textit{novel} do the thinking for you; there will be a Warning message with advice.\par -\vspace{0.2\nbs} % based on result of Warning. -\end{parascale} - -Back to normal text. At the dimensions originally used for this test, there are 9 lines of scaled text. Not counting the first scaled line, the remaining 8 scaled lines each introduce a deficit of 0.2\string\nbs. So, the cumulative deficit is 1.6\string\nbs. The integer part doesn't matter. So, \string\vspace{0.6\string\nbs} must be added prior to \string\end\{parascale\}, to restore the normal line grid. - -It is also possible to split the \string\vspace, prior to \string\begin\{parascale\} and \string\end\{parascale\}, as long as the total is correct. - -If the \string\vspace\space is not added, then there will be a Warning message. - -If the parascale spans more than one page, then the correct amount to add will depend on the lines present on the final page, not the total number of lines. - -\clearpage - - -% NEXT PAGE - -This page tests the \textit{adjustwidth} environment. Changing textwidth is a useful way to create block indents, occasionally used for long quotations, or for other special text that must be visually distinguished from normal. - -\begin{adjustwidth}{2\normalparindent}{\normalparindent} -\forceindent This text uses the \textit{adjustwidth} environment. It is set to block indent 2\string\normalparindent\space at left, and indent 1\string\normalparindent\space at right. The \string\forceindent\space command precedes the text, so that (within the block) it indents like an ordinary paragraph.\par -\end{adjustwidth} - -This text is after the environment, so it occupies the normal amount of text width. - -\clearpage - - -% NEXT PAGE: - -This tests various text effects: - -\null - -\FirstLine{\noindent\charscale[2]{T}\hspace{-2pt}his line has its first letter enlarged, and sets the first line in small caps. After the first line, text continues as usual. Note that space must be provided prior to this paragraph, so that the first letter does not intrude on text (or margin) above it.} - -The \string\charscale\space command scales the letter, and \string\FirstLine\space performs the small caps. Also, some kerning was applied so that the large T has the following \textsc{h} resting beneath its top. The \string\noindent\space command goes inside \string\FirstLine. - -\null\null - -\dropcap{H}ere is placed is a drop cap, using \textit{novel's} \string\dropcap\space command. Alternatively, the \textit{lettrine} package could be used. There are differences in how the drop caps are specified, depending on what you do. So, be sure to read the documentation, or you will be surprised.\par -In general, it is difficult to style drop caps so that they look good for many different letters. An alternative is to use images for the drop caps. If you use images, please read the \textit{novel} documentation, as the method is not the same as the usual methods from the \textsc{lettrine} package.\par -Note that there is no automated way to combine a drop cap with a first line in small caps. This is discussed in \textsc{novel} documentation. - -\null -This line is in the main font.\par -\textsf{This line is in the sans font.}\par -\texttt{This line is in the mono font.}\par -{\mustbelibertinus This line is in Libertinus Serif.}\par % specific to testsuite -{\mustbelmodern This line is in Latin Modern Roman.}\par % specific to testsuite - - -\clearpage - - -% NEXT PAGE: - -\thispagestyle{dropfoliobeneath} % compare to dropfolioinside - -This page tests drop folio. There will be no page header. If your head/foot style normally has a footer, then you will see it as usual. - -If you choose a head/foot style without footer, you will still see a page number centered below. Exactly where it appears will depend on which kind of drop folio is used. - -If using \string\thispagestyle\{dropfoliobeneath\} then the page number will appear within the lower margin. - -If using \string\thispagestyle\{dropfolioinside\} then the page number will appear just above the lower margin, where the final line of text would otherwise be placed. - -Use class options [draft,shademargins] to see the position. - -The initial choice is \textit{dropfoliobeneath}. - -\clearpage - -% NEXT PAGE: - -This tests the \string\cleartoend\space command. If this page is recto (odd), then exactly one blank page will follow. If this page is verso (even), then exactly two blank pages will follow. - -\null\null - - -When you request PDF/X (default), whether or not you are in draft mode, each image placed in your document is inspected. This is one of those things that require Lua code, which is one reason why the \textit{novel} class requires LuaLaTeX only. - -When an image is inspected, it is added to one of two lists, either good or unknown. Each time an image is requested, the lists are examined, so the same image file is not inspected twice. This saves time. - -The lists are saved in the \textit{aux} file. Then, if you re-compile, images already inspected won't be re-inspected. To re-initialize the lists, discard the \textit{aux} file. - -\null - -Two of the images were pre-processed via \textit{novel-scripts}. These will be detected as good. They are: - -\makeatletter\@AllGoodImages\makeatother - -\null - -Two of the images were not pre-processed, so their compliance is unknown. They might be good or bad. They are: - - \makeatletter\@UnknownImages\makeatother - -\null - -Note: If you change the document settings to \string\SetPDFX\{off\} then you will not see either of the image lists, and will not get the Warning message. - -Also, using \string\SetPDFX\{off\} will re-initialize the lists. - - - -\end{document} - diff --git a/macros/luatex/latex/novel/doc/needed-packages b/macros/luatex/latex/novel/doc/needed-packages deleted file mode 100644 index 3bfbc7e9bb..0000000000 --- a/macros/luatex/latex/novel/doc/needed-packages +++ /dev/null @@ -1,11 +0,0 @@ - -To use `novel' you need LaTeX with lualatex. - -In addition to the minimal setup, you will need these packages: - -textpos magaz xcolor adjustbox eso-pic pdfpages unicode-math fp iftex -libertinus-fonts makecmds xkeyval lm-math xstring xifthen silence -collectbox pgf lipsum wrapfig pdflscape polyglossia microtype hyperref - -You will need language support, for your language(s). -If using lipsum, you will need hyphen-latin.
\ No newline at end of file diff --git a/macros/luatex/latex/novel/doc/novel-documentation.html b/macros/luatex/latex/novel/doc/novel-documentation.html index 154f85a358..a644f4c03c 100644 --- a/macros/luatex/latex/novel/doc/novel-documentation.html +++ b/macros/luatex/latex/novel/doc/novel-documentation.html @@ -14,7 +14,10 @@ License URL: https://www.latex-project.org/lppl/lppl-1-3c/ <style> -body {font-family:sans-serif; line-height:150%; font-size:14pt; color:#000000; background:#ffffff none;} +body {font-family:sans-serif; color:#203310; background:#cccccc none;} +#master {position:relative;} +#toc {position:fixed; width:30%; background:#ffffff none; overflow:scroll; height:98%; float:left;} +#main {width:68%; float:right; background:#ffffff none;} p {font-family:sans-serif,sans-serif; font-size:1em; margin:0px 16px 0px 16px; text-indent:16px;} ol, ul {list-style-type:none; margin:0px; padding:0px;} li {margin:3px 8px 3px 16px; padding:0px;} @@ -32,13 +35,19 @@ img.nodisplaynav {display:none; height:1em;} img.openclose {display:none; height:1em;} *.noimg {padding-left:1.5em;} div.d1 {margin:0px 16px 16px 16px;} -div.d2 {margin:0px 0px 16px 16px; padding-bottom:1em; border-top:0; border-right: 0px; border-bottom:1px dotted #666666; border-left:1px dotted #666666;} -div.d3 {margin:0px 0px 16px 16px; padding-bottom:1em; border-top:0; border-right: 0px; border-bottom:1px dotted #666666; border-left:1px dotted #666666;} -div.d4 {margin:0px 0px 16px 16px; padding-bottom:1em; border-top:0; border-right: 0px; border-bottom:1px dotted #666666; border-left:1px dotted #666666;} -div.d5 {margin:0px 0px 16px 16px; padding-bottom:1em; border-top:0; border-right: 0px; border-bottom:1px dotted #666666; border-left:1px dotted #666666;} -div.d6 {margin:0px 0px 16px 16px; padding-bottom:1em; border-top:0; border-right: 0px; border-bottom:1px dotted #666666; border-left:1px dotted #666666;} +div.d2 {margin:0px 0px 16px 16px; padding-bottom:1em; border-top:0; border-right: 0px; +border-bottom:1px dotted #666666; border-left:1px dotted #666666;} +div.d3 {margin:0px 0px 16px 16px; padding-bottom:1em; border-top:0; border-right: 0px; +border-bottom:1px dotted #666666; border-left:1px dotted #666666;} +div.d4 {margin:0px 0px 16px 16px; padding-bottom:1em; border-top:0; border-right: 0px; +border-bottom:1px dotted #666666; border-left:1px dotted #666666;} +div.d5 {margin:0px 0px 16px 16px; padding-bottom:1em; border-top:0; border-right: 0px; +border-bottom:1px dotted #666666; border-left:1px dotted #666666;} +div.d6 {margin:0px 0px 16px 16px; padding-bottom:1em; border-top:0; border-right: 0px; +border-bottom:1px dotted #666666; border-left:1px dotted #666666;} div.page {padding:16px 0px 16px 0px; border-top:4px solid #505050;} div.codeblock {overflow:auto; margin:16px; padding: 8px; border: 1px solid #000000;} +div.codeblock p {text-indent:0px; white-space:nowrap;} code {font-size:1em; font-family:monospace,monospace; color:#200050; background:transparent none; padding:0px 3px 0px 3px;} *.smaller {font-weight:normal; font-size:88%;} *.noindent {text-indent:0px;} @@ -47,7 +56,8 @@ code {font-size:1em; font-family:monospace,monospace; color:#200050; background: *.noindentcmd {text-indent:0px; margin-top:16px;} *.isolate {padding-left:10px;margin-top:10px; margin-bottom:10px; text-indent:0px;} *.dbloc {padding-left:1.8em; visibility:hidden} -table.preconf {margin-left:auto; margin-right:auto; margin-top:20px; margin-bottom:20px; border:1px solid #000000} +table.preconf {margin-left:auto; margin-right:auto; margin-top:20px; margin-bottom:20px; +border:1px solid #000000} table.preconf caption {font-weight:bold;} table.preconf th {text-align:left; padding:6px; font-weight:normal; border-bottom:1px solid #000000;} table.preconf td {text-align:left; padding:6px;} @@ -58,7 +68,6 @@ table.preconf p {text-indent:0px; margin:6px;} small {line-height:50%;} span.ap {color: #996633;} /* percent comment in code */ *.floatright {float:right; margin-left:1em; margin-right:16px;} -*.n {display:none; border:1px solid #990000; font-family:monospace,monospace; font-size:0.92em; font-weight:bold; padding: 0 0.3em 0 0.3em; color:#990000; background: #ffdddd none; margin-right:0.5em;} p.centerimg {text-indent:0px; text-align:center; margin-top:0.5em; margin-bottom:0.5em;} p.code {text-indent:0px; margin: 4px 16px 4px 16px; padding-left:32px;} p.item {text-indent:0px; padding-top:8px;} @@ -67,115 +76,22 @@ hr.newpage {margin-top:2em; margin-bottom:2em; height:4px; color:#505050; backgr p.overhang {margin-left:32px; text-indent:-16px;} *.sampledoc {margin:1em} *.sampledoc em {font-size:92%; color:#666666} -#master {position:relative;} -#finish {clear:both;} -#toc {display:block;} -#toc li ul li {display:none;} -#main {width:auto; float:none; background:#ffffff none;} -*.noshowprint {display:none;} -div.codeblock p {text-indent:0px;} -*.screennoscript {display:none;} -</style> - -<style id="screenstyle"> -@media screen { - body {color:#203310; background:#cccccc none;} - #toc {display:block; font-size:14pt; width:30%; background:#ffffff none; position:fixed; overflow:scroll; height:98%;} - #toc li ul li {display:block;} - #main {float:right; background:#ffffff none; width:68%; padding-bottom:40px;} - div.codeblock p {text-indent:0px; white-space:nowrap;} - *.screennoscript {display:inline;} - *.toptitle {display:none;} -} </style> -<script>var doprint=false;</script> - - -<!-- Trouble Printing? Remove the following line, and another one below: --> -<!-- REMOVE ME - -<style> - body {color:#000000; background:#ffffff none;} - #toc {display:block; font-size:1em; width:auto; background:#ffffff none; position:static; overflow:auto; height:auto;} - #toc li ul li {display:none;} - #main {float:none; background:#ffffff none; width:auto; padding-bottom:0;} - div.codeblock p {text-indent:0px; white-space:auto;} - *.screennoscript {display:none;} - *.toptitle {display:block;} - *.notprinted {display:none;} -</style> -<script>doprint=true;</script> - -REMOVE ME TOO --> -<!-- Also remove the above line, if trouble printing. Then load with JavaScript off. --> - - -<script> -if(!doprint) {window.onload = loadnav;} -function loadnav() { - nspans = document.getElementsByClassName("n"); - placenav(); -} -function placenav(){ - for(var n=0; nspans.length>n; n++){ - nspans[n].style.display="inline"; - nspans[n].style.cursor="pointer"; - nspans[n].title="open"; - nspans[n].setAttribute("data-state",0); - nspans[n].innerHTML="+"; - nspans[n].onclick=openclose; - lstartclose(n); - } -} -function lstartclose(whichn) { - whichparid = nspans[whichn].parentElement.id; - whichdiv = document.getElementById("u" + whichparid.substring(1)); - if(whichdiv) whichdiv.style.display="none"; -} -function openclose(){ - thisparid = this.parentElement.id; - thisdiv = document.getElementById("u" + thisparid.substring(1)); - if(this.title=="close") {thisdiv.style.display="none";} - if(this.title=="open") {thisdiv.style.display="block";} - thisstate = this.getAttribute("data-state"); - thisval = 1 - thisstate; - this.setAttribute("data-state",thisval); - if(this.getAttribute("data-state")=="1") {this.title="close"; this.innerHTML="–";} - if(this.getAttribute("data-state")=="0") {this.title="open"; this.innerHTML="+";} -} -function openall() { - for(var n=0; nspans.length>n; n++){ - nspans[n].setAttribute("data-state",1); - nspans[n].title="close"; - nspans[n].innerHTML="–"; - thisparid = nspans[n].parentElement.id; - thisdiv = document.getElementById("u" + thisparid.substring(1)); - thisdiv.style.display="block"; - } -} -function closeall() { - placenav(); -} -</script> </head> <body> <div id="master"> - <div id="toc" class="toc"> -<h1 class="toptitle">Document class <em>novel</em> - Documentation</h1> -<h3 class="noshowprint"><a href="#main">Contents</a> <span class="smaller"><a href="javascript:openall();">(open all)</a> <a href="javascript:closeall();">(close all)</a></span></h3> +<h3><a href="#main">Contents</a></h3> <ul><!-- master toc ul --> - <li id="l0"><a href="#h0"><b>“Novel” Document Class</b></a></li> - - <li id="l1"><span class="n"></span><a href="#h1"><b>1. Before You Begin</b></a> + <li id="l1"><a href="#h1"><b>1. Before You Begin</b></a> <ul id="u1"> - <li id="l1.1"><span class="n"></span><a href="#h1.1">1.1 Do These Things</a> + <li id="l1.1"><a href="#h1.1">1.1 Do These Things</a> <ul id="u1.1"> <li><a href="#h1.1.1">1.1.1 LuaLateX Compiler</a></li> <li><a href="#h1.1.2">1.1.2 UTF-8 Encoding</a></li> @@ -184,7 +100,7 @@ function closeall() { <li><a href="#h1.1.5">1.1.5 Book Design</a></li> </ul> </li><!-- end 1.1 --> - <li id="l1.2"><span class="n"></span><a href="#h1.2">1.2 Avoid These Things</a> + <li id="l1.2"><a href="#h1.2">1.2 Avoid These Things</a> <ul id="u1.2"> <li><a href="#h1.2.1">1.2.1 Non-Fontspec Font Loader</a></li> <li><a href="#h1.2.2">1.2.2 TeX Font Sizes</a></li> @@ -192,7 +108,7 @@ function closeall() { <li><a href="#h1.2.4">1.2.4 TeX Editors and IDEs</a></li> </ul> </li><!-- end 1.2 --> - <li id="l1.3"><span class="n"></span><a href="#h1.3">1.3 Beware of These Things</a> + <li id="l1.3"><a href="#h1.3">1.3 Beware of These Things</a> <ul id="u1.3"> <li><a href="#h1.3.1">1.3.1 TeX Special Characters</a></li> <li><a href="#h1.3.2">1.3.2 Layout Surprises</a></li> @@ -201,7 +117,7 @@ function closeall() { </ul> </li><!-- end 1 --> - <li id="l2"><span class="n"></span><a href="#h2"><b>2. Document Class Options</b></a> + <li id="l2"><a href="#h2"><b>2. Document Class Options</b></a> <ul id="u2"> <li><a href="#h2.1">2.1 draft</a></li> <li><a href="#h2.2">2.2 sandbox</a></li> @@ -210,22 +126,22 @@ function closeall() { <li><a href="#h2.5">2.5 cropview</a></li> <li><a href="#h2.6">2.6 closecrop</a></li> <li><a href="#h2.7">2.7 xml</a></li> - <li><a href="#h2.8">2.8 coverart</a></li> + <li><a href="#h2.8">2.8 coverart (deprecated)</a></li> <li><a href="#h2.9">2.9 developer options</a></li> <li><a href="#h2.10">2.10 revert</a></li> </ul> </li><!-- end 2 --> - <li id="l3"><span class="n"></span><a href="#h3"><b>3. Metadata, File Data, PDF/X</b></a> + <li id="l3"><a href="#h3"><b>3. Metadata, File Data, PDF/X</b></a> <ul id="u3"> - <li id="l3.1"><span class="n"></span><a href="#h3.1">3.1 Definitions of Terms</a> + <li id="l3.1"><a href="#h3.1">3.1 Definitions of Terms</a> <ul id="u3.1"> <li><a href="#h3.1.1">3.1.1 ISBN Metadata</a></li> <li><a href="#h3.1.2">3.1.2 Printed Metadata</a></li> <li><a href="#h3.1.3">3.1.3 File (PDF) Metadata</a></li> </ul> </li><!-- end 3.1 --> - <li id="l3.2"><span class="n"></span><a href="#h3.2">3.2 Rules for File Data</a> + <li id="l3.2"><a href="#h3.2">3.2 Rules for File Data</a> <ul id="u3.2"> <li><a href="#h3.2.1">3.2.1 Required, Prohibited?</a></li> <li><a href="#h3.2.2">3.2.2 Limited to Latin-1?</a></li> @@ -233,7 +149,7 @@ function closeall() { <li><a href="#h3.2.4">3.2.4 Forbidden Characters</a></li> </ul> </li><!-- end 3.2 --> - <li id="l3.3"><span class="n"></span><a href="#h3.3">3.3 File Data Commands</a> + <li id="l3.3"><a href="#h3.3">3.3 File Data Commands</a> <ul id="u3.3"> <li><a href="#h3.3.1">3.3.1 \SetTitle</a></li> <li><a href="#h3.3.2">3.3.2 \SetAuthor</a></li> @@ -241,7 +157,7 @@ function closeall() { <li><a href="#h3.3.4">3.3.4 \SetApplication, \SetProducer</a></li> </ul> </li><!-- end 3.3 --> - <li id="l3.4"><span class="n"></span><a href="#h3.4">3.4 PDF/X</a> + <li id="l3.4"><a href="#h3.4">3.4 PDF/X</a> <ul id="u3.4"> <li><a href="#h3.4.1">3.4.1 Compliance Standards</a></li> <li><a href="#h3.4.2">3.4.2 Output Intents</a></li> @@ -254,15 +170,15 @@ function closeall() { </ul> </li><!-- end 3 --> - <li id="l4"><span class="n"></span><a href="#h4"><b>4. Book Size, Page Layout, Fonts</b></a> + <li id="l4"><a href="#h4"><b>4. Book Size, Page Layout, Fonts</b></a> <ul id="u4"> - <li id="l4.1"><span class="n"></span><a href="#h4.1">4.1 Book Dimensions</a> + <li id="l4.1"><a href="#h4.1">4.1 Book Dimensions</a> <ul id="u4.1"> <li><a href="#h4.1.1">4.1.1 Trim Size, TrimBox</a></li> <li><a href="#h4.1.2">4.1.2 Media Size, MediaBox</a></li> </ul> </li><!-- end 4.1 --> - <li id="l4.2"><span class="n"></span><a href="#h4.2">4.2 Fonts, Normal Font Size</a> + <li id="l4.2"><a href="#h4.2">4.2 Fonts, Normal Font Size</a> <ul id="u4.2"> <li><a href="#h4.2.1">4.2.1 Parent (Main) Font, Size</a> <ul id="u4.2.1"> @@ -276,7 +192,7 @@ function closeall() { <li><a href="#h4.2.5">4.2.5 Advanced: New Fonts</a></li> </ul> </li><!-- end 4.2 --> - <li id="l4.3"><span class="n"></span><a href="#h4.3">4.3 Interior Page Layout</a> + <li id="l4.3"><a href="#h4.3">4.3 Interior Page Layout</a> <ul id="u4.3"> <li><a href="#h4.3.1">4.3.1 Margins</a> <ul id="u4.3.1"> @@ -312,9 +228,9 @@ function closeall() { </ul> </li><!-- end 4 --> - <li id="l5"><span class="n"></span><a href="#h5"><b>5. Chapter Structure</b></a> + <li id="l5"><a href="#h5"><b>5. Chapter Structure</b></a> <ul id="u5"> - <li id="l5.1"><span class="n"></span><a href="#h5.1">5.1 Starting a Chapter</a> + <li id="l5.1"><a href="#h5.1">5.1 Starting a Chapter</a> <ul id="u5.1"> <li><a href="#h5.1.1">5.1.1 \clearpage, \cleartorecto</a></li> <li><a href="#h5.1.2">5.1.2 ChapterStart Environment</a> @@ -340,20 +256,20 @@ function closeall() { </li> </ul> </li><!-- end 5.1 --> - <li id="l5.2"><span class="n"></span><a href="#h5.2">5.2 Continuous Chapters</a> + <li id="l5.2"><a href="#h5.2">5.2 Continuous Chapters</a> <ul id="u5.2"> <li><a href="#h5.2.1">5.2.1 Short ChapterStart</a></li> <li><a href="#h5.2.2">5.2.2 \QuickChapter</a></li> </ul> </li><!-- end 5.2 --> - <li id="l5.3"><span class="n"></span><a href="#h5.3">5.3 Scene Breaks</a> + <li id="l5.3"><a href="#h5.3">5.3 Scene Breaks</a> <ul id="u5.3"> <li><a href="#h5.3.1">5.3.1 \SetScenebreakIndent</a></li> </ul> </li><!-- end 5.3 --> - <li id="l5.4"><span class="n" style="visibility:hidden"></span><a href="#h5.4">5.4 Chapter Numbering</a> + <li id="l5.4"><a href="#h5.4">5.4 Chapter Numbering</a> </li><!-- end 5.4 --> - <li id="l5.5"><span class="n"></span><a href="#h5.5">5.5 First Lines</a> + <li id="l5.5"><a href="#h5.5">5.5 First Lines</a> <ul id="u5.5"> <li><a href="#h5.5.1">5.5.1 First Character Special</a></li> <li><a href="#h5.5.2">5.5.2 First Line Small Caps</a></li> @@ -363,9 +279,9 @@ function closeall() { </ul> </li><!-- end 5 --> - <li id="l6"><span class="n"></span><a href="#h6"><b>6. Text Size, Style, Position</b></a> + <li id="l6"><a href="#h6"><b>6. Text Size, Style, Position</b></a> <ul id="u6"> - <li id="l6.1"><span class="n"></span><a href="#h6.1">6.1 Text Sizes</a> + <li id="l6.1"><a href="#h6.1">6.1 Text Sizes</a> <ul id="u6.1"> <li><a href="#h6.1.1">6.1.1 Standard Sizes: Disabled!</a></li> <li><a href="#h6.1.2">6.1.2 Local sizing: \charscale</a></li> @@ -373,7 +289,7 @@ function closeall() { <li><a href="#h6.1.4">6.1.4 Open Type Scale</a></li> </ul> </li><!-- end 6.1 --> - <li id="l6.2"><span class="n"></span><a href="#h6.2">6.2 General Styling</a> + <li id="l6.2"><a href="#h6.2">6.2 General Styling</a> <ul id="u6.2"> <li><a href="#h6.2.1">6.2.1 Italics and Emphasis</a></li> <li><a href="#h6.2.2">6.2.2 Bold and Semibold</a></li> @@ -385,13 +301,13 @@ function closeall() { <li><a href="#h6.2.8">6.2.8 Grayscale Text</a></li> </ul> </li><!-- end 6.2 --> - <li id="l6.3"><span class="n"></span><a href="#h6.3">6.3 Positioning and Alignment</a> + <li id="l6.3"><a href="#h6.3">6.3 Positioning and Alignment</a> <ul id="u6.3"> <li><a href="#h6.3.1">6.3.1 What to Avoid</a></li> <li><a href="#h6.3.2">6.3.2 Some Useful Commands</a></li> </ul> </li><!-- end 6.3 --> - <li id="l6.4"><span class="n"></span><a href="#h6.4">6.4 Superscripts, Subscripts</a> + <li id="l6.4"><a href="#h6.4">6.4 Superscripts, Subscripts</a> <ul id="u6.4"> <li><a href="#h6.4.1">6.4.1 Global Marker Style</a></li> <li><a href="#h6.4.2">6.4.2 Local Real or Fake</a></li> @@ -400,15 +316,15 @@ function closeall() { </ul> </li><!-- end 6 --> - <li id="l7"><span class="n"></span><a href="#h7"><b>7. Images, Pictures, Drawings</b></a> + <li id="l7"><a href="#h7"><b>7. Images, Pictures, Drawings</b></a> <ul id="u7"> - <li id="l7.1"><span class="n"></span><a href="#h7.1">7.1 Technical Requirements</a> + <li id="l7.1"><a href="#h7.1">7.1 Technical Requirements</a> <ul id="u7.1"> <li><a href="#h7.1.1">7.1.1 Interior B/W, Grayscale</a></li> <li><a href="#h7.1.2">7.1.2 Color Cover</a></li> </ul> </li><!-- end 7.1 --> - <li id="l7.2"><span class="n"></span><a href="#h7.2">7.2 Placing Interior Images</a> + <li id="l7.2"><a href="#h7.2">7.2 Placing Interior Images</a> <ul id="u7.2"> <li><a href="#h7.2.1">7.2.1 Image-Like Text</a></li> <li><a href="#h7.2.2">7.2.2 \InlineImage</a></li> @@ -420,9 +336,9 @@ function closeall() { </ul> </li><!-- end 7 --> - <li id="l8"><span class="n"></span><a href="#h8"><b>8. Tables, Lists</b></a> + <li id="l8"><a href="#h8"><b>8. Tables, Lists</b></a> <ul id="u8"> - <li id="l8.1"><span class="n"></span><a href="#h8.1">8.1 The toc Environment</a> + <li id="l8.1"><a href="#h8.1">8.1 The toc Environment</a> <ul id="u8.1"> <li><a href="#h8.1.1">8.1.1 Entries Using \tocitem</a></li> <li><a href="#h8.1.2">8.1.2 Example Table</a></li> @@ -431,10 +347,10 @@ function closeall() { </ul> </li> - <li id="l9"><span class="n"></span><a href="#h9"><b>9. Footnotes, Endnotes</b></a> + <li id="l9"><a href="#h9"><b>9. Footnotes, Endnotes</b></a> <ul id="u9"> - <li id="l9.1"><span class="n" style="visibility:hidden"></span><a href="#h9.1">9.1 Footnotes</a></li> - <li id="l9.2"><span class="n"></span><a href="#h9.2">9.2 Endnotes</a> + <li id="l9.1"><a href="#h9.1">9.1 Footnotes</a></li> + <li id="l9.2"><a href="#h9.2">9.2 Endnotes</a> <ul id="u9.2"> <li><a href="#h9.2.1">9.2.1 Placing: \endnote</a></li> <li><a href="#h9.2.2">9.2.2 Writing: \endnotetext</a></li> @@ -447,17 +363,17 @@ function closeall() { <li><i>Appendices:</i></li> - <li id="lA"><span class="n" style="visibility:hidden"></span><a href="#hA"><b>A. Sample Document</b></a> + <li id="lA"><a href="#hA"><b>A. Sample Document</b></a> </li><!-- end A --> - <li id="lB"><span class="n"></span><a href="#hB"><b>B. Six-Page Front Matter</b></a> + <li id="lB"><a href="#hB"><b>B. Six-Page Front Matter</b></a> <ul id="uB"> <li><a href="#hB.1">B.1 Half-Title to Copyright</a></li> <li><a href="#hB.2">B.2 Post-Copyright</a></li> </ul> </li><!-- end B --> - <li id="lC"><span class="n"></span><a href="#hC"><b>C. Shopping for Fonts</b></a> + <li id="lC"><a href="#hC"><b>C. Shopping for Fonts</b></a> <ul id="uC"> <li><a href="#hC.1">C.1 Licensing Issues</a></li> <li><a href="#hC.2">C.2 Technical Issues</a></li> @@ -465,16 +381,16 @@ function closeall() { </ul> </li><!-- end C --> - <li id="lD"><span class="n"></span><a href="#hD"><b>D. Book Design</b></a> + <li id="lD"><a href="#hD"><b>D. Book Design</b></a> <ul id="uD"> - <li id="lD.1"><span class="n"></span><a href="#hD.1">D.1 Terminology</a> + <li id="lD.1"><a href="#hD.1">D.1 Terminology</a> <ul id="uD.1"> <li><a href="#hD.1.1">D.1.1 Sheet, Page, Leaf</a></li> <li><a href="#hD.1.2">D.1.2 Folio, Spine</a></li> <li><a href="#hD.1.3">D.1.3 Signature, Imposition</a></li> </ul> </li><!-- end D.1 --> - <li id="lD.2"><span class="n"></span><a href="#hD.2">D.2 Book Manufacture</a> + <li id="lD.2"><a href="#hD.2">D.2 Book Manufacture</a> <ul id="uD.2"> <li><a href="#hD.2.1">D.2.1 Perfect Binding</a></li> <li><a href="#hD.2.2">D.2.2 Library Binding</a></li> @@ -482,15 +398,15 @@ function closeall() { <li><a href="#hD.2.4">D.2.4 Paper, Cover Materials</a></li> </ul> </li><!-- end D.2 --> - <li id="lD.3"><span class="n"></span><a href="#hD.3">D.3 Interior Structure</a> + <li id="lD.3"><a href="#hD.3">D.3 Interior Structure</a> <ul id="uD.3"> - <li id="lD.3.1"><span class="n"></span><a href="#hD.3.1">D.3.1 Display, Chapter-Like</a> + <li id="lD.3.1"><a href="#hD.3.1">D.3.1 Display, Chapter-Like</a> <ul id="uD.3.1"> <li><a href="#hD.3.1.1">D.3.1.1 Display Pages</a></li> <li><a href="#hD.3.1.2">D.3.1.2 Chapter-Like Sections</a></li> </ul> </li> - <li id="lD.3.2"><span class="n"></span><a href="#hD.3.2">D.3.2 Front Matter</a> + <li id="lD.3.2"><a href="#hD.3.2">D.3.2 Front Matter</a> <ul id="uD.3.2"> <li><a href="#hD.3.2.1">D.3.2.1 Half-Title, i</a></li> <li><a href="#hD.3.2.2">D.3.2.2 Blank, ii</a></li> @@ -507,7 +423,7 @@ function closeall() { <li><a href="#hD.3.2.13">D.3.2.13 End of Front Matter</a></li> </ul> </li> - <li id="lD.3.3"><span class="n"></span><a href="#hD.3.3">D.3.3 Main Matter</a> + <li id="lD.3.3"><a href="#hD.3.3">D.3.3 Main Matter</a> <ul id="uD.3.3"> <li><a href="#hD.3.3.1">D.3.3.1 Half-Title in Main</a></li> <li><a href="#hD.3.3.2">D.3.3.2 Part Separator</a></li> @@ -518,7 +434,7 @@ function closeall() { <li><a href="#hD.3.3.7">D.3.3.7 End Notes, Appendix</a></li> </ul> </li> - <li id="lD.3.4"><span class="n"></span><a href="#hD.3.4">D.3.4 At the End</a> + <li id="lD.3.4"><a href="#hD.3.4">D.3.4 At the End</a> <ul id="uD.3.4"> <li><a href="#hD.3.4.1">D.3.4.1 Back Matter? Not!</a></li> <li><a href="#hD.3.4.2">D.3.4.2 About the Author</a></li> @@ -529,14 +445,14 @@ function closeall() { </ul> </li><!-- end D --> - <li id="lE"><span class="n"></span><a href="#hE"><b>E. Fontspec Syntax</b></a> + <li id="lE"><a href="#hE"><b>E. Fontspec Syntax</b></a> <ul id="uE"> - <li id="lE.1"><span class="n"></span><a href="#hE.1">E.1 Family vs. File Name</a> + <li id="lE.1"><a href="#hE.1">E.1 Family vs. File Name</a> <ul id="uE.1"> <li><a href="#hE.1.1">E.1.1 Set/New by Name</a></li> </ul> </li> - <li id="lE.2"><span class="n"></span><a href="#hE.2">E.2 Open Type Features</a> + <li id="lE.2"><a href="#hE.2">E.2 Open Type Features</a> <ul id="uE.2"> <li><a href="#hE.2.1">E.2.1 Scale Pseudo-Feature</a></li> <li><a href="#hE.2.2">E.2.2 Color and Opacity</a></li> @@ -547,7 +463,7 @@ function closeall() { </ul> </li><!-- end E --> - <li id="lF"><span class="n"></span><a href="#hF"><b>F. Drop Caps</b></a> + <li id="lF"><a href="#hF"><b>F. Drop Caps</b></a> <ul id="uF"> <li><a href="#hF.1">F.1 Built-In vs Lettrine</a></li> <li><a href="#hF.2">F.2 \dropcap[]{}</a></li> @@ -557,10 +473,10 @@ function closeall() { </ul> </li><!-- end F --> - <li id="lY"><span class="n" style="visibility:hidden"></span><a href="#hY"><b>Y. Licensing and Credits</b></a> + <li id="lY"><a href="#hY"><b>Y. Licensing and Credits</b></a> </li><!-- end Y --> - <li id="lZ"><span class="n" style="visibility:hidden"></span><a href="#hZ"><b>Z. Important Changes</b></a> + <li id="lZ"><a href="#hZ"><b>Z. Important Changes</b></a> </li><!-- end Z --> </ul><!-- end master toc ul --> @@ -575,23 +491,22 @@ function closeall() { <div id="main"> <!-- **************************************************************************************** --> -<h1 id="h0" style="padding-top:16px">Document class <i>novel</i> - documentation. <span style="font-size:75%">V. 1.83, 2023/11/09</span></h1> -<p class="noindent"><span id="screennoscript" class="screennoscript"><b>For enhanced navigation of this file, turn on JavaScript.</b></span></p> -<div><script>if(document.getElementById("screennoscript")){document.getElementById("screennoscript").style.display="none";}</script></div> +<h1 id="h0" style="padding-top:16px">Document class <i>novel</i> - documentation.</h1> +<p>V. 1.86, 2024/01/31</p> -<p class="item">ALERT: If you have been using this document class prior to version 1.80 (February 2023), see <a href="#hZ">Appendix Z</a>.</p> +<p class="item">ALERT: If you have been using this document class prior to version 1.80 (February 2023), +see <a href="#hZ">Appendix Z</a>.</p> -<p class="item">ALERT: New user? Little knowledge of LaTeX? Try the simpler "novelette" document class. Expected in March, 2023.</p> +<p class="item">ALERT: New user? Little knowledge of LaTeX? Try the simpler "novelette" document class. +Expected in early 2024.</p> <!-- ********************************************************************** --> <div id="page01" class="page"> <p class="noindent">The <i>novel</i> document class is for authors of text-intensive original fiction, such as detective novels, murder mysteries, romance, sci-fi, and collections of short stories. Academic works and graphic novels are excluded.</p> <p>The resulting PDF uses built-in technology to produce PDF/X compliant files for print-on-demand (P.O.D.) services. There is no capability for E-books, and never will be.</p> -<p>To use <i>novel</i>, you need TeXLive 2016 or later, or recent MikTeX. Open your TeX package manager, and install both <i>novel</i> and <i>libertinus-fonts</i>.</p> +<p>To use <i>novel</i>, you need TeXLive 2020 or later, or recent MikTeX. Open your TeX package manager, and install both <i>novel</i> and <i>libertinus-fonts</i>.</p> -<p><b>New in version 1.82:</b> Preamble command <code>\myparindent{length}</code> -will over-ride the default 1.5em as normal indent. Version 1.83: Minor typo corrected.</p> <h2 id="h1">1. Before You Begin</h2> <div class="d2" id="d1"> @@ -621,17 +536,9 @@ will over-ride the default 1.5em as normal indent. Version 1.83: Minor typo corr <p class="item"><b>C.</b> If you are on Windows, <i>do not</i> use Notepad! The free <a class="external" rel="external" target="new" href="https://notepad-plus-plus.org">Notepad++</a> (also <a class="external" rel="external" target="new" href="https://portableapps.com/apps/development/notepadpp_portable">Portable</a> version) is a suitable plain text editor. Configure it as specified, with utf-8 but without BOM. Does not matter whether UNIX or DOS line endings, as long as you are consistent.</p> </div><!-- end 1.1.2 --> -<h4 id="h1.1.3">1.1.3. Language Support</h4> +<h4 id="h1.1.3">1.1.3. News (changed in version 1.86)</h4> <div class="d4" id="d1.1.3"> -<p class="item"><b>A.</b> The <i>polyglossia</i> package is loaded automatically. Do not load it yourself.</p> -<p class="item"><b>B.</b> Language is loaded like this default:</p> -<p class="code"><code>\setdefaultlanguage[variant=american]{english}</code></p> -<p class="item"><b>C.</b> For other possibilities, see polyglossia documentation.</p> -<p class="item"><b>D.</b> Polyglossia does not always load language hyphenation patterns. -If it does not, be sure that your system has the hyphenation patterns for your language or languages. -For example, <code>hyphen-latin</code> is used when you insert <code>lipsum</code> text. -And, you may need to use the polyglossia <code>\setotherlanguage</code> if extended text -is not your default.</p> +<p class="item">The package PDF has been updated.</p> </div><!-- end 1.1.3 --> <h4 id="h1.1.4">1.1.4. Use Open Type Fonts</h4> @@ -798,9 +705,12 @@ is not your default.</p> <p class="item" style="position:relative"><b>D.</b> <img src="html-resources/info18.png" width="18" height="18" style="position:relative; bottom:-3px" title="tech info" alt="tech info"/> Technical Info: XMP packet may be isolated by editing the *.xml file, in a plain text editor (requires utf-8). Necessary edits are obvious.</p> </div><!-- end 2.7 --> -<h3 id="h2.8">2.8. coverart</h3> +<h3 id="h2.8">2.8. coverart (deprecated)</h3> <div class="d3" id="d2.8"> -<p class="item">This option is only used for cover artwork. See <a href="#h7.1.2">section 7.1.2</a>.</p> +<p class="item">This option is only used for cover artwork. However, in the intervening time +since <i>novel</i> was first introduced, the printing technology has evolved. +Now (late 2023) using <i>novel</i> technology is not the best way to produce +your book cover file, although it still works. See <a href="#h7.1.2">section 7.1.2</a>.</p> </div><!-- end 2.8 --> <h3 id="h2.9">2.9. Developer Options</h3> @@ -994,7 +904,8 @@ If it does not, the class option <code>revert</code> will undo the tweaks.</p> <p class="item"><b>C.</b> The second is widely used in Europe, the third in Japan.</p> </div><!-- end 3.4.3 --> -<h4 id="h3.4.4">3.4.4. Other Output Intents</h4><div class="d4" id="d3.4.4"> +<h4 id="h3.4.4">3.4.4. Other Output Intents</h4> +<div class="d4" id="d3.4.4"> <p class="item"><b>A.</b> If you are required to use an Output Intent that is not one of the above three, then you have to code it yourself.</p> <p class="item"><b>B.</b> In a place where TeX can find it, create a plain text file with its file name in the following format:</p> <p class="code">File name begins with <code>novel-</code> (note the hyphen).</p> @@ -1015,7 +926,8 @@ If it does not, the class option <code>revert</code> will undo the tweaks.</p> <p class="item"><b>G.</b> Another place to look for Output Intent data is in your (texmf)/tex/latex/pdfx folder. This will be in your TeX system if package <i>pdfx</i> is installed (but do not load this package into <i>novel</i> class). Files <i>AdobeColorProfiles.tex</i> and <i>AdobeExternalProfiles.tex</i> contain code prepared by the author of the <i>pdfx</i> package. The macro names are not the same, but they are easy to decode: <code>\@OIidentifer</code> is <i>/OutputConditionIdentifier</i>; <code>\@OIcondition</code> is <i>/ProfileName</i>; <code>\@OIinfo</code> is <i>/OutputCondition</i>; <code>\@OIregistry</code> is <i>/RegistryName</i>; and <code>\@OIprofile</code> follows <i>\setCMYKcolorprofile</i>.</p> </div><!-- end 3.4.4 --> -<h4 id="h3.4.5">3.4.5. Whether or Not to Embed *.icc</h4><div class="d4" id="d3.4.5"> +<h4 id="h3.4.5">3.4.5. Whether or Not to Embed *.icc</h4> +<div class="d4" id="d3.4.5"> <p class="item"><b>A.</b> Each Output Intent has a color profile, in the form of a file with extension <i>*.icc</i>.</p> <p class="item"><b>B.</b> You usually do not need the color profile, because the printer knows which profile corresponds with which standard Output Intent code.</p> <p class="item"><b>C.</b> When you use <code>\SetPDFX</code> in its un-starred form, the *.icc color profile will not be embedded in the PDF. This is the normal situation.</p> @@ -1024,7 +936,8 @@ If it does not, the class option <code>revert</code> will undo the tweaks.</p> <p class="item" style="position:relative"><b>F.</b> <img src="html-resources/info18.png" width="18" height="18" style="position:relative; bottom:-3px" title="tech info" alt="tech info"/> If your printer requests "US Web Coated SWOP v2" and, as usual, requests that you <em>not</em> embed the corresponding *.icc color profile, then some software will read the Output Intent as "CGATS TR 001" instead of "US Web Coated SWOP v2". They are identical.</p> </div><!-- end 3.4.5 --> -<h4 id="h3.4.6">3.4.6. Where to Find *.icc Files</h4><div class="d4" id="d3.4.6"> +<h4 id="h3.4.6">3.4.6. Where to Find *.icc Files</h4> +<div class="d4" id="d3.4.6"> <p class="item"><b>A.</b> You do not need an *.icc color profile unless you choose to embed it.</p> <p class="item"><b>B.</b> Although many *.icc color profiles are freely available, they usually cannot be distributed within an open-source project. You might already have them in your system, wherever such files are stored. Note that TeX uses forward slash in file paths, not backslash, even if the platform is Windows:</p> <p class="isolate"> @@ -1244,7 +1157,7 @@ Nonexistent Publications • Portland, Oregon\par<br/> <p class="item"><b>E.</b> You do not need to set the unsafe zone. Whether or not you do, and regardless of any values you choose, the result does not affect the finished, final PDF. The zones are not enforced. Margins are unaffected.</p> <p class="item"><b>F.</b> If you set unsafe zone, then the unsafe area will have a dark gray background, when you use <code>[draft,shademargins]</code> as class options. This allows you to visualize whether anything intrudes into the unsafe zone.</p> <div style="clear:both"></div> -</div><!-- end 4.3.1.1 --> +</div><!-- end 4.3.1.2 --> </div><!-- end 4.3.1 --> <h4 id="h4.3.2">4.3.2. Lines Per Page</h4> @@ -1960,7 +1873,7 @@ This text is in lightgray, until the group ends.<br/> <p>Images have built-in positioning arguments.</p> <p class="item"><b>F.</b> Do not use floats (except in <a href="#h2.2">sandbox</a>). Use <i>novel's</i> own <code>\FloatImage</code>.</p> <p class="item"><b>G.</b> Do not use tables (except in <a href="#h2.2">sandbox</a>). But <i>novel</i> has its <a href="#hD.3.2.7">own provision</a> for a Table of Contents, and the code may be used for other purposes as well.</p> -<p class="item"><b>H.</b> Do not use picture environment (except in <a href="#h2.2">sandbox</a>). Use only the image commands provided by novel: <code><a href="#h7.2.2">\InlineImage</a></code>, <code><a href="#h7.2.4">\FloatImage</a></code>, and <code><a href="#h7.2.5">\WrapImage</a></code>. There is also a special provision for <a href="#h7.1.2">color cover artwork</a>.</p> +<p class="item"><b>H.</b> Do not use picture environment (except in <a href="#h2.2">sandbox</a>). Use only the image commands provided by novel: <code><a href="#h7.2.2">\InlineImage</a></code>, <code><a href="#h7.2.4">\FloatImage</a></code>, and <code><a href="#h7.2.5">\WrapImage</a></code>. There is also a special provision for <a href="#h7.1.2">color cover artwork</a> (deprecated).</p> </div><!-- end 6.3.1 --> <h4 id="h6.3.2">6.3.2. Some Useful Commands</h4> @@ -2006,7 +1919,7 @@ This text is in lightgray, until the group ends.<br/> </div><!-- end 6.3 --> <h3 id="h6.4">6.4 Superscripts, Subscripts</h3> -<div class="d3" id="d6,4"> +<div class="d3" id="d6.4"> <p class="item"><b>A.</b> In <i>novel</i>, superscripts and subscripts are called "markers." Most book-quality Open Type fonts have markers in style sets (<i>sups</i>, <i>sinf</i>, <i>subs</i>).</p> <p class="item"><b>B.</b> In professional fonts, marker glyph weights are adjusted for consistent appearance compared to ordinary glyphs. However, many free fonts do not adjust marker glyph weights, so the markers may appear too small, or too light. You may choose whether to use a font's own markers, or allow <i>novel</i> to generate markers, depending on whichever you think looks better.</p> <p class="item"><b>C.</b> <i>real</i> markers attempt to use the Open Type feature <i>sups</i> for superscripts, and the feature <i>sinf</i> (preferred) or <i>subs</i> (alternate) for subscripts. Real markers are the best choice for professional fonts. If the requested feature is not available for the font, then it will be automatically faked, by scaling/raising/lowering ordinary characters from the basefont (lining numerals will be used).</p> @@ -2070,8 +1983,11 @@ This text is in lightgray, until the group ends.<br/> <p class="code"><code>\SetKnownGoodImages{somefile.png anotherfile.jpg}</code></p> </div><!-- end 7.1.1 --> -<h4 id="h7.1.2">7.1.2. Color Cover</h4> +<h4 id="h7.1.2">7.1.2. Color Cover (deprecated)</h4> <div class="d4" id="d7.1.2"> +<p>As of late 2023, most print services no longer have the same requirements as they once did, +regarding color cover artwork. Although the method provided by <i>novel</i> still works, +it is the hard way to do something that (nowadays) does not have to be hard.</p> <p class="item"><b>A.</b> The book cover may be (usually is) in color. Bleed is required.</p> <p class="item"><b>B.</b> If your print service allows you to submit cover artwork as an ordinary RGB image file, that's the easiest way to do it. Then, <i>novel</i> is not used.</p> <p class="item" style="position:relative"><b>C.</b> <img src="html-resources/info18.png" width="18" height="18" style="position:relative; bottom:-3px" title="tech info" alt="tech info"/> Complete support for creating a PDF/X-1a:2001 (or other) color cover, with image in CMYK at 240% ink limit, is provided in <i>novel-scripts.zip</i>. This format is required by some American print-on-demand services.</p> @@ -2235,7 +2151,7 @@ He would have taken the car, had it not been stolen. But that was why he was her </p> <div style="clear:both"></div> </div><!-- end 8.1.2 --> -</div><!-- end 8.2 --> +</div><!-- end 8.1 --> </div><!-- end 8 --> </div><!-- end page08 --> @@ -2665,7 +2581,7 @@ It was a dark and stormy night, etc.<br/> <p>The source of the quotation should be right-justified within the block, and may be preceded by an emdash. Typically, names of people are not italicized, but titles of books are. It is not necessary to give elaborate details; this is not a bibliography.</p> <p>It is not necessary to load the <i>epigraph</i> package. Simply construct your own style of epigraph using other methods. But if you do load <i>epigraph</i>: Only use <code>\epigraph</code>, or the <code>epigraphs</code> environment, within the ChapterStart environment, or on a display page. Commands <code>\epigraphhead</code>, <code>\dropchapter</code>, <code>\undocrop</code> do not work in <i>novel</i>. The <code>\cleartoevenpage[<i>option</i>]</code> command does work. Ignore the material regarding epigraphs on part pages or in bibliographies.</p> -<h6 id="hD.3.2.6.1"><span class="n"></span>D.3.2.6.1. Example Epigraph: Real Quotation</h6> +<h6 id="hD.3.2.6.1">D.3.2.6.1. Example Epigraph: Real Quotation</h6> <div class="d6" id="uD.3.2.6.1"> <p class="noindent">This might be used for an action adventure:</p> <p class="code"><img class="floatright" src="html-resources/shakepi.png" width="131" height="208" alt="sample epigraph: Shakespeare"/> @@ -2683,7 +2599,7 @@ The valiant never taste of death but once.\par<br/> <div style="clear:both"></div> </div><!-- end D.3.2.6.1 --> -<h6 id="hD.3.2.6.2"><span class="n"></span>D.3.2.6.2. Example Epigraph: Imaginary Quotation</h6> +<h6 id="hD.3.2.6.2">D.3.2.6.2. Example Epigraph: Imaginary Quotation</h6> <div class="d6" id="uD.3.2.6.2"> <p class="noindent">This might be used for contemporary fiction with a humorous style. The fictional speaker will appear as a character in the book:</p> <p class="code"><img class="floatright" src="html-resources/dorfmcnorf.png" width="131" height="208" alt="sample epigraph: imaginary"/> @@ -2739,7 +2655,7 @@ Let me tell you, there's nothing more exciting than the brouhaha at Mickey's Pub <p>If an Author's Note is two pages long, then on the second page use the same page style that you would ordinary use to start a chapter. Normally, this is <code>\thispagestyle{footer}</code>.</p> <p>If an Author's Note is three or more pages long, then a header is permitted (if the book's main style has header). You may allow author and title to appear in header text, but it is better to indicate that this is <em>not</em> the main story, using <code>\SetVersoHeadText{Author's Note}</code> and <code>\SetRectoHeadText{Author's Note}</code>.</p> -<h6 id="hD.3.2.10.1"><span class="n"></span>D.3.2.10.1. Example Author's Note</h6> +<h6 id="hD.3.2.10.1">D.3.2.10.1. Example Author's Note</h6> <div class="d6" id="uD.3.2.10.1"> <p class="noindent">In a book of historical fiction, based on the author's own travels and expertise:</p> <p class="code"><code><small> @@ -2774,7 +2690,7 @@ Finally, I would like to thank... \lipsum[1]<br/> <p>A single map, or maybe two, need not be mentioned in a table of contents or illustrations. If you have a lot of them strewn around the book, then they should be listed in such a table; but this is very rare in fiction.</p> <p>As with all images, a map must be placed using <i>novel's</i> own <a href="#h7">image placement methods</a>.</p> -<h6 id="hD.3.2.11.1"><span class="n"></span>D.3.2.11.1. Example Map</h6> +<h6 id="hD.3.2.11.1">D.3.2.11.1. Example Map</h6> <div class="d6" id="uD.3.2.11.1"> <p class="noindent">Typically, there will be nothing but the single image on a Map page, with all text self-contained. But in this example, the image only occupies part of the page. It is followed by ordinary text for the numbered locations: <p class="code"><img class="floatright" src="html-resources/map.png" width="178" height="274" alt="sample map"/> @@ -2834,7 +2750,7 @@ Finally, I would like to thank... \lipsum[1]<br/> <p>Some books are partitioned into distinct sub-books. A sub-book is of substantial length, not individual chapters or short stories.</p> <p>If your book has distinct sub-books, then each of them has its own recto cover page, known as a Part Separator. Its verso is blank or an Epigraph. Then the accompanying story begins recto.</p> <p>A Part Separator is <i>always</i> main matter. So, the first Part Separator is <i>always</i> page 1 (number not printed). Then its text begins on page 3. Do not re-initialize the page count when you get to the next Part Separator.</p> -<p>Part separators could be simply <i>Part I</i>, <i>Part II</i>, and so forth. They could be <i>Book I</i>, <i>Book II</i>. Or, they could have distinctive titles, such as <i>The Northern Front</i> and <i>The Southern Front</i>. If your book is two novelettes in one, then the Part Separators would be the title (and subtitle, if any) of the individual novelettes. Sometimes a Part Separator has a brief description of its purpose, as in <i>Book I. On Earth</i> followed by <i>Book II. On Mars</i>.</p> +<p>Part separators could be simply <i>Part I</i>, <i>Part II</i>, and so forth. They could be <i>Book I</i>, <i>Book II</i>. Or, they could have distinctive titles, such as <i>The Northern Front</i> and <i>The Southern Front</i>. If your book is "two in one" then the Part Separators would be the title (and subtitle, if any) of the individual parts. Sometimes a Part Separator has a brief description of its purpose, as in <i>Book I. On Earth</i> followed by <i>Book II. On Mars</i>.</p> <p>Unless your book has a very complex structure, do <i>not</i> use both a second Half-Title (whether in front matter or main matter) and a Part Separator. Combine them as the recto main matter page 1: <i>The Withens Chronicles. Part I</i>, or simply <i>Part I</i>. Then the next Part Separator would be <i>Part II</i>.</p> <p>In one book I recently noticed, there were five parts, each of which corresponded to one calendar day. The Part Separator showed the day, as in <i>Monday, September 25</i>. Then within each part there were several chapters, each of which took us to some different event in a different setting, all on that same day. I also note that this book had no Table of Contents; the progress of the novel was therefore a surprise, by its author's intent.</p> </div><!-- end D.3.3.2 --> @@ -3183,7 +3099,7 @@ Some text {\baskf\addfontfeature{Numbers=Monospaced} hello 123} is here. <h2 id="hY">Appendix Y. Licensing and Credits</h2> <div class="d2" id="dY"> -<p class="item"><b>A. Licensing:</b> The <i>novel</i> document class, including software, examples, documentation and supporting images, is distributed under the terms of the <a class="external" rel="external" target="new" href="https://www.latex-project.org/lppl/lppl-1-3c/">LaTeX Project Public License, version 1.3c only</a>. Exception: The included fonts <i>NovelDeco.otf</i> and <i>CPmodified.otf</i> are distributed under terms of the <a class="external" rel="external" target="new" href="http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web">SIL Open Font License, v.1.1.</a></p> +<p class="item"><b>A. Licensing:</b> The <i>novel</i> document class, including software, examples, documentation and supporting images, is distributed under the terms of the <a class="external" rel="external" target="new" href="https://www.latex-project.org/lppl/lppl-1-3c/">LaTeX Project Public License, version 1.3c only</a>. Exception: The included font <i>NovelDeco.otf</i> is distributed under terms of the <a class="external" rel="external" target="new" href="http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web">SIL Open Font License, v.1.1.</a></p> <p>To ensure that your book may be sold commercially, be careful to use only fonts that allow commercial usage. That may exclude some of the fonts in the LaTeX font catalog. See <a href="#hC">Appendix C</a>.</p> <p class="item"><b>B. Credits:</b> Within the TeX code files, you will find places where small or large pieces of code are the work of someone else. Names or organizations are credited in-place within the TeX code, according to license.</p> @@ -3199,11 +3115,13 @@ Some text {\baskf\addfontfeature{Numbers=Monospaced} hello 123} is here. <div id="pageZ" class="page"> -<h2 id="hZ">Appendix Z. Changes in v.1.80.</h2> +<h2 id="hZ">Appendix Z. Changes in v.1.86.</h2> <div class="d2" id="dZ"> <h4>Important Changes</h4> <div class="d3"> +<p>Version 1.86 (2024) docs edited..</p> +<p>Version 1.84 (2023) docs edited. Probably final update.</p> <p>Version 1.83 (2023) corrected minor typo. Will not affect most users.</p> <p>Version 1.82 (2023) adds a user setting, to change the default indent.</p> <p>Version 1.80 (2023) tweaks some internal code, for faster compiling. @@ -3213,6 +3131,8 @@ In any case, if you are re-building an earlier document, pay careful attention to line breaks and pagination. Due to various adjustments in component packages and fonts, a document built in the past may look slightly different if re-built now.</p> +</div> + </div><!-- end Z --> </div><!-- end Appendix Z --> @@ -3221,7 +3141,7 @@ if re-built now.</p> </div><!-- end main --> -<div id="finish"></div> +<div style="clear:both"></div> </div><!-- end master --> </body> </html> diff --git a/macros/luatex/latex/novel/doc/novel.pdf b/macros/luatex/latex/novel/doc/novel.pdf index afb325ef5f..019feecf43 100644 --- a/macros/luatex/latex/novel/doc/novel.pdf +++ b/macros/luatex/latex/novel/doc/novel.pdf @@ -8,10 +8,10 @@ stream <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/"> - <xmp:ModifyDate>2023-11-09T11:33:37-08:00</xmp:ModifyDate> - <xmp:CreateDate>2023-11-09T11:33:37-08:00</xmp:CreateDate> + <xmp:ModifyDate>2024-01-31T11:26:16-08:00</xmp:ModifyDate> + <xmp:CreateDate>2024-01-31T11:26:16-08:00</xmp:CreateDate> <xmp:CreatorTool>LuaLaTeX with novel and microtype</xmp:CreatorTool> - <xmp:MetadataDate>2023-11-09T11:33:37-08:00</xmp:MetadataDate> + <xmp:MetadataDate>2024-01-31T11:26:16-08:00</xmp:MetadataDate> </rdf:Description> <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -25,7 +25,7 @@ stream <rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> <xmpMM:DocumentID>uuid:A12D98E081B6A0EC2CBA2D468474F922</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:50D7821EED17A7D4834572F405C18DB9</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:7B55E0C0C1A732BF844F0BBB234AF9B7</xmpMM:InstanceID> <xmpMM:RenditionClass>default</xmpMM:RenditionClass> <xmpMM:VersionID>1</xmpMM:VersionID> </rdf:Description> @@ -49,7 +49,7 @@ stream endstream endobj 7 0 obj -<< /Length 8286 >> +<< /Length 8457 >> stream 0 g 0 G 0 g 0 G @@ -59,67 +59,58 @@ BT 1 0 0 1 178.388 541.455 Tm [<002F0030>-37<00370026002D>]TJ /F95 13.62884 Tf 1 0 0 1 105.124 508.167 Tm [<0022>-250<00250050>-7<00440056004E0046004F0055>-250<0024004D004200540054>-250<004700500053>-250<005500490046>-250<0033004600540055>-250<00500047>-250<00360054>]TJ -ET -1 0 0 1 161.57 496.331 cm -q -4 0 0 4 0 0 cm -1 0 0 1 -161.57 -496.331 cm -BT +/F95 11.3574 Tf +1 0 0 1 143.535 493.372 Tm [<0037>80<004600530054004A0050004F>-250<09C9000F09D009CE>-250<0009>-73<002B0042004F005600420053>-15<005A>-250<09CA09C809CA09CC000A>]TJ /F97 11.3574 Tf -1 0 0 1 161.57 496.331 Tm [<0176>]TJ -ET -1 0 0 1 161.57 496.331 cm -Q -1 0 0 1 -161.57 -496.331 cm -BT -/F98 11.3574 Tf -1 0 0 1 53.421 446.286 Tm [<0038004900460053>8<0046>-201<004A0054>-201<005500490046>-202<00450050>-7<00440056004E0046004F005500420055004A0050004F00200020>]TJ +1 0 0 1 53.421 446.202 Tm [<0038004900460053>8<0046>-250<004A0054>-250<005500490046>-250<00450050>-7<00440056004E0046004F005500420055004A0050004F00200020>]TJ /F95 11.3574 Tf -0.98 0 0 1 211.688 446.286 Tm [<002A0055>-205<004A0054>-205<004A004F>-206<0029>-38<0035002E002D>-206<004700500053004E00420055000D>-215<0042004F0045>-206<00440042004F004F00500055>]TJ -1 0 0 1 54 431.492 Tm [<0043>-10<0046>-249<0053>7<004600550053004A0046>8<0057>8<0046>-7<0045>-249<0057004A0042>]TJ -/F99 11.3574 Tf -1 0 0 1 128.744 431.492 Tm [<00550046>7<005900450050>-7<0044>]TJ +1 0 0 1 213.53 446.202 Tm [<002A0055>-250<004A0054>-250<0029>-37<0035002E002D000F>]TJ +1 0 0 1 53.659 431.407 Tm [<000900550046>7<00590053>8<0050>-7<00500055000A001000450050>-7<00440010004D00560042004D004200550046>7<00590010004F0050>7<0057>8<0046004D0010004F0050>7<0057>8<0046004D000E00450050>-7<00440056004E0046004F005500420055004A0050004F000F00490055004E004D000F>]TJ +/F97 11.3574 Tf +1 0 0 1 54 401.818 Tm [<002F0046>7<00580054001B>]TJ /F95 11.3574 Tf -1 0 0 1 157.229 431.492 Tm [<000F>-333<002A0047>-249<005A>8<00500056>-249<004900420057>8<0046>-248<00550049004A0054>-250<005100420044004C004200480046>-249<004A004F005400550042004D004D0046>-7<0045000D>-249<004D0050>-7<0050004C>-249<004700500053>]TJ -0.996 0 0 1 53.659 416.697 Tm [<000900550046>7<00590053>8<0050>-6<00500055000A001000450050>-8<00440010004D00560042004D004200550046>7<00590010004F0050>7<0057>8<0046004D0010004F0050>7<0057>8<0046004D000E00450050>-6<00440056004E0046004F005500420055004A0050004F000F00490055004E004D000F>-341<002A0047>-253<005A>7<00500056>-252<00420053>7<0046>]TJ -0.98 0 0 1 54 401.903 Tm [<0050004F004D004A004F0046>10<000D>-246<00480050>-246<00550050>-245<005500490046>-245<00240035>50<0022002F>-244<0051004200480046>-246<00420055>-245<00490055005500510054001B00100010004400550042004F000F00500053004800100051004C00480010004F0050>7<0057>8<0046004D>-244<0042004F0045>-246<0044004D004A0044004C>]TJ -1 0 0 1 53.148 387.108 Tm [<06E2003100420044004C004200480046>-250<00250050>-7<00440056004E0046004F005500420055004A0050004F>-250<00090029>-37<0035002E002D000A000F>122<06E3>]TJ +0.992 0 0 1 88.261 401.818 Tm [<00350049004A0054>-252<00450050>-7<00440056004E0046004F0055>-253<0044004D004200540054>-253<005800420054>-252<0939005300540055>-253<00510053004A0057004200550046004D005A>-253<005600540046>-7<0045>-252<004A004F>-253<09CA09C809C909CC000F>-338<003500490046004F000D>]TJ +1.02 0 0 1 54 387.024 Tm [<004A004F>-280<09CA09C809C909D0000D>-289<004A0055>-280<005800420054>-281<004A004E00510053>8<0050>7<0057>8<0046>-7<0045000D>-289<00450050>-7<00440056004E0046004F00550046>-7<0045000D>-289<0042004F0045>-280<0053>7<0046004D0046004200540046>-6<0045000F>-432<002A0055>-281<004900420054>-280<0043>-10<0046>-7<0046004F>]TJ +1.02 0 0 1 54 372.229 Tm [<004E0042004A004F00550042004A004F0046>-7<0045>-315<005500490053>7<0050005600480049>-314<0035>62<00460039004D004A0057>8<0046>-315<09CA09C809CA09CB000F>-538<002A0055>-315<004A0054>-315<0046>6<00590051>-6<0046>-7<004400550046>-7<0045>-316<00550050>-315<0058>7<00500053004C>-315<004A004F>-315<005500490046>]TJ +1 0 0 1 54 357.435 Tm [<00470056005500560053>8<0046>10<000D>-250<004300560055>-250<004A0054>-250<004F0050>-250<004D0050004F004800460053>-250<004E0042004A004F00550042004A004F0046>-7<0045>-250<0043005A>-250<004A00550054>-250<00500053004A0048004A004F0042004D>-250<00440053>8<00460042005500500053>59<000F>]TJ +0.98 0 0 1 71.036 342.64 Tm [<002400490042004F004800460054>-226<004A004F>-226<00510053004A004F0055000E0050004F000E00450046004E0042004F0045>-227<00550046>-7<00440049004F0050004D00500048005A>-227<004900420057>8<0046>-226<004E004200450046>-226<004E0042004F005A>-227<00510042005300550054>]TJ +0.98 0 0 1 54 327.845 Tm [<00500047>-254<00550049004A0054>-255<00440050>-7<00450046>-254<004A00530053>7<0046004D0046>7<00570042004F0055000F>-339<0035004900460053>8<0046>-254<00420053>7<0046>-253<0042004D00540050>-255<0042>-254<00470046>6<0058>-254<00440050004E004E0042004F00450054>-254<0055004900420055>-255<0053>8<0046>-7<00520056004A0053>8<0046>]TJ +1.02 0 0 1 54 313.051 Tm [<00480053004200510049004A0044>-288<004500460054004A0048004F>-288<0046>6<00590051>-6<00460053004A0046004F00440046>-289<004700500053>-288<00510053>7<00500051>-6<00460053>-289<00560054004200480046>9<000F>-456<0022004F0045>-288<0042>-289<00470046>6<0058>-287<0054004600550055004A004F00480054000D>]TJ +1 0 0 1 53.58 298.256 Tm [<00580049004A00440049>-250<0054004900500056004D0045>-250<0043>-10<0046>-250<0054004A004E0051004D0046>-250<0042004F0045>-250<005000430057004A005000560054000D>-250<00420053>8<0046>-250<00440050004E0051004D0046>7<0059>-250<0042004F0045>-250<00420053>8<00440042004F0046>10<000F>]TJ +1.02 0 0 1 71.036 283.462 Tm [<002A0047>]TJ /F98 11.3574 Tf -1 0 0 1 54 357.519 Tm [<00250046005400440053004A00510055004A0050004F001B>]TJ +1.02 0 0 1 81.23 283.462 Tm [<004F0050>7<0057>8<0046004D>]TJ /F95 11.3574 Tf -1.02 0 0 1 121.178 357.519 Tm [<003500490046>]TJ -/F99 11.3574 Tf -1.02 0 0 1 142.58 357.519 Tm [<004F0050>7<0057>8<0046004D>]TJ +1.02 0 0 1 109.331 283.462 Tm [<0058>8<00500053004C0054>-273<004700500053>-273<005A>8<00500056000D>-279<00480050>-7<0050>-7<0045000F>-411<002300560055>-273<004A0047>-273<005A>7<00500056>-272<00420053>7<0046>-272<0054004A004E0051004D005A>-273<00580053004A0055004A004F0048>-273<0042>]TJ +1.02 0 0 1 54 268.667 Tm [<093900440055004A0050004F>-283<004F0050>6<0057>8<0046004D000D>-293<004F005000550049004A004F0048>-284<00470042004F0044005A>58<000D>-292<005500490046004F>-284<00540046>-7<0046>-284<004A0047>-284<00240035>48<0022002F>-282<0042004F0045>-284<0035>62<00460039004D004A0057>8<0046>-283<004900420057>7<0046>]TJ +1.02 0 0 1 54 253.873 Tm [<0042>-273<005100420044004C004200480046>-274<004F0042004E0046>-7<0045>]TJ +/F98 11.3574 Tf +1.02 0 0 1 139.105 253.873 Tm [<004F0050>7<0057>7<0046004D0046005500550046>]TJ /F95 11.3574 Tf -1.02 0 0 1 170.594 357.519 Tm [<00450050>-7<00440056004E0046004F0055>-265<0044004D004200540054>-266<004A0054>-265<004700500053>-265<00580053004A0055004600530054>-266<00500047>-265<00500053004A0048004A004F0042004D>]TJ -0.98 0 0 1 54 342.725 Tm [<093900440055004A0050004F000D>-244<00550050>-242<0043>-10<0046>-242<00510053004A004F00550046>-7<0045>-242<00550050>-242<005100420051>-7<00460053>61<000D>-244<0058004A00550049>-242<0042005500550046004F0055004A0050004F>-241<00550050>-242<005500490046>-242<0053>7<0046>-6<00520056004A0053>8<0046004E0046004F00550054>-241<00500047>]TJ -0.995 0 0 1 54 327.93 Tm [<005500490046>-249<00510053004A004F0055000E0050004F000E00450046004E0042004F0045>-250<004E00420053004C00460055000F>-335<002F0050004F000E00440050004D00500053>-250<004A004F005500460053004A005000530054>-249<0042004F0045>-250<00440050004D00500053>-250<00440050>6<0057>8<004600530054>]TJ -1.02 0 0 1 54 313.136 Tm [<00420053>8<0046>-294<0054005600510051>-7<0050005300550046>-7<0045000F>-474<002A004E0042004800460054>-295<00420053>8<0046>-294<0054005600510051>-7<0050005300550046>-7<0045000D>-307<004300560055>-294<0050004F004D005A>-294<00420054>-294<005500490046>6<005A>-294<004E004A004800490055>-294<0043>-10<0046>]TJ -1 0 0 1 54 298.341 Tm [<005600540046>-7<0045>-250<004A004F>-250<093900440055004A0050004F000D>-250<004F00500055>-250<0051004A0044005500560053>8<0046>-250<0043>-10<0050>-7<0050004C0054000F>]TJ -0.98 0 0 1 71.036 283.547 Tm [<002A0047>-226<005A>8<005000560053>-226<0058>8<00500053004C>-226<004A0054>-226<0042004F>-226<0026000E0043>-10<0050>-8<0050004C000D>-232<00500053>-226<0056005400460054>-226<004A004F005500460053004A00500053>-226<00440050004D00500053>-226<00500055004900460053>-227<005500490042004F>-226<004800530042005A>61<000D>]TJ -1 0 0 1 54 268.752 Tm [<00500053>-250<004A0054>-250<00420044004200450046004E004A0044000D>-250<005500490046004F>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<004A0054>-250<004F00500055>-250<004700500053>-250<005A>8<00500056000F>]TJ -1 0 0 1 71.036 253.958 Tm [<002300560055>-250<004A0047>-250<005A>7<00500056>-250<00420053>8<0046>-250<00580053004A0055004A004F0048>-250<0042>-251<0045004600550046>-7<00440055004A0057>7<0046>-249<004F0050>6<0057>8<0046004D000D>-249<00500053>-251<00540044004A0046004F00440046>-250<093900440055004A0050004F000D>-251<00500053>-250<0042>]TJ -1 0 0 1 54 239.163 Tm [<00440050004D004D0046>-7<00440055004A0050004F>-250<00500047>-250<00540049005000530055>-250<0054005500500053004A00460054000D>-250<005500490046004F>-250<0053>8<004600420045>-250<0050004F0002>]TJ -/F95 13.62884 Tf -1 0 0 1 54 213.663 Tm [<0012000F>-333<002700460042005500560053>7<00460054>]TJ +1.02 0 0 1 179.711 253.873 Tm [<000F>-411<0022>11<0054>-273<00500047>-273<004D004200550046>-274<002B0042004F005600420053>-15<005A>-273<09CA09C809CA09CC000D>-281<005500490046>-273<005100420044004C004200480046>]TJ +1.02 0 0 1 54 239.078 Tm [<004A0054>-264<004A004F>-265<0043>-10<004600550042>-265<0055004600540055>-265<0009004F00500055>-265<0053>7<0046004D0046004200540046>-6<0045>-265<005A>7<00460055000A000F>-385<002A0047>-265<005500490046>-265<005100420044004C004200480046>-264<0046>6<0059004A005400550054>-264<0042004F0045>-265<00440042004F>-265<0043>-10<0046>]TJ +1 0 0 1 54 224.284 Tm [<004A004F005400550042004D004D0046>-7<0045000D>-250<005500490046004F>-250<005A>8<00500056>-250<0054004900500056004D0045>-250<00510053>8<0046004700460053>]TJ +/F98 11.3574 Tf +1 0 0 1 207.45 224.284 Tm [<004F0050>7<0057>8<0046004D0046005500550046>]TJ /F95 11.3574 Tf -1.02 0 0 1 53.659 194.779 Tm [<003500490053>8<0050005600480049005000560055000D>-329<004A0055>-312<004A0054>-313<0042005400540056004E0046>-7<0045>-312<0055004900420055>-312<005500490046>-313<0051005600530051>-7<005000540046>-312<00500047>-312<005A>7<005000560053>-312<00580053004A0055004A004F0048>-312<004A0054>-312<0042>]TJ -1 0 0 1 54 179.985 Tm [<00440050004E004E00460053>8<0044004A0042004D004D005A>-250<00510053004A004F00550046>-7<0045>-250<0043>-10<0050>-7<0050004C>-250<00500047>-250<093900440055004A0050004F000F>]TJ -0.98 0 0 1 71.036 165.19 Tm [<0022>-244<004F0046>7<0058>]TJ -/F99 11.3574 Tf -0.98 0 0 1 103.451 165.19 Tm [<004F0050>7<0057>8<0046004D>]TJ +1 0 0 1 247.258 224.284 Tm [<000F>]TJ +/F97 11.3574 Tf +1 0 0 1 54 194.695 Tm [<00250046005400440053004A00510055004A0050004F001B>]TJ +/F95 11.3574 Tf +1.02 0 0 1 121.178 194.695 Tm [<003500490046>]TJ +/F98 11.3574 Tf +1.02 0 0 1 142.58 194.695 Tm [<004F0050>7<0057>8<0046004D>]TJ /F95 11.3574 Tf -0.98 0 0 1 130.153 165.19 Tm [<004A0054>-244<00510053>8<0046000E00440050004F0939004800560053>8<0046>-7<0045>-244<00550050>-244<00510053>7<0050>-6<0045005600440046>-244<0042>-245<005400550042004F004500420053>8<0045>-244<00550053004200450046>-244<0043>-10<0050>-8<0050004C>]TJ -1.003 0 0 1 54 150.396 Tm [<0054004A005B0046>-249<00500047>-249<09CD000F09CD004A004F>-249<0038>-249<0059>-249<09D0000F09CD004A004F>-249<0029000D>-250<0058004A00550049>-249<004D0042005A>7<005000560055>-248<004E004200530048004A004F0054>-249<0055004900420055>-249<00420053>7<0046>-248<004D004A004C0046004D005A>-249<00550050>-250<0043>-10<0046>]TJ -0.994 0 0 1 54 135.601 Tm [<00420044004400460051005500420043004D0046>-251<00550050>-252<005500490046>-251<004E005000540055>-252<0058004A00450046004D005A000E005600540046>-7<0045>-252<00510053004A004F0055>-251<005400460053>-15<0057004A004400460054000F>-336<003500490046>-251<0939004D0046>-252<005A>7<00500056>-250<00420053>7<0046>]TJ -0.98 0 0 1 54 120.807 Tm [<004F0050>7<0058>-202<0053>7<004600420045004A004F0048>-202<004A0054>-203<004A004F>-203<00550049004A0054>-204<004700500053004E00420055000F>-322<002300560055>-204<004A0047>-203<0055004900420055>-203<004A0054>-203<004F00500055>-203<005500490046>-203<0054004A005B0046>-203<00500053>-204<004D0042005A>8<005000560055>-203<005A>8<00500056>]TJ -0.986 0 0 1 53.58 106.012 Tm [<00580042004F0055000D>-252<005500490046004F>-253<0055004900460053>8<0046>-252<00420053>8<0046>-252<00440050004E004E0042004F00450054>-252<0055004900420055>-253<00440050004F0939004800560053>8<0046>-252<004B005600540055>-252<00420043>-11<005000560055>-252<0042004F005A00550049004A004F0048000D>]TJ -1.02 0 0 1 54 91.218 Tm [<00560054004A004F0048>-243<005400550042004F004500420053>7<0045>-243<005500460053004E004A004F0050004D00500048005A>-244<0042004F0045>-243<0056004F004500460053005400550042004F004500420043004D0046>-244<0051005600530051>-7<005000540046>9<000F>-325<0023004600540055>-244<00500047>]TJ -0.984 0 0 1 54 76.423 Tm [<0042004D004D000D>-253<005500490046>-253<0029>-39<0035002E002D>-253<00450050>-7<00440056004E0046004F005500420055004A0050004F>-253<00440050004E00460054>-254<0058004A00550049>-253<004A004E0042004800460054>-253<0042004F0045>-253<0046>6<00590042004E0051004D00460054000D>-252<00540050>]TJ -1 0 0 1 54 61.629 Tm [<005A>8<00500056>-250<004C004F0050>7<0058>-250<0058004900420055>-250<005A>8<00500056>-250<00420053>8<0046>-250<00450050004A004F0048000F>]TJ +1.02 0 0 1 170.594 194.695 Tm [<00450050>-7<00440056004E0046004F0055>-265<0044004D004200540054>-266<004A0054>-265<004700500053>-265<00580053004A0055004600530054>-266<00500047>-265<00500053004A0048004A004F0042004D>]TJ +0.98 0 0 1 54 179.9 Tm [<093900440055004A0050004F000D>-244<00550050>-242<0043>-10<0046>-242<00510053004A004F00550046>-7<0045>-242<00550050>-242<005100420051>-7<00460053>61<000D>-244<0058004A00550049>-242<0042005500550046004F0055004A0050004F>-241<00550050>-242<005500490046>-242<0053>7<0046>-6<00520056004A0053>8<0046004E0046004F00550054>-241<00500047>]TJ +0.995 0 0 1 54 165.106 Tm [<005500490046>-249<00510053004A004F0055000E0050004F000E00450046004E0042004F0045>-250<004E00420053004C00460055000F>-335<002F0050004F000E00440050004D00500053>-250<004A004F005500460053004A005000530054>-249<0042004F0045>-250<00440050004D00500053>-250<00440050>6<0057>8<004600530054>]TJ +1.02 0 0 1 54 150.311 Tm [<00420053>8<0046>-294<0054005600510051>-7<0050005300550046>-7<0045000F>-474<002A004E0042004800460054>-295<00420053>8<0046>-294<0054005600510051>-7<0050005300550046>-7<0045000D>-307<004300560055>-294<0050004F004D005A>-294<00420054>-294<005500490046>6<005A>-294<004E004A004800490055>-294<0043>-10<0046>]TJ +1 0 0 1 54 135.517 Tm [<005600540046>-7<0045>-250<004A004F>-250<093900440055004A0050004F000D>-250<004F00500055>-250<0051004A0044005500560053>8<0046>-250<0043>-10<0050>-7<0050004C0054000F>]TJ +0.98 0 0 1 71.036 120.722 Tm [<002A0047>-226<005A>8<005000560053>-226<0058>8<00500053004C>-226<004A0054>-226<0042004F>-226<0026000E0043>-10<0050>-8<0050004C000D>-232<00500053>-226<0056005400460054>-226<004A004F005500460053004A00500053>-226<00440050004D00500053>-226<00500055004900460053>-227<005500490042004F>-226<004800530042005A>61<000D>]TJ +1 0 0 1 54 105.928 Tm [<00500053>-250<004A0054>-250<00420044004200450046004E004A0044000D>-250<005500490046004F>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<004A0054>-250<004F00500055>-250<004700500053>-250<005A>8<00500056000F>]TJ +1 0 0 1 71.036 91.133 Tm [<002300560055>-250<004A0047>-250<005A>7<00500056>-250<00420053>8<0046>-250<00580053004A0055004A004F0048>-250<0042>-251<0045004600550046>-7<00440055004A0057>7<0046>-249<004F0050>6<0057>8<0046004D000D>-249<00500053>-251<00540044004A0046004F00440046>-250<093900440055004A0050004F000D>-251<00500053>-250<0042>]TJ +1 0 0 1 54 76.339 Tm [<00440050004D004D0046>-7<00440055004A0050004F>-250<00500047>-250<00540049005000530055>-250<0054005500500053004A00460054000D>-250<005500490046004F>-250<005A>8<00500056>-250<00420053>8<0046>-250<004A004F>-250<005500490046>-250<0053004A004800490055>-250<0051004D004200440046>10<000F>]TJ 0 g 0 G -/F95 10.44878 Tf -1 0 0 1 204.571 39.437 Tm [<0012>]TJ 0 g 0 G ET @@ -128,193 +119,10 @@ endobj 6 0 obj << /Type /Page /Contents 7 0 R /Resources 5 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] -/TrimBox[0 0 396 612] /Parent 12 0 R >> +/TrimBox[0 0 396 612] /Parent 11 0 R >> endobj 5 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R /F97 9 0 R /F98 10 0 R /F99 11 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -15 0 obj -<< /Length 9218 >> -stream -0 g 0 G -0 g 0 G -BT -/F95 11.3574 Tf -1.02 0 0 1 53.036 564.643 Tm [<0022004D004E005000540055>-286<0046>6<0057>8<00460053>-14<005A00550049004A004F0048>-286<004A0054>-286<00510053>7<0046000E00440050004F0939004800560053>8<0046>-6<0045>-286<00550050>-286<06E2004B005600540055>-286<0058>7<00500053004C000D>122<06E3>-295<0046>6<0057>8<0046004F>-285<005500490046>]TJ -0.993 0 0 1 36 549.848 Tm [<004400490050004A00440046>-253<00500047>-253<00470050004F00550054000F>-339<003500490046>-253<00440049005000540046004F>-253<00440050004E0051004A004D00460053>-253<004A0054>-253<002D00560042002D00420035>64<00460039000D>-252<0042004F0045>-253<00300051>-7<0046004F>-253<0035>49<005A0051>-6<0046>]TJ -1.02 0 0 1 36 535.054 Tm [<00470050004F00550054>-254<00420053>7<0046>-253<004D0050004200450046>-7<0045>-254<00560054004A004F0048>]TJ -/F99 11.3574 Tf -1.02 0 0 1 143.408 535.054 Tm [<00470050004F005500540051>-7<0046>-7<0044>]TJ -/F95 11.3574 Tf -1.02 0 0 1 184.407 535.054 Tm [<00550046>-7<00440049004F0050004D00500048005A>59<000F>-353<002A0047>-255<005A>7<00500056>-253<00510053>7<0046004700460053>-253<00550050>-254<005600540046>-254<0042>]TJ -1 0 0 1 36 520.259 Tm [<00510053>8<00500047004600540054004A0050004F0042004D>-250<00470050004F0055000D>-250<004A0055>-250<0058004A004D004D>-250<0043>-10<0046>-250<004600420054005A>-250<00550050>-250<004D005000420045>-250<0042004F0045>-250<005600540046>-250<004A004F>-250<005600550047000E09D0000F>]TJ -1.02 0 0 1 53.036 505.465 Tm [<002E0042004F005A>-330<005400550042004F004500420053>7<0045>-330<002D00420035>62<00460039>-330<00440050004E004E0042004F00450054>-330<00420053>7<0046>-330<0045004A005400420043004D0046>-7<0045000F>-584<00350049004A0054>-331<0058004A004D004D>-330<0043>-10<0046>]TJ -0.98 0 0 1 36 490.67 Tm [<00540056005300510053004A0054004A004F0048>-228<00420055>-227<0939005300540055000F>-332<002300560055>]TJ -/F99 11.3574 Tf -0.98 0 0 1 138.832 490.67 Tm [<004F0050>7<0057>8<0046004D>]TJ -/F95 11.3574 Tf -0.98 0 0 1 165.352 490.67 Tm [<004A0054>-228<00470050>-7<0044005600540046>-7<0045>-228<0050004F>-228<0050004F0046>-228<00550049004A004F0048>-228<0050004F004D005A>61<000F>-331<0022004F005A00550049004A004F0048>]TJ -0.986 0 0 1 36 475.875 Tm [<0055004900420055>-254<004E004A004800490055>-254<004A004F005500460053004700460053>7<0046>-253<0058004A00550049>-255<0055004900420055>-254<0051005600530051>-7<005000540046>-255<004E0042005A>-254<004900420057>7<0046>-253<0043>-11<0046>-7<0046004F>-254<00550050005400540046>-7<0045>-255<00420054004A00450046>10<000F>]TJ -0.98 0 0 1 36 461.081 Tm [<00340050>10<000D>-231<0043>-10<0046>-226<005400560053>7<0046>-224<0055004900420055>-226<005A>7<00500056>-225<0053>8<004600420045>-225<005500490046>-226<00450050>-7<00440056004E0046004F005500420055004A0050004F0002>-331<002A0047>-225<005A>7<00500056>-225<00550042004C0046>-226<0042004F>-225<0046>6<0059004A00540055004A004F0048>]TJ -0.98 0 0 1 36 446.286 Tm [<002D00420035>65<00460039>-173<00450050>-8<00440056004E0046004F0055>-174<0042004F0045>-174<004B005600540055>-175<004400490042004F00480046>-174<005500490046>-175<0044004D004200540054>-174<00550050>]TJ -/F99 11.3574 Tf -0.98 0 0 1 237.077 446.286 Tm [<004F0050>7<0057>8<0046004D000D>]TJ -/F95 11.3574 Tf -0.98 0 0 1 264.879 446.286 Tm [<004A0055>-174<004A0054>-174<0057>7<00460053>-15<005A>-174<0056004F004D004A004C0046004D005A>]TJ -1 0 0 1 36 431.492 Tm [<00550050>-250<0058>8<00500053004C>-250<00420054>-250<0046>7<00590051>-7<0046>-7<004400550046>-7<0045000F>]TJ -1.02 0 0 1 53.036 416.697 Tm [<002E0042004F005A>-266<004F0046>7<0058>-266<00440050004E004E0042004F00450054>-266<00420053>7<0046>-265<00510053>7<0050>7<0057004A00450046>-6<0045000F>-389<003500490046>6<005A>-265<00420053>7<0046>-266<00470050>-6<0044005600540046>-7<0045>-266<0050004F>-266<005500490046>]TJ -0.98 0 0 1 36 401.903 Tm [<004F0046>-7<0046>-7<00450054>-240<00500047>-239<00510053004A004F0055>-240<093900440055004A0050004F>-239<00580053004A0055004600530054000D>-243<0051>-7<00460053004A0050>-8<0045000F>-335<0022004F0045000D>]TJ -/F99 11.3574 Tf -0.98 0 0 1 231.134 401.903 Tm [<004F0050>7<0057>8<0046004D>]TJ -/F95 11.3574 Tf -0.98 0 0 1 257.783 401.903 Tm [<004900420054>-239<00430056004A004D0055000E004A004F>-240<00310025002700100039>]TJ -0.98 0 0 1 36 387.108 Tm [<00550046>-7<00440049004F0050004D00500048005A>-185<0055004900420055>-186<0046>6<005900440046>-6<0046>-7<00450054>-186<005500490046>-186<00440042005100420043004A004D004A0055004A00460054>-185<0044005600530053>7<0046004F0055004D005A>-184<004200570042004A004D00420043004D0046>-186<0057004A0042>-186<00500055004900460053>]TJ -1 0 0 1 36 372.314 Tm [<002D00420035>63<00460039>-250<005100420044004C0042004800460054000F>]TJ -/F95 13.62884 Tf -1 0 0 1 36 346.813 Tm [<0013000F>-333<00240050004E0051004D004600550046>-250<00250050>-7<00440056004E0046004F005500420055004A0050004F>]TJ -/F95 11.3574 Tf -1.008 0 0 1 35.455 327.93 Tm [<0038004900420055>-248<005A>7<00500056>-247<00420053>7<0046>-248<0053>8<004600420045004A004F0048>-248<004F0050>6<0058>60<000D>-248<004A0054>-248<0050004F004D005A>-249<0042004F>-248<004A004F00550053>7<0050>-6<0045005600440055004A0050004F000F>-332<003500490046>-248<00440050004E0051004D004600550046>]TJ -0.98 0 0 1 36 313.136 Tm [<00450050>-7<00440056004E0046004F005500420055004A0050004F>-221<004A0054>-222<004A004F>-221<0029>-38<0035002E002D>-222<004700500053004E00420055000D>-228<0045004A0053>8<0046>-7<00440055004D005A>-221<00580053004A005500550046004F>-221<004A004F>-222<0029>-38<0035002E002D>-222<005300420055004900460053>]TJ -0.98 0 0 1 36 298.341 Tm [<005500490042004F>-173<0046>6<0059005500530042004400550046>-6<0045>-173<00470053>7<0050004E>-172<00440050>-8<00450046>10<000F>-312<0035004900460053>7<0046>-172<00420053>7<0046>-172<004F0056004E00460053>7<005000560054>-173<0046>7<00590042004E0051004D00460054>-173<0042004F0045>-173<004A004E0042004800460054000D>]TJ -1 0 0 1 36 283.547 Tm [<00550050>-7<0050>-250<0045004600550042004A004D0046>-7<0045>-250<00550050>-250<0043>-10<0046>-250<00510053>8<004600540046004F00550046>-7<0045>-250<00420054>-250<003100250027>24<000F>]TJ -/F95 13.62884 Tf -1 0 0 1 36 258.046 Tm [<0014000F>-333<002D004A00440046004F00540046>]TJ -/F95 11.3574 Tf -1.02 0 0 1 35.659 239.163 Tm [<003500490046>-323<002D00420035>62<00460039>-323<00440050>-7<00450046>9<000D>-342<0042004F0045>-324<0042004400440050004E00510042004F005A004A004F0048>-323<00450050>-7<00440056004E0046004F005500420055004A0050004F000D>-344<004A0054>-323<0053>7<0046004D0046004200540046>-6<0045>]TJ -1 0 0 1 36 224.369 Tm [<0056004F004500460053>-250<005500490046>-250<002D0042005500460039>-250<00310053>8<0050004B0046>-7<00440055>-250<003100560043004D004A0044>-250<002D004A00440046004F00540046>10<000D>-250<0057>8<004600530054004A0050004F>-250<09C9000F09CB0044000F>]TJ -0.98 0 0 1 53.036 209.574 Tm [<003500490046>-254<00440050004E00510042004F004A0050004F>-254<00470050004F00550009>11<0054000A>-253<004A00540009>11<00420053>9<0046000A>-254<004D004A00440046004F00540046>-7<0045>-255<0056004F004500460053>-254<005500490046>-254<0034002A002D>-255<00300051>-7<0046004F>-255<00270050004F0055>]TJ -1 0 0 1 36 194.779 Tm [<002D004A00440046004F00540046>10<000D>-250<0057>8<004600530054004A0050004F>-250<09C9000F09C9000F>]TJ -/F95 13.62884 Tf -1 0 0 1 36 169.279 Tm [<0015000F>-333<0037>79<004600530054004A0050004F>]TJ -/F95 11.3574 Tf -1 0 0 1 36 150.396 Tm [<09C9000F09D009CB000D>-250<09CA09C809CA09CB000E09C909C9000E09C809D1001B>-333<002E004A004F00500053>-250<0055005A0051>-7<0050>-250<0044005000530053>7<0046>-6<004400550046>-7<0045000F>]TJ -1 0 0 1 36 135.601 Tm [<09C9000F09D009CA000D>-250<09CA09C809CA09CB000E09C809D0000E09CA09CE001B>-333<0022>11<004500450046>-6<0045>-250<0056005400460053>-250<0054004600550055004A004F0048>-250<004700500053>-250<00450046004700420056004D0055>-250<004A004F00450046004F0055000F>]TJ -1 0 0 1 36 120.807 Tm [<09C9000F09D009C9000D>-250<09CA09C809CA09CB000E09C809CB000E09CA09CD001B>-333<002300560048>-250<0939005900460054000F>-333<0022004D00540050>-250<09C9000F09D009C90042000D>-250<09C9000F09D009C90043>19<000F>]TJ -1 0 0 1 36 106.012 Tm [<09C9000F09D009C8000D>-250<09CA09C809CA09CB000E09C809CA000E09C809D0001B>-333<0024004D004200540054>-250<005000510055004A0050004F>-250<06E20053>7<0046>7<005706E3>-249<004700500053>-250<004F0046>6<0058>-249<00450050>-7<00440056004E0046004F00550054000F>]TJ -0.994 0 0 1 36 91.218 Tm [<09C9000F09CD09CA000D>-250<09CA09C809C909D0000E09C809CC000E09CA09CE001B>-335<0026004F00490042004F00440046>-7<0045>-250<0045004600550046>-7<00440055004A0050004F>-250<0042004F0045>-251<005800420053004F004A004F0048>-250<00560054004A004F0048>-250<002D00560042>-250<00440050>-7<00450046>9<000F>]TJ -1 0 0 1 36 76.423 Tm [<09C9000F09CD09C8000F09CD000D>-250<09CA09C809C909D0000E09C809CC000E09C909C9001B>-333<002E004A004F00500053>-250<004300560048>-250<0939005900460054>-250<0009>16<00450050>-6<00440054>-250<0042004F0045>-250<00440050>-7<00450046>-250<0045004A0054004200480053>7<0046>-6<0046>-7<0045000A000F>]TJ -1 0 0 1 36 61.629 Tm [<09C9000F09CD09C8000D>-250<09CA09C809C909D0000E09C809CB000E09CA09D0001B>-333<002A004E00510053>7<0050>7<0057>8<0046>-6<0045>-250<004A004E004200480046>-250<00490042004F0045004D004A004F0048>-250<00440050004E004E0042004F00450054000D>-250<00540042004F00450043>-10<0050>6<0059000F>]TJ -0 g 0 G -/F95 10.44878 Tf -1 0 0 1 186.571 39.437 Tm [<0013>]TJ -0 g 0 G -ET - -endstream -endobj -14 0 obj -<< /Type /Page /Contents 15 0 R /Resources 13 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 12 0 R >> -endobj -13 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R /F99 11 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -18 0 obj -<< /Length 8644 >> -stream -0 g 0 G -0 g 0 G -BT -/F95 13.62884 Tf -1 0 0 1 54 553.937 Tm [<0016000F>-333<0027>58<0022>34<00320054>]TJ -0 g 0 G -0 g 0 G -/F95 11.3574 Tf -1 0 0 1 54 535.054 Tm [<0032>29<000F>-607<00240042004F>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<0043>-10<0046>-250<005600540046>-7<0045>-250<004700500053>-250<0026000E0043>-10<0050>-7<0050004C00540020>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 520.259 Tm [<0022000F>]TJ -0.997 0 0 1 71.036 520.259 Tm [<002F0050>10<000F>-333<0022004F0045000D>-251<0055004900420055>-250<004700460042005500560053>7<0046>-249<0058004A004D004D>-250<004F0046>6<0057>9<00460053>-250<0043>-10<0046>-250<0042004500450046>-7<0045000D>-250<00420054>-251<005500490046>-250<00550046>-7<00440049004F0050004D00500048005A>-250<004A0054>]TJ -1 0 0 1 71.036 505.465 Tm [<004A004F004900460053>8<0046004F0055004D005A>-250<004A004F00440050004E005100420055004A0043004D0046>10<000F>-333<0022>-250<0058>7<00500053>8<0045>-249<00510053>7<0050>-6<004400460054005400500053>-250<004A0054>-250<005A>7<005000560053>-249<00470053004A0046004F0045000F>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 490.67 Tm [<0032>29<000F>-607<0038004900420055>-250<0049004200510051>-7<0046004F0046>-7<0045>-250<00550050>-250<093A0050004200550054>-250<0042004F0045>-250<004D004A0054005500540020>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 475.875 Tm [<0022000F>-585<003600540046>-250<005500490046>-250<004F0046>7<0058>-250<004A004E004200480046>-250<00440050004E004E0042004F00450054000D>-250<00500053>-250<00540042004F00450043>-10<0050>7<0059>-250<004E0050>-7<00450046>10<000F>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 461.081 Tm [<0032>29<000F>-607<002E005A>-250<0055004900460054004A0054>-250<004200450057004A005400500053>-250<00550050004D0045>-250<004E004606DA>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 446.286 Tm [<0022000F>]TJ -1.02 0 0 1 71.036 446.286 Tm [<0034005500500051>-315<0053004A004800490055>-316<0055004900460053>7<0046>10<000F>-537<00350049004A0054>-315<00450050>-7<00440056004E0046004F0055>-316<0044004D004200540054>-316<004A0054>-315<0057>7<00460053>-14<005A>-316<0045004A093800460053>7<0046004F0055>-314<00470053>7<0050004E>]TJ -1 0 0 1 71.036 431.492 Tm [<0042004F005A00550049004A004F0048>-250<005600540046>-7<0045>-250<004700500053>-250<005500490046005400460054>-250<0042004F0045>-250<00500055004900460053>-250<00420044004200450046004E004A0044>-250<005100560043004D004A004400420055004A0050004F0054000F>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 416.697 Tm [<0032>29<000F>-607<002A0047>-250<002A>-250<005600540046>-250<0035004A004C003B>-250<004700500053>-250<00270046>7<005A004F004E0042004F>-250<0045004A0042004800530042004E0054000D>-250<005500490046004F06DA>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 401.903 Tm [<0022000F>-585<00280050>-250<004200580042005A>59<000F>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 387.108 Tm [<0032>29<000F>-607<002900420054>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<0046>7<0057>8<00460053>-250<0043>-10<0046>-7<0046004F>-250<005600540046>-7<0045>-250<004700500053>-250<0042004F>-250<00420044005500560042004D>-250<004F0050>7<0057>8<0046004D0020>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 372.314 Tm [<0022000F>]TJ -1.02 0 0 1 71.036 372.314 Tm [<003A>71<00460054>-291<004A004F00450046>-7<0046>-7<00450002>-466<002A004F>-291<0022>33<00560048005600540055>-290<09CA09C809C909CF>-292<005500490046>-291<004200560055004900500053>-292<005100560043004D004A005400490046>-7<0045>-291<0042>-291<00440050004E0051004D004600550046>]TJ -0.98 0 0 1 71.036 357.519 Tm [<004F0050>7<0057>8<0046004D000D>-253<004A004F0044004D00560045004A004F0048>-253<004A00550054>-253<00440050>6<0057>8<00460053>62<000D>-253<00560054004A004F0048>-254<00550049004A0054>-253<00450050>-7<00440056004E0046004F0055>-254<0044004D004200540054000F>-339<0022004D004E005000540055>-254<0042004D004D>]TJ -0.995 0 0 1 71.036 342.725 Tm [<00500047>-252<005500490046>-251<00540046005500560051>-252<005600540046>-8<0045>-252<00450046004700420056004D00550054000F>-337<003500490046>-252<0939004D00460054>-252<000900550046>7<005900550043004D0050>-7<0044004C>-252<0042004F0045>-251<00440050>6<0057>8<00460053>17<000A>-251<0058>8<00460053>8<0046>]TJ -0.98 0 0 1 71.036 327.93 Tm [<005400560043004E004A005500550046>-7<0045>-252<00550050>-251<0042>-252<004E0042004B00500053>-252<0022004E00460053004A00440042004F>-252<0031>24<000F>11<0030>30<000F0025>30<000F>-251<005400460053>-15<0057004A00440046>-252<004A004F>]TJ -/F95 11.3574 Tf -0.98 0 0 1 293.018 327.93 Tm [<00310025002700100039>24<000E00120042001B0013001100110012>]TJ -/F95 11.3574 Tf -1.02 0 0 1 71.036 313.136 Tm [<004700500053004E00420055000D>-261<005500490046004F>-258<0046004D0046>-7<004400550053>7<0050004F004A00440042004D004D005A>-258<0053>7<0046>7<0057004A0046>7<0058>8<0046>-6<0045>-258<0042004F0045>-259<0042004400440046005100550046>-7<0045>]TJ -/F99 11.3574 Tf -1.02 0 0 1 310.307 313.136 Tm [<0050004F>-258<005500490046>-258<084A005300540055>]TJ -1.02 0 0 1 71.036 298.341 Tm [<0042005500550046004E00510055000F>]TJ -/F95 11.3574 Tf -1.02 0 0 1 115.412 298.341 Tm [<0022>-313<00510053004A004F00550046>-7<0045>-313<004400500051>6<005A>-313<005800420054>-313<004A004F>-313<005500490046>-314<00420056005500490050005306DF0054>-313<00490042004F00450054>-313<0058004A00550049004A004F>-314<0042>]TJ -1 0 0 1 70.616 283.547 Tm [<0058>8<0046>-7<0046004C000F>-333<002B005600540055>-250<004D004A004C0046>-250<0055004900420055000F>-333<0035>62<0050>-6<0050004C>-250<004E0050004F005500490054>-250<00550050>-250<00580053004A00550046>9<000D>-249<00500047>-250<004400500056005300540046>9<000F>]TJ -1 0 0 1 88.072 268.752 Tm [<00360051>-7<0045004200550046001B>-333<00340046>6<0057>8<004600530042004D>-249<00500055004900460053>-250<0042005600550049005000530054>-250<0053>7<00460051>-6<005000530055>-250<0054005600440044004600540054000F>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 253.958 Tm [<0032>29<000F>]TJ -1.009 0 0 1 71.036 253.958 Tm [<003800490046004F>-247<002A>-247<0058>7<0050004C0046>-247<00560051>-247<00550049004A0054>-247<004E00500053004F004A004F0048000D>-248<004E005A>-247<0049004600420045>-248<00470046004D0055>-247<004D004A004C0046>-248<0042>-247<00550050>-7<00450045004D00460053>-247<004900420045>]TJ -1.011 0 0 1 71.036 239.163 Tm [<0043>-10<0046>-7<0046004F>-247<0051>-7<00500056004F0045004A004F0048>-247<004A0055>-247<004A004F>-247<0042>-247<00540042004F00450043>-10<0050>6<0059000F>-329<002A>-247<0053>7<0050004D004D0046>-6<0045>-247<0050>6<0057>8<00460053>-246<0042004F0045>-247<004D0050>-7<0050004C0046>-7<0045>-247<00420055>-248<005500490046>]TJ -0.98 0 0 1 71.036 224.369 Tm [<004E00560048>-234<0054004900500055>-234<0050004F>-235<005500490046>-234<00580042004D004D000F>-333<002A0055>-235<005800420054>-234<0042>-235<0058>8<0050004E0042004F>-234<004A004F>-234<004900460053>-234<0047005000530055004A00460054>-235<0058004A00550049>-234<0042>-235<0045005300560048>]TJ -1.02 0 0 1 71.036 209.574 Tm [<004900420043004A0055>-264<0055004900420055>-265<005800420054>-265<004300420045000D>-269<0042004F0045>-265<0042004F>-264<004200550055004A0055005600450046>-265<0055004900420055>-265<005800420054>-264<0046>6<0057>8<0046004F>-264<0058>7<0050005300540046>10<000F>-384<003400490046>]TJ -0.98 0 0 1 71.036 194.779 Tm [<004900420045>-231<00540046>-7<0046004F>-231<0043>-10<00460055005500460053>-232<00450042005A0054000D>-235<004D004A004C0046>-232<005500490046>-231<0055004A004E0046>-231<002A>-231<00550050>-7<0050004C>-231<004900460053>-231<00550050>-231<005500490046>-231<0046004A0048004900550049>-232<00480053004200450046>]TJ -1.017 0 0 1 71.036 179.985 Tm [<00540050>-7<0044004C>-246<004900500051>9<000F>-329<003500490046004F>-246<002A>-247<004800500055>-247<00560051>10<000D>-246<00580042005400490046>-7<0045000D>-247<0042004F0045>-246<004500530042004800480046>-7<0045>-247<004E005A>-247<004D0050004F0046004D005A>-246<0043005600550055>]TJ -0.98 0 0 1 71.036 165.19 Tm [<00450050>7<0058004F>-240<00550050>-241<005500490046>-241<0050004F0046000E004E0042004F>-242<0045004600550046>-7<00440055004A0057>8<0046>-241<004200480046004F0044005A>-241<0055004900420055>-241<002A>-241<004B0050004C004A004F0048004D005A>-241<00440042004D004D0046>-7<0045>-241<004E005A>]TJ -1 0 0 1 71.036 150.396 Tm [<004E00460042004F0054>-250<00500047>-250<004D004A0057004A004F0048000F>-333<003A>70<00500056>-249<004C004F0050>6<0058>-249<0058004900420055>-250<002A>-250<004E00460042004F0020>]TJ -0 g 0 G -0 g 0 G -1 0 0 1 54 135.601 Tm [<0022000F>-585<003A>71<004600420049000F>-333<00340055004A0044004C>-250<0058004A00550049>-250<004E0046>9<000D>-249<004C004A0045000F>-333<00350049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<004A0054>-250<004700500053>-250<005A>7<00500056000F>]TJ -0 g 0 G -/F95 10.44878 Tf -1 0 0 1 204.571 39.437 Tm [<0014>]TJ -0 g 0 G -ET - -endstream -endobj -17 0 obj -<< /Type /Page /Contents 18 0 R /Resources 16 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 12 0 R >> -endobj -16 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R /F99 11 0 R >> /ProcSet [ /PDF /Text ] >> -endobj -21 0 obj -<< /Length 32 >> -stream -0 g 0 G -0 g 0 G -0 g 0 G -0 g 0 G - -endstream -endobj -20 0 obj -<< /Type /Page /Contents 21 0 R /Resources 19 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612] - -/TrimBox[0 0 396 612] /Parent 12 0 R >> -endobj -19 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet [ /PDF ] >> +<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R /F97 9 0 R /F98 10 0 R >> /ProcSet [ /PDF /Text ] >> endobj 1 0 obj <<>> @@ -325,35 +133,34 @@ endobj 3 0 obj << /pgfprgb [/Pattern /DeviceRGB] >> endobj -22 0 obj -[ 13 [ 219 ] 15 [ 219 ] 66 [ 486 ] 68 [ 389 489 401 314 ] 73 [ 519 ] 77 [ 266 783 518 447 489 ] 83 [ 357 353 307 ] 87 [ 472 ] 89 [ 475 ] 2122 [ 564 ] ] +12 0 obj +[ 70 [ 401 ] 77 [ 266 ] 79 [ 518 447 ] 85 [ 307 ] 87 [ 472 ] ] endobj -24 0 obj -<< /Length 266 >> +14 0 obj +<< /Length 11 >> stream - + endstream endobj -25 0 obj -<< /Subtype /CIDFontType0C /Length 3317 >> +15 0 obj +<< /Subtype /CIDFontType0C /Length 1211 >> stream - -= =N‹½ø콋½ø$½‹øˆùPüˆÛý ÷>÷“÷>û“üø¿÷>û“û>û“÷z÷“÷>÷“ü’û\÷Àû>÷“÷èûêû÷w÷»É¸sšž† ›‡š‡yoX\V ˆ‚Žƒ“…÷ §å¿³t£lmnxl ûê€õÊ÷ -Óyåûû;<û1û Þ“å²÷&õ©›{oš —rŽfmc…5fS `ocyen`±ô Cû}ÿ + +Óyåûû;<û1û Þ“å²÷&õ©›{oš —rŽfmc…5fS `ocyen`±ô û’Çdvø$²ñÚp÷NøAVˆxŠ„ƒ‰ƒŠˆˆ‰‰Ž‹Ž ÑNû¤„k„lxgª¸Í´É °˜ˆ„‘W]y{ˆ—”ŽŸ“ Æ÷›í—”¥€“(•¸ž”¨—œƒ•kg^f 2”vøÝ‹wÝøI)íCÓ°÷Å×i÷}è}°fjQPVh Г„–Š¦§¢ ž•z_“ µûˆ_“•w™–˜› ž ª±»š ¨ ©¹È§Íš®—¯¯§~ždnz~s…Ž‡ ¤št‘v{_f=eX °~zg\}€ × øÅ endstream endobj -23 0 obj -<< /Type /FontDescriptor /FontName /LMQEIT+LibertinusSerif-Italic /Flags 4 /FontBBox [ -1325 -312 1389 928 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle -12 /StemV 73 /XHeight 429 /FontFile3 25 0 R /CIDSet 24 0 R >> +13 0 obj +<< /Type /FontDescriptor /FontName /MYLNXL+LibertinusSerif-Italic /Flags 4 /FontBBox [ -1325 -312 1389 928 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle -12 /StemV 73 /XHeight 429 /FontFile3 15 0 R /CIDSet 14 0 R >> endobj -26 0 obj -<< /Length 974 >> +16 0 obj +<< /Length 787 >> stream %!PS-Adobe-3.0 Resource-CMap %%DocumentNeededResources: ProcSet (CIDInit) %%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-LMQEIT-LibertinusSerif-Italic-0) -%%Title: (TeX-LMQEIT-LibertinusSerif-Italic-0 TeX LMQEIT-LibertinusSerif-Italic 0) +%%BeginResource: CMap (TeX-MYLNXL-LibertinusSerif-Italic-0) +%%Title: (TeX-MYLNXL-LibertinusSerif-Italic-0 TeX MYLNXL-LibertinusSerif-Italic 0) %%Version: 1.000 %%EndComments /CIDInit /ProcSet findresource begin @@ -361,36 +168,23 @@ stream begincmap /CIDSystemInfo << /Registry (TeX) -/Ordering (LMQEIT-LibertinusSerif-Italic) +/Ordering (MYLNXL-LibertinusSerif-Italic) /Supplement 0 >> def -/CMapName /TeX-Identity-LMQEIT-LibertinusSerif-Italic def +/CMapName /TeX-Identity-MYLNXL-LibertinusSerif-Italic def /CMapType 2 def 1 begincodespacerange <0000> <FFFF> endcodespacerange 0 beginbfrange endbfrange -19 beginbfchar -<000D> <002C> -<000F> <002E> -<0042> <0061> -<0044> <0063> -<0045> <0064> +6 beginbfchar <0046> <0065> -<0047> <0066> -<0049> <0068> <004D> <006C> -<004E> <006D> <004F> <006E> <0050> <006F> -<0051> <0070> -<0053> <0072> -<0054> <0073> <0055> <0074> <0057> <0076> -<0059> <0078> -<084A> <00660069> endbfchar endcmap CMapName currentdict /CMap defineresource pop @@ -401,43 +195,44 @@ end endstream endobj -11 0 obj -<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /LMQEIT+LibertinusSerif-Italic /DescendantFonts [ 27 0 R ] /ToUnicode 26 0 R >> +10 0 obj +<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /MYLNXL+LibertinusSerif-Italic /DescendantFonts [ 17 0 R ] /ToUnicode 16 0 R >> endobj -27 0 obj -<< /Type /Font /Subtype /CIDFontType0 /BaseFont /LMQEIT+LibertinusSerif-Italic /FontDescriptor 23 0 R /W 22 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> +17 0 obj +<< /Type /Font /Subtype /CIDFontType0 /BaseFont /MYLNXL+LibertinusSerif-Italic /FontDescriptor 13 0 R /W 12 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> endobj -28 0 obj -[ 27 [ 256 ] 32 [ 430 ] 37 [ 734 ] 56 [ 1028 ] 66 [ 506 ] 68 [ 456 561 489 ] 73 [ 619 322 ] 78 [ 905 616 551 581 ] 83 [ 428 427 358 598 ] ] +18 0 obj +[ 27 [ 256 ] 32 [ 430 ] 37 [ 734 ] 47 [ 740 ] 56 [ 1028 ] 66 [ 506 ] 68 [ 456 561 489 ] 73 [ 619 322 ] 78 [ 905 616 551 581 ] 83 [ 428 427 358 598 ] 88 [ 777 ] ] endobj -30 0 obj -<< /Length 11 >> +20 0 obj +<< /Length 12 >> stream - + endstream endobj -31 0 obj -<< /Subtype /CIDFontType0C /Length 3010 >> +21 0 obj +<< /Subtype /CIDFontType0C /Length 3373 >> stream - -„3ÈÅ<çZUõFêlñ ‚ -#V‹½ø콋½ø$½‹øˆùPüˆÛý ÷>÷“÷>û“üø¿÷>û“û>û“÷z÷“÷>÷“ü’û\÷Àû>÷“÷èû½ƒ÷ ÷3÷ Ç÷&ÇÇe«m³³«±²k©ccikd ÷¾e«m³³«±²k©ccikd û÷ ø¯¥÷|÷& ÌÈ÷ä÷øΧ®£·Ã£WQYwfhl ÌDJ‹Rb|u‘¥¨”¤ ˜Ó®¦§Ÿ ½°Ê¹ÕçDÈû àN]}rm ioxthe¬w£©¢›¤ 䦂‘ Ð…ü”e«m³³«±²k©ccikd ÷I‰µøȵ÷÷ ÷÷+÷M³Ý‰³ãî¡ÉÒ »µ¬Þñ÷Mû ÷,ûŠ VaŠccû‹ …‹u•…ˆ§‡8ü%8o‡Tˆ …‹u•…‹÷³ Ð÷ ø.Â¥Ÿ¯÷Y¡û=û+ûJûM?Eq—Î øo”vùw¢‘úû9÷9ÐøÓøùx‡o‹~û#ü'„q«°û÷ù¬¯»Ž‘‘‹¡…‘fŠ'ŠdbSŒf $……‹u‘…²‡¯„š`÷Pü¸v’š‰–•› “ ÷*ø#÷-ü#x’–‡š˜™’ ÷Pø”¨ Ƴ§·Ž‘‘‹¡…‘jŠiŠhb\Œf $……‹u‘…Ä‚žvfûûäg|µ\ÇOÑ÷êµ·÷ %÷÷ + +„5äyËví˜ ¦÷› ¢ +3 +Ô †V‹½ø콋½ø$½‹øˆùPüˆÛý ÷>÷“÷>û“üø¿÷>û“û>û“÷z÷“÷>÷“ü’û\÷Àû>÷“÷èû½ƒ÷ ÷3÷ Ç÷&ÇÇe«m³³«±²k©ccikd ÷¾e«m³³«±²k©ccikd û÷ ø¯¥÷|÷& ÌÈ÷ä÷øΧ®£·Ã£WQYwfhl ÌDJ‹Rb|u‘¥¨”¤ ˜Ó®¦§Ÿ ½°Ê¹ÕçDÈû àN]}rm ioxthe¬w£©¢›¤ 䦂‘ Ð…ü”e«m³³«±²k©ccikd ÷I‰µøȵ÷÷ ÷÷+÷M³Ý‰³ãî¡ÉÒ »µ¬Þñ÷Mû ÷,ûŠ VaŠccû‹ …‹u•…ˆ§‡8ü%8o‡Tˆ …‹u•…‹÷³ Ð÷ ø.Â¥Ÿ¯÷Y¡û=û+ûJûM?Eq—Î ÷O”vªv¢vøù÷½ø3½œù <‹†Òªø.äœÑ’ ‘‘‹¡…‘ZŠzŠa^vŒY $……‹u‘…Ñ„œˆ0ûr~}œ û÷Ì2ôû7……‹u‘…¶ˆ©i‘qü5\2z†E„ ……‹u‘…¼ŒžŒ··Š½ $‘‘‹¡…‘E’zŽæ÷½••‘“„~– œ÷ãü"ŸrŸx‹®•Ž” øo”vùw¢‘úû9÷9ÐøÓøùx‡o‹~û#ü'„q«°û÷ù¬¯»Ž‘‘‹¡…‘fŠ'ŠdbSŒf $……‹u‘…²‡¯„š`÷Pü¸v’š‰–•› “ ÷*ø#÷-ü#x’–‡š˜™’ ÷Pø”¨ Ƴ§·Ž‘‘‹¡…‘jŠiŠhb\Œf $……‹u‘…Ä‚žvfûûäg|µ\ÇOÑ÷êµ·÷ %÷÷ ÷´÷»¼b’¦y·Â² ®° l‰—‡““~‡xu…¼ ÷$÷$2¨9BûaIo—u²¯¥¡£Š‘Š‘ ‰•‰••–Œ“—¬µ®yû Hv´"jAn<F±gâ¨Å«¥¬ Œ÷>ûwrr{y`|¨ª°ŽªÒ¢ *Ó÷èµ°÷ø:â—‰ž€ fcixn@PÁ÷ ÷¤ÂÀ°šdkŽ pŽ¦w««¢¤ª¸UÆûû -#,û(J¢R²f f²¹|ÒÇе± “Í÷îµ€w÷¤˜‹w°÷ ÷B÷Î÷÷»sz‹Œ“†™°•Ç™Ð”‘‰Ÿ‰‘U€›ÄøV¶ÌŽ°‹ ”„‚ f;€DˆˆŒ~‚ʆŠFûΑxsnûûûûP F¼e o¯¤}æշ™ ‘ºzvVuYdÃ÷ À‘¹žª ¦œ¦›©¥¤ˆj£ ûŠƒ‹‚Œƒ Ká÷3³÷µ°÷û÷ ÷ ÷ìøC÷abU€eô=[¸í ’Œ÷„£œ™àjèû' ì"û .û-Q N¶d i±¼{ÒÐϮԽ ˜† û’÷&Œ®±™Ÿ£›¦•–¦°q;…‹~‰‰ ÍžvøÕ÷…˜‹wï÷÷<÷Üø¤÷÷0÷\½5fDfhR ÷gìÌŽ°‹ ”„‚ f;€DˆˆŒ€‚ʆŠFüJ8{‚Nˆ ……‹u‘…µŒ¸ŒÂ»ªŠ¶ $‘‘‹¡…‘aŽ|”Þ÷a¥µ¬—³®yR û;7{‚bˆ ……‹u‘…µŒ«Œ»Â·Š¶ $‘‘‹¡…‘ÜNŽ{”ßû{žvøRwõ÷ñ÷÷|÷÷[½Ã‹ –‚‘} o€:ƒF‚‰…w…†•ƒRûT8€‰N† ……‹u‘…µŒµŒÀÀ´Š¶ $‘‘‹¡…‘N€ŽÞûønj£j³¸¥¯¥©t¯a\tkm ÷ôžvøÕzœí÷÷5÷÷5÷ Ü÷x÷÷[‹£²®•œ³©yR û;7{‚bˆ ……‹u‘…µŒ«Œ»»ªŠ¶ $‘‘‹¡…‘cŽz”ß÷0¤ŠŸˆ• ž±¶—›³§yR û;7{‚bˆ ……‹u‘…µŒ«Œ»Â·Š¶ $‘‘‹¡…‘NŽ{”ß÷0÷c½5f7ckQ ¶|c¨PgCekR ¼ˆ©ˆ¢‹Ü—Šƒ}fO}F‚‰…w…†•ƒRûO8€‰N† ……‹u‘…µŒµŒÀ¹§Š¶ $‘‘‹¡…‘aŽÞÊžvøÕí÷÷<÷÷x÷÷]¦³³Ÿ³©yR û;7{‚bˆ ……‹u‘…µŒ«Œ»Â·Š¶ $‘‘‹¡…‘NŽ{”ß÷0÷\½5cD_eT ˆ®‡©‹—Šƒ}fO}F‚‰…w…†•ƒRûO8€‰N† ……‹u‘…µŒµŒÀ¹§Š¶ $‘‘‹¡…‘aŽÞ‰µøµ°÷ ÷Y÷ °÷cûó5÷ÒÆŸ°´ ¾¸œÏÃ÷2ìû)8Mn^d e_zOP÷s÷WϹ:û û \kg9k÷Õç›ÜÎ §ûiv÷tµ÷íÎê÷÷F÷ ê÷Éü78€‰N† ……‹u‘…µŒµŒÀÀ´Š¶ $‘‘‹¡…‘N€ŽÞ÷ €¡ …£÷,îï÷'ÃvÉd² ®hYšWnUhkh …‰§ˆ¡‹—Šƒ}fO}F‚‰…w…†•ƒR÷ûˆ÷”‘‹‘¥¨°˜¢´»Yû 7m-4€r‘¦r ûžv÷Ò÷í÷÷x÷ ¯–š˜š •“”’š”–‚“ ƒ’œƒ¢¨§©µ¥m©ghemI] ‡‰©†¼‹”Šƒ“}\V}I„‰…x…†•‚RûO8€‰N† ……‹u‘…µŒµŒÀÀ´Š¶ $‘‘‹¡…‘N€ŽÞû²ø µÊ÷à÷»÷&Z\“e…žË{ÃØëµâƒ¦t¤ o«a¤]Ÿcœ}«¨¢žž¨®kN¤ ˆ–Œ•’¯‡±‚« ™kr•TVYwkk tt€opm—sžv ªiÂh©}³y–gskkzp^[¹Ôv {ŽƒŠ{‡ûWÑ÷ؽ÷'”ã÷û÷û÷ðÊøF}|‡€~ n†ŒŠ ̉&ŠûYh”i y x¢¯‚£Âȧ§Ÿ —…‘• ~r‡xuuœ½ ½Šöïð•™” ªˆ† äû ŒÎŽ¹‹‘ˆŽ† è„f€„{ z„n…„‚„‚‡p;¸Õøwä÷÷5÷ø’÷÷Aߣœ‡–…‘ yŠwŠxoJŒd $……‹u‘…¾†›„7ûM‹Œ rbj‰ycmÑ ÷;ߣœ‡–…‘ yŠvŠyXeŒ` $……‹u‘…¹‰ 7û0!µUá¯Ô¨«Å rx‹Œ“†™°•Ç™Ð”‘‰Ÿ‰‘U€›Ä +#,û(J¢R²f f²¹|ÒÇе± “Í÷îµ€w÷¤˜‹w°÷ ÷B÷Î÷÷»sz‹Œ“†™°•Ç™Ð”‘‰Ÿ‰‘U€›ÄøV¶ÌŽ°‹ ”„‚ f;€DˆˆŒ~‚ʆŠFûΑxsnûûûûP F¼e o¯¤}æշ™ ‘ºzvVuYdÃ÷ À‘¹žª ¦œ¦›©¥¤ˆj£ ûŠƒ‹‚Œƒ Ká÷3³÷µ°÷û÷ ÷ ÷ìøC÷abU€eô=[¸í ’Œ÷„£œ™àjèû' ì"û .û-Q N¶d i±¼{ÒÐϮԽ ˜† û’÷&Œ®±™Ÿ£›¦•–¦°q;…‹~‰‰ ÍžvøÕ÷…˜‹wï÷÷<÷Üø¤÷÷0÷\½5fDfhR ÷gìÌŽ°‹ ”„‚ f;€DˆˆŒ€‚ʆŠFüJ8{‚Nˆ ……‹u‘…µŒ¸ŒÂ»ªŠ¶ $‘‘‹¡…‘aŽ|”Þ÷a¥µ¬—³®yR û;7{‚bˆ ……‹u‘…µŒ«Œ»Â·Š¶ $‘‘‹¡…‘ÜNŽ{”ßû{žvøRwõ÷ñ÷÷|÷÷[½Ã‹ –‚‘} o€:ƒF‚‰…w…†•ƒRûT8€‰N† ……‹u‘…µŒµŒÀÀ´Š¶ $‘‘‹¡…‘N€ŽÞûønj£j³¸¥¯¥©t¯a\tkm ÷ôžvøÕzœí÷÷5÷÷5÷ Ü÷x÷÷[‹£²®•œ³©yR û;7{‚bˆ ……‹u‘…µŒ«Œ»»ªŠ¶ $‘‘‹¡…‘cŽz”ß÷0¤ŠŸˆ• ž±¶—›³§yR û;7{‚bˆ ……‹u‘…µŒ«Œ»Â·Š¶ $‘‘‹¡…‘NŽ{”ß÷0÷c½5f7ckQ ¶|c¨PgCekR ¼ˆ©ˆ¢‹Ü—Šƒ}fO}F‚‰…w…†•ƒRûO8€‰N† ……‹u‘…µŒµŒÀ¹§Š¶ $‘‘‹¡…‘aŽÞÊžvøÕí÷÷<÷÷x÷÷]¦³³Ÿ³©yR û;7{‚bˆ ……‹u‘…µŒ«Œ»Â·Š¶ $‘‘‹¡…‘NŽ{”ß÷0÷\½5cD_eT ˆ®‡©‹—Šƒ}fO}F‚‰…w…†•ƒRûO8€‰N† ……‹u‘…µŒµŒÀ¹§Š¶ $‘‘‹¡…‘aŽÞ‰µøµ°÷ ÷Y÷ °÷cûó5÷ÒÆŸ°´ ¾¸œÏÃ÷2ìû)8Mn^d e_zOP÷s÷WϹ:û û \kg9k÷Õç›ÜÎ §ûiv÷tµ÷íÎê÷÷F÷ ê÷Éü78€‰N† ……‹u‘…µŒµŒÀÀ´Š¶ $‘‘‹¡…‘N€ŽÞ÷ €¡ …£÷,îï÷'ÃvÉd² ®hYšWnUhkh …‰§ˆ¡‹—Šƒ}fO}F‚‰…w…†•ƒR÷ûˆ÷”‘‹‘¥¨°˜¢´»Yû 7m-4€r‘¦r ûžv÷Ò÷í÷÷x÷ ¯–š˜š •“”’š”–‚“ ƒ’œƒ¢¨§©µ¥m©ghemI] ‡‰©†¼‹”Šƒ“}\V}I„‰…x…†•‚RûO8€‰N† ……‹u‘…µŒµŒÀÀ´Š¶ $‘‘‹¡…‘N€ŽÞû²ø µÊ÷à÷»÷&Z\“e…žË{ÃØëµâƒ¦t¤ o«a¤]Ÿcœ}«¨¢žž¨®kN¤ ˆ–Œ•’¯‡±‚« ™kr•TVYwkk tt€opm—sžv ªiÂh©}³y–gskkzp^[¹Ôv {ŽƒŠ{‡ûWÑ÷ؽ÷'”ã÷û÷û÷ðÊøF}|‡€~ n†ŒŠ ̉&ŠûYh”i y x¢¯‚£Âȧ§Ÿ —…‘• ~r‡xuuœ½ ½Šöïð•™” ªˆ† äû ŒÎŽ¹‹‘ˆŽ† è„f€„{ z„n…„‚„‚‡p;¸Õøwä÷÷5÷ø’÷÷Aߣœ‡–…‘ yŠwŠxoJŒd $……‹u‘…¾†›„7ûM‹Œ rbj‰ycmÑ ÷;ߣœ‡–…‘ yŠvŠyXeŒ` $……‹u‘…¹‰ 7û0!µUá¯Ô¨«Å rx‹Œ“†™°•Ç™Ð”‘‰Ÿ‰‘U€›Ä÷t”vø2•÷fø.÷ øv÷ßx»·‹yŠx‹x,ûœˆ„‡‰‡•R÷>ŠŽŠŠŽ}µ…›Æ‘‘‹¡…‘fŠ`ŠXhXŒf $……‹u‘…Å„ŽxžX÷ûÐx’˜‰˜•ž “ é÷‹ëûy’žˆ˜•œŽŸ“ ÷÷Åœ¶œ±Ã‘‘‹¡…‘uŠyŠqf`Œf $……‹u‘…Á‡qxZQû2‡…Œ‡• ÷ ÷•
ø½ endstream endobj -29 0 obj -<< /Type /FontDescriptor /FontName /VDIGQQ+LibertinusSerif-Bold /Flags 4 /FontBBox [ -1625 -328 1562 1014 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle 0 /StemV 81 /XHeight 433 /FontFile3 31 0 R /CIDSet 30 0 R >> +19 0 obj +<< /Type /FontDescriptor /FontName /TBQIGK+LibertinusSerif-Bold /Flags 4 /FontBBox [ -1625 -328 1562 1014 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle 0 /StemV 81 /XHeight 433 /FontFile3 21 0 R /CIDSet 20 0 R >> endobj -32 0 obj -<< /Length 946 >> +22 0 obj +<< /Length 974 >> stream %!PS-Adobe-3.0 Resource-CMap %%DocumentNeededResources: ProcSet (CIDInit) %%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-VDIGQQ-LibertinusSerif-Bold-0) -%%Title: (TeX-VDIGQQ-LibertinusSerif-Bold-0 TeX VDIGQQ-LibertinusSerif-Bold 0) +%%BeginResource: CMap (TeX-TBQIGK-LibertinusSerif-Bold-0) +%%Title: (TeX-TBQIGK-LibertinusSerif-Bold-0 TeX TBQIGK-LibertinusSerif-Bold 0) %%Version: 1.000 %%EndComments /CIDInit /ProcSet findresource begin @@ -445,20 +240,21 @@ stream begincmap /CIDSystemInfo << /Registry (TeX) -/Ordering (VDIGQQ-LibertinusSerif-Bold) +/Ordering (TBQIGK-LibertinusSerif-Bold) /Supplement 0 >> def -/CMapName /TeX-Identity-VDIGQQ-LibertinusSerif-Bold def +/CMapName /TeX-Identity-TBQIGK-LibertinusSerif-Bold def /CMapType 2 def 1 begincodespacerange <0000> <FFFF> endcodespacerange 0 beginbfrange endbfrange -18 beginbfchar +20 beginbfchar <001B> <003A> <0020> <003F> <0025> <0044> +<002F> <004E> <0038> <0057> <0042> <0061> <0044> <0063> @@ -474,69 +270,7 @@ endbfrange <0054> <0073> <0055> <0074> <0056> <0075> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - -endstream -endobj -10 0 obj -<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /VDIGQQ+LibertinusSerif-Bold /DescendantFonts [ 33 0 R ] /ToUnicode 32 0 R >> -endobj -33 0 obj -<< /Type /Font /Subtype /CIDFontType0 /BaseFont /VDIGQQ+LibertinusSerif-Bold /FontDescriptor 29 0 R /W 28 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> -endobj -34 0 obj -[ 374 [ 2000 ] ] -endobj -36 0 obj -<< /Length 47 >> -stream - -endstream -endobj -37 0 obj -<< /Subtype /CIDFontType0C /Length 472 >> -stream - -¯ -¯ Ú Ú’
-endstream -endobj -35 0 obj -<< /Type /FontDescriptor /FontName /ETXLAD+NovelDeco /Flags 4 /FontBBox [ -392 -234 1985 838 ] /Ascent 894 /CapHeight 537 /Descent -246 /ItalicAngle 0 /StemV 61 /XHeight 429 /FontFile3 37 0 R /CIDSet 36 0 R >> -endobj -38 0 obj -<< /Length 652 >> -stream -%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-ETXLAD-NovelDeco-0) -%%Title: (TeX-ETXLAD-NovelDeco-0 TeX ETXLAD-NovelDeco 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (ETXLAD-NovelDeco) -/Supplement 0 ->> def -/CMapName /TeX-Identity-ETXLAD-NovelDeco def -/CMapType 2 def -1 begincodespacerange -<0000> <FFFF> -endcodespacerange -0 beginbfrange -endbfrange -1 beginbfchar -<0176> <254C> +<0058> <0077> endbfchar endcmap CMapName currentdict /CMap defineresource pop @@ -548,54 +282,48 @@ end endstream endobj 9 0 obj -<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ETXLAD+NovelDeco /DescendantFonts [ 39 0 R ] /ToUnicode 38 0 R >> +<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /TBQIGK+LibertinusSerif-Bold /DescendantFonts [ 23 0 R ] /ToUnicode 22 0 R >> endobj -39 0 obj -<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ETXLAD+NovelDeco /FontDescriptor 35 0 R /W 34 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> +23 0 obj +<< /Type /Font /Subtype /CIDFontType0 /BaseFont /TBQIGK+LibertinusSerif-Bold /FontDescriptor 19 0 R /W 18 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> endobj -40 0 obj -[ 2 [ 288 ] 9 [ 298 298 ] 13 [ 220 338 220 323 465 465 465 465 465 465 ] 27 [ 236 ] 32 [ 435 ] 34 [ 695 588 646 701 557 485 685 730 297 322 ] 45 [ 528 839 699 702 541 702 587 485 597 661 652 951 660 575 604 ] 66 [ 457 493 428 506 447 310 500 538 271 272 512 264 790 542 504 519 503 372 390 316 531 497 747 490 515 424 ] 1754 [ 742 ] 1759 [ 268 ] 1762 [ 375 375 ] 2360 [ 582 560 540 ] 2504 [ 465 465 465 465 465 465 465 465 465 465 ] ] +24 0 obj +[ 9 [ 298 298 ] 13 [ 220 338 220 323 ] 34 [ 695 588 646 701 557 ] 41 [ 730 297 322 ] 45 [ 528 839 699 702 ] 51 [ 587 ] 53 [ 597 661 652 ] 57 [ 660 ] 66 [ 457 493 428 506 447 310 500 538 271 ] 76 [ 512 264 790 542 504 519 503 372 390 316 531 497 747 490 515 ] 2361 [ 560 ] 2504 [ 465 465 465 465 465 ] 2510 [ 465 ] 2512 [ 465 ] ] endobj -42 0 obj +26 0 obj << /Length 315 >> stream - gþ¿÷ÿð?ÿÿð + endstream endobj -43 0 obj -<< /Subtype /CIDFontType0C /Length 12156 >> +27 0 obj +<< /Subtype /CIDFontType0C /Length 8395 >> stream - - -T -µ # ò œ õ
},ß[ðw÷äõ°Eà‚ÎŽö}xFÇK0Š ‘ W ¦ f ¦ ; ¯![!Ý"ª#©$W$â% %@%¬&'
'Ï( (ã)>)¨*(*¨+!+ƒ+ß,q,ÒU‹½ø龋½ø$½‹øˆùNüˆÛý ÷>÷’÷>û’üø½÷>û’û>û’÷z÷’÷>÷’üû\÷¿û>÷‘÷èûžõøÆwæõ÷$ù&snxUE™h”3 “=‘1v…ŒŽ„••Ž”–Œ ™‹Ç˜÷ + + +4 E à ‚ Î
Ž
ö}xFǬ
Ó"âˆ"·+×Y&%Ó•Ø 3 ÿ ‘U‹½ø龋½ø$½‹øˆùNüˆÛý ÷>÷’÷>û’üø½÷>û’û>û’÷z÷’÷>÷’üû\÷¿û>÷‘÷èû”û`ú#·Þ·÷^û{÷dûH •“’Ž“j±û ÷ ÷›÷›÷ ÷ «¯ ˆ•„’€Œû %.û;ûNû”ùGw÷?Þ÷’÷¸‡÷{ûd÷H ‰ƒ„ˆƒ¬e÷ û û›û›û -û kg Ž’„–Š÷ ñè÷;÷Nûâû÷x÷²óêluvol¥ˆ ž‰œ…tvg]W~ „’„ Ç–Å»ÑÇq²c ûl÷sdz÷–÷£÷s˜™§—•‡• ûo~ty‘‚” ûâõÄõĶn£s¨¨££¨¨s£nnssn û{ùwš÷ª÷¹ùbûýU´2®øº®²â÷eâ÷xØ÷ Ù÷îsà_Å ®qa©U(-û -ûZ ¬'ÂT o§}²øÝœ›…€— ªq¦?û/ˆL}X 9uZ‚y.÷?â÷ŠÈ¹¸ 2‰¬øÕw÷gØ÷´÷÷ïnjȘ ‰‹‡ TiVr3b€”…ž¹¡‘žœŽsi ûÚ8p†Eˆ ……‹v‘…¼Œ¯ŒÁ»£Š½ $‘‘‹ …‘EŽzÞ2‹Ìø’®¿ÞAÖ@â÷BãÌÈøhvžy œ©¡“‰‘‰’ Ô‰’…”“¤¥¯Ô¯¾r+KtWPO ABä)'{[P‹¾« ÷C«¹‰‹ ˜À•ÖŒ©…~‰DzzrgûF»ÐÏ ðìĶ·×÷ -è¤ÅÏ €”†“–÷®œ•¨Ž ‘‘‹£…‘sŠrŠcj\Œ_ $……‹s‘…‡¦‡cû-kiH…Uû27÷=÷÷C÷÷ ÷÷%´85¥ –Š––‰µ†³{Ó•Of®û÷Džv÷×µ÷°wõà÷êàøþ÷ø%ޜю ‘‘‹ …‘bŠXŠef[Œ_ $……‹v‘…шœ†8û4ûê÷4ޜю ‘‘‹ …‘eŠbŠXYbŒe $……‹v‘…шœ†8ü%8z†Eˆ ……‹v‘…·Œ»Œ±¯¼Š· $‘‘‹ …‘EŽzÞ÷[÷êû[8z†Eˆ ……‹v‘…¸Œ»Œ°°»Š· $‘‘‹ …‘EŽzÞû•žvù wõà÷S÷ø%ޜю ‘‘‹ …‘_Š\ŠdjZŒ\ $……‹v‘…шœ†8ü%8z†Eˆ ……‹v‘…¸Œ¼Œ¯¯»Š¸ $‘‘‹ …‘EŽzÞû|û@¸ùy¬÷!à÷vøŸÞœÇŽ ‘‘‹ …‘eŠ`ŠdgVŒY $……‹v‘…Ûˆœ†8üNûHWojx}—š„ —…‚˜r}mvugÀy¡¸ª“®´ ·°Å¿÷#q‹²øôwõà÷)÷i¦ç‰‹ •½•Ì‘¿€‰CwfP!Ldyž¾ ø2ޜю ‘‘‹ …‘^Š\Šeg\Œ] $……‹v‘…шœ†8ü%8z†Eˆ ……‹v‘…Œ²ÄŒ÷±–v¨vø¢÷û÷‹w›÷ -Œ°ø÷1Mù+÷:‡ŠJˆ……‹v‘…°Œ³Œ©©¹Š¬ $‘‘‹ …‘GŽˆ…Þmø9‡Á™Ï‘‘‹ …‘û‰ûhü‡ˆ‡‰‰ˆ“ˆ Kûaøû%……‹v‘…Ї‘‰„@Mcü0…OrR†……‹v‘…©Œ«Œ££³Š© $‘‘‹ …‘I†ªÃ£±ø%÷cü›„Ž‘ƒ‘‘’“ U÷uø¥÷%–v¨vøü¬ñ¼ø)¼xøÀø”ûÛx‹€„‡|°n ûëøGû……‹v‘…¶ˆ©h‘qü52z…E„ ……‹v‘…¶Œ¸Œ£¢¹Šµ $‘‘‹ …‘E’zæ÷Æ‹š“‘–€uœ ¸÷ñüM|–˜‚›™”—ž ø䜑ђ ‘‘‹ …‘bŠ\Šsv]Œ_ $……‹v‘…xÑ„œ‡0÷(¯ø诰ëøIëù.÷Ý÷cû#÷ûGûVûû.ûVûY÷#û÷>÷ã»Ù ³Ä¡Óßûã÷¹÷öûû^ûG5"ûûû÷÷T÷fîàî ~‰¬÷÷†wóà÷uèìóøŸü%8z†Eˆ ……‹v‘…¸Œ¼Œ¯®ÆŠ½ $‘‘‹ …‘=sÞ÷>„¡£ˆ®÷JÂ÷ àÆdöûM eP„cÜfWŒŒc ……‹v‘…ìшœ†8નš®ÓÐÐtûû -÷+x NlT[g`„„…ƒ†ƒ²w—œ˜š˜™•™˜Ž“¶¯xu² pº½pÒʵ¥Ã² z—pugnacŸa ¡\Y¡Q…„‹Š„ ½¯¼ «”ߙζ·Ë³Ä¡Óßûã÷¹÷öûû^ûG5"ûûû÷÷T÷fîàî ¬ª‰v÷¹÷¹†wóà÷lç¶÷Q÷÷=ßž|t™ öûB\¨¶aÇšœ• ’Š”‡“^r¶q û÷f¶™å¿ô½z´g ¸[MŽL\a„gnh\ŒŒ\ ……‹v‘…шœ†8ü%8z†Eˆ ……‹v‘…¸ŒºŒ±±ºŠ· $‘‘‹ …‘¶EŽzÞÞø„ÈÓuû -ûDo* [÷y¨—®Ò F¯~÷/ø\¾Ò÷‚߸ø ù “Qž)&2H!"â[ãi ÇtÕo):^a;.O¶îu x~‰†>q—Z¸Ê§t丶–¡® ů¯ÈËõ;º9ª O¡'±ßþÃÆìªMIŸ –‰˜Œ”’‡»‡§À¶‰¬øÓ²“w÷àÐ÷ò÷øË•±¯ ¡Öºq>œ –™Œ” °„¹†¾Š¸Œ‰Š Јiû†<5°>û -Že ‰‰‰Š ‡^W€[‡•—Š—ÐÛŸ¹¥Í¼°•eN ü8z†;ˆ ……‹v‘…¼Œ¾Œ³±¾Š½ $‘‘‹ …‘;ŽzÞö´øÛ¬âà÷ö¼÷@øŸÞšØŽ ‘‘‹ …‘\ŠZŠddbŒd $……‹v‘…Ljœ†8û¶û`÷dñ÷a¼÷÷F ÷xۜǒ ‘‘‹ …‘eŠbŠtvZŒ] $……‹v‘…Ö„œˆ:ûŠû|ûû=[b¨m Zº‰×Ìí”vù¬Œ÷:÷î÷ øTøúÕ†‹pvUû2ü%‡û4ø+tÇ‘˜Ï’‘‘‹ …‘cŠ^ŠgghŒj $……Œv‘…†“z¦F÷Yü”{‘’„•–’”™‘ ÷cø’žº›²Ê’‘‘‹ …‘mŠhŠtt^Œb $……‹v‘…ø!”vù¬÷4÷B÷ATÂ÷Ä÷ôù¾øÉû0üFˆŒû ø:zÁ®ŽŽ‘‘‹ …‘bŠ_ŠcjhŒk $……‹v‘…ìÀˆ¡l”q¢IŽ‚Šƒƒz ûû¹†Œû&øN®¦®‘‘‹ …‘jŠ_ŠdhnŒn $……‹v‘…¸ˆ’ŠžU÷Pü±{‘€–˜‘•œ’ ÷)÷㟔Ž€z‘ ÷ûàz‘—–’–š ÷]ø¯˜®¢ÂŽ‘‘‹ …‘nŠkŠqq_Œc $……‹v‘…ô´ˆ³ˆ|`õ‰¬øÛ¬Ž÷*û*ùý ÷E÷ª÷Dû7÷+Ðø®ñû-÷f˜…••”Œ””— ÷ ÷EÊ®¸ª˜¸‘‘‹ …‘mŠfŠttaŒc $……‹v‘…·ˆž…sjûûCƒ……‡‡ˆ‡’† û÷8n³‡–ÃŽ‘‘‹ …‘fŠfŠcdjŒm $……Œv‘…µˆž†´P÷"û_“‘ƒ…‡‚…ƒ û(ûZäi]k^‡……‹v‘…©Œ°Œ¢¢µŠ³ $‘‘‹ …‘_Žx£÷÷M“‘‘‘Žˆƒ‘ ÷ûD§c€Sˆ……‹v‘…°Œ°Œ³²¬Š© $‘‘Š …‘ÐaŽz•aÅ ‰¬øÛ¬Œ÷>ÜàÁ÷Kû÷Ô÷å÷÷ ©Œ›œ© ÷ ÷l§¾¡”¸‘‘‹ …‘ØoŠkŠttgŒk $……‹v‘…ô·ˆ›vcûûeƒ|†Œ‚›û÷asµ•ÃŽ‘‘‹ …‘gŠeŠcdjŒm $……Œv‘…µˆœ…®Q÷ûqnŽ€fû8z†;ˆ ……‹v‘…¼Œ¿Œ²²½Š½ $‘‘‹ …‘Ô;ŽzÞ½‹±ø̲´øø»‰Ã•Æ—¿„€Ž~lDrTû‰ûU‡zƒ”Ž‘” Ôõ÷L÷™÷ -÷, ¦Ž’–’†ƒ l‰mûq\*Žf ‡URƒbˆ•”‰– б¯ÖŒ÷g‘ˆ…†ˆ…†„ *ûûRûž%û,…ƒ‰ƒ„†™ ø +û kg Ž’„–Š÷ ñè÷;÷Nûâû÷x÷²óêluvol¥ˆ ž‰œ…tvg]W~ „’„ Ç–Å»ÑÇq²c ûl÷sdz÷–÷£÷s˜™§—•‡• ûo~ty‘‚” ûâõÄõĶn£s¨¨££¨¨s£nnssn û{ùwš÷ª÷¹ùbûýU´÷!‰¬÷fµø wŽ÷)÷/ÚÂ÷%˜‘£÷gÅû=—ie‡[ˆ……‹v‘…°ŒÂŒ²´±Š® $‘‘‹ …‘diŽz»ûbøЂ|p€~ûwü¬qMm…_ˆ……‹v‘…¥Œ¬Œ©´½Š° $‘‘‹ …‘eŽ\›´÷ +Œ°ø÷1Mù+÷:‡ŠJˆ……‹v‘…°Œ³Œ©©¹Š¬ $‘‘‹ …‘GŽˆ…Þmø9‡Á™Ï‘‘‹ …‘û‰ûhü‡ˆ‡‰‰ˆ“ˆ Kûaøû%……‹v‘…Ї‘‰„@Mcü0…OrR†……‹v‘…©Œ«Œ££³Š© $‘‘‹ …‘I†ªÃ£±ø%÷cü›„Ž‘ƒ‘‘’“ U÷uø¥÷%–v¨vøü¬ñ¼ø)¼xøÀø”ûÛx‹€„‡|°n ûëøGû……‹v‘…¶ˆ©h‘qü52z…E„ ……‹v‘…¶Œ¸Œ£¢¹Šµ $‘‘‹ …‘E’zæ÷Æ‹š“‘–€uœ ¸÷ñüM|–˜‚›™”—ž ø䜑ђ ‘‘‹ …‘bŠ\Šsv]Œ_ $……‹v‘…xÑ„œ‡0÷(¯ø诰ëøIëù.÷Ý÷cû#÷ûGûVûû.ûVûY÷#û÷>÷ã»Ù ³Ä¡Óßûã÷¹÷öûû^ûG5"ûûû÷÷T÷fîàî ¬ª‰v÷¹÷¹†wóà÷lç¶÷Q÷÷=ßž|t™ öûB\¨¶aÇšœ• ’Š”‡“^r¶q û÷f¶™å¿ô½z´g ¸[MŽL\a„gnh\ŒŒ\ ……‹v‘…шœ†8ü%8z†Eˆ ……‹v‘…¸ŒºŒ±±ºŠ· $‘‘‹ …‘¶EŽzÞÞø„ÈÓuû +ûDo* [÷y¨—®Ò ¶‰¬øÓ²“w÷àÐ÷ò÷øË•±¯ ¡Öºq>œ –™Œ” °„¹†¾Š¸Œ‰Š Јiû†<5°>û +Že ‰‰‰Š ‡^W€[‡•—Š—ÐÛŸ¹¥Í¼°•eN ü8z†;ˆ ……‹v‘…¼Œ¾Œ³±¾Š½ $‘‘‹ …‘;ŽzÞö´øÛ¬âà÷ö¼÷@øŸÞšØŽ ‘‘‹ …‘\ŠZŠddbŒd $……‹v‘…Ljœ†8û¶û`÷dñ÷a¼÷÷F ÷xۜǒ ‘‘‹ …‘eŠbŠtvZŒ] $……‹v‘…Ö„œˆ:ûŠû|ûû=[b¨m Zº‰×Ìí”vù¬Œ÷:÷î÷ øTøúÕ†‹pvUû2ü%‡û4ø+tÇ‘˜Ï’‘‘‹ …‘cŠ^ŠgghŒj $……Œv‘…†“z¦F÷Yü”{‘’„•–’”™‘ ÷cø’žº›²Ê’‘‘‹ …‘mŠhŠtt^Œb $……‹v‘…õ‰¬øÛ¬Ž÷*û*ùý ÷E÷ª÷Dû7÷+Ðø®ñû-÷f˜…••”Œ””— ÷ ÷EÊ®¸ª˜¸‘‘‹ …‘mŠfŠttaŒc $……‹v‘…·ˆž…sjûûCƒ……‡‡ˆ‡’† û÷8n³‡–ÃŽ‘‘‹ …‘fŠfŠcdjŒm $……Œv‘…µˆž†´P÷"û_“‘ƒ…‡‚…ƒ û(ûZäi]k^‡……‹v‘…©Œ°Œ¢¢µŠ³ $‘‘‹ …‘_Žx£÷÷M“‘‘‘Žˆƒ‘ ÷ûD§c€Sˆ……‹v‘…°Œ°Œ³²¬Š© $‘‘Š …‘ÐaŽz•aÅ*´b»ø¬¯ÞKØ÷5Ù´÷¹»l‘–p½±¯œŸ l‰—‡”€‘…„z~nŠ²¹ ÷'÷"=¦B98URs—¢¨ ˜’Š’‰ ŠŽŠ‘–ªµ–±ºzû„ˆ‡ˆŠ 5v´+sFVG9ÃqÑ®©“· Ÿ›÷Mû~…„ƒ… vqitoYu³ª¸ ¹Õž Nˆvø ·÷^©œ•‹wÙÚ÷iá§÷;ø ……‡”÷L«Ì³‹ ’‡Ž‚ sr@}cˆ‰ƒ{‘…ŽŽ‹Ž·ˆ–‹<ü|dŠyˆ} §ƒ‡—‘‘•”“”•—‘‹–‚x¢©…®ñ÷ è÷3÷1Ö4`ezol ’l¢¥©”¨È½A*û]5,lv¡¤w ÷Ž •˜– û¼ø¬°áø"懔ƒ‚Œ_i`u`BNÕ÷ ÷»ÍÍÆ“hh pŽ™‚ §˜ªÂR³+(!2û"ûÓ2÷ÇÀžÝ½ [º„¦÷ï®÷^©œ•‹w²á÷pÚ§÷â½”Œ„Žs“h‹“ˆŒ‘k¡®šÈ’‘‘‹š…‘K‚ž¼øY̳‹ ’‡Ž‚ ³r@}cˆ‰ƒ{‘…ŽŽ‹Ž·ˆ–‹<û„‰‰„ ‡bœjI_uec ``qPAûÉ1÷ wãÚ÷XÚ¸÷m²ºŸ³¼ ”Œ„Žr“i‹“ˆŒ‘x¡®šÈ’‘‘‹š…‘K‚ž¼÷T©Ô‹ ŽˆŽ† †Š|Š|kgŒi $……‹v‘…¼ˆ˜I¸ûUx‰ƒ} kfe{rmY™ä ÷J©Ô‹ ŽˆŽ† †Š|Š|kgŒi $……‹v‘…»‡™€JûTF©Hî R”vø.¬’÷/÷i÷ ÷Ùø"Á‡‘vX:ûX{d†‹{µC÷Uy»‡—À’‘‘‹ …‘jŠhŠjjmŒm $……‹v‘…À…’{ŸX÷ûÐ|‘‘…˜•’‘œ’ ÷÷Íž·–¤Ã‘‘‹ …‘wŠsŠqjiŒr $……‹v‘…÷U”vø.¬’÷.ò÷%÷i÷ -÷_ø"‘‘‹ …‘mŠhŠgepŒq $……‹v‘…º†– W÷û×}‘“…•”“‘›’ ð÷ŠòûŒ}‘“…•”“‘š‘ ÷÷Ñ›´œ§¾Ž‘‘‹ …‘wŠuŠmmaŒm $……‹v‘…Ö‡n}h7ûdr‡‹ƒ 5÷oxº•À‘‘‹ …‘mŠcŠmrjŒm $……‹v‘…º‡—n^‘{EûE~j‰Š~«;÷bx»Œ›»ŽK‰¬÷ ã÷ ¬œ÷û÷9û6÷)¯Ò¢÷:û+÷4û÷¦@÷J÷út’Œ¸‘‘‹ …‘pŠ_ŠmmmŒq $……‹v‘…ˆ§z§bâû„‹ˆ‡†¨@7û -²ôùNluvol¥ˆ ž‰œ…tvg]W~ „’„ Ç–Å»ÑÇq²c ÷1luvol¥ˆ ž‰œ…tvg]W~ „’„ Ç–Å»ÑÇq²c §žvø ²÷r©y®åÚ÷[ÚÜøS÷÷ ç•™” Ÿˆ† û -±ÎÓ 2‰¬ø%•÷jØ÷j÷8p†Eˆ ……‹v‘…¼Œ¯ŒÁ»£Š½ $‘‘‹ …‘EŽzÞ÷[ÇŽ¾‹ “†‚ Z{aƒ7yŒ’‚Ž¨¥Ž¡›€W 2‹Â÷è·÷³ä÷ºÂû ÷ ÷ÅĤ³¹Èbº&,NXWz ’ƒ—‡šˆÀ ¼ ¼¹¦oVQxpû +÷_ø"‘‘‹ …‘mŠhŠgepŒq $……‹v‘…º†– W÷û×}‘“…•”“‘›’ ð÷ŠòûŒ}‘“…•”“‘š‘ ÷÷Ñ›´œ§¾Ž‘‘‹ …‘wŠuŠmmaŒm $……‹v‘…Ö‡n}h7ûdr‡‹ƒ 5÷oxº•À‘‘‹ …‘mŠcŠmrjŒm $……‹v‘…º‡—n^‘{EûE~j‰Š~«;÷bx»Œ›»ŽK‰¬÷ ã÷ ¬œ÷û÷9û6÷)¯Ò¢÷:û+÷4û÷¦@÷J÷út’Œ¸‘‘‹ …‘pŠ_ŠmmmŒq $……‹v‘…ˆ§z§bâû„‹ˆ‡†¨@7û +±ÎÓ 2‰¬ø%•÷jØ÷j÷8p†Eˆ ……‹v‘…¼Œ¯ŒÁ»£Š½ $‘‘‹ …‘EŽzÞ÷[ÇŽ¾‹ “†‚ Z{aƒ7yŒ’‚Ž¨¥Ž¡›€W 2‹Â÷è·÷³ä÷ºÂû ÷ ÷ÅĤ³¹Èbº&,NXWz ’ƒ—‡šˆÀ ¼ ¼¹¦oVQxpû Ú Ú’
ø¾ endstream endobj -41 0 obj -<< /Type /FontDescriptor /FontName /VTIPMO+LibertinusSerif-Regular /Flags 4 /FontBBox [ -1325 -256 1269 928 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle 0 /StemV 73 /XHeight 429 /FontFile3 43 0 R /CIDSet 42 0 R >> +25 0 obj +<< /Type /FontDescriptor /FontName /YTEUQI+LibertinusSerif-Regular /Flags 4 /FontBBox [ -1325 -256 1269 928 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle 0 /StemV 73 /XHeight 429 /FontFile3 27 0 R /CIDSet 26 0 R >> endobj -44 0 obj -<< /Length 1883 >> +28 0 obj +<< /Length 1483 >> stream %!PS-Adobe-3.0 Resource-CMap %%DocumentNeededResources: ProcSet (CIDInit) %%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-VTIPMO-LibertinusSerif-Regular-0) -%%Title: (TeX-VTIPMO-LibertinusSerif-Regular-0 TeX VTIPMO-LibertinusSerif-Regular 0) +%%BeginResource: CMap (TeX-YTEUQI-LibertinusSerif-Regular-0) +%%Title: (TeX-YTEUQI-LibertinusSerif-Regular-0 TeX YTEUQI-LibertinusSerif-Regular 0) %%Version: 1.000 %%EndComments /CIDInit /ProcSet findresource begin @@ -603,39 +331,28 @@ stream begincmap /CIDSystemInfo << /Registry (TeX) -/Ordering (VTIPMO-LibertinusSerif-Regular) +/Ordering (YTEUQI-LibertinusSerif-Regular) /Supplement 0 >> def -/CMapName /TeX-Identity-VTIPMO-LibertinusSerif-Regular def +/CMapName /TeX-Identity-YTEUQI-LibertinusSerif-Regular def /CMapType 2 def 1 begincodespacerange <0000> <FFFF> endcodespacerange 0 beginbfrange endbfrange -83 beginbfchar -<0002> <0021> +55 beginbfchar <0009> <0028> <000A> <0029> <000D> <002C> <000E> <002D> <000F> <002E> <0010> <002F> -<0011> <0030> -<0012> <0031> -<0013> <0032> -<0014> <0033> -<0015> <0034> -<0016> <0035> -<001B> <003A> -<0020> <003F> <0022> <0041> <0023> <0042> <0024> <0043> <0025> <0044> <0026> <0045> -<0027> <0046> -<0028> <0047> <0029> <0048> <002A> <0049> <002B> <004A> @@ -643,17 +360,11 @@ endbfrange <002E> <004D> <002F> <004E> <0030> <004F> -<0031> <0050> -<0032> <0051> <0033> <0052> -<0034> <0053> <0035> <0054> <0036> <0055> <0037> <0056> -<0038> <0057> <0039> <0058> -<003A> <0059> -<003B> <005A> <0042> <0061> <0043> <0062> <0044> <0063> @@ -663,7 +374,6 @@ endbfrange <0048> <0067> <0049> <0068> <004A> <0069> -<004B> <006A> <004C> <006B> <004D> <006C> <004E> <006D> @@ -679,24 +389,14 @@ endbfrange <0058> <0077> <0059> <0078> <005A> <0079> -<005B> <007A> -<06DA> <2014> -<06DF> <2019> -<06E2> <201C> -<06E3> <201D> -<0938> <00660066> <0939> <00660069> -<093A> <0066006C> <09C8> <0030> <09C9> <0031> <09CA> <0032> <09CB> <0033> <09CC> <0034> -<09CD> <0035> <09CE> <0036> -<09CF> <0037> <09D0> <0038> -<09D1> <0039> endbfchar endcmap CMapName currentdict /CMap defineresource pop @@ -708,72 +408,56 @@ end endstream endobj 8 0 obj -<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /VTIPMO+LibertinusSerif-Regular /DescendantFonts [ 45 0 R ] /ToUnicode 44 0 R >> +<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /YTEUQI+LibertinusSerif-Regular /DescendantFonts [ 29 0 R ] /ToUnicode 28 0 R >> endobj -45 0 obj -<< /Type /Font /Subtype /CIDFontType0 /BaseFont /VTIPMO+LibertinusSerif-Regular /FontDescriptor 41 0 R /W 40 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> +29 0 obj +<< /Type /Font /Subtype /CIDFontType0 /BaseFont /YTEUQI+LibertinusSerif-Regular /FontDescriptor 25 0 R /W 24 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >> endobj -12 0 obj -<< /Type /Pages /Count 4 /Kids [ 6 0 R 14 0 R 17 0 R 20 0 R ] >> +11 0 obj +<< /Type /Pages /Count 1 /Kids [ 6 0 R ] >> endobj -46 0 obj -<< /Type /Catalog /Pages 12 0 R /Metadata 4 0 R/OutputIntents [ <</Type/OutputIntent/S/GTS_PDFX/OutputCondition (SWOP (Publication) printing in USA (Printing process definition: ANSI CGATS.6).)/OutputConditionIdentifier (CGATS TR 001)/Info (U.S. Web Coated (SWOP) v2)/RegistryName (http://www.color.org)>> ] >> +30 0 obj +<< /Type /Catalog /Pages 11 0 R /Metadata 4 0 R/OutputIntents [ <</Type/OutputIntent/S/GTS_PDFX/OutputCondition (SWOP (Publication) printing in USA (Printing process definition: ANSI CGATS.6).)/OutputConditionIdentifier (CGATS TR 001)/Info (U.S. Web Coated (SWOP) v2)/RegistryName (http://www.color.org)>> ] >> endobj -47 0 obj -<< /Title(Novel\040Document\040Class)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20231109113337-08'00')/ModDate(D:20231109113337-08'00')/Producer(LuaLaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001) >> +31 0 obj +<< /Title(Novel\040Document\040Class)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20240131112616-08'00')/ModDate(D:20240131112616-08'00')/Producer(LuaLaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001) >> endobj xref -0 48 +0 32 0000000000 65535 f -0000030193 00000 n -0000030213 00000 n -0000030233 00000 n +0000011455 00000 n +0000011475 00000 n +0000011495 00000 n 0000000020 00000 n -0000011141 00000 n -0000010989 00000 n +0000011312 00000 n +0000011160 00000 n 0000002644 00000 n -0000057968 00000 n -0000042381 00000 n -0000040387 00000 n -0000035457 00000 n -0000058333 00000 n -0000020729 00000 n -0000020574 00000 n -0000011296 00000 n -0000029721 00000 n -0000029566 00000 n -0000020862 00000 n -0000030101 00000 n -0000029946 00000 n -0000029854 00000 n -0000030286 00000 n -0000034181 00000 n -0000030454 00000 n -0000030780 00000 n -0000034423 00000 n -0000035616 00000 n -0000035821 00000 n -0000039142 00000 n -0000035977 00000 n -0000036048 00000 n -0000039381 00000 n -0000040544 00000 n -0000040747 00000 n -0000041443 00000 n -0000040780 00000 n -0000040887 00000 n -0000041669 00000 n -0000042526 00000 n -0000042718 00000 n -0000055784 00000 n -0000043169 00000 n -0000043544 00000 n -0000056025 00000 n -0000058127 00000 n -0000058415 00000 n -0000058742 00000 n +0000030768 00000 n +0000019426 00000 n +0000014082 00000 n +0000031133 00000 n +0000011548 00000 n +0000012993 00000 n +0000011627 00000 n +0000011698 00000 n +0000013235 00000 n +0000014241 00000 n +0000014446 00000 n +0000018153 00000 n +0000014624 00000 n +0000014696 00000 n +0000018392 00000 n +0000019582 00000 n +0000019785 00000 n +0000028984 00000 n +0000020130 00000 n +0000020505 00000 n +0000029225 00000 n +0000030927 00000 n +0000031194 00000 n +0000031521 00000 n trailer -<< /Size 48 /Root 46 0 R /Info 47 0 R /ID [ <6D282F68DAD0E257966ED9A7FE1025D7> <6D282F68DAD0E257966ED9A7FE1025D7> ] >> +<< /Size 32 /Root 30 0 R /Info 31 0 R /ID [ <98EE0E1A7196CAA99E8C791E24184A8B> <98EE0E1A7196CAA99E8C791E24184A8B> ] >> startxref -59066 +31845 %%EOF diff --git a/macros/luatex/latex/novel/doc/novel.tex b/macros/luatex/latex/novel/doc/novel.tex index 42ce289628..e61e9c0226 100644 --- a/macros/luatex/latex/novel/doc/novel.tex +++ b/macros/luatex/latex/novel/doc/novel.tex @@ -12,7 +12,7 @@ % novel.pdf (if present) have read/write permissions for any user. % Otherwise, compile may fail at the point where files are written. -\documentclass{novel} % v. 1.83. +\documentclass{novel} % v. 1.86. % Almost all settings are defaults. \SetHeadFootStyle{3} \SetTitle{Novel Document Class} % only footer, with page number @@ -20,111 +20,49 @@ % However, not every P.O.D. service needs PDF/X these days. \SetPDFX[CGATSTR001]{X-1a:2001} \begin{document} +\thispagestyle{empty} \begin{ChapterStart}[8] \vspace{\nbs} % \nbs is normal baselineskip \ChapterTitle{NOVEL} \vspace{\nbs} \ChapterSubtitle{A Document Class for the Rest of Us} -\ChapterDeco[4]{\decoglyph{n9548}} +{\centering Version 1.86 (January 2024)\par} \end{ChapterStart} -\textbf{Where is the documentation??} It is in HTML format, and cannot be retrieved via \textit{texdoc}. If you have this package installed, look for (texroot)/doc/lualatex/novel/novel-documentation.html. If you are online, go to the CTAN page at https://ctan.org/pkg/novel and click ``Package Documentation (HTML).'' +\textbf{Where is the documentation??} It is HTML.\\ +(texroot)/doc/lualatex/novel/novel-documentation.html. \scenebreak -\textbf{Description:} The \emph{novel} document class is for writers of original fiction, to be printed to paper, with attention to the requirements of the print-on-demand market. Non-color interiors and color covers are supported. Images are supported, but only as they might be used in fiction, not picture books. +\textbf{News:} This document class was first privately used in 2014. +Then, in 2018, it was improved, documented, and released. It has been +maintained through TeXlive 2023. It is expected to work in the future, but is +no longer maintained by its original creator.\par +Changes in print-on-demand technology have made many parts of this code +irrelevant. There are also a few commands that require graphic design +experience for proper usage. And a few settings, which should be simple and +obvious, are complex and arcane.\par +If \emph{novel} works for you, good. But if you are simply writing a fiction +novel, nothing fancy, then see if CTAN and TeXlive have a package named +\emph{novelette}. As of late January 2024, the package is in beta test +(not released yet). If the package exists and can be installed, then you +should prefer \emph{novelette}. -If your work is an E-book, or uses interior color other than gray, or is academic, then this document class is not for you. - -But if you are writing a detective novel, or science fiction, or a collection of short stories, then read on! - -\QuickChapter{1. Features} - -Throughout, it is assumed that the purpose of your writing is a commercially printed book of fiction. - -A new \emph{novel} is pre-configured to produce a standard trade book size of 5.5in W x 8.5in H, with layout margins that are likely to be acceptable to the most widely-used print services. The file you are now reading is in this format. But if that is not the size or layout you want, then there are commands that configure just about anything, using standard terminology and understandable purpose. Best of all, the HTML documentation comes with images and examples, so you know what you are doing. - -Almost everything is pre-configured to “just work,†even the choice of fonts. The chosen compiler is LuaLaTeX, and Open Type fonts are loaded using \textit{fontspec} technology. If you prefer to use a professional font, it will be easy to load and use in utf-8. - -Many standard LaTeX commands are disabled. This will be surprising at first. But \emph{novel} is focused on one thing only. Anything that might interfere with that purpose may have been tossed aside. So, be sure that you read the documentation! If you take an existing LaTeX document and just change the class to \emph{novel,} it is very unlikely to work as expected. - -Many new commands are provided. They are focused on the needs of print fiction writers, period. And, \emph{novel} has built-in PDF/X technology that exceeds the capabilities currently available via other LaTeX packages. - -\QuickChapter{2. Complete Documentation} - -What you are reading now, is only an introduction. The complete documentation is in HTML format, directly written in HTML rather than extracted from code. There are numerous examples and images, too detailed to be presented as PDF. - -\QuickChapter{3. License} - -The LaTeX code, and accompanying documentation, is released under the LateX Project Public License, version 1.3c. - -The companion font(s) is(are) licensed under the SIL Open Font License, version 1.1. - - - -\QuickChapter{4. Version} - -\noindent 1.83, 2023-11-09: Minor typo corrected. - -\noindent 1.82, 2023-08-26: Added user setting for default indent. - -\noindent 1.81, 2023-03-25: Bug fixes. Also 1.81a, 1.81b. - -\noindent 1.80, 2023-02-08: Class option ``rev'' for new documents. - -\noindent 1.52, 2018-04-26: Enhanced detection and warning using Lua code. - -\noindent 1.50.5, 2018-04-11: Minor bug fixes (docs and code disagreed). - -\noindent 1.50, 2018-03-28: Improved image handling commands, sandbox. - -\clearpage - -\QuickChapter{5. FAQs} - -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{Q. }Can this document class be used for E-books? -\end{adjustwidth} -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{A. }No. And, that feature will never be added, as the technology is inherently incompatible. A word processor is your friend. -\end{adjustwidth} - -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{Q. }What happened to floats and lists? -\end{adjustwidth} -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{A. }Use the new image commands, or sandbox mode. -\end{adjustwidth} - -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{Q. }My thesis advisor told me--- -\end{adjustwidth} -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{A. }Stop right there. This document class is very different from anything used for theses and other academic publications. -\end{adjustwidth} +\scenebreak -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{Q. }If I use TikZ for Feynman diagrams, then--- -\end{adjustwidth} -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{A. }Go away. -\end{adjustwidth} +\textbf{Description:} The \emph{novel} document class is for writers of +original fiction, to be printed to paper, with attention to the requirements +of the print-on-demand market. Non-color interiors and color covers are +supported. Images are supported, but only as they might be used in fiction, +not picture books. -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{Q. }Has this document class ever been used for an actual novel? -\end{adjustwidth} -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{A. }Yes indeed! In August 2017 the author published a complete novel, including its cover, using this document class. Almost all of the setup used defaults. The files (textblock and cover) were submitted to a major American P.O.D. service in \lnum{PDF/X-1a:2001} format, then electronically reviewed and accepted \textit{on the first attempt.} A printed copy was in the author's hands within a week. Just like that. Took months to write, of course.\par -Update: Several other authors report success. -\end{adjustwidth} +If your work is an E-book, or uses interior color other than gray, or is +academic, then this document class is not for you. -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{Q. }When I woke up this morning, my head felt like a toddler had been pounding it in a sandbox. I rolled over and looked at the mug shot on the wall. It was a woman in her forties with a drug habit that was bad, and an attitude that was even worse. She had seen better days, like the time I took her to the eighth grade sock hop. Then I got up, washed, and dragged my lonely butt down to the one-man detective agency that I jokingly called my means of living. You know what I mean? -\end{adjustwidth} -\begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{A. }Yeah. Stick with me, kid. This document class is for you. -\end{adjustwidth} +But if you are writing a detective novel, or science fiction, or a collection +of short stories, then you are in the right place. +\makeatletter\nocle@rtoendtrue\makeatother % For developer only. \end{document} diff --git a/macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo b/macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo index f1e054428e..11bdaa8169 100644 --- a/macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo +++ b/macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo @@ -2,7 +2,7 @@ %% The values of the arguments are public industry standards. %% \ProvidesFile{novel-CGATSTR001.clo}% -[2023/11/09 any version. (novel Output Intent CGATS TR 001)] +[2024/01/31 any version. (novel Output Intent CGATS TR 001)] %% % Typically used in the USA. diff --git a/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty b/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty index 86b499397c..f65aadd3e2 100644 --- a/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty +++ b/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty @@ -6,7 +6,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-CalculateLayout.sty}% -[2023/11/09 v1.83 LaTeX file (layout calculations)] +[2024/01/31 v1.86 LaTeX file (layout calculations)] %% %% diff --git a/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty b/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty index b4b581d57d..4797893f96 100644 --- a/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty +++ b/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty @@ -6,7 +6,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-ChapterScene.sty}% -[2023/11/09 v1.83 LaTeX file (chapter and scene macros)] +[2024/01/31 v1.86 LaTeX file (chapter and scene macros)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel-DropCap.sty b/macros/luatex/latex/novel/lualatex/novel-DropCap.sty index d09c9bd5bc..eabd28f127 100644 --- a/macros/luatex/latex/novel/lualatex/novel-DropCap.sty +++ b/macros/luatex/latex/novel/lualatex/novel-DropCap.sty @@ -9,7 +9,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-DropCap.sty}% -[2023/11/09 v1.83 (Drop Caps)] +[2024/01/31 v1.86 (Drop Caps)] \NeedsTeXFormat{LaTeX2e}[1999/12/01] % % diff --git a/macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo b/macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo index 714f075865..ae70e33988 100644 --- a/macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo +++ b/macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo @@ -1,7 +1,7 @@ %% This is file `novel-FOGRA39.clo', part of `novel' document class. %% The values of the arguments are public industry standards. \ProvidesFile{novel-FOGRA39.clo}% -[2023/11/09 any version. (novel Output Intent FOGRA39)] +[2024/01/31 any version. (novel Output Intent FOGRA39)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel-FileData.sty b/macros/luatex/latex/novel/lualatex/novel-FileData.sty index 9e5d60cce4..3225480cff 100644 --- a/macros/luatex/latex/novel/lualatex/novel-FileData.sty +++ b/macros/luatex/latex/novel/lualatex/novel-FileData.sty @@ -6,7 +6,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-FileData.sty}% -[2023/11/09 v1.83 LaTeX file (File Data settings)] +[2024/01/31 v1.86 LaTeX file (File Data settings)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel-Fonts.sty b/macros/luatex/latex/novel/lualatex/novel-Fonts.sty index c686586254..1d4f787dee 100644 --- a/macros/luatex/latex/novel/lualatex/novel-Fonts.sty +++ b/macros/luatex/latex/novel/lualatex/novel-Fonts.sty @@ -6,7 +6,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-Fonts.sty}% -[2023/11/09 v1.83 LaTeX file (font settings and defaults)] +[2024/01/31 v1.86 LaTeX file (font settings and defaults)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty b/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty index 2e46f31729..528a59ac26 100644 --- a/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty +++ b/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty @@ -7,7 +7,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-Footnotes.sty}% -[2023/11/09 v1.83 LaTeX file (commands for footnotes and endnotes)] +[2024/01/31 v1.86 LaTeX file (commands for footnotes and endnotes)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty b/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty index 7a3825ac54..24f3b82c25 100644 --- a/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty +++ b/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty @@ -6,7 +6,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-HeadFootStyles.sty}% -[2023/11/09 v1.83 LaTeX file (header and footer layouts and styles)] +[2024/01/31 v1.86 LaTeX file (header and footer layouts and styles)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel-Images.sty b/macros/luatex/latex/novel/lualatex/novel-Images.sty index 3e5dd85f2c..67b19ff865 100644 --- a/macros/luatex/latex/novel/lualatex/novel-Images.sty +++ b/macros/luatex/latex/novel/lualatex/novel-Images.sty @@ -6,7 +6,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-Images.sty}% -[2023/11/09 v1.83 LaTeX file (image placement)] +[2024/01/31 v1.86 LaTeX file (image placement)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel-JC200103.clo b/macros/luatex/latex/novel/lualatex/novel-JC200103.clo index ba365d2b83..4493bbc322 100644 --- a/macros/luatex/latex/novel/lualatex/novel-JC200103.clo +++ b/macros/luatex/latex/novel/lualatex/novel-JC200103.clo @@ -2,7 +2,7 @@ %% The values of the arguments are public industry standards. %% \ProvidesFile{novel-JC200103.clo}% -[2023/11/09 any version. (novel Output Intent JC200103)] +[2024/01/31 any version. (novel Output Intent JC200103)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty b/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty index c111fa9664..202d59d520 100644 --- a/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty +++ b/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty @@ -6,7 +6,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-LayoutSettings.sty}% -[2023/11/09 v1.83 LaTeX file (layout settings)] +[2024/01/31 v1.86 LaTeX file (layout settings)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty b/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty index db61189794..ac46313892 100644 --- a/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty +++ b/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty @@ -6,7 +6,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-PostLayout.sty}% -[2023/11/09 v1.83 LaTeX file (post-layout modifications)] +[2024/01/31 v1.86 LaTeX file (post-layout modifications)] %% %% diff --git a/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty b/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty index 5cf4894ac5..1a80d93e5b 100644 --- a/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty +++ b/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty @@ -11,7 +11,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-Sandbox.sty}% -[2023/11/09 v1.83 LaTeX file (used only with sandbox class option)] +[2024/01/31 v1.86 LaTeX file (used only with sandbox class option)] %% %% diff --git a/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty b/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty index 7f204192db..ff0bcf6fdc 100644 --- a/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty +++ b/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty @@ -6,7 +6,7 @@ %% License URL: https://www.latex-project.org/lppl/lppl-1-3c/ %% \ProvidesFile{novel-TextMacros.sty}% -[2023/11/09 v1.83 LaTeX file (text macros usable within document body)] +[2024/01/31 v1.86 LaTeX file (text macros usable within document body)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel-microtype.cfg b/macros/luatex/latex/novel/lualatex/novel-microtype.cfg index d8bde1da88..b44dd08441 100644 --- a/macros/luatex/latex/novel/lualatex/novel-microtype.cfg +++ b/macros/luatex/latex/novel/lualatex/novel-microtype.cfg @@ -10,7 +10,7 @@ %% ------------------------------------------------------------------------ %% \ProvidesFile{novel-microtype.cfg}% -[2023/11/09 any version. (default microtype configuration for novel class)] +[2024/01/31 any version. (default microtype configuration for novel class)] %%% --------------------------------------------------------------------------- %%% FONT SETS diff --git a/macros/luatex/latex/novel/lualatex/novel-pdfx.sty b/macros/luatex/latex/novel/lualatex/novel-pdfx.sty index 1fb6e7e876..0295f1cc70 100644 --- a/macros/luatex/latex/novel/lualatex/novel-pdfx.sty +++ b/macros/luatex/latex/novel/lualatex/novel-pdfx.sty @@ -16,7 +16,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{novel-pdfx.sty}% -[2023/11/09 v1.83 LaTeX file (PDF/X support for novel class)] +[2024/01/31 v1.86 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/macros/luatex/latex/novel/lualatex/novel-xmppacket.sty b/macros/luatex/latex/novel/lualatex/novel-xmppacket.sty index 5ae2bb10f3..9fb3e13686 100644 --- a/macros/luatex/latex/novel/lualatex/novel-xmppacket.sty +++ b/macros/luatex/latex/novel/lualatex/novel-xmppacket.sty @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------------------- %% \ProvidesFile{novel-xmppacket.sty}% -[2023/11/09 any version. (novel XMP packet template)] +[2024/01/31 any version. (novel XMP packet template)] %% diff --git a/macros/luatex/latex/novel/lualatex/novel.cls b/macros/luatex/latex/novel/lualatex/novel.cls index 5faf86342a..4f860e0f75 100644 --- a/macros/luatex/latex/novel/lualatex/novel.cls +++ b/macros/luatex/latex/novel/lualatex/novel.cls @@ -8,14 +8,21 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] % Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016. -\ProvidesClass{novel}[2023/11/09 v1.83 LaTeX document class] +\ProvidesClass{novel}[2024/01/31 v1.86 LaTeX document class] %% -%% Version 1.83: Minor typo corrected. + +%% During the years since `novel' was introduced, there have been +%% many changes in print-on-demand. Also, `novel` offers some +%% features that are rarely used, bloating the code and documentation. +%% Although `novel` still works (as of late 2023), it is more complicated +%% than necessary for ordinary popular fiction. Unless you really need `novel', +%% try `novelette' instead. Available early 2024. Easier to use. + %% In addition to a minimal LaTeX setup, with luatex, you will need these: %% textpos magaz xcolor adjustbox eso-pic pdfpages unicode-math fp iftex %% libertinus-fonts makecmds xkeyval lm-math xstring xifthen silence -%% collectbox pgf lipsum wrapfig pdflscape polyglossia microtype hyperref +%% collectbox pgf lipsum wrapfig pdflscape microtype hyperref polyglossia %% You will need language support, for your language(s). %% If using lipsum, you will need hyphen-latin. @@ -26,6 +33,8 @@ %% It cannot be used for e-books or for journal publication. %% It is not suitable for most non-fiction, because routine academic features %% such as bibiography and automatic sectioning are defeated. +%% Only use it for ORIGINAL works, where you can edit your text. If your +%% purpose is a reprint of someone else's work, then `novel' is not for you. %% %% There are pre-configured layouts for the most commonly used choices of %% trim size (finished book width and height), and internal layout consistent @@ -100,7 +109,7 @@ \newlength\@tempLength % scratch length for local calculations \newif \if@tempTF % scratch boolean for local tests - +\newif \ifnocle@rtoend % Only developer uses true. %% Global lengths are often passed around in `novel'. %% But \setlength is not always global in effect. @@ -327,11 +336,11 @@ %% Physical Layout Commands and Settings. %% ---------------------------------------------------------------------------- %% Define user commands that over-ride class option pre-configured settings. -%% Also sets a variety of miscellaneous lengths:s \parsep, \parindent, etc. +%% Also sets a variety of miscellaneous lengths: \parsep, \parindent, etc. \RequirePackage{novel-LayoutSettings} -%% Language support. +%% Use polyglossia: %% ---------------------------------------------------------------------------- \RequirePackage{polyglossia} \setdefaultlanguage[variant=american]{english} % may be changed by user @@ -621,7 +630,7 @@ \string\xdef\string\@AllGoodImages{\@AllGoodImages}^^J% \string\xdef\string\@UnknownImages{\@UnknownImages}^^J% }% - \cleartoend% adds 1 or 2 blanks, for final verso blank + \ifnocle@rtoend\else\cleartoend\fi% \fi% \fi% } diff --git a/macros/tex-in-practice b/macros/tex-in-practice deleted file mode 120000 index 71c9f5d5ab..0000000000 --- a/macros/tex-in-practice +++ /dev/null @@ -1 +0,0 @@ -tip
\ No newline at end of file diff --git a/macros/tip b/macros/tip deleted file mode 120000 index cec823dcc8..0000000000 --- a/macros/tip +++ /dev/null @@ -1 +0,0 @@ -../info/examples/tip
\ No newline at end of file |
