summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/windycity
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-07-18 20:39:56 +0000
committerKarl Berry <karl@freefriends.org>2019-07-18 20:39:56 +0000
commitd3320b0be96ce98fe41d9eb20a85f39f58c062c4 (patch)
tree56199628b450ddaede9a149c8d017643dd5627c0 /Master/texmf-dist/tex/latex/windycity
parent96f78b0ea7289bf98f4ed11ce5a0db2b6938a813 (diff)
windycity (17jul19)
git-svn-id: svn://tug.org/texlive/trunk@51668 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/windycity')
-rw-r--r--Master/texmf-dist/tex/latex/windycity/american-windycity.lbx100
-rw-r--r--Master/texmf-dist/tex/latex/windycity/windycity.bbx121
-rw-r--r--Master/texmf-dist/tex/latex/windycity/windycity.cbx28
-rw-r--r--Master/texmf-dist/tex/latex/windycity/windycity.sty5
4 files changed, 178 insertions, 76 deletions
diff --git a/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx b/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
index 0a1f4ac8827..ed734f97345 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 02 Apr 2019 01:51:01 PM CDT
+% Last modified: Wed 17 Jul 2019 09:45:17 AM CDT
% Copyright (c) 2018 Brian Michael Chase.
%
@@ -13,29 +13,111 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{american-windycity.lbx}[2019/04/02 Windy City
+\ProvidesFile{american-windycity.lbx}[2019/07/17 Windy City
localization module for biblatex]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
-% The code below comes from english.lbx. The only change is to remove
-% '\parentext{}' from '\mkbibtimezone{\thefield{#4}'.
-
\DeclareBibliographyExtras{%
+% Slightly modified from english.lbx:
\expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{%
- \stripzeros{\mktimehh{\thefield{#1}}}%
+ \addcomma\space
+ \stripzeros{\mktimehh{\thefield{#1}}}% needs '%'
\bibtimesep
\forcezerosmdt{\thefield{#2}}%
\iffieldundef{#3}{}
{\bibtimesep
- \forcezerosmdt{\thefield{#3}}}%
+ \forcezerosmdt{\thefield{#3}}}% needs '%'
\space
\ifnumless{\thefield{#1}}{12}
- {\bibstring{am}}
+ {\bibstring{am}}%
{\bibstring{pm}}%
\iffieldundef{#4}{}
{\space\bibtimezonesep
- \mkbibtimezone{\thefield{#4}}}}%
+ \mkbibtimezone{\thefield{#4}}}}% needs '%'
+% Overrides version in windycity.bbx:
+ \protected\def\mkdaterangefull#1#2{%
+ \begingroup
+ \blx@metadateinfo{#2}%
+ \ifboolexpr{ test {\iffieldundef{#2year}}
+ and test {\iffieldundef{#2month}}}
+ {\blx@nounit}%
+ {\ifboolexpr{ test {\iffieldundef{#2endyear}}
+ and test {\iffieldundef{#2endmonth}}}
+ {\printtext[#2date]{%
+ \datecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ \blx@printtime{#2}{}}%
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateuncertainprint
+ \dateeraprint{#2year}}}
+ {\iffieldundef{#2year}
+ {\iffieldundef{#2day}
+ {\csuse{mkmonthrange}{#1}{#2}}%
+ {\csuse{mkmonthdayrange}{#1}{#2}}}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\iffieldundef{#2day}
+ {\csuse{mkmonthrange}{#1}{#2}}%
+ {\csuse{mkmonthdayrange}{#1}{#2}}}
+ {\csuse{mkmonthdayyearrange}{#1}{#2}}}}}% needs '%'
+ \endgroup}%
+% For ranges of months with no year (June--August) and months in the
+% same year (June--August 2001). Also applies to articles with
+% two-month publication dates, both with a year (June/July 2001) and
+% without (June/July).
+ \protected\def\mkmonthrange#1#2{%
+ \printtext[#2date]{%
+ \datecircaprint
+ \csuse{mkbibdate#1}{}{#2month}{}%
+ \dateuncertainprint
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and test {\ifstrequal{#2}{}}}
+ {\ifnumcomp{\thefield{#2endmonth} - \thefield{#2month}}{=}{1}
+ {\addslash}%
+ {\bibdaterangesep}}%
+ {\bibdaterangesep}%
+ \enddatecircaprint
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}
+% For ranges of days and months with no year (June 3--July 1), days
+% in the same month and year (June 3--4, 2001), and days and months in
+% the same year (June 3--July 1, 2001):
+ \protected\def\mkmonthdayrange#1#2{%
+ \printtext[#2date]{%
+ \datecircaprint
+ \csuse{mkbibdate#1}{}{#2month}{#2day}%
+ \blx@printtime{#2}{}%
+ \dateuncertainprint
+ \bibdaterangesep
+ \enddatecircaprint
+ \iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}%
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \blx@printtime{#2}{end}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}
+% For ranges of days, months, and years (June 3, 2001--July 1, 2002):
+ \protected\def\mkmonthdayyearrange#1#2{%
+ \printtext[#2date]{%
+ \datecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ \blx@printtime{#2}{}}%
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateuncertainprint
+ \dateeraprint{#2year}%
+ \iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdaterangesep}}%
+ {\bibdaterangesep
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \blx@printtime{#2}{end}}%
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}}
}
\NewBibliographyString{by}
diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.bbx b/Master/texmf-dist/tex/latex/windycity/windycity.bbx
index 3d4111ac138..6e8e2c35ebe 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 02 Apr 2019 02:13:22 PM CDT
+% Last modified: Wed 17 Jul 2019 09:44:45 AM CDT
% Copyright (c) 2019 Brian Michael Chase.
%
@@ -13,7 +13,7 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{windycity.bbx}[2019/04/02 Windy City bibliography style
+\ProvidesFile{windycity.bbx}[2019/07/17 Windy City bibliography style
for biblatex]
\@ifpackagelater{biblatex}{2017/11/04}
{}
@@ -168,7 +168,14 @@
useprefix=false,
usetranslator=true}
+% If a document's language is English, set by babel or polyglossia or
+% by biblatex when neither babel nor polyglossia has been loaded, use
+% 'american-windycity.lbx':
\DeclareLanguageMapping{english}{american-windycity}
+% If the document's language isn't English, try to override
+% 'american-windycity.lbx' with '<language>-windycity.lbx':
+\DeclareLanguageMappingSuffix{-windycity}
+
\DeclareLabeldate{% 'reflist' preamble option loads an alternative
\field{bookyear}
\field{date}
@@ -1346,12 +1353,45 @@
%% Dates and Times %%
%%%%%%%%%%%%%%%%%%%%%%%
+% 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.
+
+\renewcommand*{\mkdaterangefull}[2]{%
+ \begingroup
+ \blx@metadateinfo{#2}%
+ \ifboolexpr{ test {\iffieldundef{#2year}}
+ and test {\iffieldundef{#2month}}}
+ {\blx@nounit}%
+ {\printtext[#2date]{%
+ \datecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ \blx@printtime{#2}{}}%
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateuncertainprint
+ \dateeraprint{#2year}%
+ \ifboolexpr{ test {\iffieldundef{#2endyear}}
+ and test {\iffieldundef{#2endmonth}}}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdaterangesep}}%
+ {\bibdaterangesep
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \blx@printtime{#2}{end}}%
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}}}% needs '%'
+ \endgroup}%
+
\newbibmacro*{issue+month+etc}[1]{%
\iffieldundef{year}
{\iffieldundef{month}
{}
{\setunit{\space}%
- \printtext[parens]{\usebibmacro{month+endmonth}}}}
+ \printtext[parens]{\printdate}}}
{\ifboolexpr{ test {\iffieldundef{volume}}
and test {\iffieldundef{number}}}
{\iffieldundef{journal}
@@ -1359,61 +1399,30 @@
{\setunit{\addcomma\space}}%
\iffieldundef{month}
{\usebibmacro{issue+season+year}}%
- {\usebibmacro{month+day+year}}}
+ {\usebibmacro{reflist+year+day}%
+ \printdate}}%
{\iffieldundef{month}
{\setunit{\space}%
\usebibmacro{reflist+issue+season}}%
{\ifstrequal{#1}{noparens}
- {\newunit
- \usebibmacro{month+day+year}}%
- {\setunit{\space}%
- \printtext[parens]{%
- \usebibmacro{month+day+year}}}}}}}
-
-\newbibmacro*{month+day+year}{%
- \usebibmacro{month+endmonth}%
- \usebibmacro{reflist+day+year}}%
-
-\newbibmacro*{month+endmonth}{%
- \iffieldundef{month}
- {}
- {\printfield{month}%
- \ifboolexpr{ test {\iffieldundef{endmonth}}
- or test {\iffieldsequal{month}{endmonth}}}
- {}
- {\addslash\printfield{endmonth}}}}
-
-\newbibmacro*{reflist+day+year}{%
+ {\usebibmacro{reflist+year+day}%
+ \newunit
+ \printdate}%
+ {\usebibmacro{reflist+year+day}%
+ \setunit{\space}%
+ \printtext[parens]{\printdate}}}}}}
+
+\newbibmacro*{reflist+year+day}{%
\ifboolexpr{ togl {bibliography}
- and togl {reflist}}
- {\iffieldundef{day}
- {}
- {\usebibmacro{day+endday+year}}}
- {\iffieldundef{day}
- {\addspace
- \printfield{year}}%
- {\usebibmacro{day+endday+year}}}}
-
-\newbibmacro*{day+endday+year}{%
- \usebibmacro{day+endday}%
- \addcomma\space
- \printfield{year}%
- \usebibmacro{hour+minute+timezone}}%
-
-\newbibmacro*{day+endday}{%
- \iffieldundef{day}
- {}
- {\addspace
- \stripzeros{\thefield{day}}%
- \iffieldundef{endday}
- {}
- {\textendash\stripzeros{\thefield{endday}}}}}
-
-\newbibmacro*{hour+minute+timezone}{%
- \iffieldundef{hour}
- {}
- {\addcomma\space
- \printtime}}%
+ and togl {reflist}
+ and test {\iffieldundef{day}}}
+ {\iffieldundef{endyear}
+ {\clearfield{year}}%
+ {\iffieldsequal{year}{endyear}
+ {\clearfield{year}%
+ \clearfield{endyear}}%
+ {}}}
+ {}}
% Treat 'season' as an alternative for 'issue'.
@@ -1818,7 +1827,8 @@
\setunit{\addcomma\space}%
\printlist{location}%
\setunit{\addcomma\space}%
- \usebibmacro{month+day+year}}%
+ \usebibmacro{reflist+year+day}%
+ \printdate}%
%%%%%%%%%%%%%%%%%%%%%%%%%
%% Third Tier Macros %%
@@ -1986,7 +1996,8 @@
\ifboolexpr{ test {\iflistundef{location}}
and test {\iflistundef{publisher}}}
{\newunit
- \usebibmacro{month+day+year}}%
+ \usebibmacro{reflist+year+day}%
+ \printdate}%
{\iffieldundef{origtitle}
{\iftoggle{bibliography}
{\newunit
diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.cbx b/Master/texmf-dist/tex/latex/windycity/windycity.cbx
index 0d054166396..8a43318cf55 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 02 Apr 2019 11:43:21 AM CDT
+% Last modified: Wed 17 Jul 2019 09:44:59 AM CDT
% Copyright (c) 2019 Brian Michael Chase.
%
@@ -13,7 +13,7 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{windycity.cbx}[2019/04/02 Windy City citation style for
+\ProvidesFile{windycity.cbx}[2019/07/17 Windy City citation style for
biblatex]
\@ifpackagelater{biblatex}{2017/11/04}
{}
@@ -43,13 +43,6 @@
\AtEveryItem}%
\AtEveryMultiCite{\toggletrue{multicite}}%
-% To facilitate uniform output, citations in notes always end with
-% '\addperiod' (see cite:postnote). This makes '\footcite{something}'
-% and '\footnote{\cite{something}}' functionally equivalent. To
-% prevent an extra period from printing in very rare cases, as when
-% '\footcite{something}' ends with a capital letter, remove
-% '\addperiod' from the commands below:
-
\renewcommand{\bibfootnotewrapper}[1]{%
\bibsentence#1}%
\renewcommand{\bibendnotewrapper}[1]{%
@@ -131,6 +124,23 @@
\DeclareMultiCiteCommand{\smartcites}[\iffootnote{}\mkbibfootnote]
{\smartcite}{\multicitedelim}
+\DeclareCiteCommand{\textcite}
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \usebibmacro{test:multicite}%
+ \usebibmacro{cite}}%
+ {\multicitedelim}%
+ {\usebibmacro{postnote}}%
+
+\DeclareCiteCommand*{\textcite}
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \toggletrue{noauth}%
+ \usebibmacro{test:multicite}%
+ \usebibmacro{cite}}%
+ {\multicitedelim}%
+ {\usebibmacro{postnote}}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Parenthetical Citations %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.sty b/Master/texmf-dist/tex/latex/windycity/windycity.sty
index acc5d5b7cbf..122191c05e9 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: Tue 02 Apr 2019 12:28:34 PM CDT
+% Last modified: Tue 16 Jul 2019 07:49:59 AM CDT
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{windycity}
\RequirePackage{ifxetex}
@@ -224,9 +224,8 @@
\urlstyle{rm}
\newcommand{\biblatex}{%
\href{http://www.ctan.org/pkg/biblatex}{\textcolor{blue}{biblatex}}\xspace}%
-% From Oren Patashnik's documentation for bibtex:
\newcommand{\BibTeX}{{\rm B\kern-.05em{\sc i\kern-.025em b}\kern-.08em
- T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}%
+ \TeX}}%
\emergencystretch=1em
\hyphenation{bib-la-tex Chi-ca-go}
\usepackage{btxdockit}% For \bibfield, \bibtype, \cmd, marglist, optionlist, \op, etc.