From 332f896e129474a718b2385024208daf39662240 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 Nov 2020 22:02:16 +0000 Subject: windycity (11nov20) git-svn-id: svn://tug.org/texlive/trunk@56911 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/windycity/american-windycity.lbx | 34 +++- .../texmf-dist/tex/latex/windycity/windycity.bbx | 208 ++++++++++++++------- .../texmf-dist/tex/latex/windycity/windycity.cbx | 81 ++++---- .../texmf-dist/tex/latex/windycity/windycity.dbx | 3 +- .../texmf-dist/tex/latex/windycity/windycity.sty | 40 ++-- 5 files changed, 240 insertions(+), 126 deletions(-) (limited to 'Master/texmf-dist/tex/latex/windycity') diff --git a/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx b/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx index f04e60e0a9b..640202d8c0b 100644 --- a/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx +++ b/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx @@ -1,4 +1,4 @@ -% Last modified: Tue 29 Sep 2020 06:29:33 PM CDT +% Last modified: Tue 10 Nov 2020 05:25:31 PM CST % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License (LPPL), @@ -11,7 +11,7 @@ % implied warranties of merchantability and fitness for a particular % purpose. -\ProvidesFile{american-windycity.lbx}[2020/09/29 Windy City +\ProvidesFile{american-windycity.lbx}[2020/11/10 Windy City localization module for biblatex] \InheritBibliographyExtras{american} \InheritBibliographyStrings{american} @@ -119,23 +119,26 @@ } \NewBibliographyString{by} -\NewBibliographyString{comped,comped+,compiler,compiler+,comprev,comprev+,comptrans,comptrans+} -\NewBibliographyString{editor+,edcomp,edcomp+,edrev,edrev+,edtrans,edtrans+} +\NewBibliographyString{comped,comped+,compiler,compiler+,comprev,comprev+,comptrans,comptrans+,compup,compup+} +\NewBibliographyString{editor+,edcomp,edcomp+,edrev,edrev+,edtrans,edtrans+,edup,edup+} \NewBibliographyString{expanded} \NewBibliographyString{noplace} \NewBibliographyString{of} \NewBibliographyString{origpub} \NewBibliographyString{part} \NewBibliographyString{preface} +\NewBibliographyString{pseudo} \NewBibliographyString{reprint,reprinted} \NewBibliographyString{review,reviewnoauth} -\NewBibliographyString{revcomp,revcomp+,reved,reved+,reviser,reviser+,revtrans,revtrans+} +\NewBibliographyString{revcomp,revcomp+,reved,reved+,reviser,reviser+,revtrans,revtrans+,revup,revup+} \NewBibliographyString{revised} \NewBibliographyString{selfpub} \NewBibliographyString{special} \NewBibliographyString{subverbo,subverbos} -\NewBibliographyString{transcomp,transcomp+,transed,transed+,translator+,transrev,transrev+} +\NewBibliographyString{transcomp,transcomp+,transed,transed+,translator+,transrev,transrev+,transup,transup+} +\NewBibliographyString{upcomp,upcomp+,updater,updater+,uped,uped+,uprev,uprev+,uptrans,uptrans+} \NewBibliographyString{updated} +\NewBibliographyString{updater} \DeclareBibliographyStrings{% am = {{a\adddot m\adddot}{a\adddot m\adddot}}, @@ -153,6 +156,8 @@ comprev+ = {{compiled and revised by}{comps\adddotspace and revs\adddot}}, comptrans = {{compiled and translated by}{comp\adddotspace and trans\adddot}}, comptrans+ = {{compiled and translated by}{comps\adddotspace and trans\adddot}}, + compup = {{compiled and updated by}{comp\adddotspace and up\adddot}}, + compup+ = {{compiled and updated by}{comps\adddotspace and up\adddot}}, edcomp = {{edit\-ed and compiled by}{ed\adddotspace and comp\adddot}}, edcomp+ = {{edit\-ed and compiled by}{eds\adddotspace and comps\adddot}}, edition = {{ed\adddot}{ed\adddot}}, @@ -162,6 +167,8 @@ edrev+ = {{edit\-ed and revised by}{eds\adddotspace and revs\adddot}}, edtrans = {{edit\-ed and translated by}{ed\adddotspace and trans\adddot}}, edtrans+ = {{edit\-ed and translated by}{eds\adddotspace and trans\adddot}}, + edup = {{edit\-ed and updated by}{ed\adddotspace and up\adddot}}, + edup+ = {{edit\-ed and updated by}{eds\adddotspace and up\adddot}}, expanded = {{expanded edition}{exp\adddotspace ed\adddot}}, foreword = {{foreword to}{foreword to}}, forthcoming = {{forthcoming}{forthcoming}}, @@ -179,6 +186,7 @@ phdthesis = {{PhD diss\adddot}{PhD diss\adddot}}, pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, preface = {{preface to}{preface to}}, + pseudo = {{pseud\adddot}{pseud\adddot}}, references = {{Bibliography}{Bibliography}}, reprint = {{reprint}{repr\adddot}}, reprinted = {{reprinted in}{reprinted in}}, @@ -193,6 +201,8 @@ reviser+ = {{revised by}{revs\adddot}}, revtrans = {{revised and translated by}{rev\adddotspace and trans\adddot}}, revtrans+ = {{revised and translated by}{revs\adddotspace and trans\adddot}}, + revup = {{revised and updated by}{rev\adddotspace and up\adddot}}, + revup+ = {{revised and updated by}{revs\adddotspace and up\adddot}}, selfpub = {{Self-published}{self-pub\adddot}}, special = {{special issue}{special issue}}, subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}}, @@ -205,7 +215,19 @@ translator+ = {{translated by}{trans\adddot}}, transrev = {{translated and revised by}{trans\adddotspace and rev\adddot}}, transrev+ = {{translated and revised by}{trans\adddotspace and revs\adddot}}, + transup = {{translated and updated by}{trans\adddotspace and up\adddot}}, + transup+ = {{translated and updated by}{trans\adddotspace and up\adddot}}, + upcomp = {{updated and compiled by}{up\adddotspace and comp\adddot}}, + upcomp+ = {{updated and compiled by}{up\adddotspace and comps\adddot}}, updated = {{updated edition}{up\adddotspace ed\adddot}}, + updater = {{updated by}{up\adddot}}, + updater+ = {{updated by}{up\adddot}}, + uped = {{updated and edit\-ed by}{up\adddotspace and ed\adddot}}, + uped+ = {{updated and edit\-ed by}{up\adddotspace and eds\adddot}}, + uprev = {{updated and revised by}{up\adddotspace and rev\adddot}}, + uprev+ = {{updated and revised by}{up\adddotspace and revs\adddot}}, + uptrans = {{updated and translated by}{up\adddotspace and trans\adddot}}, + uptrans+ = {{updated and translated by}{up\adddotspace and trans\adddot}}, urlseen = {{accessed}{accessed}}, volume = {{vol\adddot}{vol\adddot}}, volumes = {{vols\adddot}{vols\adddot}} diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.bbx b/Master/texmf-dist/tex/latex/windycity/windycity.bbx index 29bc593dddb..9bf9170ab8f 100644 --- a/Master/texmf-dist/tex/latex/windycity/windycity.bbx +++ b/Master/texmf-dist/tex/latex/windycity/windycity.bbx @@ -1,4 +1,4 @@ -% Last modified: Tue 29 Sep 2020 06:28:58 PM CDT +% Last modified: Tue 10 Nov 2020 05:24:28 PM CST % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License (LPPL), @@ -11,7 +11,7 @@ % implied warranties of merchantability and fitness for a particular % purpose. -\ProvidesFile{windycity.bbx}[2020/09/29 Windy City bibliography style +\ProvidesFile{windycity.bbx}[2020/11/10 Windy City bibliography style for biblatex] \@ifpackagelater{biblatex}{2019/08/17} {} @@ -26,20 +26,6 @@ %% Bibliography and Entry Options %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\providetoggle{anonauth} -\DeclareBiblatexOption{entry}[boolean]{anonauth}[true]{% - \ifstrequal{#1}{true} - {\renewcommand*{\anona}{\bibopenbracket}% - \renewcommand*{\anonb}{\bibclosebracket}}% - {}} - -\providetoggle{anonqauth} -\DeclareBiblatexOption{entry}[boolean]{anonqauth}[true]{% - \ifstrequal{#1}{true} - {\renewcommand*{\anona}{\bibopenbracket}% - \renewcommand*{\anonb}{\addquestion\bibclosebracket}}% - {}} - \providetoggle{annotate} \DeclareBiblatexOption{global}[boolean]{annotate}[true]{% \settoggle{annotate}{#1}}% @@ -66,6 +52,10 @@ \DeclareBiblatexOption{entry,global}[boolean]{isbn}[true]{% \settoggle{isbn}{#1}}% +\providetoggle{issn} +\DeclareBiblatexOption{entry,global}[boolean]{isnn}[true]{% + \settoggle{issn}{#1}}% + \providetoggle{library} \DeclareBiblatexOption{entry,global}[boolean]{library}[true]{% \settoggle{library}{#1}}% @@ -83,6 +73,10 @@ {\AtBeginBibliography{\blx@key@bibcheck{nolos}}} {}} +\providetoggle{nopages} +\DeclareBiblatexOption{global}[boolean]{nopages}[true]{% + \settoggle{nopages}{#1}}% + \providetoggle{reflist} \DeclareBiblatexOption{global}[boolean]{reflist}[true]{% \ifstrequal{#1}{true} @@ -133,7 +127,6 @@ dateabbrev=false, dateusetime=true, ibidtracker=constrict, -% Just one use of '\ifciteidem'. See note in windycity.cbx. idemtracker=false, indexing=true, labeldateparts=true, @@ -281,6 +274,7 @@ \DefaultInheritance[\except{*}{review}{all=false}]{all=true,override=false} \DeclareDataInheritance{*}{incollection,inbook,letter,review}{% \inherit{author}{bookauthor} + \inherit{authortype}{bookauthortype} \inherit{shortauthor}{shortbookauthor} \inherit{editor}{editora} \inherit{editora}{editorb} @@ -321,9 +315,9 @@ \noinherit{sortkey} \noinherit{xref}} -%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Other Basic Settings %% -%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% Other Basic Settings %% +%%%%%%%%%%%%%%%%%%%%%%%%%%%% \let\cbx@bibstring\empty \let\cbx@deflabel\empty @@ -347,6 +341,7 @@ \providetoggle{cbx:collection} \providetoggle{cbx:first} +\providetoggle{cbx:idem} \providetoggle{cbx:short} \providetoggle{collection} @@ -614,9 +609,9 @@ \DeclareBibliographyAlias{*}{book} -%%%%%%%%%%%%%%%%%%%%%%%% -%% Author's Position %% -%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%% +%% Author's Position %% +%%%%%%%%%%%%%%%%%%%%%%%%% \renewcommand*{\revsdnamedelim}{% \iftoggle{bibliography} @@ -628,7 +623,7 @@ {\usebibmacro{authpos+deflabel}}% {\usebibmacro{author+bookauthor}% \ifnameundef{\cbx@namelist} - {\usebibmacro{edtransuthpos}% + {\usebibmacro{edtrans:authpos}% \ifnameundef{\cbx@namelist} {\toggletrue{noauth}% \usebibmacro{authpos+deflabel}% @@ -659,13 +654,31 @@ \ifboolexpr{ test {\ifnameundef{shortauthor}} or togl {bibliography}} {\renewcommand*{\cbx@namelist}{author}}% - {\renewcommand*{\cbx@namelist}{shortauthor}}} + {\renewcommand*{\cbx@namelist}{shortauthor}}% + \usebibmacro{author+bookauthor+type}}% \newbibmacro*{bookauthor+namelist}{% \ifboolexpr{ test {\ifnameundef{shortbookauthor}} or togl {bibliography}} {\renewcommand*{\cbx@namelist}{bookauthor}}% - {\renewcommand*{\cbx@namelist}{shortbookauthor}}} + {\renewcommand*{\cbx@namelist}{shortbookauthor}}% + \usebibmacro{author+bookauthor+type}}% + +% See notes for 'handle' and 'nameaddon'. + +\newbibmacro*{author+bookauthor+type}{% + \iffieldundef{\cbx@namelist type} + {} + {\iffieldequalstr{\cbx@namelist type}{anon} + {\renewcommand*{\anona}{\bibopenbracket}% + \renewcommand*{\anonb}{\bibclosebracket}}% + {\iffieldequalstr{\cbx@namelist type}{anon?} + {\renewcommand*{\anona}{\bibopenbracket}% + \renewcommand*{\anonb}{\addquestion\bibclosebracket}}% + {\ifboolexpr{ test {\iffieldequalstr{\cbx@namelist type}{pseudo}} + and not togl {cbx:short}} + {\renewcommand*{\anonb}{\space\mkbibbrackets{\bibstring{pseudo}}}} + {}}}}} % When 'journaltitle' goes in the author's position. @@ -735,7 +748,7 @@ % For editors and translators in the author's position. -\newbibmacro*{edtransuthpos}{% +\newbibmacro*{edtrans:authpos}{% \togglefalse{noed}% \togglefalse{notrans}% \usebibmacro{test:ed:authpos}% @@ -842,55 +855,90 @@ \renewcommand*{\cbx@namelist}{\yeditor}% \ifnamesequal{\xeditor}{\yeditor} {\clearname{\xeditor}% - \ifboolexpr{ test {\iffieldequalstr{\xeditor type}{compiler}} - or test {\iffieldequalstr{\xeditor type}{comped}} - or test {\iffieldequalstr{\xeditor type}{comprev}} - or test {\iffieldequalstr{\xeditor type}{comptrans}} + \ifboolexpr{ test {\iffieldstart{editortype}{c}} or test {\iffieldequalstr{\xeditor type}{transcomp}}} {\renewcommand*{\cbx@bibstring}{transcomp}}% - {\ifboolexpr{ test {\iffieldequalstr{\xeditor type}{reviser}} - or test {\iffieldequalstr{\xeditor type}{revcomp}} - or test {\iffieldequalstr{\xeditor type}{reved}} - or test {\iffieldequalstr{\xeditor type}{revtrans}} + {\ifboolexpr{ test {\iffieldstart{\xeditor type}{r}} or test {\iffieldequalstr{\xeditor type}{transrev}}} {\renewcommand*{\cbx@bibstring}{transrev}}% - {\renewcommand*{\cbx@bibstring}{transed}}}} + {\ifboolexpr{ test {\iffieldstart{\xeditor type}{u}} + or test {\iffieldequalstr{\xeditor type}{transup}}} + {\renewcommand*{\cbx@bibstring}{transup}}% + {\renewcommand*{\cbx@bibstring}{transed}}}}} {\renewcommand*{\cbx@bibstring}{translator}}} \newbibmacro*{edcombos}{% \renewcommand*{\cbx@namelist}{\xeditor}% \ifnamesequal{\xeditor}{\yeditor} {\clearname{\yeditor}% - \ifboolexpr{ test {\iffieldequalstr{\xeditor type}{compiler}} - or test {\iffieldequalstr{\xeditor type}{comped}} - or test {\iffieldequalstr{\xeditor type}{comprev}} - or test {\iffieldequalstr{\xeditor type}{comptrans}} - or test {\iffieldequalstr{\xeditor type}{transcomp}}} - {\renewcommand*{\cbx@bibstring}{comptrans}}% - {\ifboolexpr{ test {\iffieldequalstr{\xeditor type}{reviser}} - or test {\iffieldequalstr{\xeditor type}{revcomp}} - or test {\iffieldequalstr{\xeditor type}{reved}} - or test {\iffieldequalstr{\xeditor type}{revtrans}} - or test {\iffieldequalstr{\xeditor type}{transrev}}} - {\renewcommand*{\cbx@bibstring}{revtrans}}% - {\renewcommand*{\cbx@bibstring}{edtrans}}}} - {\iffieldequalstr{\xeditor type}{compiler} - {\renewcommand*{\cbx@bibstring}{compiler}}% - {\iffieldequalstr{\xeditor type}{reviser} - {\renewcommand*{\cbx@bibstring}{reviser}}% + \usebibmacro{edcombos:trans}}% + {\usebibmacro{edcombos:notrans}}} + +\newbibmacro*{edcombos:trans}{% + \iffieldstart{\xeditor type}{c} + {\renewcommand*{\cbx@bibstring}{comptrans}}% + {\iffieldstart{\xeditor type}{r} + {\renewcommand*{\cbx@bibstring}{revtrans}}% + {\iffieldstart{\xeditor type}{u} + {\renewcommand*{\cbx@bibstring}{uptrans}}% + {\iffieldequalstr{\xeditor type}{transcomp} + {\renewcommand*{\cbx@bibstring}{transcomp}}% + {\iffieldequalstr{\xeditor type}{transed} + {\renewcommand*{\cbx@bibstring}{transed}}% + {\iffieldequalstr{\xeditor type}{transrev} + {\renewcommand*{\cbx@bibstring}{transrev}}% + {\iffieldequalstr{\xeditor type}{transup} + {\renewcommand*{\cbx@bibstring}{transup}}% + {\renewcommand*{\cbx@bibstring}{edtrans}}}}}}}}} + +\newbibmacro*{edcombos:notrans}{% + \iffieldequalstr{\xeditor type}{compiler} + {\renewcommand*{\cbx@bibstring}{compiler}}% + {\iffieldequalstr{\xeditor type}{reviser} + {\renewcommand*{\cbx@bibstring}{reviser}}% + {\iffieldequalstr{\xeditor type}{updater} + {\renewcommand*{\cbx@bibstring}{updater}}% {\iffieldequalstr{\xeditor type}{comped} {\renewcommand*{\cbx@bibstring}{comped}}% {\iffieldequalstr{\xeditor type}{comprev} {\renewcommand*{\cbx@bibstring}{comprev}}% - {\iffieldequalstr{\xeditor type}{edcomp} - {\renewcommand*{\cbx@bibstring}{edcomp}}% - {\iffieldequalstr{\xeditor type}{edrev} - {\renewcommand*{\cbx@bibstring}{edrev}}% - {\iffieldequalstr{\xeditor type}{revcomp} - {\renewcommand*{\cbx@bibstring}{revcomp}}% - {\iffieldequalstr{\xeditor type}{reved} - {\renewcommand*{\cbx@bibstring}{reved}}% - {\renewcommand*{\cbx@bibstring}{editor}}}}}}}}}}} + {\iffieldequalstr{\xeditor type}{compup} + {\renewcommand*{\cbx@bibstring}{compup}}% + {\iffieldequalstr{\xeditor type}{edcomp} + {\renewcommand*{\cbx@bibstring}{edcomp}}% + {\iffieldequalstr{\xeditor type}{edrev} + {\renewcommand*{\cbx@bibstring}{edrev}}% + {\iffieldequalstr{\xeditor type}{edup} + {\renewcommand*{\cbx@bibstring}{edup}}% + {\iffieldequalstr{\xeditor type}{revcomp} + {\renewcommand*{\cbx@bibstring}{revcomp}}% + {\iffieldequalstr{\xeditor type}{reved} + {\renewcommand*{\cbx@bibstring}{reved}}% + {\iffieldequalstr{\xeditor type}{revup} + {\renewcommand*{\cbx@bibstring}{revup}}% + {\iffieldequalstr{\xeditor type}{upcomp} + {\renewcommand*{\cbx@bibstring}{upcomp}}% + {\iffieldequalstr{\xeditor type}{uped} + {\renewcommand*{\cbx@bibstring}{uped}}% + {\iffieldequalstr{\xeditor type}{uprev} + {\renewcommand*{\cbx@bibstring}{uprev}}% + {\renewcommand*{\cbx@bibstring}{editor}}}}}}}}}}}}}}}}} + +% Thanks to David Fussner's biblatex-chicago for pointing me to this +% command by Philipp Lehman. Source: +% https://groups.google.com/forum/#!topic/comp.text.tex/kG003fkZK1I + +\newrobustcmd*{\iffieldstart}[2]{% + \iffieldundef{#1} + {\@secondoftwo}% originally '\@gobbletwo' + {\begingroup + \edef\@tempa{% + \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}% + \@tempa\@nil{\endgroup\ifblank{##1}}% + \savefield*{#1}{\@tempa}% + \expandafter\iffieldstart@i\detokenize + \expandafter\expandafter\expandafter{% + \expandafter\@tempa\detokenize{#2}}\@nil}}% \newbibmacro*{addplus:authpos}{% \iftoggle{cbx:short} @@ -1037,17 +1085,26 @@ or test {\iffieldequalstr{\xeditor type}{comped}} or test {\iffieldequalstr{\xeditor type}{comprev}} or test {\iffieldequalstr{\xeditor type}{comptrans}} + or test {\iffieldequalstr{\xeditor type}{compup}} or test {\iffieldequalstr{\xeditor type}{editor}} or test {\iffieldequalstr{\xeditor type}{edcomp}} or test {\iffieldequalstr{\xeditor type}{edrev}} or test {\iffieldequalstr{\xeditor type}{edtrans}} + or test {\iffieldequalstr{\xeditor type}{edup}} or test {\iffieldequalstr{\xeditor type}{reviser}} or test {\iffieldequalstr{\xeditor type}{revcomp}} or test {\iffieldequalstr{\xeditor type}{reved}} or test {\iffieldequalstr{\xeditor type}{revtrans}} + or test {\iffieldequalstr{\xeditor type}{revup}} or test {\iffieldequalstr{\xeditor type}{transcomp}} or test {\iffieldequalstr{\xeditor type}{transed}} or test {\iffieldequalstr{\xeditor type}{transrev}} + or test {\iffieldequalstr{\xeditor type}{transup}} + or test {\iffieldequalstr{\xeditor type}{updater}} + or test {\iffieldequalstr{\xeditor type}{upcomp}} + or test {\iffieldequalstr{\xeditor type}{uped}} + or test {\iffieldequalstr{\xeditor type}{uprev}} + or test {\iffieldequalstr{\xeditor type}{uptrans}} or test {\iffieldequalstr{\xeditor type}{title}} or test {\iffieldundef{\xeditor type}}} {} @@ -1158,17 +1215,23 @@ {\anona\pluga\printnames[\cbx@deflabel]{% \cbx@namelist}\plugb\anonb}}% -% A screen name precedes 'nameaddon'. See CMOS, 17th ed., 14.208. +% A screen name precedes 'nameaddon' and can be omitted from short +% citations. See CMOS, 17th ed., 14.209. \newbibmacro*{handle}{% - \iffieldundef{handle} + \ifboolexpr{ test {\iffieldundef{handle}} + or togl {cbx:short}} {} {\space \printfield[parens]{handle}% \clearfield{handle}}} +% In short citations, omit addons. See CMOS, 17th ed., 14.80 and +% 14.209. + \newbibmacro*{nameaddon}{% - \iffieldundef{nameaddon} + \ifboolexpr{ test {\iffieldundef{nameaddon}} + or togl {cbx:short}} {} {\space \printfield[brackets]{nameaddon}% @@ -1281,7 +1344,7 @@ {\printfield[title]{shortbooktitle}\isdot}}% {\printfield[\thefield{entrytype}]{labeltitle}\isdot}}} -\newbibmacro*{booktitle}{% +\renewbibmacro*{booktitle}{% \iffieldundef{booktitle} {} {\renewcommand*{\xtitle}{book}% @@ -1297,7 +1360,7 @@ \renewcommand*{\xtitle}{bookbook}% \usebibmacro{longtitle+titleaddon}}} -\newbibmacro*{maintitle}{% +\renewbibmacro*{maintitle}{% \iffieldundef{maintitle} {} {\renewcommand*{\xtitle}{main}% @@ -1760,6 +1823,7 @@ \newbibmacro*{doi+finentry+etc}{% \usebibmacro{doi+url+etc}% \usebibmacro{isbn}% + \usebibmacro{issn}% \usebibmacro{library}% \usebibmacro{pageref+finentry}}% @@ -1982,6 +2046,16 @@ {}} {}}} +\newbibmacro*{issn}{% + \iffieldundef{issn} + {} + {\iftoggle{bibliography} + {\iftoggle{issn} + {\newunit + \printfield{issn}}% + {}} + {}}} + \newbibmacro*{library}{% \iffieldundef{library} {} diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.cbx b/Master/texmf-dist/tex/latex/windycity/windycity.cbx index 3246927365a..b98193313aa 100644 --- a/Master/texmf-dist/tex/latex/windycity/windycity.cbx +++ b/Master/texmf-dist/tex/latex/windycity/windycity.cbx @@ -1,4 +1,4 @@ -% Last modified: Tue 29 Sep 2020 06:29:14 PM CDT +% Last modified: Tue 10 Nov 2020 05:24:14 PM CST % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License (LPPL), @@ -11,7 +11,7 @@ % implied warranties of merchantability and fitness for a particular % purpose. -\ProvidesFile{windycity.cbx}[2020/09/29 Windy City citation style for +\ProvidesFile{windycity.cbx}[2020/11/10 Windy City citation style for biblatex] \@ifpackagelater{biblatex}{2019/08/17} {} @@ -29,6 +29,7 @@ \AtEveryCite{% \global\togglefalse{bibliography}% \global\togglefalse{cbx:first}% + \global\togglefalse{cbx:idem}% \global\togglefalse{ibid:loccit}% \global\togglefalse{multicite}% \AtEveryItem}% @@ -38,8 +39,10 @@ \InitializeCitationStyle{\let\crossreflist\empty}% \renewcommand{\bibfootnotewrapper}[1]{% +% \clearfield{postpunct}% \bibsentence#1}% \renewcommand{\bibendnotewrapper}[1]{% +% \clearfield{postpunct}% \bibsentence#1}% % Protect commas against abbreviation dots and terminal punctuation. @@ -85,6 +88,22 @@ {\multicitedelim}% {\usebibmacro{cite:postnote}}% +\DeclareCiteCommand{\footfullcite}[\mkbibfootnote] + {\usebibmacro{prenote}}% + {\citereset + \usebibmacro{citeindex}% + \usebibmacro{cite:new}}% + {\multicitedelim}% + {\usebibmacro{cite:postnote}}% + +\DeclareCiteCommand{\fullcite} + {\usebibmacro{prenote}}% + {\citereset + \usebibmacro{citeindex}% + \usebibmacro{cite:new}}% + {\multicitedelim}% + {\usebibmacro{cite:postnote}}% + \DeclareCiteCommand{\parencite}[\mkbibparens] {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% @@ -133,6 +152,25 @@ {\multicitedelim}% {\usebibmacro{postnote}}% +\DeclareCiteCommand{\idemcite} + {\usebibmacro{prenote}}% + {\usebibmacro{citeindex}% + \toggletrue{cbx:idem}% + \usebibmacro{cite}}% + {\multicitedelim}% + {\usebibmacro{cite:postnote}}% + +\DeclareCiteCommand{\footidemcite}[\mkbibfootnote] + {\usebibmacro{prenote}}% + {\usebibmacro{citeindex}% + \toggletrue{cbx:idem}% + \usebibmacro{cite}}% + {\multicitedelim}% + {\usebibmacro{cite:postnote}}% + +\DeclareMultiCiteCommand{\idemcites}{\idemcite}{\multicitedelim}% +\DeclareMultiCiteCommand{\footidemcites}[\mkbibfootnote]{\footidemcite}{\multicitedelim} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Parenthetical Citations %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -160,18 +198,6 @@ \usebibmacro{labeldate+endyear}% \printfield{extradate}}} -\newbibmacro*{parencite:date+old}{% - \iffieldundef{labelyear} - {} - {\usebibmacro{parencite:origyear}% - \ifboolexpr{ ( test {\iffieldundef{year}} - and test {\iffieldundef{urlyear}} ) - or test {\iffieldequalstr{year}{forthcoming}}} - {\addcomma}% - {}% needs '%' - \usebibmacro{labeldate+endyear}% - \printfield{extradate}}} - \newbibmacro*{parencite:origyear}{% \iffieldundef{origyear} {} @@ -322,22 +348,6 @@ {} {\newunit}}% -% Thanks to David Fussner's biblatex-chicago for pointing me to this -% command by Philipp Lehman. Source: -% https://groups.google.com/forum/#!topic/comp.text.tex/kG003fkZK1I - -\newrobustcmd*{\iffieldstart}[2]{% - \iffieldundef{#1} - {\@gobbletwo}% - {\begingroup - \edef\@tempa{% - \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}% - \@tempa\@nil{\endgroup\ifblank{##1}}% - \savefield*{#1}{\@tempa}% - \expandafter\iffieldstart@i\detokenize - \expandafter\expandafter\expandafter{% - \expandafter\@tempa\detokenize{#2}}\@nil}}% - \newbibmacro*{volume+page}{% \iffieldundef{volume} {} @@ -356,13 +366,13 @@ {\DeclareNameAlias{sortname}{default}}% {cite:\thefield{entrytype}}}}} -% By default, idemtracker is 'false'. As such, '\ifciteidem' returns -% false. With idemtracker set to 'true' (or to some value that implies -% 'true') the test below will print 'labelname' if it matches that of -% the previous citation. +% By default, idemtracker is 'false'. With idemtracker set to 'true' +% (or to some value that implies 'true') the test below will print +% 'labelname' if it matches that of the previous citation. \newbibmacro*{idem+short+multicite}{% \ifboolexpr{ test {\ifciteidem} + or togl {cbx:idem} or togl {firstshort}} {\renewcommand*{\cbx@deflabel}{labelname}}% {\ifboolexpr{ test {\iffieldequals{namehash}{\bbx@lasthash}} @@ -467,7 +477,8 @@ % bibliography database. \newbibmacro*{cite:pages}{% - \iffieldundef{pages} + \ifboolexpr{ test {\iffieldundef{pages}} + or togl {nopages}} {} {\ifboolexpr{ test {\ifentrytype{article}} or test {\ifentrytype{review}}} diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.dbx b/Master/texmf-dist/tex/latex/windycity/windycity.dbx index 231c4210a52..ea87948409e 100644 --- a/Master/texmf-dist/tex/latex/windycity/windycity.dbx +++ b/Master/texmf-dist/tex/latex/windycity/windycity.dbx @@ -1,9 +1,10 @@ -\ProvidesFile{windycity.dbx}[2020/09/29 Windy City data model file for +\ProvidesFile{windycity.dbx}[2020/11/10 Windy City data model file for biblatex] \DeclareDatamodelFields[type=field,datatype=literal]{% blogsubtitle, blogtitle, blogtitleaddon, + bookauthortype, bookbooktitle, bookbookvolume, bookvolume, diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.sty b/Master/texmf-dist/tex/latex/windycity/windycity.sty index 4d9b7977227..718c4f61805 100644 --- a/Master/texmf-dist/tex/latex/windycity/windycity.sty +++ b/Master/texmf-dist/tex/latex/windycity/windycity.sty @@ -1,4 +1,4 @@ -% Last modified: Sun 19 Jul 2020 11:58:38 AM CDT +% Last modified: Tue 10 Nov 2020 07:45:15 AM CST \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{windycity} \RequirePackage{ifxetex} @@ -21,7 +21,7 @@ ItalicFont=*-italic, BoldItalicFont=*-bolditalic]{texgyretermes} \setmonofont[ - Scale=0.96, + Scale=0.94, Numbers=Lining, Extension=.otf, UprightFont=*mono10-regular, @@ -56,7 +56,7 @@ \vskip 4ex% {\Large\@subtitle}% \vskip 4ex% - {\large\@author\par\@website\par\@email\par\@version\par\@date}% + {\large\@author\par\@website\par\@email\par\@version}% dropped '\par\@date' \end{center}% \vskip 4ex}% @@ -195,20 +195,21 @@ \csname adddot@#1\endcsname\quad}% \newcommand*{\adddot@section}{.}% \renewcommand\thesubsubsection{% - \normalfont\arabic{subsection}.\@arabic\c@subsubsection} + \normalfont\arabic{subsection}.\arabic{subsubsection}}% -\renewcommand\section{\@startsection{section}{1}{\z@}% - {-3.5ex \@plus -1ex \@minus -.2ex}% - {2.3ex \@plus.2ex}% - {\normalfont\large\bfseries}} -\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% - {-3.5ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\normalfont\bfseries}}% -\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% - {-4ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\normalfont\it}} +\usepackage[clearempty]{titlesec} +\titleformat{\section} + {\large\bfseries}{\thesection.}{2ex}{} +\titleformat{\subsection} + {\normalsize\bfseries}{\thesubsection}{2ex}{} +\titleformat{\subsubsection} + {\normalsize\it}{\thesection.\thesubsubsection}{2ex}{} +\titlespacing*{\section} + {0ex}{3.5ex plus 1ex minus .2ex}{1.5ex plus .2ex}[0ex] +\titlespacing*{\subsection} + {0ex}{3.5ex plus 1ex minus .2ex}{1.5ex plus .2ex}[0ex] +\titlespacing*{\subsubsection} + {0ex}{3.5ex plus 1ex minus .2ex}{1.5ex plus .2ex}[0ex] \AtBeginEnvironment{quote}{\small} \AtBeginEnvironment{verbatim}{\small} @@ -218,14 +219,18 @@ citecolor=, colorlinks=true, linkcolor=blue, - pdfauthor={Brian Michael Chase}, + pdfauthor={Brian Chase}, pdftitle={Windy City for biblatex}, urlcolor=]{hyperref} \urlstyle{rm} +\newcommand{\babel}{% + \href{http://www.ctan.org/pkg/babel}{\textcolor{blue}{babel}}\xspace}% \newcommand{\biblatex}{% \href{http://www.ctan.org/pkg/biblatex}{\textcolor{blue}{biblatex}}\xspace}% \newcommand{\BibTeX}{{\rm B\kern-.05em{\sc i\kern-.025em b}\kern-.08em \TeX}}% +\newcommand{\polyglossia}{% + \href{http://www.ctan.org/pkg/polyglossia}{\textcolor{blue}{polyglossia}}\xspace}% \emergencystretch=1em \hyphenation{bib-la-tex Chi-ca-go} \usepackage{btxdockit}% For \bibfield, \bibtype, \cmd, marglist, optionlist, etc. @@ -283,5 +288,6 @@ \usepackage{float}% For nonfloating tables \usepackage[it,small]{caption}% Adjust captions \gappto{\@floatboxreset}{\centering}% Center floats +\AtBeginEnvironment{tabular}{\small}% Adjust fonts \endinput -- cgit v1.2.3