diff options
author | Norbert Preining <norbert@preining.info> | 2023-06-19 03:02:28 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-06-19 03:02:28 +0000 |
commit | 0622b5d465a30f417f9c5372cd05a931a407380c (patch) | |
tree | 0007872c586bbdf271937367d23bb2396bf60a1a /macros/latex | |
parent | 560cff4babb98ab81103bfe3f966c4111f31b0b0 (diff) |
CTAN sync 202306190302
Diffstat (limited to 'macros/latex')
53 files changed, 5370 insertions, 1389 deletions
diff --git a/macros/latex/contrib/animate/ChangeLog b/macros/latex/contrib/animate/ChangeLog index 64aec08795..237adc19ac 100644 --- a/macros/latex/contrib/animate/ChangeLog +++ b/macros/latex/contrib/animate/ChangeLog @@ -1,3 +1,6 @@ +2023-06-18 + * fix: missing file `pstmetronome.tex' added + 2023-05-15 * fix: `buttonfg' package option diff --git a/macros/latex/contrib/animate/animate.pdf b/macros/latex/contrib/animate/animate.pdf Binary files differindex 7ad2b741cb..518115d6af 100644 --- a/macros/latex/contrib/animate/animate.pdf +++ b/macros/latex/contrib/animate/animate.pdf diff --git a/macros/latex/contrib/animate/animate.sty b/macros/latex/contrib/animate/animate.sty index 63faa6838b..fc126ce70a 100644 --- a/macros/latex/contrib/animate/animate.sty +++ b/macros/latex/contrib/animate/animate.sty @@ -13,7 +13,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\def\@anim@version{2023/05/15} +\def\@anim@version{2023/06/18} \ProvidesPackage{animate} [\@anim@version\space PDF & SVG animations from files and inline graphics] diff --git a/macros/latex/contrib/animate/files/pstmetronome.tex b/macros/latex/contrib/animate/files/pstmetronome.tex new file mode 100644 index 0000000000..e13bd4a0da --- /dev/null +++ b/macros/latex/contrib/animate/files/pstmetronome.tex @@ -0,0 +1,233 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% animated metronome +% this code is based to 99.9 percent on the work by Manuel Luque +% (pstricks.blogspot.com) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\makeatletter +\pst@addfams{pst-metronome} +\define@key[psset]{pst-metronome}{theta0}{\def\psk@oscmetronomethetai{#1 }} +\psset[pst-metronome]{theta0=45} % position initiale du metronome +\define@key[psset]{pst-metronome}{M}{\def\psk@oscmetronometM{#1 }} +\psset[pst-metronome]{M=25} % masse du disque en g +\define@key[psset]{pst-metronome}{m}{\def\psk@oscmetronometm{#1 }} +\psset[pst-metronome]{m=6} % masse du curseur en g +\define@key[psset]{pst-metronome}{r}{\def\psk@oscmetronomer{#1 }} +\psset[pst-metronome]{r=1} % rayon du disque en cm +\define@key[psset]{pst-metronome}{x}{\def\psk@oscmetronomex{#1 }} +\psset[pst-metronome]{x=8.4} % position du curseur en cm par rapport à l'axe +\define@key[psset]{pst-metronome}{d}{\def\psk@oscmetronomed{#1 }} +\psset[pst-metronome]{d=3.2} % distance de l'axe au centre du disque en cm +\define@key[psset]{pst-metronome}{dt}{\def\psk@oscmetronomedt{#1 }} +\psset[pst-metronome]{dt=0.01} % pas pour RK4 +\define@key[psset]{pst-metronome}{nT}{\def\psk@oscmetronomenT{#1 }} +\psset[pst-metronome]{nT=1} % nombre de périodes représentées +%---- calculer theta(t) et thetapoint(t) -------- +\def\psmetronome{\pst@object{psmetronome}} +\def\psmetronome@i{% +\begingroup% +\use@par% + \begin@SpecialObj% + \pstVerb{% + /deg2rad {180 div 3.14159 mul} def + /rad2deg {180 mul 3.14159 div} def + /gp 9.8 def % pesanteur + /radius \psk@oscmetronomer 1e-2 mul def % en m + /OA \psk@oscmetronomed 1e-2 mul def % distance de l'axe au centre du disque en m + /xC \psk@oscmetronomex 1e-2 mul def % position du curseur en m par rapport à l'axe + /theta0 \psk@oscmetronomethetai def % en degrés + /theta0rad theta0 deg2rad def % en radians + /Md \psk@oscmetronometM 1e-3 mul def % en kg + /mc \psk@oscmetronometm 1e-3 mul def % en kg + /dt \psk@oscmetronomedt def + /nT \psk@oscmetronomenT def + % moment d'inertie du métronome + % J=1/2M*R^2+M*a^2+m*x^2 + /Ji {0.5 Md mul radius dup mul mul Md OA dup mul mul add mc xC dup mul mul add} def + /AT {4 + Ji + gp Md OA mul mc xC mul sub mul + div + sqrt + mul} def + % Pour le calcul de la période + % coefficients de l'approximation polynômiale du calcul + % de l'intégrale elliptique +% coefficient pour le calcul de l'intégrale elliptique + /m0 theta0 2 div sin def + /m1 {1 m0 dup mul sub} def + /m2 {m1 dup mul} def + /m3 {m2 m1 mul} def + /m4 {m2 dup mul} def + /m_1 {1 m1 div} def + /EllipticK { + 0.5 + 0.12498593597 m1 mul add + 0.06880248576 m2 mul add + 0.03328355376 m3 mul add + 0.00441787012 m4 mul add + m_1 ln mul + 1.38629436112 add + 0.09666344259 m1 mul add + 0.03590092383 m2 mul add + 0.03742563713 m3 mul add + 0.01451196212 m4 mul add + } def +/Tm {AT EllipticK mul} def +% tableau des valeurs de theta(t) + /W 0 def % vitesse angulaire + /theta theta0 def + /oscillateur {sin gp Md OA mul mc xC mul sub mul neg mul Ji div} def + /j1 {W dt mul} def + /k1 {theta oscillateur dt mul} def + /j2 {W k1 2 div add dt mul} def + /k2 {theta j1 2 div rad2deg add oscillateur dt mul} def + /j3 {W k2 2 div add dt mul} def + /k3 {theta j2 2 div rad2deg add oscillateur dt mul} def + /j4 {W k3 add dt mul} def + /k4 {theta j3 rad2deg add oscillateur dt mul} def + /theta2 {theta j1 rad2deg 2 j2 rad2deg j3 rad2deg add mul add j4 rad2deg add 6 div add} def +/tabTheta [ % pour l'animation + 0 theta0 % date angle +dt dt Tm nT mul{ % + theta2 % + /W2 W k1 2 k2 k3 add mul add k4 add 6 div add def + /theta theta2 def + /W W2 def + } for + ] def +/Nvaleurs tabTheta length 2 div cvi def + /W 0 def % vitesse angulaire + /theta theta0 def +/tabThetaGraph [ % pour le graphique theta(t) + 0 theta0 % date angle +0 dt Tm nT mul { % pop + theta2 % 180 div 3.14159 mul + /W2 W k1 2 k2 k3 add mul add k4 add 6 div add def + /theta theta2 def + /W W2 def + } for + ] def + /W 0 def % vitesse angulaire + /theta theta0 def +/tabThetaPoint [ % pour le graphique thetapoint(t) + 0 0 % date angle +dt dt Tm nT mul { % pop +% theta2 % 180 div 3.14159 mul + /W2 W k1 2 k2 k3 add mul add k4 add 6 div add def + W2 + /theta theta2 def + /W W2 def + } for + ] def +/tabXOSC [ % oscillations par min en fonction de x +0.5 0.1 12 {/xc exch def + /xC xc 1e-2 mul def + xc 60 Tm div % cvi + } for + ] def +/tabXbattements [ % battements par min en fonction de x +3 0.1 12 {/xc exch def + /xC xc 1e-2 mul def + xc 60 Tm div 2 mul % cvi + } for + ] def +% graduation T --> x +/tabXT [ % [T,x] + 40 1 220 {/batt exch def % battements + /Tmetronome2 120 batt div dup mul def + /A1 16 mc mul EllipticK dup mul mul def + /B1 gp Tmetronome2 mul mc mul def + /C1 gp Md mul OA mul Tmetronome2 mul neg + 8 Md mul radius dup mul mul 16 Md mul OA dup mul mul add EllipticK dup mul mul add def + /Delta B1 dup mul 4 A1 mul C1 mul sub sqrt def + /xC1 B1 neg Delta sub 2 div A1 div def + /xC2 B1 neg Delta add 2 div A1 div def + xC2 0 ge {/posC xC2 def}{/posC xC1 def} ifelse + batt posC 1e2 mul + } for + ] def +/xT { % pour une valeur particulière battement -> position du curseur + /batt exch def + /Tmetronome2 120 batt div dup mul def + /A1 16 mc mul EllipticK dup mul mul def + /B1 gp Tmetronome2 mul mc mul def + /C1 gp Md mul OA mul Tmetronome2 mul neg + 8 Md mul radius dup mul mul 16 Md mul OA dup mul mul add EllipticK dup mul mul add def + /Delta B1 dup mul 4 A1 mul C1 mul sub sqrt def + /xC1 B1 neg Delta sub 2 div A1 div def + /xC2 B1 neg Delta add 2 div A1 div def + xC2 0 ge {/posC xC2 def}{/posC xC1 def} ifelse + posC 1e2 mul + } def +/xC \psk@oscmetronomex 1e-2 mul def % position du curseur en m par rapport à l'axe +/Tm {AT EllipticK mul} def + }% + \end@SpecialObj% +\endgroup} +% +\def\psmetronomeA{\pst@object{psmetronomeA}} +\def\psmetronomeA@i{% +\begingroup% +\use@par% + \begin@SpecialObj% + \pstVerb{% + /radius \psk@oscmetronomer 1e-2 mul def % en m + /OA \psk@oscmetronomed 1e-2 mul def % distance de l'axe au centre du disque en m + /xC \psk@oscmetronomex 1e-2 mul def % position du curseur en m par rapport à l'axe + }% +\psframe[fillstyle=solid](! -0.075 \psk@oscmetronomed neg)(0.075,13) +\pscircle[fillstyle=solid,fillcolor={[rgb]{0.75 0.75 0.75}}](! 0 \psk@oscmetronomed neg){!radius 1e2 mul} +\pscircle[fillstyle=solid,linewidth=0.05](0,0){0.15} +\pscircle*[linecolor=red](0,0){0.05} +% curseur +\pspolygon[fillstyle=solid](! -0.25 \psk@oscmetronomex 0.5 sub)(! -0.5 \psk@oscmetronomex 0.5 add)(!-0.075 \psk@oscmetronomex 0.5 add)(!-0.075 \psk@oscmetronomex 0.5 sub) +\pspolygon[fillstyle=solid](! 0.25 \psk@oscmetronomex 0.5 sub)(! 0.5 \psk@oscmetronomex 0.5 add)(!0.075 \psk@oscmetronomex 0.5 add)(!0.075 \psk@oscmetronomex 0.5 sub) +\pspolygon[fillstyle=solid,fillcolor=gray](! -0.25 \psk@oscmetronomex 0.5 sub)(! -0.3 \psk@oscmetronomex 0.3 sub)(! -0.075 \psk@oscmetronomex 0.3 sub)(!-0.075 \psk@oscmetronomex 0.3 add)(!0.075 \psk@oscmetronomex 0.3 add)(!0.075 \psk@oscmetronomex 0.3 sub)(!0.3 \psk@oscmetronomex 0.3 sub)(!0.25 \psk@oscmetronomex 0.5 sub) +\pscircle[fillstyle=solid](!-0.125 \psk@oscmetronomex 0.4 sub){0.08} +\pscircle[fillstyle=solid](!0.125 \psk@oscmetronomex 0.4 sub){0.08} +% fin curseur +{\psset{linecolor=red} +\psline(!-.1 \psk@oscmetronomex)(!0.1 \psk@oscmetronomex)\psline(!0 \psk@oscmetronomex 0.1 sub)(!0 \psk@oscmetronomex 0.1 add) +\psline(! -.1 \psk@oscmetronomed neg)(!0.1 \psk@oscmetronomed neg)\psline(! 0 \psk@oscmetronomed neg 0.1 sub)(!0 \psk@oscmetronomed neg 0.1 add)} +\pnode(!0 \psk@oscmetronomex){C}% curseur +\pnode(! 0 \psk@oscmetronomed neg){D}% disque +%\pstextpath[c](0,-2ex){\psarcn[linestyle=none](D){1}{180}{0}}{\small\textsf{\textbf{m e t r o n o m e}}} +%\pstextpath[c](0,1ex){\psarc[linestyle=none](D){1}{180}{0}}{\small\textsf{\textbf{P S t r i c k s}}} + \end@SpecialObj% +\endgroup} +\psmetronome% +\pstVerb{/tabTempos [40 42 44 46 48 50 52 54 46 58 60 63 66 69 72 76 80 84 88 92 96 100 104 108 112 116 120 126 132 138 144 152 160 168 176 184 192 200 208] def}% + +\def\metronomebody{% + \pspolygon[fillstyle=solid,linewidth=2\pslinewidth,linearc=0.5,fillcolor=yellow!30](-5,-4.5)(5,-4.5)(1,14)(-1,14) + \psline(1.2,4.5)(1.2,12.5) + \psline(-1.2,4.5)(-1.2,12.5) + \multido{\i=0+2}{20}{% + \pstVerb{/BATT tabTempos \i\space get def} + \psline[linecolor=red](!1.2 BATT xT)(!0.7 BATT xT) + \uput[r](!0.7 BATT xT){\psPrintValue[PSfont=Helvetica,fontscale=6]{BATT}} + }% + \multido{\i=1+2}{19}{% + \pstVerb{/BATT tabTempos \i\space get def} + \psline[linecolor=red](!-1.2 BATT xT)(!-0.7 BATT xT) + \uput[r](!-1.3 BATT xT){\psPrintValue[PSfont=Helvetica,fontscale=6]{BATT}}}% + \rput(!0 40 xT){\textsf{\tiny GRAVE}}% + \rput(!0 46 xT){\textsf{\tiny LARGO}}% + \rput(!0 52 xT){\textsf{\tiny LENTO}}% + \rput(!0 58 xT){\textsf{\tiny ADAGIO}}% + \rput(!0 60 xT){\textsf{\tiny LARGETTO}}% + \rput(!0 66 xT){\textsf{\tiny ANDANTE}}% + \rput(!0 76 xT){\textsf{\tiny ANDANTINO}}% + \rput(!0 84 xT){\textsf{\tiny MODERATO}}% + \rput(!0 108 xT){\textsf{\tiny ALLEGRETTO}}% + \rput(!0 132 xT){\textsf{\tiny ALLEGRO}}% + \rput(!0 160 xT){\textsf{\tiny VIVACE}}% + \rput(!0 184 xT){\textsf{\tiny PRESTO}}% + \rput(!0 200 xT){\textsf{\tiny PRESTISSIMO}}% +} + +\def\pendulum#1{% + \pstVerb{/iA #1\space def /date tabTheta iA get def /Theta tabTheta iA 1 add get def}% + \rput{!Theta}{\psmetronomeA}% +} +\makeatother diff --git a/macros/latex/contrib/bibarts/README.txt b/macros/latex/contrib/bibarts/README.txt index 701eb35450..9340896db0 100644 --- a/macros/latex/contrib/bibarts/README.txt +++ b/macros/latex/contrib/bibarts/README.txt @@ -7,7 +7,7 @@ it requires a program, for which source and Windows executable are provided. === -BibArts 2.5 is a LaTeX package to assist in making bibliographical features +BibArts 2.6 is a LaTeX package to assist in making bibliographical features common in the arts and humanities (history, political science, etc.). bibarts.sty provides commands for quotation, register keywords, abbreviations, and especially for a formatted citation of literature, @@ -22,11 +22,11 @@ with BibTeX, and it does not use any data bank except your own LaTeX text. The lists are created by bibsort. A file bibsort.exe is part of the package ( CTAN mirrors > BibArts > bibarts.zip ) and runs on newer Windows systems. Other users first have to create a binary file from bibsort.c (ANSI-C) with -their own C-compiler. BibArts 2.5 is developed and tested on Windows 10 -with the 2022-06-01 LaTeX 2e distribution, but it should be able to work +their own C-compiler. BibArts 2.6 is developed and tested on Windows 10 +with the 2022-11-01 LaTeX 2e distribution, but it should be able to work even with LaTeX 2.09. - BibArts 2.5 (9 files, 8 dated 2022-10-01): + BibArts 2.6 (9 files, 8 dated 2023-06-18): README.txt This file here: Version history bibarts.sty The LaTeX style file ba-short.pdf Short introduction (English) @@ -64,7 +64,7 @@ see examples for the new commands \frompagesep and \ntsep in bibarts.pdf. Changes from BibArts version 2.0 (2015) to version 2.1 (2016): -BibArts 2.0 set \footnotesep to 2ex, whereas 2.1 to 2.5 do *not* change the +BibArts 2.0 set \footnotesep to 2ex, whereas 2.1 to 2.6 do *not* change the pre-set value. If you want to continue with the 2.0-distance between two footnotes, you will have to type \setlength{\footnotesep}{2ex} in your text. @@ -136,15 +136,16 @@ the homogeneous command \bacorr instead of the four different commands commands are still valid). To print the lists, you may say now e.g.: \renewcommand{\frompagesep}{\bacorr ; } \printnumvli \printnumvkc -(7) If you use babel, BibArts will not execute \originalTeX between +(7) If you use BABEL, BibArts will not execute \originalTeX between list items (that's prepared by bibsort, if the catcode of " changes): It -was useless with germanb-babel and caused errors with french-babel. With +was useless with BABEL-German and caused errors with BABEL-French. With german.sty or ngerman.sty, the use of \originalTeX is still reproduced. +[... but see BibArts 2.6.] (8) bibarts.sty provides new commands for the hyphenation in German: - \oldhyss to set a \ss, which is splitted s-s (to be used between vovels, e.g. au\oldhyss er; you have to use your sharp S else, e.g. da{\ss}); -- \newhyss to set a \ss, which is splitted s-s only in small caps, and +- \newhyss to set a \ss, which is splitted s-s only in Small Caps, and else is printing a sharp S, which is splitted as \language says (-\ss); - \hyss to execute \oldhyss, if \language is \l@german, and \newhyss else (e.g. if \language is \l@ngerman), so you can use \hyss in all languages; @@ -208,7 +209,7 @@ utf8enc.dfu from version 2021/01/27 v1.2l to 2021/06/21 v1.2n). === -Changes from BibArts version 2.4 (2022[a]) to version 2.5 (now, 2022b): +Changes from BibArts version 2.4 (2022[a]) to version 2.5 (2022b): (1) You may now put curly brackets around the \ktit{shortened title}, e.g.: @@ -262,7 +263,242 @@ changes in utf8enc.dfu from version 2021/06/21 v1.2n to 2022/06/07 v1.3c). === +Changes from BibArts version 2.5 (2022b) to version 2.6 (now, 2023): + +Version 2.6 improves the use of BibArts with BABEL and UTF-8. For this +purpose, some commands have been expanded: \baoriginalTeX and \bagermanTeX +(for reproducing the catcode of " on BibArts' lists), \hy and \fhy (for +printing a hyphen with a kerning), \abra and \fabra (for editorial additions +in adjusted square brackets). BibArts 2.6 is checking whether LaTeX +defines `\inputencodingname' as `utf8'; if not, [f]hy and [f]abra will +not interpret UTF-8 multi-octets. Commands for compatibility with older +versions of BibArts are added: \notnewhyko and \notnewabra are downgrading +BibArts 2.6 to the older interpretation of [f]hy and [f]abra commands. + + +(1) When you print a BibArts list (e.g., if you use \printvli), the list +items are copies of the arguments of BibArts' commands in your LaTeX text +file (e.g. \vli{FirstName}{LastName}{Title ...}). If such entries originate +from environments with *different catcodes* for the double quote [U+0022], +BibArts will reproduce such changes on its lists (from active " to passive " +or vice versa). Now, additionally BABEL is supported for this purpose: + +(a) BibArts 2.6 tests whether you have loaded BABEL; if NOT, the new BibArts +estimates (IF the catcode of " changes AND " is USED in a respective entry) +that german.sty or ngerman.sty is loaded, *and* that the reason is that YOU +have used \originalTeX, and \germanTeX or \ngermanTeX. So, on BibArts' +lists, like in older versions, the automatically inserted \baoriginalTeX +executes \originalTeX, and \bagermanTeX executes \germanTeX or \ngermanTeX. + +(b) BABEL's command \originalTeX seems never to change the " catcode, but +the MEANING of the active double quote: {\originalTeX "`} is printing *two* +characters. BibArts 2.6 is *not* able to reproduce BABEL's \originalTeX. +Also BABEL's command \selectlanguage apparently does not change any catcode. + +If the catcode of " changes, older BibArts versions since BibArts 2.1 simply +did nothing when BABEL was loaded. Now, BibArts 2.6 estimates that you have +used BABEL's commands \shorthandoff{"} respectively \shorthandon{"} in your +LaTeX file, and BibArts executes both commands on its lists - to reproduce +the conditions of the place in your text where the entries come from. If +you have loaded e.g. \usepackage[ngerman]{babel}, or - despite BibArts 2.6 +provides no Dutch captions - \usepackage[dutch]{babel}, you are free to say + + \shorthandoff{"} ... \vli{}{M"uller}{Title} ... + \shorthandon{"} ... \vli{}{M"uller}{Title} ...; + +and BibArts' sorting program bibsort will detect that: A start of bibsort +will create two items (instead of one) on the lists (e.g. \printvli); and, +if you start bibsort with option -g1 to sort [U+00FC] and "u as 'ue', then +the \shorthandoff{"}-entry is sorted as Muller (BABEL prints a double quote +character between 'M' an 'u'), whereas the \shorthandon{"}-entry is sorted +as Mueller (BABEL prints "u as 'ü'): What you see is what is sorted. + +(c) Anyway, if it has a different meaning in your LaTeX text file when the +catcode of " changes, you must still redefine the corresponding BibArts list +commands. If you have loaded e.g. [n]german.sty, and YOU use \mdqoff and +\mdqon (instead \originalTeX, and \germanTeX or \ngermanTeX), then define: + + \renewcommand{\baoriginalTeX}{\mdqoff} %No user commands! bibsort inserts + \renewcommand{\bagermanTeX}{\mdqon} %\baoriginalTeX and \bagermanTeX. + +Such redefinitions, if ordered, will be executed ALWAYS: They OVERWRITE the +case differentiation between (a) [n]german.sty and (b) BABEL. Together with +BABEL, \mdqoff and \mdqon are known commands, *if* you have loaded BABEL +with options [n]german or [n]austrian or [n]swissgerman. Then, \mdqoff and +\mdqon simply execute \shorthandoff{"} and \shorthandon{"}; and thus all "X +will be reproduced correctly - with or without both redefinitions. + +Commands which are (only) changing catcodes have one problem in common: If +you place such a command INSIDE THE ARGUMENT of e.g. \footnote{...}, then it +will not change what footnote text looks like ("u is PRINTED as without the +command). The decisive catcode is the one which is valid when LaTeX BEGINS +to read an argument. To achieve an impact, you have to say e.g.: + + \mdqoff ... .\footnote{\vli{}{Harry}{The "Big" Book}[2].} + ... .\mdqon \footnote{\vli{}{M"uller}{Title}[3].} + +If you, despite, use such commands INSIDE footnote text, then older versions +reproduced the changed VALUE of the catcode on BibArts' lists (e.g. M"uller +was printed different on the list than in the footnote). Now, BibArts 2.6 +makes the entry on a BibArts' list look exactly like the arguments of a +BibArts' command which you use in a footnote. (But there is only a solution +for active " in BibArts' commands used in footnotes and minipage footnotes.) + +(d) The following creates two items on \printvli now instead of three items: + + \shorthandon{"} \vli{}{"`M"'}{}. + \shorthandoff{"} \vli{}{"`M"'}{}. + \shorthandon{"} \vli{}{"`M"'}{}. + +(A use of „M“ = [U+201E]M[U+201C] instead of the German "`M"' creates +one item; but the distance between M and “ is appropriate in T1, not OT1.) + + +(2) \hy is printing a hyphen ('-') which, in difference to the normal minus +character, allows to split a following word (word division at the end of a +line). If \hy is followed by certain characters or letters, there will be a +kerning additionally. The characters are STILL ` and ', \glq, ), ], \} and +STILL some Latin letters: A, T, v, V, w, W, x, X, y, Y. That means that +e.g. \hy T prints -T with a smaller distance between '-' and 'T'. Use \fhy +instead \hy to prevent a line break between the '-' and following text. +The kerning is even done when the letter has ONE accent: \", \., \=, \^, +\', \`, \~, \b, \c, \d, \H, \k, \r, \u, \v, or the ACTIVE ". Now, \t and +\textcommabelow are new among the accents as well as capital-accents like +\capitalcedilla; and a kerning is also done in front of \AA, \lq, \grq, \rq, +and (accent plus) \AE. If \hy or \fhy are in Small Caps, the new BibArts +2.6 does a kerning in front of \aa as well as (accent plus) \ae, a and t. + +\hy and \fhy now accept all equivalent UTF-8 multi-octets, as far as they +are defined in utf8enc.dfu (2022/06/07 v1.3c); see the list in bibarts.pdf. +Today, \hy Ärmel [U+00C4] or \hy Ångstrom [U+00C5] etc. are handled in the +same way as \hy\"Armel or \hy\r{A}ngstrom. Instead of \hy ‘ [U+2018], you +may also use \hy\textquoteleft or \hy\lq, and instead of \hy ’ [U+2019] +you may also use \hy\textquoteright or \hy\rq now. Note that there is no +kerning when \hy is followed by a comma (Ober\fhy, Mittel- und Unter\hy Bau) +- in difference to \hy\glq Hallo\grq or \hy‚Hallo‘ ([U+201A], [U+2018]). + +If ` or ' are ACTIVE, \hy and \fhy, since BibArts 2.6, will insert the same +kern as in front of the PASSIVE ` or '. With BABEL-activeacute-activegrave- +catalan, you have to use e.g. \hy\`E or \hy È [U+00C8] instead \hy`E. + +It is *not necessary* for you to know whether characters are UTF-8 multi- +octets: (i) If \hy or \fhy are immediately followed by a letter, then +braces are never necessary; and if used, such braces simply will switch off +any kerning. (ii) An accent may always be followed by braces {...}, e.g. +\hy\"{A}. If you do not know whether you have an UTF-8 multi-octet, it will +be better to use curly braces, because LaTeX itself WANTS braces in case of +multi-octets as e.g \b{Ä} [U+00C4] - despite, as mentioned above, \hy and +\fhy will not perform a kerning if letters have more than one accent. + +An error is fixed concerning the hyphenation of a word as e.g. \hy \"Armel +(with [n]german.sty also \hy "Armel): In *T1*, it now can split at the end +of a line. (The [n]german-BABEL does not split "Armel, while Ärmel would.) + +If you have used older versions of BibArts in one of your existing LaTeX +text files, you can use BibArts 2.6 and type \notnewhyko. Then \hy and \fhy +will not handle the new accents and characters; in particular, no kerning is +done in front of UTF-8 multi-octets; and e.g. \hy\"Armel will not split Är- +mel at the end of a line: Concerning \hy and \fhy, \notnewhyko starts a +compatibility mode and any hy-kerning is done as with BibArts 2.5. + +\nothyko still switches off the kerning of \hy and \fhy. In *typewriter +fonts*, where every character (including '-') should have the same width, +the kerning is switched off automatically since BibArts 2.6. If you use +\notnewhyko, you still have to set \nothyko in a typewriter environment +yourself, or you may use the normal minus character there. Also, as in +older versions, e.g. \hy{}T switches off the kerning between '-' and 'T'. + + +(3) In quotations, you may use e.g. \abra{sic!} for editorial comments and +for adding characters, which are missing in the text from which you are +quoting from. On default, BibArts 2.6 CONTINUES to print this additions in +square brackets, e.g. [sic!]. Use \fabra to prevent a line break between +the closing bracket and following characters, e.g.: `misspel\fabra{l}ed' => +`misspel[l]ed'. Certain arguments automatically are printed in subscript +or superscript brackets: E.g. ``This is \fabra{`}strange'.'' (where the +`inner' quotation may represent `...' as well as ``...'' in the original). +The tiny square brackets cannot be shown here; but size (\tiny) and position +of those square brackets are adjusted to the size and position of certain +arguments, e.g.: \abra{.} \abra{,} \abra{-} \abra{...} \abra{\dots} + +The new \abra and \fabra also print the corresponding UTF-8 multi-octets in +such tiny superscript or subscript brackets, e.g. \abra{…} [U+2026]. +Alternatively, you can now use the corresponding LaTeX command, e.g. +\abra{\textellipsis} - in addition to \abra{\dots}. Today, \abra{“} +[U+201C] or \abra{\textquotedblleft} - and together with [n]german: +\abra{"'} or \abra{\grqq} - can be used, each of which prints German right +quotes in tiny brackets. For more examples see bibarts.pdf (version 2.6): +"Argumente, bei denen \abra und \fabra angepasste Klammern drucken". + +The characters ` ' < > can be active or not; since BibArts 2.6, therefore, +e.g. \abra{"<} and \abra{">} from [n]german would be accepted with active +or passive < and > to print French quote characters. BABEL seems to accept +\glqq, \grqq, \flqq and \frqq as well as \glq, \grq, \flq and \frq ALWAYS; +so you can use e.g. \abra{\flq} as synonym for \abra{‹} [U+2039] - even if +\usepackage[UKenglish]{babel} or \usepackage[french]{babel} is loaded. + +If you have used older versions of BibArts in your existing LaTeX text files +before, you can use \notnewabra to avoid a profound change of your existing +line break: With \notnewabra, only the arguments, which already older +versions printed in adjusted brackets, will be printed in tiny brackets, +whereas the `new' arguments will be printed as before (inside normal size +brackets). But explicit errors will not be reproduced, e.g. concerning +LaTeX' mathematical mode: In [n]german, BibArts 2.6 prints $\abra{"`}$ and +$\abra{"'}$ inside normal-sized brackets, whereas BibArts 2.5 did produce an +error message. In text mode, \abra{"`} and \abra{"'} are STILL printed in +tiny brackets, but only if both arguments are commands to print double quote +characters: If BABEL prints "` and "' as two characters, then normal-sized +brackets [] are printed, regardless of whether you typed \notnewabra or not. + +And you now can use e.g. \babbrack{$_{1}$}, $ a\bambrack{\cdot}b=c $, or +30\batbrack{°} to print the tiny brackets at *b*ottom, *m*edium, or *t*op +positions directly (but WITHOUT any automatic centring of the argument). +For symmetry reasons, also \fbatbrack, \fbambrack and \fbabbrack exist. + +"french"-BABEL inserts space in front of active two-part punctuation marks. +If you load \usepackage[french]{babel}, only :;!? are active characters, and +BibArts will not do anything to reproduce changing catcodes on its lists. +But BibArts 2.6 now also prints \abra{:}, \abra{;}, \abra{!} and \abra{?} +with active :;!? as [:], [;], [!] and [?]; also on lists, no extra space is +inserted (with \notnewabra, still [ :], [ ;], [ !], [ ?] is printed). But +BibArts 2.6 still does not handle !` and ?`. "french"-BABEL itself has a +solution, when you can not use \abra{¿} [U+00BF] and \abra{¡} [U+00A1]: +E.g. {\NoAutoSpacing \abra{?`}}. This seems to work even INSIDE ARGUMENTS. + +In difference to e.g. D[a]mpfschifffahrt, LaTeX, at the end of a line, can +split D\fabra{a}mpfschifffahrt (German word division: D[a]mpf-schiff-fahrt). + +In typewriter fonts you can use e.g. \banbrack{.} or \fbanbrack{.} to print +brackets in *n*ormal size (tiny brackets would have an inappropriate width). +The arguments of BibArts' ...abra and ...brack commands are always printed +`upshape', and all, except the `bottom' versions, do an italics correction. +E.g. \textit{(H.\bahasdot\abra{'})} switches the italics correction off. + +If you use BibArts 2.6, you will be able to say \renewcommand{\pabrao}{(} +and \renewcommand{\pabrac}{)}. This will alter \abra, \fabra, \babbrack, +\fbabbrack, \bambrack, \fbambrack, \batbrack, \fbatbrack, \banbrack and +\fbanbrack. Then, e.g. \abra{sic!} will print (sic!) instead of [sic!]. + + +(4) bibsort 2.5 with options -g1 and -g2 sorted "i, "I, "e and "E as i, I, +e and E. In the same case, bibsort 2.6 sorts `active double quote in front +of letter' as `letter with dieresis' now. Also see NUMGER in bibsort.c. + + +(5) BibArts' support of german.sty 2.4a (1991/04/12, where e.g. ..."' +expands to ...\active@dq \dq@prtct {'@} in the .toc-file) may end in +the near future. So, if you have used BibArts together with such very old +German style files: Keep back a copy of bibarts.sty 2.6. - In difference, +the support of ngerman.sty v2.5e and german.sty v2.5e (1998/07/08, where +..."' expands to ...\grmn@active@dq@ ' in the .toc-file) probably +will continue [[but the support of ...\active@dq \dq@prtct {'} from the +compatibility mode which is included in v2.5e will probably also END]]. +- Features relating to BABEL will probably be extended. + + +=== + Published under the terms of the GNU General Public License. -BibArts 2.5 (2022b): -(C) Timo Baumann, Versions 2.x (2015-2022) +BibArts 2.6 (2023): +(C) Timo Baumann, Versions 2.x (2015-2023) diff --git a/macros/latex/contrib/bibarts/ba-short.pdf b/macros/latex/contrib/bibarts/ba-short.pdf Binary files differindex f8e760dbd7..321ab51fec 100644 --- a/macros/latex/contrib/bibarts/ba-short.pdf +++ b/macros/latex/contrib/bibarts/ba-short.pdf diff --git a/macros/latex/contrib/bibarts/ba-short.tex b/macros/latex/contrib/bibarts/ba-short.tex index 14cf1ff1a7..e9c6a46ab7 100644 --- a/macros/latex/contrib/bibarts/ba-short.tex +++ b/macros/latex/contrib/bibarts/ba-short.tex @@ -1,22 +1,30 @@ -%% BibArts 2.5 assists you to write LaTeX texts in arts and humanities. -%% Copyright (C) 2022b Timo Baumann bibarts[at]gmx.de (2022/10/01) +%% BibArts 2.6 assists you to write LaTeX texts in arts and humanities. +%% Copyright (C) 2023 Timo Baumann bibarts[at]gmx.de (2023/06/18) %%% LaTeX + "bibsort -i ba-short -m -utf8 -k -e -h" + LaTeX %%% \documentclass[12pt,a4paper]{article} - \usepackage{bibarts} - \usepackage[utf8]{inputenc} - %\usepackage[english]{babel} - \bacaptionsenglish -\setlength{\footnotesep}{2ex} %% ... as in bibarts.sty 2.0; see README.txt %% + \usepackage[utf8]{inputenc} + \usepackage[OT1]{fontenc} %%\usepackage[T1]{fontenc} + + %\usepackage[english]{babel} + %\sethyphenation{USenglish} -\hyphenation{Last-Name} +\usepackage{bibarts} +\bacaptionsenglish +\setlength{\footnotesep}{2ex} %% as in bibarts.sty 2.0; see README.txt %% + + \hyphenation{Last-Name} \title{The \LaTeX\hy Package \BibArts \\[1.25ex] {\normalsize\slshape - A package to assist in making bibliographical features \\[-1.25ex] common in the arts and humanities}} - \author{\textsc{Timo Baumann}} - \date{\small {Version 2.5 (2022b).} \hspace{2.25em} {\copyright\ 2.x (2015$-$2022).}} + A package to assist in making bibliographical features \\[-1.25ex] common + in the arts and humanities}} + + \author{\scshape Timo Baumann} + + \date{\small Version 2.6 (2023). \hspace{2.25em} \copyright\ 2.x + (2015$-$2023).} \setcounter{secnumdepth}{0} %\renewcommand{\kxxemph}{\em} @@ -33,14 +41,16 @@ \renewcommand{\}}{{\normalfont\rbashortmem}} \long\def\Doppelbox#1#2{\nopagebreak\vspace{2.25ex}% - {\fbox{\parbox{.45\textwidth}{\frenchspacing\raggedright\footnotesize\ttfamily - \ignorespaces #1}\hfill\parbox{.45\textwidth}{\vspace{1ex}% - \begin{minipage}{.45\textwidth}\sloppy\small - \renewcommand{\thempfootnote}{\arabic{mpfootnote}}% - \setcounter{mpfootnote}{\arabic{footnote}}% - {\ignorespaces #2}% - \setcounter{footnote}{\arabic{mpfootnote}}% - \end{minipage} + {\fbox{\parbox{.45\textwidth}{\frenchspacing\raggedright + \footnotesize\ttfamily + \ignorespaces #1}\hfill + \parbox{.45\textwidth}{\vspace{1ex}% + \begin{minipage}{.45\textwidth}\sloppy\small + \renewcommand{\thempfootnote}{\arabic{mpfootnote}}% + \setcounter{mpfootnote}{\arabic{footnote}}% + {\ignorespaces #2}% + \setcounter{footnote}{\arabic{mpfootnote}}% + \end{minipage} \vspace{1ex}}}\vspace{2.4ex}}} \let\mempage=\thepage @@ -54,13 +64,13 @@ \maketitle \thispagestyle{empty} -{\small\tableofcontents} +{\footnotesize\tableofcontents} \vfill\noindent\rule{\textwidth}{.1pt} \vspace{1.75ex} \hbox{\parbox{7.7cm}{\footnotesize\noindent -\textbf{\BibArts~2.5 (9 files, 8 dated 2022/10/01):} \\[.875ex] +\textbf{\BibArts~2.6 (9 files, 8 dated 2023/06/18):} \\[.875ex] \begin{tabular}{ll}% \texttt{README.txt} & Version history since 1.3 \\[-1.75pt] \texttt{bibarts.sty} & The \LaTeX\ style file \\[-1.75pt] @@ -96,13 +106,14 @@ \newpage \section{Introduction} - Type \verb|\usepackage{bibarts}| into your \textit{file}.\texttt{tex}, and - \verb|\bacaptionsenglish| to switch to English captions (to name pages p., - not S.). They are used here. \verb|\bacaptionsfrench| sets French captions; - default is \verb|\bacaptionsgerman|. + Type \verb|\usepackage{bibarts}| in your \textit{file}.\texttt{tex}, and let + \verb|\bacaptionsenglish| or \verb|\bacaptionsgerman| or + \verb|\bacaptionsfrench| follow. In this file here, the mode is + \verb|\bacaptionsenglish| \hspace{.05em}(to get a `p.\ko' in front of + page numbers, etc.). - \vspace{.75ex}\noindent - You need to write the full reference once (the page number \verb|[Pg]| is optional): + \vspace{1ex}\noindent + The idea is to begin with the full reference (page numbers \verb|[Pg]| are optional) \vspace{-.4ex} \Doppelbox @@ -110,20 +121,25 @@ \bs vli\{FirstName\}\{LastName\} \\ \ \ \{The \bs ktit\{kTitle\}, \\ \ \ \ place and year of - \\ \ \ \ publication\}[Pg]. + \\ \ \ \ publication\}[Pg]. } { \vli{FirstName}{LastName} {The \ktit{\kTitle}, place and year of publication}[Pg]. } - \noindent - This full reference will also be found in the Bibliography (see \verb|\printvli| on p.\,\pageref{appendix}). The \BibArts' program - \texttt{bibsort} creates your List of Literature. - You have to enter at the prompt: (1) \LaTeX\ \textit{file}, (2) \texttt{bibsort} \texttt{-utf8} \textit{file}, (3) \LaTeX\ \textit{file}. - - \vspace{.75ex}\noindent - After the first full citation (\kern -0.02em\textsf{v}oll), you may use shortened references (\textsf{k}urz\kern -0.02em): + \vspace{-.25ex}\noindent + ...\ because \BibArts\ uses such full citations to create the + List of Literature automatically (see + \verb|\printvli| on p.\,\pageref{appendix}). UTF-8 is usual today, + and you can enter at the prompt: + \hspace{.5em}(1)\texttt{~}\LaTeX\texttt{~}\textit{file}, + \hspace{.5em}(2)\texttt{~}\texttt{bibsort~-utf8}\hspace{.65em}\textit{file}, + \hspace{.5em}(3)\texttt{~}\LaTeX\texttt{~}\textit{file}. + + \vspace{1ex}\noindent + After the first full citation (\kern -0.02em\texttt{v}oll), you can use + shortened references (\texttt{k}urz\kern -0.02em): \vspace{-.6ex} \Doppelbox @@ -134,65 +150,66 @@ \kli{LastName}{\kTitle}[Pg]. } - \vspace{-.3ex}\noindent - Use \verb|\vqu| and \verb|\kqu| \hspace{.1em}in the same way - \hspace{.1em}to cite published documents (\kern -0.04em\textsf{Qu}ellen\kern -0.02em): + \vspace{-.3ex}\noindent + Use \verb|\vqu| \hspace{.1em}and \verb|\kqu| \hspace{.1em}in the same way + to cite published documents (\kern-0.04em\textsf{Qu}ellen\kern-0.025em): -\vspace{-.25ex} -\Doppelbox -{ - \bs vqu \{Carl von\} \{Clausewitz\} \{\bs ktit\{Vom Kriege\}. - \\ \ Hinterlassenes Werk, 3\bs fup\{rd\} - \\ \ ed.\bs\ Frankfurt/M. 1991\}[3]. - \\[2.6ex] - \bs kqu\{Clausewitz\}\{Vom Kriege\}[3]. -} -{ - \vqu {Carl von} {Clausewitz} {\ktit{Vom Kriege}. - Hinterlassenes Werk, 3\fup{rd} ed.\ Frankfurt/M. 1991}[3]. - \\[1.25ex] - \kqu{Clausewitz}{Vom Kriege}[3]. -} + \vspace{-.25ex} + \Doppelbox + { + \bs vqu \{Carl von\} \{Clausewitz\} \{\bs ktit\{Vom Kriege\}. + \\ \ Hinterlassenes Werk, 3\bs fup\{rd\} + \\ \ ed.\bs\ Frankfurt/M. 1991\}[3]. + \\[2.6ex] + \bs kqu\{Clausewitz\}\{Vom Kriege\}[3]. + } + { + \vqu {Carl von} {Clausewitz} {\ktit{Vom Kriege}. + Hinterlassenes Werk, 3\fup{rd} ed.\ Frankfurt/M. 1991}[3]. + \\[1.25ex] + \kqu{Clausewitz}{Vom Kriege}[3]. + } \vspace{-.25ex}\noindent - Then, \verb|\printvqu| will print a List of Published Documents - (full references\kern -0.02em). + Then, \verb|\printvqu| will print a List of Published Documents (full + references\kern-0.02em). - \vspace{.75ex}\noindent - And \verb|\printnumvkc| (p.\,\pageref{vkc}) will print an index - of all your shortened references (from \verb|\kli|, \verb|\kqu|, and - from \verb|\ktit| inside the last argument of \verb|\vli| or \verb|\vqu|). + \vspace{1.25ex}\noindent + And \verb|\printnumvkc| (p.\,\pageref{vkc}) will print an index of all your + shortened references (created from \verb|\kli|, \verb|\kqu|, and the last names + plus \verb|\ktit| \hspace{.05em}in \verb|\vli| or \verb|\vqu|). - \vspace{.75ex}\vfill\noindent - There are also \BibArts\hy commands to cite periodicals - and archive documents: + \vspace{.75ex}\vfill\noindent + \BibArts\ also provides commands for citing periodicals and unpublished records: \vspace{-.35ex} \Doppelbox { - \bs per\{Journal\}\string_Num\string_[Pg] + \bs per\{Journal Name\}\string_Num\string_[Pg] \\[1ex] \bs arq\{Unpublished Document\} - \\ \ \{Archive File Sig\}\string|Vol\string|(Folio) + \\ \ \{Archive Signature\}\string|Vol\string|(Folio) } { - \per{Journal}_Num_[Pg] + \per{Journal Name}_Num_[Pg] \\[.5ex] \arq{Unpublished Document} - {Archive File Sig}|Vol|(Folio) + {Archive Signature}|Vol|(Folio) } \vspace{-.25ex}\noindent - \verb|\printper| your Periodicals, and \verb|\printarq| the List of Archive - Files. Type no spaces in front of the optional arguments \verb+[Pg]+, - \verb+(Foilo)+, \verb+|Vol|+, or \verb+_Num_+. + Spaces in front of the optional arguments \verb+_Num_+ or \verb+|Vol|+, + \verb+[Pg]+ or \verb+(Folio)+ are forbidden. \verb|\printper| + prints a List of Journals, \verb|\printarq| of Signatures. \newpage -\noindent -In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing -\textsc{ibidem} automatically. That means, that \verb|\kli|, \verb|\kqu|, -\verb|\per|, and \verb|\arq| can change to \textsc{ibidem}: + + \noindent + In footnotes, you do not have to put \textsc{ibidem} yourself. \BibArts\ + detects repeatedly cited sources and changes \verb|\kli|, \verb|\kqu|, + \verb|\per| and \verb|\arq| \hspace{.1em}automatically: + \setcounter{footnote}{0} {\footnotesize\begin{verbatim} @@ -207,52 +224,54 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing <5> ...\footnote{\arq{Haber to Kultusminister, 17 December 1914} {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, Litt~A, Nr.\,108}|2|(223\f).} - + <6> \footnote{\arq{Setsuro Tamaru to Clara Haber, 24 December 1914} - {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, + {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, Litt~A, Nr.\,108}|2|(226-231).} - + <7> \footnote{\arq{Setsuro Tamaru to Clara Haber, 24 December 1914} - {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, - Litt~A, Nr.\,108}|2|(226-231).} - + {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, % use copy & paste + Litt~A, Nr.\,108}|2|(226-231).} % to repeat exactly + <8> \footnote{\arq{Valentini to Schmidt, 13 March 1911} {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, Litt~A, Nr.\,108}|1|(47).} - + \fillarq{GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, Litt~A, Nr.\,108} {2\,Vols.} \end{verbatim}} - \noindent - When you introduce a book,\footnote{ \vli{Niklas} {Luhmann} {\ktit{Soziale Systeme}. - Grundriß einer allgemeinen Theorie, Frankfurt/M. 1984}.} - you are free to add a \verb+|Vol|+, or not. But if you set a \verb+|Vol|+ once, - you will have to repeat that, when you refer to the same book in the following - footnote (or say \verb|\clearbamem|). - \verb+[Pg]+ is equivalent. You may also cite one work several times in the same - footnote.\footnote{\kli{Luhmann}{Soziale Systeme}|1|[22], and - \kli{Luhmann}{Soziale Systeme}|1|[23].}\,% - \footnote{\kli{Luhmann}{Soziale Systeme}|1|[23]. Next sentence.}\,% - \footnote{\kli{Luhmann}{Soziale Systeme}|2|[56].} + \noindent + When you introduce a book,\footnote{ \vli{Niklas} {Luhmann} {\ktit{Soziale + Systeme}. Grundriß einer allgemeinen Theorie, Frankfurt/M. 1984}.} you are + free to add a \verb+|Vol|+, or not. But when you use \verb+|Vol|+ once, you + will have to repeat that, if you refer to the same book in the following + footnote again (or say \verb|\clearbamem|). \verb+[Pg]+ is equivalent. You + may also cite one work several times in the same + footnote.\footnote{\kli{Luhmann}{Soziale Systeme}|1|[22], and + \kli{Luhmann}{Soziale Systeme}|1|[23].}\,% + \footnote{\kli{Luhmann}{Soziale Systeme}|1|[23]. Next sentence.}\,% + \footnote{\kli{Luhmann}{Soziale Systeme}|2|[56].} \vspace{1ex}\noindent And here are examples about how to cite archive - sources.\footnote{\arq{Haber to Kultusminister, 17 December 1914} - {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, Litt~A, Nr.\,108}|2|(223\f).}\,% + sources.% + \footnote{\arq{Haber to Kultusminister, 17 December 1914} + {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, + Litt~A, Nr.\,108}|2|(223\f).}\,% \footnote{\arq{Setsuro Tamaru to Clara Haber, 24 December 1914} - {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, - Litt~A, Nr.\,108}|2|(226-231).}\,% + {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, + Litt~A, Nr.\,108}|2|(226-231).}\,% \footnote{\arq{Setsuro Tamaru to Clara Haber, 24 December 1914} - {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, - Litt~A, Nr.\,108}|2|(226-231).}\,% + {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, % use copy & paste + Litt~A, Nr.\,108}|2|(226-231).}\,% % to repeat exactly \footnote{\arq{Valentini to Schmidt, 13 March 1911} - {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, - Litt~A, Nr.\,108}|1|(47).} - \fillarq{GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, - Litt~A, Nr.\,108} {2\,Vols.} - The \verb|\fillarq| above adds to the entry in the - \texttt{arq}\hy list that ``Nr.\,108'' has 2 volumes \baref{arqlist}. + {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, + Litt~A, Nr.\,108}|1|(47).} + \fillarq{GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, + Litt~A, Nr.\,108} {2\,Vols.} + The \verb|\fillarq| above adds to the item on the \texttt{arq} list + that ``Nr.\,108'' has 2 volumes \baref{arqlist}. \newpage @@ -261,11 +280,12 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing \setcounter{footnote}{0} \section{Switches} For writing an essay without a List of Literature, type \verb|\conferize| - at the top of your \LaTeX\ file; then, \verb|\kli| will print a cross\hy + at the top of your \LaTeX\ text; then \verb|\kli| prints a cross\hy reference to the full reference: \Doppelbox - {\bs conferize\ ...\bs footnote\{ + { + \bs conferize\ ...\bs footnote\{ \\[.15ex] \ \ Full ref.: \ \bs vli\{Niklas\} \\[.05ex] \ \ \ \{Luhmann\} \b{\{}\bs ktit\{Soziale \\[.15ex] \ \ \ \ \ \ \ \ Systeme\}. Grundriß @@ -276,29 +296,31 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing \\ \ Shortened ref.: \bs kli\{Luhmann\} \\ \ \ \ \ \ \ \{Soziale Systeme\}[23\bs f].\} } - {\conferize ...\footnote{ - Full ref.: \vli{Niklas}{Luhmann} {\ktit{Soziale Systeme}. - Grundriß einer allgemeinen Theorie, Frankfurt/M. 1984}[22].} + { + \conferize ...\footnote{ + Full ref.: \vli{Niklas}{Luhmann} {\ktit{Soziale Systeme}. + Grundriß einer allgemeinen Theorie, Frankfurt/M. 1984}[22].} \texttt{[u, v]} or \texttt{[w-x]} or \texttt{[y\bs f]} or - \texttt{[z\bs baplural]} are creating pp.\footnote{\notibidemize - %no ibidem in this footnote% - Shortened ref.: \kli{Luhmann} {Soziale Systeme}[23\f].} + \texttt{[z\bs baplural]} are creating pp.\footnote{\notibidemize + %no ibidem in this footnote% + Shortened ref.: \kli{Luhmann} {Soziale Systeme}[23\f].} } \noindent - If \texttt{k}\textit{\fhy commands} \verb|\kli| and \verb|\kqu| are never - used, \verb|\notannouncektit| shortened references at \texttt{v}\textit{\fhy commands} - ({\footnotesize cited as ...} will not be printed at \verb|\vli| and - \verb|\vqu|). + If the \texttt{k}\textit{\fhy commands} \verb|\kli| and \verb|\kqu| are + never used: \verb|\notannouncektit| will stop \verb|\vli| and \verb|\vqu| + to print `{\footnotesize (cited as \fabra{...})}'. No historian? Set \verb|\notprinthints| $-$ you will never use \verb|\vqu| or \verb|\kqu|, and therefore, it is unnecessary to print \ehinttovliname, because there is only one \texttt{v}\textit{\fhy list}. -\section{The extra \texttt{*}\{\ko\textit{argument}\} of \texttt{v}- and \texttt{k}\fhy commands} +\section{The extra \texttt{*}\{\ko\textit{argument}\} of \texttt{v}- and +\texttt{k}\fhy commands} -\textit{Works by multiple authors}: Use \texttt{x}\fhy commands with co\hy authors in \texttt{*}\hy arguments: + For works by multiple authors, use \texttt{x}\textit{\fhy commands} and + the optional \texttt{*}\hy argument: \Doppelbox { @@ -306,80 +328,83 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing \\ \ \bs xvli\{FirstName\}\{LastName\} \\ \ \ *\b{\{}\bs vauthor\{co-FirstName\} \\ \ \ \ \ \ \{co-LastName\}\b{\}} - \\ \ \ \{The \bs ktit\{kTitle2\} ETC\}.\} + \\[.25ex] \ \ \{The \bs ktit\{kTitle2\} etc.\}.\} \\[1.25ex] - ... to ibidemize.\bs footnote\{ + \ \ \ \ \ \ \ ...\bs footnote\{ \\ \ \bs xkli\{LastName\} \\ \ \ *\{\bs kauthor\{co-LastName\}\} - \\ \ \ \{kTitle2\}[11-14].\} + \\[.25ex] \ \ \{kTitle2\}[11-14].\} } { Set names in \texttt{\bs vauthor}~$-$\,\texttt{\bs kauthor}.\footnote{Two: \xvli{FirstName}{LastName} *{\vauthor{co-FirstName} {co-LastName}} - {The \ktit{\kTitle2} ETC}.} + {The \ktit{\kTitle2} etc.}.} - That's necessary to ibidemize.\footnote{\xkli{LastName}*{\kauthor{co-LastName}}{\kTitle2}[11-14].} + That's necessary to get an \textsc{ibidem}.\footnote{ + \xkli{LastName}*{\kauthor{co-LastName}}{\kTitle2}[11-14].} } \noindent - You may also use \texttt{*}\fhy arguments to mask text (\verb|\editor|) in the ibidemization: + You may also use \texttt{*}\fhy arguments to mask text (\verb|\editor|) in + the `ibidemization': \Doppelbox { ...\bs footnote\{An edited book is - \\ \ \bs vli\{FirstName\}\{LastName\} - \\ \ \ *\{\bs onlyvoll\{\bs editor\}\} - \\ \ \ \{The \bs ktit\{kTitleEd\} ETC\}[2].\} + \\ \ \bs vli \{FirstName\} \{LastName\} + \\ \ *\{\bs onlyvoll\{\bs editor\}\} + \\[.25ex] \ \{The \bs ktit\{kTitleEd\} etc.\}[2].\} \\[1.25ex] - \bs footnote\{ \%Without *-argument:\ - \\ \ \bs kli\{LastName\}\{kTitleEd\}[3, 6].\} + \bs footnote\{ \ \%\% Without *\{arg\}:\ + \\[.25ex] \ \bs kli\{LastName\}\{kTitleEd\}[3, 6].\} } - { - \texttt{\bs editor} has no sorting - weight.\footnote{An edited book is - \vli{FirstName}{LastName} - *{\onlyvoll{\editor}} - {The \ktit{\kTitle Ed} ETC}[2].} - \footnote{ %Without *-argument:\ - \kli{LastName}{\kTitle Ed}[3, 6].} + { + \texttt{\bs onlyvoll} completely fills + \texttt{*\{}\ko\textit{arg}\texttt{\}}.\footnote{An + edited book is + \vli {FirstName} {LastName} + *{\onlyvoll{\editor}} + {The \ktit{\kTitle Ed} etc.}[2].}\,% + \footnote{ %% Without *{arg}: + \kli{LastName}{\kTitle Ed}[3, 6].} } \newpage \noindent - For works with three or more authors, you have to set all `middle' authors + For works with three or more authors, you must put all the `middle' authors in \verb|\midvauthor| (or \verb|\midkauthor|), and the `last' in \verb|\vauthor| (or \verb|\kauthor|): \vspace{-.125ex} -\Doppelbox + \Doppelbox { - ...\bs footnote \b{\b{\{}}See + ...\bs footnote \{See \\ \ \bs xvli\{Manfred F.\}\{Boemeke\} \\ \ \ *\b{\{}\bs midvauthor\{Roger\} \\ \ \ \ \ \ \ \ \ \ \ \{Chickering\} \\ \ \ \ \ \bs vauthor\{Stig\}\{Förster\}\% \\ \ \ \ \ \bs onlyvoll\{ \bs editors\}\b{\}} - \\[.2ex] \ \ \{\bs ktit\{Anticipating Total War\}. + \\[.2ex] \ \b{\b{\{}}\bs ktit\{Anticipating Total War\}. \\ \ \ \ The German and American \\ \ \ \ Experiences 1871-{}-1914, - \\ \ \ \ Cambridge/U.\bs,K. 1999\}.\b{\b{\}}} + \\ \ Cambridge\bs baslash U.\string~K. 1999\b{\b{\}}}.\} \\[.275ex] - ... all LastNames.\bs footnote \{ + Repeat ... but ...\bs footnote \{ \\ \ \bs xkli\{Boemeke\} \\ \ \ *\b{\{}\bs midkauthor\{Chickering\} \\ \ \ \ \ \bs kauthor\{Förster\}\b{\}} \\ \ \ \{Anticipating Total War\}[9\bs f]!\} } { - \texttt{bibsort} sorts \texttt{\bs vauthor\{F\}\{L\}}, + \texttt{bibsort} sorts \texttt{\bs vauthor\{F\}\{L\}} and \texttt{\bs midvauthor\{F\}\{L\}} always as \texttt{L F}.\footnote {See \xvli{Manfred F.}{Boemeke}*{\midvauthor{Roger}{Chickering} \vauthor{Stig}{Förster}% \onlyvoll{ \editors}}{\ktit{Anticipating Total War}. - The German and American Experiences 1871--1914, Cambridge/U.\,K. 1999}.} + The German and American Experiences 1871--1914, Cambridge\baslash U.~K. 1999}.} Repeat all \texttt{LastName}s in \texttt{\bs xkli}, but not the argument of \texttt{\bs onlyvoll}.\footnote @@ -391,114 +416,117 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing \vspace{-1ex} \section{Refer to different articles from the same source} -\vspace{-.75ex} -Use \verb|\per| inside the last argument of a \texttt{v}\fhy command to cite articles in journals: - -\Doppelbox -{ -...\bs footnote\{See \bs vqu \{John -\\ \ \ Frederick Charles\} \{Fuller\} -\\ \ \b{\{}Gold Medal (Military) -\\ \ \ \bs ktit\{Prize Essay\} for 1919, -\\ \ \ first published in: -\\ \ \ \bs per\{Journal of the Royal -\\ \ \ \ \ \ \ \ United Service -\\ \ \ \ \ \ \ \ Institution\}\string_458 -\\ \ \ \ \ \ \ \ \ (1920)\string_[239-274]\b{\}}*[240].\} -\\[1.5ex] -...\bs footnote\{ \bs kqu \{Fuller\} -\\ \ \ \ \ \ \ \ \ \ \ \{Prize Essay\}[241].\} -\\[1.5ex] -... here.\bs footnote\{ \bs vqu\{R.\} -\\ \ \{Chevenix Trench\} -\\ \ \{Gold Medal (Military) -\\ \ \ \bs ktit\{Prize Essay\} for 1922, -\\ \ \ in: \bs per\{Journal of the -\\ \ \ \ \ \ \ \ Royal United Service -\\ \ \ \ \ \ \ \ Institution\}\string_470 -\\ \ \ \ \ \ \ \ \ (1923)\string_[199-227]\}*[200].\} -} -{ -You can use \texttt{*[Pg]} to cite a -certain page inside \texttt{[PgBegin-PgEnd]}. -Do not type spaces in front of \texttt{*[Pg]}.\footnote{See -\vqu {John Frederick Charles} {Fuller} -{Gold Medal (Military) \ktit{Prize Essay} for 1919, -first published in: \per{Journal of the Royal United Service -Institution}_458 (1920)_[239-274]}*[240].} - -\BibArts\ creates an outer \textsc{ibidem} -here.\footnote{ \kqu {Fuller} {Prize Essay}[241].} - -\BibArts\ creates an inner \textsc{ibidem} -here.\footnote{ \vqu{R.} -{Chevenix Trench} -{Gold Medal (Military) \ktit{Prize Essay} for 1922, -in: \per{Journal of the Royal United Service -Institution}_470 (1923)_[199-227]}*[200].\label{third}} -} + \vspace{-.75ex} + Insert \verb|\per| in the last argument of a \texttt{v}\textit{\fhy command} for + citing journal articles: + + \Doppelbox + { + ...\bs footnote\{See \bs vqu \{John + \\ \ \ Frederick Charles\} \{Fuller\} + \\ \ \b{\{}Gold Medal (Military) + \\ \ \ \bs ktit\{Prize Essay\} for 1919, + \\ \ \ first published in: + \\ \ \ \bs per\{Journal of the Royal + \\ \ \ \ \ \ \ \ United Service + \\ \ \ \ \ \ \ \ Institution\}\string_458 + \\ \ \ \ \ \ \ \ \ (1920)\string_[239-274]\b{\}}*[240].\} + \\[1.5ex] + ...\bs footnote\{ \bs kqu \{Fuller\} + \\ \ \ \ \ \ \ \ \ \ \ \{Prize Essay\}[241].\} + \\[1.5ex] + ... inner ...\bs footnote\{ \bs vqu\{R.\} + \\ \ \{Chevenix Trench\} + \\ \ \{Gold Medal (Military) + \\ \ \ \bs ktit\{Prize Essay\} for 1922, + \\ \ \ in: \bs per\{Journal of the + \\ \ \ \ \ \ \ \ Royal United Service + \\ \ \ \ \ \ \ \ Institution\}\string_470 + \\ \ \ \ \ \ \ \ \ (1923)\string_[199-227]\}*[200].\} + } + { + You can use \texttt{*[Pg]} to cite a + certain page inside \texttt{[PgBegin-PgEnd]}. + Do not type spaces in front of \texttt{*[Pg]}.\footnote{See + \vqu {John Frederick Charles} {Fuller} + {Gold Medal (Military) \ktit{Prize Essay} for 1919, + first published in: \per{Journal of the Royal United Service + Institution}_458 (1920)_[239-274]}*[240].} + + \BibArts\ creates an outer \textsc{ibidem} here.\footnote{ \kqu {Fuller} + {Prize Essay}[241].} + + \BibArts\ creates an inner \textsc{ibidem} + here.\footnote{ \vqu{R.} + {Chevenix Trench} + {Gold Medal (Military) \ktit{Prize Essay} for 1922, + in: \per{Journal of the Royal United Service + Institution}_470 (1923)_[199-227]}*[200].\label{third}} + } \noindent - After the main arguments of \verb|\per|, or \verb|\vli|, etc., you are free - to type \verb+_Num_+, or \verb+|Vol|+; both are only printing different + The last argument of \verb|\vli|, \verb|\kli|, \verb|\per|, etc., may each be + followed by \verb+_Num_+ or \verb+|Vol|+; both are only printing different separators (see in note~\ref{third}: {\footnotesize no.\,470}). \noindent - To cite an article from a book, you may use \verb|\vli| for the book - \textit{inside the last} \texttt{v}\textit{\fhy argument}. - \verb|\printvli| is \textit{printing} such inner references + When citing an article from a book, you can use \verb|\vli| + \textit{inside the last} \texttt{v}\textit{\fhy argument} for the book. + \verb|\printvli| is \textit{printing} such `inner references' \textit{as shortened references}; the \textit{full inner reference} - appears as separate item (see \underline{Publ}). For further articles from - the same book, you may use an inner \verb|\kli| for the book: + appears as separate item (see \underline{Publ.}). For further articles from + the same book, you may use an \textit{inner} \verb|\kli| for the book: \vspace{-.25ex} - \Doppelbox{ - \bs footnote\{\bs vli\{\} \{Pitt\} \b{\b{\{}}The - \\[-.2ex] \ \ \ \ \ \ \ \ \ \ \ \ \ \ \bs ktit\{First\}, in: - \\[.25ex] \bs vli\{J.\}\{Yi\}\{The \bs ktit\{iT\} - \\[.25ex] \ \ \ \ \ \ \ \ \ \ \bs underline\{Publ\}\}\b{\b{\}}}.\} - \\[.75ex] \bs footnote\{\bs kli \{Pitt\}\{First\}.\} - \\[1ex] \bs footnote\{\bs vli[m]\{\}\{Pitt\}\b{\{}The - \\[.2ex] \ \ \ \ \ \ \ \ \ \ \ \bs ktit\{Second\}, in: - \\[-.05ex] \ \ \ \ \ \ \ \ \bs kli\{Yi\}\{iT\}[7-9]\b{\}}*[8].\} + \Doppelbox + { + \bs footnote\{ \ \ \bs vli\{\} \{Pitt\} \b{\b{\{}}The + \\[-.2ex] \ \ \ \ \ \ \ \ \ \ \ \ \ \ \bs ktit\{First\}, in: + \\[.25ex] \bs vli\{J.\}\{Yi\}\{The \bs ktit\{iR\} + \\[.25ex] \ \ \ \ \ \ \bs underline\{Publ.\}\}[4-6]\b{\b{\}}}.\} + \\[.75ex] \bs footnote\{\bs kli \{Pitt\}\{First\}[4].\} + \\[1ex] \bs footnote\{\bs vli[m]\{\}\{Pitt\}\b{\{}The + \\[.2ex] \ \ \ \ \ \ \ \ \ \ \ \bs ktit\{Second\}, in: + \\[-.05ex] \ \ \ \ \ \ \ \ \bs kli\{Yi\}\{iR\}[7-9]\b{\}}*[8].\} } { - \texttt{\bs vli[f]}...\ or \texttt{\bs kli[f]}...\ would refer to `the same female author'.% - \footnote{\vli {}{Pitt}{The \ktit{First}, in: \vli{J.}{Yi} {The \ktit{\protect\fbox{iT}} \underline{Publ}}}.} - \footnote{\kli {Pitt}{First}.} - \footnote{\vli[m]{}{Pitt} {The \ktit{Second}, in: \kli{Yi}{\protect\fbox{iT}}[7-9]}*[8].\vspace{1ex}\strut} + \texttt{ \bs vli[f]}...\ or \texttt{\bs kli[f]}...\ would refer to `the same female author'.% + \footnote{\vli {}{Pitt}{The \ktit{First}, in: \vli{J.}{Yi} {The \ktit{\protect\fbox{iR}} \underline{Publ.}}[4-6]}.}\,% + \footnote{\kli {Pitt}{First}[4].}\,% + \footnote{\vli[m]{}{Pitt} {The \ktit{Second}, in: \kli{Yi}{\protect\fbox{iR}}[7-9]}*[8].\vspace{1ex}\strut} } -\noindent -If the shortened inner referencing in the bibliography and the inner ibidemization in footnotes -is not wanted, use \verb|\ntvauthor| instead of the inner \verb|\vli|: - -\vspace{-.275ex} -\Doppelbox -{ - \vspace{.225ex} - \bs footnote\{\bs vli\{Jost\}\{Dülffer\} - \\[.35ex] \ \b{\{}\bs em \bs ktit\{Einleitung\}\bs em, - \\[.35ex] \ \ in: \bs ntvauthor\{Jost\}\{Dülffer\} - \\[.35ex] \ \ Bereit zum Krieg\b{\}}[9].\} - \\[2.25ex] - \bs footnote\{\bs kli\{Dülffer\} - \\ \ \ \ \ \ \ \ \{Einleitung\}[9].\} -} -{ - \texttt{\bs emph\{\bs ktit\{}\fabra{...}\texttt{\}\}} masks {\scriptsize cited as \fabra{...}},\vspace{-.1ex} - so use \texttt{\bs em} \abra{...}\,\texttt{\bs em} to emphasize!\footnote{\vli{Jost}{Dülffer} - {\em \ktit{Einleitung}\em, - in: \ntvauthor{Jost}{Dülffer} Bereit zum Krieg}[9].} - \footnote{\kli{Dülffer} - {Einleitung}[9].} -} + \noindent + If neither a shortened inner reference in the bibliography nor an `inner + ibidemization' in footnotes is wanted, use \verb|\ntvauthor| instead of + the inner \verb|\vli|: + + \vspace{-.275ex} + \Doppelbox + { + \vspace{.225ex} + \bs footnote\{\bs vli\{Jost\}\{Dülffer\} + \\[.35ex] \ \b{\{}\bs textit\{\bs ktit\{Einleitung\}\}, + \\[.35ex] \ \ in: \bs ntvauthor\{Jost\}\{Dülffer\} + \\[.35ex] \ \ Bereit zum Krieg\b{\}}[9].\} \ \ \ \%ok + \\[2.25ex] + \bs footnote\{\bs kli\{Dülffer\} + \\ \ \ \ \ \ \ \ \{Einleitung\}[9].\} + } + { + Please do not use \texttt{\bs textit\{}\textit{italics}\texttt{\}} + at the end of a \BibArts' \texttt{\b{\{}}\textit{argument}$\bullet$\texttt{\b{\}}}.\footnote{\vli{Jost}{Dülffer} + {\textit{\ktit{Einleitung}}, + in: \ntvauthor{Jost}{Dülffer} Bereit zum Krieg}[9].}\,% + \footnote{\kli{Dülffer} + {Einleitung}[9].}\vspace{-.25em} + } \vfill\noindent If you use \verb|\printnumvli| instead of \verb|\printvli|, an -\textit{index referring to page and footnote numbers} will be printed. -Here, \fbox{iT} is a centrally defined inner\,k\kern -0.05em Title: +\textit{index referring to page and footnote numbers} will be printed; +\fbox{iR} \hspace{.05em}is a centrally defined `inner reference': \vfill {\baonecolitemdefs\printnumvlilist} @@ -516,21 +544,22 @@ Here, \fbox{iT} is a centrally defined inner\,k\kern -0.05em Title: \newpage\noindent In the case of multiple works by one author, -you may enter \hspace{.25em} \texttt{bibsort -k }\abra{...}\ \hspace{.005em} at the prompt. -Then, in both \texttt{v}\fhy lists, \BibArts\ inserts \hspace{.05em} $\sim$ \hspace{.005em} -instead of the repeated \textit{first name and last name}. -And \texttt{-e} prints the last names of co\hy authors first. Anyway, -\label{appendix} \hspace{-.05em}\verb|\printbibtitle|\hspace{.05em}\verb|\printvli|\hspace{.05em}\verb|\printvqu| -will print your bibliography: +you may enter \hspace{.25em}\hbox{\texttt{bibsort -k }\abra{...}}\ at the prompt. +Then, in both \texttt{v}\textit{\fhy lists}, \BibArts\ inserts \hspace{.05em} $\sim$ \hspace{.005em} +instead of the repeated \textit{last name}, \textit{first name}. +And \hbox{\texttt{-e}} \hspace{.075em}prints the last names also of co\hy authors first. Anyway, +\label{appendix} \verb|\printbibtitle| \verb|\printvli| \verb|\printvqu| +\hspace{.1em}prints your bibliography: -\printbibtitle \printvli \printvqu +\printbibtitle \printvli \printvqu \label{vqulist} \vfill\noindent Use e.\,g.\ \verb|{\small| \verb|\printvli}| to change the font size of a whole list. -Besides, \BibArts\ provides commands to format the lists: -The sequence \verb|{\bibsortheads| \verb|\printvli}| places a capital letter -as separator at the beginning of each group of entries starting with the same letter, -whereas \verb|{\bibsortspaces| \verb|\printvli}| only inserts additional vertical space there instead. +Besides, \BibArts\ provides commands to format the lists: The sequence +\verb|{\bibsortheads| \verb|\printvli}| inserts capital letters, each one as a +headline of the respective group of items beginning with the same letter, whereas +\verb|{\bibsortspaces| \verb|\printvli}| only inserts extra vertical space between +such groups of items. \newpage @@ -539,7 +568,7 @@ whereas \verb|{\bibsortspaces| \verb|\printvli}| only inserts additional vertica \addcontentsline{toc}{subsection}{\texttt{\bs printnumvkc} \ \evkctitlename} \verb|\printnumvkc| prints an index of all your shortened references in \texttt{twocolumn}, whereas \verb|\printnumvkclist| \label{vkc} just prints -your list without \texttt{headings} or title:\vspace{.5ex} +your list (without \texttt{headings} or title):\vspace{.5ex} {\batwocolitemdefs\printnumvkclist} @@ -560,225 +589,22 @@ your list without \texttt{headings} or title:\vspace{.5ex} \vspace{2ex}\noindent \verb|\arqsection{GStAPK}{Geheimes Staatsarchiv}| may introduce a headline ``\textsf{GStAPK} $-$ \textbf{Geheimes Staatsarchiv}'' -above all GStAPK\fhy entries in the list. - - -\newpage -\section{Additional features} - -The following work is not mentioned in the text, but appears on the \texttt{vqu}\hy list: - -\vspace{-1.1ex} -{\footnotesize\begin{verbatim} - !\begin{unused} \sethyphenation{ngerman}% %% hyphenation travels along - \vqu{Karl}{Marx}{Das \ktit{Kapital}, in: \midvauthor{Karl}{Marx} - \ntvauthor{Friedrich}{Engels} Werke, \ersch|3|[1]{Berlin}{1962--1964}} - \end{unused}! Note, that %% vol.|3| and ed.[1] are optional -\end{verbatim}} - -\vspace{-1.25ex}\noindent - !\begin{unused} \sethyphenation{ngerman}% %% other hyphenation optional - \vqu{Karl}{Marx}{Das \ktit{Kapital}, in: \midvauthor{Karl}{Marx} - \ntvauthor{Friedrich}{Engels} Werke, \ersch|3|[1]{Berlin}{1962--1964}} - \end{unused}! Note, that %% vol.|3| and ed.[1] are optional -\textit{inner} \texttt{v}\textit{\fhy commands} in \verb|{unused}|\hy environments -do not send an own item to the \texttt{v}\fhy lists. So, such inner entries -have to be repeated separately. - -\vspace{1.5ex}\noindent -\BibArts\ does not only help to cite. The environment \verb|{originalquote}| -helps to quote from literature or sources. You may call all hyphenation -settings, which your \LaTeX\ possesses, in the \verb|[|\textit{optional -argument}\verb|]| of the environment: - -\vspace{-.5ex} -\Doppelbox -{\vspace{.5ex} - \bs begin\{originalquote\}[german]\%old - \\[.4ex] \ \ \string`\string`Dies ist die erste - \\ \ \ Wechselwirkung und das - \\ \ \ erste Äu\bs hyss erste, - \\ \ \ \bs fabra\{...\}.\string'\string'\bs footnote \ \b{\{}The - \\ \ Eszett splits different here: - \\ \ \b{\b{\{}}\bs sethyphenation\{ngerman\} \%new - \\[-.4ex] \ \ Au\bs hyss er\b{\b{\}}}. \bs kqu\{Clausewitz\} - \\[-.4ex] \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \{Vom Kriege\}[19].\b{\}} - \\[.3ex] \bs end\{originalquote\} - \vspace{.3ex} -} -{\renewcommand{\originalquotetype}{\footnotesize}% - \begin{originalquote}[german]%old - ``Dies ist die erste - Wechselwirkung und das - erste Äu\hyss erste, - \fabra{...}.''\footnote {The - Eszett splits different here: - {\sethyphenation{ngerman} %new - %% I use Au\hyss er here. The hyphenation Äu- - %% ßerst has to recognize the Ä; I do not want to - %% use \usepackage[T1]{fontenc} in this file here. - Au\hyss er}. \kqu{Clausewitz} - {Vom Kriege}[19]. - \\[.5ex] \hspace*{3mm} \texttt{\% In \bs scshape, \bs hyss prints }{\scshape \hyss}\texttt{,} - \\ \hspace*{3mm} \texttt{\% and splits }{\scshape s-s}\,\texttt{ (old AND new)!}% - \vspace{-1.5ex}% - } - \end{originalquote} -} +above all GStAPK items on the list. -\vspace{-.125ex}\noindent -In quotations, you may use \verb|\abra| to insert additions. -Use \verb|\fabra| to prevent a line break between the closing bracket and the following text. -\BibArts\ puts height\hy adjusted square brackets around the following additions: -\vspace{.75ex}\noindent -{\small - \ifnum\catcode`\"=12\else\catcode`\"=12\message{ Set catcode of \string" to 12. }\fi - %% ... to avoid error messages if you load a german package (active doublequote). %% - \verb| \abra{,} => | ``Red\abra{,} blue and green were the \\[-.25ex] - \verb| \abra{.}\newsentence => | colours\abra{.}\newsentence And \hspace{2.25em} \verb|% spacing| \\[-.25ex] - \verb| \abra{...} \abra{\dots} => | there \abra{...} were \abra{\dots} others, \\[-.25ex] - \verb| \abra{---} => | \abra{---} let's say \abra{---} \\[-.25ex] - \verb| \abra{-} \abra{--} => | green\abra{-}red\abra{--}painted. \\[-.25ex] - \verb| \fabra{`} \fabra{'} => | \hbox to 6em{\fabra{`}Marks\fabra{'}.\hfill} \verb|% U+0060 and U+0027| \\[-.25ex] - \verb| \fabra{``} \abra{''} => | \fabra{``}Good!\abra{''} \\[-.25ex] - \verb| \fabra{"} \abra{"} => | \hbox to 6em{\fabra{"}Good!\abra{"}\hfill} \verb|% or \abra{\dq}| \\[-.25ex] - \verb| \abra{sic!}.'' => | \hbox to 6em{\fabra{sic!}.''\hfill} \verb|% unknown=>normalsize|} - -\vspace{1.5ex}\vfill\noindent -\BibArts\ defines -\hspace{.1em}\verb|S\fup{te}|\hspace{.3em}\verb|=>|\hspace{.3em}S\fup{te} -(if that command for \textit{French up} is undefined) and does also -help to set ordinals in English, French and German: - -\vspace{.875ex}\vfill\noindent -{\small - \verb| \eordinal{103} Assistant. => | \eordinal{103} Assistant. \\[-.2ex] - \verb| Le \fordinalm{1} homme. => | Le \fordinalm{1} homme. \\[-.25ex] - \verb| La \fordinalf{1} femme. => | La \fordinalf{1} femme. \\[-.2ex] - \verb| Der 1\te August. => | Der 1\te August.} +\section{Using an Author\hy Year Reference System} - - \newpage\noindent - To print a formatted \textit{abbreviation} in your text, you may use - \verb|\abk{|\textit{xyz}\verb|}|. It will only appear - on the List of Abbreviations, if you say what it stands for: - - \vspace{-.25ex} - \Doppelbox - { - \bs abkdef\{HMS\}\{Her Majesty\string's Ship\} - \\[.35ex] \ \ or - \\[.35ex] \bs defabk\{Her Majesty\string's Ship\}\{HMS\} - \\[.35ex] \ \ and then \bs texttt\{bibsort\} - \\[.35ex] \ \ will accept \bs abk\{HMS\}. - \vspace{-1ex}\strut - } - { - \abkdef{HMS}{Her Majesty's Ship} - \\ or - \\ \defabk{Her Majesty's Ship}{HMS} - \\ and then \texttt{bibsort} - \\ will accept \abk{HMS}. - \vspace{-1ex}\strut - } - -\noindent -For a correct spacing at the end of a sentence, you have to set -a separate full stop: \verb|\abk{U.\,K.}. Next |... \verb|=>| \abk{U.\,K.}. Next -... (or \verb|\abk{e.\,g.}. Next|). -You may use \verb|\printnumabk| (or \verb|\printabk|) to print a -List of Abbreviations: - -\vspace{-.325ex} -\printnumabklist - -\noindent -\BibArts\ provides up to three \textit{registers} (geographical, subject, and person). -The commands to feed them have one argument. It is -invisible in your text, e.\,g.: \verb|\addtogrr{London}|, -\verb|\addtosrr{Ship}|, and \verb|\addtoprr{Churchill}|\,. -Use \verb|\printnumgrr|, \verb|\printnumsrr|, and \verb|\printnumprr| -to print the lists. They are prepared by \texttt{bibsort}. This -has nothing to do with \textsc{MakeIndex}. - -\vspace{1ex}\noindent -A last feature of \BibArts\ are fill\hy commands. \verb|\fillgrr|, -\verb|\fillsrr|, \verb|\fillprr|, \verb|\fillper|, and \verb|\fillarq| -have two arguments. The first has to be identical with \textit{the} argument -of a register\hy entry, or \verb|\per|\hy command, or \textit{the second} -argument of an \verb|\arq|\hy command (the archive file information). -Fill\hy commands may be used at a central position to add information to -an entry on the list: - -\vspace{-.25ex} -\Doppelbox -{\vspace{1.2ex} - \ \bs fillprr\{Churchill\}\{1874-1965\} \\[1.5ex] - Churchill \bs addtoprr\{Churchill\} - was prime minister.\bs footnote\b{\{} - \\ \ Born \bs addtoprr\{Churchill\} - \\ \ Blenheim Palace.\b{\}} \\[1.325ex] - \bs renewcommand\{\bs xrrlistemph\}\{\bs em\} \\ - \bs printnumprr - \vspace{1ex} -} -{\vspace{-1.1ex}% - \fbox{\begin{minipage}{.95\textwidth} - \setcounter{mpfootnote}{\arabic{footnote}}% - \vspace{.125ex} - \fillprr{Churchill}{1874-1965} - Churchill \addtoprr{Churchill} - was prime minister.\footnote - { Born \addtoprr{Churchill} - Blenheim Palace.} - \setcounter{footnote}{\arabic{mpfootnote}}% - \end{minipage}} - \\[1.6ex] - \fbox{\begin{minipage}{.95\textwidth} - \vspace{.875ex} - \subsubsection*{\eprrtitlename} - \vspace{-.75ex}% - \renewcommand{\xrrlistemph}{\em}% - {\footnotesize \printnumprrlist}% - \vspace{-1.375ex}% - \end{minipage}}% - \vspace{-1.3ex}% -} - -\vspace{.5ex}\vfill\noindent -Please use commands like \verb|\bfseries| to \verb|\renewcommand| fonts, not \verb|\textbf|: - - -\vspace{1.5ex}\vfill\noindent -{\small\begin{tabular}{lll} -\textsf{Command} & \textsf{Predefined} & \textsf{Executed on} \\[.325ex] -\verb|\xrrlistemph| & \verb|{}| & entries on grr\fhy, srr\fhy, and prr\hy lists\\ -\verb|\abkemph| & \verb|{\sffamily}| & abbreviations in your text \\ -\verb|\abklistemph| & \verb|{\bfseries}| & abbreviations on the abk\hy list \\ -\verb|\kxxemph| & \verb|{}| & last argument of \texttt{k}\fhy commands \\ -\verb|\peremph| & \verb|{\normalfont\scshape}| & periodicals \verb| %{\upshape}| \\ -\end{tabular}} - - -%!!!> - -\newpage\noindent -Since version 2.5, \BibArts\ supports the \textbf{name\hy year system}\kern.025em: -In shortened references, you may also use the year of publication instead of a few words -from the full title. E.\,g.\ -\hspace{.25em}\verb|*{\onlyvoll{\ktit{1999}}}| -\hspace{.35em}$-$ or synonymously -\hspace{.35em}\verb|*{\starktit{1999}}| $-$ -\hspace{.25em}is used as the \texttt{*}\fhy argument of a v\fhy command; -the last argument of a k\fhy command is the year of publication. -If two cited works by the same author have been published in the same year, -use \verb|1999a|, \verb|1999b|. +There, the last argument of a shortened reference is the year of publication +(instead of a few words from the full title). \BibArts' full references can +be adapted to such a system: Use e.\,g.\ +\hspace{.1em}\verb|*{\onlyvoll{\ktit{1999}}}| +\hspace{.1em}as the additional \texttt{*}\fhy argument of \texttt{v}\textit{\fhy commands}, or +\hspace{.1em}\verb|*{\starktit{1999}}| \hspace{.1em}synonymously. The following example uses \hspace{.075em}\verb|\notannouncektit|\kern.05em, because it seems to -be unnecessary to print \hspace{.15em}{\footnotesize (cited as \fabra{...})}\ \hspace{.15em}here; and \verb|\ntsep| -is redefined in a way that k\fhy commands do not print a colon after the -name(s) of the author(s):% +be unnecessary to print {\footnotesize (cited as \fabra{...})}\ now; and \verb|\ntsep| +is redefined in a way that, in \texttt{k}\textit{\fhy commands}, the name of the (last) author +is not followed by a colon:% {\notannouncektit \renewcommand{\ntsep}{\ifbashortcite{ }{: }}\notktitaddtok \footnote { \printonlyvli{Roger} {Chickering} *{\starktit{1999}} @@ -786,7 +612,7 @@ name(s) of the author(s):% \xprintonlyvli{Manfred F.}{Boemeke} *{\midvauthor{Roger}{Chickering} \vauthor{Stig}{Förster}\onlyvoll{ \editors\ \ktit{1999}}} {Anticipating Total War. The German and American - Experiences 1871--1914, Cambridge U.\,K.}[13-28]}*[14\f].}% + Experiences 1871--1914, Cambridge U.~K.}[13-28]}*[14\f].}% \,\footnote{\printonlykli{Chickering}{1999}[14\f].\label{RC}}% \,\footnote { \printonlyvli{Gerald D.}{Feldman}*{\starktit{1999}} {Hugo Stinnes and the Prospect of War Before 1914, in: @@ -794,26 +620,26 @@ name(s) of the author(s):% {1999}[77-95]}*[77]; and \printonlykli{Chickering}{1999}[16].}% } -\vspace{1.125ex} +\vspace{1ex} \begin{small} \noindent -\verb| \notannouncektit| \\ -\verb| \renewcommand{\ntsep}{\ifbashortcite{ }{: }} % : only in v-cmds| +\verb| \notannouncektit| \\[.25ex] +\verb| |\verb|\renewcommand{\ntsep}{\ifbashortcite{ }{: }} % see bibarts.pdf| -\vspace{-.75ex} +\vspace{-.25ex} \begin{verbatim} \footnote { \vli{Roger} {Chickering} *{\starktit{1999}} {Total War. The Use and Abuse of a Concept, in: \xvli{Manfred F.}{Boemeke} *{\midvauthor{Roger}{Chickering} \vauthor{Stig}{Förster}\onlyvoll{ \editors\ \ktit{1999}}} {Anticipating Total War. The German and American - Experiences 1871--1914, Cambridge U.\,K.}[13-28]}*[14\f].} + Experiences 1871--1914, Cambridge U.~K.}[13-28]}*[14\f].} \end{verbatim} -\vspace{-.675ex}\noindent +\vspace{-.25ex}\noindent \verb| \footnote{\kli{Chickering}{1999}[14\f].} %% see footnote |\texttt{\ref{RC}} -\vspace{-.675ex} +\vspace{-.5ex} \begin{verbatim} \footnote { \vli{Gerald D.}{Feldman}*{\starktit{1999}} {Hugo Stinnes and the Prospect of War Before 1914, in: @@ -822,16 +648,16 @@ name(s) of the author(s):% \end{verbatim} \end{small} -\vspace{.125ex}\noindent +\noindent Note, that there are spaces in front of \verb|\vauthor{Stig}{Förster}| as well as \verb|\kauthor{Förster}|. -Finally, \verb|\printvli| will print the List of Literature as: +Now, \verb|\printvli| prints your bibliography like this: -\vspace{-1.5ex}\subsection*{Literatur}\vspace{-.25ex} +\vspace{-1.75ex}\subsection*{Literatur}\vspace{-.25ex} \begin{description}\parsep 0ex \itemsep -.5ex \item {\scshape Boemeke}, Manfred F.\baslash {\scshape Chickering}, Roger\baslash {\scshape Förster}, Stig \editors\ 1999: Anticipating Total War. The German and American Experiences -1871-1914, Cambridge U.\,K. +1871--1914, Cambridge U.~K. \item {\scshape Chickering}, Roger 1999: Total War. The Use and Abuse of a Concept, in: {\scshape Boemeke}\baslash {\scshape Chickering}\baslash {\scshape Förster} 1999 [L], S.\,13-28. @@ -840,7 +666,214 @@ Finally, \verb|\printvli| will print the List of Literature as: 1914, in: {\scshape Boemeke}\baslash {\scshape Chickering}\baslash {\scshape Förster} 1999 [L], S.\,77-95. \end{description} -%!!!< + + +\newpage +\section{Additional features} + +This title was not used in text or footnotes, but appears on the \verb|vqu| list (p.\,\pageref{vqulist}): + +\vspace{-.325ex} +{\footnotesize\begin{verbatim} + \begin{unused} \sethyphenation{ngerman} % This is invisible HERE: + \vqu{Karl}{Marx}{Das \ktit{Kapital}, in: \midvauthor{Karl}{Marx} + \ntvauthor{Friedrich}{Engels} Werke, \ersch|3|[1]{Berlin}{1962--1964}} + \end{unused} % vol.|3| and ed.[1] are optional +\end{verbatim}} + + \begin{unused} \sethyphenation{ngerman} % This is invisible HERE: + \vqu{Karl}{Marx}{Das \ktit{Kapital}, in: \midvauthor{Karl}{Marx} + \ntvauthor{Friedrich}{Engels} Werke, \ersch|3|[1]{Berlin}{1962--1964}} + \end{unused} % vol.|3| and ed.[1] are optional + +\vspace{-.4ex}\noindent +Note, that \textit{inner} \texttt{v}\textit{\fhy commands} in \verb|{unused}| +environments do not send an own full item to the \texttt{v}\textit{\fhy list}; +an \textit{inner} \verb|\vli| or \verb|\vqu| has to be repeated separately. + +\vspace{1ex}\noindent +For longer quotations, you can use \BibArts' \verb|{originalquote}| +environment. To set the same hyphenation rules that apply to the language +of the original, this environment provides an +\verb|[|\textit{optional argument}\verb|]| for language selection: + + \vspace{-.625ex} + \Doppelbox + { + \vspace{.75ex} + \bs begin\{originalquote\}[german] + \\[.4ex] \ \ \string`\string`Dies ist die erste + \\ \ \ Wechselwirkung und das + \\ \ \ erste Äu\bs hyss erste, + \\ \ \ \bs fabra\{...\}.\string'\string'\bs footnote \ \b{\{}The + \\ \ Eszett splits different here: + \\ \ \b{\b{\{}}\bs sethyphenation\{ngerman\} + \\[-.4ex] \ \ Au\bs hyss er\b{\b{\}}}. \bs kqu\{Clausewitz\} + \\[-.4ex] \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \{Vom Kriege\}[19].\b{\}} + \\[.3ex] \bs end\{originalquote\} + \vspace{.5ex} + } + { + \renewcommand{\originalquotetype}{\footnotesize}% + \begin{originalquote}[german] + ``Dies ist die erste + Wechselwirkung und das + erste Äu\hyss erste, + \fabra{...}.''\footnote {The + Eszett splits different here: + {\sethyphenation{ngerman} + %% I use Au\hyss er here. The hyphenation Äu- + %% ßerst has to recognize the Ä; I do not want to + %% use \usepackage[T1]{fontenc} in this file here. + Au\hyss er}. \kqu{Clausewitz} + {Vom Kriege}[19]. + \\[.5ex] \hspace*{3mm} \texttt{\% In \bs scshape, \bs hyss prints }{\scshape \hyss}\texttt{,} + \\ \hspace*{3mm} \texttt{\% and splits }{\scshape s-s}\,\texttt{ (also ngerman)}% + \vspace{-1.5ex}% + } + \end{originalquote} + } + +\vspace{-.625ex}\noindent +In quotations, you may use \verb|\abra| \hspace{.1em}for \textit{editorial +additions in square brackets}. Use \verb|\fabra| to prevent a line break +between the printed brackets and following text. Some arguments are enclosed +by superscript or subscript brackets, e.\,g.: + +\vspace{.75ex}\noindent +{\small + \ifnum\catcode`\"=12\else\catcode`\"=12\message{ Set catcode of \string" to 12. }\fi + %% ... to avoid error messages if you load a german package (active double quotes). %% + \verb| \fabra{"}Red\abra{,} blue => | \fabra{"}Red\abra{,} blue \\[-.25ex] + %% U+201A (=> \quotesinglbase) not available in OT1. %% + \verb| \abra{.}\newsentence But => | \hbox to 6.2em{colours\abra{.}\newsentence But\hfill} \verb|% [spacing like |\verb*|\@. |\verb|]| \\[-.25ex] + \verb|\abra{...}\abra{\dots} => | \hbox to 6.2em{\abra{...} others \abra{\dots}\hfill} \verb|% U+2026 = \dots| \\[-.25ex] + \verb|\abra{---}\abra{-}\abra{--} => | \abra{---}green\abra{-}red\abra{--}painted. \\[-.25ex] + \verb| \fabra{`} \abra{'} => | \hbox to 6.2em{\fabra{`}Quote\fabra{'} and\hfill} \verb|% U+0060 / U+0027| \\[-.25ex] + \verb| \fabra{‘} \fabra{’}. => | \hbox to 6.2em{\fabra{‘}Quote\fabra{’}.\hfill} \verb|% U+2018 / U+2019| \\[-.25ex] + \verb| \fabra{|\hbox to .525em{\sf\kern-.075em“\hfill}\verb|} \abra{|\hbox to .525em{\sf\kern.075em”\kern-.075em\hfill}\verb|} => | \hbox to 6.2em{\fabra{“}Quote!\abra{”}\hfill} \verb|% U+201C / U+201D| \\[-.25ex] + %% <= or 2*U+2018 ‘‘ and 2*U+2019 ’’ %% + \verb| \fabra{``} \abra{''} => | \hbox to 6.2em{\fabra{``}Quote!\abra{''}\hfill} \verb|% [+guillemets in T1]| \\[-.25ex] + \verb| \fabra{sic!}. => | \hbox to 6.2em{\fabra{sic!}.\hfill} \verb|% unknown=>normalsize|} + +\vspace{1ex}\noindent +\verb|\hy| \hspace{.05em}is a \textit{hyphen} which allows to divide the following word and does a kerning: + +\vspace{.5ex}\noindent +{\small + \verb| ex-Yugoslavia => | \hbox to 6.2em{ex-Yugoslavia\hfill} \verb|% Or \hy\`{A} etc.,| \\[-.2ex] + \verb| ex\hy Yugoslavia => | \hbox to 6.2em{ex\hy Yugoslavia\hfill} \verb|% or \hy À = U+00C0|} + +\vspace{.875ex}\noindent +Not only for use in French is e.\,g.\ \verb|P\fup{r}| (P\fup{r}). More country\hy specific are: + +\vspace{.75ex}\vfill\noindent +{\small + \verb| \eordinal{103} Assistant. => | \eordinal{103} Assistant. \\[-.2ex] + \verb| Der 1\te August. => | Der 1\te August.} + + \newpage\noindent + An additional feature are \textit{abbreviations}. Before using e.\,g.\ + \verb|\abk{HMS}|, define: + + \vspace{-.25ex} + \Doppelbox + { + \bs abkdef\{HMS\}\{His Majesty\string's Ship\} + \\[.35ex] \ \ or ...: + \\[.35ex] \bs defabk\{His Majesty\string's Ship\}\{HMS\} + \\[.35ex] \ \ and then \bs texttt\{bibsort\} + \\[.35ex] \ \ will accept \bs abk\{HMS\} ... + \vspace{-.5ex}\strut + } + { + \abkdef{HMS}{His Majesty's Ship} + \\ or [their repeated use is allowed]: + \\ \defabk{His Majesty's Ship}{HMS} + \\ and then \texttt{bibsort} + \\ will accept \abk{HMS} for the index. + \vspace{-.5ex}\strut + } + +\vspace{-.25ex}\noindent +For a correct spacing at the end of a sentence, a \textit{full stop of the sentence} +(\ko\verb*|. |) must be `repeated' here: +\hspace{.25em}\verb|say, \abk{e.\,g.}|\verb*|. |\verb|Next => | say, \abk{e.\,g.}. Next + +Each defined abbreviation will appear on the List of Abbreviations. Use +\verb|\printabk| just to print a list or \verb|\printnumabk| to print a +`\BibArts\ index' (a list with page numbers---\textit{and} footnote numbers if the +entries are from footnotes\ko): + +\vspace{-.325ex} +\printnumabklist + +\noindent +\BibArts\ provides up to three \textit{registers} (geographical, subject and person). +The commands for feeding them have one argument, which is +invisible in your text, e.\,g.\ \verb|\addtogrr{London}|, +\verb|\addtosrr{Ship}|, \verb|\addtoprr{Churchill}|. Use \verb|\printnumgrr|, +\verb|\printnumsrr| and \verb|\printnumprr| to print the indexes. + +\vspace{1.5ex}\noindent +A last feature of \BibArts\ are \textit{fill commands}. \verb|\fillgrr|, +\verb|\fillsrr|, \verb|\fillprr|, \verb|\fillper| and \verb|\fillarq| +have two arguments. The first has to be identical with \textit{the} argument +of a register entry or \verb|\per| command, or \textit{the second} +argument of an \verb|\arq| command (an Archive Signature). +The other \textit{fill} argument serves to add an information---written only +once---to the related index item: + + \vspace{-.25ex} + \Doppelbox + { + \vspace{1.2ex} + \ \bs fillprr\{Churchill\}\{1874--1965\} \\[1.5ex] + Churchill \bs addtoprr\{Churchill\} + \\ was prime minister.\bs footnote + \\ \ \b{\{}He \bs addtoprr\{Churchill\} was + \\ \ \ \ \ \ \ \ \ born Blenheim Palace.\b{\}} \\[1.325ex] + \bs renewcommand\{\bs xrrlistemph\}\{\bs em\} \\ + \bs printnumprr + \vspace{1ex} + } + { + \vspace{-1.1ex}% + \fbox{\begin{minipage}{.95\textwidth} + \setcounter{mpfootnote}{\arabic{footnote}}% + \vspace{.125ex} + \fillprr{Churchill}{1874--1965} + Churchill \addtoprr{Churchill} + was prime minister.\footnote + {He \addtoprr{Churchill} was + born Blenheim Palace.} + \setcounter{footnote}{\arabic{mpfootnote}}% + \end{minipage}} + \\[1.6ex] + \fbox{\begin{minipage}{.95\textwidth} + \vspace{.875ex} + \subsubsection*{\eprrtitlename} + \vspace{-.75ex}% + \renewcommand{\xrrlistemph}{\em}% + {\footnotesize \printnumprrlist}% + \vspace{-1.375ex}% + \end{minipage}}% + \vspace{-1.3ex}% + } + +\vspace{.5ex}\vfill\noindent +Please use commands like \verb|\bfseries| to \verb|\renewcommand| fonts, not \verb|\textbf|: + + +\vspace{1.5ex}\vfill\noindent +{\small\begin{tabular}{lll} +\textsf{Command} & \textsf{Predefined} & \textsf{Executed on} \\[.325ex] +\verb|\xrrlistemph| & \verb|{}| & keywords on grr, srr and prr lists \\ +\verb|\abkemph| & \verb|{\sffamily}| & abbreviations in your text \\ +\verb|\abklistemph| & \verb|{\bfseries}| & abbreviations on the abk list \\ +\verb|\kxxemph| & \verb|{}| & last argument of \texttt{k}\textit{\fhy commands} \\ +\verb|\peremph| & \verb|{\normalfont\scshape}| & periodicals \verb| % alt.: {\upshape}| \\ +\end{tabular}} \edef\bamantestargs{ -h -utf8 -k -e } diff --git a/macros/latex/contrib/bibarts/bibarts.pdf b/macros/latex/contrib/bibarts/bibarts.pdf Binary files differindex 103ef04712..be36167fa9 100644 --- a/macros/latex/contrib/bibarts/bibarts.pdf +++ b/macros/latex/contrib/bibarts/bibarts.pdf diff --git a/macros/latex/contrib/bibarts/bibarts.sty b/macros/latex/contrib/bibarts/bibarts.sty index e0ab320722..2f41c052cb 100644 --- a/macros/latex/contrib/bibarts/bibarts.sty +++ b/macros/latex/contrib/bibarts/bibarts.sty @@ -1,5 +1,5 @@ -%% BibArts 2.5 assists you to write LaTeX texts in arts and humanities. -%% Copyright (C) 2022b Timo Baumann bibarts[at]gmx.de (2022/10/01) +%% BibArts 2.6 assists you to write LaTeX texts in arts and humanities. +%% Copyright (C) 2023 Timo Baumann bibarts[at]gmx.de (2023/06/18) %% %% This program is free software; you can redistribute it and/or modify %% it under the terms of the GNU General Public License as published by @@ -29,12 +29,13 @@ %% bibsort.c Source of bibsort.exe %% COPYING The license of the package +%% Octets and triplets like ‘ are used in this file. %% COMPATIBILITY -%% Change \DeclareRobustCommand into \def before using LaTeX 2.09. +%% Change \DeclareRobustCommand (DRC) into \def before using LaTeX 2.09. %% Then, you still NOT have to \protect BibArts-cmds in args of v-cmds. -%% BibArts 2.5 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x? +%% BibArts 2.6 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x? @@ -73,7 +74,7 @@ \def\errmessage@ba#1{{\protectchars@active\errmessage{#1.^^J \space. . . . . . . . . . . }}} -\typeout@ba{Style Option BibArts, Version 2.5 [2022b] ...} +\typeout@ba{Style Option BibArts, Version 2.6 [2023] ...} \def\msg@bafontsubst#1#2{\typeout@ba{{\string#1 ...} is unknown; I'll substitute {\string#2 ...}.}} @@ -99,7 +100,7 @@ \def\baabkcorr{\bacorr} \def\balistcorr{\bacorr} \def\bakntsepcorr{\bacorr} -%% Only \barefcorr is not yet unified in 2.5 %% +%% \barefcorr remains un-unified \def\setup@ba#1#2{\let\@bahdtest-{#1{% \ifdim\fontdimen\@ne\font=\z@{\ignorespaces #2\ba@textmode\iflasthasdot@ba{\global\let\@bahdtest+}{}}\else @@ -192,8 +193,8 @@ \newif\ifgendering\genderingfalse \newif\iffemale\femalefalse -\def\female{\global\genderingtrue\global\femaletrue} %% not for use in \vauthor ... -\def\male{\global\genderingtrue\global\femalefalse} %% ... or \midvauthor! +\def\female{\global\genderingtrue\global\femaletrue} +\def\male{\global\genderingtrue\global\femalefalse} \def\Ikillname{\ifgendering \iffemale \femalename \else \malename \fi \else \killname \fi} @@ -310,7 +311,7 @@ \def\pnotprintlpevo{\@prnbapevofalse} \def\notprintlongpervol{\protect\pnotprintlpevo} -\def\if@batone#1#2{{\def\@testa{T1}\ifx\@testa\encodingdefault{#1}\else{#2}\fi}} +\def\if@batone#1#2{\ifx\ToneName@ba\encodingdefault{#1}\else{#2}\fi} \def\ifbatone{\protect\if@batone} \def\ifbaibidem#1#2{\ifx\isibidem@ba+{#1}\else{#2}\fi} \def\ifbaperiodical#1#2{\if@perba{#1}\else{#2}\fi} @@ -466,33 +467,36 @@ \def\ibidemname@ba{\setup@ba{\edibidemph}{\cap@ba{ibidem}}} -\def\pbaplural{\let\@testb=+} -\def\baplural{\protect\pbaplural} -\def\pbasingular{\let\@testb=.} -\def\basingular{\protect\pbasingular} %% at the end of __||()[] %% +%% \@testb into \sg@ba and DRC in 2.6 -{\catcode\grave@ba\;=12\gdef\dopassemi@ba{\ifx;\next@ba \let\@testb=+\fi}} -{\catcode\grave@ba\;=13\gdef\doaktsemi@ba{\ifx;\next@ba \let\@testb=+\fi}} +\def\pbaplural{\let\sg@ba=+} +\DeclareRobustCommand\baplural{\protect\pbaplural} %% at the end of __||()[] + +\def\pbasingular{\let\sg@ba=.} +\DeclareRobustCommand\basingular{\protect\pbasingular} + +{\catcode\grave@ba\;=12\gdef\dopassemi@ba{\ifx;\next@ba \let\sg@ba=+\fi}} +{\catcode\grave@ba\;=13\gdef\doaktsemi@ba{\ifx;\next@ba \let\sg@ba=+\fi}} \def\kommin@string#1{\getnext@km#1\endlist@ba} \def\getnext@km{\afterassignment\do@ba@km\let\next@ba= } \def\do@ba@km{% \ifx \next@ba\endlist@ba \let\next@ba\relax \else - \ifx -\next@ba \let\@testb=+\fi - \ifx ,\next@ba \let\@testb=+\fi - \ifx \hy\next@ba \let\@testb=+\fi - \ifx \fhy\next@ba \let\@testb=+\fi - %\ifx \phy\next@ba \let\@testb=+\fi - %\ifx\pfhy\next@ba \let\@testb=+\fi - \ifx \f\next@ba \let\@testb=+\fi - \ifx \ff\next@ba \let\@testb=+\fi - \ifx \pf\next@ba \let\@testb=+\fi - \ifx \pff\next@ba \let\@testb=+\fi - \ifx \sq\next@ba \let\@testb=+\fi - \ifx \sqq\next@ba \let\@testb=+\fi - \ifx \psq\next@ba \let\@testb=+\fi - \ifx\psqq\next@ba \let\@testb=+\fi + \ifx -\next@ba \let\sg@ba=+\fi + \ifx ,\next@ba \let\sg@ba=+\fi + \ifx \hy\next@ba \let\sg@ba=+\fi + \ifx \fhy\next@ba \let\sg@ba=+\fi + \ifx \phy\next@ba \let\sg@ba=+\fi %% Re-entered in 2.6: + \ifx\pfhy\next@ba \let\sg@ba=+\fi %% Needed if not DRC! + \ifx \f\next@ba \let\sg@ba=+\fi + \ifx \ff\next@ba \let\sg@ba=+\fi + \ifx \pf\next@ba \let\sg@ba=+\fi + \ifx \pff\next@ba \let\sg@ba=+\fi + \ifx \sq\next@ba \let\sg@ba=+\fi + \ifx \sqq\next@ba \let\sg@ba=+\fi + \ifx \psq\next@ba \let\sg@ba=+\fi + \ifx\psqq\next@ba \let\sg@ba=+\fi \ifx \basingular\next@ba \basingular\fi \ifx \baplural \next@ba \baplural \fi \ifx\pbasingular\next@ba \basingular\fi @@ -502,27 +506,27 @@ \let\next@ba\getnext@km \fi \next@ba} -\def\erripfpevo@ba#1{%{ \erri@ba}% %% outer/inner in 2.5: +\def\erripfpevo@ba#1{%{ \erri@ba}% \ifx#1x\type@bawarn{Empty [] or () at \if@baouter outer \else inner \fi cmd}\else \type@bawarn{Empty || or __ at \if@baouter outer \else inner \fi cmd}\fi} \def\printpf@ba#1#2{\if@pfvba{\errorcontextlines=-1% \def\@testa{#2}% - \let\@testb=.% + \let\sg@ba=.% \ifx\@testa\@leer \erripfpevo@ba{x}\else \ifx\@testa\@leerz\erripfpevo@ba{x}\else \if@prnbapf\kommin@string{#2}\fi - {\if@prnbapf\ifx.\@testb\cap@ba{#1}\else\cap@ba{#1p}\fi + {\if@prnbapf\ifx.\sg@ba\cap@ba{#1}\else\cap@ba{#1p}\fi \else{\pagefolioshortsep}\fi {\ignorespaces #2}\let\@testa=-\finddot@ba{#2}\ifx\@testa+\@bahasdot\fi}\fi\fi}\fi} \def\printpevo@ba#1#2{\if@pfvba{\errorcontextlines=-1% \def\@testa{#1}% - \let\@testb=.% + \let\sg@ba=.% \ifx\@testa\@leer \erripfpevo@ba{}\else \ifx\@testa\@leerz\erripfpevo@ba{}\else \if@prnbapevo\kommin@string{#1}\fi - {\if@prnbapevo\ifx.\@testb\cap@ba{#2}\else\cap@ba{#2p}\fi + {\if@prnbapevo\ifx.\sg@ba\cap@ba{#2}\else\cap@ba{#2p}\fi \else{\pervolshortsep}\fi {\ignorespaces #1}\let\@testa=-\finddot@ba{#1}\ifx\@testa+\@bahasdot\fi\gdef\bacorr{}}\fi\fi}\fi} @@ -556,7 +560,7 @@ \fi \else\printpf@ba{#1}{#3}% \global\let\lastp@ba=-% - \global\let\pmem@ba=\pref@ba %% moved in 2.5 + \global\let\pmem@ba=\pref@ba \fi}% \fi} @@ -577,8 +581,8 @@ \ifx\isibidem@ba+\ifx\pos@ba1\else\global\let\thisvol@ba=+\fi\fi \fi \fi - \global\let\lastvol@ba=-% %% moved in 2.5 - \global\let\volmem@ba=\volref@ba %% moved in 2.5 + \global\let\lastvol@ba=-% + \global\let\volmem@ba=\volref@ba \else \printpevo@ba{#1}{#2}% \fi}% @@ -613,9 +617,9 @@ \def\geditorname{[\kern 0.04em Hrsg.]\kern 0.02em} \let\geditorpname=\geditorname \setibidem{g}{ebd\kern -0.07em}{.} -\def\gidemname{ders\kern -0.04em.\bahasdot} %% -\def\geademname{dies\kern -0.04em.\bahasdot} %% \bahasdot new in 2.2 %% -\def\giidemname{diesn\kern -0.07em.\bahasdot} %% +\def\gidemname{ders\kern -0.04em.\bahasdot} +\def\geademname{dies\kern -0.04em.\bahasdot} +\def\giidemname{diesn\kern -0.07em.\bahasdot} \def\gvolname{, Bd.\,} \def\gvolpname{, Bde.\,} \def\gpername{\ifbaibidem{, Nr.\,}{\pernosep}} @@ -641,7 +645,7 @@ \def\gprrtitlename{Personenregister} \def\gsrrtitlename{Sachregister} \def\gannouncektitname{\bastrut\ (\kern 0.015em im Folgenden \baupcorr} - %% 2.5 auch: {\bapoint\newsentence Fortan: } + %%{\bapoint\newsentence Fortan: } \def\gannouncekendname{)} %%{\bapoint\banotdot} \def\grefvbegname{(} \def\grefverbname{siehe} @@ -810,131 +814,128 @@ \def\@outsavety{% %% not protect \nsep %% - \protectchars@active% - \def\newpage{\protect\newpage}% - \def\frq{\protect\frq}% - \def\flq{\protect\flq}% - \def\frqq{\protect\frqq}% - \def\flqq{\protect\flqq}% - \def\"{\string\"}% - \def\ddot{\protect\ddot}% - \def\.{\string\.}% - \def\dot{\protect\dot}% - \def\={\string\=}% - \def\bar{\protect\bar}% - \def\vec{\protect\vec}% - \def\^{\string\^}% - \def\hat{\protect\hat}% - \def\'{\string\'}% - \def\acute{\protect\acute}% - \def\`{\string\`}% - \def\grave{\protect\grave}% - \def\~{\string\~}% - \def\tilde{\protect\tilde}% - \def\P{\protect\P}% - \def\S{\protect\S}% - \def\aa{\protect\aa}% - \def\ae{\protect\ae}% - \def\AA{\protect\AA}% - \def\AE{\protect\AE}% - \def\b{\protect\b}% - \def\c{\protect\c}% - \def\d{\protect\d}% - \def\H{\protect\H}% - \def\i{\protect\i}% - \def\j{\protect\j}% - \def\l{\protect\l}% - \def\L{\protect\L}% - \def\o{\protect\o}% - \def\O{\protect\O}% - \def\ss{\protect\ss}% - \def\3{\string\3}% - \def\newhyss{\protect\newhyss}% - \def\NEWHYSS{\protect\NEWHYSS}% - \def\oldhyss{\protect\oldhyss}% - \def\OLDHYSS{\protect\OLDHYSS}% - \def\oldhyc{\protect\oldhyc}% - \def\OLDHYC{\protect\OLDHYC}% - \def\oldhyf{\protect\oldhyf}% - \def\OLDHYF{\protect\OLDHYF}% - \def\oldhyl{\protect\oldhyl}% - \def\OLDHYL{\protect\OLDHYL}% - \def\oldhym{\protect\oldhym}% - \def\OLDHYM{\protect\OLDHYM}% - \def\oldhyn{\protect\oldhyn}% - \def\OLDHYN{\protect\OLDHYN}% - \def\oldhyp{\protect\oldhyp}% - \def\OLDHYP{\protect\OLDHYP}% - \def\oldhyr{\protect\oldhyr}% - \def\OLDHYR{\protect\OLDHYR}% - \def\oldhyt{\protect\oldhyt}% - \def\OLDHYT{\protect\OLDHYT}% - \def\ck{\protect\ck}% - \def\CK{\protect\CK}% - \def\k{\protect\k}% - \def\r{\protect\r}% - \def\mathring{\protect\mathring}% - \def\t{\protect\t}% - \def\u{\protect\u}% - \def\breve{\protect\breve}% - \def\v{\protect\v}% - \def\check{\protect\check}% - %%\def\|{\string\|}% %% \fnsymbol ? %% - \def\,{\string\,}% - \def\*{\string\*}% - \def\@{\string\@}% - \def\-{\string\-}% - \def\_{\string\_}% - \def\${\string\$}% - \def\\{\string\\}% - \def\{{\string\{}% - \def\}{\string\}}% - \def\leavevmode{\protect\leavevmode}% - \def\rlap{\protect\rlap}% - \def\llap{\protect\llap}% - \def\nobreak{\protect\nobreak}% - \def\mathhexbox{\protect\mathhexbox}% - \def\authoremph{\protect\authoremph}% - \def\cal{\protect\cal}% - \def\mit{\protect\mit}% - \def\footnotesize{\protect\footnotesize}% - \def\huge{\protect\huge}% - \def\Huge{\protect\Huge}% - \def\large{\protect\large}% - \def\Large{\protect\Large}% - \def\LARGE{\protect\LARGE}% - \def\scriptsize{\protect\scriptsize}% - \def\small{\protect\small}% - \def\tiny{\protect\tiny}% - \def\normalsize{\protect\normalsize}% - %\def\label##1{}% - \def\label{\protect\label}% %% 2.09/2e? %% - \def\index{\protect\index}% - \def\glossary{\protect\glossary}% - \def\Alpha{\protect\Alpha}% - \def\Beta{\protect\Beta}% - \def\Epsilon{\protect\Epsilon}% - \def\Zeta{\protect\Zeta}% - \def\Eta{\protect\Eta}% - \def\Iota{\protect\Iota}% - \def\Kappa{\protect\Kappa}% - \def\Mu{\protect\Mu}% - \def\Nu{\protect\Nu}% - \def\Rho{\protect\Rho}% - \def\Tau{\protect\Tau}% - \def\Chi{\protect\Chi}% - \def\Omicron{\protect\Omicron}% - \def\omicron{\protect\omicron}% - \def\backslash{\protect\backslash}% - \def\sz{\protect\sz}% - \def\SZ{\protect\SZ}% - \def\selectlanguage{\protect\selectlanguage}% - \def\sethyphenation{\protect\sethyphenation}% - \def\frac{\protect\frac}% - \def\nosort{\protect\nosort}% - \def\hy{\protect\hy}% - \def\fhy{\protect\fhy}% - \def\bastrut{\protect\bastrut}% + \protectchars@active% + \def\newpage{\protect\newpage}% + %% del \frq \flq \frqq \flqq in 2.6 + \def\"{\string\"}% + \def\ddot{\protect\ddot}% + \def\.{\string\.}% + \def\dot{\protect\dot}% + \def\={\string\=}% + \def\bar{\protect\bar}% + \def\vec{\protect\vec}% + \def\^{\string\^}% + \def\hat{\protect\hat}% + \def\'{\string\'}% + \def\acute{\protect\acute}% + \def\`{\string\`}% + \def\grave{\protect\grave}% + \def\~{\string\~}% + \def\tilde{\protect\tilde}% + \def\P{\protect\P}% + \def\S{\protect\S}% + \def\aa{\protect\aa}% + \def\ae{\protect\ae}% + \def\AA{\protect\AA}% + \def\AE{\protect\AE}% + \def\b{\protect\b}% + \def\c{\protect\c}% + \def\d{\protect\d}% + \def\H{\protect\H}% + \def\i{\protect\i}% + \def\j{\protect\j}% + \def\l{\protect\l}% + \def\L{\protect\L}% + \def\o{\protect\o}% + \def\O{\protect\O}% + \def\ss{\protect\ss}% + \def\3{\string\3}% + \def\newhyss{\protect\newhyss}% + \def\NEWHYSS{\protect\NEWHYSS}% + \def\oldhyss{\protect\oldhyss}% + \def\OLDHYSS{\protect\OLDHYSS}% + \def\oldhyc{\protect\oldhyc}% + \def\OLDHYC{\protect\OLDHYC}% + \def\oldhyf{\protect\oldhyf}% + \def\OLDHYF{\protect\OLDHYF}% + \def\oldhyl{\protect\oldhyl}% + \def\OLDHYL{\protect\OLDHYL}% + \def\oldhym{\protect\oldhym}% + \def\OLDHYM{\protect\OLDHYM}% + \def\oldhyn{\protect\oldhyn}% + \def\OLDHYN{\protect\OLDHYN}% + \def\oldhyp{\protect\oldhyp}% + \def\OLDHYP{\protect\OLDHYP}% + \def\oldhyr{\protect\oldhyr}% + \def\OLDHYR{\protect\OLDHYR}% + \def\oldhyt{\protect\oldhyt}% + \def\OLDHYT{\protect\OLDHYT}% + \def\ck{\protect\ck}% + \def\CK{\protect\CK}% + \def\k{\protect\k}% + \def\r{\protect\r}% + \def\mathring{\protect\mathring}% + \def\t{\protect\t}% + \def\u{\protect\u}% + \def\breve{\protect\breve}% + \def\v{\protect\v}% + \def\check{\protect\check}% + %%\def\|{\string\|}% %% \fnsymbol ? %% + \def\,{\string\,}% + \def\*{\string\*}% + \def\@{\string\@}% + \def\-{\string\-}% + \def\_{\string\_}% + \def\${\string\$}% + \def\\{\string\\}% + \def\{{\string\{}% + \def\}{\string\}}% + \def\leavevmode{\protect\leavevmode}% + \def\rlap{\protect\rlap}% + \def\llap{\protect\llap}% + \def\nobreak{\protect\nobreak}% + \def\mathhexbox{\protect\mathhexbox}% + \def\authoremph{\protect\authoremph}% + \def\cal{\protect\cal}% + \def\mit{\protect\mit}% + \def\footnotesize{\protect\footnotesize}% + \def\huge{\protect\huge}% + \def\Huge{\protect\Huge}% + \def\large{\protect\large}% + \def\Large{\protect\Large}% + \def\LARGE{\protect\LARGE}% + \def\scriptsize{\protect\scriptsize}% + \def\small{\protect\small}% + \def\tiny{\protect\tiny}% + \def\normalsize{\protect\normalsize}% + %\def\label##1{}% + \def\label{\protect\label}% %% 2.09/2e? %% + \def\index{\protect\index}% + \def\glossary{\protect\glossary}% + \def\Alpha{\protect\Alpha}% + \def\Beta{\protect\Beta}% + \def\Epsilon{\protect\Epsilon}% + \def\Zeta{\protect\Zeta}% + \def\Eta{\protect\Eta}% + \def\Iota{\protect\Iota}% + \def\Kappa{\protect\Kappa}% + \def\Mu{\protect\Mu}% + \def\Nu{\protect\Nu}% + \def\Rho{\protect\Rho}% + \def\Tau{\protect\Tau}% + \def\Chi{\protect\Chi}% + \def\Omicron{\protect\Omicron}% + \def\omicron{\protect\omicron}% + \def\backslash{\protect\backslash}% + \def\sz{\protect\sz}% + \def\SZ{\protect\SZ}% + \def\selectlanguage{\protect\selectlanguage}% + \def\sethyphenation{\protect\sethyphenation}% + \def\frac{\protect\frac}% + \def\nosort{\protect\nosort}% + \def\hy{\protect\hy}% + \def\fhy{\protect\fhy}% + \def\bastrut{\protect\bastrut}% } @@ -949,77 +950,84 @@ \def\@outfunctions{% - \errorcontextlines=-1% - \def\protect{\noexpand\noexpand\noexpand}% - \def\protect@onlyout{\protect}% - \def\par{}% %% Fehlermeldungen verringen %% - \if@unusedbib\def\setn@ba{{}{}{-}}\fi% - \def\onlyhere{\protect\onlyhere}% - \def\onlyout{\protect\onlyout}% - \def\onlyvoll{\protect\onlyvoll}% - \def\onlykurz{\protect\onlykurz}% - \def\sechere##1##2{\onlyhere{##2}\onlyout{##1}}% %% new in 2.5 - \def\kurz{\if@baouter\protect\outkurz\else\protect\delkurz\fi}% - \def\ktit{\protect\ktit}% - \def\vauthor{\protect\vauthor}% - \def\midvauthor{\protect\midvauthor}% - \def\kauthor{\protect\kauthor}% - \def\midkauthor{\protect\midkauthor}% - \def\addtovli{\protect\shadowv}% - \def\addtovqu{\protect\shadowv}% - \def\addtokli{\protect\shadowk}% - \def\addtokqu{\protect\shadowk}% - \def\vli{\protect\printonlyvli}% - \def\vqu{\protect\printonlyvqu}% - \def\kli{\protect\printonlykli}% - \def\kqu{\protect\printonlykqu}% - \def\printonlyvli{\protect\printonlyvli}% - \def\printonlyvqu{\protect\printonlyvqu}% - \def\printonlykli{\protect\printonlykli}% - \def\printonlykqu{\protect\printonlykqu}% - \def\xaddtovli{\protect\shadowv}% - \def\xaddtovqu{\protect\shadowv}% - \def\xaddtokli{\protect\shadowk}% - \def\xaddtokqu{\protect\shadowk}% - \def\xvli{\protect\xprintonlyvli}% - \def\xvqu{\protect\xprintonlyvqu}% - \def\xkli{\protect\xprintonlykli}% - \def\xkqu{\protect\xprintonlykqu}% - \def\xprintonlyvli{\protect\xprintonlyvli}% - \def\xprintonlyvqu{\protect\xprintonlyvqu}% - \def\xprintonlykli{\protect\xprintonlykli}% - \def\xprintonlykqu{\protect\xprintonlykqu}% - \def\per{\protect\printonlyper}% - \def\abkper{\protect\printonlyper}% - \def\fillper{\protect\shadowtwo}% - \def\arq{\protect\printonlyarq}% - \def\fillarq{\protect\shadowtwo}% - \def\fillgrr{\protect\shadowtwo}% - \def\fillprr{\protect\shadowtwo}% - \def\fillsrr{\protect\shadowtwo}% - \def\abk{\protect\printonlyabk}% - \def\defabk{\protect\printonlydefabk}% - \def\abkdef{\protect\printonlyabkdef}% - \def\addtoper{\protect\shadowo}% - \def\addtoarq{\protect\shadowt}% - \def\addtoabk{\protect\shadowone}% - \def\addtodefabk{\protect\shadowtwo}% - \def\addtoabkdef{\protect\shadowtwo}% - \def\addtogrr{\protect\shadowone}% - \def\addtoprr{\protect\shadowone}% - \def\addtosrr{\protect\shadowone}% - \def\printonlyper{\protect\printonlyper}% - \def\printonlyarq{\protect\printonlyarq}% - \def\printonlyabk{\protect\printonlyabk}% - \def\printonlydefabk{\protect\printonlydefabk}% - \def\printonlyabkdef{\protect\printonlyabkdef}% - \def\female{\protect\female}% - \def\male{\protect\male}% - \def\sort{\protect\sort}% - \def\bago{\protect\bago}% - \def\bahasdot{\protect\bahasdot}% - \def\bacorr{\protect\bacorr}% - \def\verb{\errmessage{verbatim is forbidden inside BibArts args}}% + \errorcontextlines=-1% + \def\protect{\noexpand\noexpand\noexpand}% + \def\protect@onlyout{\protect}% + \def\par{}% %% reduce errmsgs + \if@unusedbib\def\setn@ba{{}{}{-}}\fi% + \def\onlyhere{\protect\onlyhere}% + \def\onlyout{\protect\onlyout}% + \def\onlyvoll{\protect\onlyvoll}% + \def\onlykurz{\protect\onlykurz}% + \def\sechere##1##2{\onlyhere{##2}\onlyout{##1}}% + \def\kurz{\if@baouter\protect\outkurz\else\protect\delkurz\fi}% + \def\ktit{\protect\ktit}% + \def\vauthor{\protect\vauthor}% + \def\midvauthor{\protect\midvauthor}% + \def\kauthor{\protect\kauthor}% + \def\midkauthor{\protect\midkauthor}% + \def\addtovli{\protect\shadowv}% + \def\addtovqu{\protect\shadowv}% + \def\addtokli{\protect\shadowk}% + \def\addtokqu{\protect\shadowk}% + \def\vli{\protect\printonlyvli}% + \def\vqu{\protect\printonlyvqu}% + \def\kli{\protect\printonlykli}% + \def\kqu{\protect\printonlykqu}% + \def\printonlyvli{\protect\printonlyvli}% + \def\printonlyvqu{\protect\printonlyvqu}% + \def\printonlykli{\protect\printonlykli}% + \def\printonlykqu{\protect\printonlykqu}% + \def\xaddtovli{\protect\shadowv}% + \def\xaddtovqu{\protect\shadowv}% + \def\xaddtokli{\protect\shadowk}% + \def\xaddtokqu{\protect\shadowk}% + \def\xvli{\protect\xprintonlyvli}% + \def\xvqu{\protect\xprintonlyvqu}% + \def\xkli{\protect\xprintonlykli}% + \def\xkqu{\protect\xprintonlykqu}% + \def\xprintonlyvli{\protect\xprintonlyvli}% + \def\xprintonlyvqu{\protect\xprintonlyvqu}% + \def\xprintonlykli{\protect\xprintonlykli}% + \def\xprintonlykqu{\protect\xprintonlykqu}% + \def\per{\protect\printonlyper}% + \def\abkper{\protect\printonlyper}% + \def\fillper{\protect\shadowtwo}% + \def\arq{\protect\printonlyarq}% + \def\fillarq{\protect\shadowtwo}% + \def\fillgrr{\protect\shadowtwo}% + \def\fillprr{\protect\shadowtwo}% + \def\fillsrr{\protect\shadowtwo}% + \def\abk{\protect\printonlyabk}% + \def\defabk{\protect\printonlydefabk}% + \def\abkdef{\protect\printonlyabkdef}% + \def\addtoper{\protect\shadowo}% + \def\addtoarq{\protect\shadowt}% + \def\addtoabk{\protect\shadowone}% + \def\addtodefabk{\protect\shadowtwo}% + \def\addtoabkdef{\protect\shadowtwo}% + \def\addtogrr{\protect\shadowone}% + \def\addtoprr{\protect\shadowone}% + \def\addtosrr{\protect\shadowone}% + \def\printonlyper{\protect\printonlyper}% + \def\printonlyarq{\protect\printonlyarq}% + \def\printonlyabk{\protect\printonlyabk}% + \def\printonlydefabk{\protect\printonlydefabk}% + \def\printonlyabkdef{\protect\printonlyabkdef}% + \def\female{\protect\female}% + \def\male{\protect\male}% + \def\sort{\protect\sort}% + \def\bago{\protect\bago}% + \def\bahasdot{\protect\bahasdot}% + \def\bacorr{\protect\bacorr}% + \def\verb{\errmessage{verbatim is forbidden inside BibArts args}}% + %% new in 2.6: + \def\input{\protect\input}% + \def\mdqon{\protect\mdqon}% + \def\mdqoff{\protect\mdqoff}% + \def\shorthandon{\protect\shorthandon}% + \def\shorthandoff{\protect\shorthandoff}% + \def\hyphenrules{\protect\hyphenrules}% } @@ -1027,72 +1035,72 @@ \def\@memfunctions{% - \errorcontextlines=-1% - \def\protect{\noexpand\noexpand\noexpand}% - \def\kurz{\protect\kurz}% - \def\ktit{\protect\ktit}% - \def\addtovli{\protect\addtovli}% - \def\addtovqu{\protect\addtovqu}% - \def\addtokli{\protect\addtokli}% - \def\addtokqu{\protect\addtokqu}% - \def\printonlyvli{\protect\printonlyvli}% - \def\printonlyvqu{\protect\printonlyvqu}% - \def\printonlykli{\protect\printonlykli}% - \def\printonlykqu{\protect\printonlykqu}% - \def\vli{\protect\vli}% - \def\vqu{\protect\vqu}% - \def\kli{\protect\kli}% - \def\kqu{\protect\kqu}% - \def\xaddtovli{\protect\xaddtovli}% - \def\xaddtovqu{\protect\xaddtovqu}% - \def\xaddtokli{\protect\xaddtokli}% - \def\xaddtokqu{\protect\xaddtokqu}% - \def\xprintonlyvli{\protect\xprintonlyvli}% - \def\xprintonlyvqu{\protect\xprintonlyvqu}% - \def\xprintonlykli{\protect\xprintonlykli}% - \def\xprintonlykqu{\protect\xprintonlykqu}% - \def\xvli{\protect\xvli}% - \def\xvqu{\protect\xvqu}% - \def\xkli{\protect\xkli}% - \def\xkqu{\protect\xkqu}% - \def\per{\protect\per}% - \def\abkper{\protect\abkper}% - \def\fillper{\protect\fillper}% - \def\arq{\protect\arq}% - \def\fillarq{\protect\fillarq}% - \def\fillgrr{\protect\fillgrr}% - \def\fillprr{\protect\fillprr}% - \def\fillsrr{\protect\fillsrr}% - \def\abk{\protect\abk}% - \def\abkdef{\protect\abkdef}% - \def\defabk{\protect\defabk}% - \def\addtoper{\protect\addtoper}% - \def\addtoarq{\protect\addtoarq}% - \def\addtoabk{\protect\addtoabk}% - \def\addtoabkdef{\protect\addtoabkdef}% - \def\addtodefabk{\protect\addtodefabk}% - \def\addtogrr{\protect\addtogrr}% - \def\addtoprr{\protect\addtoprr}% - \def\addtosrr{\protect\addtosrr}% - \def\printonlyper{\protect\printonlyper}% - \def\printonlyarq{\protect\printonlyarq}% - \def\printonlyabk{\protect\printonlyabk}% - \def\printonlyabkdef{\protect\printonlyabkdef}% - \def\printonlydefabk{\protect\printonlydefabk}% - \def\onlyhere{\protect\onlyhere}% - \def\onlyout{\protect\onlyout}% - \def\onlyvoll{\protect\onlyvoll}% - \def\onlykurz{\protect\onlykurz}% - \def\vauthor{\protect\vauthor}% - \def\midvauthor{\protect\midvauthor}% - \def\kauthor{\protect\kauthor}% - \def\midkauthor{\protect\midkauthor}% - \def\female{}% - \def\male{}% - \def\sort{\protect\sort}% %% Nur wirksam in \protec@scr %% - \def\bahasdot{}% - \def\banotdot{}% - \def\bago{}% + \errorcontextlines=-1% + \def\protect{\noexpand\noexpand\noexpand}% + \def\kurz{\protect\kurz}% + \def\ktit{\protect\ktit}% + \def\addtovli{\protect\addtovli}% + \def\addtovqu{\protect\addtovqu}% + \def\addtokli{\protect\addtokli}% + \def\addtokqu{\protect\addtokqu}% + \def\printonlyvli{\protect\printonlyvli}% + \def\printonlyvqu{\protect\printonlyvqu}% + \def\printonlykli{\protect\printonlykli}% + \def\printonlykqu{\protect\printonlykqu}% + \def\vli{\protect\vli}% + \def\vqu{\protect\vqu}% + \def\kli{\protect\kli}% + \def\kqu{\protect\kqu}% + \def\xaddtovli{\protect\xaddtovli}% + \def\xaddtovqu{\protect\xaddtovqu}% + \def\xaddtokli{\protect\xaddtokli}% + \def\xaddtokqu{\protect\xaddtokqu}% + \def\xprintonlyvli{\protect\xprintonlyvli}% + \def\xprintonlyvqu{\protect\xprintonlyvqu}% + \def\xprintonlykli{\protect\xprintonlykli}% + \def\xprintonlykqu{\protect\xprintonlykqu}% + \def\xvli{\protect\xvli}% + \def\xvqu{\protect\xvqu}% + \def\xkli{\protect\xkli}% + \def\xkqu{\protect\xkqu}% + \def\per{\protect\per}% + \def\abkper{\protect\abkper}% + \def\fillper{\protect\fillper}% + \def\arq{\protect\arq}% + \def\fillarq{\protect\fillarq}% + \def\fillgrr{\protect\fillgrr}% + \def\fillprr{\protect\fillprr}% + \def\fillsrr{\protect\fillsrr}% + \def\abk{\protect\abk}% + \def\abkdef{\protect\abkdef}% + \def\defabk{\protect\defabk}% + \def\addtoper{\protect\addtoper}% + \def\addtoarq{\protect\addtoarq}% + \def\addtoabk{\protect\addtoabk}% + \def\addtoabkdef{\protect\addtoabkdef}% + \def\addtodefabk{\protect\addtodefabk}% + \def\addtogrr{\protect\addtogrr}% + \def\addtoprr{\protect\addtoprr}% + \def\addtosrr{\protect\addtosrr}% + \def\printonlyper{\protect\printonlyper}% + \def\printonlyarq{\protect\printonlyarq}% + \def\printonlyabk{\protect\printonlyabk}% + \def\printonlyabkdef{\protect\printonlyabkdef}% + \def\printonlydefabk{\protect\printonlydefabk}% + \def\onlyhere{\protect\onlyhere}% + \def\onlyout{\protect\onlyout}% + \def\onlyvoll{\protect\onlyvoll}% + \def\onlykurz{\protect\onlykurz}% + \def\vauthor{\protect\vauthor}% + \def\midvauthor{\protect\midvauthor}% + \def\kauthor{\protect\kauthor}% + \def\midkauthor{\protect\midkauthor}% + \def\female{}% + \def\male{}% + \def\sort{\protect\sort}% %% Nur wirksam in \protec@scr %% + \def\bahasdot{}% + \def\banotdot{}% + \def\bago{}% } @@ -1102,7 +1110,7 @@ %% inner only-cmds are identical on lists, %% because v-cmds are changed to k-cmds: -\def\@reprintIfunctions{% %% new in 2.5 +\def\@reprintIfunctions{% \def\onlyout##1{##1}% \def\onlyhere##1{}% \def\onlyvoll##1{}% @@ -1117,7 +1125,7 @@ \def\onlykurz##1{##1}% %% Umgekehrt in \@herefunctions \def\vauthor##1##2{\kauthor{##2}}% %% Vgl. \@hereFfunctions %% \def\midvauthor##1##2{\kauthor{##2}{\nsep}\ignorespaces}% - \def\v@uthor##1##2{\kauthor{##1}}% %% new in 2.4 %% + \def\v@uthor##1##2{\kauthor{##1}}% \def\m@dvauthor##1##2{\kauthor{##1}{\nsep}\ignorespaces}% \def\sort##1{}% } @@ -1163,11 +1171,11 @@ \def\outkurz#1{\unskip{} [{#1\ba@textmode}]} \def\delkurz#1{\unskip} -\def\starktit#1{\onlyvoll{\ktit{#1}}} %% new in 2.5 +\def\starktit#1{\onlyvoll{\ktit{#1}}} \def\vollout#1{\onlyvoll{\onlyout{#1}}} \def\vollhere#1{\onlyvoll{\onlyhere{#1}}} -\def\sechere#1#2{\onlyout{#1}\onlyhere{#2}} %% new in 2.5 -\def\onlybakey#1{} %% new in 2.5 +\def\sechere#1#2{\onlyout{#1}\onlyhere{#2}} +\def\onlybakey#1{} \def\protmva#1#2{\dofrco@ba\@printvname{#1}{\bastrut\ }{#2}{0}{0}{\nsep}\ignorespaces} \def\midvauthor{\protect\protmva} @@ -1178,10 +1186,10 @@ \def\ntvauthor#1#2{\protect@onlyout\vauthor{#1}{#2}\protect\ntsepnta} \def\protmv@#1#2{\dofrco@ba\@printvname{#1}{\listlnfnsep}{#2}{1}{1}{\nsep}\ignorespaces} -\def\m@dvauthor{\protect\protmv@} %% new in 2.3 %% +\def\m@dvauthor{\protect\protmv@} \def\protv@#1#2{\dofrco@ba\@printvname{#1}{\listlnfnsep}{#2}{1}{1}} -\def\v@uthor{\protect\protv@} %% new in 2.3 %% +\def\v@uthor{\protect\protv@} \def\protmka#1{\dofrco@ba\@printkname{#1}{0}{\nsep}\ignorespaces} \def\midkauthor{\protect\protmka} @@ -1194,8 +1202,8 @@ \def\protect@onlyout{} \def\ntsepnta{\printntsep\ignorespaces} -\def\printcatcode#1{\the\catcode\grave@ba#1} - %% E.g. \printcatcode{\"} for value of " %% +\def\printcatcode#1{\the\catcode\grave@ba #1{}} %% {} new in 2.6 +%% arg e.g. ! or \! %% @@ -1204,8 +1212,10 @@ %% internal %% \expandafter\ifx\csname z@skip\endcsname\relax +\def\allowbr@ba{{\hskip 0pt plus 0pt}}% \def\nulskip@ba{{\nobreak \hskip 0pt plus 0pt}}% \else +\def\allowbr@ba{{\hskip \z@skip}}% \def\nulskip@ba{{\nobreak \hskip \z@skip}}% \fi @@ -1219,9 +1229,11 @@ \def\line@ba{\the\inputlineno} \def\lang@ba{\the\language} -\def\catq@ba{\the\catcode\grave@ba\"} \def\erri@ba{\ifnum\catcode\grave@ba\?=13\string?\string?\else??\fi} \def\setn@ba{{\thepage}\if@footnote{\@thefnmark}{@}\else{}{}\fi} +%% if new in 2.6: +\def\catq@ba{\if@footnote\fntdqcat@ba\else\the\catcode\grave@ba\"\fi} +\def\fntdqcat@ba{-1} {\catcode\grave@ba\%=12\gdef\commentch@ba{%}} @@ -1257,7 +1269,7 @@ \def\makeibid@ba{% \if@bashowmem - \if@footnote %% added if, msg changed in 2.5 + \if@footnote \protec@scr{^^J SHOWBAMEM on input line \line@ba \space in}% \if@baminipage \protec@scr{Minipage-FNT \thempfootnote:}\else @@ -1324,7 +1336,7 @@ \ifx\thisti@ba+\ifx\tmemi@ba\tref@ba\else\global\let\thisti@ba=.\fi\fi \ifx\thisti@ba-\global\let\thisti@ba=+\fi} -\def\@bafnttextindent{0.1em} %% new in 2.5 (fnt=mpfnt) +\def\@bafnttextindent{0.1em} %% fnt=mpfnt \let\lastn@ba=- \expandafter\ifx\csname @footnotetext\endcsname\relax @@ -1339,6 +1351,7 @@ \global\let\thiss@ba=-% \global\let\thisn@ba=-% \global\let\pos@ba=0% + \edef\fntdqcat@ba{\the\catcode\grave@ba\"}% %% new in 2.6 \kern\@bafnttextindent \nulskip@ba {\@footnotetrue\ignorespaces #1\nulskip@ba\ba@textmode}% \global\let\lastto@ba=\thisto@ba @@ -1347,7 +1360,7 @@ \global\let\lastvol@ba=\thisvol@ba \global\let\lasts@ba=\thiss@ba \global\let\lastn@ba=\thisn@ba}% - \ifx\pos@ba0{\@footnotetrue\fillvolref@ba{}}\fi} %% new in 2.5 + \ifx\pos@ba0{\@footnotetrue\fillvolref@ba{}}\fi} \fi \expandafter\ifx\csname @mpfootnotetext\endcsname\relax @@ -1362,6 +1375,7 @@ \global\let\thiss@ba=-% \global\let\thisn@ba=-% \global\let\pos@ba=0% + \edef\fntdqcat@ba{\the\catcode\grave@ba\"}% %% new in 2.6 \kern\@bafnttextindent \nulskip@ba {\@footnotetrue\ignorespaces #1\nulskip@ba\ba@textmode}% \global\let\lastto@ba=\thisto@ba @@ -1370,7 +1384,7 @@ \global\let\lastvol@ba=\thisvol@ba \global\let\lasts@ba=\thiss@ba \global\let\lastn@ba=\thisn@ba}% - \ifx\pos@ba0{\@footnotetrue\fillvolref@ba{}}\fi} %% new in 2.5 + \ifx\pos@ba0{\@footnotetrue\fillvolref@ba{}}\fi} \fi @@ -1483,23 +1497,21 @@ \newbox\testbox@ba -\def\@printlastarg#1#2#3{{% %% #2 changed into new #3 in 2.5 %% +\def\@printlastarg#1#2#3{{% \setbox\testbox@ba=\hbox{#3{\ignorespaces #1#2\ba@textmode}}% \ifdim\ht\testbox@ba=0pt% \if@kxxba - \gdef\bacorr{}% %% no \if@printhint\else in 2.2 %% + \gdef\bacorr{}% \fi \else {\if@kxxba - %% \iflasthasdot@ba{\not@bakntsepcorr}{\prep@bakntsepcorr}% - %% ... changed in 2.5 into: \prep@bakntsepcorr \else \not@bakntsepcorr \fi \ntsep }{\unhbox\testbox@ba}% - \if@kxxba\else \if@vxxbalist\else %% finddot new in 2.5 + \if@kxxba\else \if@vxxbalist\else \setbox\testbox@ba=\hbox{#3{#2}}% \ifdim\ht\testbox@ba=0pt% \let\@testa=-\finddot@ba{#1}\ifx\@testa+\@bahasdot\fi @@ -1534,7 +1546,7 @@ \ifdim\ht\testbox@ba=0pt\else \ifx\@testb\@leer\@bastrut\ \else %% space before *{...} {#2}\fi %% #2 is \nsep at \x... - {\unhbox\testbox@ba}% %% <= moved in 2.5 before \fi => + {\unhbox\testbox@ba}% \let\@testa=-\finddot@ba{#1}\ifx\@testa+\@bahasdot\fi \fi}} @@ -1551,7 +1563,6 @@ ^^J\vqu, the inner full title will also be printed separately on the v..-list.) ^^JAlso \vli[p{TEXT}]{}{}*{\ktit{..}}{...} without \ktit in TEXT is forbidden.^^J}% \errmessage@ba{Missing \string\ktit{...} in *inner* ...v#1-cmd}}\fi\fi} - %% msgs changed in 2.5 %% \def\@initvprintonly#1#2#3#4#5#6#7#8{{% %% #1 == li, qu %% \resetcorr@ba @@ -1570,7 +1581,7 @@ \def\@testa{#6}% \def\execute@ktit{\@nobaktit{#1}}% \@baktitfalse - \def\ktit##1{\global\@baktittrue %% \global new in 2.5 %% + \def\ktit##1{\global\@baktittrue \def\kurz{\kurz@ktit}% \ba@varlabel{#4}{#5}{##1}% \if@footnote @@ -1584,7 +1595,7 @@ \ifmem@baouter \gdef\execute@ktit{{\@kxxbatrue\@kprintonly{#1}{#2}{#4}{#5}{##1}{#7}}}% \fi - \else %% 2 * outer+gdef \execute@ktit new in 2.5 %% + \else \ifmem@baouter \gdef\execute@ktit{{\@firstherald\if@rheraldktit \cap@ba{announcektit}\@rootponly{#1}{#4}*{#5}{##1}{#7}% @@ -1593,29 +1604,28 @@ \fi ##1\ba@textmode}% \ifreprint@ba {\setbox\testbox@ba=\hbox{#2\relax #3\relax #4\relax #5\relax #6\relax - \if@baktit %% #2...#5\relax new in 2.5 %% + \if@baktit \global\let\gargc@ba=\execute@ktit \else \gdef\gargc@ba{\@kxxbatrue\@kprintonly{#1}{#2}{#4}{#5}{\erri@ba}{#7}}% - {\errorcontextlines=-1% %% warn changed to err 2.5 %% + {\errorcontextlines=-1% \errhelp{See the number of the line where the error comes from ...}% \errmessage@ba{Missing \string\ktit{...} in *inner* ...v#1-cmd}}% \fi}% {\@hereRfunctions\gargc@ba}% %% <-> \@rootponly %% - %% new in 2.5: see \@reprintIfunctions %% + %% see \@reprintIfunctions %% \global\let\gargc@ba=\relax }% \else \ifx\@testa\@leer{\@vprintonly{#1}{#2}{#3}{#4}{#5}{}{}{#7}}\else \ifx\@testa\@leerz{\@vprintonly{#1}{#2}{#3}{#4}{#5}{}{}{#7}}\else {\@vprintonly{#1}{#2}{#3}{#4}{#5}{#6}{\execute@ktit}{#7}}\fi\fi - %% 2.5: {#6\relax\execute@ktit} changed in {\execute@ktit}{#7} %% \fi }\if@footnote \if@baouter\makethiso@ba\else\makethisi@ba\fi \fi} \def\clearmem@ba{{\@footnotetrue\filltmemo@ba{}{}{}{}\filltmemi@ba{}{}{}{}% \fillpmem@ba{}{}\fillvolmem@ba{}\fillnmem@ba{}% - \fillvolref@ba{}}} %% new in 2.5 + \fillvolref@ba{}}} \def\filltmemo@ba#1#2#3#4{\if@footnote \global\edef\tmemo@ba{{#1}{#2}{#3}{#4}}\fi} @@ -1637,7 +1647,6 @@ \global\edef\nref@ba{#1}\fi} {\@footnotetrue\fillnref@ba{}} - %% 2.3: change #1-cmd into #1 %% \def\errmsg@bawarn#1#2#3{{\errorcontextlines=-1\type@bawarn{...#1}% \protec@scr{ \space\space\space [#2] overwrites `{\nref@ba}',}% \protec@scr{ \space\space\space but the foregoing #3.^^J^^J}}} @@ -1660,7 +1669,7 @@ \ifwriwarn@ba{$\bullet$\penalty\@m \ }\fi \if@baouter \type@bawarn{...#1 repeats first author's lastname}% \else \type@bawarn{Inner ...#1 repeats author's lastname}% - \fi %% 2.3: change #1-cmd into #1 and (first) into first %% + \fi \protec@scr{ \space\space\space `{\nmem@ba}'. Change to `...#1[m,f,p]'??^^J}% \fi\fi \else @@ -1708,17 +1717,14 @@ {\@footnotetrue\fillsref@ba{}} -\def\@vprintonly#1#2#3#4#5#6#7#8{{% %% #7 changed into new #8 in 2.5 %% +\def\@vprintonly#1#2#3#4#5#6#7#8{{% \@herefunctions \def\@testa{#2}% \ifx\@testa\@leer \@printvname{#3}{\bastrut\ }{#4}{0}{1}% \@printoptarg{#5}{#8}% \else\oletter@ba{v#1}{#2}{\@printoptarg{#5}{#8}}% \fi %% #1 == li, qu %% - \@printlastarg{#6}{#7}{}\@heraldktitfalse - %% {#6} changed into {#6}{#7} in 2.5 %% - }} - + \@printlastarg{#6}{#7}{}\@heraldktitfalse}} \def\@initprinthint#1{\if@printhint @@ -1734,7 +1740,7 @@ \makeibid@ba \if@footnote\warn@baname{k#1}{#2}\fi \ifx\isibidem@ba-{\@herefunctions - \ifreprint@ba\@reprintIfunctions\fi %% new in 2.5 + \ifreprint@ba\@reprintIfunctions\fi \@kprintonly{#1}{#2}{#3}{#4}{#5}{#6}}% \else\ibidemname@ba \fi @@ -1801,12 +1807,10 @@ \def\next@ba{} -%% new in 2.5: \def\pfilled@baon{\if@pfvba\if@footnote\global\let\pfilled@ba=+\fi\fi} \def\@balocalvolon{\if@pfvba\if@footnote\@balocalvoltrue\fi\fi} \def\@balocalpgon{\if@pfvba\if@footnote\@balocalpgtrue\fi\fi} \def\pevofilled@baon{\if@pfvba\if@footnote\global\let\pevofilled@ba=+\fi\fi} -%% \def\getk@bapg#1]{\@bapg{#1}\bk@bapg} \def\getxk@bapg#1]{\@baxpg{#1}\bk@bapg} @@ -1822,7 +1826,7 @@ \else \ifx\next@ba(\let\next@ba=\getxkf@bapg \pfilled@baon - \else %% else-part new in 2.5 + \else \if@pfvba{ \erri@ba}{\errorcontextlines-1% \@qqertypeout{*[n]- or *(n)}{... at the end of an \if@baouter outer \else inner \fi BibArts command.}% \errhelp{^^JThe * at the end of a BibArts cmd has to be followed @@ -1836,7 +1840,6 @@ \def\lessinnerinfoerr@ba#1{\type@bawarn{No #1 in INNER ibidem-series}} \def\lessouterinfoerr@ba#1#2#3#4#5{{ \erri@ba}{\errorcontextlines-1% - %% minipage new in 2.5: \@qqertypeout{#2}{Automatic IBIDEM-setting in \if@baminipage minipage \fi footnote:}% \errhelp{ ^^JYour last BibArts command has had a #1 as #2-number, @@ -1845,7 +1848,6 @@ ^^J`passim', or what you've forgotten, as #2-number. (Then, you ^^Jmay put your whole BibArts-\cmd in {#4\cmd...}.) ^^JOr switch off IBIDEM: Set \clearbamem in front of your BibArts command.^^J}% - %% errmsg changed in 2.5 \errmessage@ba{Same outer title, before with :#3:, has now no #1}}} \def\do@banohint#1{\if@printhint\else\ifba@varstring\else #1\fi\fi} @@ -1869,13 +1871,11 @@ \let\pfilled@ba=- \let\pevofilled@ba=- -%% new in 2.5: \let\@bainnernewvol=- \let\@bainnernewpg=- \newif\if@balocalvol\@balocalvolfalse \newif\if@balocalpg\@balocalpgfalse \newif\if@bapglock\@bapglockfalse -%% \def\ak@bapg{\afterassignment\getakch@bapg\let\next@ba= } \def\getakch@bapg{% @@ -1885,17 +1885,16 @@ %%% \ifx\lockpevo@ba-\ifx\next@ba|\else\ifx\next@ba_\else \if@pfvba - \if@footnote %% new in 2.5 + \if@footnote \ifx\isibidem@ba+\ifx\pevofilled@ba+% \ifx\volref@ba\@leer \else - \if@baouter %% new in 2.5 + \if@baouter \lessouterinfoerr@ba{vol/no}{|n|- or _n_}{{pervol}{\volref@ba}}{\notprintlongpervol}{series}% - \fillvolref@ba{}% %% new in 2.5 + \fillvolref@ba{}% \fi \fi \fi\fi - %% 2.5: Simple \fillvolmem@ba{} changed into \if@baouter \fillvolmem@ba{}% \else @@ -1918,7 +1917,7 @@ \else \ifx\next@ba*% \@balocalpgon - \if@baouter\else %% new in 2.5 + \if@baouter\else \type@bawarn{Your * is at the end of an INNER cmd}% \typeout@ba{ \space\space Use *[PageNum] or *(FolioNum) only at the end of OUTER BibArts cmds.}\fi \let\next@ba=\xk@bapg @@ -1940,12 +1939,11 @@ \pevofilled@baon \else %%% - %% new in 2.5 \if@pfvba - \if@footnote %% new in 2.5 + \if@footnote \ifx\isibidem@ba+% \ifx\pfilled@ba+% - \if@baouter %% new in 2.5 + \if@baouter \lessouterinfoerr@ba{page/folio}{[n]- or (n)}{\pref@ba}{\notprintlongpagefolio}{document}% \fi \ifx\lockpevo@ba-% @@ -1954,7 +1952,6 @@ \fi \fi \fi - %% 2.5: Simple \fillpmem@ba{}{} changed into \if@baouter \fillpref@ba{}{}% \else @@ -1973,13 +1970,12 @@ \fi \else \spacefactorM@ba \@bastrut - \ifx\onlypevo@ba-\if@baouter\else\ifx\isibidem@ba+\if@ibidhp\@bahasdot\fi\fi\fi\fi %% new in 2.5 + \ifx\onlypevo@ba-\if@baouter\else\ifx\isibidem@ba+\if@ibidhp\@bahasdot\fi\fi\fi\fi \fi \fi %%% \fi\fi\fi\fi\fi %%% ONLY SCREEN-MESSAGES MAY FOLLOW HERE: - %% new in 2.5 \if@pfvba\if@footnote \if@baouter \else @@ -2073,7 +2069,6 @@ ^^J \space OR set `*'-option, and type supplements and a full title as *{op}{a3}}}}} \def\Check@ObligatoryLastvArg#1[#2]#3#4*#5#6{\csname @#1\endcsname[#2]{#3}{#4}*{#5}{#6}\pvcheck@ba} - %% {#6\@leer} changed into {#6} in 2.5 %% @@ -2846,13 +2841,18 @@ ^^J}% \fi} -%% No \message without german.sty: %% + +%% babel-shorthand... new in 2.6: \def\bagermanTeX#1{% - \expandafter\ifx\csname ngermanTeX\endcsname\relax\else \ngermanTeX{#1}\message{(new)}\fi - \expandafter\ifx\csname germanTeX\endcsname\relax\else \germanTeX{#1}\message{(old)}\fi} + \expandafter\ifx\csname AfterBabelLanguage\endcsname\relax + \expandafter\ifx\csname ngermanTeX\endcsname\relax\else \ngermanTeX{#1}\message{(new)}\fi + \expandafter\ifx\csname germanTeX\endcsname\relax\else \germanTeX{#1}\message{(old)}\fi + \else \shorthandon{"}{#1}\message{\string=\string\shorthandon{\string"}}% + \fi} \def\baoriginalTeX#1{% - \expandafter\ifx\csname originalTeX\endcsname\relax\else - \expandafter\ifx\csname AfterBabelLanguage\endcsname\relax\originalTeX{#1}\fi %% not babel + \expandafter\ifx\csname AfterBabelLanguage\endcsname\relax + \expandafter\ifx\csname originalTeX\endcsname\relax\else \originalTeX{#1}\fi + \else \shorthandoff{"}{#1}\message{\string=\string\shorthandoff{\string"}}% \fi} @@ -2872,7 +2872,6 @@ {\reprint@batrue \@printlastarg{#4}{}{}}\if@banonum{\fromnopagevxxsep}\fi\@reportbaupfalse\ignorespaces} \def\@vkcitentry#1#2#3#4#5#6[#7][#8](#9){\@reprintIfunctions - %% \@reprintkfunctions changed to \@reprintIfunctions in 2.5 \addxadd@ba#5\relax\relax\relax \language@barep{#8}{#9}% \activech@barep{#7}{#9}% @@ -2997,20 +2996,15 @@ \gdef\@bibsortvers{[OLD]}% \@input{\jobname.#1} \def\@noitemerr{\info@emptyba{#1}\gdef\@bibsortvers{-}} - \end{description}\fussy}\checkversion@ba{#1}\message{\string>\string> }} - -\def\getversuf@ba#1{{\def\@testa{vli}\def\@testb{vqu}\def\@testc{vkc}\def\@testd{#1}% - \ifx\@testd\@testa\typeversion@ba\fi - \ifx\@testd\@testb\typeversion@ba\fi - \ifx\@testd\@testc\typeversion@ba\fi}} + \end{description}\fussy}\checkversion@ba\message{\string>\string> }} \def\typeversion@ba{{\def\@testa{[OLD]}% \ifx\@bibsortvers\@testa\type@bawarn{Input file created by outdated bibsort}\fi - \typeout@ba{ \space Version of bibsort is \ifx\@bibsortvers\@testa older than \else \@bibsortvers\space instead \fi 2.5 (version of bibarts.sty).}}} + \typeout@ba{ \space Version of bibsort is \ifx\@bibsortvers\@testa older than \else \@bibsortvers\space instead \fi 2.6 (version of bibarts.sty).}}} -\def\checkversion@ba#1{{\def\@testa{2.5}\def\@testb{-}% %% new in 2.5 +\def\checkversion@ba{{\def\@testa{2.6}\def\@testb{-}% \ifx\@bibsortvers\@testa\else\ifx\@bibsortvers\@testb\else - \getversuf@ba{#1}\fi\fi}} + \typeversion@ba\fi\fi}} \def\@hereUfunctions{% \def\par{}% @@ -3061,7 +3055,8 @@ \newcount\language \fi -\def\psethyphenation#1{\@bsphack\sethyphen@ba{#1}{You've called \string\sethyphenation{#1}.}\@esphack} +\def\psethyphenation#1{\@bsphack\sethyphen@ba{#1}{You've called \string\sethyphenation{#1}.}% + \if@unusedbib\ignorespaces\else\@esphack\fi} %% if new in 2.6 \def\sethyphenation{\protect\psethyphenation} \def\sethyphen@ba#1#2{% @@ -3226,7 +3221,7 @@ \def\SS{{SS}}% %% \ \def\aa{{\r{a}}}% %% > avoid [T1] errors \def\AA{{\r{A}}}% %% / - \def\onlybakey{}% %% new in 2.5 (add arg to keyword) + \def\onlybakey{}% %% add arg to keyword \ifba@varstring \@bains@labtrue \getnext@baA#1\endlist@ba \@bains@labtrue \getnext@baB#2\endlist@ba \@bains@labtrue @@ -3328,7 +3323,6 @@ \ifx ~\next@ba \else\ifx :\next@ba \else\ifx ;\next@ba \else\ifx !\next@ba \else \ifx ?\next@ba \else\ifx `\next@ba \else\ifx '\next@ba \else \ifx <\next@ba \else\ifx >\next@ba \else - %% \relax new in 2.5 to reduce errmsgs from \cmd{arg}: %% \ifcat 1\next@ba \relax \csname savn@bavar#1\endcsname \else \sonderz@banext{#1}% \fi @@ -3341,8 +3335,6 @@ \fi\fi\fi\fi}% } -%% Ignore first arg of: \onlyvoll, \onlyout, \vauthor, \midvauthor, -%% and new in 2.5: \starktit, \vollout, \vollhere, \sechere, \sort: \def\analyselabeltext@ba#1{% \expandafter\ifx \csname next@ba\endcsname\relax \else \ifx \onlyvoll \next@ba \@bains@labfalse \count@ba0 \else @@ -3356,7 +3348,6 @@ \ifx \sort \next@ba \@bains@labfalse \count@ba0 \fi\fi\fi\fi\fi\fi\fi\fi\fi \if@bains@lab - %% \relax new in 2.5 to reduce errmsgs from \cmd{arg}: %% \ifcat A\next@ba \relax \csname savn@bavar#1\endcsname \else \prepnumplussonder@ba{#1}% \fi @@ -3717,68 +3708,260 @@ \def\next@hy{} -\def\test@hy{} \def\txen@hy{} -\def\Atest@hy{A@} +%% new in 2.6: +\def\Foct@ba{} + + +%% new in 2.6: +\def\dokern@ba#1{\let\letr@ba\relax \baletter@arg#1\endlist@ba + {\let\next@hy\letr@ba \kernlttr@ba}} + +\def\baletter@arg{\afterassignment\do@ba@ltr\let\nltr@ba= } + +\def\do@ba@ltr{% + \ifx \nltr@ba\endlist@ba \let\nltr@ba\relax + \else + \ifx \letr@ba\relax \ifx \nltr@ba\bgroup \else \let\letr@ba\nltr@ba \fi \fi + \let\nltr@ba\baletter@arg + \fi \nltr@ba} + + +{\catcode\grave@ba\<=12% +\gdef\only@sc@ba#1{{\setbox\testbox@ba=\hbox{p}% + \ifdim\dp\testbox@ba<0.2ex{#1}\fi}}% +} + +\def\ifdqko@ba#1#2{\if@newhyko \ifx\fromdq@ba+{#1}\else{#2}\fi \else{#2}\fi} + +\def\kernlttr@ba{% + \if@newhyko %% new in 2.6: + \ifx\next@hy \AE\Akern@ba\fi + \ifx\next@hy \ae\akern@ba\fi + \ifx\next@hy a\akern@ba\fi + \ifx\next@hy t\tkern@ba\fi + \fi + \ifx\next@hy A\Akern@ba\fi % incl {A@} + \ifx\next@hy V\Vkern@ba\fi + \ifx\next@hy W\ifdqko@ba{\Akern@ba}{\Wkern@ba}\fi %% 2.6: "W=\AA + \ifx\next@hy T\Tkern@ba\fi + \ifx\next@hy v\vkern@ba\fi + \ifx\next@hy w\ifdqko@ba{\akern@ba}{\wkern@ba}\fi %% 2.6: "w=\aa + \ifx\next@hy X\Xkern@ba\fi + \ifx\next@hy Y\Ykern@ba\fi + \ifx\next@hy y\ykern@ba\fi + \ifx\next@hy x\xkern@ba\fi +} \def\acckorr@hy#1{% - \def\test@hy{#1}% - \ifx#1A\kern -0.06em\fi \ifx\test@hy\Atest@hy\kern -0.06em\fi - \ifx#1V\kern -0.1em\fi - \ifx#1W\kern -0.1em\fi - \ifx#1T\kern -0.1em\fi - \ifx#1v\kern -0.04em\fi - \ifx#1w\kern -0.04em\fi - \ifx#1X\kern -0.06em\fi - \ifx#1Y\kern -0.12em\fi - \ifx#1y\kern -0.04em\fi - \ifx#1x\kern -0.04em\fi + \dokern@ba{#1}% + \if@newhyko\nulskip@ba\fi %% new in 2.6 (err-fix) \txen@hy{#1}} \def\accentnum@hy#1 #2{% - \ifx#2A\kern -0.06em\fi - \ifx#2V\kern -0.1em\fi - \ifx#2W\kern -0.1em\fi - \ifx#2T\kern -0.1em\fi - \ifx#2v\kern -0.04em\fi - \ifx#2w\kern -0.04em\fi - \ifx#2X\kern -0.06em\fi - \ifx#2Y\kern -0.12em\fi - \ifx#2y\kern -0.04em\fi - \ifx#2x\kern -0.04em\fi + \dokern@ba{#2}% + \if@newhyko\nulskip@ba\fi %% new in 2.6 (symmetry) \accent #1 #2} -\def\aktacckorr@hy#1{\ifx#1\dq@prtct \else - \message{[ HYKO: Get unexpected \string#1 ] }\fi +\def\oldg@ba{\dq@prtct} + +%% changed in 2.6: +\def\aktacckorr@hy#1{{\def\@testa{#1}% + \ifx \@testa\oldg@ba \else + \type@bawarn{\string\hy\string\active@dq: No \string\dq@prtct\space follows}\fi}% + \def\txen@hy{\active@dq #1}% \acckorr@hy} \def\getarg@hy{\afterassignment\nextarg@hy\let\txen@hy= } -\def\nextarg@hy{\bgroup - \ifx\txen@hy\accent - \expandafter\accentnum@hy\else - \expandafter\txen@hy\fi} +%% changed in 2.6: +\def\nextarg@hy{\ifx \txen@hy\accent \let\txen@hy\accentnum@hy \fi + \bgroup \txen@hy} \def\gonext@hy{\let\txen@hy=\next@hy \let\next@hy=\acckorr@hy} -\def\goact@hy{\let\txen@hy=\next@hy \let\next@hy=\aktacckorr@hy} +\def\goact@hy{\let\next@hy=\aktacckorr@hy} %% changed in 2.6 + + +\def\UTFviiiName@ba{utf8} +\def\ToneName@ba{T1} + +%% extracted in 2.6: +\def\Akern@ba{\kern -0.06em} +\def\ak@sc@ba{\kern -0.03em} +\def\akern@ba{\only@sc@ba{\ak@sc@ba}} +\def\Tkern@ba{\kern -0.1em} +\def\tk@sc@ba{\kern -0.03em} +\def\tkern@ba{\only@sc@ba{\tk@sc@ba}} +\def\Vkern@ba{\kern -0.1em} +\def\vkern@ba{\kern -0.04em} +\def\Wkern@ba{\kern -0.1em} +\def\wkern@ba{\kern -0.04em} +\def\Xkern@ba{\kern -0.06em} +\def\xkern@ba{\kern -0.04em} +\def\Ykern@ba{\kern -0.12em} +\def\ykern@ba{\kern -0.04em} +\def\lqkern@ba{\kern 0.04em} +\def\qsbkern@ba{\kern 0.04em} +\def\glqkern@ba{\qsbkern@ba} +\def\rqkern@ba{\kern 0.04em} +\def\grqkern@ba{\rqkern@ba} +\def\srbkern@ba{\kern -0.04em} +\def\crbkern@ba{\kern -0.05em} + +\def\act@ba#1{\catcode\grave@ba#1=13} + +{\act@ba{\`}% + \act@ba{\'}% + \gdef\dohyxhk@ba{% + \ifx\next@hy `\lqkern@ba\fi + \ifx\next@hy '\rqkern@ba\fi + }% +} {\catcode\grave@ba\"=13% \catcode\grave@ba\`=12% \catcode\grave@ba\'=12% + %%% new in 2.6: + \catcode\grave@ba\>=12% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + %%% + \gdef\batriplet@hy{\let\Foct@ba\next@hy \let\next@hy\doUTFhyT@ba}% + \gdef\doUTFhyT@ba#1#2{% + \ifx\Foct@ba % + \ifx #1% + \ifx #2\Ykern@ba\fi % 1E8E \.Y + \ifx #2\ykern@ba\fi % 1E8F \.y + \fi + \ifx #1% + \ifx #2\Ykern@ba\fi % 1EF2 \`Y + \ifx #2\ykern@ba\fi % 1EF3 \`y + \fi + \ifx #1% + \ifx #2\tkern@ba\fi % 1E6D \d t + \fi + \fi + \ifx\Foct@ba % + \ifx #1% + \ifx #2\lqkern@ba\fi % 2018 + \ifx #2\rqkern@ba\fi % 2019 + \ifx #2\qsbkern@ba\fi % 201A + \fi + \fi + %% + \nulskip@ba \Foct@ba #1#2}% + %%% + \gdef\badoublet@hy{\let\Foct@ba\next@hy \let\next@hy\doUTFhyD@ba}% + \gdef\doUTFhyD@ba#1{% + \ifx\Foct@ba % + \ifx #1\Akern@ba\fi % 00C0 \`A + \ifx #1\akern@ba\fi % 00E0 \`a + \ifx #1\Akern@ba\fi % 00C1 \'A + \ifx #1\akern@ba\fi % 00E1 \'a + \ifx #1\Akern@ba\fi % 00C2 \^A + \ifx #1\akern@ba\fi % 00E2 \^a + \ifx #1\Akern@ba\fi % 00C3 \~A + \ifx #1\akern@ba\fi % 00E3 \~a + \ifx #1\Akern@ba\fi % 00C4 \"A + \ifx #1\akern@ba\fi % 00E4 \"a + \ifx #1\Akern@ba\fi % 00C5 \r A + \ifx #1\akern@ba\fi % 00E5 \r a + \ifx #1\Akern@ba\fi % 00C6 \AE + \ifx #1\akern@ba\fi % 00E6 \ae + \ifx #1\Ykern@ba\fi % 00DD \'Y + \ifx #1\ykern@ba\fi % 00FD \'y + \ifx #1\ykern@ba\fi % 00FF \"y + \fi + \ifx\Foct@ba % + \ifx #1\Akern@ba\fi % 01CD \v A + \ifx #1\akern@ba\fi % 01CE \v a + \ifx #1\Akern@ba\fi % 01E2 \=\AE + \ifx #1\akern@ba\fi % 01E3 \=\ae + \fi + \ifx\Foct@ba % + \ifx #1\Akern@ba\fi % 0100 \=A + \ifx #1\akern@ba\fi % 0101 \=a + \ifx #1\Akern@ba\fi % 0102 \u A + \ifx #1\akern@ba\fi % 0103 \u a + \ifx #1\Akern@ba\fi % 0104 \k A + \ifx #1\akern@ba\fi % 0105 \k a + \fi + \ifx\Foct@ba % + \ifx #1\Tkern@ba\fi % 021A \textcommabelow T + \ifx #1\tkern@ba\fi % 021B \textcommabelow t + \ifx #1\Ykern@ba\fi % 0232 \=Y + \ifx #1\ykern@ba\fi % 0233 \=y + \fi + \ifx\Foct@ba % + \ifx #1\Tkern@ba\fi % 0162 \c T + \ifx #1\tkern@ba\fi % 0163 \c t + \ifx #1\Tkern@ba\fi % 0164 \v T + \ifx #1\tkern@ba\fi % 0165 \v t + \ifx #1\Wkern@ba\fi % 0174 \^W + \ifx #1\wkern@ba\fi % 0175 \^w + \ifx #1\Ykern@ba\fi % 0178 \"Y + \ifx #1\Ykern@ba\fi % 0176 \^Y + \ifx #1\ykern@ba\fi % 0177 \^y + \fi + %% + \nulskip@ba \Foct@ba #1}% + %%% \gdef\hykorr@hy{% + \let\fromdq@ba=-% + \let\ttdq@ba=-% \if@hyko - \ifx\next@hy A\kern -0.06em\fi - \ifx\next@hy V\kern -0.1em\fi - \ifx\next@hy W\kern -0.1em\fi - \ifx\next@hy T\kern -0.1em\fi - \ifx\next@hy v\kern -0.04em\fi - \ifx\next@hy w\kern -0.04em\fi - \ifx\next@hy X\kern -0.06em\fi - \ifx\next@hy Y\kern -0.12em\fi - \ifx\next@hy y\kern -0.04em\fi - \ifx\next@hy x\kern -0.04em\fi - \ifx\next@hy "\gonext@hy\fi + %% new in 2.6 + \expandafter\ifx\csname next@hy\endcsname\relax + \if@balist\type@bawarn{Empty object after \string\hy\space or \string\fhy}\fi + \else + \if@newhyko + {\setbox\testbox@ba=\hbox{i}% + \ifdim\wd\testbox@ba>.4em\global\let\ttdq@ba=+\fi}% + \fi + \ifx\ttdq@ba-% + \kernlttr@ba + \ifx\next@hy "\let\fromdq@ba=+\gonext@hy\fi \ifx\next@hy \newumlaut\gonext@hy\fi \ifx\next@hy \active@dq\goact@hy \fi \ifx\next@hy \bgroup \let\next@hy=\getarg@hy\fi @@ -3798,12 +3981,56 @@ \ifx\next@hy \r\gonext@hy\fi \ifx\next@hy \u\gonext@hy\fi \ifx\next@hy \v\gonext@hy\fi - \ifx\next@hy `\kern 0.04em\fi - \ifx\next@hy '\kern 0.04em\fi - \ifx\next@hy \glq\kern 0.04em\fi \ifx\next@hy \@glq\kern 0.04em\fi - \ifx\next@hy ]\kern -0.04em\fi + \ifx\next@hy `\lqkern@ba\fi + \ifx\next@hy '\rqkern@ba\fi + \ifx\next@hy \glq\glqkern@ba\fi \ifx\next@hy \@glq\glqkern@ba\fi + \ifx\next@hy ]\srbkern@ba\fi \ifx\next@hy )\kern -0.04em\fi - \ifx\next@hy \}\kern -0.05em\fi \ifx\next@hy \@rb\kern -0.05em\fi + \ifx\next@hy \}\crbkern@ba\fi \ifx\next@hy \@rb\crbkern@ba\fi + %% new in 2.6: + \fi + \if@newhyko\ifx\ttdq@ba-% + \ifx\next@hy \AA\Akern@ba\fi + \ifx\next@hy \aa\akern@ba\fi + \ifx\next@hy \lq\lqkern@ba\fi + \ifx\next@hy \textquoteleft\lqkern@ba\fi + \ifx\next@hy \rq\rqkern@ba\fi + \ifx\next@hy \textquoteright\rqkern@ba\fi + \ifx\next@hy \grq\grqkern@ba\fi \ifx\next@hy \@grq\grqkern@ba\fi + \ifx\next@hy \quotesinglbase\qsbkern@ba\fi + \ifx\next@hy \rbrack\srbkern@ba\fi + \ifx\next@hy \textcommabelow\gonext@hy\fi + \ifx\next@hy \grmn@active@dq@\gonext@hy\fi + \ifx\next@hy \t\gonext@hy\fi + \ifx\next@hy \newtie\gonext@hy\fi + \ifx\next@hy \capitaltie\gonext@hy\fi + \ifx\next@hy \capitalnewtie\gonext@hy\fi + \ifx\next@hy \capitalacute\gonext@hy\fi + \ifx\next@hy \capitalbreve\gonext@hy\fi + \ifx\next@hy \capitalcaron\gonext@hy\fi + \ifx\next@hy \capitalcedilla\gonext@hy\fi + \ifx\next@hy \capitalcircumflex\gonext@hy\fi + \ifx\next@hy \capitaldieresis\gonext@hy\fi + \ifx\next@hy \capitaldotaccent\gonext@hy\fi + \ifx\next@hy \capitalgrave\gonext@hy\fi + \ifx\next@hy \capitalhungarumlaut\gonext@hy\fi + \ifx\next@hy \capitalmacron\gonext@hy\fi + \ifx\next@hy \capitalogonek\gonext@hy\fi + \ifx\next@hy \capitalring\gonext@hy\fi + \ifx\next@hy \capitaltilde\gonext@hy\fi + \dohyxhk@ba + \fi\fi + \fi + \if@newhyko\ifx\ttdq@ba-\ifx\inputencodingname\UTFviiiName@ba + \ifx\next@hy \badoublet@hy\fi % 195 + \ifx\next@hy \badoublet@hy\fi % 196 + \ifx\next@hy \badoublet@hy\fi % 197 + \ifx\next@hy \badoublet@hy\fi % 199 + \ifx\next@hy \badoublet@hy\fi % 200 + \ifx\next@hy \batriplet@hy\fi % 225 + \ifx\next@hy \batriplet@hy\fi % 226 + \fi\fi\fi + %% \fi \nulskip@ba\next@hy}% } @@ -3812,19 +4039,42 @@ \newif\if@hyko\@hykotrue -\def\phyko{\@hykotrue}% -\def\hyko{\protect\phyko}% +\def\phyko{\@hykotrue} +\def\hyko{\protect\phyko} + +\def\pnothyko{\@hykofalse} +\def\nothyko{\protect\pnothyko} + + +%% new in 2.6: +\typeout@ba{ **^^J 2.6 extents the kerning of \string\hy\space and \string\fhy. \space Use \string\notnewhyko\space to reject.} + +\newif\if@newhyko\@newhykotrue + +\def\pnewhyko{\@newhykotrue} +\def\newhyko{\protect\pnewhyko} + +\def\pnotnewhyko{\@newhykofalse} +\def\notnewhyko{\protect\pnotnewhyko} + +\typeout@ba{ 2.6 extents specials of \string\abra\space and \string\fabra. \space Use \string\notnewabra\space to reject.^^J **} + +\newif\if@newabra\@newabratrue + +\def\pnewabra{\@newabratrue} +\def\newabra{\protect\pnewabra} + +\def\pnotnewabra{\@newabrafalse} +\def\notnewabra{\protect\pnotnewabra} -\def\pnothyko{\@hykofalse}% -\def\nothyko{\protect\pnothyko}% \def\phy{\leavevmode\nulskip@ba\ifmmode\hbox{-}\else\discretionary{-}{}{-}\fi\after@hy} %\def\phy{\leavevmode\nulskip@ba\ifmmode\hbox{-}\else\discretionary{-}{}{-}\fi\nulskip@ba} \def\pfhy{\leavevmode\nulskip@ba\hbox{-}\after@hy} %\def\pfhy{\leavevmode\nulskip@ba\hbox{-}\nulskip@ba} -\def\hy{\protect\phy} -\def\fhy{\protect\pfhy} +\DeclareRobustCommand\hy{\protect\phy} %% DRC in 2.6 for +\DeclareRobustCommand\fhy{\protect\pfhy} %% .toc \MakeUppercase %% @@ -3917,14 +4167,14 @@ \def\HYVARI@BA#1#2{\expandafter\ifx\csname l@german\endcsname\relax {#1}\else \ifnum\language=\l@german \csname OLDHY#2\endcsname \else {#1}\fi \fi} -%% "Inside-c before k": %% +%% "Inside-c in front of k": %% \def\oldhyc{\hycons@ba{k}{c}} %% always old: Dru\oldhyc ker \def\OLDHYC{\HYCONS@BA{K}{C}} \def\hyc{\hyvari@ba{c}{c}} %% spells new in ngerman, naustrian \def\HYC{\HYVARI@BA{C}{C}} -%% "Triple consonant before a vovel": %% +%% "Triple consonant in front of vovel": %% \def\oldhyl{\hycons@ba{ll}{l}} %% always old: Scha\oldhyl leistung \def\OLDHYL{\HYCONS@BA{LL}{L}} \def\hyl{\hyvari@ba{ll}{l}} %% spells new in ngerman, naustrian @@ -3971,125 +4221,422 @@ \fi -\def\escb@ba{\ifvmode\leavevmode\lower -1ex\hbox{\strut}\else\nulskip@ba\fi} - -\def\babbrack#1{\escb@ba{\upshape - \lower 0.25ex\hbox{\tiny [}\hbox{#1}% - \lower 0.25ex\hbox{\tiny ]}\kern 0.02em{}}} - -\def\bambrack#1{\iflasthasdot@ba{}{\@baupcorr}\escb@ba{\upshape - \lower -0.5ex\hbox{\lower 1.5pt\hbox{\tiny [}}\hbox{#1}% - \lower -0.5ex\hbox{\lower 1.5pt\hbox{\tiny ]}}\kern 0.02em{}}} - -\def\batbrack#1{\iflasthasdot@ba{}{\@baupcorr}\escb@ba{\upshape - \lower -1.4ex\hbox{\lower 3pt\hbox{\tiny [}}\hbox{#1}% - \lower -1.4ex\hbox{\lower 3pt\hbox{\tiny ]}}}{\@baendcorr}\kern 0.02em{}} - - +%% new in 2.6: +\def\pabrao{[} %{(} +\def\abraopen{\protect\pabrao} +\def\pabrac{]} %{)} +\def\abraclose{\protect\pabrac} + + +\def\escb@ba{\ifvmode\leavevmode + \if@newabra\else\lower -1ex\hbox{\strut}\fi %% 2.6: repro old err + \else\nulskip@ba\fi} + +%% new in 2.6: +\newif\if@abradone +\def\up@abra{\ifmmode\else\upshape\fi} +\def\hm@abra#1{\ifmmode{#1}\else\hbox{#1}\fi} + +%% DRC in 2.6 for .toc-\uppercase: +\def\pabra#1{\@abra{#1}\allowbr@ba} +\DeclareRobustCommand\abra{\protect\pabra} + +\def\pfabra#1{\@abra{#1}\nulskip@ba} +\DeclareRobustCommand\fabra{\protect\pfabra} + +%% direct use since 2.6: +\def\pfbabbrack#1{\@babbrack{#1}\nulskip@ba} +\def\pbabbrack#1{\@babbrack{#1}\allowbr@ba} +\def\@babbrack#1{\escb@ba{\up@abra + \lower 0.25ex\hbox{\tiny \abraopen}\hm@abra{#1}% + \lower 0.25ex\hbox{\tiny \abraclose}\kern 0.02em{}}\global\@abradonetrue} +\DeclareRobustCommand\fbabbrack{\protect\pfbabbrack} +\DeclareRobustCommand\babbrack{\protect\pbabbrack} + +\def\pfbambrack#1{\@bambrack{#1}\nulskip@ba} +\def\pbambrack#1{\@bambrack{#1}\allowbr@ba} +\def\@bambrack#1{\iflasthasdot@ba{}{\@baupcorr}\escb@ba{\up@abra + \lower -0.5ex\hbox{\lower 1.5pt\hbox{\tiny \abraopen}}\hm@abra{#1}% + \lower -0.5ex\hbox{\lower 1.5pt\hbox{\tiny \abraclose}}\kern 0.02em{}}\global\@abradonetrue} +\DeclareRobustCommand\fbambrack{\protect\pfbambrack} +\DeclareRobustCommand\bambrack{\protect\pbambrack} + +\def\pfbatbrack#1{\@batbrack{#1}\nulskip@ba} +\def\pbatbrack#1{\@batbrack{#1}\allowbr@ba} +\def\@batbrack#1{\iflasthasdot@ba{}{\@baupcorr}\escb@ba{\up@abra + \lower -1.4ex\hbox{\lower 3pt\hbox{\tiny \abraopen}}\hm@abra{#1}% + \lower -1.4ex\hbox{\lower 3pt\hbox{\tiny \abraclose}}}{\@baendcorr}\kern 0.02em{}\global\@abradonetrue} +\DeclareRobustCommand\fbatbrack{\protect\pfbatbrack} +\DeclareRobustCommand\batbrack{\protect\pbatbrack} + +\def\pfbanbrack#1{\unk@abra{#1}\nulskip@ba} +\def\pbanbrack#1{\unk@abra{#1}\allowbr@ba} +\def\unk@abra#1{\iflasthasdot@ba{}{\@baupcorr}\ifvmode\leavevmode\else\nulskip@ba\fi + {\up@abra {\abraopen}{#1}{\abraclose}}\global\@abradonetrue} +\DeclareRobustCommand\fbanbrack{\protect\pfbanbrack} +\DeclareRobustCommand\banbrack{\protect\pbanbrack} + +%% mod in 2.6: {\catcode\grave@ba\"=12% + \gdef\dqch@ba{"}% \expandafter\ifx\csname dq\endcsname\relax - \gdef\dq{"}% %% compatibility to 2.0 %% - \fi - \gdef\dq@bapas{\dq}} + \gdef\dq{"}\fi + \catcode\grave@ba\"=13% + \gdef\Xdqch@ba{"}% +} + +\def\dq@ba{\dq} +%% new in 2.6: +\def\pdq@ba{\grmn@active@dq@} +\def\lq@ba{\lq} +\def\rq@ba{\rq} +%% mod in 2.6: {\catcode\grave@ba\"=13% \catcode\grave@ba\'=12% \catcode\grave@ba\`=12% - \gdef\rqq@baakt{"'}% - \gdef\lqq@baakt{"`}% + \gdef\c@ba{'}% + \gdef\cc@ba{''}% + \gdef\grqq@baA{"'}% + \gdef\grqq@baB{\grmn@active@dq@ '}% + \gdef\grqq@baC{\active@dq\dq@prtct{'}}% + \gdef\grqq@baD{\active@dq\dq@prtct{'@}}% + \gdef\o@ba{`}% + \gdef\oo@ba{``}% + \gdef\glqq@baA{"`}% + \gdef\glqq@baB{\grmn@active@dq@ `}% + \gdef\glqq@baC{\active@dq\dq@prtct{`}}% + \gdef\glqq@baD{\active@dq\dq@prtct{`@}}% \catcode\grave@ba\'=13% \catcode\grave@ba\`=13% - \gdef\rqq@baaaa{"'}% - \gdef\lqq@baaaa{"`}} - -{\catcode\grave@ba\'=12% - \gdef\c@bapas{'}% - \gdef\cc@bapas{''}% - \gdef\cp@bapas{\active@dq\dq@prtct{'}}} -{\catcode\grave@ba\'=13% - \gdef\c@baakt{'}% - \gdef\cc@baakt{''}% - \gdef\cp@baakt{\active@dq\dq@prtct{'}}} - -{\catcode\grave@ba\`=12% - \gdef\o@bapas{`}% - \gdef\oo@bapas{``}% - \gdef\op@bapas{\active@dq\dq@prtct{`}}} -{\catcode\grave@ba\`=13% - \gdef\o@baakt{`} - \gdef\oo@baakt{``}% - \gdef\op@baakt{\active@dq\dq@prtct{`}}} + \gdef\xc@ba{'}% + \gdef\xcc@ba{''}% + \gdef\xgrqq@baA{"'}% + \gdef\xgrqq@baB{\grmn@active@dq@ '}% + \gdef\xgrqq@baC{\active@dq\dq@prtct{'}}% + \gdef\xgrqq@baD{\active@dq\dq@prtct{'@}}% + \gdef\xo@ba{`}% + \gdef\xoo@ba{``}% + \gdef\xglqq@baA{"`}% + \gdef\xglqq@baB{\grmn@active@dq@ `}% + \gdef\xglqq@baC{\active@dq\dq@prtct{`}}% + \gdef\xglqq@baD{\active@dq\dq@prtct{`@}}% +} + +%% mod in 2.6: +{\catcode\grave@ba\"=13% + \catcode\grave@ba\<=12% + \catcode\grave@ba\>=12% + \gdef\ba@ds{<<}% + \gdef\ba@db{>>}% + \gdef\flqq@baA{"<}% + \gdef\flqq@baB{\grmn@active@dq@ <}% + \gdef\flqq@baC{\active@dq\dq@prtct{<}}% + \gdef\flqq@baD{\active@dq\dq@prtct{<@}}% + \gdef\frqq@baA{">}% + \gdef\frqq@baB{\grmn@active@dq@ >}% + \gdef\frqq@baC{\active@dq\dq@prtct{>}}% + \gdef\frqq@baD{\active@dq\dq@prtct{>@}}% + \catcode\grave@ba\<=13% + \catcode\grave@ba\>=13% + \gdef\xba@ds{<<}% + \gdef\xflqq@baA{"<}% + \gdef\xflqq@baB{\grmn@active@dq@ <}% + \gdef\xflqq@baC{\active@dq\dq@prtct{<}}% + \gdef\xflqq@baD{\active@dq\dq@prtct{<@}}% + \gdef\xba@db{>>}% + \gdef\xfrqq@baA{">}% + \gdef\xfrqq@baB{\grmn@active@dq@ >}% + \gdef\xfrqq@baC{\active@dq\dq@prtct{>}}% + \gdef\xfrqq@baD{\active@dq\dq@prtct{>@}}% +} + +%% new in 2.6 (babel "X; {} for [activeacute,activegrave,catalan,ngerman]): +{\catcode\grave@ba\>=12% + \gdef\isdqX@ba#1#2#3{{\setbox\testbox@ba=\hbox{#3{}}% + \ifdim\ht\testbox@ba>1.4ex\unk@abra{#2{}}\else{#1{#2{}}}\fi}}% +} + +%% new in 2.6: +{\act@ba{\!}\gdef\xaz@ba{!}} +{\act@ba{\?}\gdef\xfz@ba{?}} +{\act@ba{\;}\gdef\xsp@ba{;}} +{\act@ba{\:}\gdef\xdp@ba{:}} + +%% UTF8 new in 2.6: +{\act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \act@ba{\}% + \gdef\UTFlq@ba{‘}% %% 2018 \textquoteleft {`} + \gdef\UTFdlq@ba{‘‘}% %% 2018 2018 {``} + \gdef\UTFrq@ba{’}% %% 2019 \textquoteright {'} + \gdef\UTFdrq@ba{’’}% %% 2019 2019 {''} + \gdef\UTFglq@ba{‚}% %% 201A \quotesinglbase {,} + \gdef\UTFgrqq@ba{“}% %% 201C \textquotedblleft {``} + \gdef\UTFrqq@ba{”}% %% 201D \textquotedblright {''} + \gdef\UTFglqq@ba{„}% %% 201E \quotedblbase {,,} + \gdef\UTFellip@ba{…}% %% 2026 \textellipsis {\dots} + \gdef\UTFflqq@ba{«}% %% 00AB \guillemetleft + \gdef\UTFfrqq@ba{»}% %% 00BB \guillemetright + \gdef\UTFflq@ba{‹}% %% 2039 \guilsinglleft + \gdef\UTFfrq@ba{›}% %% 203A \guilsinglright + \gdef\UTFmin@ba{‐}% %% 2010 - + \gdef\UTFmm@ba{‐‐}% %% 2010 2010 {--} + \gdef\UTFmmm@ba{‐‐‐}% %% {---} + \gdef\UTFnbm@ba{‑}% %% 2011 \mbox{-} + \gdef\UTFena@ba{‒}% %% 2012 \textendash + \gdef\UTFenb@ba{–}% %% 2013 \textendash + \gdef\UTFema@ba{—}% %% 2014 \textemdash + \gdef\UTFemb@ba{―}% %% 2015 \textemdash +} + +%% moved and renamed in 2.6: +\def\ba@ok{,} +\def\ba@op{.} +\def\ba@mm{$-$} +\def\ba@om{-} +\def\ba@dm{--} +\def\ba@tm{---} +\def\ba@glq{\glq} +\def\ba@@glq{\@glq} %% +\def\ba@grq{\grq} +\def\ba@@grq{\@grq} %% german.sty 2.4a, 12 Apr 1991 +\def\ba@glqq{\glqq} +\def\ba@@glqq{\@glqq} %% +\def\ba@grqq{\grqq} +\def\ba@@grqq{\@grqq} %% +\def\ba@gflqq{\flqq} +\def\ba@@gflqq{\@flqq} %% +\def\ba@gflq{\flq} +\def\ba@@gflq{\@flq} %% +\def\ba@gfrqq{\frqq} +\def\ba@@gfrqq{\@frqq} %% +\def\ba@gfrq{\frq} +\def\ba@@gfrq{\@frq} %% +\def\ba@tp{...} +\def\ba@dots{\dots} + +%% new in 2.6: +\def\hy@ba{\hy} +\def\phy@ba{\phy} %% Needed if not DRC! +\def\ba@bm{\mbox{-}} +\def\ba@dk{,,} +\def\ba@tflqq{\guillemetleft} +\def\ba@oflqq{\guillemotleft} +\def\ba@tfrqq{\guillemetright} +\def\ba@ofrqq{\guillemotright} +\def\ba@tflq{\guilsinglleft} +\def\ba@tfrq{\guilsinglright} +\def\ba@tql{\textquoteleft} +\def\ba@tqr{\textquoteright} +\def\ba@qsb{\quotesinglbase} +\def\ba@tlqq{\textquotedblleft} +\def\ba@tqrr{\textquotedblright} +\def\ba@tgqq{\quotedblbase} +\def\ba@ellip{\textellipsis} +\def\ba@FBellip{\FBtextellipsis} %% babel-french +\def\ba@endash{\textendash} +\def\ba@emdash{\textemdash} + +\def\UTFabra@ba#1#2{\ifx\inputencodingname\UTFviiiName@ba #1{#2}\else + \unk@abra{#2}\fi} + +\def\UTFtabra@ba#1#2{\ifx\inputencodingname\UTFviiiName@ba + \ifmmode \unk@abra{#2}\else #1{#2}\fi \else + \unk@abra{#2}\fi} + +\def\tabra@ba#1#2{\ifmmode \unk@abra{#2}\else #1{#2}\fi} + +\def\mate@ba#1#2{\ifmmode \unk@abra{#1}\else{#2}\fi} + +\def\if@banewgerm#1#2{\expandafter\ifx\csname @flqq\endcsname\relax\if@batone{#1}{#2}\else{#2}\fi} + \def\@abra#1{{\errorcontextlines=-1% - \def\@testa{#1}% - \def\testk{,}% - \def\testp{.}% - \def\testm{$-$}% - \def\testh{-}% - \def\testH{--}% - \def\testL{---}% - \def\testl{\glq}% - \def\teatl{\@glq}% %% commands in old versions of german.sty - \def\testr{\grq}% - \def\teatr{\@grq}% %% - \def\testO{\glqq}% - \def\teatO{\@glqq}% %% - \def\testC{\grqq}% - \def\teatC{\@grqq}% %% - \def\testd{...}% - \def\testD{\dots}% - \ifx\@testa\oo@bapas \oo@abra{\oo@bapas}\else - \ifx\@testa\oo@baakt \oo@abra{\oo@baakt}\else - \ifx\@testa\cc@bapas \cc@abra{\cc@bapas}\else - \ifx\@testa\cc@baakt \cc@abra{\cc@baakt}\else - \ifx\@testa\cp@bapas\rqq@abra{\cp@bapas}\else - \ifx\@testa\cp@baakt\rqq@abra{\cp@baakt}\else - \ifx\@testa\op@bapas\lqq@abra{\op@bapas}\else - \ifx\@testa\op@baakt\lqq@abra{\op@baakt}\else - \ifx\@testa\o@bapas \o@abra{\o@bapas}\else - \ifx\@testa\o@baakt \o@abra{\o@baakt}\else - \ifx\@testa\c@bapas \c@abra{\c@bapas}\else - \ifx\@testa\c@baakt \c@abra{\c@baakt}\else - \ifx\@testa\testk \babbrack{\kern -0.02em{\testk}\kern -0.02em}\else - \ifx\@testa\testp \babbrack{\kern -0.02em{\testp}\kern -0.02em}\else - \ifx\@testa\testm \bambrack{\kern -0.03em{\testm}\kern -0.035em}\else - \ifx\@testa\testh \bambrack{\kern -0.01em{\testh}\kern -0.05em}\else - \ifx\@testa\testH \bambrack{\kern 0.03em{\testH}\kern 0.03em}\else - \ifx\@testa\testL \bambrack{\kern 0.03em{\testL}\kern 0.03em}\else - \ifx\@testa\testl \lq@abra{\testl}\else - \ifx\@testa\teatl \lq@abra{\teatl}\else - \ifx\@testa\testr \rq@abra{\testr}\else - \ifx\@testa\teatr \rq@abra{\teatr}\else - \ifx\@testa\testO \lqq@abra{\testO}\else - \ifx\@testa\teatO \lqq@abra{\teatO}\else - \ifx\@testa\testC \rqq@abra{\testC}\else - \ifx\@testa\teatC \rqq@abra{\teatC}\else - \ifx\@testa\lqq@baakt\lqq@abra{\lqq@baakt}\else - \ifx\@testa\lqq@baaaa\lqq@abra{\lqq@baaaa}\else - \ifx\@testa\rqq@baakt\rqq@abra{\rqq@baakt}\else - \ifx\@testa\rqq@baaaa\rqq@abra{\rqq@baaaa}\else - \ifx\@testa\dq \dq@abra{\dq}\else - \ifx\@testa\dq@bapas \dq@abra{\dq@bapas}\else - \ifx\@testa\testd \babbrack{\kern -0.01em{\testd}\kern -0.03em}\else - \ifx\@testa\testD \babbrack{\kern 0.12em{\testD}\kern -0.08em}\else - \iflasthasdot@ba{}{\@baupcorr}\ifhmode\nulskip@ba\fi{\upshape [{#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\fi\fi\fi\fi\fi\fi\fi\fi\fi - }} - - \def\oo@abra#1{\batbrack{\if@batone{\kern 0.04em{#1}\kern -0.06em}{\kern -0.11em{#1}}}} - \def\cc@abra#1{\batbrack{\if@batone{\kern 0.03em{#1}\kern -0.05em}{\kern 0.01em{#1}\kern -0.12em}}} - \def\o@abra#1{\batbrack{\kern -0.02em{#1}\kern -0.02em}} - \def\lq@abra#1{\babbrack{\if@batone{\kern -0.02em{#1}\kern -0.1034em}{\kern -0.02em{#1}\kern 0.02em}}} - \def\c@abra#1{\batbrack{\kern -0.02em{#1}\kern -0.02em}} -\def\lqq@abra#1{\babbrack{\if@batone{\kern 0.03em{#1}\kern -0.05em}{\kern 0.01em{#1}\kern -0.08em}}} -\def\rqq@abra#1{\batbrack{\if@batone{\kern 0.04em{#1}\kern -0.06em}{\kern -0.04em{#1}\kern -0.07em}}} - \def\dq@abra#1{\batbrack{\if@batone{\kern -0.043em{#1}\kern -0.06em}{\kern 0.01em{#1}\kern -0.12em}}} - \def\rq@abra#1{\batbrack{\if@batone{\kern -0.02em{#1}\kern -0.02em}{\kern -0.01em{#1}\kern -0.0875em}}} - -\def\pabra#1{\@abra{#1}{\hskip 0pt plus 0pt}} -\def\abra{\protect\pabra} - -\def\pfabra#1{\@abra{#1}{\nulskip@ba}} -\def\fabra{\protect\pfabra} + \def\@testa{#1}% + \global\@abradonefalse %% new in 2.6 + \ifx\@testa\oo@ba \moo@abra{\oo@ba}\fi + \ifx\@testa\xoo@ba\moo@abra{\xoo@ba}\fi + \ifx\@testa\cc@ba \mcc@abra{\cc@ba}\fi + \ifx\@testa\xcc@ba\mcc@abra{\xcc@ba}\fi + \ifx\@testa\grqq@baC \rqq@abra{\grqq@baC}\fi + \ifx\@testa\xgrqq@baC\rqq@abra{\xgrqq@baC}\fi + \ifx\@testa\glqq@baC \lqq@abra{\glqq@baC}\fi + \ifx\@testa\xglqq@baC\lqq@abra{\xglqq@baC}\fi + \ifx\@testa\o@ba \o@abra{\o@ba}\fi + \ifx\@testa\xo@ba \o@abra{\xo@ba{}}\fi + \ifx\@testa\c@ba \mc@abra{\c@ba}\fi + \ifx\@testa\xc@ba\mc@abra{\xc@ba{}}\fi + \ifx\@testa\ba@ok \dot@abra{\ba@ok}\fi + \ifx\@testa\ba@op \dot@abra{\ba@op}\fi + \ifx\@testa\ba@mm \mxm@abra{\ifmmode{-}\else{\ba@mm}\fi}\fi + \ifx\@testa\ba@om \m@abra{\ba@om}\fi + \ifx\@testa\ba@dm \tabra@ba{\mm@abra}{\ba@dm}\fi + \ifx\@testa\ba@tm \tabra@ba{\mmm@abra}{\ba@tm}\fi + \ifx\@testa\ba@glq \lq@abra{\ba@glq}\fi + \ifx\@testa\ba@@glq\lq@abra{\ba@@glq}\fi + \ifx\@testa\ba@grq \rq@abra{\ba@grq}\fi + \ifx\@testa\ba@@grq\rq@abra{\ba@@grq}\fi + \ifx\@testa\ba@glqq \lqq@abra{\ba@glqq}\fi + \ifx\@testa\ba@@glqq \lqq@abra{\ba@@glqq}\fi + \ifx\@testa\ba@grqq \rqq@abra{\ba@grqq}\fi + \ifx\@testa\ba@@grqq \rqq@abra{\ba@@grqq}\fi + \ifx\@testa\glqq@baA \isdqX@ba {\lqq@abra} {\glqq@baA} {\glqq@baA}\fi + \ifx\@testa\xglqq@baA\isdqX@ba {\lqq@abra} {\xglqq@baA}{\xglqq@baA}\fi + \ifx\@testa\grqq@baA \isdqX@ba {\rqq@abra} {\grqq@baA} {\glqq@baA}\fi + \ifx\@testa\xgrqq@baA\isdqX@ba {\rqq@abra} {\xgrqq@baA}{\ifnum\catcode\grave@ba\`=13\xglqq@baA\else\glqq@baA\fi}\fi + \ifx\@testa\dqch@ba\dq@abra{\dqch@ba}\fi + \ifx\@testa\dq@ba \dq@abra{\dq@ba}\fi + \ifx\@testa\pdq@ba \dq@abra{\pdq@ba{}}\fi + \ifx\@testa\ba@tp \@babbrack{\kern -0.01em{\ba@tp}\kern -0.03em}\fi + \ifx\@testa\ba@dots\ddd@abra{\ifmmode\kern -.0075em\fi\ba@dots}\fi + %% new in 2.6: + \if@newabra + \ifx\@testa\UTFlq@ba \UTFtabra@ba {\o@abra} {\UTFlq@ba}\fi + \ifx\@testa\ba@tql \tabra@ba{\o@abra}{\ba@tql}\fi + \ifx\@testa\UTFrq@ba \UTFtabra@ba {\c@abra} {\UTFrq@ba}\fi + \ifx\@testa\ba@tqr \tabra@ba{\c@abra}{\ba@tqr}\fi + \ifx\@testa\UTFglq@ba \UTFtabra@ba{\com@abra} {\UTFglq@ba}\fi + \ifx\@testa\ba@qsb \tabra@ba{\com@abra}{\ba@qsb}\fi + \ifx\@testa\UTFgrqq@ba \UTFtabra@ba {\oo@abra} {\UTFgrqq@ba}\fi + \ifx\@testa\ba@tlqq \tabra@ba{\oo@abra}{\ba@tlqq}\fi + \ifx\@testa\UTFdlq@ba \UTFtabra@ba {\oo@abra} {\UTFdlq@ba}\fi + \ifx\@testa\UTFrqq@ba \UTFtabra@ba {\cc@abra} {\UTFrqq@ba}\fi + \ifx\@testa\ba@tqrr \tabra@ba{\cc@abra}{\ba@tqrr}\fi + %% + \ifx\@testa\UTFdrq@ba \UTFtabra@ba {\cc@abra} {\UTFdrq@ba}\fi + \ifx\@testa\UTFglqq@ba \UTFtabra@ba{\ulqq@abra} {\UTFglqq@ba}\fi + \ifx\@testa\ba@tgqq \tabra@ba{\ulqq@abra}{\ba@tgqq}\fi + \ifx\@testa\UTFellip@ba\UTFabra@ba{\dddt@abra} {\UTFellip@ba}\fi + \ifx\@testa\ba@ellip \dddt@abra{\ba@ellip}\fi + \ifx\@testa\ba@FBellip \dddt@abra{\ba@FBellip}\fi + %% + \ifx\@testa\ba@gfrqq \smfr@abra{\ba@gfrqq}\fi + \ifx\@testa\ba@gfrq \smfr@abra{\ba@gfrq}\fi + \ifx\@testa\frqq@baA \isdqX@ba {\smfr@abra} {\frqq@baA} {\flqq@baA}\fi + \ifx\@testa\xfrqq@baA\isdqX@ba {\smfr@abra} {\xfrqq@baA}{\xflqq@baA}\fi + \ifx\@testa\frqq@baB \smfr@abra{\frqq@baB}\fi + \ifx\@testa\xfrqq@baB\smfr@abra{\xfrqq@baB}\fi + \ifx\@testa\frqq@baD \smfr@abra{\frqq@baD}\fi + \ifx\@testa\xfrqq@baD\smfr@abra{\xfrqq@baD}\fi + \ifx\@testa\frqq@baC \smfr@abra{\frqq@baC}\fi + \ifx\@testa\xfrqq@baC\smfr@abra{\xfrqq@baC}\fi + \ifx\@testa\ba@@gfrqq\smfr@abra{\ba@@gfrqq}\fi + \ifx\@testa\ba@@gfrq \smfr@abra{\ba@@gfrq}\fi + %% + \ifx\@testa\ba@gflqq \smfl@abra{\ba@gflqq}\fi + \ifx\@testa\ba@gflq \smfl@abra{\ba@gflq}\fi + \ifx\@testa\flqq@baA \isdqX@ba {\smfl@abra} {\flqq@baA} {\flqq@baA}\fi + \ifx\@testa\xflqq@baA\isdqX@ba {\smfl@abra} {\xflqq@baA}{\xflqq@baA}\fi + \ifx\@testa\flqq@baB \smfl@abra{\flqq@baB}\fi + \ifx\@testa\xflqq@baB\smfl@abra{\xflqq@baB}\fi + \ifx\@testa\flqq@baD \smfl@abra{\flqq@baD}\fi + \ifx\@testa\xflqq@baD\smfl@abra{\xflqq@baD}\fi + \ifx\@testa\flqq@baC \smfl@abra{\flqq@baC}\fi + \ifx\@testa\xflqq@baC\smfl@abra{\xflqq@baC}\fi + \ifx\@testa\ba@@gflqq\smfl@abra{\ba@@gflqq}\fi + \ifx\@testa\ba@@gflq \smfl@abra{\ba@@gflq}\fi + %% + \ifx\@testa\ba@ds \mufl@abra{\ba@ds}\fi + \ifx\@testa\xba@ds\mufl@abra{\xba@ds}\fi + \ifx\@testa\UTFflqq@ba \UTFtabra@ba {\ufl@abra} {\UTFflqq@ba}\fi + \ifx\@testa\ba@tflqq \tabra@ba{\ufl@abra}{\ba@tflqq}\fi + \ifx\@testa\ba@oflqq \tabra@ba{\ufl@abra}{\ba@oflqq}\fi + \ifx\@testa\UTFfrqq@ba \UTFtabra@ba {\ufr@abra} {\UTFfrqq@ba}\fi + \ifx\@testa\ba@tfrqq \tabra@ba{\ufr@abra}{\ba@tfrqq}\fi + \ifx\@testa\ba@ofrqq \tabra@ba{\ufr@abra}{\ba@ofrqq}\fi + \ifx\@testa\ba@db \mufr@abra{\ba@db}\fi + \ifx\@testa\xba@db\mufr@abra{\xba@db}\fi + \ifx\@testa\UTFflq@ba \UTFtabra@ba {\ufl@abra} {\UTFflq@ba}\fi + \ifx\@testa\ba@tflq \tabra@ba{\ufl@abra}{\ba@tflq}\fi + \ifx\@testa\UTFfrq@ba \UTFtabra@ba {\ufr@abra} {\UTFfrq@ba}\fi + \ifx\@testa\ba@tfrq \tabra@ba{\ufr@abra}{\ba@tfrq}\fi + %% + \ifx\@testa\lq@ba \c@abra{\lq@ba}\fi + \ifx\@testa\rq@ba \mc@abra{\rq@ba}\fi + \ifx\@testa\hy@ba \m@abra{\hy@ba}\fi + \ifx\@testa\phy@ba \m@abra{\phy@ba}\fi + \ifx\@testa\xaz@ba\unk@abra{\string!}\fi + \ifx\@testa\xfz@ba\unk@abra{\string?}\fi + \ifx\@testa\xsp@ba\unk@abra{\string;}\fi + \ifx\@testa\xdp@ba\unk@abra{\string:}\fi + %% + \ifx\@testa\UTFmin@ba \UTFabra@ba{\m@abra}{\UTFmin@ba}\fi + \ifx\@testa\UTFnbm@ba \UTFabra@ba{\xm@abra}{\UTFnbm@ba}\fi + \ifx\@testa\ba@bm \xm@abra{\ba@bm}\fi + \ifx\@testa\UTFmm@ba \UTFtabra@ba{\mm@abra}{\UTFmm@ba}\fi + \ifx\@testa\UTFena@ba \UTFtabra@ba{\mm@abra}{\UTFena@ba}\fi + \ifx\@testa\UTFenb@ba \UTFtabra@ba{\mm@abra}{\UTFenb@ba}\fi + \ifx\@testa\ba@endash \tabra@ba{\mm@abra}{\ba@endash}\fi + \ifx\@testa\UTFmmm@ba \UTFtabra@ba{\mmm@abra}{\UTFmmm@ba}\fi + \ifx\@testa\UTFema@ba \UTFtabra@ba{\mmm@abra}{\UTFema@ba}\fi + \ifx\@testa\UTFemb@ba \UTFtabra@ba{\mmm@abra}{\UTFemb@ba}\fi + \ifx\@testa\ba@emdash \tabra@ba{\mmm@abra}{\ba@emdash}\fi + %% + \ifx\@testa\ba@dk \dk@abra{\ba@dk}\fi + \ifx\@testa\glqq@baB \lqq@abra{\glqq@baB}\fi + \ifx\@testa\xglqq@baB\lqq@abra{\xglqq@baB}\fi + \ifx\@testa\glqq@baD \lqq@abra{\glqq@baD}\fi + \ifx\@testa\xglqq@baD\lqq@abra{\xglqq@baD}\fi + \ifx\@testa\grqq@baB \rqq@abra{\grqq@baB}\fi + \ifx\@testa\xgrqq@baB\rqq@abra{\xgrqq@baB}\fi + \ifx\@testa\grqq@baD \rqq@abra{\grqq@baD}\fi + \ifx\@testa\xgrqq@baD\rqq@abra{\xgrqq@baD}\fi + \ifx\@testa\Xdqch@ba\dq@abra{\Xdqch@ba{}}\fi + \fi + \if@abradone\else\unk@abra{{}#1{}}\fi}} + +%% changed in 2.6: + \def\oo@abra#1{\@batbrack{\if@batone{\kern 0.04em{#1}\kern -0.06em} {\kern -0.11em{#1}}}} + \def\cc@abra#1{\@batbrack{\if@batone{\kern 0.03em{#1}\kern -0.05em} {\kern 0.01em{#1}\kern -0.12em}}} + \def\o@abra#1{\@batbrack{\kern -0.02em{#1}\kern -0.02em}} + \def\c@abra{\o@abra} + \def\dq@abra#1{\mate@ba{#1}{\@batbrack{\if@batone{\kern -0.043em{#1}\kern -0.06em} {\kern 0.01em{#1}\kern -0.12em}}}} + \def\lq@abra#1{\mate@ba{#1}{\@babbrack{\if@batone{\kern -0.02em{#1}\if@banewgerm{\kern -0.1034em}{\kern 0.02em}}{\kern -0.02em{#1}\kern 0.02em}}}} + \def\rq@abra#1{\mate@ba{#1}{\@batbrack{\if@batone{\if@banewgerm{\kern -0.02em}{\kern -0.01em}{#1}\if@banewgerm{\kern -0.02em}{\kern -0.0875em}} {\kern -0.0075em{#1}\kern -0.09em}}}} +\def\lqq@abra#1{\mate@ba{#1}{\@babbrack{\if@batone{\kern 0.03em{#1}\if@banewgerm{\kern -0.05em}{\kern -0.01em}} {\kern 0.01em{#1}\kern -0.08em}}}} +\def\rqq@abra#1{\mate@ba{#1}{\@batbrack{\if@batone{\if@banewgerm{\kern 0.04em}{\kern 0.1075em}{#1}\if@banewgerm{\kern -0.06em}{\kern -0.1275em}} {\kern -0.04em{#1}\kern -0.07em}}}} +%% new in 2.6: +\def\smfr@abra#1{\mate@ba{\strut #1\strut}{\fr@abra{#1}}} %% \strut with- +\def\smfl@abra#1{\mate@ba{\strut #1\strut}{\fl@abra{#1}}} %% out braces! +\def\mufl@abra#1{\if@batone{\ifmmode\unk@abra{#1}\else\ufl@abra{#1}\fi}{\unk@abra{#1}}} +\def\mufr@abra#1{\if@batone{\ifmmode\unk@abra{#1}\else\ufr@abra{#1}\fi}{\unk@abra{#1}}} +\def\moo@abra#1{\ifmmode\@batbrack{\if@batone{\kern -0.115em}{\kern -0.11em}{#1}\if@batone{\kern 0.0125em}{}}\else\oo@abra{#1}\fi} +\def\mc@abra#1{\ifmmode\kern -0.0025em\@batbrack{{#1}\kern -0.0025em}\else\c@abra{#1}\fi} +\def\mcc@abra#1{\ifmmode\@batbrack{\if@batone{\kern -0.02em}{\kern -0.0275em}{#1}\kern -0.0175em}\else\cc@abra{#1}\fi} +\def\ulqq@abra#1{\@babbrack{\if@batone{\kern 0.03em{#1}\kern -0.05em} {\kern 0.01em{#1}\kern -0.08em}}} +\def\dk@abra#1{\mate@ba{#1}{\if@batone{\@babbrack{\kern 0.03em{#1}\kern -0.05em}}{\unk@abra{#1}}}} +\def\ddd@abra#1{\@babbrack{\kern 0.12em{#1}\ifdim\lastkern=\z@\kern\fontdimen3\font\fi\kern -0.08em}} %% lastkern: babel-french +\def\dddt@abra#1{\mate@ba{#1}{\ddd@abra{#1}}} +\def\com@abra#1{\@babbrack{\if@batone{\kern -0.02em{#1}\kern -0.1034em}{\kern -0.02em{#1}\kern 0.02em}}} + \def\fl@abra#1{\if@banewgerm{\@bambrack{\kern -0.05125em{#1}\kern 0.0075em}}{\@bambrack{{#1}\kern 0.04em}}} + \def\fr@abra#1{\if@banewgerm{\@bambrack{\kern 0.025em{#1}\kern -0.07em}}{\@bambrack{\kern 0.04em{#1}}}} + \def\ufl@abra#1{\if@batone{\@bambrack{\kern -0.05125em{#1}\kern 0.0075em}}{\@bambrack{{#1}\kern 0.04em}}} + \def\ufr@abra#1{\if@batone{\@bambrack{\kern 0.025em{#1}\kern -0.07em}}{\@bambrack{\kern 0.04em{#1}}}} + \def\xm@abra#1{\@bambrack{\kern -0.01em{#1}\kern -0.05em}} +\def\mxm@abra#1{\@bambrack{\kern -0.03em{#1}\kern -0.035em}} + \def\m@abra#1{\ifmmode\mxm@abra{#1}\else\xm@abra{#1}\fi} + \def\mm@abra#1{\@bambrack{\kern 0.03em{#1}\kern 0.03em}} +\def\mmm@abra{\mm@abra} +\def\dot@abra#1{\@babbrack{\kern -0.02em{#1}\kern -0.02em}} + \def\pbaromannum#1{{\romannumeral #1}} @@ -4155,7 +4702,7 @@ \def\addtobib{\addtoarq{}} \newif\if@oldba\@oldbafalse \def\makebar{\typeout@ba{ \space ***** \space That is obviously a file based on BibArts 1.x \space ***** - ^^J \space ***** \space BibArts 2.5 starts compatibility mode for 1.3 \space *****}% + ^^J \space ***** \space BibArts 2.6 starts compatibility mode for 1.3 \space *****}% \def\bibarts{\BibArts}% \def\schrift{}% \def\barschrift{}% diff --git a/macros/latex/contrib/bibarts/bibarts.tex b/macros/latex/contrib/bibarts/bibarts.tex index eaa2f92989..0c3bd68594 100644 --- a/macros/latex/contrib/bibarts/bibarts.tex +++ b/macros/latex/contrib/bibarts/bibarts.tex @@ -1,5 +1,5 @@ -%% BibArts 2.5 assists you to write LaTeX texts in arts and humanities. -%% Copyright (C) 2022b Timo Baumann bibarts[at]gmx.de (2022/10/01) +%% BibArts 2.6 assists you to write LaTeX texts in arts and humanities. +%% Copyright (C) 2023 Timo Baumann bibarts[at]gmx.de (2023/06/18) %%% LaTeX + "bibsort -i bibarts -m -utf8 -k -e -g1 -h" + LaTeX %%% @@ -12,16 +12,16 @@ \documentclass[12pt,a4paper]{article} - \usepackage{bibarts} + \usepackage{bibarts}\bacaptionsgerman \usepackage{ngerman} %\usepackage{german} %% SUCHE auszudru\hyc ken (ngerman-babel akzeptiert auszudru"cken nicht). %% - %\usepackage[ngermanb]{babel} \newcommand{\3}{\oldhyss} %% Mit babel wird z. B. 'wäre' in %% - %\usepackage[germanb]{babel} \newcommand{\3}{\oldhyss} %% 'wä-re' getrennt; 'w"are' nicht. %% + %\usepackage[ngerman]{babel} \newcommand{\3}{\oldhyss} %% Mit babel wird z. B. 'wäre' in %% + %\usepackage[german]{babel} \newcommand{\3}{\oldhyss} %% 'wä-re' getrennt; 'w"are' nicht. %% \setlength{\footnotesep}{2ex} %% ... wie in bibarts.sty 2.0; siehe README.txt. %% - \usepackage[utf8]{inputenc} %% bibarts.tex, Vers. 2.5, enthaelt utf8-Zeichen. %% + \usepackage[utf8]{inputenc} %% bibarts.tex, Vers. 2.6, enthaelt utf8-Zeichen. %% \usepackage[T1]{fontenc} %% Automatische Trennung von Worten mit Umlauten. %% @@ -34,18 +34,18 @@ %\allprrtrue %% <= Prozent am Zeilenanfang auf Wunsch entfernen; -%% mit \allprrtrue kommen ALLE utf8-Zeichen, die bibsort 2.5 kennt, +%% mit \allprrtrue kommen ALLE utf8-Zeichen, die bibsort 2.6 kennt, %% in "Das Personenregister als Beispiel f"ur das Sortieren" (Kap. 18). - \title{Das \LaTeX-Paket \BibArts} + \title{Das \LaTeX\hy Paket \BibArts} \author{\scshape{Timo Baumann}} - \date{\small {Version 2.5 (2022b).} - \hspace{2.25em} {\copyright\ 2.x (2015$-$2022).} + \date{\small {Version 2.6 (2023).} + \hspace{2.25em} {\copyright\ 2.x (2015$-$2023).} \hspace{2em} {\textbf{Inhalt siehe S.\,\pageref{SectIn}}.}} @@ -99,29 +99,29 @@ Zei-len-um-bruch \maketitle \noindent - \BibArts\ verfolgt die Idee, geisteswissenschaftliche Belegapparate direkt aus dem - Text zu erzeugen (\textit{Bibliography in the Arts}). Der Vorspann eines deutschen - \LaTeX\hy Textdokuments, das \texttt{bibarts.sty} einl"adt, sieht typischerweise so aus: - - \vspace{-1.5ex} - {\small\begin{verbatim} - \documentclass[12pt,a4paper]{article} - \usepackage{bibarts} \usepackage{ngerman} - \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} + \BibArts\ erlaubt, geisteswissenschaftliche Literaturangaben im Text zu setzen und + parallel die Literaturliste automatisch zu erzeugen. Der Vorspann einer deutschen + \LaTeX\hy Datei, die \texttt{bibarts.sty} einl"adt, sieht typischerweise so aus: + + \vspace{.25ex}\noindent + {\small\begin{verbatim} + \documentclass[12pt,a4paper]{article} + \usepackage{bibarts} \usepackage{ngerman} %oder [ngerman]{babel} + \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} \end{verbatim}} - \vspace{-4ex}\noindent - Das separate Tippen von Anh"angen kann nun weitgehend entfallen. Dazu - werden Kopien von Literaturangaben, die sich im Haupttext oder den - Fu"snoten befinden, in einer Literaturliste und weiteren Listen sortiert - ausgedruckt. + \vspace{-2ex}\noindent + Das separate Tippen von Anh"angen kann nun entfallen. Neben + Kopien von Literaturangaben, die sich im Haupttext oder in + Fu"snoten befinden, k"onnen geschichtswissenschaftliche Quellenverzeichnisse + sortiert ausgedruckt werden. \vspace{1ex}\noindent Der wichtigste dieser Ausdruckbefehle, \verb|\printvli|\hspace{.01em}, verh"alt sich "ahnlich wie \verb|\tableofcontents| \hspace{.025em}f"ur das - Inhaltsverzeichnis: Dazu muss im \LaTeX\hy Text ja auch - \hspace{.025em}\verb|\section{|\texttt{"Uberschriftentext}\verb|}| - \hspace{.05em}markiert werden. \hspace{.025em}Und f"ur \BibArts\ gilt: + Inhaltsverzeichnis: Dazu muss im \LaTeX\hy Text ja auch z.\,B. + \verb|\section{|\textit{\ko "Uberschriftentext}\verb|}| + \hspace{.1em}markiert werden. Und f"ur \BibArts\ gilt: \Doppelbox {...\bs footnote\{Ein Beispiel f"ur Geschichtsliteratur ist @@ -152,7 +152,7 @@ Beide Arten der Eingabe (mit und ohne \verb|\ktit|) kommen in die Literaturliste, die das erw"ahnte \verb|\printvli| ausdruckt. Dies hat nichts mit \textsc{Bib}\TeX\ zu tun:\pdfko{.25} - {\renewcommand{\gvlititlename}{Literatur \hfill \normalfont\small\raisebox{.45ex}{\texttt{\bs printvli \ \%druckt "Uberschrift und Liste\%}}} + {\renewcommand{\gvlititlename}{Literatur \hfill \normalfont\small\raisebox{.45ex}{\texttt{\bs printvli \ \% druckt "Uberschrift und Liste \ }}} \printvli} \vspace{1ex}\noindent @@ -160,8 +160,8 @@ nichts mit \textsc{Bib}\TeX\ zu tun:\pdfko{.25} "Anderungen erst nach zweimaligem Start von \LaTeX\ im Preview oder Ausdruck zu sehen. F"ur \BibArts\ gilt au\hyss erdem, dass zwischen den beiden Bearbeitungen das Programm \hspace{.05em}\verb|bibsort| \hspace{.05em}gestartet werden muss, um die - Literaturliste zu sortieren. Hei"st eine \LaTeX\hy Textdatei - \hspace{.075em}\verb|meintext.tex|\hspace{.05em}, ist typischerweise + Literaturliste zu erzeugen. Hei"st eine \LaTeX\hy Textdatei + \hspace{.1em}\verb|meintext.tex|\hspace{.05em}, ist typischerweise \vspace{-.5ex} \begin{verbatim} @@ -178,7 +178,7 @@ nichts mit \textsc{Bib}\TeX\ zu tun:\pdfko{.25} \hspace{.2em}bewirkt, dass \textit{ein} Autor (Vor- und Nachname gleich), der mit mehreren Werken zitiert wird, ab seiner zweiten Nennung auf der Literaturliste als $\sim$ erscheint. \verb|-utf8| \hspace{.2em}sortiert - UTF8\hy Zeichen analog zu \verb|utf8enc.dfu| \hspace{.05em}{\small 2022/06/07} \hspace{.05em}v1.3c + UTF-8\hy Zeichen analog zu \verb|utf8enc.dfu| \hspace{.05em}{\small 2022/06/07} \hspace{.05em}v1.3c (\kern-.075em\textit{ohne} \verb|\cyr|...\ und \verb|\CYR|...\hy Zeichen). \vspace{1ex}\noindent @@ -189,7 +189,7 @@ nichts mit \textsc{Bib}\TeX\ zu tun:\pdfko{.25} \verb|C:\pfadangabe\bibsort.exe| in das Men"u \fbox{Ausgabe} $\Rightarrow$ \fbox{Ausgabeprofile definieren} $\Rightarrow$ \fbox{Vorbearbeitung}\rule[-1.75ex]{0mm}{0mm} in die Zeile - \underline{Anwendung} eingeben und darunter als \underline{Argumente} + \underline{Anwendung} eingeben und in die Zeile \underline{Argumente} typischerweise: \hspace{.25em}\verb|-i %tm -g1 -k -utf8| \vspace{2.75ex}\noindent @@ -215,7 +215,7 @@ nichts mit \textsc{Bib}\TeX\ zu tun:\pdfko{.25} gedruckter Quellen}\kern-.05em). -\section{Vollzitate und Kurzzitate (\ko\textit{v}\hy\ und \textit{k}\fhy +\section{Vollzitate und Kurzzitate (v\hy\ und k\fhy Befehle)}\label{Sect1} Nachdem ein Buch einmal vollzitiert wurde, kann es anschlie\hyss end an @@ -313,14 +313,12 @@ nichts mit \textsc{Bib}\TeX\ zu tun:\pdfko{.25} \vspace{-3.25ex}\noindent Solche Hinweise informieren, dass ein Autorenname vielleicht ersetzt werden soll durch \textsc{dies.} oder \textsc{ders.}, - weil es sich vielleicht um dieselbe Person handelt, wie - die in der direkt vorausgehenden Fu"snote. + weil es sich m"oglicherweise um dieselbe Person handelt wie in der direkt vorausgehenden Fu"snote. Den entsprechenden Schalter m"uss"-\kern-.025em(\kern-.05em t\kern-.045em)\kern-.015emen Sie selbst umlegen und dabei das Geschlecht des Autors einstellen. - Die Schalter lassen sich zusammen mit allen v- und k\fhy Befehlen - verwenden. Verf"ugbare Schalter sind\hspace{.1em} - \verb|f| (weiblich),\hspace{.1em} \verb|m| (m"annlich) und\hspace{.1em} \verb|p{}| - (plural: S.\,\pageref{p}): + Die Schalter sind zusammen mit allen v\hy\ und k\fhy Befehlen + m"oglich und lauten \hspace{.1em}\verb|[f]| (weiblich), \hspace{.1em}\verb|[m]| (m"annlich) + \hspace{.15em}oder \hspace{.1em}\verb|[p{}]| (plural; siehe S.\,\pageref{p}): \vspace{1.ex}{\small\noindent \verb| \footnote{\vqu [m] {Carl von}{Clausewitz}{\ktit{Strategie}.|\\ @@ -451,7 +449,7 @@ Angaben hinzuweisen. Eingeschaltet wird dies mit \verb|\conferize|\kern.05em.\fo mit der Auswahl des Dokumentenstils \texttt{\{article\}} oder \texttt{\{book\}} zu tun.} Dieser Befehl sollte global gelten, also im Vorspann von \LaTeX\hy Textdateien gesetzt werden. Die Nummern der folgenden Fu"snoten \ref{vz} und \ref{fz} erscheinen unter \textsc{Luhmann} auch im -Kurzzitateverzeichnis Seite \hspace{-.075em}\pageref{vkc} \hspace{.05em}(das +Kurzzitateverzeichnis Seite \hspace{-.075em}\pageref{vkc} \hspace{.05em}(das auch im \hspace{-.025em}\verb|\conferize|\kern.125em\hy Modus f"ur Kontrollen ausgedruckt werden kann): \vspace{-.75ex} @@ -478,7 +476,7 @@ im \hspace{-.025em}\verb|\conferize|\kern.125em\hy Modus f"ur Kontrollen ausgedr \vspace{-.125em}\noindent Dies funktioniert sogar, falls in den Nachnamen- oder -Kurztitel\hy Argumenten der v- und k\fhy Belege \LaTeX\hy Befehle stehen.\footnote{Allerdings +Kurztitel\hy Argumenten der v\hy\ und k\fhy Belege \LaTeX\hy Befehle stehen.\footnote{Allerdings sollten Sie \hspace{-.1em}\texttt{\bs newcommand}\kern.075em\hy Definitionen, die \hspace{-.05em}\texttt{\bs onlyvoll} oder \hspace{-.05em}\texttt{\bs onlyout} \textit{enthalten}, unter \hspace{-.1em}\texttt{\bs conferize} \textit{nicht} verwenden. Wie \hspace{-.05em}\texttt{\bs onlyvoll} \hspace{.05em}und \texttt{\bs onlyout} d"urfen Sie @@ -487,7 +485,7 @@ sowie \hspace{-.05em}\texttt{\bs sechere} \baref{sechere} nur \textit{direkt} an Dagegen sind \texttt{\bs onlykurz} und \texttt{\bs onlyhere} in Makros erlaubt.\balabel{conferizelimits}} \BibArts\ kopiert aus dem Text, den Sie in diese Argumente tippen, insbesondere Zeichen \verb|A| bis \verb|Z| \hspace{.025em}und \verb|a| bis \verb|z| \hspace{.1em}sowie \verb|0| bis \verb|9|, -um das \textit{Schl"usselwort} f"ur die Marke automatisch zu erzeugen.\footnote{UTF8\hy Zeichen +um das \textit{Schl"usselwort} f"ur die Marke automatisch zu erzeugen.\footnote{UTF-8\hy Zeichen werden nicht "ubernommen. In den Marken fehlen ggf.\ Zeichen wie \texttt{ß}\pdfko{.5}\ und die Umlaute \texttt{ä}, \texttt{ö}, \texttt{ü}, \texttt{Ä}, \texttt{Ö}, \texttt{Ü}. Falls Kurzzitate sich nur darin unterscheiden $-$\,etwa\pdfko{.25}\ @@ -518,12 +516,12 @@ Die beiden Namen w"aren dann als \hspace{.1em}\texttt{M\bs \string"uller} die Querverweis\hy Marke \hspace{.325em}\texttt{\bs newlabel\{baf.M*uller..Reise\}\{\{{\normalfont \textit{Fu"snote}}\}\{{\normalfont \textit{Seite}}\}\}}\hspace{.35em} ins \hspace{-.175em}\texttt{.aux}\hy File ab. -$-$ Falls Sie mit \texttt{ngerman.sty} oder babel\hy ngermanb stattdessen \hspace{-.075em}\texttt{\string"u} tippen, wird +$-$ Falls Sie mit \texttt{ngerman.sty} oder \textsc{babel}\hy ngerman stattdessen \hspace{-.075em}\texttt{\string"u} tippen, wird \texttt{Muller}\pdfko{.325}\ automatisch erzeugt; dies unterschiede sich ebenfalls von einem mit \hspace{-.075em}\texttt{\string"o} erzeugten \texttt{Moller}.} Um bei Querverweisen in jedem Fall unabh"angig zu sein, steht zus"atzlich das Befehlspaar \verb|\balabel{|\textit{Schl"usselwort}\verb|}| und \verb|\baref{|\textit{Schl"usselwort}\verb|}| bereit, um stets -Marken setzen zu k"onnen, wie k\fhy Befehle es im \hspace{-.075em}\verb|\conferize|\hy Stil +Marken drucken zu k"onnen, wie k\fhy Befehle es im \hspace{-.075em}\verb|\conferize|\hy Stil tun: \hspace{.05em}\verb|\baref| wei"s ebenfalls eigenst"andig, ob \verb|\balabel| in einer Fu"snote steht. Die \textit{Schl"usselworte} dieser Querverweise werden nicht ausgedruckt:\footnote{In den @@ -551,7 +549,7 @@ Befehle wie \texttt{\bs underline} \hspace{.05em}verboten.} \hspace{.1em}(\verb|\grefverbname|: S.\,\pageref{grefverbname}). -\vspace{1.5ex}\noindent +\vspace{1.325ex}\noindent Nun zur"uck zu den v\fhy Befehlen. Bei der Markierung des \hspace{-.1em}\verb|\ktit{|\textit{Kurztitels}\verb|}| kann es vorkommen, dass dort im Volltitel der \textbf{Kurztitel mit einem Kleinbuchstaben} beginnt. \BibArts\ @@ -583,14 +581,24 @@ Kurztiteln mittels \hspace{-.05em}\verb|\onlyvoll| und \verb|\onlykurz|: ...\footnote{\clearbamem \kli{Ferguson}{Falscher Krieg}.\label{clearbamem}} } -\vspace{-.25ex}\noindent +\vspace{-.5ex}\noindent +\BibArts\ erkennt zwei Argumente meist nur als gleich an, falls sie +$-$\,nach Umsetzung von \hspace{-.05em}\verb|\onlyvoll|\kern.05em, \hspace{-.075em}\verb|\onlykurz|\kern.05em, +\hspace{-.075em}\verb|\onlyhere| und \verb|\onlyout| \baref{onlyhere}\,$-$ +zeichengleich sind. Ein neues Paar von v\hy\ und k\fhy Befehlen sollte darauf +getestet werden, ob die \textsc{ebd.}\hy Setzung funktioniert \textit{und} +auf der \hspace{-.2em}\texttt{.\ko vkc}\hy Liste nur \textit{ein} Eintrag erscheint. +Die Forderung nach Zeichengleichheit schlie"st getippte Leerzeichen ein (wobei +gilt: ein Leerzeichen ist gleich mehreren Leerzeichen). + +\vspace{1.125ex}\noindent Die Fu"snote\,\ref{clearbamem} soll sich auf das ganze Werk beziehen; nur \textsc{ebd.} \hspace{-.05em}wieder mittels \verb|\kli{Ferguson}{Falscher Krieg}[23]| \hspace{.05em}zu erzeugen, -w"are falsch. Stattdessen l"oschte \hspace{-.025em}\verb|\clearbamem| die -Zwischenspeicher. Sonst h"atte der \hspace{-.05em}\verb|\kli|\hy Befehl -ohne \verb|[|\textit{Seite}\verb|]| bei der "Ubersetzung mit \LaTeX\ -diese Fehlermeldung ausgel"ost: +w"are falsch. Stattdessen l"oschte \verb|\clearbamem| \hspace{.1em}die +Zwischenspeicher. Der \hspace{-.05em}\verb|\kli|\hy Befehl +\textit{ohne} \verb|[|\textit{Seite}\verb|]| h"atte bei der "Ubersetzung mit \LaTeX\ +\textit{sonst} folgende Fehlermeldung ausgel"ost: \vspace{-0.25ex}\label{before} {\scriptsize\begin{verbatim} @@ -604,16 +612,6 @@ diese Fehlermeldung ausgel"ost: \end{verbatim}} %% Bis BibArts 2.4 stand am Ende der Meldung ... no page/folio number. %% -\vspace{-.75ex}\noindent -\BibArts\ erkennt zwei Argumente meist nur als gleich an, falls sie -$-$\,nach Umsetzung von \hspace{-.05em}\verb|\onlyvoll|\kern.05em, \hspace{-.075em}\verb|\onlykurz|\kern.05em, -\hspace{-.075em}\verb|\onlyhere| und \verb|\onlyout| \baref{onlyhere}\,$-$ -zeichengleich sind. Ein neues Paar von v- und k\fhy Befehlen sollte darauf -getestet werden, ob die \textsc{ebd.}\hy Setzung funktioniert \textit{und} -auf der \hspace{-.2em}\texttt{.\ko vkc}\hy Liste nur \textit{ein} Eintrag erscheint. -Die Forderung nach Zeichengleichheit schlie"st getippte Leerzeichen ein (wobei -gilt: ein Leerzeichen ist gleich mehreren Leerzeichen). - \vspace{2ex}\noindent Neben Monografien gibt es noch B"ucher, die aus mehreren Aufs"atzen bestehen. @@ -684,10 +682,11 @@ zitierten Einzelseite innerhalb des zuvor genannten Seitenbereichs (Anfangs- und von runden statt eckigen Klammern w"urde \hspace{.2em}{\sffamily Bl.} \hspace{.15em}statt \hspace{.2em}{\sffamily S.} \hspace{.15em}ausdrucken. Das Beispiel f"uhrte zudem das \verb|*{|\textit{Sternargument}\verb|}| ein, -das in allen v- und k\hy Befehlen nach dem Nachnamen\hy Argument optional +das in allen v\hy\ und k\hy Befehlen nach dem Nachnamen\hy Argument optional stehen darf. In v\fhy Befehlen sind dort f"ur Koautoren vauthor- und in -k\fhy Befehlen kauthor\fhy Formatierer zu verwenden. Nur, falls \textit{auch} in den -Formatierern \textit{gleiche Nachnamen} stehen und sonstiger Text gleich ist, +k\fhy Befehlen kauthor\fhy Formatierer zu verwenden. Nur, falls (neben dem +Hauptautor) \textit{auch} in den +Formatierern \textit{gleiche Nachnamen} stehen, wird \textsc{ebd.} eingef"uhrt \baref[siehe \ko\texttt{\bs showbamem}]{bamem}. Die Formatierer \verb|\vauthor| und \verb|\kauthor| bezeichnen stets @@ -699,7 +698,7 @@ nach dem Erstautor erzeugen die x\fhy Befehle \hspace{-.05em}\verb|\xvli| oder \verb|\xkli| respektive \hspace{-.05em}\verb|\xvqu| \hspace{.05em}oder \verb|\xkqu|\kern.05em. -Auch `normale' v- und k\fhy Befehlen d"urfen Sternargumente haben. +Auch `normale' v\hy\ und k\fhy Befehlen d"urfen Sternargumente haben. Nach \verb|\vli| und \verb|\vqu| k"onnen sie Attribute wie \verb|*{\onlyvoll{[Hrsg.]}}| aufnehmen. Das Sternargument des v\fhy Befehls ist hier \textit{komplett} mit \verb|\onlyvoll| maskiert, sodass sp"atere @@ -754,7 +753,7 @@ Herausgeberwerk zitiert, erfolgt das `innere' und das `"au\hyss ere' \\ \ \ \}[467-477]\H{\}}*[469].\} } {\vspace{9ex}\showbamem - ...\footnote{`Innen' vollzitiert: \vqu {} {} + Aufsatz in Herausgeberband.\footnote{`Innen' vollzitiert: \vqu {} {} {\ktit{Aufmarschanweisungen 1912}, abgedruckt in: \xvqu{Hans} {Ehlert} *{\midvauthor{Michael} {Epkenhans} @@ -762,7 +761,7 @@ Herausgeberwerk zitiert, erfolgt das `innere' und das `"au\hyss ere' {Der \ktit{Schlieffenplan}, Paderborn 2007}[462-466]}*[463].} - ...\footnote{\kqu{} {Aufmarschanweisungen 1912}[464].\label{zweite}} + Aufsatz ist gleich.\footnote{\kqu{} {Aufmarschanweisungen 1912}[464].\label{zweite}} %% %\footnote{\kqu{}{Aufmarschanweisungen 1912!!!!!}[464].} %% Aussen anders %% %% @@ -770,7 +769,7 @@ Herausgeberwerk zitiert, erfolgt das `innere' und das `"au\hyss ere' %\setbox\mybox=\hbox{\footnotetext{\printonlyvqu{}{} {\xprintonlykqu{Ehlert} % *{\midkauthor{Epkenhans} \kauthor{Gro"s} [Hrsg.]}{Schlieffenplan}}}} - ...\footnote{`Innen' kurz: \vqu {} {} + Herausgeberband ist gleich.\footnote{`Innen' kurz: \vqu {} {} {\ktit{\onlyhere{\onlykurz{\,}}Aufmarsch 1913/14}, abgedruckt in: \xkqu{Ehlert} *{\midkauthor{Epkenhans} \kauthor{Gro"s} [Hrsg.]} @@ -788,9 +787,9 @@ ein `inneres' \textsc{ebd.} gesetzt. Den Inhalt des "au"seren und inneren \textit{Speichers} zeigt \verb|\showbamem| f"ur Tests an. Gedruckt wird auf den Bildschirm, \textit{wenn in Fu"snoten} bei kli\fhy, kqu\fhy, per\hy\ oder arq\hy Befehlen auf \textsc{ebd.}\hy Setzung gepr"uft \balabel{bamem} -wird.\footnote{Die \textsc{ebd.}\hy Setzung in \texttt{minipage}\hy -Fu"snoten ist v"ollig unabh"angig von Fu"snoten im "ubrigen Text. Seit \BibArts\ 2.5 -erfolgt au"serhalb von Fu"snoten kein Bildschirm\hy Ausdruck mehr.} +wird.\footnote{Die \textsc{ebd.}\hy Setzung erfolgt auch in \texttt{minipage}\hy +Fu"snoten automatisch. Sie nutzt eigene Speicher, ist also unabh"angig von der +\textsc{ebd.}\hy Setzung im "ubrigen Text.} Darunter wird hinter \verb|o-ref| bzw\ko.\ \verb|i-ref| der vom kli\fhy, kqu\fhy, per\hy\ oder arq\hy Befehl \textit{gesuchte} Text gedruckt: @@ -846,7 +845,7 @@ Und trotz \hspace{.1em}\verb|bibsort| \verb|-k| \hspace{.1em}wird der zweite ano \vspace{2ex}\noindent Gelegentlich sollen Teile der Literaturangaben nur in der v\fhy Liste erscheinen, jedoch -nicht im v\fhy Befehl in der Fu"snote. Hier sind dies die Reihenangaben: +nicht im v\fhy Befehl in der Fu"snote $-$ detaillierte Reihenangaben z.\,B.: \Doppelbox {\vspace{.75ex} @@ -1017,9 +1016,9 @@ zu \textit{wiederholen}. \vfill\vspace{1ex}\noindent Falls Sie aber umgekehrt ohnehin nur \textit{einen} Komplett\hy Eintrag in der v\fhy Liste wollen, -k"onnen Sie auf `innere' \hspace{-.02em}v- und k\fhy Befehle alternativ auch verzichten: +k"onnen Sie auf `innere' \hspace{-.02em}v\hy\ und k\fhy Befehle alternativ auch verzichten: -\vspace{-.5ex} +\vspace{-.725ex} \Doppelbox {\vspace{.3em} \bs vqu \{Karl\} \{Marx\} @@ -1042,21 +1041,21 @@ k"onnen Sie auf `innere' \hspace{-.02em}v- und k\fhy Befehle alternativ auch ver }\label{ntvauthor}% -\vspace{-.325ex}\noindent -Zitierkonventionen lassen sich "uber \textbf{vorgefertigte Textelemente} anpassen: +\noindent +\textit{\hspace{-.0325em}Zitierkonventionen} lassen sich "uber \textbf{vorgefertigte Textelemente} anpassen: Die Schr"agstiche definiert \hspace{-.05em}\verb|\nsep|, \label{nsep1} das seinerseits \hspace{-.1em}\verb|\baslash| (\baslash) ausf"uhrt. Die mid\hy Formatierer und x\fhy Befehle nutzen ihn. \verb*|\renewcommand{\nsep}{, }| \hspace{.1em}w"urde Komma statt Schr"agstrich zwischen Namen drucken. Dies kann auch lokal geschehen: Die jeweils aktuelle Definition von \hspace{-.1em}\verb|\nsep| reist -\label{Ausreise} mit jedem v- und k\fhy Zugang \textit{separat} in die Listen +\label{Ausreise} mit jedem v\hy\ und k\fhy Zugang \textit{separat} in die Listen und wird dort reproduziert. Die Voreinstellung l"asst sich mit \hspace{.05em}\verb|\renewcommand{\nsep}{\baslash}| \hspace{.075em}wiederherstellen. Ein weiterer Separator, \hspace{-.1em}\verb|\ntsep|\kern.025em, \label{ntsepA} der zwischen Name und Titel `\textsf{\printntsep}' druckt, sollte dagegen nur im Dokumentenvorspann ge"andert werden. -Ausgef"uhrt wird \verb|\ntsep| von v- und k\fhy Befehlen +Ausgef"uhrt wird \verb|\ntsep| von v\hy\ und k\fhy Befehlen sowie \verb|\ntvauthor| und \verb|\ntkauthor|. Gelegentlich ist ein lokal auf den \textit{Ausdruck ganzer Listen} beschr"anktes "Andern von \hspace{-.1em}\verb|\ntsep| @@ -1104,7 +1103,7 @@ Um den \textit{Text} zu ver"andern (\textit{nicht die} \textsc{schrift}\ko\texti \verb|\gidemname| (\textsc{der"-selbe}) und \verb|\giidemname| (\textsc{die"-selben}) mit \verb|\renewcommand| ver"andert werden. Diese Definitionen bestimmen auch, -was von \verb|[f]|, \verb|[m]| und \verb|[p{}]| ausgedruckt wird (Schalter von v- und k\fhy Befehlen). +was von \verb|[f]|, \verb|[m]| und \verb|[p{}]| ausgedruckt wird (Schalter von v\hy\ und k\fhy Befehlen). \vspace{1.25ex}\noindent @@ -1122,7 +1121,7 @@ dazu, \BibArts\ mitzuteilen, dass beim automatischen\pdfko{.25}\ \BibArts\ sperrt sich allgemein gegen eine Kursivsetzung von Autorennamen. Die Schrift, in der \textit{Autoren\hy Nachnamen} gesetzt sind, ist \verb|\authoremph|\kern.025em. Mit \verb|\renewcommand{\authoremph}{\upshape}| \hspace{.1em}lie\hyss e sich die voreingestellte -Hervorhebung von \textsc{Nachnamen} beim Ausdruck von v- und k\fhy Befehlen +Hervorhebung von \textsc{Nachnamen} beim Ausdruck von v\hy\ und k\fhy Befehlen aufheben. Alternativ kann \verb|\stressing| \textit{ein} Schriftbefehl ohne~\kern-.15em\verb|\| "ubergeben werden: \textit{Etwa} \verb|\stressing{underbar}| \textit{initiiert @@ -1209,7 +1208,7 @@ im Ausdruck selbst informieren lassen: } \vspace{.75ex}\noindent -Nach Setzen von \verb|\writeidemwarnings| druckten v- und k\fhy Befehle +Nach Setzen von \verb|\writeidemwarnings| druckten v\hy\ und k\fhy Befehle dabei das sonst unsichtbare \{\textit{Nachnamen\hy Argument}\} hinter folgenden Symbolen aus: \vspace{1.5ex}\noindent @@ -1264,7 +1263,7 @@ nicht alle Autoren \textit{dieselben} sind, k"onnen Sie die zuviel mit (oben in Anm.\,\ref{wieder} gezeigt). Wie vorgemacht d"urfen auch \verb|\editor| \hspace{.1em}oder \verb|\editors| \hspace{.1em}(dt.\ beide f"ur {\small\editor}) \hspace{.1em}in \textit{xx} verwendet werden. -Obwohl \textit{xx} im Text ausgedruckt wird, sollten Sie in v- und k\fhy Befehlen auch +Obwohl \textit{xx} im Text ausgedruckt wird, sollten Sie in v\hy\ und k\fhy Befehlen auch die "uberschriebenen Namen\hy Argumente stets vollst"andig bef"ullen: Denn sie bestimmen die \textsc{ebd.}\hy Setzung! \hspace{.05em}`\ko "Au\hyss ere' \hspace{-.1em}\textit{xx} werden auf den v\fhy Listen zudem nicht ausgedruckt und @@ -1284,18 +1283,18 @@ der Befehl \verb|\writeidemwarnings| unwirksam, also \hspace{.1em}nicht gedruckt. \vfill\noindent -Die Schalter \verb|[f]|, \verb|[m]| und \verb|[p{}]| von \hspace{-.1em}\textit{`\kern.05em inneren'} v- und k\fhy Befehlen +Die Schalter \verb|[f]|, \verb|[m]| und \verb|[p{}]| von \hspace{-.1em}\textit{`\kern.05em inneren'} v\hy\ und k\fhy Befehlen werden in die Literaturliste "ubernommen. Die \hspace{-.1em}\textit{`\kern.05em inneren'} Schalter beziehen sich auf die -\hspace{-.1em}\textit{`"au\hyss eren'} v- und k\fhy Befehle \textit{derselben} +\hspace{-.1em}\textit{`"au\hyss eren'} v\hy\ und k\fhy Befehle \textit{derselben} Literaturangabe: Der Herausgeber des Bandes ist z.\,B. auch Autor eines Aufsatzes. Die Nachnamen kontrolliert \BibArts\ nicht auf den Listen, nur in den Fu"snoten. Fehlen \verb|[f]|, \verb|[m]| und \verb|[p{}]| \hspace{-.1em}\textit{`\kern.05em innen'}, lautet die Warnung: % Meldung ...vqu-cmd in 2.3 geaendert in ...vqu \hspace{.3em}{\footnotesize\texttt{Inner ...vqu repeats author's lastname}}\kern.025em. \hspace{.1em}Falls dann aber Aufsatzautor und Herausgeber trotz gleicher Nachnamen nicht dieselbe -Person sind, k"onnen Sie \hspace{-.05em}\verb|\notwarnsamename| vor den \hspace{-.1em}\textit{`\kern.05em inneren'} -v- oder k\fhy Befehl setzen, falls Sie die Warnung \textit{nur lokal} ausschalten wollen. +Person sind, k"onnen Sie \hspace{-.05em}\verb|\notwarnsamename| direkt vor den \hspace{-.1em}\textit{`\kern.05em inneren'}\pdfko{.05}\ +v\hy\ oder k\fhy Befehl setzen, um die Warnung \textit{lokal} auszuschalten. \newpage\noindent @@ -1332,11 +1331,10 @@ vor und nach \verb+|2|+ keine Leerzeichen): } \noindent -St"unden hier \verb|\vli| und \verb|\kli| statt der -tats"achlich verwendeten printonly\hy Befehle, ginge ins Kurzzitateverzeichnis +W"are letzteres (hier nur zur Demonstration gebrachte) Beispiel tats"achlich umgesetzt, st"unde im Kurzzitateverzeichnis \hspace{.2em}\textsc{Reinhard}: Europ"aische Expansion [L] \hspace{.5em} \textsf{\pageref{Ranf}$^{\ref{Ranf}-\ref{Rend}}$} -\hspace{.4em}und ins Literaturverzeichnis: +\hspace{.4em}und im Literaturverzeichnis: \hspace{.2em}\textsc{Reinhard}, Wolfgang: Geschichte der europ"aischen Expansion, 4 Bde., Stuttgart 1983--1990. @@ -1400,15 +1398,16 @@ pr"uft nie, ob die \hspace{.2em}\verb|*[|\textit{Seite}\verb|]| \noindent Seit \BibArts\ 2.5 wird die \textbf{Autor\hy Jahr\hy Zitierweise} \label{AutorJahr} unterst"utzt. Das Stern\hy Argument eines v\fhy Befehls -kann nun etwa +kann dazu etwa \hspace{.25em}\verb|*{\onlyvoll{\ktit{1999}}}| \hspace{.25em}lauten. K"urzer wird genau dasselbe mit \hspace{.15em}\verb|*{\starktit{1999}}| \hspace{.15em}erreicht. \balabel{starktit} Diese Maskierung von \verb|\ktit| \hspace{.1em}dient der \textsc{ebd.}\hy Setzung. -Die Jahreszahl ist in sp"ateren k\fhy Belegen dann (\ko nur\ko) als -letztes Argument einzutippen. Bei zwei Publikationen eines Autors im +Kurzzitate bestehen dann aus Nachname und Jahr, z.\,B.: +\verb|\kli{Chickering}{1999}|. +Bei zwei Publikationen eines Autors im selben Jahr sind Eingaben wie \verb|1999a| und \verb|1999b| vorgesehen. Im folgenden Beispiel wird \verb|\notannouncektit| gesetzt und \verb|\ntsep| @@ -1460,15 +1459,15 @@ Nachnamen gedruckt wird. Das Attribut \hspace{-.05em}\verb|\editors| steht \vspace{.375ex}\noindent Vor \verb|\vauthor{Stig}{Förster}| \textit{und} \verb|\kauthor{Förster}| -sind Leerzeichen, sonst st"unde kein \textsc{ebd.} \hspace{-.05em}in Anm.\,\ref{inneribid}. Und -\verb|\printvli| \hspace{.075em}w"urde in etwa drucken:\vspace{-1ex} +sind Leerzeichen, sonst st"unde kein \textsc{ebd.} \hspace{-.05em}in Anm.\,\ref{inneribid}. $-$ +\verb|\printvli| \hspace{.075em}w"urde nun in etwa drucken:\vspace{-1ex} \subsection*{Literatur} \begin{description}\parsep 0ex \itemsep -.5ex\sloppy \item {\scshape Boemeke}, Manfred F.\baslash {\scshape Chickering}, Roger\baslash {\scshape Förster}, Stig \editors\ 1999: Anticipating Total War. The German and American Experiences -1871-1914, Cambridge U.\,K. +1871--1914, Cambridge U.\,K. \item {\scshape Chickering}, Roger 1999: Total War. The Use and Abuse of a Concept, in: {\scshape Boemeke}\baslash {\scshape Chickering}\baslash {\scshape Förster} 1999 [L], S.\,13-28. @@ -1494,13 +1493,13 @@ Option \texttt{-k} \hspace{.175em}gestartet wird, um wiederholte Namen gegen 2000: Zweiter Titel. \item {\scshape \Ikillname{}}\baslash {\scshape \killname} und {\scshape \killname} \editors\ -2001: Dritter Titel. \texttt{ \%`und' ist sortierrelevant} +2001: Dritter Titel. %\texttt{ \%`und' ist sortierrelevant} \end{description} \vspace{-1ex}\noindent Der letzte Listenpunkt wurde mit \hspace{.2em}\verb*|*{\vauthor{Roger}{Chickering} |\underline{\texttt{un}}\verb|d| \verb*|\vauthor{Stig}{Förster}\onlyvoll{ \editors\ \ktit{2001}}}| \hspace{.2em}im v\hy Befehl -erzeugt: Dabei steht der vorletzte Autor in \verb|\vauthor| \hspace{.05em}und +erzeugt: Dabei steht der \textit{vorletzte} Autor in \verb|\vauthor| \hspace{.05em}und \hspace{.1em}\verb*| und| \hspace{.15em}ist dahinter getippt; \hspace{.05em}\texttt{bibsort} f"uhrt \verb|-k| \hspace{.15em}wie gezeigt durch. Passende k\fhy Befehle m"ussen \hspace{.2em}\verb*|*{\kauthor{Chickering} und \kauthor{Förster}}| @@ -1563,12 +1562,13 @@ Speziell \verb|\onlyvoll| und \verb|\starktit| \hspace{.05em}sollten Sie $-$\,wi nur direkt eintippen: Diese Befehle sollten Sie nicht in \hspace{-.05em}\verb|\newcommand|\kern.05em\hy Makros einsetzen, sonst kann es zu fehlerhaften Querverweisen kommen \baref{conferizelimits}. -Falls {\footnotesize\verb|\newlabel|} \hspace{.1em}\textit{zweier} Werke \textit{gleich} sind, -weil die sich z.\,B.\ nur im letzten Autor unterscheiden und der -fehlt (hier: \texttt{F"orster}), lassen sich {\footnotesize\verb|\newlabel|} \hspace{.1em}in der Art -\hspace{.175em}\verb|{\onlybakey{A}2001}| \hspace{.15em}in v- \textit{und} k\fhy Befehlen unsichtbar erg"anzen. - +\textbf{Falls} \textit{Schl"usselworte} von \textit{zwei} Werken \textit{gleich} sind, +weil etwa der letzte Autor fehlt (oben: {\footnotesize\texttt{dF"orster}}), k"onnen Sie bei +\textit{einem} Werk in die v\hy\ \textit{und} k\fhy Befehle z.\,B. +\hspace{.1em}{\verb|{\onlybakey{A}2001}|} \hspace{.15em}statt +\hspace{.15em}{\verb|{2001}|} \hspace{.15em}tippen (unsichtbare Erg"anzung). +\noindent Falls bei Autor\hy Jahr\hy Zitierweise in v\fhy Befehlen ein Autorenname mit \texttt{[f]} oder \texttt{[m]} als \textsc{dies.}\ oder \textsc{ders.}\ gedruckt werden soll, ist dies einfach: @@ -1599,13 +1599,14 @@ den Kurztitel; \verb|\announcektit| und \verb|\ibidemize| funktionieren so nicht \vspace{1ex} } {\notktitaddtok + \texttt{ \ \ \% [p\{\}] dabei falsch:} \\[3.5ex] Hier nicht in den Listen.% \footnote{\xprintonlyvli{Petra} {Maier} *{\vauthor{Hans} {Müller}{\onlyvoll{ \ktit{2018}}}} {Der eine Aufsatz}.} \footnote{\xprintonlyvli [p{}] {Petra} {Maier} *{\vauthor{Hans} {Müller}\onlyvoll{ \ktit{2019}}} {Der andere Aufsatz}.} \footnote{\xprintonlykli{Maier} *{\kauthor{Müller}}{2019}.} } -\vspace{-.25ex}\noindent +\vspace{-.325ex}\noindent Statt in der letzten Fu"snote \textsc{ebd.}\ zu setzen, weist \BibArts\ bei der \LaTeX\hy "Ubersetzung darauf hin, dass der Nachname des ersten Autors wiederholt wird. Im Autor\hy Jahr\hy System ist der Kurztitel innerhalb von \verb|[p{|\textit{xx}\verb|}]| zu wiederholen: @@ -1618,6 +1619,7 @@ Im Autor\hy Jahr\hy System ist der Kurztitel innerhalb von \verb|[p{|\textit{xx} \vspace{1ex} } {\notktitaddtok + \texttt{ \ \ \% [p\{\bs\ \bs ktit\{2019\}\}] ok:} \\[3.5ex] Hier nicht in den Listen.% \footnote{\xprintonlyvli{Petra} {Maier} *{\vauthor{Hans} {Müller}{\onlyvoll{ \ktit{2018}}}} {Der eine Aufsatz}.} \footnote{\xprintonlyvli [p{\ \ktit{2019}}] {Petra} {Maier} *{\vauthor{Hans} {Müller}\onlyvoll{ \ktit{2019}}} {Der andere Aufsatz}.} @@ -1672,8 +1674,8 @@ stehen. \vspace{2ex}\noindent Das Innere von v\fhy Befehlen, die in \verb|{unused}|\kern.025em\hy Umgebungen stehen, -wird nicht abgearbeitet. Insofern gilt dort dasselbe, wie f"ur addto\fhy -Befehle au\hyss erhalb: +wird nicht abgearbeitet (insofern gilt dort dasselbe wie innerhalb von addto\fhy +Befehlen): \vspace{1ex}\noindent \parbox{1.8em}{(1)}In einer \verb|{unused}|\kern.025em\hy Umgebung erzeugen @@ -1749,7 +1751,7 @@ Deshalb sollten Sie in Texten mit \texttt{\{originalquote\}} den \LaTeX\hy Befehl \texttt{\bs flushbottom} nicht verwenden. $-$ \BibArts\ setzte den \textit{Abstand zwischen Fu"snoten} in Version 2.0 auf \texttt{2ex}. Falls Sie dies weiterhin wollen, m"ussen Sie nun -selbst \texttt{\bs setlength\{\bs footnotesep\}\{2ex\}} im Vorspann definieren.} +selbst \texttt{\bs setlength\{\bs footnotesep\}\{2ex\}} im Vorspann definieren (\textit{hier} der Fall).} Wenn Sie \verb|\footnoterule| anschlie\hyss end\pdfko{.25}\ einfach umdefinieren, dann schalten Sie diese Eigenschaft aus.\footnote{Um die Dicke des Strichs vor dem Fu"snotenbereich zu @@ -1876,8 +1878,8 @@ der Fu"snote stehen. Falls Sie \verb|\sethyphenation| oder \BibArts\hy Argumenten verwenden, ist dies (samt Argument) f"ur die Sortierreihenfolge unerheblich. Speziell aber im Nachnamen\hy Argument von \verb|\vli| und \verb|\kli| sollten Sie solche Befehle wegen der -\textsc{ebd.}\hy Setzung vermeiden. Wenn Sie in Autorennamen (also) -\textit{Trennhilfen} nutzen, sollten die bei allen v- und k\fhy Nennungen +\textsc{ebd.}\hy Setzung vermeiden. Falls Sie in Autorennamen +\textit{Trennhilfen} nutzen, sollten die "uberhaupt bei allen v\hy\ und k\fhy Nennungen zumindest \textit{dieses einen Werkes} einheitlich gesetzt sein.\footnote{Mehrere (ansonsten) zeichengleiche Listenzug"ange, bei denen \texttt{\bs sethyphenation} oder\pdfko{.25}\ @@ -1889,42 +1891,44 @@ $-$ Bei wechselnden Trennhilfen \texttt{\bs-} und \texttt{\dq-} setzt \hspace{.15em}\texttt{bibsort} \texttt{-k} \hspace{.2em}das \hspace{.1em}$\sim$ \hspace{.1em}dagegen richtig.} -\vspace{1.5ex}\noindent +\vspace{1ex}\noindent Nebenbei: Die \verb|{originalquote}|\kern.025em\hy Umgebung und der \verb|\sethyphenation|\hy Befehl "andern absichtlich auch das \textit{spacing} nicht, weil dies in einem Text durchgehend gleich sein sollte. Vgl. unten Kap.\,\ref{nonfrenchspacing} ab S.\,\pageref{nonfrenchspacing} und Kap.\,\ref{Punkte} ab S.\,\pageref{Punkte}. -\vspace{1.5ex}\noindent +\vspace{1ex}\noindent \BibArts\ reproduziert beim Listenausdruck zudem den Befehl \verb|\originalTeX|\pdfko{.25}\ aus \verb|german.sty| bzw\ko.\ \verb|ngerman.sty|, falls ein Eintrag aus einem Umfeld mit ver"andertem \textit{catcode} f"ur \verb|"| herstammt. Von den beiden \verb|"a| unten S.\,\pageref{originaltex} -ist nur eines als "a einsortiert. \verb|\originalTeX| schaltet zudem in den Basis\hy Trennsatz um; -mir meldete die \LaTeX\hy "Ubersetzung (\ko unter babel funktioniert dies nicht\ko): +ist nur eines als "a einsortiert. Nach \verb|\originalTeX| meldete die \LaTeX\hy "Ubersetzung: -\vspace{-.75ex}{\scriptsize\begin{verbatim} +\vspace{-.25ex}{\scriptsize\begin{verbatim} [bibsort] Set \baoriginalTeX in line 50 of BibArts file. [bibsort] Reproduce hyphenation 0 in line 51 of BibArts file. [bibsort] Set \bagermanTeX in line 56 of BibArts file. (new) [bibsort] Reproduce hyphenation 48 in line 57 of BibArts file. \end{verbatim}} -\vspace{-1ex}\noindent +\vspace{-.5ex}\noindent \verb|\baoriginalTeX| f"uhrt \verb|\originalTeX| aus, \verb|\bagermanTeX| f"uhrt selbst"andig \hspace{-.1em}\verb|\germanTeX| oder \hspace{-.1em}\verb|\ngermanTeX| (mit Meldungen \texttt{\footnotesize (old)} oder \texttt{\footnotesize (new)}) aus, -je nachdem, ob Sie \verb|german.sty| -oder \verb|ngerman.sty| geladen haben.\footnote{\label{bagermanTeX}Die Zwischenstufe mit -\texttt{\bs baoriginalTeX} bzw\ko.\ \hspace{-.075em}\texttt{\bs bagermanTeX} dient dazu, dass -Sie mit \texttt{\bs renewcommand} beide Definitionen ausschalten k"onnen, -falls es in Ihrem Text eine andere Bedeutung hat, wenn sich der -\textit{catcode} des \texttt{\dq} "andert. Siehe auch unten S.\,\pageref{original} samt Anm.\,\ref{original}.} -Ganz allgemein kommt \verb|bibarts.sty| klar, falls +je nachdem, ob Sie \verb|german.sty| oder \verb|ngerman.sty| geladen haben. +Unter \textsc{babel} wird nur \verb|\shorthandoff{"}| bzw\ko.\ \hspace{-.075em}\verb|\shorthandon{"}| +reproduziert, aber \verb|\originalTeX| nicht!\footnote{\label{bagermanTeX}Mit +[\kern.025em\texttt{n}]\kern.1em\texttt{german.sty} k"onnen Sie +\texttt{\bs renewcommand\{\bs baoriginalTeX\}\{\bs mdqoff\}} +und \texttt{\bs renewcommand\{\bs bagermanTeX\}\{\bs mdqon\}} definieren und dann +im Umfeld von \BibArts\hy Befehlen \texttt{\bs mdqoff} \hspace{.05em}statt \texttt{\bs originalTeX} verwenden. +Siehe auch \texttt{-x} unten S.\,\pageref{original} samt Anm.\,\ref{original}.} +\verb|bibarts.sty| kann arbeiten, falls \hspace{.1em}\verb|~|\,\verb|"|\,\verb|:|\,\verb|;|\,\verb|!|\,\verb|?|\,\verb|'|\,\verb|`|\,\verb|<|\,\verb|>| -\hspace{.15em}\textit{aktive} Zeichen sind, doch "Anderungen \label{catcode} -des \textit{catcode} reproduziert \verb|bibsort| nur bez"uglich~\verb|"|\,. +\hspace{.15em}\textit{aktiv} +sind, doch "Anderungen \label{catcode} +des \textit{catcode} reproduziert \verb|bibsort| nur bez"uglich~\verb|"|\kern.1em. @@ -1997,147 +2001,381 @@ S.\,\pageref{Punkte}): \vspace{1ex}{\small\noindent \verb| S\fup{te} Claire => | \hbox to 6em{S\fup{te} Claire\hfill}\texttt{\% Laden von} \\ -\verb| \textit{S\fup{te} Claire} => | \hbox to 6em{\textit{S\fup{te} Claire\hfill}}\texttt{\% babel-french} \\ +\verb| \textit{S\fup{te} Claire} => | \hbox to 6em{\textit{S\fup{te} Claire\hfill}}\texttt{\% BABEL\hy french} \\ \verb| \textit{S.\fup{te} Claire} => | \hbox to 6em{\textit{S.\fup{te} Claire\hfill}}\texttt{\% "uberschreibt} \\ \verb| \textit{S.\bahasdot\fup{te} Claire} => | \hbox to 6em{\textit{S.\bahasdot\fup{te} Claire\hfill}}\texttt{\% dieses \bs fup!}} +%% Falls \fup{...} am Absatzbegin steht (v-mode), wird die Positionierung von \notnewabra +%% beeinflusst: \notnewabra reproduziert einen bis zu BibArts 2.5 vorhandenen Fehler!!!!! \newpage\noindent -F"ur \textit{Editionsarbeiten} (w"ortliches Zitieren) stellt \BibArts\ -\verb|\abra{|\textit{Symbol}\verb|}| und -\verb|\fabra{|\textit{Symbol}\verb|}| -bereit. Als \textit{Symbol} lassen sich i.\,O. vergessene Satzzeichen -nachtragen, die dann in eckigen Klammern ausgedruckt werden, um sie +F"ur \textbf{Editionsarbeiten} (\ko w"ortliche Zitate\ko) stellt \BibArts\ +\verb|\abra{|\textit{Argument}\verb|}| und +\verb|\fabra{|\textit{Argument}\verb|}| +bereit. Als \textit{Argument} lassen sich i.\,O. fehlende Zeichen oder Worte +eintragen, die dann in eckigen Klammern ausgedruckt werden, um sie als \textit{editorische Zus"atze} zu kennzeichnen (\kern-.075em \textit{a}dditions in square \textit{bra}ckets). -Der Fixier\hy Befehl \verb|\fabra| verbietet einen Zeilenumbruch direkt -\textit{nach} dem \textit{Symbol}. - -Besonderheit der beiden Befehle ist, dass sie etliche kleine Symbole -automatisch in \textit{h"ohenangepassten} Klammern ausdrucken. `Unbekannte' -Zeichen werden in ein normales eckiges Klammerpaar gesetzt. Bekannte Symbole sind: +Der Befehl \verb|\fabra| verhindert einen Zeilenumbruch \textit{nach} der \textit{Klammer\hy Zu}. -\vspace{1.75ex}\noindent - \verb| \abra{,} => | Rot\abra{,} blau und gr"un \\[-.5ex] - \verb| \abra{.} => | kamen vor\abra{.} Und da \\[-.5ex] - \verb| \abra{...} => | \abra{...} waren \\[-.5ex] - \verb| \abra{\dots} => | \abra{\dots} noch \\[-.5ex] - \verb| \abra{$-$} => | \abra{$-$} glaube ich \abra{$-$} \\[-.5ex] - \verb| \abra{-} => | gr"un\abra{-} und gelb\abra{-}farbene \\[-.5ex] - \verb| \abra{--} => | Punkte \abra{--}\\[-.5ex] - \verb| \abra{---} => | Englischer\abra{---}Gedankenstrich.\\[-.5ex] - \verb| \fabra{`} => | \hbox to 8em{\fabra{`}So,\hfill} \verb| % U+0060 (nicht U+2018)| \\[-.5ex] - \verb| \fabra{'} => | \hbox to 8em{so\abra{'}.\hfill} \verb| % U+0027 (nicht U+2019)| \\[-.5ex] - \verb| \fabra{\glq} => | \hbox to 8em{\fabra{\glq}So,\hfill} \\[-.5ex] - \verb| \fabra{\grq} => | \hbox to 8em{so\abra{\grq}.\hfill} \\[-.5ex] - \verb| \fabra{\glqq} => | \hbox to 8em{\fabra{\glqq}Das kann\hfill} \\[-.5ex] - \verb| \abra{\grqq} => | \hbox to 8em{nicht sein.\abra{\grqq}\hfill} \\[-.5ex] - \verb| \fabra{"`} => | \hbox to 8em{\fabra{"`}Das kann\hfill} \verb| % nicht „ (nicht U+201E)| \\[-.5ex] - \verb| \abra{"'} => | \hbox to 8em{nicht sein.\abra{"'}\hfill} \\[-.5ex] - \verb| \abra{``} => | \hbox to 8em{,,Gut!\abra{``}\hfill} \verb| % nicht “ (nicht U+201C)| \\[-.5ex] - \verb| \abra{''} => | \hbox to 8em{''Good?\abra{''}\hfill} \verb| % nicht ” (nicht U+201D)| \\ - \verb| \fabra{g}gf. => | \hbox to 3.3em{\fabra{g}gf.\hfill} \verb| % unbekannt => normale Klammern| +Besonderheit von \hspace{-.075em}\verb|\abra| \hspace{.05em}und \verb|\fabra| \hspace{.05em}ist, dass +sie bestimmte Argumente (samt vielen \hspace{-.125em}\verb|.toc|\hy Expansionen) in \textit{h"ohenangepasste} Klammern setzen $-$ z.\,B: +\vspace{1.25ex}\noindent + \verb| \abra{,} => | Rot\abra{,} blau \\[-.25ex] + \verb| \abra{.} => | und gr"un\abra{.} \\[-.25ex] + \verb| \abra{...} => | Hinzu \abra{...} kamen \\[-.25ex] + \verb| \abra{\dots} => | \abra{\dots} daneben \\[-.25ex] + \verb| \abra{$-$} => | \abra{$-$} soweit bekannt \abra{$-$} \\[-.25ex] + \verb| \abra{-} => | gelb\abra{-}farbene Bereiche. \\[-.25ex] + \verb| \fabra{`} => | \hbox to 10em{\fabra{`}Zitat im\hfill} \\[-.25ex] + \verb| \abra{'} => | \hbox to 10em{Zitat.\fabra{'}\hfill} \\[-.25ex] + \verb| \fabra{\lq} => | \hbox to 10em{\fabra{\lq}Zitat im\hfill}\\[-.25ex] + \verb| \abra{\rq} => | \hbox to 10em{Zitat.\abra{\rq}\hfill} \\[-.25ex] + \verb| \fabra{"`} => | \hbox to 10em{\fabra{"`}Das\hfill} \verb| % [n]german.sty oder| \\[-.25ex] + \verb| \abra{"'} => | \hbox to 10em{mag sein.\fabra{"'}\hfill} \verb| % BABEL-[n]german.| \\[-.25ex] + \verb| \fabra{\glqq} => | \hbox to 10em{\fabra{\glqq}Das\hfill} \verb| % [n]german.sty oder| \\[-.25ex] + \verb| \abra{\grqq} => | \hbox to 10em{mag sein.\fabra{\grqq}\hfill} \verb| % BABEL (mehrere).| \\[.25ex] + \verb| \abra{sic!} => | \hbox to 2.65em{\abra{sic!}\hfill} \verb| % `unbekannt' => normale Klammern| -\vspace{2ex}\noindent -Damit \BibArts\ die \textit{Symbole} erkennen kann, m"ussen sie genau "ubereinstimmen, -d"urfen also auch keine Leerzeichen enthalten. F"ur das \verb|"| in -\verb|"`| und \verb|"'| ist zudem Voraussetzung, dass es einen \textit{catcode} -von 13 (\textit{aktiv}) hat, wie es nach Laden etwa von \verb|ngerman.sty| oder -babel\hy ngerman der Fall ist. Sonst (Englisch\hy Original\hy\LaTeX) sind auch -\verb|\abra{"}| bzw\ko.\ \verb|\fabra{"}| m"oglich:~{\originalTeX\fabra{"}} \hspace{.175em}(\texttt{U+0022}). +\vspace{1.5ex}\noindent +Die entsprechenden UTF-8\hy Zeichen und franz"osische Anf"uhrungszeichen wurden in \BibArts\ 2.6 +aufgenommen; \verb|\abra{«}X\abra{»}| ergibt \abra{«}X\abra{»} (vgl.\ S.\,\pageref{AbraTab}). Alle +Erweiterungen k"onnen Sie in bestehenden Texten mit \hspace{-.05em}\verb|\notnewabra| ablehnen; die neuen Argumente +gelten dann wie fr"uher als `unbekannt': {\notnewabra\abra{«}X\abra{»}} +Zu den Erweiterungen seit \BibArts\ 2.6 siehe auch die Datei \texttt{README.txt}. + +Damit \BibArts\ die Argumente erkennen kann, m"ussen sie genau "ubereinstimmen. +Das \verb|"| etwa in \hspace{.1em}\verb|\abra{"`}| \verb|=>| \abra{"`} +\hspace{.25em}muss daf"ur \textit{aktiv} +sein. In den Argumenten ist \verb|\protect| ebenfalls insofern nicht +brauchbar, als dass dann in jedem Fall normale Klammern erzeugt werden. +Die Zeichen \verb|`|, \verb|'|, \verb|>| und \verb|<|\pdfko{1}\ +k"onnen dagegen sowohl aktiv (\ko\textit{catcode} 13) als auch passiv +(\ko\textit{catcode} 12) sein. \vspace{1ex}\vfill\noindent -In den `kleinen' Klammern der abra\hy Befehle setzt \BibArts\ -die \textit{Symbole} aufrecht, -weil die sonst in einigen schr"aggestellten Schriften -schlecht zentriert in den Klammern erscheinen w"urden. -\verb|\abra| und \verb|\fabra| machen eine -\textit{italics}\hy Korrektur. Sie wird durch ein direkt davor getipptes -\verb|\bahasdot| unterbunden: +Seit 2.6 lassen sich die drei h"ohenangepassten Klammerpaare `von Hand' +aufrufen: \verb|\batbrack| druckt das \textit{top\fhy}, +\hspace{-.05em}\verb|\bambrack| das \textit{middle}- und \verb|\babbrack| +das \textit{bottom}\hy Paar. Zudem gibt es \verb|\fbatbrack|, +\hspace{-.05em}\verb|\fbambrack| und \verb|\fbabbrack|, die vor dem +Folgewort keinen Zeilenumbruch erlauben. Das Argument wird in den Klammern +freilich nicht zentriert (ggf.\ mit \verb|\hspace{|\abra{...}\verb|}| +\hspace{.05em}nachbessern):\label{babbrack} -\vspace{1.75ex}\noindent -\verb| \fabra{"`}Haus\abra{"'} => | {\fabra{"`}Haus\abra{"'}} \\ +\vspace{1.325ex}\noindent +\verb| 30\fbatbrack{°}\,C => | 30\fbatbrack{°}\,C \\[.125ex] +\verb| $2\bambrack{\cdot}3=6$ => | $2\bambrack{\cdot}3=6$ \\[.125ex] +\verb| H\babbrack{\raisebox{-0.325ex}{\tiny 2}}O => | H\babbrack{\raisebox{-0.325ex}{\tiny 2}}O + + +\newpage +\newcommand{\tdum}{\,$^{\mbox{\scriptsize\tt \hphantom{T}}}$} +\newcommand{\tein}{\,$^{\mbox{\scriptsize\tt T1}}$} +\newcommand{\torg}{\,$^{\mbox{\scriptsize\tt T1/g}}$} +\newcommand{\tonb}{\,$^{\mbox{\scriptsize\tt T1/b}}$} +\newcommand{\gsty}{\,$^{\mbox{\scriptsize\tt g}}$} +\newcommand{\xsty}{\,$^{\mbox{\scriptsize\tt x}}$} +\newcommand{\told}{\,$^{\mbox{\scriptsize\tt old}}$} +\newcommand{\xmold}{\kern.2em$^{\mbox{\scriptsize\tt m}}$} +\newcommand{\moldb}{\kern.2em$^{\mbox{\scriptsize\tt m}}$} %sinnvoll in b=babel% +\newcommand{\mold}{\kern.125em$^{\mbox{\scriptsize\tt m}}$} + +\noindent +\begin{footnotesize}\label{AbraTab} +\begin{tabular}{llllll} +\multicolumn{6}{c}{\normalsize {\sf Argumente, bei denen} {\tt\bs abra} {\sf\hspace{.05em}und\hspace{.05em}} {\tt\bs fabra} {\sf\hspace{.025em}angepasste Klammern drucken:}} \\[.5ex] \hline +% + \rule{0pt}{12pt} & \bf UTF-8 & \bf oder Ersatzbefehl & \bf bzw\ko. ASCII \ & [{\tt n}]\tt german & \bf\hy Ersatz \\[.25ex] \hline + \normalsize \abra{‐} & \tt [2010]\mold & & \verb|- [45]|\mold & & \rule{0pt}{12pt} \\ + \normalsize \abra{‑} & \tt [2011]\mold & \verb|\mbox{-}|\xmold & & & \\ + \normalsize \abra{‒} & \tt [2012] & \verb|\textendash| & & & \\ + \normalsize \abra{–} & \tt [2013] & \verb|\textendash| & & & \\ + \normalsize \abra{‐‐} & \tt 2*[2010] & & \verb|-- 2*[45]| & & \\ + \normalsize \abra{$-$} & & & \verb|$-$|\xmold & & \\ + \normalsize \abra{—} & \tt [2014] & \verb|\textemdash| & & & \\ + \normalsize \abra{―} & \tt [2015] & \verb|\textemdash| & & & \\ + \normalsize \abra{‐‐‐} & \tt 3*[2010] & & \verb|--- 3*[45]| & & \\ + \normalsize \abra{.} & & & \verb|. [46]|\mold & & \\ + \normalsize \abra{‘} & \tt [2018] & \verb|\textquoteleft| & \verb|` [96]|\mold\verb| \lq|\xmold & & \verb|\grq| \\ + \normalsize \abra{’} & \tt [2019] & \verb|\textquoteright| & \verb|' [39]|\mold\verb| \rq|\xmold & & \\ + \normalsize \abra{‚} & \tt [201A]\torg & \verb|\quotesinglbase|\torg & \verb|, [44]|\mold & & \verb|\glq| \\ + \normalsize \abra{"} & & & \verb|" [34]|\phantom{\mold}\verb| \dq|\xsty & & \\ + \normalsize \abra{“} & \tt [201C] & \verb|\textquotedblleft| & & \verb|"' 34,39| & \verb|\grqq| \\ + \normalsize \abra{‘‘} & \tt 2*[2018] & & \verb|`` 2*[96]|\xmold & & \\ + \normalsize \abra{”} & \tt [201D] & \verb|\textquotedblright| & & & \\ + \normalsize \abra{’’} & \tt 2*[2019] & & \verb|'' 2*[39]|\moldb & & \\ + \normalsize \abra{„} & \tt [201E]\torg & \verb|\quotedblbase|\torg & \verb|,, 2*[44]|\tein & \verb|"` 34,96| & \verb|\glqq| \\ + \normalsize \abra{...} & & & \verb|... 3*[46]|\mold & & \\ + \normalsize \abra{…} & \tt [2026] & \verb|\textellipsis| & (\,\verb|\dots|\xmold\,) & & \\ + \normalsize \abra{‹} & \tt [2039]\torg & \verb|\guilsinglleft|\torg & & & \verb|\flq| \\ + \normalsize \abra{›} & \tt [203A]\torg & \verb|\guilsinglright|\torg & & & \verb|\frq| \\ + \normalsize \abra{«} & \tt [00AB]\tonb & \verb|\guillemetleft|\tonb & \verb|<< 2*[60]|\tein & \verb|"< 34,60| & \verb|\flqq| \\ + \normalsize \abra{»} & \tt [00BB]\tonb & \verb|\guillemetright|\tonb & \verb|>> 2*[62]|\tein & \verb|"> 34,62| & \verb|\frqq| \\[2ex] +% +\multicolumn{6}{l}{\hspace{1.5em}\hbox to 3em{\tein\tdum\hfill} \scriptsize\sf existiert in {\tt T1} (nicht in {\tt OT1}). \hspace{1.8cm} \xsty\ Falls undefiniert von \rm \BibArts\ \sf bereitgestellt.} \\[-.25ex] +\multicolumn{6}{l}{\hspace{1.5em}\hbox to 3em{\torg\tdum\hfill} \scriptsize\sf existiert in {\tt T1}; mit [n]\kern.01em german.sty v2.5e (\ko nicht 2.4a\ko) oder {\sc babel} auch in {\tt OT1}.} \\[-.25ex] +\multicolumn{6}{l}{\hspace{1.5em}\hbox to 3em{\tonb\tdum\hfill} \scriptsize\sf existiert in {\tt T1}; mit {\sc babel} auch in {\tt OT1}.} \\[-.25ex] +\multicolumn{6}{l}{\hspace{1.5em}\hbox to 3em{\xmold\tdum\hfill} \scriptsize{\sf Angepasste Klammern im Text- \it und\/ \sf\underline{math.\ Modus}; sonstige Zeichen \underline{dort} }$\abra{unbekannt}$.} \\[.75ex] +\hline +\end{tabular} +\end{footnotesize} + + +\vspace{3ex}\noindent +Seit \BibArts\ 2.6 lassen sich au"serdem andere Klammersymbole einstellen, z.\,B.: + +\vspace{.75ex}\noindent +{\verb| \renewcommand{\pabrao}{(} % Die Zentrierung ist| \\ + \verb| \renewcommand{\pabrac}{)} % für [ und ] getestet.| + \renewcommand{\pabrao}{(} + \renewcommand{\pabrac}{)} \\[.25ex] + \verb| „Ohne Satzpunkt\fabra{.}“ => |„Ohne Satzpunkt\fabra{.}“ +} + + +\vfill\noindent +\BibArts' abra- und brack\hy Befehle drucken ihre Argumente und Klammern stets +aufrecht. In kursivem Umfeld wird (von \textit{bottom\hy}Klammern abgesehen) +eine \textit{italics}\hy Kopfkorrektur durchgef"uhrt. \verb|\bahasdot| +davorgetippt schaltet sie aus: + +\vspace{1.125ex}\noindent \verb| \itshape | \\ -\verb| \fabra{"`}Haus\abra{"'} => | {\itshape \fabra{"`}Haus\abra{"'}} \\ -\verb| \fabra{"`}H.\abra{"'} => | {\itshape \fabra{"`}H.\abra{"'}} \\ -\verb| \fabra{"`}H.\bahasdot\abra{"'} => | {\itshape \fabra{"`}H.\bahasdot\abra{"'}} +\verb| \fabra{„}Haus\abra{“} => |{\itshape \fabra{„}Haus\abra{“}} \\ +\verb| \fabra{„}H.\abra{“} => |{\itshape \fabra{„}H.\abra{“}} \\ +\verb| \fabra{„}H.\bahasdot\abra{“} => |{\itshape \fabra{„}H.\bahasdot\abra{“}} -\vspace{2ex}\noindent + +\newpage\noindent Weil normale \textit{Minuszeichen} in Worten die Silbentrennung ausschalten, -stellt \BibArts\ zudem \verb|\hy| und \verb|\fhy| bereit. -\verb|\hy| erlaubt die Trennung direkt nach dem gedruckten Minuszeichen +stellt \BibArts\ au\hyss erdem noch \verb|\hy| und \verb|\fhy| bereit. +\verb|\hy| erlaubt eine Trennung nach dem gedruckten Minuszeichen (\verb|Haber\hy Bosch\hy Verfahren =>| Haber\hy Bosch\hy Verfahren), -w"ahrend \verb|\fhy| ein Minuszeichen druckt, das fest am -Folgewort klebt: \verb|Truppenaufmarsch und \fhy abzug =>| +w"ahrend \verb|\fhy| ein Erg"anzungsstrich ist, der fest am +Folgewort klebt: \hspace{.1em}\verb|Truppenaufmarsch und \fhy abzug| \verb|=>| Truppenaufmarsch und \fhy abzug. Gegebenenfalls w"urde auch ab-zug getrennt -(anders als nach~\verb|"~|).\label{hy} +(anders als nach~\verb|"~| [g]).\label{hy} -\vspace{1ex}\noindent -\verb|\hy| machte im Beispiel oben auch ein \textit{kerning} zum V\ko, -das es nach direkt angetippten Minuszeichen nicht gibt: +\vspace{1.25ex}\noindent +\verb|\hy| macht im Beispiel oben ein \textit{kerning} zum V\ko, +das direkt getippte Minuszeichen au\hyss erdem nicht durchf"uhren: \hspace{.3em}\verb|Haber-Bosch-Verfahren| \hspace{.3em}\verb|=>| \hspace{.2em}Haber-Bosch-Verfahren. Das \textit{kerning} erfolgt vor A, T\ko, v, V\ko, w, W\ko, x, X, y und Y\ko, sowie vor -\verb|`|, \verb|'|, \verb|\glq|, \verb|)|, \verb|]| und \verb|\}| automatisch. -Es funktioniert auch dann, wenn der Buchstabe \textit{einen} Akzent hat -(\kern-.1em\textit{aktives} \hspace{-.1em}\verb|"|, \verb|\"|, -\verb|\.|, \verb|\=|, \verb|\^|, \verb|\'|, \verb|\`|, -\verb|\~|,\pdfko{.25}\ -\verb*|\accent |\textit{num}\verb*| |, +\hspace{.1em}\verb|`|\kern-.0275em, \hspace{.1em}\verb|'|, \hspace{.1em}\verb|\glq|\kern.075em, \hspace{.15em}\verb|)|\kern-.075em, +\hspace{.2em}\verb|]| \hspace{.1em}und \hspace{.1em}\verb|\}| \hspace{.125em}automatisch $-$ +auch mit \textit{einem} Akzent auf dem Buchstaben: +\textit{aktives} \hspace{-.075em}\verb|"|, \hspace{.01em}\verb|\"|, +\verb|\.|\kern-.05em, \verb|\=|\kern.05em, \verb|\^|, \verb|\'|, \verb|\`|, +\verb|\~|, \verb*|\accent |\textit{num}\verb*| |, \verb|\b|, \verb|\c|, \verb|\d|, \verb|\H|, \verb|\k|, -\verb|\r|, \verb|\u| oder \verb|\v|; nur \verb|\t| -funktioniert nicht). +\verb|\r|, \verb|\u|, \verb|\v| \hspace{.1em}oder, neu in \BibArts\ 2.6, \verb|\textcommabelow| +\hspace{.05em}und \verb|\t|. +Weiter sind \hspace{.025em}\verb|\AA| (\AA) \hspace{.075em}und der Verbund +\verb|\AE| (\AE) \hspace{.075em}hinzugekommen. Beispiele: + +\vspace{1.25ex}\noindent +\verb| -Yser => | -Yser \\ +\verb| \hy Yser => | \hbox to 3.5em{\hy Yser\hfill} \verb|% Bindestrich mit kerning.| \\ +\verb| \hy\'Yser => | \hy\'Yser \\ +\verb| \hy\'{Y}ser => | \hbox to 3.5em{\hy\'{Y}ser\hfill} \verb|% Einklammern *hinter Akzent* ok.| \\ +\verb| \hy\b{YB} => | \hbox to 3.5em{\hy\b{YB}\hfill} \\ +\verb| \hy Ýser => | \hbox to 3.5em{\hy Ýser\hfill} \verb|% |\texttt{utf8 seit BibArts 2.6; siehe S.\pageref{utf8}.} + +\vspace{1.5ex}\noindent +Dieses \textit{kerning} l"asst sich durch \verb|\nothyko| +ausschalten, nur die 2.6\hy "Anderungen durch \verb|\notnewhyko|\kern.015em. +In \texttt{typewriter}\hy Fonts ist \verb|\nothyko| nur noch unter +\verb|\notnewhyko| anzuordnen. +Setzen von \verb|\hy{}|\hspace{-.1em}\textit{Wort} bzw\ko.\ +\verb|\fhy{}|\hspace{-.1em}\textit{Wort} unterbindet ein einzelnes \textit{kerning}. +Das \ko\textit{Wort} kann dann immer noch getrennt werden. + +\vspace{1.25ex}\noindent +\verb|\hy| und \verb|\fhy| beeinflussen das \LaTeX\hy eigene +\textit{kerning} zwischen \textit{den Folgebuchstaben} nicht. +Falls Sie einen Buchstaben einklammern, der \ko\textit{direkt} +nach \verb|\hy|\pdfko{.75}\ +oder \verb|\fhy| steht, wird von \LaTeX\ selbst dieses weitere +\textit{kerning} ausgeschalten: + +\vspace{1.25ex}\noindent +\verb| \hy\'Yser => | \hbox to 3.5em{\hy\'Yser\hfill} \\ +\verb| \hy{}\'Yser => | \hbox to 3.5em{\hy{}\'Yser\hfill} \verb|% \hy-kerning korrekt ausgeschalten.| \\ +\verb| -{\'Y}ser => | \hbox to 3.5em{-{\'Y}ser\hfill} \\ +\verb| \hy{\'Y}ser => | \hbox to 3.5em{\hy{\'Y}ser\hfill} \verb|% Ý-s-kerning (T1) zudem aufgehoben.| + +\vspace{1.75ex}\noindent +Seit \BibArts\ 2.6 bearbeiten \hspace{-.05em}\verb|\hy| und \verb|\fhy| die \textit{capital}\hy Befehle, +die abgewandelte Akzente auf Buchstaben setzen (\r A\capitalring A). +F"ur Flie"stext sind normale Akzent\hy Befehle zu bevorzugen, +oder $-$ falls vorhanden $-$ UTF-8\hy Akzentbuchstaben:\footnote{ +Mit \hspace{.05em}\texttt{\bs sethyphenation\{swedish\}} \hspace{.1em}trennte mein \LaTeX\ mit \texttt{T1} +sowohl die Notationen \hspace{.05em}\texttt{Ångstrom} \hspace{.1em}als auch +\texttt{\bs r\{A\}ngstrom} \hspace{.1em}und \hspace{.05em}\texttt{\bs AA ngstrom} \hspace{.1em}am Zeilenende +in \hspace{.05em}\textsf{Ång-strom}\kern.075em, aber \hspace{.05em}\texttt{\bs capitalring Angstrom} \hspace{.05em}nicht. +Auch \texttt{\bs hy\bs accent 6 A} \hspace{.05em}(\hy\accent 6 A) +\hspace{.05em}bzw\ko.\ (bei \texttt{\bs accent} m"oglich:) +\texttt{\bs hy\{\bs accent 6 A\}} \hspace{.05em}(\hy{\accent 6 A}) \hspace{.05em}werden nicht getrennt. +\texttt{\bs hy\bs accent 6A} verursacht Fehler, +weil \texttt{\bs hy} ein Leerzeichen will (zwischen \texttt{6} und \texttt{A}). +Und \texttt{bibsort} sortiert \texttt{\bs accent} abweichend!} + + +\newpage + +\noindent +An allen entsprechenden Zeichen aus \hspace{0.025em}\verb|utf8enc.dfu| \hspace{-0.025em}(\ko v1.3c, {\small 2022/06/07}) +f"uhren \hspace{-.025em}\verb|\hy| und \verb|\fhy| ein \textit{kerning} durch, falls \verb|\usepackage[utf8]{inputenc}| gew"ahlt ist +\label{utf8} (\BibArts\ pr"uft, ob "`\kern-.1em\verb|\inputencodingname|"' \hspace{.05em}genau "`utf8"' definiert): + +\vspace{2.75ex}\noindent +\verb| \hy À |{\small\verb|[U+00C0]|}\verb| \hy\`A statt -À => | \hbox to 2em{\hy À\hfill} \hbox to 1.5em{\hy\`A\hfill} statt -À \\ +\verb| \hy Á |{\small\verb|[U+00C1]|}\verb| \hy\'A => | \hbox to 2em{\hy Á\hfill} \hy\'A \\ +\verb| \hy  |{\small\verb|[U+00C2]|}\verb| \hy\^A => | \hbox to 2em{\hy Â\hfill} \hy\^A \\ +\verb| \hy à |{\small\verb|[U+00C3]|}\verb| \hy\~A => | \hbox to 2em{\hy Ã\hfill} \hy\~A \\ +\verb| \hy Ä |{\small\verb|[U+00C4]|}\verb| \hy\"A (\hy "A) => | \hbox to 2em{\hy Ä\hfill} \hbox to 1.5em{\hy\"A\hfill} (\hy "A)\kern-.175em\gsty \\ +\verb| \hy Å |{\small\verb|[U+00C5]|}\verb| \hy\r A (\hy\AA) => | \hbox to 2em{\hy Å\hfill} \hbox to 1.5em{\hy\r A\hfill} (\hy\AA)\kern-.175em\told \\ +\verb| \hy Æ |{\small\verb|[U+00C6]|}\verb| \hy\AE \ statt -Æ => | \hbox to 2em{\hy Æ\hfill} \hbox to 1.5em{\hy\AE\hfill} statt -Æ \\ +\verb| \hy Ā |{\small\verb|[U+0100]|}\verb| \hy\=A => | \hbox to 2em{\hy Ā\hfill} \hy\=A \\ +\verb| \hy Ă |{\small\verb|[U+0102]|}\verb| \hy\u A => | \hbox to 2em{\hy Ă\hfill} \hy\u A \\ +\verb| \hy Ą |{\small\verb|[U+0104]|}\verb| \hy\k A => | \hbox to 2em{\hy Ą\kern-.25em\tein\hfill} \hy\k A\kern-.25em\tein \\ +\verb| \hy Ǎ |{\small\verb|[U+01CD]|}\verb| \hy\v A => | \hbox to 2em{\hy Ǎ\hfill} \hy\v A \\ +\verb| \hy Ǣ |{\small\verb|[U+01E2]|}\verb| \hy\=\AE\ statt -Ǣ => | \hbox to 2em{\hy Ǣ\hfill} \hbox to 1.5em{\hy\=\AE\hfill} statt -Ǣ + + +\vspace{2.75ex}\noindent +\verb| \hy Ţ |{\small\verb|[U+0162]|}\verb| \hy\c T statt -Ţ => | \hbox to 2em{\hy Ţ\hfill} \hbox to 1.5em{\hy\c T\hfill} statt -Ţ \\ +\verb| \hy Ť |{\small\verb|[U+0164]|}\verb| \hy\v T => | \hbox to 2em{\hy Ť\hfill} \hy\v T \\ +\verb| \hy Ț |{\small\verb|[U+021A]|}\verb| \hy\textcommabelow T => | \hbox to 2em{\hy Ț\hfill} \hy\textcommabelow T + + +\vspace{2.75ex}\noindent +\verb| \hy Ŵ |{\small\verb|[U+0174]|}\verb| \hy\^W statt -Ŵ => | \hbox to 2em{\hy Ŵ\hfill} \hbox to 1.5em{\hy\^W\hfill} statt -Ŵ + + +\vspace{1ex}\noindent +\verb| \hy ŵ |{\small\verb|[U+0175]|}\verb| \hy\^w statt -ŵ => | \hbox to 2em{\hy ŵ\hfill} \hbox to 1.5em{\hy\^w\hfill} statt -ŵ + + +\vspace{2.75ex}\noindent +\verb| \hy Ý |{\small\verb|[U+00DD]|}\verb| \hy\'Y statt -Ý => | \hbox to 2em{\hy Ý\hfill} \hbox to 1.5em{\hy\'Y\hfill} statt -Ý \\ +\verb| \hy Ŷ |{\small\verb|[U+0176]|}\verb| \hy\^Y => | \hbox to 2em{\hy Ŷ\hfill} \hy\^Y \\ +\verb| \hy Ÿ |{\small\verb|[U+0178]|}\verb| \hy\"Y => | \hbox to 2em{\hy Ÿ\hfill} \hy\"Y \\ +\verb| \hy Ȳ |{\small\verb|[U+0232]|}\verb| \hy\=Y => | \hbox to 2em{\hy Ȳ\hfill} \hy\=Y \\ +\verb| \hy Ẏ |{\small\verb|[U+1E8E]|}\verb| \hy\.Y => | \hbox to 2em{\hy Ẏ\hfill} \hy\.Y \\ +\verb| \hy Ỳ |{\small\verb|[U+1EF2]|}\verb| \hy\`Y => | \hbox to 2em{\hy Ỳ\hfill} \hy\`Y + \vspace{1.25ex}\noindent -\verb| -Yser => | -Yser \\ -\verb| \hy Yser => | \hy Yser \\ -\verb| \hy\"Yser => | \hy \"Yser \hspace{1em} \texttt{\% Kein U+0178, sondern \bs\dq Y (auch \dq A)} \\ -\verb| \hy\"{Y}ser => | \hy \"{Y}ser +\verb| \hy ý |{\small\verb|[U+00FD]|}\verb| \hy\'y statt -ý => | \hbox to 2em{\hy ý\hfill} \hbox to 1.5em{\hy\'y\hfill} statt -ý \\ +\verb| \hy ÿ |{\small\verb|[U+00FF]|}\verb| \hy\"y => | \hbox to 2em{\hy ÿ\hfill} \hy\"y \\ +\verb| \hy ŷ |{\small\verb|[U+0177]|}\verb| \hy\^y => | \hbox to 2em{\hy ŷ\hfill} \hy\^y \\ +\verb| \hy ȳ |{\small\verb|[U+0233]|}\verb| \hy\=y => | \hbox to 2em{\hy ȳ\hfill} \hy\=y \\ +\verb| \hy ẏ |{\small\verb|[U+1E8F]|}\verb| \hy\.y => | \hbox to 2em{\hy ẏ\hfill} \hy\.y \\ +\verb| \hy ỳ |{\small\verb|[U+1EF3]|}\verb| \hy\`y => | \hbox to 2em{\hy ỳ\hfill} \hy\`y + + +\vspace{2.75ex}\noindent +\verb| \hy ‘ |{\small\verb|[U+2018]|}\verb| \hy\lq \ statt -‘ => | \hbox to 2em{\hy ‘\hfill} \hbox to 1.5em{\hy\lq\hfill} statt -‘ \\ %\textquoteleft +\verb| \hy ’ |{\small\verb|[U+2019]|}\verb| \hy\rq \ statt -’ => | \hbox to 2em{\hy ’\hfill} \hbox to 1.5em{\hy\rq\hfill} statt -’ \\ %\textquoteright +\verb| \hy ‚ |{\small\verb|[U+201A]|}\verb| \hy\glq \ statt -‚ => | \hbox to 2em{\hy ‚\kern-.3825em\torg\hfill} \hbox to 1.5em{\hy\glq\kern-.275em\gsty\hfill} statt -‚ %\quotesinglbase + + +\newpage +\noindent +Die Spielregel, dass \hspace{-.05em}\verb|\hy| \hspace{.025em}und \verb|\fhy| nur dann ein \textit{kerning} +durchf"uhren, falls Buchstaben mit \textit{keinem} oder \textit{genau einem} Akzent folgen, +ist ernst gemeint: Weder an \hspace{.025em}\verb|\hy\b{\'Y}| (\hy\b{\'Y}) +\hspace{.075em}noch an \hspace{.025em}\verb|\hy\b{Ý}| (\hy\b{Ý}) \hspace{.075em}findet ein \textit{kerning} statt. + +\vspace{1ex}\noindent +Mit \BibArts\ 2.6 ist ein lange "ubersehener Fehler beseitigt: +Die Konstruktion \verb|\hy|\kern.05em\hy Akzentbefehl\kern.05em\hy Folgewort wird +in \verb|T1| seither am Zeilenende getrennt (\fhy\"Armel \verb|\fhy\"Armel|). +Auch mit der speziellen Notation \hspace{.025em}\verb|\fhy| \verb|"Armel| \hspace{.1em}funktioniert +die Trennung in \verb|T1|, falls \verb|\usepackage{ngerman}| (nicht \textsc{babel}) geladen ist. +\verb|\notnewhyko| setzt auch dabei auf die hy\hy Eigenschaften von 2.5 zur"uck. + +\vspace{1ex}\noindent +Die neu aufgenommenen \hspace{-.075em}\verb|\lq| \hspace{.05em}und \verb|\rq| +\hspace{.075em}f"uhren ASCII 96 (\verb|`|) und 39 (\verb|'|) aus. +Seit \BibArts\ 2.6 werden nun auch das aktive ASCII 96 und 39 behandelt. +Alternativ \hspace{.1em}sind auch {\small\verb|[U+2018]|} oder \verb|\textquoteleft| +\hspace{-.075em}(\textquoteleft) \hspace{.1em}bzw.\ {\small\verb|[U+2019]|} oder +\hspace{-.025em}\verb|\textquoteright| \hspace{-.05em}(\textquoteright) \hspace{.075em}m"oglich; +{\small\verb|[U+201A]|} ist \verb|\quotesinglbase| (\quotesinglbase) oder \verb|\glq|: + +\vspace{1ex}\noindent +\verb| Ab-`Stand' => | \hbox to 5.6em{Ab-`Stand'\hfill} \\ +\verb| Ab\hy `Stand' => | \hbox to 5.6em{Ab\hy `Stand'\hfill} \verb| % ` ASCII 96 (passiv/aktiv)| \\ +\verb| Ab\hy\glq Zu\grq => | \hbox to 5.6em{Ab\hy\glq Zu\grq\hfill} \\ +\verb| Ab\fhy, Zu- und => | \hbox to 5.6em{Ab\fhy, Zu- und\hfill} \verb| % , ASCII 44 (Komma) NICHT!| \vspace{1.5ex}\noindent -Dieses automatische \textit{kerning} l"asst sich durch \verb|\nothyko| -ausschalten (Wiedereinschalten mit \verb|\hyko|). Setzen von -\verb|\hy{}|\hspace{-.15em}\textit{Wort} bzw\ko.\ -\verb|\fhy{}|\hspace{-.15em}\textit{Wort} unterbindet es ebenfalls. -Das folgende Wort kann dann immer noch getrennt werden. -In einem \texttt{typewriter}\hy Umfeld sollten Sie weiterhin -Minuszeichen `\verb|-|' tippen. +\verb|\hy| 2.6 erg"anzt \textsc{Small Caps}: +\hspace{.1em}\textsc{\hy a} (statt \textsc{-a}, auch Akzente), +\textsc{\hy à} \texttt{\footnotesize 00E0}, +\textsc{\hy á} \texttt{\footnotesize 00E1}, +\textsc{\hy â} \texttt{\footnotesize 00E2}, +\textsc{\hy ã} \texttt{\footnotesize 00E3}, +\textsc{\hy ä} \texttt{\footnotesize 00E4}, +\textsc{\hy å} \texttt{\footnotesize 00E5}, +{\small\verb|\hy| \verb|\aa|}, +\textsc{\hy æ} \texttt{\footnotesize 00E6}, +{\small\verb|\hy| \verb|\ae|}, +\textsc{\hy ā} \texttt{\footnotesize 0101}, +\textsc{\hy ă} \texttt{\footnotesize 0103}, +\textsc{\hy ą} \texttt{\footnotesize 0105}, +\textsc{\hy ǎ} \texttt{\footnotesize 01CE}, +\textsc{\hy ǣ} \texttt{\footnotesize 01E3}, +\textsc{\hy t} (statt \textsc{-t}), +\textsc{\hy ţ} \texttt{\footnotesize 0163}, +\textsc{\hy ť} \texttt{\footnotesize 0165}, +\textsc{\hy ț} \texttt{\footnotesize 021B} und +\textsc{\hy ṭ} \texttt{\footnotesize 1E6D}. + \vspace{1.5ex}\noindent -\hspace*{-.16em}\textit{Vor} \hspace{-.075em}\verb|\hy| oder \hspace{-.1em}\verb|\fhy| kann +\hspace*{-.15em}\textit{Vor} \hspace{-.075em}\verb|\hy| oder \hspace{-.1em}\verb|\fhy| kann $-$\,falls ein penibler Textsatz gew"unscht ist\,$-$ kein automatisches \textit{kerning} durchgef"uhrt werden. \BibArts\ stellt den Korrekturbefehl \verb|\ko| bereit. Die Kosmetik -ist (\kern-.05em\textit{wenn "uberhaupt!}) n"otig nach +ist (\kern-.05em\textit{wenn "uberhaupt!}) n"otig hinter Gro"sbuchstaben, die sehr weit vom nachfolgenden Minuszeichen entfernt sind: T\ko, V\ko, W und Y\ko. -\vspace{1.25ex}\noindent -\verb| T\hy Zacke => | T\hy Zacke \\ -\verb| T\ko\hy Zacke => | T\ko\hy Zacke \\ -\verb| V\hy Form => | V\hy Form \\ -\verb| V\ko\hy Form => | V\ko\hy Form +\vspace{.75ex}\noindent +\verb| V\hy Form => | V\hy Form \\ +\verb| V\ko\hy Form => | V\ko\hy Form -\vspace{1.5ex}\noindent +\vspace{1ex}\noindent Die Definition von \verb|\ko| kann Ihnen als Beispiel f"ur "ahnliche Befehle dienen -\vspace{1.25ex}{\small\noindent +\vspace{.75ex}{\small\noindent \verb| \newcommand{\pko}{\ifhmode\nobreak\hskip -0.07em plus 0em\fi}| \\ \verb| \newcommand{\ko}{\protect\pko}|\label{ProtectBeispiel}} -\vspace{1.5ex}\noindent +\vspace{1ex}\noindent falls Sie die Korrektur zwischen V und Punkt oder Komma zu klein finden: -\vspace{1.25ex}\noindent +\vspace{.75ex}\noindent \verb| V\te Armee => | V\te Armee \\ \verb| V\ko\te Armee => | V\ko\te Armee -\vspace{1.5ex}\noindent +\vspace{1ex}\noindent Sicher w"are der Abstand von V und \hspace{-.1em}\verb|.| aber besser in den Ligaturtabellen definiert (worauf \verb|\te| reagiert: \verb| P\te I und P{}\te I => | P\te I und P{}\te I). +\vfill\noindent +\textsf{Hinweis: "Uber Markieren einiger Akzentbuchstaben im +PDF\hy Editor k"onnten Sie in Ihre Textdateien unbeabsichtigt unsichtbare +Steuerzeichen (}\texttt{U+0080}\textsf{ bis }\texttt{U+009F}\textsf{) +kopieren, die die Fehlermeldung}\hspace{.1em}{\small +\texttt{ not set up for use with LaTeX }}\hspace{.125em}\textsf{hervorrufen.} \newpage @@ -2252,7 +2490,7 @@ defaultm"a\hyss ig \verb|\bfseries| ausf"uhrt (\textbf{fett}). Die Seiten, von denen Definitionen herstammen, sind in der Auf"|listung von Seitenzahlen nicht hervorgehoben. Eine Hervorhebung einzelner Seitenzahlen sieht -auch \BibArts\ 2.5 nie vor. +auch \BibArts\ 2.6 nie vor. F"ur Abk"urzungen wie \printonlyabk{u.\,a.}, die Allgemeingut sind und deshalb vielleicht nicht ins Abk"urzungsverzeichnis sollen, kann @@ -2596,7 +2834,7 @@ von mehreren Zeitschriftennummern enthalten ist. Dies gilt "aquivalent f"ur \verb+|+\ko\textit{Bandangaben}\ko\verb+|+, die besonders nach dem letzten Pflichtargument von -v- oder k\fhy Befehlen stehen d"urfen (vgl.\ oben S.\,\pageref{Reinhard}): +v\hy\ oder k\fhy Befehlen stehen d"urfen (vgl.\ oben S.\,\pageref{Reinhard}): \vspace{-1ex} {\small @@ -2646,7 +2884,7 @@ mittels \verb|\renewcommand{\gpername}{, Heft }| ver"andern {\renewcommand{\gpername}{, Heft }\per{ZfG.}_5_.} \vspace{.9ex}\noindent -Falls \BibArts\ nach v\fhy, k- oder per\hy Befehlen im Eintrag zwischen den +Falls \BibArts\ nach v\fhy, k\hy\ oder per\hy Befehlen im Eintrag zwischen den \textit{senkrechten\pdfko{.5}\ Strichen} bzw\ko.\ zwischen den \textit{underscores} Singular und Plural nicht richtig erkennt, l"asst sich mit \verb|\basingular| bzw\ko.\ \verb|\baplural| \textit{am Ende} @@ -2693,7 +2931,7 @@ Falls Sie zwischen \hspace{.25em}{\footnotesize\verb+|+...\verb+|+} \hspace{.325em}und \hspace{.325em}{\footnotesize\verb+_+...\verb+_+} \hspace{.275em}unbeabsichtigt wechseln (vgl.\ Anm.\,\ref{Wechsel}), erhalten Sie keine Warnung (die Zahlen werden im selben Speicher -hinterlegt). \BibArts\ macht auch hier nur die oben +hinterlegt). \BibArts\ macht nur die oben S.\,\pageref{before} und \pageref{pervol} beschrieben Fehlermeldungen. \vspace{1ex}\noindent @@ -3435,7 +3673,7 @@ und sonst, wie es der gew"ahlte Trennsatz f"ur Scharf\fhy S vorsieht (meist -\ss \verb|\oldhyss| f"ur die alte deutsche Rechtschreibung trennt dagegen immer s-s. Verwendet wird meist \verb|\hyss|. \label{hyss} Es f"uhrt mit \verb|german|\hy Trennung \verb|\oldhyss| aus, sonst \verb|\newhyss|. -Dieses \verb|\newhyss| ist wichtig, weil \BibArts\ Nachnamen in v- und k\fhy Befehlen +Dieses \verb|\newhyss| ist wichtig, weil \BibArts\ Nachnamen in v\hy\ und k\fhy Befehlen defaultm"a\hyss ig in \textsc{small caps} setzt, in dem `\ss' nicht existiert, sondern \textsc{\ss} gedruckt wird. Eine Trennung \hspace{.1em}\verb|außer| \hspace{.1em}$\Rightarrow$ \hspace{.1em}\textsc{außer}\hspace{.1em} f"ur ein `Scharf\fhy S zwischen Vokalen @@ -3730,7 +3968,7 @@ w"urde in beiden F"allen {\small\verb|\printvkc|} korrekt mit \textit{einem} Pun \vspace{1.5ex}\noindent -Auch die Nachnamen\hy Argumente sowie die Stern\hy Argumente von v- und k\fhy Befehlen +Auch die Nachnamen\hy Argumente sowie die Stern\hy Argumente von v\hy\ und k\fhy Befehlen werden daraufhin durchsucht, ob ein Punkt am Ende steht. Damit ist m"oglich, \verb|\bapoint| in die Definition des Separators \verb|\ntsep| aufzunehmen, ohne am Ende von abgek"urzten Namen immer \verb|\bahasdot| tippen zu m"ussen: @@ -3781,7 +4019,7 @@ Die Stellen dieser\hspace{.1em} \textit{automatischen Korrekturen}\hspace{.1em} macht \verb|\showbacorr| sichtbar. \vspace{1ex}\noindent -Da v-, k-, per- und arq\hy Befehle am Kopf stets +Da v\fhy, k\fhy, per- und arq\hy Befehle am Kopf stets in aufrechte Schrift umschalten, ist \textit{in schr"aggestelltem Umfeld} ggf.\ eine Korrektur n"otig. Au\hyss er direkt nach Leerzeichen f"uhrt \BibArts\ diese \textbf{Kopf"|korrektur} eigenst"andig @@ -3823,7 +4061,7 @@ Kopf"|korrektur ausschalten. \hspace{.05em}durchgef"uhrt. Speziell innerhalb von Kurzzitaten stellt \verb|\kxxemph| \hspace{.05em}die Schrift des Kurztitels ein:\footnote{Seit \BibArts\ 2.5 w"are zudem \hspace{.1em}\texttt{\bs textit\{\bs ktit\{Soziale Systeme\}}\underline{\texttt{\}}} \hspace{.15em}erlaubt; -nun d"urfen Sie \texttt{\bs ktit\{}\fabra{...}\underline{\texttt{\}}} +nun d"urfen Sie \texttt{\bs ktit\{}\fabra{...}\texttt{\}} \hspace{.05em}einklammern. Im v\fhy Argument sollte nach \hspace{.1em}\underline{\texttt{\}}} \hspace{.15em}aber stets weiterer Text stehen!} @@ -4011,7 +4249,7 @@ gedruckt. Korrekt ist Doch k"onnen Sie mit \hspace{-.05em} \verb|\ifbashortcite|\hspace{.4em}\verb|{|\textit{Text k\fhy Befehl}\hspace{.2em}\verb|}|\hspace{.4em}% \verb|{|\textit{Text v\fhy Befehl}\hspace{.2em}\verb|}|\hspace{.4em} -im Argument von \verb|\ntsep| weiterhin Textunterschiede f"ur k- und v\fhy Befehle festlegen.\footnote{\label{ntsepC}\texttt{% +im Argument von \verb|\ntsep| weiterhin Textunterschiede f"ur k\hy\ und v\fhy Befehle festlegen.\footnote{\label{ntsepC}\texttt{% \bs renewcommand}\hskip 1pt plus 2pt\texttt{\{\bs ntsep\}}\hskip 1pt plus 2pt\texttt{\{\bs ifbashortcite\{:\bs hskip0pt plus 0pt\}\{: \}\bs bacorr\}} druckt im v\hy Befehl nach `\kern.025em:' \textit{ein Leerzeichen} (im k\fhy Befehl nicht $-$ und korrigiert \textit{nur dort}).} @@ -4022,8 +4260,8 @@ Solche \textbf{if\hy Befehle} haben zwei Argumente; \BibArts\ setzt das erste bei Ja und das zweite bei Nein um (das jeweils unzutreffende Argument wird ignoriert): \vspace{.875ex}{\small\noindent -\verb| \ifbashortcite | \verb|{|\textit{falls k-Befehl}\verb|}| \verb|{|\textit{sonst (falls v-, per- oder arq-Befehl)}\verb|}| \\ -\verb| \ifbaperiodical | \verb|{|\textit{falls per-Befehl}\verb|}| \verb|{|\textit{sonst (falls v-, k- oder arq-Befehl)}\verb|}| \\ +\verb| \ifbashortcite | \verb|{|\textit{falls k\fhy Befehl}\verb|}| \verb|{|\textit{sonst (falls v\fhy, per- oder arq-Befehl)}\verb|}| \\ +\verb| \ifbaperiodical | \verb|{|\textit{falls per-Befehl}\verb|}| \verb|{|\textit{sonst (falls v\fhy, k\hy\ oder arq-Befehl)}\verb|}| \\ \verb| \ifbaprinthints | \verb|{|\textit{unter Voreinstellung}\verb|}| \verb|{|\textit{falls }\verb|\notprinthints|\textit{ gilt}\verb|}| \\ \verb| \ifbaibidem | \verb|{|\textit{falls }\textsc{ebd.}\textit{ (nach Ausdruck von }\textsc{ebd.}\textit{ bereit)}\verb|}| \verb|{|\textit{sonst}\verb|}| \\ \verb| \ifbahaspervol | \verb|{|\textit{hat }\verb+|n|+\textit{ oder }\verb+_n_+\textit{ (ab }\verb|\gisonfolioname|\textit{ bereit)}\verb|}| \verb|{|\textit{sonst}\verb|}| \\ @@ -4437,7 +4675,7 @@ zu \hspace{.35em}\verb|{\bastrut\ \bacorr(}| \hspace{.4em}bzw\ko.\ \hspace{.35em \\ \hspace*{1em} Die lokale Definition von \verb|\nsep| reist \textit{auch} mit dem Eintrag in die Liste! \\[1ex] \verb|\ntsep => {: \bacorr} | \hfill (siehe S.\,\pageref{ntsepA} und S.\,\pageref{ntsepB} samt Anm.\,\ref{ntsepC}) -\\ \hspace*{1em} Vor dem letzten Hauptargument (`Rest' oder Kurztitel) von v- und k\fhy Befehlen +\\ \hspace*{1em} Vor dem letzten Hauptargument (`Rest' oder Kurztitel) von v\hy\ und k\fhy Befehlen \\ \hspace*{1em} Alternativen: \verb|{, }| oder \verb|{\bapoint\ }| \\[1ex] \verb|\pagefolioshortsep => {\bacorr : } | @@ -4552,9 +4790,19 @@ kann stets sowohl `nichts' als auch ein Punkt stehen; hier die Voreinstellungen: \\ \hspace*{1em} Klammern um das zweite Argument von \verb|\fillgrr|, \verb|\fillprr| bzw\ko.\ \hspace{-.075em}\verb|\fillsrr|; \\ \hspace*{1em} lokale Definitionen von \verb|\xrrlistopen| und \verb|\xrrlistclose| reisen in die Listen +\noindent +\verb|\abraopen => {\protect\pabrao}| \hfill (vgl.\ S.\,\pageref{babbrack}) +\\[-.1ex] \hspace*{7em} \verb|\pabrao => {[}| +\\ +\verb|\abraclose => {\protect\pabrac}| +\\[-.1ex] \hspace*{7em} \verb|\pabrac => {]}| +\\ \hspace*{1em} Neu in 2.6: Ausgedruckte Klammern um das Argument von \verb|\abra| und \verb|\fabra|; +\\ \hspace*{1em} zudem ist z.\,B. m"oglich:\verb| `\abraopen Te\abraclose r\-ra' => |`\abraopen Te\abraclose r\-ra' oder +\\ \hspace*{1em} \verb|\banbrack{.} =>| \ \banbrack{.} \ bzw.\ \verb|\fbanbrack{.} =>| \ \fbanbrack{.} \ (\textit{n}ormalgro\hyss e Klammern) \end{small} + \newpage \section{Sprachabh"angige Separatoren (\kern-.02em\textit{captions})}\label{Sect12}\label{SprachSep} @@ -4622,7 +4870,7 @@ eingesetzt, damit auch in \texttt{OT1}\hy Kodierung richtig getrennt wird. \verb|\ganonymousname => {[Anonym]}| \\[-.8ex] \verb|\eanonymousname => {[Anonymous]}| \\[-.8ex] \verb|\fanonymousname => {[Anonyme]}| \\[-.2ex] -Kein Autor in v- oder k-Befehlen eingetippt: \verb|\kli{}{T}. =>| \printonlykli{}{T}. +Kein Autor in v\hy\ oder k\fhy Befehlen eingetippt: \verb|\kli{}{T}. =>| \printonlykli{}{T}. \\[.8ex]% \verb|\geditorname => {[\kern 0.04em Hrsg.]\kern 0.02em}| \\[-.8ex] \verb|\eeditorname => {(\kern -0.03em ed.\kern -0.06em)\kern 0.02em}| \\[-.8ex] @@ -4638,27 +4886,27 @@ Text f"ur Befehl \verb|\editors| (mehrere Herausgeber); mit \verb|\bacaptionseng \verb|\eidemname => {idem}| \\[-.8ex] \verb|\fidemname => {le m\^e\-me}| \\[-.2ex] Derselbe Autor wird direkt hintereinander mit verschiedenen Werken zitiert: \\[-.2ex] -\verb|[m]| direkt nach v- und k-Befehlen: \verb|\kli[m]{N}{T}. =>| \printonlykli[m]{N}{T}. +\verb|[m]| direkt nach v\hy\ und k\fhy Befehlen: \verb|\kli[m]{N}{T}. =>| \printonlykli[m]{N}{T}. \\[.8ex]% \verb|\geademname => {dies\kern -0.04em.\bahasdot} % 2.2: \bahasdot neu| \\[-.8ex] \verb|\eeademname => {eadem}| \\[-.8ex] \verb|\feademname => {la m\^e\-me}| \\[-.2ex] -\verb|[f]| direkt nach v- und k-Befehlen: \verb|\kli[f]{N}{T}. =>| \printonlykli[f]{N}{T}. +\verb|[f]| direkt nach v\hy\ und k\fhy Befehlen: \verb|\kli[f]{N}{T}. =>| \printonlykli[f]{N}{T}. \\[.8ex]% \verb|\giidemname => {diesn\kern -0.07em.\bahasdot} % 2.2: \bahasdot neu| \\[-.8ex] \verb|\eiidemname => {iidem}| \\[-.8ex] \verb|\fiidemname => {les m\^e\-mes}| \\[-.2ex] -\verb|[p{}]| direkt nach v- und k-Befehlen: \verb|\kli[p{}]{N1}*{N2}{T}. =>| \printonlykli[p{}]{N1}*{N2}{T}. +\verb|[p{}]| direkt nach v\hy\ und k\fhy Befehlen: \verb|\kli[p{}]{N1}*{N2}{T}. =>| \printonlykli[p{}]{N1}*{N2}{T}. \\[.8ex]% \verb|\gvolname => {, Bd.\,}| \\[-.8ex] \verb|\evolname => {, vol.\,}| \\[-.8ex] \verb|\fvolname => {, vol.\,}| \\[-.2ex] -Bandangabe von v-, k-, arq- und per-Befehlen: \verb+\per{ZfG.}|2|. =>+ \per{ZfG.}|2|. +Bandangabe von v\fhy, k\fhy, arq- und per\hy Befehlen: \verb+\per{ZfG.}|2|. =>+ \per{ZfG.}|2|. \\[.8ex]% \verb|\gvolpname => {, Bde.\,}| \\[-.8ex] \verb|\evolpname => {, vols.\,}| \\[-.8ex] \verb|\fvolpname => {, vol.\,}| \\[-.2ex] -B"ande von v-, k-, arq- und per-Befehlen:\footnote{\BibArts\ ermittelt +B"ande von v\fhy, k\fhy, arq- und per\hy Befehlen:\footnote{\BibArts\ ermittelt einen vorliegenden Plural selbst"andig, indem es das \texttt{|}\kern-.08em\textit{Argument}\kern-.04em\texttt{|} nach \texttt{-}, [Komma], \texttt{\bs hy}, \texttt{\bs fhy}, \texttt{\bs f}, \texttt{\bs ff}, \texttt{\bs sq}, und \texttt{\bs sqq} durchsucht, @@ -4670,14 +4918,14 @@ B"ande von v-, k-, arq- und per-Befehlen:\footnote{\BibArts\ ermittelt \verb|\gpername => {\ifbaibidem{, Nr.\,}{\pernosep}}| \\[-.8ex] \verb|\epername => {\ifbaibidem{, no.\,}{\pernosep}}| \\[-.8ex] \verb|\fpername => {\ifbaibidem{, n\fup{o}\,}{\pernosep}}| \\[-.2ex] -Heftangaben im Singular (mit/ohne \textsc{ebd.}) in v-, k-, arq- und per-Befehlen.\footnote{ +Heftangaben im Singular (mit/ohne \textsc{ebd.}) in v\fhy, k\fhy, arq- und per\hy Befehlen.\footnote{ \texttt{\bs per\{ZfG.\}\_5\_ und \bs per\{ZfG.\}\_6\_ \ \ \ \ => } \per{ZfG.}_5_ und \per{ZfG.}_6_.} \\[.8ex]% \verb|\gperpname => {\ifbaibidem{, Nr.\,}{\pernosep}}| \\[-.8ex] \verb|\eperpname => {\ifbaibidem{, no.\,}{\pernosep}}| \\[-.8ex] \verb|\fperpname => {\ifbaibidem{, n\fup{os}\,}{\pernosep}}| \\[-.2ex] -Heftangaben im Plural (mit/ohne \textsc{ebd.}) in v-, k-, arq- und per-Befehlen. \\[-.2ex] +Heftangaben im Plural (mit/ohne \textsc{ebd.}) in v\fhy, k\fhy, arq- und per\hy Befehlen. \\[-.2ex] Beispiel unter \verb|\bacaptionsfrench| in der Fu"snote.\footnote{\bacaptionsfrench \texttt{\bs per\{Jour\}\_4-5\_ et \bs per\{Jour\}\_6-7\_ \ => } \printonlyper{Jour}_4-5_ et \printonlyper{Jour}_6-7_.} @@ -4685,7 +4933,7 @@ Beispiel unter \verb|\bacaptionsfrench| in der Fu"snote.\footnote{\bacaptionsfre \verb|\gisonfolioname => {, Bl.\,}| \\[-.8ex] \verb|\eisonfolioname => {, folio\nobreak \ }| \\[-.8ex] \verb|\fisonfolioname => {, folio\nobreak \ }| \\[-.2ex] -Blattangabe von v-, k-, arq- und per-Befehlen: \verb|\arq{}{PRO}(2). =>| \printonlyarq{}{PRO}(2). +Blattangabe von v\fhy, k\fhy, arq- und per\hy Befehlen: \verb|\arq{}{PRO}(2). =>| \printonlyarq{}{PRO}(2). \\[.8ex]% \verb|\gisonfoliopname => {, Bl.\,}| \\[-.8ex] \verb|\eisonfoliopname => {, folii\nobreak \ }| \\[-.8ex] @@ -4695,7 +4943,7 @@ Sichtbar in {\bacaptionsenglish\verb|\bacaptionsenglish| \verb|\arq{}{PRO}(2-3). \verb|\gisonxfolioname => {, dort: Bl.\,}| \\[-.8ex] \verb|\eisonxfolioname => {, there: Folio\nobreak \ }| \\[-.8ex] \verb|\fisonxfolioname => {, l\`a: Folio\nobreak \ }| \\[-.2ex] -\verb|*(|\textit{Blatt}\verb|)| von v-, k-, arq- und per-Befehlen: \verb|\arq{}{PRO}*(2). =>| \printonlyarq{}{PRO}*(2). +\verb|*(|\textit{Blatt}\verb|)| von v\fhy, k\fhy, arq- und per\hy Befehlen: \verb|\arq{}{PRO}*(2). =>| \printonlyarq{}{PRO}*(2). \\[.8ex]% \verb|\gisonxfoliopname => {, dort: Bl.\,}| \\[-.8ex] \verb|\eisonxfoliopname => {, there: Folii\nobreak \ }| \\[-.8ex] @@ -4705,7 +4953,7 @@ Sichtbar in {\bacaptionsenglish\verb|\bacaptionsenglish| \verb|\arq{}{PRO}*(2-3) \verb|\gisonpagename => {, S.\,}| \\[-.8ex] \verb|\eisonpagename => {, p.\,}| \\[-.8ex] \verb|\fisonpagename => {, p.\,}| \\[-.2ex] -Seitenangabe von v-, k-, arq- und per-Befehlen: \verb|\kli{N}{T}[2]. =>| \printonlykli{N}{T}[2]. +Seitenangabe von v\fhy, k\fhy, arq- und per\hy Befehlen: \verb|\kli{N}{T}[2]. =>| \printonlykli{N}{T}[2]. \\[.8ex]% \verb|\gisonpagepname => {, S.\,}| \\[-.8ex] \verb|\eisonpagepname => {, pp.\,}| \\[-.8ex] @@ -4715,7 +4963,7 @@ Sichtbar in {\bacaptionsenglish\verb|\bacaptionsenglish| \verb|\kli{N}{T}[2-3]. \verb|\gisonxpagename => {, dort: S.\,}| \\[-.8ex] \verb|\eisonxpagename => {, there: p.\,}| \\[-.8ex] \verb|\fisonxpagename => {, l\`a: p.\,}| \\[-.2ex] -\verb|*[|\textit{Seite}\verb|]| von v-, k-, arq-, per-Befehlen: \verb|\kli{N}{T}*[2]. =>| \printonlykli{N}{T}*[2]. +\verb|*[|\textit{Seite}\verb|]| von v\fhy, k\fhy, arq\fhy, per\hy Befehlen: \verb|\kli{N}{T}*[2]. =>| \printonlykli{N}{T}*[2]. \\[.8ex]% \verb|\gisonxpagepname => {, dort: S.\,}| \\[-.8ex] \verb|\eisonxpagepname => {, there: pp.\,}| \\[-.8ex] @@ -4725,7 +4973,7 @@ Sichtbar in {\bacaptionsenglish\verb|\bacaptionsenglish| \verb|\kli{N}{T}*[2-3]. \verb|\gbibtitlename => {Quellen und Literatur}| \\[-.8ex] \verb|\ebibtitlename => {Bibliography}| \\[-.8ex] \verb|\fbibtitlename => {Bibliographie}| \\[-.2ex] -Titel des gesamten Belegapparats ("Uberschrift \BibArts-Anhang) \verb|\printbibtitle| +Titel des gesamten Belegapparats ("Uberschrift \BibArts\hy Anhang) \verb|\printbibtitle| \\[.8ex]% \verb|\gabktitlename => {Ab\-k\"ur\-zungen}| \\[-.8ex] \verb|\eabktitlename => {Abbreviations}| \\[-.8ex] @@ -4806,7 +5054,7 @@ Abk"urzung `mehrere folgende': \verb|\per{ZfG.}_2\ff_[3\sqq]. =>| \per{ZfG.}_2\f \hspace*{1cm} \verb|\erefvendname => {\nobreak \hskip 1pt plus 0pt\barefcorr]}| \\[-.8ex] \verb|\frefvbegname => {(}| \\[-.8ex] \hspace*{1cm} \verb|\frefvendname => {\barefcorr)}| \\[-.2ex] -Klammern k-Befehle unter \verb|\conferize|: \verb|\kli{Luhmann}{Soziale Systeme} =>| \\[-.5ex] +Klammern k\fhy Befehle unter \verb|\conferize|: \verb|\kli{Luhmann}{Soziale Systeme} =>| \\[-.5ex] \hspace*{1em}{\conferize \kli{Luhmann}{Soziale Systeme}} \ \ \texttt{\% Fu"snote im Kasten} \\[-.5ex] Die \textit{italics}\hy Korrektur \verb|\barefcorr| ist f"ur Verweise bes.\ auf \verb|{minipage}|\kern.025em\hy Fu"snoten. \\[.8ex]% @@ -4819,7 +5067,7 @@ Bezugswort im Querverweis des eben genannten \verb|\conferize|\hy Stils. \verb|\erefvpagname => {p.\,}| \\[-.8ex] \verb|\frefvpagname => {p.\,}| \\[-.2ex] Seitenabk"urzung im Querverweis des eben genannten \verb|\conferize|\hy Stils; und \\[-.5ex] -ebenso f"ur \BibArts-Querverweise: \verb|\baref{Müller} =>| \baref{Müller}, wozu auch \\[-.5ex] +ebenso f"ur \BibArts\hy Querverweise: \verb|\baref{Müller} =>| \baref{Müller}, wozu auch \\[-.5ex] die oben unter \verb|\grefvbegname| ... genannten Klammersymbole benutzt werden. \\[.8ex]% \verb|\grefverbname => {siehe}| \label{grefverbname} \\[-.8ex] @@ -4841,12 +5089,12 @@ ebenso f"ur \BibArts\hy Querverweise:\footnote{ \verb|\eerscheditionname => {\fupskip edition,}| \\[-.8ex] \verb|\ferscheditionname => {\fupskip \'edi\-tion,} %%| \texttt{Vgl. oben S. \pageref{fordinalf}.} \\[-.2ex] -Auf"|lage-Abk"urzung in \hspace{.2em}\verb|\ersch [4] {Paris}{1899} =>| \ersch [4] {Paris}{1899} +Auf"|lage\hy Abk"urzung in \hspace{.2em}\verb|\ersch [4] {Paris}{1899} =>| \ersch [4] {Paris}{1899} \\[.8ex]% \verb|\gerschvolumename => {Bd.,} \gerschvolumepname => {Bde.,}| \\[-.8ex] \verb|\eerschvolumename => {vol.,} \eerschvolumepname => {vols.,}| \\[-.8ex] \verb|\ferschvolumename => {vol.,} \ferschvolumepname => {vol.,}| \\[-.2ex] -Band-Abk"urzung in \hspace{.2em}\verb+\ersch |3| {Paris}{1899} =>+ \ersch |3| {Paris}{1899} +Band\hy Abk"urzung in \hspace{.2em}\verb+\ersch |3| {Paris}{1899} =>+ \ersch |3| {Paris}{1899} \\[.8ex]% \verb|\gerschnohousename => {\oO,}| {\footnotesize\verb|=> {o.\kern 0.1em O\kern -0.08em.\bahasdot}|}\\[-.8ex] \verb|\eerschnohousename => {n.\kern 0.15em p.,} | \ (`no place') \\[-.8ex] @@ -4954,7 +5202,7 @@ und \texttt{\bs ersch} nur ganz ans Ende des letzten Arguments von v\fhy Befehle \vspace{1ex} \begin{tabular}{rrrc}% - \bf Basis & \verb|= |\bf addto-Teil & \verb|+ |\bf printonly-Teil & \ \ \ \bf Zusatzf"ullung \\ \hline + \bf Basis & \verb|= |\bf addto\hy Teil & \verb|+ |\bf printonly\hy Teil & \ \ \ \bf Zusatzf"ullung \\ \hline & & & \\ \verb|\vli| & \verb|= \addtovli| & \verb|+ \printonlyvli| & \\ \verb|\vqu| & \verb|= \addtovqu| & \verb|+ \printonlyvqu| & \\ @@ -5016,8 +5264,8 @@ Bei abgek"urzten Zeitschriften f"ullt \verb|\abkper| die \verb|\abk|\hy\ \textit \verb|\arqlistemph| & \verb|{\arqemph\relax\normalsize}| & alles (vgl.\ unten) \\[.25ex] \verb|\peremph| & \verb|{\normalfont\scshape}| & \verb|{\upshape\|\abra{...}\verb|}| \\[.25ex] \verb|\perlistemph| & \verb|{\peremph}| & alles (siehe\ unten) \\[.25ex] -\verb|\xrrlistemph| & \verb|{}| \ (Register-Stichworte) & alles (S.\,\pageref{xrr})\\[.25ex] -\verb|\balistnumemph| & \verb|{\sffamily}| \ (Index-Zahlen) & \verb|{}| (auto-up: S.\,\pageref{listnum}) \\ +\verb|\xrrlistemph| & \verb|{}| \ (Register\hy Stichworte) & alles (S.\,\pageref{xrr})\\[.25ex] +\verb|\balistnumemph| & \verb|{\sffamily}| \ (Index\hy Zahlen) & \verb|{}| (auto\hy up: S.\,\pageref{listnum}) \\ \end{tabular}\label{arqemph2}% \vspace{3ex}\noindent @@ -5064,89 +5312,99 @@ F"ur listemph\hy Befehle gilt "ubertragbar: \newpage \section{\BibArts\kern .1em\hy Ein\fhy\ko/\ko\ko Ausschalter}\label{Sect15} -\vspace{1ex}\ +%\vspace{1ex}\ \hspace*{7.5mm} \begin{tabular}{ll} \bf Voreinstellung "andern\hspace{1cm} & \bf $\sim$ wiederherstellen\hspace{1.5em}(1/2) \\ \hline - \multicolumn{2}{l}{} \\[1ex] + \multicolumn{2}{l}{} \\[.5ex] %% \verb| \affixhints| & \verb|\notaffixhints| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Vor [L] und [Q] keinen Zeilenumbruch erlauben (\ko seit Version 2.2)}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Vor [L] und [Q] keinen Zeilenumbruch erlauben (\ko seit Version 2.2)}} \\[2.5ex] %% \verb|\notannouncektit| & \verb| \announcektit| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily v\hy Befehl druckt den sp"ater verwendeten Kurztitel nicht aus}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily v\hy Befehl druckt den sp"ater verwendeten Kurztitel nicht aus}} \\[2.5ex] %% \verb|\notbafrontcorr| & \verb| \bafrontcorr| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily {\normalfont\footnotesize\textit{Italics}\hy}Korrektur am Kopf von \BibArts\hy Befehlen unterlassen}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily {\normalfont\footnotesize\textit{Italics}\hy}Korrektur am Kopf von \BibArts\hy Befehlen unterlassen}} \\[2.5ex] %% \verb| \baonecolitemdefs| & \verb|\notbaitemdefs| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily \texttt{\bs print}\fabra{...}\texttt{list}\hy Befehle bekommen item\hy Abst"ande wie \texttt{\bs printvli}}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily \texttt{\bs print}\fabra{...}\texttt{list}\hy Befehle bekommen item\hy Abst"ande wie \texttt{\bs printvli}}} \\[2.5ex] %% \verb| \batwocolitemdefs| & \verb|\notbaitemdefs| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily \texttt{\bs print}\fabra{...}\texttt{list}\hy Befehle bekommen item\hy Abst"ande wie \texttt{\bs printvkc}}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily \texttt{\bs print}\fabra{...}\texttt{list}\hy Befehle bekommen item\hy Abst"ande wie \texttt{\bs printvkc}}} \\[2.5ex] %% \verb| \conferize| & \verb|\notconferize| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Verweis vom k\hy Befehl auf Stelle des zugeh"origen v\hy Befehls}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Verweis vom k\hy Befehl auf Stelle des zugeh"origen v\hy Befehls}} \\[2.5ex] %% \verb| \exponenteditionnumber| & \verb|\notexponenteditionnumber| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily{\normalfont\footnotesize\texttt{\bs ersch}}\hy Befehl druckt Nummer der {\normalfont\footnotesize\texttt{[}}{\normalfont\footnotesize\textit{Auf"|lage}}{\normalfont\footnotesize\texttt{]}} als Exponent}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily{\normalfont\footnotesize\texttt{\bs ersch}}\hy Befehl druckt Nummer der {\normalfont\footnotesize\texttt{[}}{\normalfont\footnotesize\textit{Auf"|lage}}{\normalfont\footnotesize\texttt{]}} als Exponent}} \\[2.5ex] %% \verb|\nothyko| & \verb| \hyko| \\ \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Automatisches {\normalfont\footnotesize\textit{kerning}} nach {\normalfont\footnotesize\texttt{\bs hy}} - und {\normalfont\footnotesize\texttt{\bs fhy}} ausschalten: \hyko\fhy Y\ \nothyko\fhy Y}} \\[3ex] + und {\normalfont\footnotesize\texttt{\bs fhy}} ausschalten: \hyko\fhy Y\ \nothyko\fhy Y}} \\[2.5ex] %% \verb|\notibidemize| & \verb| \ibidemize| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Automatisches {\normalfont\footnotesize\textsc{ebd.}}\hy Setzen ausschalten}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Automatisches {\normalfont\footnotesize\textsc{ebd.}}\hy Setzen ausschalten}}\\[2.5ex] %% \verb|\notktitaddtok| & \verb| \ktitaddtok| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily{\normalfont\footnotesize\texttt{\bs ktit}} im v\fhy Befehl erzeugt keinen \hspace{-.175em}{\normalfont\footnotesize\texttt{.\ko vkc}}\hy Eintrag wie ein k\fhy Befehl}} \\[3ex] - %% + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily{\normalfont\footnotesize\texttt{\bs ktit}} im v\fhy Befehl erzeugt keinen \hspace{-.175em}{\normalfont\footnotesize\texttt{.\ko vkc}}\hy Eintrag wie ein k\fhy Befehl}} \\[2.5ex] + %% \verb|\notkurzaddtoarq| & \verb| \kurzaddtoarq| \\ \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily{\normalfont\footnotesize\texttt{\bs kurz}} (\kern-.075em {\normalfont\footnotesize\textit{Vorl"aufer}} von {\normalfont\footnotesize\texttt{\bs ktit}}) erzeugt keinen - \hspace{-.175em}{\normalfont\footnotesize\texttt{.arq}}\hy Eintrag}} \\%[3ex] + \hspace{-.175em}{\normalfont\footnotesize\texttt{.arq}}\hy Eintrag}}\\[2.5ex] + %% + \verb|\notnegcorrdefabk| & \verb| \negcorrdefabk| \\ + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Kein negativer Abstand nach Klammer\hy Auf in Abk"urzungen}} \\%[2.5ex] \end{tabular} \newpage \section*{\hspace{2em}\BibArts\kern .1em\hy Ein\fhy\ko/\ko\ko Ausschalter} -\vspace{1ex}\ +%\vspace{1ex}\ \hspace*{7.5mm} \begin{tabular}{ll} \bf Voreinstellung "andern\hspace{1cm} & \bf $\sim$ wiederherstellen\hspace{1.5em}\hfill (2/2) \\ \hline - \multicolumn{2}{l}{} \\[1ex] - %% - \verb|\notnegcorrdefabk| & \verb| \negcorrdefabk| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Kein negativer Abstand nach Klammer-Auf in Abk"urzungen}} \\[3ex] + \multicolumn{2}{l}{} \\[.5ex] + %% + \verb|\notnewhyko| & \verb| \newhyko| \\ + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily 2.6\hy Erweiterungen im + {\normalfont\footnotesize\textit{kerning}} von {\normalfont\footnotesize\texttt{\bs hy}} + und {\normalfont\footnotesize\texttt{\bs fhy}} ablehnen: \newhyko\fhy \textcommabelow Y\ \notnewhyko\fhy \textcommabelow Y}} \\[2.5ex] %% + \verb|\notnewabra| & \verb| \newabra| \\ + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily 2.6\hy Erweiterungen + von {\normalfont\footnotesize\texttt{\bs abra}} + und {\normalfont\footnotesize\texttt{\bs fabra}} ablehnen: \newabra\abra{\frqq}\ \notnewabra\abra{\frqq}}} \\[2.5ex] + %% \verb|\notprinthints| & \verb| \printhints| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily k\hy Befehle sollen [L]- bzw\ko.\ [Q]\hy Hinweise nicht drucken}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily k\hy Befehle sollen [L]- bzw\ko.\ [Q]\hy Hinweise nicht drucken}} \\[2.5ex] %% \verb|\notprintlongpagefolio| & \verb| \printlongpagefolio| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Statt `S.' bei {\normalfont\footnotesize\texttt{[num]}} bzw\ko.\ `Bl.' bei {\normalfont\footnotesize\texttt{(num)}} einen Doppelpunkt drucken}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Statt `S.' bei {\normalfont\footnotesize\texttt{[num]}} bzw\ko.\ `Bl.' bei {\normalfont\footnotesize\texttt{(num)}} einen Doppelpunkt drucken}} \\[2.5ex] %% \verb|\notprintlongpervol| & \verb| \printlongpervol| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily `Bd.' bei {\normalfont\footnotesize\texttt{\string|n\string|}} bzw\ko.\ `Nr.' bei {\normalfont\footnotesize\texttt{\string_n\string_}} nicht drucken}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily `Bd.' bei {\normalfont\footnotesize\texttt{\string|n\string|}} bzw\ko.\ `Nr.' bei {\normalfont\footnotesize\texttt{\string_n\string_}} nicht drucken}} \\[2.5ex] %% \verb| \bibsortheads| & \verb|\notbibsortheads| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Listen: Initialen vor Eintr"agen mit neuem Anfangsbuchstaben}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Listen: Initialen vor Eintr"agen mit neuem Anfangsbuchstaben}} \\[2.5ex] %% \verb| \bibsortspaces| & \verb|\notbibsortspaces| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Listen: Abstand zw\ko.\ Eintr"agen mit versch.\ Anfangsbuchstaben}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Listen: Abstand zw\ko.\ Eintr"agen mit versch.\ Anfangsbuchstaben}} \\[2.5ex] %% \verb| \showbacorr| & \verb|\notshowbacorr| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Stelle mit \BibArts{\normalfont\footnotesize\hy\ko\textit{italics}\hy}Korrektur im Ausdruck markieren}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Stelle mit \BibArts{\normalfont\footnotesize\hy\ko\textit{italics}\hy}Korrektur im Ausdruck markieren}} \\[2.5ex] %% \verb| \showbamem| & \verb|\notshowbamem| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily \BibArts\hy Zwischenspeicher auf Bildschirm drucken (\ko{\normalfont\footnotesize\textsc{ebd.}}\hy Setzung)}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily \BibArts\hy Zwischenspeicher auf Bildschirm drucken (\ko{\normalfont\footnotesize\textsc{ebd.}}\hy Setzung)}} \\[2.5ex] %% \verb|\notwarnsamename| & \verb| \warnsamename| \\ - \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Bildschirmwarnung bei Wiederholung von Autornachnamen aus}} \\[3ex] + \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily Bildschirmwarnung bei Wiederholung von Autornachnamen aus}} \\[2.5ex] %% \verb| \writeidemwarnings| & \verb|\notwriteidemwarnings| \\ \multicolumn{2}{l}{\mynwarrow {\footnotesize\sffamily{\normalfont\footnotesize\textsc{ders.}}\hy Setzung im Ausdruck testhalber mit {\small$\bullet\heartsuit\nabla\spadesuit\clubsuit$} markieren}} \\ @@ -5585,7 +5843,7 @@ u.\,a.\ MinGW und tippte \hspace{.5em}\texttt{gcc -c bibsort.c -o bibsort.o -O2} \hspace{.5em}und \hspace{.5em}\texttt{gcc bibsort.o -o bibsort.exe} \hspace{.5em}sowie \hspace{.5em}\texttt{strip bibsort.exe} \hspace{.5em}in die -Eingabeauf"|forderung von Windows~10 ein, um f"ur \BibArts\ 2.5 +Eingabeauf"|forderung von Windows~10 ein, um f"ur \BibArts\ 2.6 eine ausf"uhrbare Bin"ardatei zu erzeugen.} \BibArts\ kommt heute (Version 2.x) ohne \textsc{MakeIndex} aus. @@ -5656,8 +5914,8 @@ Nur \hspace{.1em}\verb|bibsort| \hspace{.1em}in die Eingabeauf"|forderung getipp \catcode\grave@ba\|=\active\makeatother \def|{\hspace{-.25em}\hbox to 1em{\hfill$\sim$\hfill}\hspace{-.25em}}% \begin{verbatim} - %%> This is bibsort 2.5 (for help: bibsort -?) - %% bibsort 2.5 is part of BibArts 2.5 (C) Timo Baumann 2022b. + %%> This is bibsort 2.6 (for help: bibsort -?) + %% bibsort 2.6 is part of BibArts 2.6 (C) Timo Baumann 2023. %% I read a LaTeX .aux file (follow \@input), and I write my output in files %% .vli Literature .vqu Published sources .grr Geographic index %% .vkc Short titles .arq Unpublished sources .prr Person index @@ -5709,21 +5967,20 @@ in den vli- und vqu\hy Listen wurde schon erkl"art. Vgl.\ \vspace{.75ex} \verb|-x| ist f"ur Anwender, bei denen ein aktives Anf"uhrungszeichen etwas Anderes bedeutet -als in \verb|german|, \verb|ngerman|, \verb|germanb| oder \verb|ngermanb| -(\verb|"a|\,$\Rightarrow$\,"a). Insbesondere wird \verb|"a| zusammen mit \verb|-g1| nicht mehr als \verb|ae| +als mit \verb|german| oder \verb|ngerman| +(\verb|"a|\,$\Rightarrow$\,"a). Insbesondere \verb|"a| etc.\ wird dann zusammen mit \verb|-g1| nicht mehr als \verb|ae| etc.\ einsortiert.\footnote{\label{original}Mit der Option \texttt{-x} setzt \texttt{bibsort} zudem -nicht (wie sonst) \texttt{\bs bagermanTeX} oder \texttt{\bs baoriginalTeX} in einer \textit{if}\hy Konstruktion -in die erzeugten Dateien, um eine "Anderung des \textit{catcodes} ggf.\ -zu reproduzieren. $-$ \label{dqakt} Im babel\hy Paket "andert sich der \textit{catcode} von Zeichen offenbar nie. -\texttt{bibsort} kann Ihre Nutzung von \texttt{\bs originalTeX} auf den Listen nur reproduzieren, -falls \texttt{german.sty} oder \texttt{ngerman.sty} verwendet werden (dort "andert \texttt{\bs originalTeX} -den \textit{catcode} des Anf"uhrungszeichens). Vgl.\ oben S.\,\pageref{bagermanTeX} samt Anm.\,\ref{bagermanTeX}. -$-$ Trotzdem muss heute unter babel \textbf{weder} \texttt{bibsort} mit der Option \texttt{-x} gestartet -\textbf{noch} \texttt{\bs baoriginalTeX} mit -\texttt{\bs renewcommand} ausgeschaltet werden: Falls babel geladen ist, f"uhrt das \texttt{\bs baoriginalTeX} -seit \BibArts~2.2 den Befehl \texttt{\bs originalTeX} nicht aus -(babel\hy french meldete unter \BibArts~2.1 ohne den \texttt{\bs renewcommand}\hy Befehl -irref"uhrend, es sei ein\hspace{.2em} \texttt{Incomplete} \texttt{\bs ifx}~...\hspace{.2em} vorhanden).} +nicht (wie sonst) \texttt{\bs baoriginalTeX} oder \texttt{\bs bagermanTeX} in einer \textit{if}\hy Konstruktion +in die erzeugten Dateien, um eine "Anderung des \textit{catcodes} von \texttt{\dq} ggf.\ +zu reproduzieren. $-$ \label{dqakt} Im \textsc{babel}\hy Paket "andern \texttt{\bs shorthandoff\{\dq\}} +und \texttt{\bs shorthandon\{\dq\}} den \textit{catcode} des \texttt{\dq}\kern.01em, aber \texttt{\bs originalTeX} offenbar nicht. +\BibArts\ reagiert seit Version 2.6 auf Ihre Nutzung von \texttt{\bs shorthandon\{\dq\}} und +\texttt{\bs shorthandoff\{\dq\}} unter \textsc{babel}; seither sind \texttt{\bs baoriginalTeX} und \texttt{\bs bagermanTeX} angepasst. +\BibArts\ kann eine Nutzung von \texttt{\bs originalTeX} unter \textsc{babel} auf den Listen also \textit{nicht} reproduzieren! +Dies ist wichtig f"ur \textsc{babel}\hy german, \fhy ngerman, \fhy swissgerman, \fhy nswissgerman, \fhy austrian und \fhy naustrian. +Mit \texttt{german.sty} und \texttt{ngerman.sty} m"ussen Sie aber weiterhin umgekehrt \texttt{\bs originalTeX} und +\texttt{\bs germanTeX} bzw\ko.\ \hspace{-.1em}\texttt{\bs ngermanTeX} verwenden, oder sie definieren +um wie oben S.\,\pageref{bagermanTeX}, Anm.\,\ref{bagermanTeX}.} \vspace{.75ex} Weitere Optionen wie \verb|-l|\,, \verb|-i=j| und \verb|-p| werden unten ab Seite~\pageref{plit} erkl"art. @@ -5733,25 +5990,18 @@ Weitere Optionen wie \verb|-l|\,, \verb|-i=j| und \verb|-p| werden unten ab Seit Seit Version 2.3 stellt \verb|bibsort| die Optionen \verb|-utf8| \hspace{.075em}und \verb|-e| \hspace{.075em}bereit: \vspace{.5ex} -\verb|-utf8| \hspace{.1em}bewirkt, dass UTF8\hy Zeichen analog zu \verb|utf8enc.dfu| v1.3c von \hspace{.05em}{\small 2022/06/07} -\hspace{.05em}(\kern-.05em\textit{ohne} \verb|\cyr|...\ und \verb|\CYR|...\hy Zeichen) sortiert werden. \texttt{bibsort} 2.5 kennt neu - \hspace{.1em}DŽ \texttt{\footnotesize [U+01C4]}, - \hspace{.1em}Dž \texttt{\footnotesize [U+01C5]}, - \hspace{.1em}dž \texttt{\footnotesize [U+01C6]}, - \hspace{.1em}LJ \texttt{\footnotesize [U+01C7]}, - \hspace{.1em}Lj \texttt{\footnotesize [U+01C8]}, - \hspace{.1em}lj \texttt{\footnotesize [U+01C9]}, - \hspace{.1em}NJ \texttt{\footnotesize [U+01CA]}, - \hspace{.1em}Nj \texttt{\footnotesize [U+01CB]}, - \hspace{.1em}nj \texttt{\footnotesize [U+01CC]}, - \hspace{.1em}〈 \texttt{\footnotesize [U+3008]} und - \hspace{.1em}〉 \texttt{\footnotesize [U+3009]}. - -Falls Sie UTF8\hy Zeichen verwenden, aber \verb|-utf8| \hspace{.075em}nicht gesetzt -haben, meldet \verb|bibsort| nur das letzte unbekannte Oktett aus Ihrem Text, also etwa:\footnote{Da UTF8\hy Zeichen jenseits Nr.\,127 -aus mehreren Oktetten bestehen, ist die im Beispiel angegebene Nummer \texttt{165} kein eindeutiger Hinweis darauf, auf welches UTF8\hy Zeichen -die Fehlermeldung zur"uckgeht. Es k"onnte sich dabei etwa um das zweite Oktett der Dublette \texttt{195-165} f"ur å (\texttt{U+00E5}) handeln, -aber vielleicht auch \texttt{194-165} f"ur ¥ (\texttt{U+00A5}), oder sonstwas. Oder ist es ASCII 165? Dann w"are vielleicht \v{e} gemeint (siehe \texttt{-t1}).} +\verb|-utf8| \hspace{.1em}bewirkt, dass UTF-8\hy Zeichen analog zu \verb|utf8enc.dfu| v1.3c von \hspace{.05em}{\small 2022/06/07} +\hspace{.05em}(\kern-.05em\textit{ohne} \verb|\cyr|...\ und \verb|\CYR|...\hy Zeichen) sortiert werden. +(Aus nicht\hy lateinischen Alphabeten verarbeitet \BibArts\ 2.6 griechische Buchstaben, +aber nur, falls sie in \LaTeX' mathematischem Modus notiert sind. \texttt{bibsort} sortiert z.\,B. +\verb|$\Eta| \verb|\rho| \verb|\alpha$| ($\Eta \rho \alpha$) als \texttt{Era}; vgl.\ +\textsc{Der Grosse Brockhaus}.) + +Falls Sie UTF-8\hy Zeichen verwenden, aber \verb|-utf8| \hspace{.075em}nicht gesetzt +haben, meldet \verb|bibsort| nur das letzte unbekannte Oktett aus Ihrem Text, also etwa:\footnote{Da UTF-8\hy Zeichen jenseits Nr.\,127 +aus mehreren Oktetten bestehen, ist die im Beispiel angegebene Nummer \texttt{165} kein eindeutiger Hinweis darauf, auf welches UTF-8\hy Zeichen +die Fehlermeldung zur"uckgeht. Es k"onnte sich z.\,B. um \texttt{195-165} f"ur å (\texttt{U+00E5}) handeln, +oder um \texttt{194-165} f"ur ¥ (\texttt{U+00A5}), u.\,s.\,w.\ $-$ aber auch um ASCII 165 (vielleicht \v{e}: siehe \texttt{-t1}).} \vspace{-1.25ex} {\scriptsize\begin{verbatim} @@ -5761,7 +6011,7 @@ aber vielleicht auch \texttt{194-165} f"ur ¥ (\texttt{U+00A5}), oder sonstwas. \end{verbatim}} \vspace{-3.75ex}\noindent -Falls unter \verb|-utf8| dagegen UTF8\hy Zeichen \textit{unbekannt} sind, sammelt \verb|bibsort| +Falls unter \verb|-utf8| \hspace{.1em}dagegen UTF-8\hy Zeichen \textit{unbekannt} sind, sammelt \verb|bibsort| bis zu zwanzig und gibt am Ende je Zeichen \textit{eine} Bildschirm\hy Meldung aus: \vspace{-1ex} @@ -5777,7 +6027,7 @@ bis zu zwanzig und gibt am Ende je Zeichen \textit{eine} Bildschirm\hy Meldung a Auch das aktuelle \LaTeX\ gibt bei Verwendung dieser Zeichen Fehler aus. Falls Sie \hspace{.15em}\verb|\DeclareUnicodeCharacter{01EC}{\k{\@tabacckludge=O}}| \hspace{.2em}im Vorspann Ihrer \LaTeX\hy Datei definieren, w"urde eine Nutzung von \verb|U+01EC| das Zeichen drucken und die \LaTeX\hy Fehlermeldung ausschalten; -\verb|bibsort| 2.5 g"abe \verb|U+01EC| aber weiterhin kein Sortiergewicht. +\verb|bibsort| 2.6 g"abe \verb|U+01EC| aber weiterhin kein Sortiergewicht. Tippen von \verb|\k{\=O}| w"urde stattdessen \k{\=O} ausdrucken\footnote{In \texttt{\{tabbing\}}\kern.05em\hy Umgebungen w"are \texttt{\bs k\{\bs a=O\}} zu verwenden, weil \texttt{\bs=} dort Tabs setzt.} \textit{und} von \verb|bibsort| als \verb|O|\hy mit\hy Akzenten sortiert. %%\k{\a=O}%% @@ -5799,8 +6049,8 @@ Seit Version 2.2 gibt es f"ur \verb|bibsort| folgende weitere Optionen: \verb|\hy| und \verb|\fhy| sowie\footnote{Falls das Doppelanf"uhrungszeichen \textit{aktiv} ist und \texttt{-x} nicht gesetzt wurde.} auf \verb|"=| und \verb|"~|. Dabei sind \verb|\hy| und \verb|\fhy| in \BibArts\ definiert -(siehe oben S.\,\pageref{hy}), w"ahrend \verb|"=| und \verb|"~| von \verb|german|, \verb|ngerman| -oder den entsprechenden Versionen von babel bereitgestellt werden m"ussen. +(siehe oben S.\,\pageref{hy}), w"ahrend \verb|"=| und \verb|"~| von [\verb|n|]\kern.05em\verb|german.sty| +oder den entsprechenden Versionen von \textsc{babel} bereitgestellt werden m"ussen. \vspace{.75ex} \verb|-n1| unterbindet, dass in den num\hy Listen Fu"snotennummern @@ -5834,15 +6084,15 @@ mehreren \textit{verschiedenen} Akzenten (\kern.075em\c{\"a}\kern.075em, \"{\r a der zuletzt getippte Akzent \hspace{.1em}(\kern.1em{\small\verb|\"|} \hspace{.15em}in \hspace{.15em}{\small\verb|\c{\"a}|} \hspace{.25em}und \hspace{.15em}{\small\verb|\r|} \hspace{.2em}in \hspace{.15em}{\small\verb|\"{\r| \hspace{.05em}\verb|a}|}\kern.025em) \hspace{.15em}die Sortierung am st"arksten. -Die folgende Liste enth"alt zun"achst nicht alle UTF8\hy Zeichen, die \verb|bibsort| verarbeiten kann. +Die folgende Liste enth"alt zun"achst nicht alle UTF-8\hy Zeichen, die \verb|bibsort| verarbeiten kann. In einer Kopie von \hspace{.05em}\verb|bibarts.tex| \hspace{.1em}k"onnen Sie f"ur eigene Tests im Vorspann das \hspace{.1em}\verb|%| \hspace{.15em}am Kopf von \hspace{.1em}\verb|%\allprrtrue| \hspace{.15em}entfernen. Nach einem Durchlauf von \hspace{.3em}\LaTeX~$+$~\verb|bibsort| \verb|-utf8| \abra{...}~$+$~\LaTeX\ -\hspace{.3em}sind u.\,a.\ alle UTF8\hy Zeichen (mit \verb|[U+|\fabra{...}\verb|]| als Kommentar) da, die -\hspace{.15em}\verb|bibsort| \hspace{.15em}in Version 2.5 erkennt. +\hspace{.3em}sind u.\,a.\ alle UTF-8\hy Zeichen (mit \verb|[U+|\fabra{...}\verb|]| als Kommentar) da, die +\hspace{.15em}\verb|bibsort| \hspace{.15em}in Version 2.6 erkennt. \newcommand{\demotext}[1]{\nosort{\protect\printdemotext{#1}}}% @@ -6853,7 +7103,8 @@ In einer Kopie von \hspace{.05em}\verb|bibarts.tex| \hspace{.1em}k"onnen Sie f"u \addtoprr{ga} %\addtoprr{ha} \addtoprr{ia} -\addtoprr{ja} +\addtoprr{"i\demotext{ \ \protect\string"i \protect\string"I \protect\string"e \protect\string"E repariert~in~2.6}} +%\addtoprr{ja} \addtoprr{ka} \addtoprr{la} \addtoprr{na} @@ -6926,7 +7177,13 @@ In einer Kopie von \hspace{.05em}\verb|bibarts.tex| \hspace{.1em}k"onnen Sie f"u \addtoprr{\nosort{'}a'\demotext{ \ \bs nosort\{{\protect\string'}\}a\protect\string'}} \addtoprr{'a'\demotext{ {\protect\string'}a{\protect\string'}}} \addtoprr{a'a\demotext{ a\protect\string'a \ \ \ \% vgl.\bs nosort\{\protect\string'\}a}} +%% changed in 2.6 : + \expandafter\ifx\csname AfterBabelLanguage\endcsname\relax {\originalTeX \addtoprr{"a"\demotext{ \{\bs originalTeX \bs addtoprr\{\protect\string"a\protect\string"\}\}\protect\label{originaltex}}}} + \else +{\shorthandoff{"} \addtoprr{"a"\demotext{ \scriptsize \{\bs shorthandoff\{\protect\string"\} \bs addtoprr\{\protect\string"a\protect\string"\}\}\protect\label{originaltex}}}} + \fi +%% \addtoprr{«a»\demotext{ [U+00AB]a[U+00BB] \% a,A=prim"ar}} %\addtoprr{\guillemetleft a\guillemetright} % \fillprr{\guillemetleft a\guillemetright}{\demotext{ \bs guillemetleft a\bs guillemetright}} @@ -6976,7 +7233,7 @@ In einer Kopie von \hspace{.05em}\verb|bibarts.tex| \hspace{.1em}k"onnen Sie f"u \addtoprr{\~b\demotext{ \bs\protect\string~b}} \addtoprr{$\tilde{b}$\demotext{ \$\bs tilde\{b\}\$}} \addtoprr{å}%%auch \ifallprr - \fillprr{å}{\demotext{ [U+00E5] \ \% *UTF8 neu in 2.3*}} + \fillprr{å}{\demotext{ [U+00E5] \ \% *utf8 neu in 2.3*}} \addtoprr{\r a} \fillprr{\r a}{\demotext{ \bs r a}} \addtoprr{\"{\r a}\demotext{ \bs\protect\string"\{\bs r a\}}} @@ -7358,7 +7615,7 @@ In einer Kopie von \hspace{.05em}\verb|bibarts.tex| \hspace{.1em}k"onnen Sie f"u \noindent Zur Erzeugung der vorausgehenden Liste bekam \verb|bibsort| als \textit{Sortier}\hy Optio"-n(\ko en\ko)\hspace{.1em}\texttt{\bibsortargs}\hspace{.15em}"ubergeben. -\hspace{.1em}\verb|\bibsortargs| steht hier vor "`"ubergeben"', um die +\hspace{.1em}\verb|\bibsortargs| steht hier vor \texttt{"uber}\-\texttt{geben}, um die Optionen auszudrucken; sie werden in diesem Befehl beim Ausdruck einer \verb|bibsort|\hy Datei $-$\,hier \verb|\printprr|\,$-$ hinterlegt. Die Optionen @@ -7404,7 +7661,7 @@ Lesen gro\hyss er Zahlen} weichen im Deutschen vom \textit{default} ab: sonst (\ko\textit{default}$\,=\,$englisch) stellt \verb|1,000| die Zahl Tausend dar. Mit \ko\verb|-g1| oder \ko\verb|-g2| wird \verb|0.251| als 251 verstanden; nur bei \textit{drei} `Nachpunktstellen' ist `\verb|.|' Strukturierungszeichen: -\verb|Bd.\,3.1| gilt als `drei-Punkt-eins' und wird vor \verb|Bd.\,10.2| +\verb|Bd.\,3.1| gilt als `drei\hy Punkt\hy eins' und wird vor \verb|Bd.\,10.2| einsortiert (anders als \verb|Bd.\,3.100|). Bei Punkt und Komma l"asst sich die f"ur einen Text einmal gew"ahlte @@ -7509,7 +7766,7 @@ ist nicht vorgesehen. %%%%%%%%%% \vspace{1.5ex}\noindent -Nun zu \textbf{Seiten- und Fu"snotennummern in num\hy Ausdruckbefehlen} (wie \verb|\printnumvkc|): +Nun zu \textbf{Seiten- und Fu"snoten\hy Nummern in num\hy Ausdruckbefehlen} (wie \verb|\printnumvkc|): Die drucken hinter den Text des Listeneintrags die Seitenzahlen und eventuell Fu"snotennummern aus, von denen mehrere textgleiche Zug"ange herstammen. Die Reihenfolge, in der Zahlentypen ausgedruckt werden, hat \textbf{defaultm"a\hyss ig} (ohne Setzen von Optionen) diese @@ -7696,7 +7953,7 @@ in {\small\verb|\footnotemark|} und {\small\verb|\footnotetext|}, sonst droht ev \vspace{.5cm} \begin{tt}\small\noindent \%\% Beispiel mit einer Fussnote im Argument des \bs title-Befehls. \\ -\%\% Beim Kopieren aus dem PDF auf die Codierung (UTF8) achten! \\ +\%\% Beim Kopieren aus dem PDF auf die Codierung (utf8) achten! \\ \%\% Im TeXnicCenter etwa ist die *beim Speichern* einzustellen. \\[2ex] \bs documentclass[12pt,a4paper]\{article\} \\[.25ex] \hspace*{.5cm} \bs usepackage[T1]\{fontenc\} \ \bs usepackage[utf8]\{inputenc\} \\ @@ -7745,7 +8002,7 @@ Der erste Satz.\footnote{\kli{Ferguson}{Falscher Krieg}[23].\vspace{1ex}}} \strut \\[-.5ex] \hspace*{2cm}\textsf{Zun"achst werden die zentralen \BibArts\hy Befehle erkl"art:} \\[.875ex] -\tocline{Sect1} {Vollzitate und Kurzzitate (\ko\textit{v}\hy\ und \textit{k}\fhy Befehle)} \\[.25ex] +\tocline{Sect1} {Vollzitate und Kurzzitate (v\hy\ und k\fhy Befehle)} \\[.25ex] \tocline{Sect2} {W"ortliche Zitate in verschiedenen Sprachen} \\[.25ex] \tocline{Sect3} {Formatierungs- und Editionshilfen} \\[.25ex] \tocline{Sect4} {Abk"urzungen} \\[.25ex] @@ -7771,15 +8028,15 @@ Der erste Satz.\footnote{\kli{Ferguson}{Falscher Krieg}[23].\vspace{1ex}}} \vfill \hbox{\parbox{7.7cm}{\footnotesize\noindent -\textbf{\BibArts~2.5 \ (9 Dateien, 8 vom 01.\,10.\,2022):} \\[.85ex] +\textbf{\BibArts~2.6 \ (9 Dateien, 8 vom 18.\,06.\,2023):} \\[.85ex] \begin{tabular}{ll}% \texttt{README.txt} & Versionsgeschichte seit 1.3 \\[-1.75pt] - \texttt{bibarts.sty} & Das \LaTeX-Style-File \\[-1.75pt] + \texttt{bibarts.sty} & Das \LaTeX\hy Style\hy File \\[-1.75pt] \texttt{bibarts.pdf} & Diese Dokumentation hier \\[-1.75pt] \texttt{bibarts.tex} & Quellcode von \texttt{bibarts.pdf} \\[-1.75pt] \texttt{ba-short.pdf} & Englische Kurzdokumentation \\[-1.75pt] \texttt{ba-short.tex} & Quellcode von \texttt{ba-short.pdf} \\[-1.75pt] - \texttt{bibsort.exe} & bibarts-bin erzeugt die Listen \\[-1.75pt] + \texttt{bibsort.exe} & bibarts\hy bin erzeugt die Listen \\[-1.75pt] \texttt{bibsort.c} & Quellcode von \texttt{bibsort.exe} \\[-1.75pt] \texttt{COPYING} & Lizenz (vom 28.\,11.\,1993) \\ \end{tabular}} @@ -7803,7 +8060,7 @@ Der erste Satz.\footnote{\kli{Ferguson}{Falscher Krieg}[23].\vspace{1ex}}} {\footnotesize\vspace{1.5ex}\noindent \BibArts\ ist kostenlos. Bitte dokumentieren Sie "Anderungen vor der Weitergabe. \\[-.5ex] -Zur Diskussion k"onnen Sie mir an\hspace{.1em} +Zur Diskussion k"onnen Sie mir gerne an\hspace{.1em} \texttt{bibarts}\kern.1em(\kern-.05em at\kern-.075em)\kern.1em\texttt{gmx.de}\hspace{.1em} mailen.} diff --git a/macros/latex/contrib/bibarts/bibsort.c b/macros/latex/contrib/bibarts/bibsort.c index 332eb2c700..41b0b6347a 100644 --- a/macros/latex/contrib/bibarts/bibsort.c +++ b/macros/latex/contrib/bibarts/bibsort.c @@ -1,5 +1,5 @@ -/* BibArts 2.5 assists you to write LaTeX texts in arts and humanities. */ -/* Copyright (C) 2022b Timo Baumann bibarts[at]gmx.de (2022/10/01) */ +/* BibArts 2.6 assists you to write LaTeX texts in arts and humanities. */ +/* Copyright (C) 2023 Timo Baumann bibarts[at]gmx.de (2023/06/18) */ /* This program is free software; you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -36,7 +36,7 @@ /* COMPATIBILITY - For my tests on Windows 10, I compiled bibsort.c 2.5 with MinGW, and with + For my tests on Windows 10, I compiled bibsort.c 2.6 with MinGW, and with MS VisualStudio C/C++; I typed gcc ..., or cl ..., TO THE COMMAND PROMPT. Do NOT change this file when you do not have a qualified text @@ -46,7 +46,7 @@ The C-compiled binary of this file is reading LaTeX .aux files. It can NOT read the .bar files, which BibArts 1.x did use. - BibArts 2.5 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x? + BibArts 2.6 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x? */ @@ -433,11 +433,11 @@ void licenseinfo(void) void moremoreinfo(const char *myname) { printf("%%%% CODEPAGES\n"); - printf("%%%% LaTeX today writes ASCIIs > 127 in your %s-file(s), if you use\n", AUX_SUFFIX); - printf("%%%% \\usepackage[utf8]{inputenc}. Then, you may start me using option\n"); + printf("%%%% LaTeX will write ASCIIs > 127 in your %s-file(s), if you use\n", AUX_SUFFIX); + printf("%%%% \\usepackage[utf8]{inputenc} (today the default). With option\n"); printf("%%%% -utf8 I expect characters as definded in utf8enc.dfu 2022/06/07 v1.3c,\n"); - printf("%%%% except those, which execute \\cyr...- or \\CYR...-cmds. Those and\n"); - printf("%%%% further utf8-characters will be reported to screen as unknown.\n"); + printf("%%%% except those, which execute \\cyr...- or \\CYR...-cmds. I report\n"); + printf("%%%% every unknown utf8 character only once.\n"); printf("%%%% -t1 You set \\UseRawInputEncoding, and ASCIIs > 127, which you use in\n"); printf("%%%% your .tex-file(s), reach the %s-file(s); I interpret them.\n", AUX_SUFFIX); printf("%%%% **For apparently all other codepages, LaTeX writes \\cmds.**\n"); @@ -449,7 +449,7 @@ void moremoreinfo(const char *myname) printf("%%%% Smith, John / Peter Young: ... [Title] ...\n"); printf("%%%% -e Exchanges the args of %s (and of %s). \\printvli:\n", authortable[0][1], authortable[1][1]); printf("%%%% Smith, John / Young, Peter: ... [Title] ...\n"); - printf("%%%% In BOTH cases, this entry is sorted as: Smith John Young Peter\n"); + printf("%%%% In BOTH cases, the entry is sorted as: Smith John Young Peter\n"); printf("%%%%\n"); } @@ -457,8 +457,8 @@ void moremoreinfo(const char *myname) void moreinfo(const char *myname) { printf("%%%% -utf8 See %s -\?\?\?\n", getmyname(myname, 40)); - printf("%%%% -m Write into files the meta arguments which I use to sort lines.\n"); - printf("%%%% -b If %s is in an arg, only text behind will have a sorting weight.\n", BAGOCMD); + printf("%%%% -m Print the strings which I internally use for sorting (meta-lines).\n"); + printf("%%%% -b If %s is in an argument, I will begin the comparison at %s.\n", BAGOCMD, BAGOCMD); printf("%%%% -n1 You reset fnt counters (no fnt-block-indexing over several pages).\n"); printf("%%%% INDEX TO PAGE AND FOOTNOTE NUMBERS (num-lists like \\printnumvkc):\n"); printf("%%%% (1) DEFAULT SORTING ORDER of page and footnote numbers:\n"); @@ -1531,6 +1531,9 @@ void QQsort(int left, int right, const int deep, const int deepsort) } + if (j == 0) /* Completely */ + j = dqsort[i] - dqsort[left]; /* new in 2.6 */ + if (j == 0) j = leval[i] - leval[left]; @@ -2984,7 +2987,7 @@ const char *weighttable[][2] = { { "\\ddot\t", "" }, /* CTL+E math-dieresis != umlaut */ { "\\=\t", "" }, /* CTL+F */ { "\\@tabacckludge\t=\t", "" }, /* new in 2.3, changed in 2.5 */ - { "\\a\t=\t", "" }, /* new in 2.3, chamged in 2.5 */ + { "\\a\t=\t", "" }, /* new in 2.3, changed in 2.5 */ { "\\bar\t", "" }, { "\\capitalmacron\t", "" }, /* new in 2.5 = \@tabacckludge= */ { "\\vec\t", "" }, /* CTL+F + [ESC] changed in 2.3 */ @@ -3224,6 +3227,10 @@ const char *udtable[][2] = { { "\\OLDHYF\t", "F" }, /* [F-] */ /* / */ { "\\hy\t", "-" }, /* MINUS \hy */ /* new in 2.2 */ { "\\fhy\t", "-" }, /* MINUS \fhy*/ /* new in 2.2 */ + { "\\\"e", "e" }, /* \"e */ /* new in 2.6 */ + { "\\\"E", "E" }, /* \"E */ /* new in 2.6 */ + { "\\\"i", "i" }, /* \"i */ /* new in 2.6 */ + { "\\\"I", "I" }, /* \"I */ /* new in 2.6 */ { "\\\"\t", "" }, /* / \" */ /* changend in 2.5*/ { "\\3", "s" }, /* \3 */ { "\\ck\t", "ck" }, /* [c-k] */ /* new in 2.2 */ @@ -3256,7 +3263,7 @@ const char *udtable[][2] = { { "\\@tabacckludge\t\"\t", "" }, /* new in 2.5 = \" */ { "\\a\t\"\t", "" }, /* new in 2.5 = \" */ { NULL, NULL }}; -#define NUMTEX 65 +#define NUMTEX 69 /* \" changed to \"\t in 2.5 */ @@ -3295,9 +3302,14 @@ const char *gstylist[][2] = { { "\"\tF", NULL }, /* [F-] */ /* | */ { "\"\t=", NULL }, /* MINUS "= */ /* new in 2.2 */ { "\"\t~", NULL }, /* MINUS "~ */ /* new in 2.2 */ - { "\"\t", NULL }, /* / " */ + { "\"\te", NULL }, /* \ "e */ /* new in 2.6 */ + { "\"\tE", NULL }, /* \ "E */ /* new in 2.6 */ + { "\"\ti", NULL }, /* \ "i */ /* new in 2.6 */ + { "\"\tI", NULL }, /* \ "I */ /* new in 2.6 */ + { "\"\t", NULL }, /* / " */ /* OFF in 2.6 */ { NULL, NULL }}; -#define NUMGER 35 +#define NUMGER 38 + /* 39 if you want "b=\"b, "y=\"y, etc. <= "\"\t" OFF in 2.6 */ const char *gweight[][2] = { @@ -3335,7 +3347,11 @@ const char *gweight[][2] = { { NULL, "F" }, /* [F-] "F */ /* / */ { NULL, "-" }, /* MINUS \hy "= */ /* new in 2.2 */ { NULL, "-" }, /* MINUS \fhy "~ */ /* new in 2.2 */ - { NULL, "" }, /* / \" " */ + { NULL, "e" }, /* \ \"e */ /* new in 2.6 */ + { NULL, "E" }, /* \ \"E */ /* new in 2.6 */ + { NULL, "i" }, /* \ \"i */ /* new in 2.6 */ + { NULL, "I" }, /* \ \"I */ /* new in 2.6 */ + { NULL, "" }, /* / \" (" OFF in 2.6) */ { NULL, "ss" }, /* \3 [] */ { NULL, "ck" }, /* \ck */ /* new in 2.2 */ { NULL, "CK" }, /* \CK */ /* new in 2.2 */ @@ -3404,7 +3420,11 @@ const char *mweight[][2] = { { NULL, "F" }, /* [F-] "F */ /* / */ { NULL, "-" }, /* \hy "= */ /* new in 2.2 */ { NULL, "-" }, /* \fhy "~ */ /* new in 2.2 */ - { NULL, "" }, /* / \" " */ + { NULL, "e" }, /* \"e */ /* new in 2.6 */ + { NULL, "E" }, /* \"E */ /* new in 2.6 */ + { NULL, "i" }, /* \"i */ /* new in 2.6 */ + { NULL, "I" }, /* \"I */ /* new in 2.6 */ + { NULL, "" }, /* \" (" OFF in 2.6) */ { NULL, "ss" }, /* \3 [] */ { NULL, "ck" }, /* \ck */ /* new in 2.2 */ { NULL, "CK" }, /* \CK */ /* new in 2.2 */ @@ -3495,17 +3515,19 @@ int texlistnum(const char *p, int n, const char *list[][2]) } - if ( *entry == '\0' - || (*entry == '\t' && *(entry+1) == '\0' && ((len == 2 && *p == '\\' && isLaTeXcmdletter(*(p+1)) == 0) || isLaTeXcmdletter(*line) == 0)) - ) + if (*entry == '\0') break; if (*entry == '\t' && ((len == 1 && *p == '\"') || (len == 2 && *p == '\\' && isLaTeXcmdletter(*(p+1)) == 0) || isLaTeXcmdletter(*line) == 0)) { + /* moved in 2.6: also "y etc. (not only as in 2.5: " y) */ + if (*(entry+1) == '\0') + break; + while (*line == ' ') ++line; /* now, isLaTeXcmdletter(*line) != 0 */ - /* new in 2.3, changed in 2.5 */ + /* new in 2.3, changed in 2.5 */ if ((atlen=lenofMATCHaftertab(entry, line)) > 0) /* atlen=1,3 !! */ break; } @@ -5260,8 +5282,12 @@ const char *transformtable[][2] = { {"\\@inpenc@undefined@\t", "{}" }, /* new in 2.3 */ {"\\G@refundefinedtrue\t", "{}" }, /* new in 2.3 */ { "\\GenericWarning\t", "{}{}" }, /* new in 2.3 */ + { "\\shorthandon\t", "{}" }, /* new in 2.6 */ + { "\\shorthandoff\t", "{}" }, /* new in 2.6 */ + { "\\foreignlanguage\t", "[]{}" }, /* new in 2.6 */ + { "\\hyphenrules\t", "{}" }, /* new in 2.6 */ { NULL, NULL }}; -#define NUMTRANSV 102 +#define NUMTRANSV 106 /* Muessen im Bereich von issonder liegen: */ @@ -6400,8 +6426,8 @@ void printfilelist(FILE *file, int filec, int cc, const char *vor, const char *n if (cc == 1) { - fprintf(file, "\n%%%% BibArts 2.5 (C) Timo Baumann 2022b [%s]\n", __DATE__); - fprintf(file, "\\gdef\\@bibsortvers{2.5}\n"); /* new in 2.5 */ + fprintf(file, "\n%%%% BibArts 2.6 (C) Timo Baumann 2023 [%s]\n", __DATE__); + fprintf(file, "\\gdef\\@bibsortvers{2.6}\n"); /* new in 2.5 */ } fprintf(file, "%%%%\n"); @@ -8870,8 +8896,8 @@ int main(int argc, char *argv[]) char *inname = mydefault, *arg_i = NULL, *arg_o = NULL; - printf("\n%%%%> This is bibsort 2.5 (for help: %s -\?)\n", getmyname(argv[0], 37)); - fprintf(stderr, "%%%% bibsort 2.5 is part of BibArts 2.5 (C) Timo Baumann 2022b.\n"); + printf("\n%%%%> This is bibsort 2.6 (for help: %s -\?)\n", getmyname(argv[0], 37)); + fprintf(stderr, "%%%% bibsort 2.6 is part of BibArts 2.6 (C) Timo Baumann 2023.\n"); argc = single_option(argc, argv, "-B", "-b"); diff --git a/macros/latex/contrib/mitthesis/MIT-Thesis.pdf b/macros/latex/contrib/mitthesis/MIT-Thesis.pdf Binary files differnew file mode 100644 index 0000000000..853523ebd2 --- /dev/null +++ b/macros/latex/contrib/mitthesis/MIT-Thesis.pdf diff --git a/macros/latex/contrib/mitthesis/MIT-Thesis.tex b/macros/latex/contrib/mitthesis/MIT-Thesis.tex new file mode 100644 index 0000000000..a604955e4e --- /dev/null +++ b/macros/latex/contrib/mitthesis/MIT-Thesis.tex @@ -0,0 +1,294 @@ +% !TEX encoding = UTF-8 Unicode +% !BIB TS-program = biber +% !BIB program = biber + +% This file is MIT-Thesis.tex, a template for producing MIT theses with the mitthesis class. +% Version: 1.00, 2023/06/17 +% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit + +% Documentation: https://ctan.org/pkg/mitthesis + +%% Don't modify the \DocumentMetadata command unless you know what it does. +%% If this command throws an "undefined" error, your latex system is out of date: try commenting this command out. +\DocumentMetadata +{ + pdfstandard = a-2b, + pdfversion = 1.7, + lang = en-US, +% debug = {xmp-export}, % output xmpi file to directly examine metadata +} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\documentclass[twoside,fontset=defaultfonts,mydesign]{mitthesis} +% +% option [twoside] gives facing-page behavior for printing; omitting it will eliminate even-numbered blank pages. +% option [lineno] provides line numbers, as for editing +% option [mydesign] loads titlesec, enumitem, caption, subcaption - you may edit the mydesign.tex file as you like it. +% option [fontset] is a keyvalue which can be: +% pdftex or unicode engines: defaultfonts, libertine, lucida +% pdftex only: fira-newtxsf, newtx, newtx-sans-text +% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2 +% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the latex font". +% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts]. +% If you are using multiple languages, load the babel package in your fontset file, before the fonts. + +%%%%%%%%% Packages used in sample chapters (not otherwise required) %%%%%%% + +%% Package for code listing in Appendix A. +\usepackage{listings} + +%% Set chemical formulas nicely +\usepackage[version=4]{mhchem} + +%% Latin filler used in Chapter 1, with a test for package version date +\usepackage{lipsum} +\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{} + + +%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%% Can set graphicspath to point to specific directories containing figures (the current directory is searched automatically) +%% For instance, to search a subdirectory of the current directory called "figures" and a parallel directory called "art", set: + +% \graphicspath{ {figures/} {../art/} }% For details see: https://latexref.xyz/dev/latex2e.html#g_t_005cgraphicspath + + +%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none,articlein=false,]{biblatex} + +\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= + +%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that) +\setcounter{biburllcpenalty}{7000} +\setcounter{biburlucpenalty}{8000} + +% biblatex is very powerful, and you can customize most aspects the reference list and citations. + + +%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%\RequirePackage[numbers,sort&compress]{natbib} + +%%% add bibliography to table of contents +%\apptocmd{\bibliography}{\addcontentsline{toc}{chapter}{\protect\textbf{\bibname}}}{}{} + +%%% You can use this to rename the bibliography section +%\renewcommand{\bibname}{References} + +%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue") +%\setlength\bibsep{4pt plus 1pt minus 1pt} + + +%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\usepackage{booktabs}% better quality tables +\usepackage{array}% additional options for table columns + +%\usepackage{tabularx} + +%\usepackage{dcolumn} % alignment on decimal places +%\newcolumntype{d}[1]{D{.}{.}{#1}} + + +%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%% Back in the typewriter era, double spaced lines were convenient for editing with a pencil. +%% In typography, the separation between lines is called "leading", and it is usually set in +%% proportion to the font size (i.e., when the font is loaded). If you really feel the need +%% to change the line separation, the most attractive results will be obtained by changing the +%% leading in proportion to the the current font size, rather than just doubling the space. + +%% The setspace package provides a tool for changing line separation (use these here) +% +%\usepackage{setspace} +%\setstretch{1.1}% you can choose some other value for the stretch of space between lines +% +%% Use the these commands AFTER the frontmatter +% +%\onehalfspacing +%\doublespacing +%\singlespacing % will turn these effects off (you can use these anywhere in the document) + +%% The best result may be to stay with leading selected by the typographer who set up the font. + + +%%%%%%%%%%% Hyperref setting and metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\def\YourName{John H. Lienhard}% <====== CHANGE TO YOUR NAME !!! + +\hypersetup{% +% +% Be sure to change the following to your own information! <======== !!! +% + pdftitle={MIT thesis template}, + pdfkeywords={\YourName, Massachusetts Institute of Technology, MIT}, + pdfauthor={\YourName}, + pdfauthortitle={Professor of Mechanical Engineering}, + pdfcaptionwriter={\YourName}, +% pdfcaptionwriter={{John H. Lienhard, V}},% if you have a comma in your name, surround by {..} + pdfurl={https://lienhard.mit.edu}, + pdfcontactemail={lienhard@mit.edu}, + pdfcontactaddress={77 Massachusetts Avenue, Room 3-166}, + pdfcontactcity={Cambridge, MA}, + pdfcontactpostcode={02139}, + pdfcontactcountry={USA}, + pdfcontacturl={https://lienhard.mit.edu}, +% + pdfsubject={Template for writing MIT theses with the mitthesis class},% briefly state what this document is about +% + colorlinks=true, + linkcolor=blue, + citecolor=blue, + urlcolor=violet, + filecolor=red, +% anchorcolor=yellow,% not all pdf viewers recognize this field (Firefox does) +% colorscheme=phelype,% overrides link, cite, url, file colors with a preset scheme, through \DocumentMetadata +% + pdfborder={0 0 0}, + bookmarksnumbered=true, + bookmarksopen=true, + bookmarksopenlevel=1, +% pdfpagemode=UseNone,% this option means don't open bookmarks panel + pdfpagelayout=SinglePage, + pdfdisplaydoctitle=true, + pdfstartview=Fit, + pdfnewwindow=true, +% + pdfcopyright={Copyright © \DegreeYear\ by \YourName. \PDFRightsText},% definitions made by class file, don't change + pdflicenseurl={\CCurl},% definition made by class file, don't change +} + +%%%%%%%%%%%%%% End preamble %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\begin{document} + + +%%% edit the following commands to match your thesis %%%%%%%%%% + +\title{The Atomic Theory as Applied To Gases, with Some Experiments on the Viscosity of Air} + +% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][... +% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted + +% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century. + +\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876] +%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022] + +% Use once for each degree fulfilled by thesis +\Degree{Bachelor of Science in Physics}{Department of Physics} +%\Degree{Bachelor of Science in Mechanical Engineering}{Department of Mechanical Engineering} + +% If there is more than one supervisor, use the \Supervisor command for each. +\Supervisor{Edward C. Pickering}{Professor of Physics} +%\Supervisor{Secunda Castor}{Department of Mechanical Engineering} + +% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...) +% If more than one department, use more than once +\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Graduate Officer, First Degree Department} +%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Second Degree Department} + +% If your title page is overflowing (from too many names, degrees, etc.), you can scale +% down the Signature block at the bottom with this command, or use another creative solution... +%\SignatureBlockSize{\small} + +% Usage: \DegreeDate{Month}{year} +% Valid degree months are September, February, or June. +\DegreeDate{June}{1876} + +% Date that final thesis is submitted to department +\ThesisDate{May 18, 1876} + + +%%%%%% Choose whether to have a CREATIVE COMMONS License %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% If you are using a cc license, put details of your cc license here. +% Omit this command if you are not using a cc license. +% +\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%% Titlepage +\maketitle + \cleardoublepage% for two-sided printing, this puts abstract on a right-hand (odd) page, possibly inserting a blank page + % if the the class option [twoside] is omitted, the command just begins a new page + + +%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...} +% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly + +%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +% The abstract environment creates all the required headers and footnote. +% You only need to add the text of the abstract itself in the file abstract.tex +\begin{abstract} + \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment +\end{abstract} + \cleardoublepage + +\include{acknowledgments.tex}% + \cleardoublepage + +\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format + \cleardoublepage + + +%%% Table of contents and lists of stuff (edit only if you want different lists) %%%%%%%%%%%%%%%% + + \pdfbookmark[0]{Table of Contents}{toc}% +\tableofcontents + \cleardoublepage + + \phantomsection +\listoffigures + \addcontentsline{toc}{chapter}{\protect\textbf{\listfigurename}}% + \cleardoublepage + + \phantomsection +\listoftables + \addcontentsline{toc}{chapter}{\protect\textbf{\listtablename}}% + \cleardoublepage + + +%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%% If you really feel the need to engage in "double spacing", you can start here... + +\include{chapter1.tex} +%\include{chapter2.tex} +%\include{chapter3.tex} + + +%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\appendix +\include{appendixa.tex} + + +%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +{\raggedright% to avoid stretched white space and split urls; DELETE if you prefer justified text +% +\printbibliography[title={References},heading=bibintoc] +} +% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566 +% see the biblatex manual, section 3.14.3 + + +%%%% Option for natbib %%%%%%%%%%%%% +%% use an appropriate style (.bst) and your own .bib file[s] + +%\bibliographystyle{plainnat} +%\bibliography{mitthesis-sample.bib} + +\end{document} +
\ No newline at end of file diff --git a/macros/latex/contrib/mitthesis/README.md b/macros/latex/contrib/mitthesis/README.md new file mode 100644 index 0000000000..40c6674bb4 --- /dev/null +++ b/macros/latex/contrib/mitthesis/README.md @@ -0,0 +1,78 @@ + + #mitthesis --- A LaTeX template for MIT theses# + + v1.00 dated 2023/06/17. + + ####Overview#### + This class provides a LaTeX template for MIT theses formatted according to + the requirements of the Massachusetts Institute of Technology Libraries (as posted in 2023): + + [https://libraries.mit.edu/distinctive-collections/thesis-specs/](https://libraries.mit.edu/distinctive-collections/thesis-specs/) + + This template is appropriate for MIT theses of all types. + + This template works with either pdfLaTeX or unicode engines such as luaLaTeX. + The bibliography can be prepared with either biblatex (default) or natbib/bibtex. + The class is based on current LaTeX distributions, ideally 11/2022 or later, but + compatible with distributions back to 2020. This template replaces the older + version of mitthesis.cls, which was first composed in the 1980s. + + The files in this distribution are: + + README.md -- this file + mitthesis.cls -- the class file + MIT-Thesis.tex -- a latex template for this class + mydesign.tex -- a file that loads packages for color and document design + MIT-Thesis.pdf -- a sample thesis from the template, using default fonts + mitthesis-sample.bib -- a sample bibliography file with many examples + fontsets/ -- a directory of input files that load optional fonts + * + abstract.tex -- put your abstract in this file + acknowledgments.tex -- put your acknowledgments in this file + biosketch.tex -- put your biosketch in this file (optional) + chapter1.tex -- put your first chapter in this file (etc.) + appendixa.tex -- put your first appendix in this file (etc.) + * + mitthesis-doc/ -- documentation for usage and options + examples/font_samples/ + -- sample theses in different fonts + examples/cover_page_samples/ + -- sample theses for one or more authors and degrees + + + ####Author#### + + John H. Lienhard V + + Department of Mechanical Engineering + + Massachusetts Institute of Technology + + Cambridge, MA 02139-4307 USA + + + --- + + ####Change log#### + v1.00 (17 June 2023): Initial release + + --- + + ####License#### + + Copyright (c) 2023 John H. Lienhard + + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + associated documentation files (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following two conditions: + + The above copyright notice and this permission notice shall be included in all copies or + substantial portions of the Software. + + The software is provided "as is", without warranty of any kind, express or implied, including but + not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. + In no event shall the authors or copyright holders be liable for any claim, damages or other liability, + whether in an action of contract, tort or otherwise, arising from, out of or in connection with the + software or the use or other dealings in the software. diff --git a/macros/latex/contrib/mitthesis/abstract.tex b/macros/latex/contrib/mitthesis/abstract.tex new file mode 100644 index 0000000000..34447aefb4 --- /dev/null +++ b/macros/latex/contrib/mitthesis/abstract.tex @@ -0,0 +1,11 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis +% +% The abstract environment creates all the required headers and footnote. +% You only need to add the text of the abstract itself. +% +% Approximately 500 words or less; try not to use formulas or special characters +% If you don't want an initial indentation, do \noindent at the start of the abstract + +The developments of the ``kinetic theory'' of gases made within the last ten years have enabled it to account satisfactorily for many of the laws of gases. The mathematical deductions of Clausius, Maxwell and others, based upon the hypothesis of a gas composed of molecules acting upon each other at impact like perfectly elastic spheres, have furnished expressions for the laws of its elasticity, viscosity, conductivity for heat, diffusive power and other properties. For some of these laws we have experimental data of value in testing the validity of these deductions and assumptions. Next to the elasticity, perhaps the phenomena of the viscosity of gases are best adapted to investigation\footnote{Text from Holman (1876): \doi{10.2307/25138434}.}. diff --git a/macros/latex/contrib/mitthesis/acknowledgments.tex b/macros/latex/contrib/mitthesis/acknowledgments.tex new file mode 100644 index 0000000000..3e41684a12 --- /dev/null +++ b/macros/latex/contrib/mitthesis/acknowledgments.tex @@ -0,0 +1,11 @@ +%% acknowledgments.tex + +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +\chapter*{Acknowledgments} +\addcontentsline{toc}{chapter}{\protect\textbf{Acknowledgments}} + +Write your acknowledgments here. diff --git a/macros/latex/contrib/mitthesis/appendixa.tex b/macros/latex/contrib/mitthesis/appendixa.tex new file mode 100644 index 0000000000..07a90bce08 --- /dev/null +++ b/macros/latex/contrib/mitthesis/appendixa.tex @@ -0,0 +1,63 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +\chapter{Code listing} + +\lstdefinestyle{mystyle}{ + backgroundcolor=\color{CadetBlue!15!white}, + commentstyle=\color{Red3}, + numberstyle=\tiny\color{gray}, + stringstyle=\color{Blue3}, + basicstyle=\small\ttfamily, + breakatwhitespace=false, + breaklines=true, + numbers=left, + numbersep=5pt, + showspaces=false, + showstringspaces=false, + showtabs=false, + tabsize=2 +}% +\lstset{language=[5.3]Lua,style={mystyle}}% + +\begin{lstlisting} +function print_rate(kappa,xMin,xMax,npoints,option) + local c = 1-kappa*kappa + local croot = (1-kappa*kappa)^(1/2) + local logx = math.log(xMin) + local psi = 0 + + local xstep = (math.log(xMax)-math.log(xMin))/(npoints-1) + + arg0 = math.sqrt(xMin/c) + psi0 = (1/c)*math.exp((kappa*arg0)^2)*(erfc(kappa*arg0)-erfc(arg0)) + + if option~=[[]] then + tex.sprint("\\addplot+["..option.."] coordinates{") + -- addplot+ for color cycle to work + else + tex.sprint("\\addplot+ coordinates{") + end + tex.sprint("("..xMin..","..psi0..")") + + for i=1, (npoints-1) do + x = math.exp(logx + xstep) + arg = math.sqrt(x/c) + karg = kappa*arg + if karg<5 then + -- this break compensates for exp(karg^2), which multiplies the error in the erf approximation... + logpsi = -math.log(croot) + karg^2 + math.log(erfc(karg)-erfc(arg)) + psi = math.exp(logpsi) + else + psi = (1/(karg) - 1/(2*(karg^3)) + 3/(4*(arg^5)) )/(1.77245385*croot) + -- this is the large x asymptote of the reaction rate + end + logx = math.log(x) + tex.sprint("("..x..","..psi..")") + end + tex.sprint("}") +end +\end{luacode*} +\end{lstlisting} diff --git a/macros/latex/contrib/mitthesis/biography.tex b/macros/latex/contrib/mitthesis/biography.tex new file mode 100644 index 0000000000..27c63e067c --- /dev/null +++ b/macros/latex/contrib/mitthesis/biography.tex @@ -0,0 +1,10 @@ +%% This section is optional + +\chapter*{Biographical Sketch} +\addcontentsline{toc}{chapter}{\protect\textbf{Biographical Sketch}} + +Silas Whitcomb Holman was born in Harvard, Massachusetts on January 20, 1856. He received his S.B. degree in Physics from MIT in 1876, and then joined the MIT Department of Physics as an Assistant. He became Instructor in Physics in 1880, Assistant Professor in 1882, Associate Professor in 1885, and Full Professor in 1893. Throughout this period, he struggled with increasingly severe rheumatoid arthritis. At length, he was defeated, becoming Professor Emeritus in 1897 and dying on April 1, 1900. + +Holman's light burned brilliantly before his tragic and untimely death. He published extensively in thermal physics, and authored textbooks on precision measurement, fundamental mechanics, and other subjects. He established the original Heat Measurements Laboratory. Holman was a much admired teacher among both his students and his colleagues. The reports of his department and of the Institute itself refer to him frequently in the 1880's and 1890's, in tones that gradually shift from the greatest respect to the deepest sympathy. + +Holman was a student of Professor Edward C. Pickering, then head of the Physics department. Holman himself became second in command of Physics, under Professor Charles R. Cross, some years later. Among Holman's students, several went on to distinguish themselves, including: the astronomer George E. Hale ('90) who organized the Yerkes and Mt. Wilson observatories and who designed the 200 inch telescope on Mt. Palomar; Charles G. Abbot ('94), also an astrophysicist and later Secretary of the Smithsonian Institution; and George K. Burgess ('96), later Director of the Bureau of Standards.
\ No newline at end of file diff --git a/macros/latex/contrib/mitthesis/chapter1.tex b/macros/latex/contrib/mitthesis/chapter1.tex new file mode 100644 index 0000000000..0bba9a74e0 --- /dev/null +++ b/macros/latex/contrib/mitthesis/chapter1.tex @@ -0,0 +1,162 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +\chapter{Introduction} + +\lipsum[1-2] Postremo aliquos futuros suspicor, qui me ad alias litteras vocent, genus hoc scribendi, etsi sit elegans, personae tamen et dignitatis esse negent~\cite{DKE1969,ww1920,kirk2288a,churchill1948,gibbs1863}. + +\section[A section discussing the first issue: \(\psi/\textrm{J}\)]{A section discussing the first issue: \ifpdftex\(\bm{\psi}/\bm{J}\)\else{\(\symbfup{\psi/J}\)}\fi} + + +We begin with some ideas from the literature \cite{Fong2015,sharpe1}. +\begin{equation} +\frac{\partial}{\partial t}\left[\rho\bigl(e + \lvert\vec{u}\rvert^2\big/2\bigr)\right] + \nabla\cdot\left[\rho\bigl(h + \lvert\vec{u}\rvert^2\big/2 \bigr)\vec{u}\right] + ={}-\nabla \cdot \vec{q} + \rho \vec{u}\cdot\vec{g}+ \frac{\partial}{\partial x_j}\bigl(d_{ji}u_i\bigr) +\end{equation} + \lipsum[3] + +\lipsum[4] And more citations~\cite{sharpe1,GSL}. Then we write some more and include our citations~\cite{Swaminathan2017IDABRO,dlmf,amsmath}. The configuration is shown in Fig.~\ref{fig:golden2}. + +%%%%%%%%%%%%%%%%% begin full width figure %%%%%%%%%%%%%%%%%%%%%%%%%%% +\begin{figure*}[t] +\begin{subfigure}[c]{0.495\textwidth} +\centering{\includegraphics[width=0.99\textwidth]{example-image-c}}% +\subcaption{\label{fig:golden}} +\end{subfigure} +%%%%%%%% don't leave a break here +\begin{subfigure}[c]{0.495\textwidth} +\centering{\includegraphics[width=0.99\textwidth]{example-image-c}}% +\subcaption{\label{fig:golden2}}% +\end{subfigure}% +\caption{A figure with two subfigures: (a) first subfigure; (b) second subfigure.\label{fig:4}} +\end{figure*} +%%%%%%%%%%%%%%%%%%% end full width figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\lipsum[4] + +\subsection{Subsection~eqn.~\eqref{eqn:WT1}} +\lipsum[5-6] + +\subsubsection{A subsubsection} +\lipsum[7] + +{\small +\begin{equation}\label{eqn:WT1} +\begin{Vmatrix} +\dfrac\varphi{(\varphi_1,\varepsilon_1)} & 0 & \hdotsfor{4} & 0 & \\[4\jot] +\dfrac{\varphi k_{21}}{(\varphi_2,\varepsilon_1)} & \dfrac\varphi{(\varphi_2,\varepsilon_2)} & 0 & \hdotsfor{3} & 0 \\[4\jot] +\dfrac{\varphi k_{31}}{(\varphi_3,\varepsilon_1)} &\dfrac{\varphi k_{32}}{(\varphi_3,\varepsilon_2)} & \dfrac\varphi{(\varphi_3,\varepsilon_3)}& 0 & \hdotsfor{2} & 0 \\[\jot] +\vdots & & & \smash{\rotatebox{15}{$\ddots$}} & & & \vdots \\[\jot] +\dfrac{\varphi k_{n-2\, 1}}{(\varphi_{n-2},\varepsilon_1)} & +\dfrac{\varphi k_{n-2\, 2}}{(\varphi_{n-2},\varepsilon_2)} &\hdotsfor{1} & \dfrac{\varphi k_{n-2\,n-3}}{(\varphi_{n-2},\varepsilon_{n-3})} & \dfrac\varphi{(\varphi_{n-2},\varepsilon_{n-2})}& 0& 0 \\[4\jot] +\dfrac{\varphi k_{n-1\, 1}}{(\varphi_{n-1},\varepsilon_1)} & \dfrac{\varphi k_{n-1\, 2}}{(\varphi_{n-1},\varepsilon_2)} &\hdotsfor{2} & +\dfrac{\varphi k_{n-1\,n-2}}{(\varphi_{n-1},\varepsilon_{n-2})}& \dfrac{\varphi}{(\varphi_{n-1},\varepsilon_{n-1})} & 0 \\[4\jot] +\dfrac{\varphi k_{n1}}{(\varphi_n,\varepsilon_1)} & \dfrac{\varphi k_{n2}}{(\varphi_n,\varepsilon_2)} & \hdotsfor{3} & +\dfrac{\varphi k_{n\,n-1}}{(\varphi_n,\varepsilon_{n-1})} & \dfrac{\varphi}{(\varphi_n,\varepsilon_n)} +\end{Vmatrix} +\end{equation} +}% + +\section{Description our paradigm~\cite{GSL}}\label{ch1:theidea} + +\lipsum[8] No dissertation is complete without footnotes\footnote{First footnote. See section~\ref{sec:stratified-flow}.}\footnote{Another interesting detail.}\footnote{And another really important idea to have in mind~\cite{reynolds1958,clauser56,lienhard2020,johnson1980,johnson1965,mpl}.}. + +\begin{figure}[t] +%\includegraphics[width=6cm]{example-image-a} +%\includegraphics[width=3cm]{example-image-golden} +%\includegraphics[width=3cm]{example-grid-100x100pt} +\centering\includegraphics[height=5cm]{example-image-b} +%\includegraphics[scale=0.5]{example-image-c} +%\includegraphics[width=3cm]{example-image} +\caption{Caption text\label{mantissa-format}} +\end{figure} + + +\subsection{Conversion to a metaheuristic} + +\lipsum[11-12] This concept is discussed further in section~\ref{sec:stratified-flow}, and Refs.~\cite{euler1740,fourier1822}. + + + +\section{Other generalizations} + +\subsection{The most general case} + +\lipsum[7] And another citation, so that our sources will be unambiguous~\cite{montijano2014}. +\begin{gather} +\ce{x Na(NH4)HPO4 ->[\Delta] (NaPO3)_x + x NH3 ^ + x H2O} \\[0.5em] +\ce{^234_90Th -> ^0_-1$\beta${} + ^234_91Pa} \\[0.5em] +\ce{SO4^2- + Ba^2+ -> BaSO4 v} \\[0.5em] +\ce{Zn^2+ +<=>[+ 2OH-][+ 2H+] +$\underset{\text{amphoteric hydroxide}}{\ce{Zn(OH)2 v}}$ +<=>[+ 2OH-][+ 2H+] +$\underset{\text{tetrahydroxozincate}}{\ce{[Zn(OH)4]^2-}}$ +} +\end{gather} +These examples of chemical formul\ae\ are copied directly from the documentation of the \texttt{mhchem} package, which was used to typeset them. + +\section{Baroclinic generation of vorticity\label{sec:stratified-flow}} + +Substitution of the particle acceleration and application Stokes theorem leads to the \textit{Kelvin-Bjerknes circulation theorem}, for +$\rho \neq \text{fn}(p)$: +\begin{align} +\frac{d\Gamma}{dt} &{}= \frac{d}{dt} \int_{\mathcal{C}} \mathbf{u} \cdot d\mathbf{r}\\ + &{}= \int_{\mathcal{C}} \frac{D\mathbf{u}}{Dt} \cdot d\mathbf{r} + \underbrace{\int_{\mathcal{C}} \mathbf{u}\cdot d\biggl( \frac{d\mathbf{r}}{dt}\Biggr)}_{=\, 0} \\[-2pt] + &{}= \iint_{\mathcal{S}} \nabla \times \frac{D\mathbf{u}}{Dt} \cdot d\mathbf{A}\\ + &{}= \iint_{\mathcal{S}} \nabla p \times \nabla \left( \frac{1}{\rho}\right) \cdot d\mathbf{A} +\end{align} + +Baroclinic generation of vorticity accounts for the sea breeze and various other atmospheric currents in which temperature, rather than pressure, creates density gradients. Further, this phenomenon accounts for ocean currents in straits joining more and less saline seas, with surface currents flowing from the fresher to the saltier water and with bottom current going oppositely. + +%%%%%%%%%%%%%%%% end full width table %%%%%%%%%%%%%%%%%%% + +%% Nomenclature list is optional +% +% This environment takes three optional arguments: +% [1] adjust space between symbol and definition +% [2] name (heading) of the nomenclature list +% [3] level - can be "section" or "chapter" depending on whether you +% have one nomenclature list for whole thesis or one for each +% chapter. +\begin{nomenclature}[2em][Nomenclature for Chapter~1][section] +\EntryHeading{Roman letters} +\entry{$\mathcal{C}$}{material curve} +\entry{$\mathbf{r}$}{material position [m]} +\entry{$\mathbf{u}$}{velocity [m s$^{-1}$]} +\EntryHeading{Greek letters} +\entry{$\Gamma$}{circulation [m$^2$ s$^{-1}$]} +\entry{$\rho$}{mass density [kg m$^{-3}$]} +\end{nomenclature} + +%%%%%%%%%%%%%%% begin full width table %%%%%%%%%%%%%%%%%% +\begin{table*}[t] +\caption{The error function and complementary error function}\label{tab:1}% +\centering{% +\begin{tabular*}{0.8\textwidth}{@{\hspace*{1.5em}}@{\extracolsep{\fill}}ccc!{\hspace*{3.em}}ccc@{\hspace*{1.5em}}} +\toprule +\multicolumn{1}{@{\hspace*{1.5em}}c}{$x$\rule{0pt}{8pt}} & +\multicolumn{1}{c}{$\text{erf}(x)$} & +\multicolumn{1}{c!{\hspace*{3.em}}}{$\text{erfc}(x)$} & +\multicolumn{1}{c}{$x$} & +\multicolumn{1}{c}{$\text{erf}(x)$} & +\multicolumn{1}{c@{\hspace*{1.5em}}}{$\text{erfc}(x)$} \\ \midrule +0.00 & 0.00000 & 1.00000 & 1.10 & 0.88021 & 0.11980 \\ +0.05 & 0.05637 & 0.94363 & 1.20 & 0.91031 & 0.08969 \\ +0.10 & 0.11246 & 0.88754 & 1.30 & 0.93401 & 0.06599 \\ +0.15 & 0.16800 & 0.83200 & 1.40 & 0.95229 & 0.04771 \\ +0.20 & 0.22270 & 0.77730 & 1.50 & 0.96611 & 0.03389 \\ +0.30 & 0.32863 & 0.67137 & 1.60 & 0.97635 & 0.02365 \\ +0.40 & 0.42839 & 0.57161 & 1.70 & 0.98379 & 0.01621 \\ +0.50 & 0.52050 & 0.47950 & 1.80 & 0.98909 & 0.01091 \\ +0.60 & 0.60386 & 0.39614 & 1.82\makebox[0pt][l]{14} & 0.99000 & 0.01000 \\ +0.70 & 0.67780 & 0.32220 & 1.90 & 0.99279 & 0.00721 \\ +0.80 & 0.74210 & 0.25790 & 2.00 & 0.99532 & 0.00468 \\ +0.90 & 0.79691 & 0.20309 & 2.50 & 0.99959 & 0.00041 \\ +1.00 & 0.84270 & 0.15730 & 3.00 & 0.99998 & 0.00002 \\ +\bottomrule +\end{tabular*} +}% +\end{table*} diff --git a/macros/latex/contrib/mitthesis/examples/cover_page_samples/No_CC_license.pdf b/macros/latex/contrib/mitthesis/examples/cover_page_samples/No_CC_license.pdf Binary files differnew file mode 100644 index 0000000000..790738f762 --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/cover_page_samples/No_CC_license.pdf diff --git a/macros/latex/contrib/mitthesis/examples/cover_page_samples/One_author_one_degree.pdf b/macros/latex/contrib/mitthesis/examples/cover_page_samples/One_author_one_degree.pdf Binary files differnew file mode 100644 index 0000000000..dbd2be9562 --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/cover_page_samples/One_author_one_degree.pdf diff --git a/macros/latex/contrib/mitthesis/examples/cover_page_samples/One_author_two_degrees.pdf b/macros/latex/contrib/mitthesis/examples/cover_page_samples/One_author_two_degrees.pdf Binary files differnew file mode 100644 index 0000000000..362b417cf8 --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/cover_page_samples/One_author_two_degrees.pdf diff --git a/macros/latex/contrib/mitthesis/examples/cover_page_samples/Two_authors_one_degree.pdf b/macros/latex/contrib/mitthesis/examples/cover_page_samples/Two_authors_one_degree.pdf Binary files differnew file mode 100644 index 0000000000..8f4e014a63 --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/cover_page_samples/Two_authors_one_degree.pdf diff --git a/macros/latex/contrib/mitthesis/examples/cover_page_samples/Two_authors_two_degrees.pdf b/macros/latex/contrib/mitthesis/examples/cover_page_samples/Two_authors_two_degrees.pdf Binary files differnew file mode 100644 index 0000000000..96e96ba54d --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/cover_page_samples/Two_authors_two_degrees.pdf diff --git a/macros/latex/contrib/mitthesis/examples/font_samples/Defaultfonts.pdf b/macros/latex/contrib/mitthesis/examples/font_samples/Defaultfonts.pdf Binary files differnew file mode 100644 index 0000000000..f2bc9f2a7e --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/font_samples/Defaultfonts.pdf diff --git a/macros/latex/contrib/mitthesis/examples/font_samples/Fira-newtxsf.pdf b/macros/latex/contrib/mitthesis/examples/font_samples/Fira-newtxsf.pdf Binary files differnew file mode 100644 index 0000000000..45c1769bee --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/font_samples/Fira-newtxsf.pdf diff --git a/macros/latex/contrib/mitthesis/examples/font_samples/Heros-Stix2.pdf b/macros/latex/contrib/mitthesis/examples/font_samples/Heros-Stix2.pdf Binary files differnew file mode 100644 index 0000000000..10b658fc9d --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/font_samples/Heros-Stix2.pdf diff --git a/macros/latex/contrib/mitthesis/examples/font_samples/Libertine.pdf b/macros/latex/contrib/mitthesis/examples/font_samples/Libertine.pdf Binary files differnew file mode 100644 index 0000000000..b4a118e17f --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/font_samples/Libertine.pdf diff --git a/macros/latex/contrib/mitthesis/examples/font_samples/Lucida.pdf b/macros/latex/contrib/mitthesis/examples/font_samples/Lucida.pdf Binary files differnew file mode 100644 index 0000000000..78a2027168 --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/font_samples/Lucida.pdf diff --git a/macros/latex/contrib/mitthesis/examples/font_samples/Newtx-sans-text.pdf b/macros/latex/contrib/mitthesis/examples/font_samples/Newtx-sans-text.pdf Binary files differnew file mode 100644 index 0000000000..2efd9fefe6 --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/font_samples/Newtx-sans-text.pdf diff --git a/macros/latex/contrib/mitthesis/examples/font_samples/Newtx.pdf b/macros/latex/contrib/mitthesis/examples/font_samples/Newtx.pdf Binary files differnew file mode 100644 index 0000000000..c448aa1159 --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/font_samples/Newtx.pdf diff --git a/macros/latex/contrib/mitthesis/examples/font_samples/Stix2.pdf b/macros/latex/contrib/mitthesis/examples/font_samples/Stix2.pdf Binary files differnew file mode 100644 index 0000000000..8ff17c4a24 --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/font_samples/Stix2.pdf diff --git a/macros/latex/contrib/mitthesis/examples/font_samples/Termes-Stix2.pdf b/macros/latex/contrib/mitthesis/examples/font_samples/Termes-Stix2.pdf Binary files differnew file mode 100644 index 0000000000..b118214e28 --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/font_samples/Termes-Stix2.pdf diff --git a/macros/latex/contrib/mitthesis/examples/font_samples/Termes.pdf b/macros/latex/contrib/mitthesis/examples/font_samples/Termes.pdf Binary files differnew file mode 100644 index 0000000000..edd2ef9d6f --- /dev/null +++ b/macros/latex/contrib/mitthesis/examples/font_samples/Termes.pdf diff --git a/macros/latex/contrib/mitthesis/fontsets/defaultfonts.tex b/macros/latex/contrib/mitthesis/fontsets/defaultfonts.tex new file mode 100644 index 0000000000..675014a0cb --- /dev/null +++ b/macros/latex/contrib/mitthesis/fontsets/defaultfonts.tex @@ -0,0 +1,20 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +%% Default fonts +% +\ifpdftex + \typeout{^^JLoading Computer Modern text and math fonts (default for pdftex).^^J} + \RequirePackage[T1]{fontenc} + \RequirePackage{bm} +\else + \typeout{^^JLoading Latin Modern text and math fonts (default for unicode engines).^^J} + % + \usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} + % suppress tiresome warnings about lack of integration between mathtools and unicode-math. + % Unicode-math loads the fontspec package, but the default fonts are not selected by fontspec, so + % you cannot use \addfontfeatures to alter the fonts. The command is used on titlepage, so defeat it: + \def\addfontfeature#1#2{\ignorespaces} +\fi diff --git a/macros/latex/contrib/mitthesis/fontsets/fira-newtxsf.tex b/macros/latex/contrib/mitthesis/fontsets/fira-newtxsf.tex new file mode 100644 index 0000000000..42a64334f9 --- /dev/null +++ b/macros/latex/contrib/mitthesis/fontsets/fira-newtxsf.tex @@ -0,0 +1,22 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +%% Fira Sans text font with newtx sans serif math font and Inconsolata typewriter font +% +\ifpdftex + \typeout{^^JLoading Fira sans text font with newtx sans serif math font and Inconsolata typewriter^^J} + \RequirePackage[sfdefault]{FiraSans} % sans serif text package %,scaled=.85 + \RequirePackage[T1]{fontenc} + \RequirePackage[varqu,varl,,scaled=1.12]{zi4} % inconsolata font for typewriter + \RequirePackage[cmintegrals,scaled=1.12]{newtxsf} % sans serif math + \RequirePackage{bm} +\else + \ClassWarning{mitnewthesis}{The newtx font set requires pdflatex. Defaulting to LMR fonts} + \usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} + % suppress tiresome warnings about lack of integration between mathtools and unicode-math. + % Unicode-math loads the fontspec package, but the default fonts are not selected by fontspec, so + % you cannot use \addfontfeatures to alter the fonts. The command is used on titlepage, so defeat it: + \def\addfontfeature#1#2{\ignorespaces} +\fi diff --git a/macros/latex/contrib/mitthesis/fontsets/heros-stix2.tex b/macros/latex/contrib/mitthesis/fontsets/heros-stix2.tex new file mode 100644 index 0000000000..943fe6a84b --- /dev/null +++ b/macros/latex/contrib/mitthesis/fontsets/heros-stix2.tex @@ -0,0 +1,68 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +%% TeX Gyre Heros (sans serif) text font with STIX Two Math font and Inconsolata monospaced font +% +% These fonts are available at: +% http://www.gust.org.pl/projects/e-foundry/tex-gyre +% https://github.com/stipub/stixfonts +% https://ctan.org/tex-archive/fonts/inconsolata +% Install these as system fonts on your computer +% +\ifpdftex + \ClassWarning{mitnewthesis}{The heros-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.} + \RequirePackage[T1]{fontenc} + \RequirePackage{bm} +\else + \typeout{^^JTeX Gyre Heros (sans serif) text font with STIX2 math font and Inconsolata monospaced font.^^J} + % + \usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} + % suppress tiresome warnings about lack of integration between mathtools and unicode-math + % unicode-math loads the fontspec package + + \setmainfont{texgyreheros}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + WordSpace = {1,1.4,1}, + Extension = .otf, + UprightFont = *-regular, + ItalicFont = *-italic, + BoldFont = *-bold, + BoldItalicFont = *-bolditalic, + Numbers = Lining, + Scale=0.91, + ] + \setsansfont{texgyreheros}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + WordSpace = {1,1.4,1}, + Extension = .otf, + UprightFont = *-regular, + ItalicFont = *-italic, + BoldFont = *-bold, + BoldItalicFont = *-bolditalic, + Numbers = Lining, + Scale=0.91, + ] + \setmonofont{Inconsolatazi4}[% This otf font ships with the LaTeX Inconsolata package and is in CTAN https://ctan.org/tex-archive/fonts/inconsolata + Scale=1.05, + Extension = .otf, + UprightFont = *-Regular, + ItalicFont = *-Regular,% has no italic face + BoldFont = *-Bold, + BoldItalicFont = *-Bold,% has no bold italic face + RawFeature = {+ss01,+ss02,+ss03}, + ] + \setmathfont{STIXTwoMath-Regular}[% nice glyphs, but \mkern sometimes needed %% https://github.com/stipub/stixfonts + Scale=MatchUppercase, + Extension = .otf, + BoldFont = *,% STIX Two Math has no bold face +% Color=NavyBlue, + RawFeature = {+ss01, -ss02, -ss08}, + ] + % ss01 -- switch calligraphic to script; +ss02 -- variants of g, u, v, w, z; +ss08 -- upright integrals + % + \setmathfontface\mathbf{STIXTwoText-Bold.otf}[]% to not get Heros bold, https://github.com/stipub/stixfonts + \setmathfontface\mathit{STIXTwoText-Italic.otf}[] + \setmathfontface\mathrm{STIXTwoText-Regular.otf}[]% to get roman letters from STIX Two + % + \newcommand*{\FRAC}[1]{{\addfontfeature{Fractions=On}#1}}% use OpenType feature for fractions, \FRAC{1/2} +\fi diff --git a/macros/latex/contrib/mitthesis/fontsets/libertine.tex b/macros/latex/contrib/mitthesis/fontsets/libertine.tex new file mode 100644 index 0000000000..81d33bff72 --- /dev/null +++ b/macros/latex/contrib/mitthesis/fontsets/libertine.tex @@ -0,0 +1,60 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + +%% Linux Libertine (serif) text font with newtxmath[libertine] (pdftex) or Libertinus (unicode) math font +% +% These fonts are available here https://ctan.org/tex-archive/fonts/libertine/opentype +% and here https://github.com/alerque/libertinus +% install these as system fonts on your computer +% +\ifpdftex + \typeout{^^JLoading newtx-libertine text and math fonts with insolata typewriter font^^J} + \usepackage[lining,semibold]{libertine} + \usepackage[T1]{fontenc} + \usepackage[varqu,varl]{inconsolata}% typewriter +% \usepackage{amsthm}% must be loaded before newtxmath + \usepackage[libertine,vvarbb]{newtxmath} + \usepackage{bm}% load after all math to give access to bold math +\else + \typeout{^^JLoading Linux Libertine (serif) text font with Libertinus math font^^J} + % + \usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} + % suppress tiresome warnings about lack of integration between mathtools and unicode-math + % unicode math loads the fontspec package + % + \setmainfont{LinLibertine}[% Linux Libertine O + Extension = .otf, + UprightFont = *_R, + ItalicFont = *_RI, + BoldFont = *_RZ, % Libertine O Semibold + BoldItalicFont = *_RZI, % Libertine O Semibold Italic + % Ligatures=Rare,% TeX + % Numbers=OldStyle,% + RawFeature={+ss05},% +ss02 would change J, K, R; +ss05 changes W + ] + \setmonofont{LinLibertine}[% Linux Libertine Mono O + Scale=0.9, + Extension = .otf, + UprightFont = *_M, + ItalicFont = *_MO,% oblique + BoldFont = *_MB, + BoldItalicFont = *_MBO,% oblique + ] + \setsansfont{LinBiolinum}[% Linux Biolinum O + Extension = .otf, + UprightFont = *_R, + ItalicFont = *_RI, + BoldFont = *_RB, + BoldItalicFont = *_RBO,% oblique + Scale=MatchUppercase] + % + %% a Libertine-style math font + \setmathfont{libertinusmath-regular}[% + Extension = .otf, + Scale=MatchUppercase, + BoldFont = *,% This font lacks a bold version + RawFeature={+ss08},% +ss08 gives slanted integrals (no other features) + ] + \newcommand*{\FRAC}[1]{{\addfontfeature{Fractions=On}#1}}% use OpenType feature for fractions, \FRAC{1/2} +\fi diff --git a/macros/latex/contrib/mitthesis/fontsets/lucida.tex b/macros/latex/contrib/mitthesis/fontsets/lucida.tex new file mode 100644 index 0000000000..a6689059d5 --- /dev/null +++ b/macros/latex/contrib/mitthesis/fontsets/lucida.tex @@ -0,0 +1,151 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +%% Lucida Bright and Lucida Bright Math fonts (available from the TeX Users Group) + +\typeout{^^JLucida Bright and Lucida Bright Math fonts^^J} + +\ifpdftex + \RequirePackage[LY1]{fontenc} + \RequirePackage[expert,vargreek,altbullet,seriftt]{lucidabr} % switch text and math fonts + \RequirePackage{bm} +\else + \usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} + % suppress tiresome warnings about lack of integration between mathtools and unicode-math + % unicode-math loads the fontspec package + + % FEATURE DESCRIPTION DEFAULT + % dlig discretionary ligatures (f-ligatures in typewriter fnt) off + % liga standard ligatures (f-ligatures, not monospaced fonts) on + % onum old style numbers (Lucida Bright only) off + % smcp small caps (Lucida Bright, upright only) off + % zero slashed zero (sans and monospaced fonts) off + % locl script/language specific (localized) forms on + % + % FEATURE FONT DESCRIPTION + % ss01 Lucida Sans & Typewriter use dotted zero: 𝟶 vs. default 0. + % ss01 use Lucida-standard shapes: + % Lucida Grande Mono ØOQ vs. default 0OQ; + % Lucida Console ØOQ vs. default 0OQ. + + \setmainfont{LucidaBrightOT}[% main rm + Ligatures=TeX, + Extension=.otf, + UprightFont=*, + ItalicFont=*-Italic, + BoldFont=*-Demi, + BoldItalicFont=*-DemiItalic, + BoldItalicFeatures={Color=Purple4}, + % UprightFeatures={Color=Salmon3}, + Scale=0.92, + % Numbers ={OldStyle}, + ] + % + \setsansfont{LucidaSansOT}[% main sans + Ligatures=TeX, + Extension=.otf, + UprightFont=*, + ItalicFont=*-Italic, + BoldFont=*-Demi, + BoldItalicFont=*-DemiItalic, + Scale=MatchUppercase, + ] + % + \setmonofont{LucidaSansTypewriterOT}[% main typewriter + Ligatures=TeX, + Extension=.otf, + UprightFont=*, + ItalicFont=*-Oblique, + BoldFont=*-Bold, + BoldItalicFont=*-BoldOblique, + Scale=MatchUppercase, + ] + + %% MATH FONTS + % + % ss01 alternate Latin lower case math italic identical to text italic. This option is not recommended as Greek 𝜈 (nu) and Latin 𝑣 (vee) become too similar + % ss02 smaller arrows (original Type 1 size): ⇑ vs. default ⇑. + % ss03 attempt to imitate Type 1 fonts + % ss04 calligraphic alternative (similar to the Type 1 design) to the math script alphabet + % ss05 use a slashed-zero style for the empty set character (U+2205): Ø vs. default ∅ + % ss08 emphasize right and bottom edges of the d’Alembertian operator (U+29E0, \laplac), to follow the design of the Laplace operator (U+2206, \increment, Δ); the default design emphasizes the left and upper edges. Also available in the bold math font. + % + \setmathfont{LucidaBrightMathOT}[% main math + Scale=MatchUppercase, + Extension=.otf, + BoldFont=LucidaBrightMathOT-Demi.otf, +% BoldFeatures={Color=Chartreuse4}, + RawFeature ={+ss04,+ss08}, % + ] + +%% LucidaMath-OT contains a *serif* typerwriter font. If you prefer a sans serif typerwriter font, you can use the following two settings. +% +% \setmathfont{LucidaSansTypewriterOT}[% <== NB: setting a text font where math font should go. +% Scale=MatchUppercase, +% range=tt, +% Color=NavyBlue, +% Extension=.otf, +% script-features = {}, +% sscript-features = {}, +% BoldFont=LucidaSansTypewriterOT-Bold.otf, +% BoldFeatures={Color=Salmon3}, +% ] +% % +% \setmathfontface\mathtt{LucidaSansTypewriterOT-Bold}[% bold upright typewriter font in boldmath. +% version=bold, +% Scale=MatchUppercase, +% Extension=.otf, +% ] + % + \setmathfont{LucidaBrightMathOT}[% + range={scr},% to make scr differ from cal + RawFeature={-ss04}, + Scale=MatchUppercase, + Extension=.otf, + BoldFont=LucidaBrightMathOT-Demi.otf,% could be overridden by bold separate version + ] + \setmathfont{LucidaBrightMathOT}[% -Demi .. sufficient this way, since bold set above. + range={bfscr},% need to call \symbfscr manually - bug in unicode-math version & range interaction + RawFeature={-ss04}, + Scale=MatchUppercase, + Extension=.otf, + BoldFont=LucidaBrightMathOT-Demi.otf, + ] + %% Fix unicode-math operator font not set up for bold face (default \mathrm). See https://github.com/wspr/unicode-math/issues/468 + \setoperatorfont\normalfont + % + % note \mathbfit = \symbfit + + % The specialized one-off Lucida fonts: + \newfontface\LucidaBlackletter{LucidaBlackletterOT}[% + Scale=0.95,% <== NB + Extension=.otf, + ] + \newfontface\LucidaCalligraphy{LucidaCalligraphyOT}[% + Scale=MatchUppercase, + Extension=.otf, + ] + \newfontface\LucidaHandwriting{LucidaHandwritingOT}[% + Scale=MatchUppercase, + Extension=.otf, + ] + % GrandeMono and Console fonts: + \newfontface\LucidaGrandeMonoDK{LucidaGrandeMonoDK}[% + Scale=MatchUppercase, + Extension=.otf, + UprightFont=*, + ItalicFont=*-Italic, + BoldFont=*-Bold, + BoldItalicFont=*-BoldItalic, + ] + \newfontface\LucidaConsole{LucidaConsoleDK}[% + Scale=MatchLowercase,% <=== NB + Extension=.otf, + UprightFont=*, + ItalicFont=*-Italic, + BoldFont=*-Bold, + BoldItalicFont=*-BoldItalic, + ] +\fi diff --git a/macros/latex/contrib/mitthesis/fontsets/newtx-sans-text.tex b/macros/latex/contrib/mitthesis/fontsets/newtx-sans-text.tex new file mode 100644 index 0000000000..6e09c92569 --- /dev/null +++ b/macros/latex/contrib/mitthesis/fontsets/newtx-sans-text.tex @@ -0,0 +1,25 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +%% newtx package with sans-serif text (Helvetica-like text with Times-like math) +% +\ifpdftex + \RequirePackage[T1]{fontenc} + \RequirePackage[subscriptcorrection,varvw,helvratio=0.91,defaultsups]{newtx}% upint for upright integrals + \renewcommand{\familydefault}{\sfdefault}% use sans for main text +% these two commands enable hyphenation of the typewriter font - https://tex.stackexchange.com/a/204421/119566 +% \input{t1ntxtt.fd} +% \DeclareFontFamily{\encodingdefault}{\ttdefault}{\hyphenchar\font=`\-} % + \RequirePackage{bm}% bold math +\else + \ClassWarning{mitnewthesis}{The newtx font set requires pdflatex. Defaulting to LMR fonts} + \usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} + % suppress tiresome warnings about lack of integration between mathtools and unicode-math. + % Unicode-math loads the fontspec package, but the default fonts are not selected by fontspec, so + % you cannot use \addfontfeatures to alter the fonts. The command is used on titlepage, so defeat it: + \def\addfontfeature#1#2{\ignorespaces} +\fi + +
\ No newline at end of file diff --git a/macros/latex/contrib/mitthesis/fontsets/newtx.tex b/macros/latex/contrib/mitthesis/fontsets/newtx.tex new file mode 100644 index 0000000000..f59c916a58 --- /dev/null +++ b/macros/latex/contrib/mitthesis/fontsets/newtx.tex @@ -0,0 +1,22 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +\ifpdftex + \typeout{^^JLoading newtx fonts with inconsolata typewriter^^J} + \RequirePackage[T1]{fontenc} + \RequirePackage[subscriptcorrection,varvw,helvratio=0.91]{newtx}% stix2, upint + \RequirePackage[varl,varqu,hyphenate,mono]{inconsolata}% sans typewriter font; mono = fixed word spacing, hyphenate = allow hyphenation + \RequirePackage{bm} + \let\textsuperscript\textsu% newtx changes the default superiors font; this is needed to get commas aligned in sequential footnotes +\else + \ClassWarning{mitnewthesis}{The newtx font set requires pdflatex. Defaulting to LMR fonts} + \usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} + % suppress tiresome warnings about lack of integration between mathtools and unicode-math. + % Unicode-math loads the fontspec package, but the default fonts are not selected by fontspec, so + % you cannot use \addfontfeatures to alter the fonts. The command is used on titlepage, so defeat it: + \def\addfontfeature#1#2{\ignorespaces} +\fi + +
\ No newline at end of file diff --git a/macros/latex/contrib/mitthesis/fontsets/stix2.tex b/macros/latex/contrib/mitthesis/fontsets/stix2.tex new file mode 100644 index 0000000000..25945f7e96 --- /dev/null +++ b/macros/latex/contrib/mitthesis/fontsets/stix2.tex @@ -0,0 +1,61 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +%% STIX Two text and math fonts with Heros sans serif font and Inconsolata monospaced font +% +% These fonts are available at: +% https://github.com/stipub/stixfonts +% http://www.gust.org.pl/projects/e-foundry/tex-gyre +% https://ctan.org/tex-archive/fonts/inconsolata +% Install these as system fonts on your computer +% +\ifpdftex + \ClassWarning{mitnewthesis}{The stix2 fontset requires a unicode engine. Defaulting to CMR fonts.} + \RequirePackage{bm} +\else + \typeout{^^JLoading STIX Two text and math fonts with Heros sans serif font and Inconsolata monospaced font.^^J} + % + \usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} + % suppress tiresome warnings about lack of integration between mathtools and unicode-math + % unicode-math loads the fontspec package + % + \setmainfont{STIXTwoText}[% Presumes these are system fonts! + Extension = .otf, + UprightFont = *-Regular, + ItalicFont = *-Italic, + BoldFont = *-Bold, + BoldItalicFont = *-BoldItalic, + SlantedFont = *-Italic, + ] + \setsansfont{texgyreheros}[% Presumes these are system fonts! + WordSpace = {1,1.4,1}, + Extension = .otf, + UprightFont = *-regular, + ItalicFont = *-italic, + BoldFont = *-bold, + BoldItalicFont = *-bolditalic, + Numbers = Lining, + Scale=0.91,% + ] + \setmonofont{Inconsolatazi4}[% This otf font ships with the LaTeX Inconsolata package (it's in TeX Live) + Scale=1.05,% + Extension = .otf, + UprightFont = *-Regular, + ItalicFont = *-Regular,% has no italic face + BoldFont = *-Bold, + BoldItalicFont = *-Bold,% has no bold italic face + RawFeature = {+ss01,+ss02,+ss03}, + ] + \setmathfont{STIXTwoMath-Regular}[% nice glyphs, but \mkern sometimes needed + Scale=MatchUppercase, + Extension = .otf, + BoldFont = *,% STIX Two Math has no bold face +% Color=NavyBlue, + RawFeature = {+ss01, -ss02, -ss08}, + ] + % ss01 -- switch calligraphic to script; +ss02 -- variants of g, u, v, w, z; +ss08 -- upright integrals + % + \newcommand*{\FRAC}[1]{{\addfontfeature{Fractions=On}#1}}% use OpenType feature for fractions, \FRAC{1/2} +\fi diff --git a/macros/latex/contrib/mitthesis/fontsets/termes-stix2.tex b/macros/latex/contrib/mitthesis/fontsets/termes-stix2.tex new file mode 100644 index 0000000000..fe475b13fe --- /dev/null +++ b/macros/latex/contrib/mitthesis/fontsets/termes-stix2.tex @@ -0,0 +1,66 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +%% TeX Gyre Termes text font and Heros sans serif font with STIX2 math font and Inconsolata monospaced font +% +% These fonts are available at: +% http://www.gust.org.pl/projects/e-foundry/tex-gyre +% https://github.com/stipub/stixfonts +% https://ctan.org/tex-archive/fonts/inconsolata +% Install these as system fonts on your computer +% +\ifpdftex + \ClassWarning{mitnewthesis}{The termes-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.} +\else + \typeout{^^JLoading TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font.^^J} + % + \usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} + % suppress tiresome warnings about lack of integration between mathtools and unicode-math + % unicode-math loads the fontspec package + % + \setmainfont{TeXGyreTermesX}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + WordSpace = {1,1.4,1},%% This stretch matches newtxtext a little better. 1.4 + Extension = .otf, + UprightFont = *-Regular, + ItalicFont = *-Italic, + BoldFont = *-Bold, + BoldItalicFont = *-BoldItalic, + SlantedFont = *-Italic, + Numbers = Lining, + ] + \setsansfont{texgyreheros}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + WordSpace = {1,1.4,1}, + Extension = .otf, + UprightFont = *-regular, + ItalicFont = *-italic, + BoldFont = *-bold, + BoldItalicFont = *-bolditalic, + Numbers = Lining, + Scale=0.91,% same as for newtx; former value 0.9 too small 2022/01/15 + ] + \setmonofont{Inconsolatazi4}[% This otf font ships with the LaTeX Inconsolata package (it's in TeX Live) + Scale=1.05,% rescaled from 1, 22/03/10 + Extension = .otf, + UprightFont = *-Regular, + ItalicFont = *-Regular,% has no italic face + BoldFont = *-Bold, + BoldItalicFont = *-Bold,% has no bold italic face + RawFeature = {+ss01,+ss02,+ss03}, + ] + \setmathfont{STIXTwoMath-Regular}[% nice glyphs, but \mkern sometimes needed %% https://github.com/stipub/stixfonts + Scale=MatchUppercase, + Extension = .otf, + BoldFont = *,% STIX Two Math has no bold face +% Color=NavyBlue, + RawFeature = {+ss01, -ss02, -ss08}, + ] + % ss01 -- switch calligraphic to script; +ss02 -- variants of g, u, v, w, z; +ss08 -- upright integrals + % + \setmathfontface\mathbf{STIXTwoText-Bold.otf}[]% to not get Termes bold, https://github.com/stipub/stixfonts + \setmathfontface\mathit{STIXTwoText-Italic.otf}[] + \setmathfontface\mathrm{STIXTwoText-Regular.otf}[]% to get roman letters from STIX, not Termes + % + \newcommand*{\FRAC}[1]{{\addfontfeature{Fractions=On}#1}}% use OpenType feature for fractions, \FRAC{1/2} +\fi diff --git a/macros/latex/contrib/mitthesis/fontsets/termes.tex b/macros/latex/contrib/mitthesis/fontsets/termes.tex new file mode 100644 index 0000000000..89f4c2a52c --- /dev/null +++ b/macros/latex/contrib/mitthesis/fontsets/termes.tex @@ -0,0 +1,57 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +%% TeX Gyre Termes (Times-like) text font with Termes math font and Heros sans serif font and Cursor monospaced font +% +% These fonts are available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre +% install these as system fonts on your computer +% +\ifpdftex + \ClassWarning{mitnewthesis}{The termes fontset requires a unicode engine. Defaulting to CMR fonts.} + \RequirePackage{bm} +\else + \typeout{^^JLoading TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font^^J} + \usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} + % suppress tiresome warnings about lack of integration between mathtools and unicode-math + % unicode-math loads the fontspec package + % + \setmainfont{TeXGyreTermesX}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + WordSpace = {1,1.4,1}, + Extension = .otf, + UprightFont = *-Regular, + ItalicFont = *-Italic, + BoldFont = *-Bold, + BoldItalicFont = *-BoldItalic, + SlantedFont = *-Italic, + Numbers = Lining, + ] + \setsansfont{texgyreheros}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + WordSpace = {1,1.4,1}, + Extension = .otf, + UprightFont = *-regular, + ItalicFont = *-italic, + BoldFont = *-bold, + BoldItalicFont = *-bolditalic, + Numbers = Lining, + Scale=0.91,% same as for newtx; former value 0.9 too small 2022/01/15 + ] + \setmonofont{texgyrecursor}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + Scale=0.97, + Extension = .otf, + UprightFont = *-Regular, + ItalicFont = *-Italic, + BoldFont = *-Bold, + BoldItalicFont = *-BoldItalic, +% BoldFeatures = { Color = VioletRed3 }, + ] + \setmathfont{texgyretermes-math}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + Scale=MatchUppercase, + Extension = .otf, + BoldFont = *, % termes-math does not have a bold version +% Color=Red3, + ] + % + \newcommand*{\FRAC}[1]{{\addfontfeature{Fractions=On}#1}}% use OpenType feature for fractions, \FRAC{1/2} +\fi diff --git a/macros/latex/contrib/mitthesis/mitthesis-doc/mitthesis-doc.pdf b/macros/latex/contrib/mitthesis/mitthesis-doc/mitthesis-doc.pdf Binary files differnew file mode 100644 index 0000000000..78ab55992d --- /dev/null +++ b/macros/latex/contrib/mitthesis/mitthesis-doc/mitthesis-doc.pdf diff --git a/macros/latex/contrib/mitthesis/mitthesis-doc/mitthesis-doc.tex b/macros/latex/contrib/mitthesis/mitthesis-doc/mitthesis-doc.tex new file mode 100644 index 0000000000..cbf62939fd --- /dev/null +++ b/macros/latex/contrib/mitthesis/mitthesis-doc/mitthesis-doc.tex @@ -0,0 +1,449 @@ +% !TEX TS-program = lualatex +% !TEX encoding = UTF-8 Unicode + +% Version date: 17 June 2023 + +\DocumentMetadata +{ + pdfstandard = a-2b,%a-3u,%a-4,% + pdfversion = 1.7, %2.0, + lang = en-US, +% debug = {xmp-export}, % note that subject entries are all fine in dc format of outputted xmpi file. +} + +%%%%%%%%%%%%%%% + +\documentclass[11pt]{article} + +\usepackage[letterpaper,margin=1in,footskip=0.5in]{geometry} +\usepackage{metalogo} +\usepackage{hologo} +\newcommand*\pdfTeX{\hologo{pdfTeX}} + +\usepackage[x11names,svgnames,dvipsnames,table]{xcolor} +\usepackage{luacolor} % load AFTER xcolor + +\usepackage[en-US]{datetime2} %% change default date format +\makeatletter +\newcommand{\daymonthyeardate}{% + \DTMenglishordinal{\@dtm@day}\space\DTMenglishmonthname{\@dtm@month} \@dtm@year +} +\makeatother + +\usepackage{booktabs} + +%%% Create an optional argument for unnumbered sections and set pdf bookmark (thru \addcontentsline). +%%% The optional argument will manually set the pdf bookmark for that section; can be used to avoid hyperref +%%% errors when macros are in section titles. +\let\svsection\section +\RenewDocumentCommand{\section}{s o m}{% + \IfBooleanTF {#1} + {\svsection*{#3}\phantomsection% + {\IfNoValueTF {#2} + {\addcontentsline{toc}{section}{#3}} + {\addcontentsline{toc}{section}{#2}}% removed trailing space 2020/02/28 + }% + }% + {\IfNoValueTF {#2} + {\svsection{#3}} + {\svsection[#2]{#3}}% + }% +} + +%%% Create an optional argument for unnumbered SUBsections and set pdf bookmark (thru \addcontentsline). +%%% The optional argument will manually set the pdf bookmark for that section; can be used to avoid hyperref +%%% errors when macros are in section titles. +\let\svsubsection\subsection +\RenewDocumentCommand{\subsection}{s o m}{% + \IfBooleanTF {#1} + {\svsubsection*{#3}\phantomsection% + {\IfNoValueTF {#2} + {\addcontentsline{toc}{subsection}{#3}} + {\addcontentsline{toc}{subsection}{#2}} + }% + }% + {\IfNoValueTF {#2} + {\svsubsection{#3}} + {\svssubection[#2]{#3}}% + }% +} + +%%%%%%%%% Set up text and math fonts %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} +% unicode math loads the fontspec package + +\setmainfont{texgyreheros}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + WordSpace = {1,1.4,1}, + Extension = .otf, + UprightFont = *-regular, + ItalicFont = *-italic, + BoldFont = *-bold, + BoldItalicFont = *-bolditalic, + Numbers = Lining, + Scale=0.91,% same as for newtx + ] +\setsansfont{texgyreheros}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + WordSpace = {1,1.4,1}, + Extension = .otf, + UprightFont = *-regular, + ItalicFont = *-italic, + BoldFont = *-bold, + BoldItalicFont = *-bolditalic, + Numbers = Lining, + Scale=0.91,% same as for newtx + ] +\setmonofont{Inconsolatazi4}[% This otf font ships with the LaTeX Inconsolata package (it's in TeX Live) + Scale=1.05,% + Extension = .otf, + UprightFont = *-Regular, + ItalicFont = *-Regular,% has no italic face + BoldFont = *-Bold, + BoldItalicFont = *-Bold,% has no bold italic face + RawFeature = {+ss01,+ss02,+ss03}, + ] +\setmathfont{STIXTwoMath-Regular}[% nice glyphs, but kerning requires fixes %% https://github.com/stipub/stixfonts. + Scale=MatchUppercase, + Extension = .otf, +% Color=NavyBlue, + RawFeature = {+ss01, -ss02, -ss08}, +]% ss01 -- switch calligraphic to script; +ss02 -- variants of g, u, v, w, z; +ss08 -- upright integrals + +\setmathfontface\mathbf{STIXTwoText-Bold.otf}% to not get text font's sans bold ... could change other text-math faces, if desired + + +%%%%%%%%%%% Hyperref related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\usepackage[psdextra]{hyperref} + +\hypersetup{% + unicode,% +% pdftex,% + pdfborder={0 0 0},% + bookmarksnumbered=true,% + bookmarksopen=true,% + bookmarksopenlevel=2,% + colorlinks=true, + linkcolor=blue, + citecolor=blue, + urlcolor=violet, + filecolor=red, +% anchorcolor=yellow,% not all pdf viewers recognize this field (Firefox does) +% colorscheme=phelype,% overrides link, cite, url, file colors with a preset scheme, through \DocumentMetadata + pdfpagelayout=SinglePage, + pdfdisplaydoctitle=true,% + pdfstartview=Fit, + pdfmetalang={en}, + pdftitle={Documentation for the MIT thesis template},% + pdfkeywords={John Lienhard, Massachusetts Institute of Technology, MIT, thesis, dissertation, template, latex},% + pdfnewwindow=true,% + pdfauthor={John H. Lienhard}, + pdfauthortitle={Professor of Mechanical Engineering}, + pdfcaptionwriter={{John H. Lienhard, V}}, %{\xmpquote{John H. Lienhard\xmpcomma\ V}}, + pdfurl={https://lienhard.mit.edu}, + pdfcontactemail={lienhard@mit.edu}, + pdfcontactaddress={77 Massachusetts Avenue, Room 3-166}, + pdfcontactcity={Cambridge, MA}, + pdfcontactpostcode={02139}, + pdfcontactcountry={USA}, + pdfcontacturl={https://lienhard.mit.edu}, + pdfcopyright={Copyright © \the\year\ by John H. Lienhard. Reuse under the MIT license}, + pdfsubject={Documentation for the MIT thesis class and template}, + pdflicenseurl={https://ctan.org/license/mit}, + } + +% Directly add the xmp property that shows work is copyrighted. See l3pdfmeta.pdf. +% This is not automatic with \DocumentMetadata. "True" must be capitalized. +\ExplSyntaxOn + \cs_if_exist:NTF \pdfmeta_xmp_add:n {\pdfmeta_xmp_add:n{<xmpRights:Marked>True</xmpRights:Marked>}}{} +\ExplSyntaxOff + +\urlstyle{same} % this changes font for \url to the current text font, but it is not recognized by \href. +\RequirePackage{bookmark}% improves handling of pdf bookmarks + +%\providecommand\hrefurl[2]{\href{#1}{#2}}% to address certain issues around URL recognition with new pdf management code + + +%%%%%%% A nomenclature environment, if needed %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\providecommand{\nomname}{Nomenclature} +\newlength\nomenwidth +\newlength\savitemsep + +\makeatletter +\NewDocumentCommand\entry{m m}{% + \ifblank{#2}{% + \ClassWarning{\ClassName}{The command \protect\entry requires two arguments. To obtain a subheading, use \protect\EntryHeading} + \itemsep3\p@ plus 1\p@ minus 1\p@% + \goodbreak\item[\itshape#1\hfill]\setlength\itemsep\savitemsep\@itempenalty=1000% + }{% + \item[#1\hfill]#2% + \@itempenalty=-\@lowpenalty% + }% +} +% A separate command command for nomenclature subheadings +\NewDocumentCommand\EntryHeading{m}{% + \itemsep3\p@ plus 1\p@ minus 1\p@% + \goodbreak\item[\itshape#1\hfill]\setlength\itemsep\savitemsep\@itempenalty=1000% +} +\makeatother +% +% Increase first optional argument to a dimension > 2em if wide entries cause undesired misalignment of columns. +% Second optional argument can be used to rename the environment, e.g., to List of Symbols. +\NewDocumentEnvironment{nomenclature}{O{2em} O{\nomname} O{section}}{% + \setlength\columnsep{2em} + \setlength{\nomenwidth}{#1} + \csname #3\endcsname *{#2}% this level will probably vary amongst users! add to toc, as well. +% \phantomsection\addcontentsline{toc}{#3}{#2}% removed for this example. + \raggedright + \begin{list}{}{% + \setlength{\itemsep}{0pt}% + \setlength{\parsep}{\itemsep}% + \setlength{\labelsep}{1em}% + \setlength{\labelwidth}{\nomenwidth}% + \setlength{\leftmargin}{\labelwidth}% + \addtolength{\leftmargin}{\labelsep}% + \setlength\savitemsep\itemsep% + }% +}{\end{list}\ignorespacesafterend} + + +%%%%%%%%%%%%% End preamble %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\title{The \textit{new} MIT thesis template} +\author{John H. Lienhard \\ Department of Mechanical Engineering \\ Massachusetts Institute of Technology} +\date{\daymonthyeardate} + +\begin{document} + +\maketitle + +\section*{The MIT thesis template} + +\LaTeX\ has changed tremendously since the original MIT thesis template was written in the 1980s. \LaTeX\ 2.09 was replaced by \LaTeX2e\ in the 1994. Many packages and fonts were developed to accompany the original platform, particularly after 2000; and major updates to the \LaTeX\ kernel began in 2018. Further, the MIT Libraries changed the required format several times, especially as electronic thesis submission became the norm. The original template served MIT well, but by the early 2020's, it was substantially out of date. + +This \textit{new} MIT thesis template was developed in 2023 at the request of the MIT Libraries. The title and abstract pages strictly follow the current requirements of the Libraries. The underlying code is entirely new. + + +\subsection*{System requirements} +The new \texttt{mitthesis} class uses the features of \LaTeX\ as of 2022, with limited backward compatibility. An up-to-date \LaTeX\ system is therefore necessary when using this template. + +\LaTeX\ is a free, open source system. The entire system is distributed through the \TeX\ Live platform (\url{https://www.tug.org/texlive/}), including the basic format, packages, and user interfaces. The system operates on Windows, MacOS, and Unix/Linux. \TeX\ Live is formally updated each year in the spring, and the associated utility package allows users download the most current codes more frequently if they desire. (At the time of this writing, the commercial platform Overleaf.com provides similar functionality.) + +If you are missing a package or documentation, you may obtain it at no cost from CTAN (\href{http://ctan.org}{ctan.org}). + + +\subsection*{\LaTeX\ engine} +The template works with either \pdfTeX\ or unicode engines such as \LuaLaTeX. With the latter, fonts that you install in your operating system can be configured for use in your thesis. \LuaLaTeX\ also enables the direct use of lua code in your \texttt{.tex} file. + + +\subsection*{File structure} +The new MIT thesis template consists of: \texttt{mitthesis.cls}; a root file \texttt{MIT-Thesis.tex}; a file to load the abstract, \texttt{abstract.tex}; a file for design options, \texttt{mydesign.tex}; and an optional file to change the fonts (see the subdirectory, \texttt{fontset}). You should change the name of the root file to something more descriptive of your own work (e.g., \texttt{JohnsThesis.tex}, \texttt{MagnumOpusScientiae.tex},\ldots). In addition, files must be loaded for acknowledgments, an optional biosketch, chapters, and optional appendices. + +\section*{Information you need to complete} +Various fields and commands must be changed to your own information in the preamble of \texttt{MIT-Thesis.tex} and immediately after the \verb|\begin{document}| command. This information includes the title, author, degree and other essential information. With the comments in \texttt{MIT-Thesis.tex}, this step should be self-explanatory. Nevertheless some comments follow. + +In the \verb|\hypersetup{..}| command, change the sample file to match your own information (name, title, keywords, etc.). These commands generate metadata that are incorporated into the pdf file. + +If your title page overflows (from too many authors, degrees, etc.), you can scale down the signature block at the bottom by issuing this command: \verb|\SignatureBlockSize{\small}|. + +The remaining commands are listed below. +\begin{itemize} +\item \verb|\title{the title of your thesis}| + +\item \verb|\Author{author full name}{author department}[1st PREVIOUS degree][2nd...| \linebreak +Note that third, fourth, fifth, and sixth arguments are optional [..] and may be omitted. Use once for each author. + +\item \verb|\Degree{name of degree}{department giving degree}|. Use once for each degree fulfilled by thesis + +\item \verb|\Supervisor{supervisor name}{supervisor department}|. Use once for each supervisor. + +\item \verb|\Acceptor{acceptor name}{acceptor title}{thesis related position}|. Professor who accepts theses for your department (e.g., the Graduate Officer). Use once for each department. + +\item \verb|\DegreeDate{Month}{year}|. Date degree is awarded (February, June, or September). + +\item \verb|\ThesisDate{date}|. Date that your final thesis is submitted to the department. + +\end{itemize} + +\subsection*{Copyright license} +If you wish to make your thesis available under a Creative Commons License, issue the following command between +\verb|\begin{document}| and \verb|\maketitle|: \verb|\CClicense{license type}{license url}|. For example, + +\vskip 5pt +\noindent\quad\verb|\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}|. + + +\section*{Package options} +Package options may be specified for \verb|\documentclass{mitthesis}[..]|. These options are described in Table~\ref{tab:1} and the subsections that follow. + + +\begin{table}[ht] +\caption{Options to the document class\label{tab:1}} +\smallskip\setlength\extrarowheight{3pt}% +\centering{% +\small +\begin{tabular}{>{\ttfamily}l<{} >{\raggedright\arraybackslash}p{42em} } +\toprule +\textrm{Package option} & Effect \\ +\midrule +fontset & is a keyvalue, \texttt{fontset = <\textit{name}>}, which selects the set of fonts used for the thesis. See description below. \\ +lineno & this option loads the \texttt{\hrefurl{https://ctan.org/pkg/lineno}{lineno}} package, which provides line numbers, as for editing. The \texttt{\hrefurl{https://ctan.org/pkg/lineno}{lineno}} package provides additional commands to control line numbering. \\ +mydesign & this option loads the file \texttt{mydesign.tex}, which in turn loads the packages \texttt{\hrefurl{https://ctan.org/pkg/xcolor}{xcolor}}, \texttt{\hrefurl{https://ctan.org/pkg/titlesec}{titlesec}}, \texttt{\hrefurl{https://ctan.org/pkg/enumitem}{enumitem}}, \texttt{\hrefurl{https://ctan.org/pkg/caption}{caption}}, \texttt{\hrefurl{https://ctan.org/pkg/subcaption}{subcaption}}, and anything else that affects document design. You may edit \texttt{mydesign.tex} +as you prefer.\\ +twoside & gives facing-page behavior for two-sided printing; omitting it will eliminate the even-numbered blank pages.\\[\jot] +\bottomrule +\end{tabular}}% +\end{table} + +\subsection*{Font loading} +By default, \texttt{mitthesis.cls} will load the traditional \LaTeX\ fonts, computer modern (\pdfTeX) or latin modern (unicode engines). By using the key value \texttt{fontset=$\cdots$} in the \verb|\documentclass| command, you can select a different set of fonts. + +Ten fontsets are predefined, including the default set (see Table~\ref{tab:2}). Three work only with \pdfTeX, four work only with unicode engines, and three work with either. These options include a mixture of serif or sans serif text and math fonts, as shown in the table. + +Among these fonts, Termes and NewTX are serifed fonts similar to the digital font Times New Roman. STIX Two is more similar to the original metal-type Times font. Linux Libertine is a serif font inspired by 19\textsuperscript{th} century book type. Lucida is a serifed font designed for high legibility at small size or on low resolution devices. This font is excellent for mathematics and includes a complete bold-face math font, but it is not free. Heros and NewTX-sans are sans-serif text fonts similar to Helvetica. NewTXsf is a sans-serif math font which draws upon glyphs from the STIX font. Fira is a humanist sans-serif text font designed in association with the Firefox browser. Finally, Computer Modern (and its extension Latin Modern)---the traditional ``\LaTeX\ font''---is a Didone font, with high contrast between thick and thin elements. + +You may also write your own fontset file, say \texttt{Myfontset.tex}, and then load it with + +\vskip10pt +\hfill\verb|\documentclass[fontset=Myfontset]{mitthesis}|\hfill\hbox{} + +\begin{table}[tbh] +\caption{Predefined font sets\label{tab:2}} +\smallskip +\centering{% +\small +\begin{tabular}{>{\ttfamily}l<{}l l p{3em} p{3em} >{\raggedright\arraybackslash}p{22em} } +\toprule +fontset & \pdfTeX & unicode & text font & math font & details \\ +\midrule +fira-newtxsf & yes & no & sans & sans & included in \TeX\ Live \\ +newtx & yes & no & serif & serif & included in \TeX\ Live \\ +newtx-sans-text & yes & no & sans & serif & included in \TeX\ Live \\[1em] +default & yes & yes & serif & serif & CM \& LM fonts are included in \TeX\ Live \\ +libertine & yes & yes & serif & serif & in \TeX\ Live for \pdfTeX. For unicode, OpenType text fonts freely available here +\linebreak \url{https://sourceforge.net/projects/linuxlibertine/}\linebreak and the math font here +\linebreak \url{https://github.com/alerque/libertinus} \\ +lucida & yes & yes & serif & serif & the lucida fonts are available from the \TeX\ User's Group, +\url{https://tug.org/store/lucida} \\[2em] +heros-stix2 & no & yes & sans & serif & \url{http://www.gust.org.pl/projects/e-foundry/tex-gyre} \linebreak\url{https://github.com/stipub/stixfonts} \linebreak both fonts are free \\ +stix2 & no & yes & serif & serif & \url{https://github.com/stipub/stixfonts}, fonts are free\\ +termes & no & yes & serif & serif & \url{http://www.gust.org.pl/projects/e-foundry/tex-gyre} fonts are free\\ +termes-stix2 & no & yes & serif & serif & \url{http://www.gust.org.pl/projects/e-foundry/tex-gyre} \linebreak\url{https://github.com/stipub/stixfonts}\linebreak both fonts are free\\ +\midrule +\multicolumn{5}{l}{Typewriter (monospaced) fonts are also loaded for unicode} & Inconsolata (sans serif): \url{https://ctan.org/tex-archive/fonts/inconsolata} Cursor (serif): \url{http://www.gust.org.pl/projects/e-foundry/tex-gyre} \\ +\bottomrule +\end{tabular}}% +\end{table} + +\subsection*{Design options} +The thesis will follow the default styles of the \LaTeX\ report class for sections headings, captions, and lists. If you prefer different styles you can edit the file \texttt{mydesign.tex}. \textit{If you are happy with the default styles, you do not need to edit this file!} + +With \texttt{mydesign.tex}, you can set options for packages that manage color, e.g.\ \texttt{\hrefurl{https://ctan.org/pkg/xcolor}{xcolor}}, that change the margins, or that change the design of titles, captions, and lists: \texttt{\hrefurl{https://ctan.org/pkg/titlesec}{titlesec}}, \texttt{\hrefurl{https://ctan.org/pkg/caption}{caption}}, or \texttt{\hrefurl{https://ctan.org/pkg/enumitem}{enumitem}}. You can also load other packages. The \texttt{mitthesis} class will insert these commands at the appropriate point (prior to loading \texttt{\hrefurl{https://ctan.org/pkg/babel}{babel}}, fonts, or \texttt{\hrefurl{https://ctan.org/pkg/hyperref}{hyperref}}). You should not need to edit the class file. + +\subsection*{Single-sided vs.\ double-sided layout} +The sample template uses the option \texttt{[twosided]}, which starts major sections (abstract, table of contents, chapters, etc.) on odd-numbered pages. This arrangement is suitable for two-sided printing, but can lead to empty even-numbered pages. If you do not wish to have this behavior, omit that option. By default, even and odd page margins are the same; this can be changed in the \texttt{mydesign.tex} file if necessary. + +\section*{PDF/A compatibility} +PDF/A-2b compliance will be automatic if the \verb|\DocumentMetadata{..}| command is issued before the \verb|\documentclass{..}| command and \textit{provided that your graphics are also compliant}. This command was added to \LaTeX\ in June 2022. For older versions of \LaTeX, the \texttt{mitthesis} class will fall back to loading \texttt{hyperxmp} to support pdf metadata, but PDF/A compliance will require post-processing (for example, by using the PreFlight function of Adobe Acrobat). An up-to-date \LaTeX\ installation is preferred. + +Current \LaTeX\ development (ca.~2023) is working toward fully accessible PDF/A out of the box (e.g., PDF/A-2a). Unicode compliance (e.g., PDF/A-2u) depends greatly on your fonts and figures. + + +\section*{Packages loaded by the class and by the user} +See Table~\ref{tab:3}. The documentation for these packages is available at CTAN, \url{https://ctan.org}. Alternatively, if you have \hrefurl{https://www.tug.org/texlive/}{\TeX\ Live} installed, you can open a terminal window and type \texttt{\%\ texdoc package-name}. + +\begin{table}[t] +\caption{Packages called. For documentation, visit CTAN, \url{https://ctan.org}.\label{tab:3}} +\vskip5pt +\centering{\small% +\setlength\extrarowheight{3pt} +\begin{tabular}{>{\ttfamily}l<{}p{18em} p{18em} } +\toprule +Package & Class & User \\ +\midrule +bookmarks& is loaded automatically under the new pdf-management system & --- \\ +doi & support for hyperlinking DOIs & hyperlink a doi number: \verb|\doi{..}| \\ +etoolbox & extend or modify other macros & can use in preamble if needed \\ +iftex & check which \LaTeX\ engine is running& macros to check engine \\ +ifthen & streamlined conditionals & can use in preamble if needed \\ +geometry & set page size and margins & ---\\ +graphicsx& support for inserting images & use to include graphics\\ +hyperref & support for hyperlinks and metadata & must complete setup in preamble\\ +hyperxmp & fallback if no \verb|\DocumentMetadata{..}|& ---\\ +kvoptions& key values for systems pre 2022/11/01 & ---\\ +mathtools& loads and extends \texttt{amsmath} & \textbf{many useful math macros available}. See documentation for \texttt{amsmath} and \texttt{mathtools} \\ +xparse & for systems older than 2020/10/01 & macros to define new commands\\[0.7em] +\midrule +lineno & option for the class & keyvalue \texttt{lineno} will give line numbers; \texttt{lineno} package has additional commands that control line numbering\\[3em] +\midrule +caption & loaded by \texttt{mydesign.tex} & support for caption styling \\ +subcaption & loaded by \texttt{mydesign.tex} & support for subfigures within figures \\ +titlesec & loaded by \texttt{mydesign.tex} & support for styling section headings \\ +xcolor & loaded by \texttt{mydesign.tex} & support for colors, including colored fonts \\[0.7em] +\midrule +babel & --- & if you use multiple languages, load \texttt{babel} in a fontset file before loading fonts \\ +biblatex & --- & sample template uses this bibliography tool. Change to \texttt{natbib} if you prefer\\ +fontenc & --- & load this in a fontset file if you use \pdfTeX\\ +fontspec & --- & load this in a fontset file if you are using a unicode engine (note that \texttt{unicode-math} loads \texttt{fontspec} by default)\\ +lipsum & --- & create filler text (see sample template, Chapter~1) \\ +listings & --- & to list computer code (see sample template, Appendix~A) \\ +mhchem & --- & to format chemical formul\ae\ (see sample template, Chapter~1) \\ +setspace & --- & can change the default line spacing with the commands of this package\\ +unicode-math & --- & load in a fontset file if you are using a unicode engine\\ +\bottomrule +\end{tabular}}% +\end{table} + +\section*{Packages for math, chemistry, code listings, and more} +The \texttt{mitthesis} class loads the \texttt{amsmath} package and its extension \texttt{mathttools}. These packages provide many useful macros for typesetting equations and symbols, such as: environments for aligning and splitting equations or groups of equations; tools for matrices; a wide variety of operators and symbols; tools to define new math operators and paired delimiters; and much, much more. If you are including equations, look at the documentation for these packages: \url{https://ctan.org/pkg/amsmath} and \url{https://ctan.org/pkg/mathtools}.\looseness=1 + +Specialized packages for many disciplines can be found in \hrefurl{https://ctan.org}{CTAN}. These include subjects like \hrefurl{https://ctan.org/topic/chemistry}{chemistry}, \hrefurl{https://ctan.org/topic/linguistic}{linguistics}, and \hrefurl{https://ctan.org/topic/physics}{physics}. As examples of such packages, the sample thesis template uses the package \texttt{\hrefurl{https://ctan.org/pkg/mhchem}{mhchem}} to set chemical equations and the package \texttt{\hrefurl{https://ctan.org/pkg/listings}{listings}} to list computer code. + +When selecting a package to use, check that it is currently maintained (with relatively recent updates), and compare it to other packages that perform similar functions. Some packages are better than others, and some obsolete packages remain online. + +\section*{Nomenclature} +An optional nomenclature environment is provided by the class. This environment can support either chapter-by-chapter nomenclature (at the section level) or a single nomenclature for the entire thesis (at the chapter level). The environment has three optional arguments: [1] adjust space between symbol and definition; [2] name (heading) of the nomenclature list; and [3] level, which can be ``section'' or ``chapter'' depending on whether you +have one nomenclature list for whole thesis or one for each chapter. + +For example, the following code +\begin{center} +\begin{minipage}{0.8\textwidth} +\begin{verbatim} +\begin{nomenclature}[2em][Nomenclature for Chapter 1][section] +\EntryHeading{Roman letters} +\entry{$A$}{the letter A} +\entry{$\mathbf{r}$}{material position} +\entry{$\mathbf{u}$}{velocity} +\EntryHeading{Greek letters} +\entry{$\Gamma$}{circulation} +\entry{$\rho$}{mass density} +\end{nomenclature} +\end{verbatim} +\end{minipage} +\end{center} +produces the nomenclature list below +\begin{center} +\begin{minipage}{0.8\textwidth} +\begin{nomenclature}[2em][Nomenclature for Chapter 1][section] +\EntryHeading{Roman letters} +\entry{$A$}{the letter A} +\entry{$\mathbf{r}$}{material position} +\entry{$\mathbf{u}$}{velocity} +\EntryHeading{Greek letters} +\entry{$\Gamma$}{circulation} +\entry{$\rho$}{mass density} +\end{nomenclature} +\end{minipage} +\end{center} +\section*{Resources for \LaTeX} +\LaTeX\ documentation is easy to find online. A few useful resources, among many, are these: +\begin{description} +\item[\LaTeX\ Wikibook.] \url{https://en.wikibooks.org/wiki/LaTeX}. An online tutorial book. +\item[\LaTeX 2e: An unofficial reference manual.] \url{https://latexref.xyz/dev/latex2e.html}. A comprehensive explanation of each \LaTeX\ command, from the \TeX\ User's Group. +\item[\TeX\ Stack-Exchange.]\ \url{https://tex.stackexchange.com/}. More than 250,000 answered questions, and you can ask your own! +\end{description} + +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/mitthesis/mitthesis-sample.bib b/macros/latex/contrib/mitthesis/mitthesis-sample.bib new file mode 100644 index 0000000000..87828e0351 --- /dev/null +++ b/macros/latex/contrib/mitthesis/mitthesis-sample.bib @@ -0,0 +1,325 @@ +%% Sample bibliography file for mitthesis.cls +%% +%% Revised: 13 June 2023 +%% Copyright John H. Lienhard, MIT +%% Offered under the MIT license: https://ctan.org/license/mit + +%% REFER TO biblatex documentation for details about possible fields +%% bibtex support depends on the bibtex style (.bst) and is usually more limited + +@article{DKE1969, + author = {Donald K. Edwards}, + year = {1969}, + title = {Radiative Transfer Characteristics of Materials}, + journal = {{ASME} J. Heat Transfer}, + volume = 91, + number = 1, + pages = {1--15}, + doi = {10.1115/1.3580108}, + month = feb, +} +%% @article requires these fields: author, title, journaltitle, year/date +%% +%% Optional fields in biblatex: translator, annotator, commentator, subtitle, +%% titleaddon, editor, editora, editorb, editorc, journalsubtitle, +%% journaltitleaddon, issuetitle, issuesubtitle, +%% issuetitleaddon, language, origlanguage, series, volume, +%% number, eid, issue, month, pages, version, note, issn, addendum, +%% pubstate, doi, eprint, eprintclass, eprinttype, url, urldate + +@book{ww1920, + author = {Edwin Taylor Whittaker and George Neville Watson}, + year = {1920}, + title = {A Course of Modern Analysis}, + edition = {3}, + publisher = {Cambridge University Press}, + address = {Cambridge, UK}, + url = {https://archive.org/details/courseofmodernan00whit}, +} +%% @book requires these fields: author, title, year/date +%% +%% Optional fields: editor, editora, editorb, editorc, translator, +%% annotator, commentator, introduction, foreword, afterword, +%% subtitle, titleaddon, maintitle, mainsubtitle, maintitleaddon, +%% language, origlanguage, volume, part, edition, volumes, series, +%% number, note, publisher, location, isbn, eid, chapter, pages, +%% pagetotal, addendum, pubstate, doi, eprint, eprintclass, +%% eprinttype, url, urldate + +@inproceedings{Swaminathan2017IDABRO, + author = {Swaminathan, Jaichander and Stover, Richard L. and Tow, Emily W. and Warsinger, David M. and Lienhard, John H.}, + booktitle = {Proceedings of IDA World Congress on Desalination and Water Reuse}, + title = {Effect of Practical Losses on Optimal Design of Batch {RO} Systems}, + year = {2017}, + month = oct, + publisher = {International Desalination Association}, + venue = {S{\~a}o Paulo, Brazil}, + eventdate = {2017-10-15/2017-10-20}, + eprinttype= {hdl}, + eprint = {1721.1/111971}, + number = {IDA17WC-58334}, +} +%% @inproceedings requires these fields: author, title, booktitle, year/date +%% +%% Optional fields: editor, subtitle, titleaddon, maintitle, +%% mainsubtitle, maintitleaddon, booksubtitle, booktitleaddon, +%% eventtitle, eventtitleaddon, eventdate, venue, language, +%% volume, part, volumes, series, number, note, organization, +%% publisher, location, month, isbn, eid, chapter, pages, addendum, +%% pubstate, doi, eprint, eprintclass, eprinttype, url, urldate + +@report{reynolds1958, + author = {William C. Reynolds and William M. Kays and Stephen J. Kline}, + title = {Heat transfer in the Incompressible Turbulent Boundary Layer. {I}---Constant Wall Temperature}, + type = {NASA Technical Memorandum No.}, + number = {12-1-58W}, + institution = {National Aeronautics and Space Administration}, + address = {Washington, DC}, + year = {1958}, + eprinttype= {hdl}, + eprint = {2060/19980228020}, + month = dec, +} +%% Equivalent links for this case: url = {https://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19980228020.pdf}, +%% url = {https://hdl.handle.net/2060/19980228020}, +%% +%% @report requires these fields: author, title, type, institution, year/date +%% +%% Optional fields: subtitle, titleaddon, language, number, version, +%% note, location, month, isrn, eid, chapter, pages, pagetotal, +%% addendum, pubstate, doi, eprint, eprintclass, eprinttype, url,urldate + +@incollection{clauser56, + author = {Francis H. Clauser}, + year = {1956}, + title = {The Turbulent Boundary Layer}, + booktitle = {Advances in Applied Mechanics}, + editor = {H. L. Dryden and Th. von K\'arm\'an}, + volume = {4}, + publisher = {Elsevier}, + address = {Amsterdam, The Netherlands}, + pages = {1--51}, + doi = {10.1016/S0065-2156(08)70370-3}, +} +%% This case is an article in series of edited books where the series title is the same for all volumes. +%% +%% incollection requires these fields: author, title, editor, booktitle, year/date +%% +%% Optional fields: editor, editora, editorb, editorc, translator, +%% annotator, commentator, introduction, foreword, afterword, +%% subtitle, titleaddon, maintitle, mainsubtitle, maintitleaddon, +%% booksubtitle, booktitleaddon, language, origlanguage, volume, +%% part, edition, volumes, series, number, note, publisher, +%% location, isbn, eid, chapter, pages, addendum, pubstate, doi, +%% eprint, eprintclass, eprinttype, url, urldate + +@thesis{gibbs1863, + author = {Joisah Willard Gibbs}, + year = {1863}, + title = {On the Form of the Teeth of Wheels in Spur Gearing}, + type = {Ph.{D}. dissertation}, + school = {Yale University}, + address = {New Haven, CT}, +} +%% phdthesis requires these fields: author, title, type, institution, year/date +%% +%% Optional fields: subtitle, titleaddon, language, note, location, +%% month, isbn, eid, chapter, pages, pagetotal, addendum, pubstate, +%% doi, eprint, eprintclass, eprinttype, url, urldate +%% +%% Use the type field to specify the type of thesis. type = {}, + +@proceedings{johnson1965, + editor = {Howard W. Johnson}, + title = {The Title of the Proceedings}, + year = 1965, + volume = 2, + organization = {Organization}, + venue = {City, State}, + eventdate = {1965-04-27/1965-04-28}, + url = {https://news.mit.edu/2009/obit-johnson}, +} +%% @proceedings requires these fields: title, year/date +%% +%% Optional fields: editor, subtitle, titleaddon, maintitle, +%% mainsubtitle, maintitleaddon, eventtitle, eventtitleaddon, eventdate, venue, language, volume, part, volumes, series, +%% number, note, organization, publisher, location, month, isbn, eid, chapter, pages, pagetotal, addendum, pubstate, doi, eprint, +%% eprintclass, eprinttype, url, urldate + +@manual{GSL, + title = {{GNU} Scientific Library}, + author = {Mark Galassi + and Jim Davies + and James Theiler + and Brian Gough + and Gerard Jungman + and Patrick Alken + and Michael Booth + and Fabrice Rossi + and Rhys Ulerich}, + version = {2.4}, + organization = {Free Software Foundation}, + address = {Boston, MA}, + year = 2017, + url = {https://www.gnu.org/software/gsl/}, + urldate = {2018-12-12}, +} +%% @manual requires these fields: author/editor, title, year/date +%% +%% Optional fields: subtitle, titleaddon, language, edition, type, +%% series, number, version, note, organization, publisher, +%% location, isbn, eid, chapter, pages, pagetotal, addendum, +%% pubstate, doi, eprint, eprintclass, eprinttype, url, urldate + +@online{sharpe1, + author = {Michael Sharpe}, + year = {2022}, + month = mar, + title = {New {TX} Font Package}, + version = {1.71}, + organization = {Comprehensive \TeX\ Archive Network}, + url = {https://ctan.org/pkg/newtx}, + urldate = {2023-05-29}, +} +%% @online requires these fields: author/editor, title, year/date, doi/eprint/url +%% +%% Optional fields: subtitle, titleaddon, language, version, note, +%% organization, month, addendum, pubstate, eprintclass, eprinttype, urldate + +@misc{Fong2015, + title = {Analytical Methods for Squaring the Disc}, + year = {2015}, + author = {Chamberlain Fong}, + howpublished = {{\itshape ArXiv e-prints}}, + eprint = {1509.06344}, + eprinttype= {arxiv}, + month = sep, +} +%% @misc requires these fields: author/editor, title, year/date +%% +%% Optional fields: subtitle, titleaddon, language, howpublished, type, version, note, +%% organization, location, month, addendum, pubstate, doi, eprint, eprintclass, +%% eprinttype, url, urldate + +@BOOK{kirk2288a, + author = {James Tiberius Kirk}, + year = {2288}, + title = {Decline and Fall of the Romulan Empire}, + edition = 7, + series = {Humankind's Greatest Writings}, + number = {23}, + publisher = {Vulcan Free Press}, + address = {T'Paal}, + addendum = {To appear.}, +} +%% One book in a series of books +%% Under bibtex, replace addendum by note + +@bookinbook{churchill1948, + author = {Winston S. Churchill}, + year = {1948}, + title = {The Gathering Storm}, + series = {The Second World War}, + volume = {1}, + chapter = {5, {``The Locust Years''}}, + pages = {66--89}, + url = {https://www.worldcat.org/oclc/3025315}, + publisher = {Houghton Mifflin Co.}, + address = {Boston}, +} +%% one book in a multivolume book written by a single author +%% with bibtex, revert to "inbook" + +@BOOK{johnson1980, + editor = {Howard Johnson}, + year = {1980}, + title = {Title of Edited Book}, + publisher = {John Wiley and Sons, Inc.}, + address = {New York, NY}, +} +%% edited book + +@book{fourier1822, + author = {Jean Baptiste Joseph Fourier}, + year = {1822}, + title = {Th\'{e}orie Analytique de la Chaleur}, + publisher = {Firmin Didot, P\`{e}re et Fils}, + address = {Paris}, + url = {https://archive.org/details/analyticaltheory00fourrich}, +} +%% old book, not much difference + +@online{dlmf, + title = {{NIST} {D}igital Library of Mathematical Functions}, + version = {1.1.19}, + year = {2023}, + month = mar, + editor = {F. W. J. Olver and A. B. {Olde Daalhuis} and D. W. Lozier and B. I. Schneider and + R. F. Boisvert and C. W. Clark and B. R. Miller and B. V. Saunders}, + organization = {National Institute of Standards and Technology}, + address = {Gaithersburg, MD}, + url = {https://dlmf.nist.gov/}, + urldate = {2023-05-29}, +} + +@article{lienhard2020, + author = {Lienhard, John H.}, + title = {Heat Transfer in Flat-Plate Boundary Layers: A Correlation for Laminar, Transitional, and Turbulent Flow}, + journal = {{ASME} J. Heat Transfer}, + volume = {142}, + number = {6}, + eid = {061805}, + year = {2020}, + month = jun, + doi = {10.1115/1.4046795 }, +} +%% note use of: eid in place of pages +%% url = {https://doi.org/10.1115/1.4055833}, + +@manual{amsmath, + author = {{American Mathematical Society} and {The \LaTeX\ Project}}, + year = {2020}, + month = feb, + title = {User's Guide for the \textsf{amsmath} Package }, + version = {2.1}, + organization = {Comprehensive \TeX\ Archive Network}, + url = {https://ctan.org/tex-archive/macros/latex/required/amsmath/amsldoc.pdf}, + urldate = {2023-05-29}, +} + +@article{euler1740, + author = {Leonard Euler}, + year = 1740, + title = {De Summis Serierum Reciprocarum}, + journal = {Commentarii Acad\-emiae Scientiarum Petropolitanae}, + volume = 7, + pages = {123--134}, + eprinttype= {arxiv}, + eprint = {math/0506415}, + addendum = {First communicated to Daniel Bernoulli in 1734 and read before the St.\ Petersburg Academy in December 1735}, +} +% with bibtex, change addendum to note. + +@article{montijano2014, + title = {Numerical Methods With LuaLaTeX}, + author = {Juan I. Montijano and Mario P{\'{e}}rez and Luis R{\'{a}}ndez and Juan Luis Varona}, + year = 2014, + volume = 35, + month = jan, + number = {1}, + pages = {51--56}, + journal = {TUGboat}, + url = {https://tug.org/TUGboat/tb35-1/tb109montijano.pdf}, +} + +@online{mpl, + title = {mpl Colormaps}, + author = {St{\'e}fan {van der Walt} and Nathaniel Smith}, + url = {https://bids.github.io/colormap/}, + urldate = {2018-08-26}, + year = 2015, + organization = {GitHub}, + address = {San Francisco, CA}, + month = sep, +} +
\ No newline at end of file diff --git a/macros/latex/contrib/mitthesis/mitthesis.cls b/macros/latex/contrib/mitthesis/mitthesis.cls new file mode 100644 index 0000000000..250369020b --- /dev/null +++ b/macros/latex/contrib/mitthesis/mitthesis.cls @@ -0,0 +1,631 @@ +% MIT thesis class + +% !TEX encoding = UTF-8 Unicode +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% This file provides the mitthesis LaTeX class for formatting theses according to +%% MIT Libraries' requirements as of 2023. +%% +%% This file's version and date: + \def\versionno{1.00} + \def\versiondate{2023/06/17\space} +%% +%% Author: John H. Lienhard, V +%% Department of Mechanical Engineering +%% Massachusetts Institute of Technology +%% Cambridge, MA 02139-4307 USA +%% +%% This class is compatible with either pdfLaTeX or LuaTeX. +%% +%% Use an up-to-date LaTeX distribution: TeX Live 2023 or later is strongly recommended! +%% All packages required by the class are in TeX Live and available on CTAN (https://ctan.org/). +%% +%% +% ========================================================= +%% +%% LICENSE: +%% +%% Copyright (c) 2023 John H. Lienhard +%% +%% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +%% associated documentation files (the "Software"), to deal in the Software without restriction, +%% including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +%% and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +%% subject to the following conditions: +%% +%% The above copyright notice and this permission notice shall be included in all copies or +%% substantial portions of the Software. +%% +%% The software is provided "as is", without warranty of any kind, express or implied, including but +%% not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. +%% In no event shall the authors or copyright holders be liable for any claim, damages or other liability, +%% whether in an action of contract, tort or otherwise, arising from, out of or in connection with the +%% software or the use or other dealings in the software. +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\NeedsTeXFormat{LaTeX2e} +\ProvidesClass{mitthesis}[\versiondate MIT Thesis Template (JHL)] + +\LoadClass[12pt]{report}% [twoside] option can be issued in the .tex file; point size must be set here. + +\RequirePackage{etoolbox}% provides \ifblank, \patchcmd, \apptocmd, etc. +\RequirePackage{ifthen} % provides \whiledo, etc. + +\def\ClassName{mitthesis} + +%%%%%%%%%%%%% Some compatibility for older latex distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}% compare version to date +\providecommand\IfPackageAtLeastTF{\@ifpackagelater}% compare version to date + +\ifdefined\NewDocumentCommand\else + \RequirePackage{xparse}% enable pre-10/2020 formats to access essential macros later moved into LaTeX kernel +\fi + +\IfFormatAtLeastTF{2020/02/25}{% + \typeout{^^JYour LaTeX format is dated \fmtversion. LaTeX distributions from 2022/11/01 or later are strongly recommended for best results^^J} + }{% + \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. Formats dated 2022/11/01 or later are recommended for this class. Older formats may generate errors}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. You can try to click past the errors for now...}% +} + +\IfFileExists{iftex.sty}{% + \RequirePackage{iftex}% check whether pdftex or another engine is used + }{% + \ClassWarning{\ClassName}{This class requires the missing package iftex.sty---trying a work-around.} + % Code copied from iftex package written by the LaTeX3 Project (used under LPPL). + % \csname and \let construct useful for hiding \ifzzz tokens from outer level \if tests. + \def\IFTEX@let#1#2{% + \expandafter\let\csname if#1\expandafter\endcsname + \csname if#2\endcsname} + % pdftex (including in dvi mode) + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdftexversion\endcsname\relax + \IFTEX@let{pdftex}{false} + \else + \IFTEX@let{pdftex}{true} + \fi + \IFTEX@let{PDFTeX}{pdftex} + } + +% check whether pdfmanagement (\DocumentMetadata) has been loaded (to fallback on hyperxmp) +\newif\ifmit@pdfmanagement +% As of 2021/07/23 we could instead do:\IfPDFManagementActiveTF{\mit@pdfmanagementtrue}{\mit@pdfmanagementfalse} +\ExplSyntaxOn + \IfFormatAtLeastTF{2020/02/25}{% + \bool_if:nTF + { + \bool_lazy_and_p:nn + {\cs_if_exist_p:N \pdfmanagement_if_active_p:} + { \pdfmanagement_if_active_p: } + } + { + \mit@pdfmanagementtrue + } + { + \mit@pdfmanagementfalse + } + }{\mit@pdfmanagementfalse} +\ExplSyntaxOff + +%% Old installations may want textcomp load, but we only require this character: +\ifdefined\textcopyright\else\def\textcopyright{©}\fi + +%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\IfFormatAtLeastTF{2022/11/01}{% +% \typeout{^^JUsing native keyvalue support^^J}% diagnostic info + \DeclareKeys{ + fontset .store = \mit@fontset , + fontset .usage = load , + lineno .if = mit@lineno , + lineno .usage = load , + mydesign .if = mit@mydesign, + mydesign .usage = load , + } + \SetKeys[\ClassName]{fontset=defaultfonts}% + \DeclareUnknownKeyHandler[\ClassName]{\relax}% suppress warning about unused keys + \ProcessKeyOptions +}{% + \RequirePackage{kvoptions} + \SetupKeyvalOptions{ + family=\ClassName, + prefix=mit@, + setkeys=\kvsetkeys, + } + % set key [fontset] for font selection + \DeclareStringOption[defaultfonts]{fontset}[] + % + \ProcessKeyvalOptions{\ClassName} + % + %% Turn off these keys now that we're done with them + \def\@KeyFamily{\ClassName} + \NewDocumentCommand\mit@DisableOption{m}{% + \DisableKeyvalOption[% + action=ignore,% + class=\ClassName% + ]{#1}{\@KeyFamily}% + } + \NewDocumentCommand\@DisableKeys{>{\SplitList{;}}m}{\ProcessList{#1}{\mit@DisableOption}} + % + \@DisableKeys{fontset;}% + + + %%%%%%%% more options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + %%% option to obtain line numbers [lineno] + \newif\ifmit@lineno\mit@linenofalse + \DeclareOption{lineno}{\mit@linenotrue} + + %%% option for to load packages that customize the design [mydesign] (caption, subcaption, titlesec, itemenum) + \newif\ifmit@mydesign\mit@mydesignfalse + \DeclareOption{mydesign}{\mit@mydesigntrue} + + %% Suppress warnings about unused global options + \DeclareOption*{} + + \ProcessOptions \relax +} + +%%%%%%%%%%%%% Line numbering (class option) %%%%%%%%%%%%%%%%%%%%%%%%% + +%%% Adjustments when lineno option is used +\ifmit@lineno + \RequirePackage[mathlines]{lineno} + \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}} + \AtBeginDocument{\linenumbers} +\fi + +%%% Enable dropping lineno option without trashing .aux file +\providecommand{\@LN@col}[1]{\relax} +\providecommand{\@LN}[2]{\relax} + + +%%%%%%%%%%%%% Geometry, mathtools, design, graphics, bibliography, hyperrefs, bookmarks %%%%%%%%%%%%%%%%%%%%%%% + +\RequirePackage[letterpaper,top=1in,bottom=1in,left=1in,right=1in,marginparwidth=50pt,headsep=12pt,footskip=0.5in]{geometry} + +\RequirePackage{mathtools}% loads and extends amsmath; must load before hyperref and unicode-math +% +% To free \eqref from the normal font (i.e., for use section headings) +\renewcommand{\eqref}[1]{\textup{\hbox{\m@th{(\ignorespaces\ref{#1}\unskip\@@italiccorr)}}}} +% +% amsmath def: \newcommand{\eqref}[1]{\textup{\tagform@{\ref{#1}}}} +% \def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip\@@italiccorr)}} +% \def\maketag@@@#1{\hbox{\m@th\normalfont#1}} + +% the packages in mydesign should come before babel (which may be loaded by fontset) and hyperref +\ifmit@mydesign\input{mydesign.tex}\fi + +%% Font loading +\typeout{^^JFontset key is \mit@fontset^^J} +\input{fontsets/\mit@fontset.tex} + +\RequirePackage{graphicx} + +\ifmit@pdfmanagement + \ClassInfo{\ClassName}{pdfmanagement is defined. Will not load hyperxmp}% +\else + \ClassInfo{\ClassName}{pdfmanagement is not defined. Will load hyperxmp}% + \RequirePackage{hyperxmp} +\fi + +\RequirePackage[psdextra]{hyperref} +% the new pdf-management scheme loads the bookmarks package internally. +% authors should use hypersetup to set details, in root .tex file + +\urlstyle{same} % this changes font for \url to the current text font +\providecommand\hrefurl[2]{\href{#1}{#2}}% in case new pdf management has not been loaded +\RequirePackage{doi} % create macro for hyperlinking doi numbers + +% Directly add the xmp property that shows work is copyrighted. See l3pdfmeta.pdf. +% This is not automatic with \DocumentMetadata. "True" must be capitalized. +\ExplSyntaxOn + \cs_if_exist:NTF \pdfmeta_xmp_add:n {\pdfmeta_xmp_add:n{<xmpRights:Marked>True</xmpRights:Marked>}}{} +\ExplSyntaxOff + + +%%%%%%%%%%%%% Stuff related to PDF bookmarks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%% Since \bm may be useful in headings, this fix will reduce frequency with which +%%% alternate pdfstrings must be given in revised section command as \section[pdfstring]{texstring} +\pdfstringdefDisableCommands{% + \def\bm#1#{\relax}% +} +% +%%% Let's disable \( and \) in pdf bookmarks +\pdfstringdefDisableCommands{% + \def\({\relax}% + \def\){\relax}% +} +% +%%% Let's also make sure \NoCaseChange in section headings won't break pdf bookmarks +\pdfstringdefDisableCommands{% + \let\NoCaseChange\relax% +} +% +%%% Let's just remove citations from pdf bookmarks +\pdfstringdefDisableCommands{% + \def\cite{\@gobble}% +} +% +%%% Let's fix \eqref in pdf bookmarks +\pdfstringdefDisableCommands{% + \def\eqref#1{(\ref{#1})}% +% +%%% Let's make sure footnotes in section headings don't break pdf bookmarks. +\robustify{\footnote} +% \patchcmd{\section}{\sectionmark}{\let\footnote\@gobble\sectionmark}{}{}% <== not needed unless you implement running heads +\pdfstringdefDisableCommands{% + \def\footnote#1{}% +} +} + +\let\oldfootnote\footnote +\renewcommand\footnote[1]{% + \oldfootnote{#1}\futurelet\nextToken\isOtherfnote} + +\newcommand\isOtherfnote{% + \ifx\footnote\nextToken\textsuperscript{\mdseries,}% + \fi% +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%% MACROS FOR HANDLING TITLE AND ABSTRACT PAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%% Dates %%%%%%%%%%%%%%% + +\ExplSyntaxOn +\NewExpandableDocumentCommand\MonthCheck{mm}{% + \str_case_e:nnF {#1}{ {June}{} {September}{} {February}{} + {\space June}{} {\space September}{} {\space February}{} + {June\space}{} {September\space}{} { February\space}{} + {\space June\space}{} {\space September\space}{} {\space February\space}{} + }{#2} +} +\ExplSyntaxOff + +\NewDocumentCommand\DegreeDate{mm}{% + \def\@DegreeMonth{\ignorespaces#1}% + \def\@@DegreeMonth{#1}% + \def\@DegreeYear{\ignorespaces#2}% + \def\DegreeYear{\ignorespaces#2}% +} + +\NewDocumentCommand\ThesisDate{m}{% + \def\@ThesisDate{\ignorespaces#1}% +} + +%%%%%%%%%%%%%% Author, supervisor, acceptor, titles, and departments %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newcounter{authorcnt} +\setcounter{authorcnt}{0}% this counter's final value is used repeatedly. + +\NewDocumentCommand\Author{m m oooo}{% + \ifblank{#1}{% + \ClassError{\ClassName}{Missing author name, check for blank in Author command}{% + You MUST provide an author name using the \Author{name}{department} command.}% + }{% + \addtocounter{authorcnt}{1}% + \expandafter\xdef\csname aut@\theauthorcnt\endcsname{\ignorespaces#1}% + \expandafter\xdef\csname autdep@\theauthorcnt\endcsname{\ignorespaces#2}% + \IfNoValueF{#3}{\expandafter\xdef\csname prevdegree@\theauthorcnt\endcsname{\ignorespaces#3}}% + \IfNoValueF{#4}{\expandafter\xdef\csname secondprevdegree@\theauthorcnt\endcsname{\ignorespaces#4}}% + \IfNoValueF{#5}{\expandafter\xdef\csname thirdprevdegree@\theauthorcnt\endcsname{\ignorespaces#5}}% + \IfNoValueF{#6}{\expandafter\xdef\csname fourthprevdegree@\theauthorcnt\endcsname{\ignorespaces#6}}% + }% + \ifblank{#2}{\ClassWarning{\ClassName}{Missing author department, check for blank in Author command}}{}% +}% defines \aut@authorcnt as Name #1 and \autdep@authorcnt as Name #1's department + +\newcounter{authorno} +\setcounter{authorno}{0} + +\NewDocumentCommand\@AuthorBlock{}{% + \setcounter{authorno}{1}% + \ifnum\value{authorcnt}=0 + \ClassError{\ClassName}{Missing author! You must issue the \Author{name}{department} command}{% + You MUST issue the \Author{name}{department} command after \begin{document} and before \maketitle.}% + \fi + {by\par + \whiledo{\value{authorno}<\value{authorcnt}}{% + \ignorespaces\csname aut@\theauthorno\endcsname\par + \ifcsundef{prevdegree@\theauthorno}{\relax}{\normalsize\csname prevdegree@\theauthorno\endcsname}% + \ifcsundef{secondprevdegree@\theauthorno}{\relax}{\\ \normalsize\csname secondprevdegree@\theauthorno\endcsname}% + \ifcsundef{thirdprevdegree@\theauthorno}{\relax}{\\ \normalsize\csname thirdprevdegree@\theauthorno\endcsname}% + \ifcsundef{fourthprevdegree@\theauthorno}{\relax}{\\ \normalsize\csname fourthprevdegree@\theauthorno\endcsname}% + \par and\par + \addtocounter{authorno}{1}% + }% + \ignorespaces\csname aut@\theauthorno\endcsname + \ifcsundef{prevdegree@\theauthorno}{\relax}{\par\normalsize\csname prevdegree@\theauthorno\endcsname}% + \ifcsundef{secondprevdegree@\theauthorno}{\relax}{\\ \normalsize\csname secondprevdegree@\theauthorno\endcsname}% + \ifcsundef{thirdprevdegree@\theauthorno}{\relax}{\\ \normalsize\csname thirdprevdegree@\theauthorno\endcsname}% + \ifcsundef{fourthprevdegree@\theauthorno}{\relax}{\\ \normalsize\csname fourthprevdegree@\theauthorno\endcsname}% + \\[1em]% + }% +} + +\newcounter{autcrcnt} +\setcounter{autcrcnt}{1} + +\NewDocumentCommand\@CopyrightAuthor{}{% + \csname aut@\theautcrcnt\endcsname + \addtocounter{autcrcnt}{1}% + \whiledo{\value{autcrcnt}<\value{authorcnt}}{% + , \ignorespaces\csname aut@\theautcrcnt\endcsname + \addtocounter{autcrcnt}{1}% + }% + \ifnum\value{autcrcnt}=\value{authorcnt}% + \space and\space\csname aut@\theauthorcnt\endcsname\ignorespaces + \fi + \setcounter{autcrcnt}{1}% reset so we can use this command more than once +} + +\newcounter{degcnt} +\setcounter{degcnt}{0} + +\NewDocumentCommand\Degree{mm}{% + \ifblank{#1}{% + \ClassError{\ClassName}{Missing degree name, check for blank \Degree{name}{department} command}{% + Check for blank name \Degree{name}{department} command.}% + }{% + \addtocounter{degcnt}{1}% + \expandafter\xdef\csname deg@\thedegcnt\endcsname{\ignorespaces#1}% + \expandafter\xdef\csname degdep@\thedegcnt\endcsname{\ignorespaces#2}% + }% + \ifblank{#2}{\ClassError{\ClassName}{Missing degree department, check for blank in \Degree{name}{department} command}{% + Check for blank department \Degree{name}{department} command.}}{}% +}% defines \deg@degcnt as Name #1 and \degdep@degcnt as associated dept. + +\newcounter{degno} +\newcounter{depno} + +\NewDocumentCommand\@DegreeBlock{}{% + \ifnum\value{degcnt}=0 + \ClassError{\ClassName}{Missing degree! You must issue the \Degree{name}{department} command}{% + You MUST issue the \Degree{name}{department} command after \begin{document} and before \maketitle. You do want the degree, don't you?}% + \fi + \setcounter{degno}{1} + \setcounter{depno}{1} + Submitted to the% + \whiledo{\value{depno}<\value{degcnt}}{% + \space\csname degdep@\thedegno\endcsname{} and the% + \addtocounter{depno}{1}% + }% + \space\csname degdep@\thedepno\endcsname\space + in partial fulfillment of the requirements for the\space + \ifnum\value{degcnt}>1 degrees\else degree\fi\space of% + \par + \whiledo{\value{degno}<\value{degcnt}}{% + \MakeUppercase{\ignorespaces\csname deg@\thedegno\endcsname}\par and\par + \addtocounter{degno}{1}% + }% + \MakeUppercase{\ignorespaces\csname deg@\thedegno\endcsname}\par +} + +\newcounter{supcnt} +\setcounter{supcnt}{0} +\newcounter{supno} +\setcounter{supno}{0} + +\NewDocumentCommand\Supervisor{mm}{% + \ifblank{#1}{% + \ClassError{\ClassName}{Missing supervisor name, check for blank in \Supervisor{name}{department} command}{ + Check for blank in \Supervisor{name}{department} command.}% + }{% + \addtocounter{supcnt}{1}% + \expandafter\xdef\csname sup@\thesupcnt\endcsname{#1}% + \expandafter\xdef\csname supdep@\thesupcnt\endcsname{#2}% + }% + \ifblank{#2}{\ClassError{\ClassName}{Missing supervisor department, check for blank in \Supervisor{name}{department} command}{% + check for blank in \Supervisor{name}{department} command.}}{}% +}% defines \sup@supcnt as Name #1 and \supdep@supcnt as associated dept. + +\newcounter{acccnt} +\setcounter{acccnt}{0} +\newcounter{accno} +\setcounter{accno}{0} +\NewDocumentCommand\Acceptor{mmm}{% + \ifblank{#1}{% + \ClassWarning{\ClassName}{Missing acceptor name, check for blank \Acceptor{name}{department} command}% + }{% + \addtocounter{acccnt}{1}% + \expandafter\xdef\csname acc@\theacccnt\endcsname{#1}% + \expandafter\xdef\csname accdep@\theacccnt\endcsname{#2}% + \expandafter\xdef\csname acctitle@\theacccnt\endcsname{#3}% + }% + \ifblank{#2}{\ClassWarning{\ClassName}{Missing acceptor department, check for blank in \Acceptor{name}{department}{title} command.}}{}% + \ifblank{#3}{\ClassWarning{\ClassName}{Missing acceptor title, check for blank in \Acceptor{name}{department}{title} command.}}{}% +}% defines \acc@acccnt as Name #1, \accdep@accccnt as associated dept, and \acctitle@acccnt as title of acceptor + +\def\@SigSize{\relax} +\NewDocumentCommand\SignatureBlockSize{m}{\let\@SigSize\ignorespaces#1} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\NewDocumentCommand\@SetSignatureBlock{}{% + \ifnum\value{supcnt}=0 + \ClassError{\ClassName}{Missing supervisor! You must issue the \Supervisor{name}{department} command}{% + You MUST issue the \Supervisor{name}{department} command after \begin{document} and before \maketitle.}% + \fi + \ifnum\value{acccnt}=0 + \ClassError{\ClassName}{Missing acceptor! You must issue the \Acceptor{name}{department} command}{% + You MUST issue the \Acceptor{name}{department} command after \begin{document} and before \maketitle.}% + \fi + \ifdefined\@ThesisDate\else\ClassError{\ClassName}{Missing thesis date!}{% + You must issue the \ThesisDate{Date thesis is submitted} command between \begin{document} and \maketitle.}% + \fi + \setcounter{authorno}{0}% + \setcounter{supno}{0}% + \setcounter{accno}{0}% + \@SigSize + \begin{tabbing} + \hspace{1.35in}\=\hspace{1in}\kill + \whiledo{\value{authorno}<\value{authorcnt}}{% starting with authorno = 0 ensures we reach authorcnt with +1 + \addtocounter{authorno}{1}% + Authored by: \> \csname aut@\theauthorno\endcsname\ignorespaces \\ + \> \csname autdep@\theauthorno\endcsname\ignorespaces \\ + \> \@ThesisDate \\[1em] + }% end whiledo + \whiledo{\value{supno}<\value{supcnt}}{% + \addtocounter{supno}{1}% + Certified by: \> \csname sup@\thesupno\endcsname\ignorespaces \\ + \> \csname supdep@\thesupno\endcsname\ignorespaces, Thesis Supervisor\\[1em] + }% end whiledo + \whiledo{\value{accno}<\value{acccnt}}{% + \addtocounter{accno}{1}% + Accepted by: \> \csname acc@\theaccno\endcsname\ignorespaces \\ + \> \csname accdep@\theaccno\endcsname\ignorespaces \\ + \> \csname acctitle@\theaccno\endcsname\ignorespaces \\[1em] + }% end whiledo + \end{tabbing} +} +\NewDocumentCommand\@SetAbstractSupervisorBlock{}{% + \setcounter{supno}{1} +% \\[1em]% dislikes a trailing blank line in abstract + \par\bigskip\noindent + \whiledo{\value{supno}<\value{supcnt}}{% + Thesis supervisor: \csname sup@\thesupno\endcsname\ignorespaces\\ + Title: \csname supdep@\thesupno\endcsname\ignorespaces\\[1em] + \addtocounter{supno}{1}% + }% end whiledo + Thesis supervisor: \csname sup@\thesupno\endcsname\ignorespaces\\ + Title: \csname supdep@\thesupno\endcsname\ignorespaces +} + +%%%%%%%%%%%%%%%%%%% Copyright related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\def\CCurl{}% empty by default +\newif\ifmit@cclicense\mit@cclicensefalse +\NewDocumentCommand\CClicense{m m}{% + \def\CClicensetext{\hrefurl{#2}{\ignorespaces#1}}% #1 - text, #2 - url + \def\CCname{#1} + \def\CCurl{#2}% for use in metadata + \mit@cclicensetrue +} + + +%%%%%%%%%%%%%%%%%%% Create titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\def\MIT{MASSACHUSETTS INSTITUTE OF TECHNOLOGY} + +\RenewDocumentCommand\maketitle{}{% +% + \ifdefined\@DegreeMonth\else\ClassError{\ClassName}{Missing degree date!}{% + You must issue the \DegreeDate{month}{year} command between \begin{document} and \maketitle}% + \fi +% + \ifmit@cclicense + \def\CopyrightLicense{This work is licensed under a \CClicensetext\ license.\par\MITpermission} + \typeout{^^JUsing Creative Commons License \CCname^^J} + \def\PDFRightsText{This work is licensed under a \CCname\ license. \MITpermission}% for use in metadata + \else + \def\CopyrightLicense{All rights reserved.\par\MITpermission} + \def\PDFRightsText{All rights reserved. \MITpermission}% for use in metadata + \fi + \ifnum\value{authorcnt}>1 + \def\CRWords{The authors hereby grant}\else\def\CRWords{The author hereby grants} + \fi + \def\MITpermissionLast{to MIT a nonexclusive, worldwide, irrevocable, royalty-free license to exercise any and all rights under copyright, including to reproduce, preserve, distribute and publicly display copies of the thesis, or release the thesis under an open-access license.}% + \def\MITpermission{\CRWords\space\MITpermissionLast}% +% + \clearpage + \thispagestyle{empty}% + \phantomsection\addcontentsline{toc}{chapter}{\protect\textbf{Title page}}% + {\centering\vbox to \vsize{% vbox to prevent signature block from breaking across page. Remove if necessary. + %\ifmit@lineno\internallinenumbers\fi % lineno does not work in tabbing environment, as in signature block + \setlength{\parskip}{0.5\baselineskip plus 2pt minus 2pt}\setlength{\parindent}{0pt}% + {\Large\textbf{\@title}\par}% + \@AuthorBlock + \par + \@DegreeBlock + at the\par + \MIT\par + \@DegreeMonth\space\@DegreeYear + \MonthCheck{\@@DegreeMonth}{% + \ClassError{\ClassName}{Acceptable months for the degree date are February, June, and September}{Change % + the month of your degree date to one of February, June, or September.}% + }% + \par + \copyright\space\@DegreeYear\space\@CopyrightAuthor. \CopyrightLicense + \par + \vskip 1.5\baselineskip + % + \@SetSignatureBlock + \vfill + }}% + \newpage +} + +%%%%%%%%%%%%%%%%%%% Create abstract page %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\RenewDocumentEnvironment{abstract}{+b}{% + \newpage + \phantomsection\addcontentsline{toc}{chapter}{\protect\textbf{Abstract}}% + \begin{center} + {\large{\textbf{\@title}}\par} + \setlength{\parskip}{0.5\baselineskip plus 2pt minus 2pt} + \@AuthorBlock + \par + \@DegreeBlock + \end{center} + \vskip\baselineskip + \textbf{ABSTRACT}\par\vskip0.5em + \ignorespaces#1\ignorespaces + \ifblank{#1}{\typeout{Missing abstract!} MISSING ABSTRACT!}{\relax} +}{% + \@SetAbstractSupervisorBlock + \newpage + \ignorespacesafterend +} + +%%%%%%% A nomenclature environment, if needed %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\providecommand{\nomname}{Nomenclature} +\newlength\nomenwidth +\newlength\savitemsep + +\makeatletter +\NewDocumentCommand\entry{m m}{% + \ifblank{#2}{% + \ClassWarning{\ClassName}{The command \protect\entry requires two arguments. To obtain a subheading, use \protect\EntryHeading} + \itemsep3\p@ plus 1\p@ minus 1\p@% + \goodbreak\item[\itshape#1\hfill]\setlength\itemsep\savitemsep\@itempenalty=1000% + }{% + \item[#1\hfill]#2% + \@itempenalty=-\@lowpenalty% + }% +} +% A separate command command for nomenclature subheadings +\NewDocumentCommand\EntryHeading{m}{% + \itemsep3\p@ plus 1\p@ minus 1\p@% + \goodbreak\item[\itshape#1\hfill]\setlength\itemsep\savitemsep\@itempenalty=1000% +} +\makeatother +% +% Increase first optional argument to a dimension > 2em if wide entries cause undesired misalignment of columns. +% Second optional argument can be used to rename the environment, e.g., to List of Symbols. +\NewDocumentEnvironment{nomenclature}{O{2em} O{\nomname} O{section}}{% + \setlength\columnsep{2em} + \setlength{\nomenwidth}{#1} + \csname #3\endcsname *{#2}% this level will vary amongst users! + \phantomsection\addcontentsline{toc}{#3}{#2}% + \raggedright + \begin{list}{}{% + \setlength{\itemsep}{0pt}% + \setlength{\parsep}{\itemsep}% + \setlength{\labelsep}{1em}% + \setlength{\labelwidth}{\nomenwidth}% + \setlength{\leftmargin}{\labelwidth}% + \addtolength{\leftmargin}{\labelsep}% + \setlength\savitemsep\itemsep% + }% +}{\end{list}\ignorespacesafterend} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput +%% +%% End of file `mitthesis.cls'. diff --git a/macros/latex/contrib/mitthesis/mydesign.tex b/macros/latex/contrib/mitthesis/mydesign.tex new file mode 100644 index 0000000000..535f2fbb0e --- /dev/null +++ b/macros/latex/contrib/mitthesis/mydesign.tex @@ -0,0 +1,58 @@ +% From mitthesis package +% Version: 1.00, 2023/06/17 +% Documentation: https://ctan.org/pkg/mitthesis + + +%%%%%%%%%% Color support %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%% Color package: xcolor. +%% Change this if you prefer something else + +%% Options for xcolor +\ifpdftex\def\MyColorOption{fixpdftex}\else\ifluatex\def\MyColorOption{luatex}\else\ifxetex\def\MyColorOption{xetex}\else\def\MyColorOption{}\fi\fi\fi + +\usepackage[hyperref,\MyColorOption,dvipsnames,svgnames,x11names]{xcolor} +%% can add option [table] to xcolor to use color in tables (see xcolor documentation) + + +%%%%%%%%% Caption support %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% see documentation for details of how to customize captions + +\RequirePackage{caption} +\RequirePackage{subcaption} + + +%%%%%%%%% Customize list environments %%%%%%%%%%%%%%%%%%%% +% +% see documentation for details of how to customize lists + +%\RequirePackage{enumitem} + + +%%%%%%%%% Customize titles and section headings %%%%%%%%%% +% +% see documentation for details of how to customize headings + +\RequirePackage{titlesec} + +% these titlesec commands just automate the bold math in some headings (rest follows default styles) +\titleformat{\section}{\mathversion{bold}\normalfont\Large\bfseries}{\thesection }{1em}{} +\titleformat{\subsection}{\mathversion{bold}\normalfont\large\bfseries}{\thesubsection}{1em}{} +\titleformat{\subsubsection}{\mathversion{bold}\normalfont\normalsize\bfseries}{\thesubsubsection}{1em}{} + +% ==> NOT every font includes a bold math version, so you may need to use other math macros in the headings to get bold math <== + + +%%%%%%%%% Change page margins %%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% The default thesis margin is 1 inch all around. You may want different margins (e.g., to add a gutter for binding), +% in which case you can use the \newgeometry command from the geometry package. Refer to the package documentation +% for details. +% +% mitthesis defaults: [top=1in,bottom=1in,left=1in,right=1in,marginparwidth=50pt,headsep=12pt,footskip=0.5in] +% +% The following tells the geometry package to use a two-sided layout with a 1 cm binding offset on the inside +% and 1 inch margins all around, reducing textwidth slightly (by 0.7 cm). See geometry documentation, Section 8.2. +% +%\newgeometry{twoside, bindingoffset=1cm,margin=1in,marginparwidth=50pt,headsep=12pt,footskip=0.5in} diff --git a/macros/latex/contrib/nostarch/README b/macros/latex/contrib/nostarch/README index 279b8973d8..6e62ae5cf9 100644 --- a/macros/latex/contrib/nostarch/README +++ b/macros/latex/contrib/nostarch/README @@ -10,6 +10,9 @@ nshyper.sty and MakeIndex style nostarch.ist. CHANGES: +Version 2.3 + Compatibility with amsmath restored + Version 2.2 New environments: note and aside Subfigure package is now the default diff --git a/macros/latex/contrib/nostarch/nostarch.dtx b/macros/latex/contrib/nostarch/nostarch.dtx index ba0c42cdc2..1e0c86ce01 100644 --- a/macros/latex/contrib/nostarch/nostarch.dtx +++ b/macros/latex/contrib/nostarch/nostarch.dtx @@ -717,7 +717,7 @@ %<class>\ProvidesClass{nostarch} %<nshyper>\ProvidesPackage{nshyper} %<*!ist> -[2023/06/10 v2.2 Typesetting books for No Starch Press] +[2023/06/18 v2.3 Typesetting books for No Starch Press] %</!ist> % \end{macrocode} % @@ -2909,6 +2909,8 @@ pagecolor=black,urlcolor=black,hyperindex=false]{hyperref} % \begin{macro}{\UrlSpecials} % \changes{v2.1}{2023/04/08}{Redefined macro} % \changes{v2.1}{2023/04/11}{Added slashes and double quote} +% \changes{v2.3}{2023/06/18}{Moved out opening braces for +% compatibility with amsmath} % We add to macro special treatment of the chars with breaking URLs. % Slashes are interesting: we allow breaking after them, but not % before, even after other slashes or colons @@ -2929,10 +2931,6 @@ pagecolor=black,urlcolor=black,hyperindex=false]{hyperref} \do\'{\penalty\UrlBreakPenalty\mathchar39\relax}% \do\"{\penalty\UrlBreakPenalty\mathchar34\relax}% \do\+{\penalty\UrlBreakPenalty\mathchar43\relax}% - \do\<{\penalty\UrlBreakPenalty\mathchar60\relax}% - \do\[{\penalty\UrlBreakPenalty\mathchar91\relax}% - \do\({\penalty\UrlBreakPenalty\mathchar40\relax}% - \do\{{\penalty\UrlBreakPenalty\mathchar123\relax}% \do\/{\unpenalty\penalty\@M\mathchar47\penalty\UrlBreakPenalty}% } % \end{macrocode} @@ -2940,9 +2938,10 @@ pagecolor=black,urlcolor=black,hyperindex=false]{hyperref} % % \begin{macro}{\UrlNoBreaks} % \changes{v2.1}{2023/04/08}{Redefined macro} -% We allow breaks in urls after brackets +% \changes{v2.3}{2023/06/18}{Removed redefinition} +% We do not allow breaks in urls after brackets % \begin{macrocode} -\def\UrlNoBreaks{} +% \def\UrlNoBreaks{} % Rolled back redefinition % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/nostarch/nostarch.pdf b/macros/latex/contrib/nostarch/nostarch.pdf Binary files differindex d27608c590..8bbf6de686 100644 --- a/macros/latex/contrib/nostarch/nostarch.pdf +++ b/macros/latex/contrib/nostarch/nostarch.pdf diff --git a/macros/latex/contrib/nostarch/nssample.pdf b/macros/latex/contrib/nostarch/nssample.pdf Binary files differindex 3d7d86418a..76c6c302f0 100644 --- a/macros/latex/contrib/nostarch/nssample.pdf +++ b/macros/latex/contrib/nostarch/nssample.pdf |