diff options
author | Karl Berry <karl@freefriends.org> | 2020-09-30 21:28:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-09-30 21:28:57 +0000 |
commit | ed27c4e2ef9f9840065d1420c4d8b1fec0656f1d (patch) | |
tree | 15e9612931dbf1b9ba117de5384bff1f9bec857c /Master/texmf-dist/tex/latex/windycity/windycity.bbx | |
parent | acc0e369555df911c4c094eb7d39c1936b3ea4fd (diff) |
windycity (30sep20)
git-svn-id: svn://tug.org/texlive/trunk@56492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/windycity/windycity.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/windycity/windycity.bbx | 90 |
1 files changed, 54 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.bbx b/Master/texmf-dist/tex/latex/windycity/windycity.bbx index 0476af4784a..29bc593dddb 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: Mon 07 Sep 2020 06:40:45 PM CDT +% Last modified: Tue 29 Sep 2020 06:28:58 PM CDT % 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/07 Windy City bibliography style +\ProvidesFile{windycity.bbx}[2020/09/29 Windy City bibliography style for biblatex] \@ifpackagelater{biblatex}{2019/08/17} {} @@ -302,6 +302,8 @@ \DeclareDataInheritance{collection}{collection,inbook}{% \inherit{year}{bookyear} \inherit{endyear}{endbookyear}} +\DeclareDataInheritance{reference}{reference}{% + \inherit{author}{bookauthor}} \DeclareDataInheritance{*}{*}{% \noinherit{crossref} \noinherit{entryset} @@ -319,9 +321,9 @@ \noinherit{sortkey} \noinherit{xref}} -%%%%%%%%%%%%%%%%%%% -%% Preliminary %% -%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% Other Basic Settings %% +%%%%%%%%%%%%%%%%%%%%%%%%%%% \let\cbx@bibstring\empty \let\cbx@deflabel\empty @@ -339,11 +341,13 @@ \providetoggle{authposition} \providetoggle{bibliography} +\providetoggle{ibid:loccit} \providetoggle{journalfirst} \providetoggle{multicite} -\providetoggle{cbx@first} -\providetoggle{cbx@loccit} -\providetoggle{cbx@short} + +\providetoggle{cbx:collection} +\providetoggle{cbx:first} +\providetoggle{cbx:short} \providetoggle{collection} \providetoggle{collection:bk} @@ -363,7 +367,7 @@ \newcommand*{\AtEveryItem}{% \global\toggletrue{authposition}% - \global\togglefalse{cbx@short}}% + \global\togglefalse{cbx:short}}% \AtBeginBibliography{\AtBeginLists}% \AtBeginShorthands{\AtBeginLists}% @@ -371,6 +375,7 @@ \global\toggletrue{bibliography}% \AtEveryItem}% \AtEveryLositem{\AtEveryItem}% +\DeclareNumChars{.[]?} \defbibenvironment{reflist} {\global\toggletrue{reflist}% @@ -513,13 +518,13 @@ \DeclareFieldFormat[thesis,unpublished]{title}{% \iftoggle{bibliography} {\mkbibquote{#1}}% - {\iftoggle{cbx@short} + {\iftoggle{cbx:short} {\mkbibquote{#1}}% {\mkbibquote{#1}\nopunct}}} \DeclareFieldFormat[thesis]{labeltitle}{% \iftoggle{bibliography} {\mkbibquote{#1}}% - {\iftoggle{cbx@short} + {\iftoggle{cbx:short} {\mkbibquote{#1}}% {\mkbibquote{#1}\nopunct}}} @@ -556,8 +561,8 @@ \DeclareFieldFormat{season}{\MakeCapital{#1}}% always capitalize % A shorthand should be italicized if the title that it abbreviates is -% also italicized. See CMOS, 17th ed., 14.60. Set this in the -% bibliography database with '\emph{}' or '\mkbibemph{}'. +% also italicized. See CMOS, 17th ed., 14.60. Set italics for it in +% the bibliography database with '\emph{}' or '\mkbibemph{}'. \DeclareFieldFormat{shorthand}{#1} \DeclareFieldFormat{shorthandintro}{% @@ -626,6 +631,7 @@ {\usebibmacro{edtransuthpos}% \ifnameundef{\cbx@namelist} {\toggletrue{noauth}% + \usebibmacro{authpos+deflabel}% \usebibmacro{journalfirst}}% {\usebibmacro{addplus:authpos}% \usebibmacro{namehash+etc}}}% @@ -661,10 +667,9 @@ {\renewcommand*{\cbx@namelist}{bookauthor}}% {\renewcommand*{\cbx@namelist}{shortbookauthor}}} -% When 'journaltitle' or 'blogtitle' goes in the author's position. +% When 'journaltitle' goes in the author's position. \newbibmacro*{journalfirst}{% - \usebibmacro{authpos+deflabel}% \ifboolexpr{ ( test {\ifentrytype{article}} or test {\ifentrytype{review}} ) and togl {bibliography}} @@ -675,18 +680,34 @@ \clearlist{location}% \usebibmacro{labeldate+extradate}% \newunit}% - {\ifboolexpr{ test {\ifentrytype{online}} - and togl {bibliography}} - {\toggletrue{journalfirst}% - \usebibmacro{bibblogdash}% - \setunit{\space}% - \usebibmacro{labeldate+extradate}% - \newunit}% - {}}} + {\usebibmacro{blogtitlefirst}}} + +% When 'blogtitle' goes in the author's position. + +\newbibmacro*{blogtitlefirst}{% + \ifboolexpr{ test {\ifentrytype{online}} + and togl {bibliography}} + {\toggletrue{journalfirst}% + \usebibmacro{bibblogdash}% + \setunit{\space}% + \usebibmacro{labeldate+extradate}% + \newunit}% + {\usebibmacro{orgfirst}}} + +% When 'organization' goes in the author's position. + +\newbibmacro*{orgfirst}{% + \ifboolexpr{ test {\ifentrytype{reference}} + and not test {\iflistundef{organization}}} + {\printlist{organization}% + \setunit{\space}% + \newunit}% + {}} \newbibmacro*{namehash+etc}{% \usebibmacro{printnames+etc}% - \iftoggle{authposition}% false in 'crossref' macro + \ifboolexpr{ togl {authposition}% false in 'crossref' macro + or togl {multicite}} {\savefield{namehash}{\bbx@lasthash}% \usebibmacro{authpos+deflabel}% \newunit}% @@ -872,7 +893,7 @@ {\renewcommand*{\cbx@bibstring}{editor}}}}}}}}}}} \newbibmacro*{addplus:authpos}{% - \iftoggle{cbx@short} + \iftoggle{cbx:short} {} {\usebibmacro{addplus}% \renewcommand*{\plugb}{% @@ -1161,7 +1182,7 @@ \let\pluga\empty \let\plugb\empty}% -% When 'journaltitle' goes in the author's position. +% When a dash replaces 'journaltitle' in the author's position. \newbibmacro*{bibjournaldash}{% \ifboolexpr{ test {\iffieldequals{journaltitle}{\bbx@lasthash}} @@ -1175,8 +1196,7 @@ \usebibmacro{longtitle+titleaddon}% \let\xtitle\empty}}% -% When 'blogtitle' goes in the author's position. This should only -% apply when a blog has changed urls or host organizations. +% When a dash replaces 'blogtitle' in the author's position. \newbibmacro*{bibblogdash}{% \ifboolexpr{ test {\iffieldequals{blogtitle}{\bbx@lasthash}} @@ -1379,8 +1399,7 @@ %%%%%%%%%%%%%%%%%%%%%%% % The next command should work well enough for most languages but can -% be overridden by lbx files. This happens when windycity.bbx loads -% american-windycity.lbx. +% be overridden by lbx files. \renewcommand*{\mkdaterangefull}[2]{% \begingroup @@ -1548,10 +1567,9 @@ \usebibmacro{reflist+origyear}% \usebibmacro{labeldate+endyear}% \printfield{extradate}% - \ifboolexpr{ test {\iffieldundef{year}} - or test {\ifnumeral{\thefield{year}}}} - {\newunit}% - {\bibsentence\newunit}}% if year enclosed in brackets + \iffieldnums{labelyear} + {\bibsentence\newunit}% + {\newunit}}% for 'n.d.' {}} \newbibmacro*{reflist+origyear}{% @@ -2108,10 +2126,10 @@ \newbibmacro*{crossref}{% \renewcommand*{\cbx@deflabel}{labelname}% - \global\toggletrue{cbx@short}% + \global\toggletrue{cbx:short}% \entrydata{\thefield{crossref}}{% \iftoggle{reflist} - {\usebibmacro{parencite:long}}% + {\usebibmacro{parencite:new}}% {\usebibmacro{author+bookauthor+etc}% \usebibmacro{shorttitle+crossref}}% \usebibmacro{cite:volume}}} |