summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-historian
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-18 00:12:17 +0000
committerKarl Berry <karl@freefriends.org>2010-09-18 00:12:17 +0000
commit05f3f24420c498f8a36ac63efa7aab1410381838 (patch)
tree674c576b2b54e7661215b7bbac67bdbbaf488e09 /Master/texmf-dist/tex/latex/biblatex-historian
parent3e043cb9a8d83174690ec924925f69217e3f1fcb (diff)
biblatex-historian update (23aug10)
git-svn-id: svn://tug.org/texlive/trunk@19787 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-historian')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-historian/historian.bbx2476
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-historian/historian.cbx431
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-historian/historian.lbx387
3 files changed, 2047 insertions, 1247 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-historian/historian.bbx b/Master/texmf-dist/tex/latex/biblatex-historian/historian.bbx
index b905c5529bb..0992609d008 100644
--- a/Master/texmf-dist/tex/latex/biblatex-historian/historian.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-historian/historian.bbx
@@ -1,17 +1,17 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% historian.bbx, v0.3a, 2010/05/20
-% A bibliography style for use with biblatex v 0.9a
+% historian.bbx, v0.4, 2010/08/22
+% A bibliography style for use with biblatex
% Developed and maintained by Sander Gliboff,
% based on guidelines from the Turabian Manual for Writers, 7th ed.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{historian.bbx}[2010/05/20 v0.3a historian bibliography style]
+\ProvidesFile{historian.bbx}[2010/08/22 v0.4 historian bibliography style]
- \@ifpackagelater{biblatex}{2010/03/19}
+ \@ifpackagelater{biblatex}{2010/08/04}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package
- The 'historian' style requires biblatex v0.9 or later.\MessageBreak
+ The 'historian' style requires biblatex v0.9b or later.\MessageBreak
You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error.}%
\endinput}
@@ -21,7 +21,7 @@
%This style is based on verbose-inote.bbx and authortitle.bbx, from which the following macros are taken (with small modifications):
\RequireBibliographyStyle{standard}
-\ExecuteBibliographyOptions{pagetracker}
+%\ExecuteBibliographyOptions{pagetracker}%options all in cbx file
\DeclareBibliographyOption{dashed}[true]{%
\ifstrequal{#1}{true}
@@ -48,7 +48,8 @@
{\item}
\defbibenvironment{shorthands}
- {\list
+ {\toggletrue{losflag}
+ \list
{\printfield[shorthandwidth]{shorthand}}
{\setlength{\labelwidth}{\shorthandwidth}%
\setlength{\leftmargin}{\labelwidth}%
@@ -72,18 +73,18 @@
\entryset{}{}%
\finentry}
-\renewbibmacro*{author}{%
- \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
- {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
- \NOT\iffirstonpage\AND
- \(\NOT\boolean{bbx@inset}\OR
- \iffieldequalstr{entrysetcount}{1}\)}
- {\bibnamedash\setunit{\addcomma\addspace}}%Changed from authortitle to insert comma after namedash
- {\printnames{author}%
- \setunit{\addcomma\space}%
- \usebibmacro{bbx:savehash}}%
- \usebibmacro{authorstrg}}
- {\global\undef\bbx@lasthash}}
+%\renewbibmacro*{author}{% Redefined extensively below
+% \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
+% {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
+% \NOT\iffirstonpage\AND
+% \(\NOT\boolean{bbx@inset}\OR
+% \iffieldequalstr{entrysetcount}{1}\)}
+% {\bibnamedash\setunit{\addcomma\addspace}}%Changed from authortitle to insert comma after namedash
+% {\printnames{author}%
+% \setunit{\addcomma\space}%
+% \usebibmacro{bbx:savehash}}%
+% \usebibmacro{authorstrg}}
+% {\global\undef\bbx@lasthash}}
\renewbibmacro*{editor}{%
\usebibmacro{bbx:editor}{editorstrg}}
@@ -122,13 +123,17 @@
{\global\undef\bbx@lasthash}}
-%%%%% TOGGLES %%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%% TOGGLES AND VARIABLES %%%%%%%%%%%%%%%%%%%%%%%%%%
-%Flag set in .cbx file when there's a postnote
-%(used for suppressing page ranges in articles)
+%Flag set in .cbx file when there appears to be a page range in the postnote
+%(used for suppressing the pages field of articles in the footnotes)
\newtoggle{printpagerange}
\toggletrue{printpagerange}
+%Set in the .cbx file by the footciteurllast and citerurllast commands
+\newtoggle{urllastflag}
+\togglefalse{urllastflag}
+
%used when crossreferencing from customd:
\newtoggle{printpages}
\newtoggle{printvolume}
@@ -145,6 +150,7 @@
%Used for flagging books that are reprint editions or translations, with original publication data
\newtoggle{origdataflag}
+\newcommand\reprintoption{\optionnoreprints}
%Used for flagging crossreferences from customd or letter
\newtoggle{xrefflag}\togglefalse{xrefflag}
@@ -153,11 +159,15 @@
%Flags set by package and entry options
\newtoggle{printurlsflag}
\newtoggle{printseriesflag}
+\newtoggle{shortincollflag}
\newtoggle{addorigflag}\togglefalse{addorigflag}
\newtoggle{addtransfromflag}\togglefalse{addtransfromflag}
\newtoggle{useshorttitles}
\newtoggle{useshortauthors}
+%Flag set in list-of-shorthands environment
+\newtoggle{losflag}
+
%Flags used for annotated bibliographies---copied from reading.bbx (new in v. 0.2)
%\newbool{bbx:entrykey}
\newbool{bbx:annotation}
@@ -176,6 +186,8 @@
\settoggle{bbx:doi}{#1}}
\DeclareEntryOption{eprint}[true]{%
\settoggle{bbx:eprint}{#1}}
+
+% Historian-specific options---see the cbx-file for the citepages options
\DeclareBibliographyOption{printseries}[true]
{\ifstrequal{#1}{true}
@@ -187,20 +199,41 @@
{\toggletrue{printseriesflag}}%
{\togglefalse{printseriesflag}}}%
+\DeclareBibliographyOption{shortincoll}[true]
+ {\ifstrequal{#1}{true}
+ {\toggletrue{shortincollflag}}%
+ {\togglefalse{shortincollflag}}}%
+
+\DeclareEntryOption{shortincoll}[true]
+ {\ifstrequal{#1}{true}
+ {\toggletrue{shortincollflag}}%
+ {\togglefalse{shortincollflag}}}%
+
\DeclareBibliographyOption{reprint}[origfirst]
- {\ifstrequal{#1}{addorig}
- {\toggletrue{addorigflag}}%
- {\relax}}%
+ {\renewcommand\reprintoption{#1}%
+ \ifthenelse{\equal{\reprintoption}{\optionaddoriginal}
+ \or\equal{\reprintoption}{\optionorigfirst}
+ \or\equal{\reprintoption}{\optiondoubledate}
+ \or\equal{\reprintoption}{\optionnoreprints}}
+ {%then valid bibliography option
+ \relax}%
+ {%else not a valid option; don't do reprints at all
+ \renewcommand\reprintoption{\optionnoreprints}}%
+ }%
\DeclareEntryOption{reprint}[origfirst]
- {\ifstrequal{#1}{addorig}
- {\toggletrue{addorigflag}%
- \togglefalse{addtransfromflag}}%
- {\ifstrequal{#1}{addtransfrom}
- {\toggletrue{addtransfromflag}%
- \togglefalse{addorigflag}}%
- {\togglefalse{addorigflag}%
- \togglefalse{addtransfromflag}}}}%
+ {\renewcommand\reprintoption{#1}%
+ \ifthenelse{\equal{\reprintoption}{\optionaddoriginal}
+ \or\equal{\reprintoption}{\optionorigfirst}
+ \or\equal{\reprintoption}{\optiondoubledate}
+ \or\equal{\reprintoption}{\optionnoreprints}
+ \or\equal{\reprintoption}{\optiontransfromorig}
+ \or\equal{\reprintoption}{\optionorigtransas}}
+ {%then valid entry option
+ \relax}%
+ {%else not a valid option; don't do reprints at all
+ \renewcommand\reprintoption{\optionnoreprints}}%
+ }%
\DeclareEntryOption{shorttitle}[true]
{\ifstrequal{#1}{true}
@@ -223,12 +256,16 @@
%%%%% CITE COMMANDS FOR CROSS-REFERENCING %%%%%%%%%%%
-%For cross-referencing to collection in bibliography
+%For cross-referencing to collection (or book) in bibliography
\DeclareCiteCommand{\bbx@crosstocoll}[]{}{%
\toggletrue{xrefflag}%
\printtext
{\bibhypertarget{\thefield{entrykey}:\the\value{instcount}}%
- {\usebibmacro{getbookinfo}}}%
+ {\iftoggle{shortincollflag}
+ {%Then book/collection date are to be abbreviated
+ \usebibmacro{getbookinfo-short}}%
+ {%Else Print book/collection data in full
+ \usebibmacro{getbookinfo}}}}%
}{}{}%
%For cross-referencing to periodical in bibliography
@@ -241,12 +278,15 @@
%For cross-referencing to reference in bibliography.
-%Normally, reference works won't be included in the bibliography, but just in caseÉ
+%Normally, reference works won't be included in the bibliography, but just in case
+%Treated same as xrefs to collections and books
\DeclareCiteCommand{\bbx@crosstoref}[]{}{%
\toggletrue{xrefflag}%
- \printtext
+\printtext
{\bibhypertarget{\thefield{entrykey}:\the\value{instcount}}%
- {\usebibmacro{getbookinfo}}}%Prints title first
+ {\iftoggle{shortincollflag}
+ {\usebibmacro{getbookinfo-short}}%
+ {\usebibmacro{getbookinfo}}}}%
}{}{}%
%For cross-referencing to customa in bibliography
@@ -260,7 +300,7 @@
%%%%% BIBLIOGRAPHY CATEGORIES %%%%%%%%%%%
%Certain entrytypes and subtypes need to be omitted or listed separately from the main bibliography. Set up categories for them
-\DeclareBibliographyCategory{footnoteonly}
+\DeclareBibliographyCategory{noteonly}
\DeclareBibliographyCategory{newspaper}
\DeclareBibliographyCategory{magazine}
\DeclareBibliographyCategory{innewspaper}
@@ -272,9 +312,8 @@
\DeclareBibliographyCategory{listserv}
%%%%%% PUNCTUATION AND FIELD FORMATS
-% Unit punctuation is period (unchanged from biblatex standard)
-\renewcommand\newunitpunct{\addperiod\space}%
-% (But in footnote environment; cbx file switches to comma)
+% Unit punctuation is comma, block punctuation period
+\renewcommand\newunitpunct{\addperiod\addspace}%
%Colons before page numbers and between titles and subtitles
\renewcommand{\bibpagespunct}{\addcolon\addspace}%
@@ -287,12 +326,20 @@
%%Put commas, etc. inside quotes
\uspunctuation %This makes sure American-style quote punctuation is enabled
-%Title formatting adjustments
+% Title formatting
+% (Titles should have been entered in headline case)
+
+\DeclareFieldFormat{titlecase}{#1}
+
+\DeclareFieldFormat{booktitle}{\mkbibemph{#1}}
\DeclareFieldFormat{issuetitle}{\mkbibquote{#1}}
+
\DeclareFieldFormat[customd]{title}{%
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypebooklike}}%
{\mkbibemph{#1}}%
{\mkbibquote{#1}}}%
+\DeclareFieldFormat[periodical]{title}{%
+ \mkbibemph{#1}}%
\DeclareFieldFormat[article]{title}{%
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypepublicdocument}}%
{\mkbibemph{#1}}%
@@ -326,6 +373,10 @@
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypebooklike}}%
{\mkbibemph{#1}}%
{\mkbibquote{#1}}}%
+\DeclareFieldFormat[video]{title}{%
+ \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeonline}}%
+ {\mkbibquote{#1}}%
+ {\mkbibemph{#1}}}%
\DeclareFieldFormat[artwork]{title}{%
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypebooklike}}%
{\mkbibemph{#1}}%
@@ -379,10 +430,11 @@
{\mkbibordinal{#1}~\bibstring{edition}}%
{\ifcapital{\MakeCapital{#1}}{#1}}\isdot}%
\DeclareFieldFormat{howpublished}{\ifcapital{\MakeCapital{#1}}{#1}}%
+%\DeclareFieldFormat{pubstate}{\ifcapital{\MakeCapital{#1}}{#1}}%
-% Get rid of default page prefix strings ``p.'' or ``pp.'' in both postnote and pages fields
-\DeclareFieldFormat{postnote}{\iffieldundef{pagination}{#1\isdot}{\mkpageprefix[pagination]{#1\isdot}}}%
+% Get rid of default page prefix strings ``p.'' or ``pp.'' in pages field and postnote
\DeclareFieldFormat{pages}{\iffieldundef{bookpagination}{#1\isdot}{\mkpageprefix[bookpagination{#1\isdot}}}%
+\DeclareFieldFormat{postnote}{\iffieldundef{pagination}{#1\isdot}{\mkpageprefix[pagination]{#1\isdot}}}%
%Change prefix for parts of book volumes
\DeclareFieldFormat{part}{%
@@ -392,6 +444,27 @@
{\addcomma\addspace bks\adddot\addspace #1}%
{\addcomma\addspace #1}}}%
+%Automatic bibstring substitutions:
+\DeclareFieldFormat{pubstate}{%
+ \ifbibstring{#1}
+ {\bibstring{#1}}%
+ {\ifcapital
+ {\MakeCapital{#1}}%
+ {#1}}}%
+\DeclareListFormat{location}{%
+ \ifbibstring{#1}
+ {\bibstring{#1}}%
+ {\usebibmacro{list:delim}{#1}%
+ #1\isdot
+ \usebibmacro{list:andothers}}}
+
+\DeclareListFormat{publisher}{%
+ \ifbibstring{#1}
+ {\bibstring{#1}}%
+ {\usebibmacro{list:delim}{#1}%
+ #1\isdot
+ \usebibmacro{list:andothers}}}
+
%Field formats for annotated bibliographies (new in v. 0.2)
%(Annotations are printed by a redefined finentry macro)
@@ -418,26 +491,82 @@
\ifcitation%
{%then in footnotes, firstname first
\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
- \usebibmacro{name:andothers}}%
- {%else bibliography
- \ifnumequal{\value{listcount}}{1}%
- {%then lastname first for first author/editor
- \usebibmacro{name:last-first}{#1}{#3}{#5}{#7}%
- \usebibmacro{name:andothers}}%
- {%else firstname first for remaining authors/editors
+ \usebibmacro{name:andothers}%
+ }%end citations
+ {%else bibliography or maybe list of shorthands
+ \iftoggle{losflag}
+ {%then list of shorthands: firstname first here, too
\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
- \usebibmacro{name:andothers}}}}%
+ \usebibmacro{name:andothers}%
+ }%end los
+ {%else bibliography
+ \ifnumequal{\value{listcount}}{1}%
+ {%then lastname first for first author/editor
+ \usebibmacro{name:last-first}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:andothers}}%
+ {%else firstname first for remaining authors/editors
+ \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:andothers}}%
+ }%end bib
+ }%
+ }%
+\DeclareNameFormat{editor}{%
+ \ifcitation%
+ {%then in footnotes, firstname first
+ \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:andothers}%
+ }%end citations
+ {%else bibliography or maybe list of shorthands
+ \iftoggle{losflag}
+ {%then list of shorthands: firstname first here, too
+ \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:andothers}%
+ }%end los
+ {%else bibliography
+ \ifnumequal{\value{listcount}}{1}%
+ {%then lastname first for first author/editor
+ \usebibmacro{name:last-first}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:andothers}}%
+ {%else firstname first for remaining authors/editors
+ \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:andothers}}%
+ }%end bib
+ }%
+ }%
-%%%%%% BIB-STRINGS %%%%%%%%%%%%%%%%
-% Redefine bibstrings in conformity with Turabian/Chicago conventions
+\DeclareNameFormat{translator}{%
+ \ifcitation%
+ {%then in footnotes, firstname first
+ \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:andothers}%
+ }%end citations
+ {%else bibliography or maybe list of shorthands
+ \iftoggle{losflag}
+ {%then list of shorthands: firstname first here, too
+ \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:andothers}%
+ }%end los
+ {%else bibliography
+ \ifnumequal{\value{listcount}}{1}%
+ {%then lastname first for first author/editor
+ \usebibmacro{name:last-first}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:andothers}}%
+ {%else firstname first for remaining authors/editors
+ \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:andothers}}%
+ }%end bib
+ }%
+ }%
+
+%%%%%% BIB-STRINGS %%%%%%%%%%%%%%%%
\NewBibliographyString{namedash}
\NewBibliographyString{letterto}
\NewBibliographyString{nodate}
\NewBibliographyString{noplace}
-\NewBibliographyString{nopub}
+\NewBibliographyString{nopublisher}
\NewBibliographyString{online}
\NewBibliographyString{postedonline}
\NewBibliographyString{pseudonym}
@@ -454,408 +583,42 @@
\NewBibliographyString{translatedfromtitlebib}
\NewBibliographyString{numbers}
\NewBibliographyString{bycorporate}
+\NewBibliographyString{bytranslatorbib}
+\NewBibliographyString{translatedas}
+\NewBibliographyString{translatedasbib}
+%\NewBibliographyString{as }
+\NewBibliographyString{forthcoming}
\DefineBibliographyStrings{american}{%
bycorporate = {by the},
bytranslator = {trans.\isdot},
+ bytranslatorbib = {translated by},
+ translatedas = {trans.\isdot as},
+ translatedasbib = {translated as},
+% as = {as},
+ forthcoming = {forthcoming},
incapitalized = {In},
- introto = {to},
+ introto = {to},
letterto = {to},
- excerptfrom = {from},
- volumeof = {of},
- byline = {by},
+ excerptfrom = {from},
+ volumeof = {of},
+ byline = {by},
online = {},%{available online from},
- postedonline = {posted},
- nodate = {n.\isdot ~d.\isdot},
- noplace = {n.\isdot ~p.\isdot},
- nopub = {n.\isdot ~p.\isdot},
+ postedonline = {posted},
+ nodate = {n.\isdot d.\isdot},
+ noplace = {n.\isdot p.\isdot},
+ nopublisher = {n.\isdot p.\isdot},
origedition = {orig. ed.\isdot},
origeditiontitled = {orig. ed.\isdot},
origeditionbib = {original edition},
- origeditiontitledbib = {original edition},
- translatedfromtitle = {translation of},
- translatedfromtitlebib = {translation of},
+ origeditiontitledbib = {original edition},
+ translatedfromtitle = {originally},
+ translatedfromtitlebib = {originally published as},
pseudonym = {pseud.\isdot},
numbers = {nos\adddot},
- namedash = {---------}
+ namedash = {---------}
}%
-%Turabian calls for mostly abbreviated bibstrings in the footnotes, but mostly long forms in the bibliography, whereas biblatex loads either one or the other from the lbx file. Here the entire list of bibstrings from the english.lbx file is redefined to make the choices. (Exceptions for `references' and `shorthands,' which are only used in the bibliography.)
-
-\DefineBibliographyStrings{american}{%
- bibliography = {\ifbibliography{Bibliography}{Bibliography}},
-% references = {\ifbibliography{References}{References}},
-% shorthands = {\ifbibliography{List of Abbreviations}{Abbreviations}},
- editor = {\ifbibliography{editor}{ed\adddot}},
- editors = {\ifbibliography{editors}{eds\adddot}},
- compiler = {\ifbibliography{compiler}{comp\adddot}},
- compilers = {\ifbibliography{compilers}{comp\adddot}},
- redactor = {\ifbibliography{redactor}{red\adddot}},
- redactors = {\ifbibliography{redactors}{red\adddot}},
- founder = {\ifbibliography{founder}{found\adddot}},
- founders = {\ifbibliography{founders}{found\adddot}},
- continuator = {\ifbibliography{continued}{cont\adddot}}, % FIXME: unsure
- continuators = {\ifbibliography{continued}{cont\adddot}}, % FIXME: unsure
- collaborator = {\ifbibliography{collaborator}{collab\adddot}}, % FIXME: unsure
- collaborators = {\ifbibliography{collaborators}{collab\adddot}}, % FIXME: unsure
- translator = {\ifbibliography{translator}{trans\adddot}},
- translators = {\ifbibliography{translators}{trans\adddot}},
- commentator = {\ifbibliography{commentator}{comm\adddot}},
- commentators = {\ifbibliography{commentators}{comm\adddot}},
- annotator = {\ifbibliography{annotator}{annot\adddot}},
- annotators = {\ifbibliography{annotators}{annot\adddot}},
- commentary = {\ifbibliography{commentary}{comm\adddot}},
- annotations = {\ifbibliography{annotations}{annot\adddot}},
- introduction = {\ifbibliography{introduction}{intro\adddot}},
- foreword = {\ifbibliography{foreword}{forew\adddot}},
- afterword = {\ifbibliography{afterword}{afterw\adddot}},
- editortr = {\ifbibliography{editor and translator}%
- {ed\adddotspace and trans\adddot}},
- editorstr = {\ifbibliography{editors and translators}%
- {eds\adddotspace and trans\adddot}},
- editorco = {\ifbibliography{editor and commentator}%
- {ed\adddotspace and comm\adddot}},
- editorsco = {\ifbibliography{editors and commentators}%
- {eds\adddotspace and comm\adddot}},
- editoran = {\ifbibliography{editor and annotator}%
- {ed\adddotspace and annot\adddot}},
- editorsan = {\ifbibliography{editors and annotators}%
- {eds\adddotspace and annot\adddot}},
- editorin = {\ifbibliography{editor and introduction}%
- {ed\adddotspace and introd\adddot}},
- editorsin = {\ifbibliography{editors and introduction}%
- {eds\adddotspace and introd\adddot}},
- editorfo = {\ifbibliography{editor and foreword}%
- {ed\adddotspace and forew\adddot}},
- editorsfo = {\ifbibliography{editors and foreword}%
- {eds\adddotspace and forew\adddot}},
- editoraf = {\ifbibliography{editor and afterword}%
- {ed\adddotspace and afterw\adddot}},
- editorsaf = {\ifbibliography{editors and afterword}%
- {eds\adddotspace and afterw\adddot}},
- editortrco = {\ifbibliography{editor, translator\finalandcomma\ and commentator}%
- {ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}},
- editorstrco = {\ifbibliography{editors, translators\finalandcomma\ and commentators}%
- {eds.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}},
- editortran = {\ifbibliography{editor, translator\finalandcomma\ and annotator}%
- {ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}},
- editorstran = {\ifbibliography{editors, translators\finalandcomma\ and annotators}%
- {eds.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}},
- editortrin = {\ifbibliography{editor, translator\finalandcomma\ and introduction}%
- {ed.,\addabbrvspace trans\adddot\finalandcomma\ and introd\adddot}},
- editorstrin = {\ifbibliography{editors, translators\finalandcomma\ and introduction}%
- {eds.,\addabbrvspace trans\adddot\finalandcomma\ and introd\adddot}},
- editortrfo = {\ifbibliography{editor, translator\finalandcomma\ and foreword}%
- {ed.,\addabbrvspace trans\adddot\finalandcomma\ and forew\adddot}},
- editorstrfo = {\ifbibliography{editors, translators\finalandcomma\ and foreword}%
- {eds.,\addabbrvspace trans\adddot\finalandcomma\ and forew\adddot}},
- editortraf = {\ifbibliography{editor, translator\finalandcomma\ and afterword}%
- {ed.,\addabbrvspace trans\adddot\finalandcomma\ and afterw\adddot}},
- editorstraf = {\ifbibliography{editors, translators\finalandcomma\ and afterword}%
- {eds.,\addabbrvspace trans\adddot\finalandcomma\ and afterw\adddot}},
- editorcoin = {\ifbibliography{editor, commentator\finalandcomma\ and introduction}%
- {ed.,\addabbrvspace comm\adddot\finalandcomma\ and introd\adddot}},
- editorscoin = {\ifbibliography{editors, commentators\finalandcomma\ and introduction}%
- {eds.,\addabbrvspace comm\adddot\finalandcomma\ and introd\adddot}},
- editorcofo = {\ifbibliography{editor, commentator\finalandcomma\ and foreword}%
- {ed.,\addabbrvspace comm\adddot\finalandcomma\ and forew\adddot}},
- editorscofo = {\ifbibliography{editors, commentators\finalandcomma\ and foreword}%
- {eds.,\addabbrvspace comm\adddot\finalandcomma\ and forew\adddot}},
- editorcoaf = {\ifbibliography{editor, commentator\finalandcomma\ and afterword}%
- {ed.,\addabbrvspace comm\adddot\finalandcomma\ and afterw\adddot}},
- editorscoaf = {\ifbibliography{editors, commentators\finalandcomma\ and afterword}%
- {eds.,\addabbrvspace comm\adddot\finalandcomma\ and afterw\adddot}},
- editoranin = {\ifbibliography{editor, annotator\finalandcomma\ and introduction}%
- {ed.,\addabbrvspace annot\adddot\finalandcomma\ and introd\adddot}},
- editorsanin = {\ifbibliography{editors, annotators\finalandcomma\ and introduction}%
- {eds.,\addabbrvspace annot\adddot\finalandcomma\ and introd\adddot}},
- editoranfo = {\ifbibliography{editor, annotator\finalandcomma\ and foreword}%
- {ed.,\addabbrvspace annot\adddot\finalandcomma\ and forew\adddot}},
- editorsanfo = {\ifbibliography{editors, annotators\finalandcomma\ and foreword}%
- {eds.,\addabbrvspace annot\adddot\finalandcomma\ and forew\adddot}},
- editoranaf = {\ifbibliography{editor, annotator\finalandcomma\ and afterword}%
- {ed.,\addabbrvspace annot\adddot\finalandcomma\ and afterw\adddot}},
- editorsanaf = {\ifbibliography{editors, annotators\finalandcomma\ and afterword}%
- {eds.,\addabbrvspace annot\adddot\finalandcomma\ and afterw\adddot}},
- editortrcoin = {\ifbibliography{editor, translator, commentator\finalandcomma\ and introduction}%
- {ed.,\addabbrvspace trans., comm\adddot\finalandcomma\ and introd\adddot}},
- editorstrcoin = {\ifbibliography{editors, translators, commentators\finalandcomma\ and introduction}%
- {eds.,\addabbrvspace trans., comm\adddot\finalandcomma\ and introd\adddot}},
- editortrcofo = {\ifbibliography{editor, translator, commentator\finalandcomma\ and foreword}%
- {ed.,\addabbrvspace trans., comm\adddot\finalandcomma\ and forew\adddot}},
- editorstrcofo = {\ifbibliography{editors, translators, commentators\finalandcomma\ and foreword}%
- {eds.,\addabbrvspace trans., comm\adddot\finalandcomma\ and forew\adddot}},
- editortrcoaf = {\ifbibliography{editor, translator, commentator\finalandcomma\ and afterword}%
- {ed.,\addabbrvspace trans., comm\adddot\finalandcomma\ and afterw\adddot}},
- editorstrcoaf = {\ifbibliography{editors, translators, commentators\finalandcomma\ and afterword}%
- {eds.,\addabbrvspace trans., comm\adddot\finalandcomma\ and afterw\adddot}},
- editortranin = {\ifbibliography{editor, translator, annotator\finalandcomma\ and introduction}%
- {ed.,\addabbrvspace trans., annot\adddot\finalandcomma\ and introd\adddot}},
- editorstranin = {\ifbibliography{editors, translators, annotators\finalandcomma\ and introduction}%
- {eds.,\addabbrvspace trans., annot\adddot\finalandcomma\ and introd\adddot}},
- editortranfo = {\ifbibliography{editor, translator, annotator\finalandcomma\ and foreword}%
- {ed.,\addabbrvspace trans., annot\adddot\finalandcomma\ and forew\adddot}},
- editorstranfo = {\ifbibliography{editors, translators, annotators\finalandcomma\ and foreword}%
- {eds.,\addabbrvspace trans., annot\adddot\finalandcomma\ and forew\adddot}},
- editortranaf = {\ifbibliography{editor, translator, annotator\finalandcomma\ and afterword}%
- {ed.,\addabbrvspace trans., annot\adddot\finalandcomma\ and afterw\adddot}},
- editorstranaf = {\ifbibliography{editors, translators, annotators\finalandcomma\ and afterword}%
- {eds.,\addabbrvspace trans., annot\adddot\finalandcomma\ and afterw\adddot}},
- translatorco = {\ifbibliography{translator and commentator}%
- {trans\adddot\ and comm\adddot}},
- translatorsco = {\ifbibliography{translators and commentators}%
- {trans\adddot\ and comm\adddot}},
- translatoran = {\ifbibliography{translator and annotator}%
- {trans\adddot\ and annot\adddot}},
- translatorsan = {\ifbibliography{translators and annotators}%
- {trans\adddot\ and annot\adddot}},
- translatorin = {\ifbibliography{translation and introduction}%
- {trans\adddot\ and introd\adddot}},
- translatorsin = {\ifbibliography{translation and introduction}%
- {trans\adddot\ and introd\adddot}},
- translatorfo = {\ifbibliography{translation and foreword}%
- {trans\adddot\ and forew\adddot}},
- translatorsfo = {\ifbibliography{translation and foreword}%
- {trans\adddot\ and forew\adddot}},
- translatoraf = {\ifbibliography{translation and afterword}%
- {trans\adddot\ and afterw\adddot}},
- translatorsaf = {\ifbibliography{translation and afterword}%
- {trans\adddot\ and afterw\adddot}},
- translatorcoin = {\ifbibliography{translation, commentary\finalandcomma\ and introduction}%
- {trans., comm\adddot\finalandcomma\ and introd\adddot}},
- translatorscoin = {\ifbibliography{translation, commentary\finalandcomma\ and introduction}%
- {trans., comm\adddot\finalandcomma\ and introd\adddot}},
- translatorcofo = {\ifbibliography{translation, commentary\finalandcomma\ and foreword}%
- {trans., comm\adddot\finalandcomma\ and forew\adddot}},
- translatorscofo = {\ifbibliography{translation, commentary\finalandcomma\ and foreword}%
- {trans., comm\adddot\finalandcomma\ and forew\adddot}},
- translatorcoaf = {\ifbibliography{translation, commentary\finalandcomma\ and afterword}%
- {trans., comm\adddot\finalandcomma\ and afterw\adddot}},
- translatorscoaf = {\ifbibliography{translation, commentary\finalandcomma\ and afterword}%
- {trans., comm\adddot\finalandcomma\ and afterw\adddot}},
- translatoranin = {\ifbibliography{translation, annotations\finalandcomma\ and introduction}%
- {trans., annot\adddot\finalandcomma\ and introd\adddot}},
- translatorsanin = {\ifbibliography{translation, annotations\finalandcomma\ and introduction}%
- {trans., annot\adddot\finalandcomma\ and introd\adddot}},
- translatoranfo = {\ifbibliography{translation, annotations\finalandcomma\ and foreword}%
- {trans., annot\adddot\finalandcomma\ and forew\adddot}},
- translatorsanfo = {\ifbibliography{translation, annotations\finalandcomma\ and foreword}%
- {trans., annot\adddot\finalandcomma\ and forew\adddot}},
- translatoranaf = {\ifbibliography{translation, annotations\finalandcomma\ and afterword}%
- {trans., annot\adddot\finalandcomma\ and afterw\adddot}},
- translatorsanaf = {\ifbibliography{translation, annotations\finalandcomma\ and afterword}%
- {trans., annot\adddot\finalandcomma\ and afterw\adddot}},
- byauthor = {\ifbibliography{by}{by}},
- byeditor = {\ifbibliography{edited by}{ed\adddotspace by}},
- bycompiler = {\ifbibliography{compiled by}{comp\adddotspace by}},
- byredactor = {\ifbibliography{redacted by}{red\adddotspace by}},
- byfounder = {\ifbibliography{founded by}{found\adddotspace by}},
- bycontinuator = {\ifbibliography{continued by}{cont\adddotspace by}},
- bycollaborator = {\ifbibliography{in collaboration with}{in collab\adddotspace with}}, % FIXME: unsure
- bytranslator = {\ifbibliography{translated \lbx@fromlang\ by}{trans\adddot\ \lbx@fromlang\ by}},
- bycommentator = {\ifbibliography{commented by}{comm\adddot\ by}},
- byannotator = {\ifbibliography{annotated by}{annot\adddot\ by}},
- withcommentator = {\ifbibliography{with a commentary by}{with a comment\adddot\ by}},
- withannotator = {\ifbibliography{with annotations by}{with annots\adddot\ by}},
- withintroduction = {\ifbibliography{with an introduction by}{with an intro\adddot\ by}},
- withforeword = {\ifbibliography{with a foreword by}{with a forew\adddot\ by}},
- withafterword = {\ifbibliography{with an afterword by}{with an afterw\adddot\ by}},
- byeditortr = {\ifbibliography{edited and translated \lbx@fromlang\ by}%
- {ed\adddotspace and trans\adddot\ \lbx@fromlang\ by}},
- byeditorco = {\ifbibliography{edited and commented by}%
- {ed\adddotspace and comm\adddot\ by}},
- byeditoran = {\ifbibliography{edited and annotated by}%
- {ed\adddotspace and annot\adddot\ by}},
- byeditorin = {\ifbibliography{edited, with an introduction, by}%
- {ed.,\addabbrvspace with an introd., by}},
- byeditorfo = {\ifbibliography{edited, with a foreword, by}%
- {ed.,\addabbrvspace with a forew., by}},
- byeditoraf = {\ifbibliography{edited, with an afterword, by}%
- {ed.,\addabbrvspace with an afterw., by}},
- byeditortrco = {\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and commented by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm\adddot\ by}},
- byeditortran = {\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and annotated by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot\adddot\ by}},
- byeditortrin = {\ifbibliography{edited and translated \lbx@fromlang, with an introduction, by}%
- {ed\adddotspace and trans\adddot\ \lbx@fromlang, with an introd., by}},
- byeditortrfo = {\ifbibliography{edited and translated \lbx@fromlang, with a foreword, by}%
- {ed\adddotspace and trans\adddot\ \lbx@fromlang, with a forew., by}},
- byeditortraf = {\ifbibliography{edited and translated \lbx@fromlang, with an afterword, by}%
- {ed\adddotspace and trans\adddot\ \lbx@fromlang, with an afterw., by}},
- byeditorcoin = {\ifbibliography{edited and commented, with an introduction, by}%
- {ed\adddotspace and comm., with an introd., by}},
- byeditorcofo = {\ifbibliography{edited and commented, with a foreword, by}%
- {ed\adddotspace and comm., with a forew., by}},
- byeditorcoaf = {\ifbibliography{edited and commented, with an afterword, by}%
- {ed\adddotspace and comm., with an afterw., by}},
- byeditoranin = {\ifbibliography{edited and annotated, with an introduction, by}%
- {ed\adddotspace and annot., with an introd., by}},
- byeditoranfo = {\ifbibliography{edited and annotated, with a foreword, by}%
- {ed\adddotspace and annot., with a forew., by}},
- byeditoranaf = {\ifbibliography{edited and annotated, with an afterword, by}%
- {ed\adddotspace and annot., with an afterw., by}},
- byeditortrcoin = {\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and commented, with an introduction, by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm., with an introd., by}},
- byeditortrcofo = {\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and commented, with a foreword, by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm., with a forew., by}},
- byeditortrcoaf = {\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and commented, with an afterword, by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm., with an afterw., by}},
- byeditortranin = {\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and annotated, with an introduction, by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot, with an introd., by}},
- byeditortranfo = {\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and annotated, with a foreword, by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot, with a forew., by}},
- byeditortranaf = {\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and annotated, with an afterword, by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot, with an afterw., by}},
- bytranslatorco = {\ifbibliography{translated \lbx@fromlang\ and commented by}%
- {trans\adddot\ \lbx@fromlang\ and comm\adddot\ by}},
- bytranslatoran = {\ifbibliography{translated \lbx@fromlang\ and annotated by}%
- {trans\adddot\ \lbx@fromlang\ and annot\adddot\ by}},
- bytranslatorin = {\ifbibliography{translated \lbx@fromlang, with an introduction, by}%
- {trans\adddot\ \lbx@fromlang, with an introd., by}},
- bytranslatorfo = {\ifbibliography{translated \lbx@fromlang, with a foreword, by}%
- {trans\adddot\ \lbx@fromlang, with a forew., by}},
- bytranslatoraf = {\ifbibliography{translated \lbx@fromlang, with an afterword, by}%
- {trans\adddot\ \lbx@fromlang, with an afterw., by}},
- bytranslatorcoin = {\ifbibliography{translated \lbx@fromlang\ and commented, with an introduction, by}%
- {trans\adddot\ \lbx@fromlang\ and comm., with an introd., by}},
- bytranslatorcofo = {\ifbibliography{translated \lbx@fromlang\ and commented, with a foreword, by}%
- {trans\adddot\ \lbx@fromlang\ and comm., with a forew., by}},
- bytranslatorcoaf = {\ifbibliography{translated \lbx@fromlang\ and commented, with an afterword, by}%
- {trans\adddot\ \lbx@fromlang\ and comm., with an afterw., by}},
- bytranslatoranin = {\ifbibliography{translated \lbx@fromlang\ and annotated, with an introduction, by}%
- {trans\adddot\ \lbx@fromlang\ and annot., with an introd., by}},
- bytranslatoranfo = {\ifbibliography{translated \lbx@fromlang\ and annotated, with a foreword, by}%
- {trans\adddot\ \lbx@fromlang\ and annot., with a forew., by}},
- bytranslatoranaf = {\ifbibliography{translated \lbx@fromlang\ and annotated, with an afterword, by}%
- {trans\adddot\ \lbx@fromlang\ and annot., with an afterw., by}},
- and = {\ifbibliography{and}{and}},
- andothers = {\ifbibliography{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- andmore = {\ifbibliography{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- volume = {\ifbibliography{volume}{vol\adddot}},
- volumes = {\ifbibliography{volumes}{vols\adddot}},
- jourvol = {\ifbibliography{volume}{vol\adddot}},
- jourser = {\ifbibliography{series}{ser\adddot}},
- newseries = {\ifbibliography{new series}{new ser\adddot}},
- oldseries = {\ifbibliography{old series}{old ser\adddot}},
- edition = {\ifbibliography{ed\adddot}{ed\adddot}},% Changed
- reprint = {\ifbibliography{reprint}{reprint}},% Changed
- reprintof = {\ifbibliography{reprint of}{repr\adddotspace of}},
- reprintas = {\ifbibliography{reprinted as}{repr\adddotspace as}},% Changed
- page = {\ifbibliography{page}{p\adddot}},
- pages = {\ifbibliography{pages}{pp\adddot}},
- column = {\ifbibliography{column}{col\adddot}},
- columns = {\ifbibliography{columns}{cols\adddot}},
- line = {\ifbibliography{line}{l\adddot}},
- lines = {\ifbibliography{lines}{ll\adddot}},
- verse = {\ifbibliography{verse}{v\adddot}},
- verses = {\ifbibliography{verses}{vv\adddot}},
- section = {\ifbibliography{section}{\S}},
- sections = {\ifbibliography{sections}{\S\S}},
- paragraph = {\ifbibliography{paragraph}{par\adddot}},
- paragraphs = {\ifbibliography{paragraphs}{par\adddot}},
- in = {\ifbibliography{in}{in}},
- inseries = {\ifbibliography{in}{in}},
- ofseries = {\ifbibliography{of}{of}},
- number = {\ifbibliography{number}{no\adddot}},
- chapter = {\ifbibliography{chapter}{chap\adddot}},
- mathesis = {\ifbibliography{Master's thesis}{MA\addabbrvspace thesis}},
- phdthesis = {\ifbibliography{PhD\addabbrvspace thesis}{PhD\addabbrvspace thesis}},
- resreport = {\ifbibliography{research report}{research rep\adddot}},
- techreport = {\ifbibliography{technical report}{tech\adddotspace rep\adddot}},
- software = {\ifbibliography{computer software}{comp\adddotspace software}},
- datacd = {\ifbibliography{CD-ROM}{CD-ROM}},
- audiocd = {\ifbibliography{audio CD}{audio CD}},
- version = {\ifbibliography{version}{version}},
- url = {\ifbibliography{address}{address}},
- urlseen = {\ifbibliography{accessed}{accessed}},% Changed
- inpress = {\ifbibliography{in press}{in press}},
- submitted = {\ifbibliography{submitted}{submitted}},
- citedas = {\ifbibliography{henceforth cited as}{henceforth cited as}},
- thiscite = {\ifbibliography{especially}{esp\adddot}},
- seenote = {\ifbibliography{see note}{see n\adddot}},
- quotedin = {\ifbibliography{quoted in}{qtd\adddotspace in}},
- idem = {\ifbibliography{idem}{idem}},
- idemsm = {\ifbibliography{idem}{idem}},
- idemsf = {\ifbibliography{eadem}{eadem}},
- idemsn = {\ifbibliography{idem}{idem}},
- idempm = {\ifbibliography{eidem}{eidem}},
- idempf = {\ifbibliography{eaedem}{eaedem}},
- idempn = {\ifbibliography{eadem}{eadem}},
- idempp = {\ifbibliography{eidem}{eidem}},
- ibidem = {\ifbibliography{ibidem}{ibid\adddot}},
- opcit = {\ifbibliography{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
- loccit = {\ifbibliography{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
- confer = {\ifbibliography{cf\adddot}{cf\adddot}},
- sequens = {\ifbibliography{sq\adddot}{sq\adddot}},
- sequentes = {\ifbibliography{sqq\adddot}{sqq\adddot}},
- passim = {\ifbibliography{passim}{pass\adddot}},
- see = {\ifbibliography{see}{see}},
- seealso = {\ifbibliography{see also}{see also}},
- backrefpage = {\ifbibliography{cited on page}{cit\adddotspace on p\adddot}},
- backrefpages = {\ifbibliography{cited on pages}{cit\adddotspace on pp\adddot}},
- january = {\ifbibliography{January}{Jan\adddot}},
- february = {\ifbibliography{February}{Feb\adddot}},
- march = {\ifbibliography{March}{Mar\adddot}},
- april = {\ifbibliography{April}{Apr\adddot}},
- may = {\ifbibliography{May}{May}},
- june = {\ifbibliography{June}{June}},
- july = {\ifbibliography{July}{July}},
- august = {\ifbibliography{August}{Aug\adddot}},
- september = {\ifbibliography{September}{Sept\adddot}},
- october = {\ifbibliography{October}{Oct\adddot}},
- november = {\ifbibliography{November}{Nov\adddot}},
- december = {\ifbibliography{December}{Dec\adddot}},
- langamerican = {\ifbibliography{American}{American}},
- langbrazilian = {\ifbibliography{Brazilian}{Brazilian}},
- langdanish = {\ifbibliography{Danish}{Danish}},
- langdutch = {\ifbibliography{Dutch}{Dutch}},
- langenglish = {\ifbibliography{English}{English}},
- langfrench = {\ifbibliography{French}{French}},
- langgerman = {\ifbibliography{German}{German}},
- langgreek = {\ifbibliography{Greek}{Greek}},
- langitalian = {\ifbibliography{Italian}{Italian}},
- langlatin = {\ifbibliography{Latin}{Latin}},
- langnorwegian = {\ifbibliography{Norwegian}{Norwegian}},
- langportuguese = {\ifbibliography{Portuguese}{Portuguese}},
- langspanish = {\ifbibliography{Spanish}{Spanish}},
- langswedish = {\ifbibliography{Swedish}{Swedish}},
- fromamerican = {\ifbibliography{from the American}{from the American}},
- frombrazilian = {\ifbibliography{from the Brazilian}{from the Brazilian}},
- fromdanish = {\ifbibliography{from the Danish}{from the Danish}},
- fromdutch = {\ifbibliography{from the Dutch}{from the Dutch}},
- fromenglish = {\ifbibliography{from the English}{from the English}},
- fromfrench = {\ifbibliography{from the French}{from the French}},
- fromgerman = {\ifbibliography{from the German}{from the German}},
- fromgreek = {\ifbibliography{from the Greek}{from the Greek}},
- fromitalian = {\ifbibliography{from the Italian}{from the Italian}},
- fromlatin = {\ifbibliography{from the Latin}{from the Latin}},
- fromnorwegian = {\ifbibliography{from the Norwegian}{from the Norwegian}},
- fromportuguese = {\ifbibliography{from the Portuguese}{from the Portuguese}},
- fromspanish = {\ifbibliography{from the Spanish}{from the Spanish}},
- fromswedish = {\ifbibliography{from the Swedish}{from the Swedish}},
- countryde = {\ifbibliography{Germany}{DE}},
- countryeu = {\ifbibliography{European Union}{EU}},
- countryep = {\ifbibliography{European Union}{EP}},
- countryfr = {\ifbibliography{France}{FR}},
- countryuk = {\ifbibliography{United Kingdom}{GB}},
- countryus = {\ifbibliography{United States of America}{US}},
- patent = {\ifbibliography{patent}{pat\adddot}},
- patentde = {\ifbibliography{German patent}{German pat\adddot}},
- patenteu = {\ifbibliography{European patent}{European pat\adddot}},
- patentfr = {\ifbibliography{French patent}{French pat\adddot}},
- patentuk = {\ifbibliography{British patent}{British pat\adddot}},
- patentus = {\ifbibliography{U.S\adddotspace patent}{U.S\adddotspace pat\adddot}},
- patreq = {\ifbibliography{patent request}{pat\adddot\ req\adddot}},
- patreqde = {\ifbibliography{German patent request}{German pat\adddot\ req\adddot}},
- patreqeu = {\ifbibliography{European patent request}{European pat\adddot\ req\adddot}},
- patreqfr = {\ifbibliography{French patent request}{French pat\adddot\ req\adddot}},
- patrequk = {\ifbibliography{British patent request}{British pat\adddot\ req\adddot}},
- patrequs = {\ifbibliography{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}},
- file = {\ifbibliography{file}{file}},
- library = {\ifbibliography{library}{library}},
- abstract = {\ifbibliography{abstract}{abstract}},
- annotation = {\ifbibliography{annotations}{annotations}}
-}
@@ -863,6 +626,7 @@
%Define comparison strings for entrysubtypes, authortypes, etc.
+\newcommand\nameaddonpseud{pseudonym}
\newcommand\subtypemag{magazine}
\newcommand\subtypenewsp{newspaper}
\newcommand\subtypeclassic{classic}
@@ -880,6 +644,7 @@
\newcommand\authortypeanon{anonymous}
\newcommand\authortypeunsure{anonymous?}
\newcommand\authortyperedundant{redundant}
+\newcommand\authortypealternate{alternate}
\newcommand\authortypejournal{journal}
\newcommand\subtypeintro{to}
\newcommand\subtypeexcerpt{from}
@@ -888,6 +653,8 @@
\newcommand\entrytypeper{periodical}
\newcommand\entrytypemanual{manual}
\newcommand\entrytypecoll{collection}
+\newcommand\entrytypebook{book}
+\newcommand\entrytyperef{reference}
\newcommand\entrytypeproc{proceedings}
\newcommand\entrytypereport{report}
\newcommand\entrytypebooklet{booklet}
@@ -896,10 +663,18 @@
\newcommand\entrytypevideo{video}
\newcommand\entrytypeaudio{audio}
\newcommand\entrytypebookinbook{bookinbook}
-\newcommand\nameaddonpseud{pseudonym}
-
-
-
+\newcommand\entrytypearticle{article}
+\newcommand\entrytypelegislation{legislation}
+\newcommand\entrytypeletter{letter}
+\newcommand\entrytypeperformance{performance}
+\newcommand\optionaddoriginal{addorig}
+\newcommand\optionnoreprints{none}
+\newcommand\optionorigfirst{origfirst}
+\newcommand\optiontransfromorig{transfrom}
+\newcommand\optionorigtransas{transas}
+\newcommand\optiondoubledate{doubledate}
+\newcommand\noplace{np}
+\newcommand\nopublisher{np}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -911,12 +686,11 @@
\DeclareBibliographyDriver{article}{%
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypenewsp}}%
- {\addtocategory{footnoteonly}{\thefield{entrykey}}%
+ {\addtocategory{noteonly}{\thefield{entrykey}}%
\addtocategory{innewspaper}{\thefield{entrykey}}}%
{\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypemag}}%
{\addtocategory{inmagazine}{\thefield{entrykey}}}%
- {\relax}%
- }%
+ {\relax}}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\ifthenelse{\equal{\thefield{authortype}}{\authortypejournal}}%
@@ -925,11 +699,11 @@
\setunit{\labelnamepunct}\newblock
\clearfield{journaltitle}\clearfield{journalsubtitle}}%
{\ifnameundef{author}
- {\setunit{\addspace}}%
+ {\relax}%
{\usebibmacro{author}%
\setunit{\labelnamepunct}\newblock}}%
\iffieldundef{type}
- {}%
+ {\relax}%
{\printfield{type}%Needed here for certain government documents
\newunit}%
\iffieldundef{title}
@@ -939,10 +713,6 @@
\newunit\newblock}}%
{\usebibmacro{title}%
\newunit\newblock}%
-%\printfield{version}%Is this of any use?
-%\newunit\newblock
-%\usebibmacro{byauthor}%
-%\newunit\newblock
\iffieldundef{issuetitle}
{%Assume any editors go with the article, not the issue
\iffieldundef{title}
@@ -960,10 +730,11 @@
\usebibmacro{in:}}%
%Save all the location and subtype info for after the x-ref
\savefield{entrysubtype}{\childsubtype}%
- \savefield{issuetitle}{\childissuetitle}\savefield{issuesubtitle}{\childsissueubtitle}%
+ \savefield{issuetitle}{\childissuetitle}%
+ \savefield{issuesubtitle}{\childsissueubtitle}%
\savefield{note}{\childnote}\savefield{series}{\childseries}%
\savefield{volume}{\childvolume}\savefield{number}{\childnumber}%
- \savefield{issue}{\childissue}
+ \savefield{issue}{\childissue}%
\savefield{year}{\childyear}\savefield{date}{\childdate}%
%Check for x-ref to periodical record
\iffieldundef{xref}%
@@ -1012,9 +783,11 @@
\iffieldundef{booktitle}
{}%
{\usebibmacro{in:}%
- \printfield{booktitle}%
+ \usebibmacro{booktitle}%
\newunit}%
-\printfield{eventtitle}%
+\iffieldundef{eventtitle}
+ {\relax}%
+ {\printtext[title]{\printfield[titlecase]{eventtitle}}}%
\setunit{\addcomma\addspace}%
\printfield{venue}%
\setunit{\addcomma\addspace}%
@@ -1036,7 +809,7 @@
\newunit
\printfield{userd}%
\newunit
-\usebibmacro{date}%
+\usebibmacro{date-full}%
\newunit\newblock
\usebibmacro{onlinelocation}%
\newunit\newblock
@@ -1056,31 +829,60 @@
{\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeearlybook}}%
{\usebibmacro{earlybook}}%
{%else default book routine
+ \ifthenelse{\equal{\reprintoption}{origtransas}}
+ {%then reverse order: orig-fields go first
+ \usebibmacro{origtransas}}%
+ {%else
+ \relax}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \printtext{}%Something wrong here. Seem to need this dummy print statement to prevent the setunit*, below, from printing its punctuation whenever there is no author/editor/translator
+ %Author Block-----------------------------------------------
\usebibmacro{author/editor/translator}%
- \setunit*{\labelnamepunct\addspace}\newblock
- \usebibmacro{maintitle+title}%
- \newunit
- \usebibmacro{byauthor}%
- \newunit
+ \setunit*{\labelnamepunct}%
+ \newblock
+ %First-Level Title Block (for book or volume)--------------
+ \usebibmacro{title}%
+ \newunit\newblock
+ %Editors and/or Translator Blocks--------------------------
+% \usebibmacro{byauthor}% Is this ever needed?
+% \newunit\newblock
+ \ifthenelse{\equal{\thefield{entrytype}}{\entrytypereport}}%
+ {%Special case of reports with an institutional author and an individual one
+ \usebibmacro{bynamea}%
+ \newunit\newblock}%
+ {\relax}%
+ \ifthenelse{\equal{\reprintoption}{\optionorigtransas}}
+ {%then save the translator for after the publishing data
+ \savename{translator}{\temptranslator}%
+ \clearname{translator}}%
+ {%else
+ \relax}%
\usebibmacro{byeditor+others}%
\newunit\newblock
+ %Block for vol. no., second-level title, and editors-----------------
+ \usebibmacro{title+maintitle}%
+ \usebibmacro{collectioneditor}%New unit puctuation set in subroutine
+ \newunit\newblock
+ %Edition Block -----------------------------------------------------
\printfield{edition}%
- \newunit
+ \newunit\newblock
+ %Optional block for book-like videos--------------------------------
\ifthenelse{\equal{\thefield{entrytype}}{\entrytypevideo}}%
- {%then
+ {%then certain videos have to be entered as books
\printfield{type}%
\newunit\newblock}%
{%else not a video
\relax}%
- \iftoggle{printseriesflag}%Print series info only when appropriate option is set
- {\usebibmacro{series+number}\newunit\newblock}%
+ %Series Block (including note field) --------------------------------
+ \iftoggle{printseriesflag}%Print series info only when option is set
+ {\iffieldundef{series}
+ {\relax}%
+ {\usebibmacro{series+number}%
+ \setunit{\addcomma\addspace}}}%
{\relax}%
\printfield{note}%
\newunit\newblock
- %Certain book-like entrytypes are also handled by this driver. Print their extra fields here
+ %Special block for book-like entrytypes-------------------
\ifthenelse
{\equal{\thefield{entrytype}}{\entrytypemanual}%
\OR
@@ -1098,31 +900,36 @@
\newunit\newblock}%
{%else ordinary book
\relax}%
- \iffootnote%
- {\setunit{\addspace}%
- \printtext{\bibleftparen}%
- \usebibmacro{publisher+location+year}%
- \printtext{\bibrightparen}}%
- {\usebibmacro{publisher+location+year}%
- \newunit\newblock
- \printfield{userc}}%Special addendum for exhibit catalogs, in the bibliography only
+ %Publishing Data Block -------------------------------------
+ \iffootnote
+ {%then location:publisher, year in parentheses
+ \setunit{\addspace}%
+ \printtext[parens]{\usebibmacro{publisher+location+year}}%
+ }%
+ {%else no parens and an extra field
+ \usebibmacro{publisher+location+year}%
+ \newunit\newblock
+ \printfield{userc}%Special addendum for exhibit catalogs
+ }%
\newunit\newblock
- %Check for original publication data that may have to be added, depending on option
- \iftoggle{addorigflag}%
+ %Optional block for original publication data---------------------
+ \ifthenelse{\equal{\reprintoption}{\optionaddoriginal}}
{\usebibmacro{addoriginaledition}}%
- {\iftoggle{addtransfromflag}%
+ {\ifthenelse{\equal{\reprintoption}{\optiontransfromorig}}
{\usebibmacro{addtransfrom}}%
- {\relax}}%
- \newunit\newblock
- % \usebibmacro{chapter+pages}%
- % \newunit\newblock
- % \printfield{pagetotal}%
- % \newunit\newblock
- % \printfield{isbn}%
- % \newunit\newblock
+ {\ifthenelse{\equal{\reprintoption}{\optionorigtransas}}
+ {%then
+ \restorename{translator}{\temptranslator}%
+ \usebibmacro{print-translation-data}}%
+ {%else
+ \relax}%
+ }%
+ }%
\newunit\newblock
+ %Online locators----------------------------------------------------------
\usebibmacro{onlinelocation}%
\newunit\newblock
+ %Addendum and finish------------------------------------------------------
\printfield{addendum}%
\usebibmacro{pageref}%
\usebibmacro{finentry}%
@@ -1131,9 +938,9 @@
}%End oF book driver
%Subtype of Book for classics and other standard texts for which publication information is unimportant: footnotes only, no punctuation after author, and minimal publication information.
-\newbibmacro{classic}{%
-%Add key to footnoteonly category
-\addtocategory{footnoteonly}{\thefield{entrykey}}%
+\newbibmacro{classic}{%-----------------------------------------------------------
+%Add key to noteonly category
+\addtocategory{noteonly}{\thefield{entrykey}}%
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypebiblical}}
{\addtocategory{biblical}{\thefield{etnrykey}}}%
{\addtocategory{classic}{\thefield{entrykey}}}%
@@ -1148,13 +955,13 @@
\iffootnote
{\iffieldundef{shorttitle}
{\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypebiblical}}
- {\printfield[noformat]{title}}%
+ {\printfield[titlecase]{title}}%
{\usebibmacro{title}}}%
{\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypebiblical}}
- {\printfield[noformat]{shortitle}\isdot}%
+ {\printfield[titlecase]{shortitle}\isdot}%
{\printfield[title]{shorttitle}\isdot}}}%
{\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypebiblical}}
- {\printfield[noformat]{title}}%
+ {\printfield[titlecase]{title}}%
{\usebibmacro{title}}}%
\setunit{\addspace}%
\iffieldundef{edition}
@@ -1165,28 +972,33 @@
\newunit\newblock
\printfield{addendum}%
\newunit\newblock
-%\usebibmacro{pageref}%
+\usebibmacro{pageref}%
\usebibmacro{finentry}%
}%end of macro; end of classic subtype of book
%Special routine for entrysubtyp ``canon'' of book, for early English literature
-\newbibmacro{earlybook}{%
-%Add key to footnoteonly category
-\addtocategory{footnoteonly}{\thefield{entrykey}}%
+\newbibmacro{earlybook}{%-----------------------------------------------------------------
+%Add key to noteonly category
+\addtocategory{noteonly}{\thefield{entrykey}}%
\addtocategory{canonical}{\thefield{entrykey}}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\iffootnote
- {\ifnameundef{shortauthor}
- {\usebibmacro{author/editor/translator}}%
- {\printnames{shortauthor}}}%
- {\usebibmacro{author/editor/translator}}%
-\newunit\newblock
-\iffootnote
- {\iffieldundef{shorttitle}
- {\usebibmacro{title}}%
- {\printfield[title]{shorttitle}\isdot}}%
- {\usebibmacro{title}}%
+ {%then always use shortauthor and shorttitle in footnotes, if available
+ \ifnameundef{shortauthor}
+ {\usebibmacro{author/editor/translator}}%
+ {\printnames{shortauthor}}%
+ \setunit*{\labelnamepunct}%
+ \newblock
+ \iffieldundef{shorttitle}%
+ {\usebibmacro{title}}%
+ {\printtext[title]{\printfield[titlecase]{shorttitle}}\isdot}%
+ }%end footnote routine
+ {%else usual author and title routines in the bibliography
+ \usebibmacro{author/editor/translator}%
+ \newunit\newblock
+ \usebibmacro{title}%
+ }%
\setunit{\addspace}%
\iffieldundef{edition}
{\relax}%
@@ -1196,7 +1008,7 @@
\newunit\newblock
\printfield{addendum}%
\newunit\newblock
-%\usebibmacro{pageref}%
+\usebibmacro{pageref}%
\usebibmacro{finentry}%
}%End earlybook macro
@@ -1215,57 +1027,94 @@
\DeclareBibliographyDriver{collection}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
+\ifthenelse{\equal{\reprintoption}{\optionorigtransas}}
+ {%then reverse order: orig-fields go first
+ \usebibmacro{origtransas}}%
+ {%else
+ \relax}%
+%Editor Block-----------------------------------------------
\ifthenelse{\equal{\thefield{editortype}}{\edtypecorp}}
{%then corporate editor of a proceedings: print without the editor string
\printnames{editor}%
\clearname{editor}}%
{%else personal editor: use usual editor routine
\usebibmacro{editor}}%
-\setunit{\labelnamepunct}\newblock
-\usebibmacro{maintitle+title}%
+\setunit{\labelnamepunct}%
+\newblock
+%First-Level Title Block (for book or volume)--------------
+\usebibmacro{title}%
\newunit\newblock
+%Proceedings fields---------------------------------------
\usebibmacro{getproceedingsfields}%
-\newunit
+\newunit\newblock
+%Editors and/or Translator Blocks--------------------------
+\ifthenelse{\equal{\reprintoption}{\optionorigtransas}}
+ {%then save the translator for after the publishing data
+ \savename{translator}{\temptranslator}%
+ \clearname{translator}}%
+ {%else
+ \relax}%
\usebibmacro{byeditor+others}%
\newunit\newblock
+%Block for vol. no., second-level title, and editors-----------------
+\usebibmacro{title+maintitle}%
+\usebibmacro{collectioneditor}%New unit puctuation set in subroutine
+\newunit\newblock
+%Edition Block -----------------------------------------------------
\printfield{edition}%
\newunit\newblock
-\iftoggle{printseriesflag}%Print series info only when appropriate option is set
- {\usebibmacro{series+number}\newunit\newblock}%
+%Series Block (including note field) --------------------------------
+\iftoggle{printseriesflag}%Print series info only when option is set
+ {\iffieldundef{series}
+ {\relax}%
+ {\usebibmacro{series+number}%
+ \setunit{\addcomma\addspace}}}%
{\relax}%
\printfield{note}%
\newunit\newblock
+%Special fields ----------------------------------------------------
\printfield{type}%
\newunit
\printfield{version}%
\newunit\newblock
+%Publishing Data Block ------------------------------------------------
\iffootnote%
- {\setunit{\addspace}%
- \printtext[parens]{\usebibmacro{publisher+location+year}}}%
- {\usebibmacro{publisher+location+year}
- \newunit\newblock
- \printfield{userc}}%Special addendum for exhibit catalogs, in the bibliography only}%
+ {%then location:publisher, year in parentheses
+ \setunit{\addspace}%
+ \printtext{\bibleftparen}%
+ \usebibmacro{publisher+location+year}%
+ \printtext{\bibrightparen}}%
+ {%else no parens and an extra field
+ \usebibmacro{publisher+location+year}%
+ \newunit\newblock
+ \printfield{userc}%Special addendum for exhibit catalogs
+ }%
\newunit\newblock
-%Check for original publication data that may have to be added, depending on option
-\iftoggle{addorigflag}%
+%Optional block for original publication data----------------------------------------
+\ifthenelse{\equal{\reprintoption}{\optionaddoriginal}}
{\usebibmacro{addoriginaledition}}%
- {\iftoggle{addtransfromflag}%
+ {\ifthenelse{\equal{\reprintoption}{\optiontransfromorig}}
{\usebibmacro{addtransfrom}}%
- {\relax}}%
+ {\ifthenelse{\equal{\reprintoption}{\optionorigtransas}}
+ {%then
+ \restorename{translator}{\temptranslator}%
+ \usebibmacro{print-translation-data}}%
+ {%else
+ \relax}%
+ }%
+ }%
\newunit\newblock
-%\usebibmacro{chapter+pages}%
-% \newunit
-% \printfield{pagetotal}
-% \newunit\newblock
-% \printfield{isbn}%
%Print urls, etc., if appropriate option\subtype is set
\newunit\newblock
+%Online locators----------------------------------------------------------
\usebibmacro{onlinelocation}%
\newunit\newblock
+%Addendum and finish------------------------------------------------------
\printfield{addendum}%
\usebibmacro{pageref}%
\usebibmacro{finentry}%
}% End of collection driver
+
%%%%%% IMAGE %%%%%%%%%%%%%%%%%%
@@ -1278,29 +1127,31 @@
\DeclareBibliographyDriver{inbook}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
+%Author Block------------------------------------------------------
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeearlybook}}
- {\iffootnote
+ {%Then for canonical works, add key to noteonly category and use shortauthor
+ \addtocategory{noteonly}{\thefield{entrykey}}%
+ \addtocategory{canonical}{\thefield{entrykey}}%\iffootnote
{\ifnameundef{shortauthor}
{\usebibmacro{author}}%
{\printnames{shortauthor}}}%
- {\usebibmacro{author}}}%
- {\usebibmacro{author}}%
+ }%
+ {%Else not canonical, use usual author routine
+ \usebibmacro{author}}%
\savename{author}{\childauthor}%Need later, to compare with book author
-\setunit{\labelnamepunct}\newblock
-\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeearlybook}}
- {\iffootnote
- {\iffieldundef{shorttitle}
- {\usebibmacro{title}}%
- {\printfield[title]{shorttitle}\isdot}}%
- {\usebibmacro{title}}}%
- {\usebibmacro{title}}%
+\setunit{\labelnamepunct}%
+\newblock
+%Inner Title Block--------------------------------------------------------
+\usebibmacro{title}%
\newunit\newblock
+%Book-Title Block--------------------------------------------------------
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypevolume}%
\OR\equal{\thefield{entrytype}}{\entrytypebookinbook}}%
{%then1 reference is to a volume of a larger work. Print volume number here and not at the end
\printfield{volume}\printfield{part}%
- \clearfield{volume}\clearfield{part}\toggletrue{volumeprinted}
- \clearfield{title}}%Clear title, too, to prevent repetition in maintitle+title macro
+ \clearfield{volume}\clearfield{part}\toggletrue{volumeprinted}%
+ \clearfield{title}%Clear title, too, to prevent repetition
+ }%
{%else1
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypevideo}}%
{%then2 Special case of a video that gets bookvolume-like formatting
@@ -1308,32 +1159,36 @@
{\printfield[noformat]{volume}}%
{\printtext[noformat]{\MakeCapital{\thefield{volume}}}}%
\clearfield{volume}\toggletrue{volumeprinted}%
- }%end then2
- {%else2 default case: print chapter instead of volume (Turabian doesn't use chapter numbers; just throwing them in for compatibility)
- \printfield{chapter}%
- }%end else2, end subtypevideo test
- }%end else1, end subtypevolume test
+ }%end then2
+ {%else2 default case
+ \printfield{chapter}%(Turabian doesn't actually use chapter numbers)
+ }%end else2, end subtypevideo test
+ }%end else1, end subtypevolume test
\newunit\newblock
-\usebibmacro{in:}%Macro modifed below for subtypes that need different prepositions
-%Now come the collection data, but where are they? Must distinguish four combinations of cases: in the current entry or in a crossreferenced book X in the footnotes or the bibliography
+%Second-level title and editor, publishing data------------------------------------------
%But first, save info to pass to parent record in case of x-reffing
\savename{author}{\childauthor}%
\savefield{pages}{\childpages}%
\savefield{volume}{\childvolume}%
\savefield{part}{\childpart}%
+\usebibmacro{in:}%Macro modifed below for subtypes that need different prepositions
+%Where are the book data?
+%First check whether there is an x-ref to the book
\iffieldundef{xref}%
{%then no xref; get book info from current entry
\usebibmacro{getbookinfo}}%
{%else x-ref to the parent entry; the crosstocoll citecommands will then pass parent data to the bibmacro getbookinfo, below
- \printtext{\unspace}%Just to force the unit punctutation before the xref
+ \printtext[noformat]{\unspace}%Just to force the unit punctutation before the xref
\iffootnote
{\cbx@crosstocoll{\thefield{xref}}}%
{\bbx@crosstocoll{\thefield{xref}}}%
}%endiffieldundef
-%Print rest of inbook data
\newunit\newblock
+%Print rest of inbook data
+%Onlineblock---------------------------------------------------------------
\usebibmacro{onlinelocation}%
\newunit\newblock
+%Addendum and finish-----------------------------------------------------
\printfield{addendum}%
\newunit\newblock
\usebibmacro{pageref}%
@@ -1344,36 +1199,43 @@
%%%%%% INCOLLECTION %%%%%%%
-%Incollection needs to be rearranged extensively to conform to Turabian/Chicago. Page numbers are also placed differently in notes and bibliographies.
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
+%Author Block------------------------------------------------------
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypepublicdocument}}%
{\usebibmacro{author}}%
{\usebibmacro{author/editor/translator}}%
\savename{author}{\childauthor}%Need later, to compare with book author
-\setunit{\labelnamepunct}\newblock
+\setunit{\labelnamepunct}%
+\newblock
+%Inner Title Block--------------------------------------------------------
\usebibmacro{title}%
\newunit\newblock
+%Book-Title Block--------------------------------------------------------
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypevolume}}%
- {\printfield{volume}\printfield{part}\toggletrue{volumeprinted}%
- \clearfield{volume}\clearfield{part}%
- \clearfield{title}}%So that booktitle+maintitle routine doesn't repeat it
- {\printfield{chapter}}%Turabian doesn't give examples with chapter numbers; not sure it goes here
+ {%then1 reference is to a volume of a larger work. Print volume number here and not at the end
+ \printfield{volume}\printfield{part}\toggletrue{volumeprinted}%
+ \clearfield{volume}\clearfield{part}%
+ }%
+ {%else1
+ \printfield{chapter}%Turabian doesn't use chapter numbers; not sure it goes here
+ }%end else1, end subtypevolume test
+\newunit\newblock
+%Second-level title and editor, publishing data --------------------------------------
%Save data for after the xref
\savename{author}{\childauthor}%
\savefield{pages}{\childpages}%
\savefield{volume}{\childvolume}%
\savefield{part}{\childpart}%
-\newunit\newblock
+%Insert preposition
\usebibmacro{in:}%
-%Now where are the collection data? Must distinguish four cases:
-%In the current entry or in a crossreferenced collection X in the footnotes or the bibliography
+%Now where are the collection data?
%First check whether there is an x-ref to the collection
\iffieldundef{xref}%
- {%then no xref
+ {%then no xref; get collection data from the current entry
\usebibmacro{getbookinfo}}%
- {%else x-ref to the parent entry; the citecommands will pass parent data to the bibmacros getbookinfo, below
+ {%else x-ref to the parent entry; the citecommands will pass parent data to the bibmacro getbookinfo, below
\printtext{\unspace}%Just to force the unit punctutation before the xref
\iffootnote
{\cbx@crosstocoll{\thefield{xref}}}%footnote routine in cbx file
@@ -1381,14 +1243,18 @@
}%endifundef
%Print rest of incollection data
\newunit\newblock
+%Online Block--------------------------------------------------------------------
\usebibmacro{onlinelocation}%
\newunit\newblock
+%Addendum and Finish--------------------------------------------------------
\printfield{addendum}%
\newunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}%
}%End incollection driver
+
+
%%%%%% INPROCEEDINGS %%%%%%
%Inproceedings are treated like incollections, even though they have some extra fields
@@ -1402,36 +1268,55 @@
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypepublicdocument}}%
{\usebibmacro{author}}%
{\usebibmacro{author/editor/translator}}%
-\setunit{\labelnamepunct}\newblock
+\setunit{\labelnamepunct}
+\newblock
+%Inner Title Block--------------------------------------------------------
\usebibmacro{title}%
\newunit\newblock
-%\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypevolume}}%
-% {\printfield{volume}\printfield{part}\toggletrue{volumeprinted}%
-% \clearfield{volume}\clearfield{part}%
-% \clearfield{title}}%So that booktitle+maintitle routine doesn't repeat it
-% {\printfield{chapter}}%Turabian doesn't give examples with chapter numbers; not sure it goes here
+%Book-Title Block--------------------------------------------------------
+\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypevolume}}%
+ {%then1 reference is to a volume of a larger work. Print volume number here and not at the end
+ \printfield{volume}\printfield{part}\toggletrue{volumeprinted}%
+ \clearfield{volume}\clearfield{part}%
+ }%
+ {%else1
+ \printfield{chapter}%Turabian doesn't use chapter numbers; not sure it goes here
+ }%end else1, end subtypevolume test
+\newunit\newblock
+%Second-level title and editor, publishing data --------------------------------------
%Save data for after the xref
\savename{author}{\childauthor}%
\savefield{pages}{\childpages}%
\savefield{volume}{\childvolume}%
\savefield{part}{\childpart}%
+%Insert preposition
\usebibmacro{in:}%
-%Now where are the collection data? Must distinguish four cases:
-%In the current entry or in a crossreferenced collection X footnotes or bibliography
-%First check whether there is an x-ref to the collection
+%Now where are the collection data?
\iffieldundef{xref}%
{%then no xref
- \usebibmacro{getbookinfo}}%
- {%else x-ref to the parent entry; the citecommands will pass parent data to the bibmacros getbookinfo, below
- \printtext{\unspace}%Just to force the unit punctutation before the xref
+ \iffootnote
+ {%Then footnote routine: just title and edition
+ \usebibmacro{getbooktitle}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \printfield{note}%
+ }%End of footnote routine
+ {%Else: bibliography (not normally used) or list of shorthands:
+ \usebibmacro{getbookinfo}}%
+ }%end then
+ {%else x-ref to the parent entry; the citecommands will pass parent data to the bibmacro getbookinfo, below
+ \printtext{\unspace}%Just to force the unit punctuation before the xref
\iffootnote
{\cbx@crosstoref{\thefield{xref}}}%footnote routine in cbx file
- {\bbx@crosstoref{\thefield{xref}}}%bibliography routine here in bbx
- }%endiffieldundef
+ {\bbx@crosstoref{\thefield{xref}}}%bibliography routine passes parent data to getbookinfo, below
+ }%endiffieldundef xref
%Print rest of inreference data
\newunit\newblock
+%Online Block--------------------------------------------------------------------
\usebibmacro{onlinelocation}%
\newunit\newblock
+%Addendum and Finish--------------------------------------------------------
\printfield{addendum}%
\newunit\newblock
\usebibmacro{pageref}%
@@ -1441,7 +1326,7 @@
%%%%%% JURISDICTION %%%%%%%%%%%%%%%%%%
\DeclareBibliographyDriver{jurisdiction}{%
-\addtocategory{footnoteonly}{\thefield{entrykey}}%
+\addtocategory{noteonly}{\thefield{entrykey}}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\printfield{type}%
@@ -1455,7 +1340,7 @@
\printtext[parens]{%
\printlist{institution}\isdot%
\setunit{\addspace}%
- \usebibmacro{date}}%
+ \usebibmacro{date-full}}%
\newunit\newblock
\usebibmacro{onlinelocation}%
\newunit\newblock
@@ -1468,7 +1353,7 @@
%%%%%% LEGAL %%%%%%%%%%%%%%%%%%
\DeclareBibliographyDriver{legal}{%
-\addtocategory{footnoteonly}{\thefield{entrykey}}%
+\addtocategory{noteonly}{\thefield{entrykey}}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\printfield{type}%
@@ -1476,7 +1361,25 @@
\usebibmacro{title}%
\newunit\newblock
\printfield{note}\isdot%
-\usebibmacro{journal+issuetitle}%
+\iffieldundef{issuetitle}
+ {\relax}%
+ {\usebibmacro{issue}%Prints issuetitle
+ \newunit}%
+\printfield{note}%
+\setunit{\addcomma\addspace}%
+\usebibmacro{journal}%
+\iffieldundef{series}
+ {\setunit*{\addspace}}%
+ {\setunit{\addcomma\addspace}%
+ \printfield{series}%
+ \setunit{\addcomma\addspace}}%
+\printfield{volume}%
+\setunit{\addcomma\addspace\bibstring{number}\addspace}%
+\printfield{number}%
+\setunit{\addspace}%
+\usebibmacro{issue+date}%
+\setunit{\bibpagespunct}%
+\printfield{pages}%
\newunit\newblock
\usebibmacro{onlinelocation}%
\newunit\newblock
@@ -1491,6 +1394,7 @@
\DeclareBibliographyDriver{legislation}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
+\toggletrue{useshortauthors}%Always use shortauthor in footnotes
\usebibmacro{author}%
\setunit*{\labelnamepunct\addspace}\newblock
\printfield{type}%
@@ -1503,9 +1407,6 @@
\newunit\newblock
\printfield{edition}%
\newunit
-%\iftoggle{printseriesflag}%Print series info only when appropriate option is set
- {\usebibmacro{series+number}\newunit\newblock}%
-% {\relax}%
\iffootnote
{\iffieldundef{shortjournal}
{\printfield{journaltitle}
@@ -1519,24 +1420,14 @@
\newunit\newblock
\printfield{note}\isdot%
\newunit\newblock
-%\iffieldundef{location}
- {%Give facts of publication freeform
- \printlist{institution}%
- \setunit{\addcomma\addspace}%
- \printlist{publisher}%
- \setunit{\addcomma\addspace}%
- \printfield{howpublished}
- \setunit{\addcomma\addspace}%
- \usebibmacro{date}}%
-% {%Use lacation:publisher,year form
-% \iffootnote%
-% {\setunit{\addspace}%
-% \printtext{\bibleftparen}%
-% \usebibmacro{publisher+location+year}%
-% \printtext{\bibrightparen}}%
-% {\usebibmacro{publisher+location+year}%
-% \newunit\newblock
-% \printfield{userc}}}%
+%Give facts of publication freeform
+\printlist{institution}%
+\setunit{\addcomma\addspace}%
+\printlist{publisher}%
+\setunit{\addcomma\addspace}%
+\printfield{howpublished}
+\setunit{\addcomma\addspace}%
+\usebibmacro{date-full}%
\printfield{usera}%
\newunit\newblock
\printfield{userd}%
@@ -1561,8 +1452,8 @@
%For correspondence (archival or published)
\DeclareBibliographyDriver{letter}{%
-%Add key to footnoteonly category
-\addtocategory{footnoteonly}{\thefield{entrykey}}%
+%Add key to noteonly category
+\addtocategory{noteonly}{\thefield{entrykey}}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author}%
@@ -1577,29 +1468,39 @@
\setunit{\addspace\bibstring{letterto}\addspace}%
\printnames{namec}%
\setunit{\addcomma\addspace}%
-%\usebibmacro{title}%Shouldn't be needed for letters, except maybe if names are missing or uncertain
-%\setunit{\addcomma\addspace}%
+\usebibmacro{title}%Shouldn't be needed for letters, except maybe if names are missing or uncertain
+\setunit{\addcomma\addspace}%
\printfield{type}%
\setunit{\addcomma\addspace}%
\printfield{venue}%
\setunit{\addcomma\addspace}%
\printfield{note}%
\setunit{\addcomma\addspace}%
-\usebibmacro{date}%
+\usebibmacro{date-full}%
\newunit\newblock
\iffieldundef{xref}%
- {%then no xref; just print `in' and whatever is likely to be available customd
+ {%then no xref; just print what's likely to be available in the customd
\iffieldundef{booktitle}
- {\relax}%
- {\usebibmacro{in:}%
- \printfield[booktitle]{booktitle}
- \setunit*{\addcomma\addspace}}%
- \printfield{howpublished}%
- \setunit*{\addcomma\addspace}%
- \printlist{organization}%
- \setunit*{\addcomma\addspace}%
- \printlist{institution}%
- \setunit*{\addcomma\addspace}}%
+ {%then improvise
+ \printfield{howpublished}%
+ \setunit*{\addcomma\addspace}%
+ \printlist{organization}%
+ \setunit*{\addcomma\addspace}%
+ \printlist{institution}%
+ \setunit*{\addcomma\addspace}%
+ \printfield{library}%
+ \setunit*{\addcomma\addspace}%
+ \printfield{userd}%
+ \newunit\newblock
+ \usebibmacro{volume+pages}%
+ }%
+ {%else assume it's from a published collection
+ \usebibmacro{in:}%
+ \usebibmacro{getbookinfo}%
+ }%
+ \newunit\newblock
+ \usebibmacro{onlinelocation}%
+ }%
{%else x-ref to collection or customa and the getbookinfo macro
%(but only print `in' if the xref turns out to be to a collection)
%Save data for after the xref
@@ -1675,14 +1576,14 @@
\newunit\newblock
\printfield{version}%
\newunit
- \usebibmacro{date}%
+ \usebibmacro{date-optional}%
\newunit
\printfield{note}%
\newunit\newblock
\iffieldundef{booktitle}
{\relax}%
{\usebibmacro{in:}%
- \printfield{booktitle}%
+ \usebibmacro{booktitle}%
\newunit}%
\printlist{organization}%
\newunit
@@ -1709,13 +1610,13 @@
}%end online driver
%Subroutine of online driver
-\newbibmacro{blog}{%
+\newbibmacro{blog}{%--------------------------------------------
\usebibmacro{title}%
\newunit\newblock
\printfield{type}%
\setunit*{\addspace}%
\bibstring{postedonline}\addspace
-\usebibmacro{date}%
+\usebibmacro{date-full}%
\newunit
\printfield{note}%
\newunit\newblock
@@ -1727,20 +1628,27 @@
\newunit
\printfield{usera}%
\newunit\newblock
-%Add key to footnoteonly and blog categories
-\addtocategory{footnoteonly}{\thefield{entrykey}}%
+%Add key to noteonly and blog categories
+\addtocategory{noteonly}{\thefield{entrykey}}%
\addtocategory{blog}{\thefield{entrykey}}%
}%end blog macro
-\newbibmacro{listmessage}{%
+\newbibmacro{listmessage}{%--------------------------------------------
%No special treatment for listserv messages, at least for the present
+ \relax
}%end listmessage macro
+%%%%%% PATENT %%%%%%
+
+% Currently not distinguished from legislation
+
+\DeclareBibliographyAlias{paten}{legislation}
+
%%%%%% PERFORMANCE %%%%%%%%%%%%%%%%%%
\DeclareBibliographyDriver{performance}{%
-%Add key to footnoteonly category
-\addtocategory{footnoteonly}{\thefield{entrykey}}%
+%Add key to noteonly category
+\addtocategory{noteonly}{\thefield{entrykey}}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{title}%
@@ -1757,11 +1665,11 @@
\newunit
\printfield{howpublished}%
\setunit{\addcomma\addspace}%
-\usebibmacro{date}%
+\usebibmacro{date-full}%
\iffieldundef{origtitle}%
{\relax}%
{\setunit{\addspace\bibleftparen}%
- \printfield{origtitle}%
+ \printfield[titlecase]{origtitle}%
\setunit*{\addspace}%
\printorigdate
\bibrightparen}%
@@ -1783,7 +1691,7 @@
{\addtocategory{magazine}{\thefield{entrykey}}}%
{\relax}}%
\usebibmacro{bibindex}%
-\iffieldundef{editor}
+\ifnameundef{editor}
{\setunit{\addspace}}%
{\usebibmacro{editor}%
\setunit{\labelnamepunct}\newblock}%
@@ -1808,32 +1716,65 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\iffootnote
- {%Footnote routine: just title and edition
- \usebibmacro{getreferenceinfo}%
- }%End of footnote routine
- {%Bibliography--not normally used, but implemented just in case
- %Use same routine as for incollection after the ``in''--prints title first
- \savefield{pages}{\childpages}%Overwrite variables to avoid interference between entries
- \savefield{volume}{\childvolume}%
- \savefield{part}{\childpart}%
- \usebibmacro{getbookinfo}%
+ {%Then footnote routine: just title and edition
+ \usebibmacro{title}%Uses shorttitles for references, if available
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \printfield{note}%
+ }%End of footnote routine
+ {%Else: bibliography (not normally used) or list of shorthands:
+ %(Proceed more or less as for collections, but title first)
+ %First-Level Title Block (for book or volume)--------------
+ \usebibmacro{title}%
\newunit\newblock
+ %Author Block-----------------------------------------------
+ \usebibmacro{byauthor}%
+ \newunit\newblock
+ %Editors and/or Translator Blocks--------------------------
+ \usebibmacro{byeditor+others}%
+ \newunit\newblock
+ %Block for vol. no., second-level title, and editors-----------------
+ \usebibmacro{title+maintitle}%
+ \usebibmacro{collectioneditor}%New unit punctuation set in subroutine
+ \newunit\newblock
+ %Edition Block -----------------------------------------------------
+ \printfield{edition}%
+ \newunit\newblock
+ %Series Block (including note field) --------------------------------
+ \iftoggle{printseriesflag}%Print series info only when option is set
+ {\iffieldundef{series}
+ {\relax}%
+ {\usebibmacro{series+number}%
+ \setunit{\addcomma\addspace}}}%
+ {\relax}%
+ \printfield{note}%
+ \newunit\newblock
+ %Publishing Data Block ------------------------------------------------
+ \usebibmacro{publisher+location+year}%
+ \newunit\newblock
+ %Online locators----------------------------------------------------------
\usebibmacro{onlinelocation}%
- }%Endif, end of bibliography routine
+ }%Endif, end of bibliography routine
\newunit\newblock
+%Addendum and finish------------------------------------------------------
\printfield{addendum}%
\usebibmacro{pageref}%
\usebibmacro{finentry}%
}% End of refernece driver
-
-\newbibmacro{getreferenceinfo}{%
-\usebibmacro{maintitle+title}%
-\newunit\newblock
-\printfield{edition}%
-\newunit\newblock
-\printfield{note}%
-}%End getreferenceinfo
+
+\renewbibmacro{byauthor}{%
+ \ifboolexpr{
+% test \ifuseauthor
+% or
+ test {\ifnameundef{author}}
+ }
+ {}
+ {\usebibmacro{bytypestrg}{author}{author}%
+ \setunit{\addspace}%
+ \printnames[byauthor]{author}}}
+
%%%%%% REPORT %%%%%%
%Reports are treated like books, even though they have some extra fields
@@ -1860,14 +1801,13 @@
\setunit{\addspace\bibleftparen}}%
{%else bibliography environmemt: just start a new unit
\newunit}%
-\printfield{type}\isdot%
+\iffieldbibstring{type}
+ {\bibstring{\thefield{type}}}%
+ {\printfield{type}\isdot}%
\setunit{\addcomma\space}%Yes, comma here, even in bibliography
\printlist{institution}%
\setunit*{\addcomma\addspace}%
\usebibmacro{year}%
-%\iffieldundef{year}
-% {\bibstring{nodate}}%
-% {\printfield{year}}%
\iffootnote
{%then footnote environment: close parentheses
\printtext{\bibrightparen}\setunit{\addspace}}%
@@ -1907,14 +1847,16 @@
\setunit*{\addcomma\space}%Yes, comma here, even in bibliography
\printfield{howpublished}%
\setunit*{\addcomma\addspace}%
-\printfield[title]{eventtitle}%
+\iffieldundef{eventtitle}
+ {\relax}%
+ {\printtext[title]{\printfield[titlecase]{eventtitle}}}%
\setunit*{\addcomma\addspace}%
\printlist{organization}%
\setunit*{\addcomma\addspace}
\printfield{venue}%
\setunit*{\addcomma\addspace}%
%Just one date; no separate eventdate
-\usebibmacro{date}%
+\usebibmacro{date-full}%
\iffootnote
{%then footnote environment: close parentheses
\setunit{\unspace}\printtext{\bibrightparen}}%
@@ -1937,9 +1879,10 @@
\usebibmacro{begentry}%
\usebibmacro{author}%
\setunit*{\labelnamepunct\addspace}\newblock
-\usebibmacro{maintitle+title}%
-\newunit
+\usebibmacro{title}%
+\newunit\newblock
\printfield{edition}%
+\newunit
\printfield{type}%
\newunit\newblock
\printfield{note}%
@@ -1950,7 +1893,7 @@
\relax}%
{%else print title of the set
\usebibmacro{in:}%
- \printfield{booktitle}%
+ \usebibmacro{booktitle}%
\newunit\newblock}%
\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeonline}}%
{%Unstructured formatting of publishing info for online multimedia
@@ -1996,17 +1939,17 @@
}%End customa driver
%Common formatting routine for customa and crossreferences to customa
-\newbibmacro{getcustomainfo}{%
-\printfield{title}%
+\newbibmacro{getcustomainfo}{%----------------------------------------------
+\printfield[titlecase]{title}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
\printlist{organization}%
-\setunit{\addcomma\space}
+\setunit*{\addcomma\space}
\printlist{institution}%
-\setunit{\addcomma\space}
+\setunit*{\addcomma\space}
\printfield{library}%
-\setunit{\addcomma\space}%
+\setunit*{\addcomma\space}%
\printlist{location}%
\newunit
\printfield{type}%
@@ -2022,8 +1965,8 @@
%Custom entrytype D for archival documents (quasi `inarchive' or `incustoma')
\DeclareBibliographyDriver{customd}{%
-%Add key to footnoteonly category
-\addtocategory{footnoteonly}{\thefield{entrykey}}%
+%Add key to noteonly category
+\addtocategory{noteonly}{\thefield{entrykey}}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author}%
@@ -2039,29 +1982,31 @@
\setunit{\addcomma\addspace}%
\printfield{note}%
\setunit{\addcomma\addspace}%
-\usebibmacro{date}%
+\usebibmacro{date-full}%
\newunit\newblock
\iffieldundef{xref}%
{%then no xref; just print what's likely to be available in the customd
\iffieldundef{booktitle}
- {\relax}%
- {\usebibmacro{in:}%
- \printfield[booktitle]{booktitle}%
- \setunit*{\addcomma\addspace}}%
- \printfield{howpublished}%
-% \setunit*{\addcomma\addspace}%
-% \printfield[title]{eventtitle}% Is this of any use?
- \setunit*{\addcomma\addspace}%
- \printlist{organization}%
- \setunit*{\addcomma\addspace}%
- \printlist{institution}%
- \setunit*{\addcomma\addspace}
- \printfield{library}%
- \setunit*{\addcomma\addspace}%
- \printfield{userd}%
+ {%then improvise
+ \printfield{howpublished}%
+ \setunit*{\addcomma\addspace}%
+ \printlist{organization}%
+ \setunit*{\addcomma\addspace}%
+ \printlist{institution}%
+ \setunit*{\addcomma\addspace}%
+ \printfield{library}%
+ \setunit*{\addcomma\addspace}%
+ \printfield{userd}%
+ \newunit\newblock
+ \usebibmacro{volume+pages}%
+ }%
+ {%else assume it's from a published collection
+ \usebibmacro{in:}%
+ \usebibmacro{getbookinfo}%
+ }%
\newunit\newblock
- \usebibmacro{volume+pages}
- \unspace}%
+ \usebibmacro{onlinelocation}%
+ }%
{%else x-ref to collection or customa or online
\printtext{\unspace}%Just to force the unit punctutation before the xref
%Save page range for bibliography
@@ -2072,18 +2017,15 @@
{\cbx@crosstoarch{\thefield{xref}}}%
{\bbx@crosstoarch{\thefield{xref}}}%
\newunit\newblock
- \printfield{library}%
- \setunit*{\addcomma\addspace}%
\printfield{userd}%
\newunit\newblock
\iffootnote
- {\usebibmacro{volume+pages}}%
- {\relax}%Volume and pages already printed in getbookinfo routine
- }%endif
+ {\usebibmacro{volume+pages}%
+ \newunit\newblock}%
+ {\relax}%Volume, pages should already have been printed
+ }%endif, end xref routine
\newunit\newblock
-\iffootnote
- {\usebibmacro{onlinelocation}}%
- {\relax}%Urls from parent record already printed
+\usebibmacro{onlinelocation}%
\newunit\newblock
\printfield{addendum}%
\newunit\newblock
@@ -2102,20 +2044,291 @@
\DeclareBibliographyAlias{suppcollection}{incollection}
\DeclareBibliographyAlias{suppperiodical}{article}
-% Patent
%%%%% SUBROUTINES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Generalized routine for publishing data from all the book-like entrytypes.
-\newbibmacro*{publisher+location+year}{%
+
+%----------------------------------------------------------------------------------
+% SUBROUTINES OF INBOOK/INCOLLECTION, etc.
+%
+%For adding book data to an inbook, incollection, or other subordinate record. (One set of routines, for any combination of entrytypes.)
+%---------------------------------------------------------------------------------
+
+%Get rid of colon before booktitle in incollection and allow other prepositions, depending on subtype
+\renewbibmacro*{in:}{%
+\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeintro}}%
+ {%Then1:`to' instead of `in'
+ \setunit{\addspace\bibstring{introto}\addspace}}%
+ {%Else1
+ \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeexcerpt}}%
+ {%Then2 ``from''
+ \setunit{\addspace\bibstring{excerptfrom}\addspace}}%
+ {%Else2
+ \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypevolume}%
+ \OR\equal{\thefield{entrytype}}{\entrytypebookinbook}}%
+ {%Then3 ``volume...of''
+ \setunit{\addspace\bibstring{volumeof}\addspace}}%
+ {%Else3
+ \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypenone}%
+ \or {\equal{\thefield{entrysubtype}}{\subtypemag}}%
+ \or {\equal{\thefield{entrytype}}{\entrytypearchive}}%
+ \or {\equal{\thefield{entrysubtype}}{\subtypenewsp}}%
+ \or {\equal{\thefield{entrysubtype}}{\subtypevideo}}%
+ \or {\equal{\thefield{entrytype}}{\entrytypeonline}}%
+ \or {\equal{\thefield{entrytype}}{\entrytypeaudio}}%
+ \or {\equal{\thefield{entrysubtype}}{\subtypeearlybook}}}%
+ {%Then4 no linking preposition at all
+ \relax}%
+ {%Else4 check for special case after an xref
+ \iftoggle{xrefflag}
+ {%Then5 have to capitalize manually in bibliography
+ \ifbibliography
+ {\bibcpstring{in}\addspace}%
+ {\bibstring{in}\addspace}}%
+ {%else5 default ``in''
+ \bibstring{in}\addspace%
+ }%end else5
+ }%end else4
+ }%end else3
+ }%end else2
+ }%end else1
+}%end macro in:
+
+\newbibmacro{getbookinfo}{%------------------------------------------------------
+ %Booktitle and Editor Block (including special fields for proceedings)
+ \usebibmacro{getbooktitle}%
+ \setunit{\addcomma\addspace}%
+ %Special fields from entrytypes proceedings or inproceedings
+ \usebibmacro{getproceedingsfields}%
+ \setunit{\addcomma\addspace}%
+ %Now find all the book-level authors and editors
+ \usebibmacro{getbookauthoreditor}%
+ \newunit\newblock
+ %Maintitle Block, including page numbers ---------------------------------------
+ %Check whether the book is part of a multivolume set
+ \iffieldundef{maintitle}
+ {%No maintitle (or maintitle was used instead of booktitle, then cleared)
+ \relax}%
+ {%\ifthenelse{\iffieldundef{title}\and\iffieldundef{titleaddon}}
+ {%no separate volume title (or titleaddon for untitled excerpts)
+ \relax}%
+ {\usebibmacro{booktitle+maintitle-multivolume}}}%
+ \setunit{\addcomma\addspace}%
+ \iffootnote
+ {%then pages will come from the postnote field
+ \relax}%
+ {%else restore child's volume and page range for bibliography
+ \restorefield{pages}{\childpages}%
+ \iftoggle{volumeprinted}
+ {\relax}%
+ {\restorefield{volume}{\childvolume}%
+ \restorefield{part}{\childpart}}%
+ \usebibmacro{volume+pages}%
+ }%
+ \newunit\newblock
+ %Edition Block------------------------------------------------------
+ \printfield{edition}%
+ \newunit\newblock
+ %Series Block (including note field) --------------------------------
+ \iftoggle{printseriesflag}%Print series info only when option is set
+ {\iffieldundef{series}
+ {\relax}%
+ {\usebibmacro{series+number}%
+ \setunit{\addcomma\addspace}}}%
+ {\relax}%
+ \printfield{note}%
+ \newunit\newblock
+ %Special fields-----------------------------------------------------
+ \printfield{type}%
+ \newunit
+ \printfield{version}%
+ \newunit\newblock
+ %Location: Publisher, Year Block ------------------------------------------
+ \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeearlybook}}
+ {%Then no publishing data for early English literature
+ \relax}%
+ {%Else full publishing data, in parens in footnotes
+ \iffootnote%
+ {%then in parens
+ \setunit{\addspace}%
+ \printtext{\bibleftparen}%
+ \usebibmacro{publisher+location+year}%
+ \printtext{\bibrightparen}}%
+ {%else no parens in bibliography
+ \usebibmacro{publisher+location+year}}%
+ }%
+}%end macro getbookinfo
+
+%Choose appropriate book-title routine for incollection-like entries
+\newbibmacro{getbooktitle}{%----------------------------------------------------
+\iftoggle{xrefflag}%
+ {%then record is book/collection-like, accessed via xref: find title in title field.
+ \usebibmacro{title}%
+ }%endthen; end of xref routine
+ {%else current record inbook/incollection-like; look in booktitle field
+ \iffieldundef{booktitle}
+ {%then user must have filled in maintitle instead of booktitle
+ \usebibmacro{title+maintitle}%
+ \clearfield{maintitle}%Prevents repetition later, in case of multivolume sets
+ }%
+ {%else booktitle available, but might be redundant
+ \iffieldsequal{booktitle}{title}%
+ {%then no distinct booktitle after all; again, use maintitle
+ \usebibmacro{title+maintitle}%
+ \clearfield{maintitle}%Prevents repetition later, in case of multivolume sets
+ }%
+ {%else normal case with distinct title and booktitle
+ \usebibmacro{booktitle+maintitle}%
+ }%
+ }%endelse; endiffieldundef
+ }%
+}%end macro getbooktitle
+
+\newbibmacro{getbookauthoreditor}{%--------------------------------------------------
+ \ifnameundef{bookauthor}
+ {%then1 No bookauthor in current record; either it's not an inbook or there's no distinct part author. Check whether current author is different from saved author from the inbook record
+ \ifnameequals{author}{\childauthor}%
+ {%then2 no need to print the same name again
+ \relax}%
+ {%else2 current record is the book and has a different overall author from the inbook
+ \setunit*{\addcomma\addspace\bibstring{byline}\addspace}%
+ \printnames[byauthor]{author}%
+ }%end else2, end ifnameequals
+ }%end then1
+ {%else1 current record has a book author; must be an inbook. Print the bookauthor if distinct from the part author (the bybookauthor macro will compare)
+ \setunit{\addcomma\addspace\bibstring{byline}\addspace}%
+ \usebibmacro{bybookauthor}%Redefined below
+ }%end else1, end iffieldundef
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{byeditor+others}%
+}%end macro getbookauthoreditor
+
+\renewbibmacro*{bybookauthor}{%--------------------------------------------
+ \ifnamesequal{author}{bookauthor}
+ {%No distinct bookauthor
+ \relax}%
+ {%Print book author, firstname first
+ \printnames[byeditor]{bookauthor}}%
+}%end macro bybookauthor
+
+\newbibmacro{getproceedingsfields}{%---------------------------------------------
+%For now, they will be printed whenever they are present--no test for entrytype
+\ifthenelse{\equal{\thefield{editortype}}{\edtypecorp}}
+ {%then corporate editor already printed and organization redundant
+ \relax}%
+ {%else print the name of the organization
+ \printlist{organization}}%
+\setunit{\addcomma\addspace}%
+\printfield[titlecase]{eventtitle}%
+\setunit{\addcomma\addspace}%
+\printfield{venue}%
+\setunit{\addcomma\addspace}%
+\iffieldundef{eventdate}
+ {\relax}%
+ {\printeventdate}%
+}%end macro
+
+%For inbook and incollection, when the parent is in a multivolume work.
+\newbibmacro*{booktitle+maintitle}{%-------------------------------------------------
+\iffieldsequal{maintitle}{booktitle}
+ {%then maintitles are superfluous
+ \clearfield{maintitle}%
+ \clearfield{mainsubtitle}%
+ \clearfield{maintitleaddon}}%
+ {%else
+ \iffieldundef{maintitle}
+ {%Then: only one title--but is reference to a volume or the whole work?
+ \usebibmacro{booktitle}%
+ \iffootnote
+ {\setunit{\addspace}%
+ \printfield[parens]{userb}}%
+ {\newunit
+ \printfield{userb}}%
+ \setunit{\newunitpunct}%
+ \iffieldundef{volume}
+ {%Then: no volume number, so must be an independent work
+ \printfield{volumes}}%
+ {%Else: volume specified, so give the volume- and part numbers
+ \ifthenelse{\equal{\thefield{entrytype}}{\entrytypecoll}%
+ \OR\equal{\thefield{entrytype}}{\entrytypebook}
+ \OR\equal{\thefield{entrytype}}{\entrytyperef}
+ \OR\equal{\thefield{entrytype}}{\entrytypeproc}}%
+ {\printfield{volume}\printfield{part}%
+ \clearfield{volume}\clearfield{part}}%
+ {\relax}%
+ }%endiffieldundef volume
+ }%endthen
+ {%Else: Separate maintitle and volume title, so give volume title here. Maintitle will come after the editor
+ \usebibmacro{booktitle}%
+ \iffootnote
+ {\setunit{\addspace}%
+ \printfield[parens]{userb}}%
+ {\newunit
+ \printfield{userb}}%
+ }%Endif
+ }%Endif
+}%end macro booktitle+maintitle
+
+
+\newbibmacro{booktitle+maintitle-multivolume}{%-------------------------------------
+%Prints volume-titles and maintitles of multivolume incollections;
+% special case of book excerpt in an anthology also handled here
+ \iffieldundef{volume}
+ {%then print `in Maintitle'
+ \setunit{\newunitpunct\addspace\bibstring{in}\addspace}%
+ }%
+ {%else print `vol. 1 of Maintitle'
+ \printfield{volume}%
+ \printfield{part}%
+ \setunit{\addspace\bibstring{volumeof}\addspace}%
+ \toggletrue{volumeprinted}%Something wrong. Doesn't work globally, so clear everything
+ \clearfield{volume}\clearfield{part}\savefield{volume}{\childvolume}\savefield{part}{\childpart}%
+ }%
+ \usebibmacro{maintitle}%
+ %Setunit in subroutine
+ \usebibmacro{collectioneditor}%
+}%end nmacro booktitle+maintitle-multivolume
+
+
+
+%----------------------------------------------------------------------
+% GETBOOKINFO-SHORT
+%
+% For adding book-level data from the reference entrytype
+% (Used when crossreferencing, under the shortincoll option)
+%----------------------------------------------------------------------
+\newbibmacro*{getbookinfo-short}{%
+\ifnameundef{labelname}
+ {\printfield{label}}%
+ {\printnames{labelname}}%
+\ifsingletitle
+ {\relax}%
+ {\setunit*{\addcomma\space}%
+ \printtext[title]{\printfield[titlecase]{labeltitle}}}%
+}%end macro getbookinfo-short
+
+
+%-----------------------------------------------------------------------------------
+% SUBROUTINES OF BOOK, COLLECTION, etc.
+%
+% Publisher-Location-Year: Generalized routines for original publishing data and reprint data, from all the book-like entrytypes.
+%-----------------------------------------------------------------------------------
+
+\newbibmacro*{publisher+location+year}{%---------------------------------------------
%Check whether the entry is a reprint (i.e., whether it has ``orig'' data)
-\usebibmacro{reprinttest}%
+\ifthenelse{\equal{\reprintoption}{\optionnoreprints}}
+ {\relax}%
+ {\usebibmacro{reprinttest}}%
%(New unit has been set in the subroutine)
%Print location, publisher, and year
-\usebibmacro{printlocation}%
-\ifpunctmark{?}
- {\setunit{:\addspace}}%
- {\setunit{\addcolon\addspace}}%
+\iflistundef{location}
+ {%Then no location, no automatic n.p., no colon
+ \relax}%
+ {%Else location and colon
+ \usebibmacro{printlocation}%
+ \midsentence% In case of question mark after location
+ \setunit*{\addcolon\addspace}%
+ }%
\iflistundef{publisher}
{%then use institution instead of publisher
\iflistundef{institution}
@@ -2123,22 +2336,39 @@
\iffieldundef{howpublished}
{%then no publishing data available
\iflistundef{location}
- {\relax}%``np'' already printed
- {\bibstring{nopub}}}%
+ {%then publisher, location both blank
+ \iffootnote
+ {%then no puctuation before date
+ \setunit{\unspace}}%
+ {%else
+ \newunit}%
+ }%
+ {%else location, but no publisher
+ \setunit{\addcomma\addspace}}%
+ }%
{%else use howpublished field
- \printfield{howpublished}}}%
+ \printfield{howpublished}%
+ \setunit{\addcomma\addspace}}%
+ }%
{%else institution instead of publisher
- \printlist{institution}}}%
+ \printlist{institution}%
+ \setunit{\addcomma\addspace}%
+ }%
+ }%
{%else use publisher field and ignore howpublished and institution
- \printlist{publisher}}%
-\setunit*{\addcomma\addspace}%
-%\iffieldundef{year}
-% {\printtext{\bibstring{nodate}}}%
-% {\printfield{year}}%
+ \printlist{publisher}%
+ \setunit{\addcomma\addspace}%
+ }%
\usebibmacro{year}%
}%end publisher+location+year
-\newbibmacro{reprinttest}{%
+\newbibmacro{printlocation}{%-------------------------------------------------
+\ifthenelse{\equal{\thelist{location}}{\noplace}}%Something wrong here. Can't get it to recognize ``np'' in the location list
+ {\bibstring{noplace}}%
+ {\printlist{location}\isdot}%
+}%end macro printlocation
+
+\newbibmacro{reprinttest}{%----------------------------------------------------
\toggletrue{origdataflag}%
\iffieldundef{origyear}%
{%then no origyear
@@ -2157,37 +2387,34 @@
\usebibmacro{reprintorigfirst}}}%
{%else At least origyear available; entry is a reprint
\usebibmacro{reprintorigfirst}}%
-}%
+}%end macro reprinttest
-\newbibmacro{reprintorigfirst}{%
-\iftoggle{addorigflag}
- {%then original data will be added later
+\newbibmacro{reprintorigfirst}{%-----------------------------------------------
+\ifthenelse{\not\equal{\reprintoption}{\optionorigfirst}}
+ {%then original data will be added later (or not at all)
\relax}%
- {%else
- \iftoggle{addtransfromflag}
- {%then original data of a translation will be added later
- \relax}%
- {%else default reprint routine: print original data first
- \printlist{origlocation}%
- \iflistundef{origpublisher}
- {\setunit*{\addcomma\addspace}}%
- {\setunit*{\addcolon\addspace}%
- \printlist{origpublisher}%
- \setunit*{\addcomma\addspace}}%
- \iffieldundef{origyear}
- {\bibstring{nodate}}%
- {\printorigdate}%
- \iffootnote
- {%then Footnote environment: use semicolon and abbreviation
- \addsemicolon\addspace\bibstring{reprint}}%
- {%else bibliography: use newunitpunct and long bibstring
- \newunit\bibstring{reprint}}%
- \setunit{\addcomma\addspace}
- }%End else
+ {%else default reprint routine: print original data first
+ \printlist{origlocation}%
+ \iflistundef{origpublisher}
+ {\setunit*{\addcomma\addspace}%
+ }%
+ {\setunit*{\addcolon\addspace}%
+ \printlist{origpublisher}%
+ \setunit*{\addcomma\addspace}%
+ }%
+ \iffieldundef{origyear}
+ {\bibstring{nodate}}%
+ {\printorigdate}%
+ \iffootnote
+ {%then Footnote environment: use semicolon and abbreviation
+ \addsemicolon\addspace\bibstring{reprint}}%
+ {%else bibliography: use newunitpunct and long bibstring
+ \newunit\bibstring{reprint}}%
+ \setunit{\addcomma\addspace}
}%End else
-}%End macro
+}%End macro reprintorigfirst
-\newbibmacro{addoriginaledition}{%
+\newbibmacro{addoriginaledition}{%--------------------------------------------
%Check whether original data were entered
\iftoggle{origdataflag}
{%Then1 introduce orig data with appropriate string
@@ -2205,7 +2432,7 @@
{\bibstring{origeditiontitled}}%
{\bibstring{origeditiontitledbib}}%
\setunit{\addcomma\addspace}
- \printfield[title]{origtitle}\addspace%
+ \printtext[title]{\printfield[titlecase]{origtitle}}\addspace%
\iflistundef{origlocation}
{\mkbibparens{\printorigdate}}%
{\printtext[parens]%
@@ -2213,12 +2440,13 @@
\setunit*{\addcomma\addspace}%
\printorigdate}}%
}%end else2
- }%End then1
+ }%End then1
{%Else1 nothing to print
- \relax}%
-}%End macro
+ \relax
+ }%endelse1
+}%End macro addoriginaledition
-\newbibmacro{addtransfrom}{%
+\newbibmacro{addtransfrom}{%--------------------------------------------------
%Check whether original data were entered
\iftoggle{origdataflag}
{%Then1 introduce orig data with appropriate string
@@ -2236,7 +2464,7 @@
{\bibstring{translatedfromtitle}}%
{\bibstring{translatedfromtitlebib}}%
\setunit{\addspace}%
- \printfield[title]{origtitle}\addspace%
+ \printtext[title]{\printfield[titlecase]{origtitle}}\addspace%
\iflistundef{origlocation}
{\mkbibparens{\printorigdate}}%
{\printtext[parens]%
@@ -2247,117 +2475,59 @@
}%End then1
{%Else1 nothing to print
\relax}%
-}%End macro
-
-\newbibmacro{printlocation}{%
-\iflistundef{location}
- {\bibstring{noplace}}%
- {\printlist{location}\isdot}%
-}%
-
-\newbibmacro{onlinelocation}{%
-\ifthenelse
- {\equal{\thefield{entrysubtype}}{\subtypeonline}%
- \OR
- \equal{\thefield{entrytype}}{\entrytypeonline}}%
- {%then override the option settings
- \printfield{doi}%
- \newunit\newblock%
- \usebibmacro{eprint}%
- \newunit\newblock%
- \iffieldundef{url}%
- {\relax}%
- {\usebibmacro{url+urldate}}}%
- {%else standard routine for online locators
- \usebibmacro{doi+eprint+url}%
- }%end ifthenelse
-}%end of macro
-
-
-
-%For adding book data to an inbook, incollection, or other subordinate record. (One central routine, for any combination of entrytypes.)
-\newbibmacro{getbookinfo}{%
- \usebibmacro{bibindex}%
- %Find the right book-level title format
- \usebibmacro{getbooktitle}%
- %Special fields from entrytypes proceedings or inproceedings
- \usebibmacro{getproceedingsfields}%
- \newunit\newblock
- %Now find all the book-level authors and editors
- \usebibmacro{getbookauthoreditor}%
- \newunit
- %Check whether the book is part of a multivolume set
- \iffieldundef{maintitle}
- {\relax}%
- {\usebibmacro{getmultivolumeinfo}}%
- \setunit{\addcomma\addspace}%
- \iffootnote
- {\relax}%Pages will come from the postnote field
- {%restore child's volume and page range and print in bibliography
- \restorefield{pages}{\childpages}%
- \restorefield{volume}{\childvolume}%
- \restorefield{part}{\childpart}%
- \usebibmacro{volume+pages}}%
- \newunit\newblock
- \printfield{edition}%
- \newunit\newblock
- \iftoggle{printseriesflag}
- {\usebibmacro{series+number}\newunit\newblock}%
- {\relax}%
- \printfield{note}%
- \newunit\newblock
- \printfield{type}%
- \newunit
- \printfield{version}%
- \newunit\newblock
- \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeearlybook}}
- {\relax}%No publishing data for early English literature
- {\iffootnote%
- {\setunit{\addspace}%
- \printtext{\bibleftparen}%
- \usebibmacro{publisher+location+year}%
- \printtext{\bibrightparen}}%
- {\usebibmacro{publisher+location+year}}%
- }%
- %Get rid of blanks in subtype ``canon''
- \unspace
-}%end macro
-
-%Choose appropriate book-title routine for incollection-like entries
-\newbibmacro{getbooktitle}{%
-\iffieldundef{booktitle}
- {%No booktitle, so current entry must be collection or book-like, crossreferenced by an incollection or other child (or, possibly, a bookinbook or incollection of subtype volume, using maintitle instead of booktitle)
- \usebibmacro{maintitle+title}%
- \toggletrue{maintitleprinted}}%Prevents repetition later, in case of multivolume sets
- {%There's a booktitle. Check whether it is different from the title
- \iffieldsequal{booktitle}{title}
- {%No distinct booktitle after all; again, current entry must be a collection or other parent entrytype
- \usebibmacro{maintitle+title}}%
- {%Distinct title and booktitle, so must be an incollection or other child entrytype
- \usebibmacro{maintitle+booktitle}}%
- }%endif
-}%end macro
-
-\newbibmacro{getbookauthoreditor}{%
- \iffieldundef{bookauthor}
- {%then1 No bookauthor in current record; either it's not an inbook or there's no distinct part author. Check whether current author is different from saved author from the inbook record
- \ifnameequals{author}{\childauthor}%
- {%then2 no need to print the same name again
- \relax}%
- {%else2 current record is the book and has a different overall author from the inbook
- \setunit{\addcomma\addspace\bibstring{byline}\addspace}%
- \printnames[byauthor]{author}%
- }%end else2, end ifnameequals
- }%end then1
- {%else1 current record has a book author; must be an inbook. Print the bookauthor if distinct from the part author (the bybookauthor macro will compare)
- \setunit{\addspace\bibstring{byline}\addspace}%
- \usebibmacro{bybookauthor}%
- }%end else1, end iffieldundef
- \setunit{\addcomma\addspace}%
- \usebibmacro{byeditor+others}%
-}%end macro
-
-\newbibmacro{getarchiveinfo}{%
+}%End macro addtransfrom
+
+
+\newbibmacro{origtransas}{%--------------------------------------------------
+% Swap orig-fields for normal fields
+\savefield{title}{\temptitle}\savefield{origtitle}{\temporigtitle}%
+\savelist{location}{\templocation}\savelist{origlocation}{\temporiglocation}%
+\savelist{publisher}{\temppublisher}\savelist{origpublisher}{\temporigpublisher}%
+\iffieldundef{date}
+ {\savefield{pubstate}{\tempyear}}%
+ {\savefield{date}{\tempdate}}%
+\savefield{origdate}{\temporigdate}%
+\restorefield{title}{\temporigtitle}\restorefield{origtitle}{\temptitle}%
+\restorelist{location}{\temporiglocation}\restorelist{origlocation}{\templocation}%
+\restorelist{publisher}{\temporigpublisher}\restorelist{origpublisher}{\temppublisher}%
+\restorefield{origdate}{\tempdate}\restorefield{date}{\temporigdate}%
+}%End macro origtransas
+
+\newbibmacro{print-translation-data}{%----------------------------------------
+ \ifnameundef{translator}
+ {\ifbibliography
+ {\setunit{\addspace\bibstring{translatedasbib}\addspace}}%
+ {\setunit{\addspace\bibstring{translatedas}\addspace}}%
+ }%
+ {\ifbibliography
+ {\bibstring{bytranslatorbib}\addspace}%
+ {\bibstring{bytranslator}}%
+ \printnames[byauthor]{translator}
+ \setunit{as\addspace}}%
+ \printtext[title]{\printfield[titlecase]{origtitle}}%
+ \ifthenelse{\iflistundef{origlocation}\and\iflistundef{origpublisher}\and\iffieldundef{origyear}}
+ {%then no more orig-data
+ \relax}%
+ {%else orig-data go in parentheses
+ \addspace\bibleftparen
+ \printlist{origlocation}%
+ \iflistundef{origpublisher}
+ {\setunit*{\addcomma\space}}
+ {\setunit*{\addcolon\space}}%
+ \printlist{origpublisher}%
+ \setunit*{\addcomma\space}%
+ \printorigdate
+ \bibrightparen}%
+}%end macro print-translation-data
+
+
+%----------------------------------------------------------------------
+% GETARCHIVEINFO
+%
+% For adding collection data from customa or other parent entrytype
+% (Used when crossreferencing from customd or letter)
+%----------------------------------------------------------------------
+\newbibmacro{getarchiveinfo}{%-----------------------------------------
\usebibmacro{bibindex}%
%\usebibmacro{in:}%
\ifthenelse{\equal{\thefield{entrytype}}{\entrytypearchive}}%
@@ -2388,112 +2558,53 @@
}%Endif
}%End macro getarchiveinfo
-%For multivolume works, give total no. of volumes only when work as a whole is cited.
-\renewbibmacro*{maintitle+title}{%
+%-----------------------------------------------------------------------------
+% TITLE and SERIES Routines (for all booklike, inbook-like entrytypes)
+%
+%-----------------------------------------------------------------------------
+
+\newbibmacro*{title+maintitle}{%------------------------------------------
+%Title (from Title-field) already printed. See if there is a maintitle, too.
\iffieldsequal{maintitle}{title}
{%Then maintitle superfluous
\clearfield{maintitle}\clearfield{mainsubtitle}\clearfield{maintitleaddon}}%
- {\relax}%
+ {%Else distinct maintitle
+ \relax}%
\iffieldundef{maintitle}
{%Then there's only one title--but is it a volume or an entire work?
- \usebibmacro{title}%
- \newunit
\iffieldundef{volume}
{%Then: no volume number, so must be an entire work. Give no. of volumes
\iftoggle{volumeprinted}
- {%exception for subtype volume after x-ref
- \relax}%
- {\printfield{volumes}}}%
- {%Else: a volume no. is specified, so give the volume- and part numbers
- \printfield{volume}\printfield{part}}%
- }%end then
- {%Else: Distinct maintitle and volume title, so give both, with volume- and part no. in between
- \usebibmacro{maintitle}%
- \newunit\newblock
- \iffieldundef{volume}
- {\relax}%
- {\printfield{volume}\printfield{part}%
- \setunit{\addcolon\space}}%
- \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeearlybook}}
- {\iffootnote
- {\iffieldundef{shorttitle}
- {\usebibmacro{title}}%
- {\printfield[title]{shorttitle}\isdot}}%
- {\usebibmacro{title}}}%
- {\usebibmacro{title}}%
- }%Endif
-}%end macro
-
-%Same as above, but for inbook and incollection, when the item is in a multivolume work.
-\renewbibmacro*{maintitle+booktitle}{%
-\iffieldsequal{maintitle}{booktitle}
- {\clearfield{maintitle}%
- \clearfield{mainsubtitle}%
- \clearfield{maintitleaddon}}%
- {\iffieldundef{maintitle}
- {%Then: only one title--but is reference to a volume or the whole work?
- \usebibmacro{booktitle}%
- \iffootnote
- {\setunit{\addspace}%
- \printfield[parens]{userb}}%
- {\newunit
- \printfield{userb}}%
- \newunit
- \iffieldundef{volume}
- {%Then: no volume number, so must be an independent work
- \printfield{volumes}}%
- {%Else: volume specified, so give the volume- and part numbers
- \ifthenelse
- {\equal{\thefield{entrytype}}{\entrytypecoll}%
- \OR
- \equal{\thefield{entrytype}}{\entrytypeproc}%
- }%
- {\printfield{volume}\printfield{part}%
- \clearfield{volume}\clearfield{part}}%
- {\relax}%
+ {\relax}%exception for subtype volume after x-ref
+ {\printfield{volumes}}%
}%
- }%endthen
- {%Else: Separate maintitle and volume title, so give volume title here. Maintitle will come after the editor
- \usebibmacro{booktitle}%
- \iffootnote
- {\setunit{\addspace}%
- \printfield[parens]{userb}}%
- {\newunit
- \printfield{userb}}%
- }%Endif
- }%Endif
-}%end macro
+ {%Else: a volume no. is specified, so give the volume- and part numbers
+ \printfield{volume}\printfield{part}%
+ }%
+ }%
+ {%Else Two-level title: print `vol. 1 of maintitle'
+ \printfield{volume}\printfield{part}%
+ \setunit{\addspace\bibstring{volumeof}\addspace}%
+ \usebibmacro{maintitle}%
+ }%
+}%end macro title+maintitle
-\newbibmacro{getproceedingsfields}{%
-%For now, they will be printed whenever they are present--no test for entrytype
-\ifthenelse{\equal{\thefield{editortype}}{\edtypecorp}}
- {%then corporate editor already printed and organization redundant
- \relax}%
- {%else print the name of the organization
- \printlist{organization}}%
-\setunit{\addcomma\addspace}%
-\printfield{eventtitle}%
-\setunit{\addcomma\addspace}%
-\printfield{venue}%
-\setunit{\addcomma\addspace}%
-\printeventdate%
-}%end macro
-\newbibmacro{getmultivolumeinfo}{%
-\iffieldundef{volume}
- {\setunit{\newunitpunct\addspace\bibstring{in}\addspace}}%
- {\printfield{volume}%
- \printfield{part}%
- \setunit{\addspace\bibstring{volumeof}\addspace}%
- \toggletrue{volumeprinted}}%
-\iftoggle{maintitleprinted}
- {\relax}%
- {\usebibmacro{maintitle}}%
-\usebibmacro{collectioneditor}%CHANGE Switch to new editor/editortypes
-}%end nmacro
+\renewbibmacro*{series+number}{%---------------------------------------------
+ \printfield[titlecase]{series}%
+ \setunit*{\addspace}%
+ \printfield{number}%
+ \newunit
+}%end macro series+number
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%----------------------------------------------------------------------------
+% SUBROUTINES FOR ARTICLES, PERIODICALS
+%
+%----------------------------------------------------------------------------
%Put in city for newspapers, but print it in Roman
-\renewbibmacro*{journal}{%
+\renewbibmacro*{journal}{%---------------------------------------------------
\iffieldundef{journaltitle}
{%then
\relax}%
@@ -2513,46 +2624,9 @@
\unspace
}%end printtext
}% end iffieldundef
-}%end renewbibmacro
+}%end macro journal
-%For entrytype periodical: adjust punctuation
-\renewbibmacro*{title+issuetitle}{%
-\iffieldundef{issuetitle}
- {}%
- {\usebibmacro{issue}%
- \setunit{\addcomma\addspace}%
- \usebibmacro{byeditor+others}%
- \newunit}%
-\iffieldundef{note}
- {}%
- {\printfield{note}%
- \setunit{\addcomma\addspace}}%
-\usebibmacro{periodical}%
-\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypemag}%
- \OR
- \equal{\thefield{entrysubtype}}{\subtypenewsp}}%
- {\newunit
- \usebibmacro{issue+date-mag}}%
- {\iffieldundef{series}
- {\setunit*{\addspace}}%
- {\setunit{\addcomma\addspace}
- \printfield{series}%
- \setunit{\addcomma\addspace}}%
- \setunit{\addcomma\addspace}%
- \printfield{volume}%
- \iffieldnum{number}
- {\setunit{\addcomma\addspace\bibstring{number}\addspace}}%
- {\iffieldnums{number}
- {\setunit{\addcomma\addspace\bibstring{numbers}\addspace}}
- {\relax}}%
- \printfield{number}%
- \setunit{\addspace}%
- \usebibmacro{issue+date}%
- }%
-}%
-
-% Get rid of period between journal volume and issue number and use bibstring for ``no.'' instead. Also insert commas before and after series
-\renewbibmacro*{journal+issuetitle}{%
+\renewbibmacro*{journal+issuetitle}{%------------------------------------------------
%Restore any location data from the child (aritcle) record that is undefined in the parent (periodical).
\iffieldundef{issuetitle}
{\restorefield{issuetitle}{\childissuetitle}%
@@ -2564,7 +2638,7 @@
\setunit{\addcomma\addspace}%
\usebibmacro{bytranslator+others}%Use translator and editors from parent record in any case
\setunit{\addcomma\addspace}%
- \usebibmacro{byeditor+others}
+ \usebibmacro{byeditor+others}%
\newunit}%
\iffieldundef{note}
{\restorefield{note}{\childnote}}%
@@ -2600,11 +2674,17 @@
\iffieldundef{number}
{\restorefield{number}{\childnumber}}%
{\relax}%
- \iffieldnum{number}
- {\setunit{\addcomma\addspace\bibstring{number}\addspace}}%
- {\iffieldnums{number}
- {\setunit{\addcomma\addspace\bibstring{numbers}\addspace}}%
- {\relax}}%
+ \iffieldnums{number}
+ {%then could be a single number or a range
+ \iffieldnum{number}
+ {%then use singular of bibstring
+ \setunit{\addcomma\addspace\bibstring{number}\addspace}}%
+ {%else use the plural
+ \setunit{\addcomma\addspace\bibstring{numbers}\addspace}}%
+ }%
+ {%else not a number at all; leave out the bibstring
+ \setunit{\addcomma\addspace}%
+ }%
\printfield{number}%
\setunit{\addspace}%
\iffieldundef{issue}
@@ -2618,79 +2698,121 @@
{\relax}%
\usebibmacro{issue+date}%
}%
-}%
+}%end macro journal+issuetitle
-\newbibmacro*{issue+date-mag}{%
+\renewbibmacro*{issue+date}{%---------------------------------------------
+\printtext[parens]{%
+ \iffieldundef{issue}
+ {\usebibmacro{date-full}}%
+ {\printfield{issue}%
+ \setunit{\addspace}%
+ \usebibmacro{year}}}%
+ \newunit}%end macro issue+date
+
+\newbibmacro*{issue+date-mag}{%---------------------------------------------
\printtext[noformat]{%Get rid of parens
\iffieldundef{issue}
- {\usebibmacro{date}}%
+ {\usebibmacro{date-full}}%
{\printfield{issue}%
\setunit{\addspace}%
\usebibmacro{year}}%
\newunit}%
-}%end macro
+}%end macro issue+date-mag
-%Insert ``no.'' before number of a book in a series
-\renewbibmacro*{series+number}{%
- \printfield{series}%
- \iffieldundef{number}
- {\relax}%
- {\addcomma\addspace\bibstring{number}\addspace\printfield{number}}%
-}%end macro
-%Get rid of colon before booktitle in incollection and allow other prepositions, depending on subtype
-\renewbibmacro*{in:}{%
-\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeintro}}%
- {%Then1:`to' instead of `in'
- \setunit{\addspace\bibstring{introto}\addspace}}%
- {%Else1
- \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeexcerpt}}%
- {%Then2 ``from''
- \setunit{\addspace\bibstring{excerptfrom}\addspace}}%
- {%Else2
- \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypevolume}%
- \OR\equal{\thefield{entrytype}}{\entrytypebookinbook}}%
- {%Then3 ``volume...of''
- \setunit{\addspace\bibstring{volumeof}\addspace}}%
- {%Else3
- \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypenone}%
- \or {\equal{\thefield{entrysubtype}}{\subtypemag}}%
- \or {\equal{\thefield{entrytype}}{\entrytypearchive}}%
- \or {\equal{\thefield{entrysubtype}}{\subtypenewsp}}%
- \or {\equal{\thefield{entrysubtype}}{\subtypevideo}}%
- \or {\equal{\thefield{entrytype}}{\entrytypeonline}}%
- \or {\equal{\thefield{entrytype}}{\entrytypeaudio}}%
- \or {\equal{\thefield{entrysubtype}}{\subtypeearlybook}}}%
- {%Then4 no linking preposition at all
- \relax}%
- {%Else4 check for special case after an xref
- \iftoggle{xrefflag}
- {%Then5 have to capitalize manually in bibliography
- \ifbibliography
- {\bibcpstring{in}\addspace}%
- {\bibstring{in}\addspace}}%
- {%else5 default ``in''
- \bibstring{in}\addspace%
- }%end else5
- }%end else4
- }%end else3
- }%end else2
- }%end else1
-}%end macro in:
-
+
+%For entrytype periodical: adjust punctuation
+\renewbibmacro*{title+issuetitle}{%-----------------------------------------
+\iffieldundef{issuetitle}
+ {%then untitled issue
+ \relax}%
+ {%else special case of issue with own title and/or editor
+ \usebibmacro{issue}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{byeditor+others}%
+ \newunit}%
+\iffieldundef{note}
+ {}%
+ {\printfield{note}\setunit{\addcomma\addspace}}%
+\usebibmacro{periodical}%
+\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypemag}%
+ \OR\equal{\thefield{entrysubtype}}{\subtypenewsp}}%
+ {%then special treatment for newspapers and magazines
+ \newunit
+ \usebibmacro{issue+date-mag}%
+ }%endthen; end newsp/mag routine
+ {%else standard journal article
+ \iffieldundef{series}
+ {\setunit*{\addspace}}%
+ {\setunit{\addcomma\addspace}%
+ \printfield{series}%
+ \setunit{\addcomma\addspace}}%
+ \printfield{volume}%
+ \iffieldnum{number}
+ {\setunit{\addcomma\addspace\bibstring{number}\addspace}}%
+ {\iffieldnums{number}
+ {\setunit{\addcomma\addspace\bibstring{numbers}\addspace}}%
+ {\relax}}%
+ \printfield{number}%
+ \setunit{\addspace}%
+ \usebibmacro{issue+date}%
+ }%end else; end journal article routine
+ }%end macro title+issuetitle
+
+\renewbibmacro*{periodical}{%
+ \iffieldundef{title}
+ {}%
+ {\printtext[]{%
+ \printfield[]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[]{subtitle}}}}
+
+%-----------------------------------------------------------------------------
+% ONLINE LOCATORS (all entrytypes)
+%
+%-----------------------------------------------------------------------------
+
+\newbibmacro{onlinelocation}{%-----------------------------------------------
+\iftoggle{urllastflag}
+ {%then special case (from footciteurllast command); postnote comes first
+ \usebibmacro{cite:postnote}}%
+ {%else let cbx do the postnote as usual
+ \relax}%
+\ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeonline}%
+ \OR\equal{\thefield{entrytype}}{\entrytypeonline}}%
+ {%then override the option settings for these entrytypes/subtypes
+ \printfield{doi}%
+ \newunit\newblock%
+ \usebibmacro{eprint}%
+ \newunit\newblock%
+ \iffieldundef{url}%
+ {\relax}%
+ {\usebibmacro{url+urldate}}%
+ }%end then; end override
+ {%else use standard routine for online locators
+ \usebibmacro{doi+eprint+url}%
+ }%end ifthenelse
+}%end macro onlinelocation
+
+%--------------------------------------------------------------------------------
+% LOWER-LEVEL ROUTINES, for title, author, editor, year, pubstate
+%
+%--------------------------------------------------------------------------------
+
%Standard routine for titles.
-\renewbibmacro*{title}{%
+\renewbibmacro*{title}{%---------------------------------------------------------
%Substitute shorttitle where required
\iffootnote
{\iffieldundef{shorttitle}
{\relax}%
- {\iftoggle{useshorttitles}
+ {\iftoggle{useshorttitles}%
{%then shorttitle option is set: replace title with shorttitle
\clearfield{title}\clearfield{subtitle}%
\savefield{shorttitle}{\temptitle}%
\restorefield{title}{\temptitle}}%
{%else check entrysubtype
- \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeearlybook}}
+ \ifthenelse{\equal{\thefield{entrysubtype}}{\subtypeearlybook}
+ \or\equal{\thefield{entrytype}}{\entrytyperef}}
{%Use shorttitles here, too
\clearfield{title}\clearfield{subtitle}%
\savefield{shorttitle}{\temptitle}%
@@ -2702,7 +2824,7 @@
{\relax}% No shorttitles in bibliography
\iffieldundef{title}%
{%then print titleaddon even without title (e.g. for describing untitled works), without preceding punctuation
- \printfield{titleaddon}%
+ \printtext[titlecase]{\printfield{titleaddon}}\isdot%
\setunit{\addspace}%
\printfield{usera}}%Special use of usera for year of anthologized article
{%else both title and titleaddon
@@ -2711,57 +2833,75 @@
\OR\equal{\thefield{entrytype}}{\entrytypebookinbook}}%
{%then special case, when incollection/inbook is a whole volume or a government document whose title needs to be italicized
\printtext[volumetitle]{%
- \printfield[noformat]{title}\isdot%
- \setunit*{\subtitlepunct}%
- \printfield[noformat]{subtitle}}%
- }%end then, end subtype volume
+ \printfield[titlecase]{title}\isdot%
+ \iffieldundef{subtitle}
+ {\relax}%
+ {\setunit*{\subtitlepunct}%
+ \printfield[titlecase]{subtitle}}%
+ }%end printtext
+ }%end then, end subtype volume
{%else Other subtypes without italics
\printtext[title]{%
- \printfield[noformat]{title}\isdot%
- \setunit*{\subtitlepunct}%
- \printfield[noformat]{subtitle}}%
- }%end ifthenelse
- \setunit*{\addspace}%
- \printfield[brackets]{usere}%
- \newunit
- \printfield{titleaddon}\isdot%
- \iffootnote
- {\setunit{\addspace}%
- \printfield[parens]{usera}}%
- {\newunit
- \printfield{usera}}%
- }%end else, end iffieldundef
-}%end macro
+ \printfield[titlecase]{title}\isdot%
+ \iffieldundef{subtitle}
+ {\relax}%
+ {\setunit*{\subtitlepunct}%
+ \printfield[titlecase]{subtitle}}}%
+ }%end ifthenelse
+ \iffieldundef{usere}
+ {\relax}%
+ {\setunit*{\addspace}\printtext[brackets]{\printfield[titlecase]{usere}}\setunit*{\addcomma\addspace}}%
+ \iffieldundef{titleaddon}
+ {\relax}%
+ {\newunit\printtext[titlecase]{\printfield{titleaddon}}\isdot}%
+ \iffieldundef{usera}
+ {\relax}%
+ {\iffootnote
+ {\setunit*{\addspace}%
+ \printfield[parens]{usera}}%
+ {\setunit*{\newunitpunct}%
+ \printfield{usera}}}%
+ }%end else, end iffieldundef{title}
+}%end macro title
+
+\renewbibmacro*{booktitle}{%
+\iffieldundef{booktitle}%
+ {%then
+ \printtext[titlecase]{\printfield{booktitleaddon}}\isdot
+ }%end then
+ {%else
+ \printtext[booktitle]{%
+ \printfield[titlecase]{booktitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{booksubtitle}}%
+ }%end if
+ \iffieldundef{booktitleaddon}
+ {\relax}%
+ {\setunit{\addcomma\addspace}%
+ \printtext[titlecase]{\printfield{booktitleaddon}}\isdot}%
+}%end macro booktitle
+
%Also print maintitleaddon even without title, and capitalize in bib
-\renewbibmacro*{maintitle}{%
+\renewbibmacro*{maintitle}{%------------------------------------------------------
\iffieldundef{maintitle}%
{%then
- \iffootnote%
- {%then
- \printfield{maintitleaddon}}%
- {%else
- \printfield[capitalize]{maintitleaddon}%
- }%endif
- }%end then
+ \printtext[titlecase]{\printfield{maintitleaddon}}\isdot
+ }%end then
{%else
\printtext[maintitle]{%
- \printfield[noformat]{maintitle}%
+ \printfield[titlecase]{maintitle}%
\setunit{\subtitlepunct}%
- \printfield[noformat]{mainsubtitle}}%
- }%end if
- \newunit
- \iffootnote%
- {%then
- \printfield{maintitleaddon}}%
- {%else
- \printfield[capitalize]{maintitleaddon}%
- }%endif
-}%end macro
+ \printfield[titlecase]{mainsubtitle}}%
+ }%end if
+ \iffieldundef{maintitleaddon}
+ {\relax}%
+ {\setunit{\addcomma\addspace}%
+ \printtext[titlecase]{\printfield{maintitleaddon}}\isdot}%
+}%end macro maintitle
- %Handling anonymous/uncertain authorship
- %And a preliminary implementation of Nameaddon
-\renewbibmacro*{author}{%
+%Handling anonymous/uncertain authorship; nameaddon
+\renewbibmacro*{author}{%--------------------------------------------------------
\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
{\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT\iffirstonpage}
{\toggletrue{namedashflag}}%
@@ -2769,14 +2909,18 @@
\savefield{namehash}{\bbx@lasthash}}%
\iftoggle{useshortauthors}
{\iffootnote%
- {\savename{shortauthor}{\tempauthor}
- \restorename{author}{\tempauthor}}%
+ {\ifnameundef{shortauthor}
+ {\relax}%
+ {\savename{shortauthor}{\tempauthor}%
+ \restorename{author}{\tempauthor}}%
+ }%
{\relax}}%
{\relax}%
\usebibmacro{authortype+nameaddon}}%
-{\global\undef\bbx@lasthash}}%
+{\global\undef\bbx@lasthash}%
+}%end macro author
-\newbibmacro{authortype+nameaddon}{%
+\newbibmacro{authortype+nameaddon}{%--------------------------------------------
\ifuseauthor
{%then check for anonymous, but known, authorship
\ifthenelse{\equal{\thefield{authortype}}{\authortypeanon}}
@@ -2785,15 +2929,16 @@
{%then dash in place of name in bibliography
\mkbibbrackets{\bibnamedash}}%
{%else use name as usual
- \mkbibbrackets{\printnames{author}}}%
- }%
+ \mkbibbrackets{\printnames{author}}%
+ }%end iftoggle
+ }%endthen; end anonymous
{%else check for uncertain authorship
\ifthenelse{\equal{\thefield{authortype}}{\authortypeunsure}}
{%then question mark in brackets; usual punctuation outside brackets
\iftoggle{namedashflag}
{\mkbibbrackets{\bibnamedash\addquestion}}%
{\mkbibbrackets{\printnames{author}\addquestion}}%
- }%
+ }%endthen; end uncertain authorship
{%else no brackets; check for redundant author and suppress in footnotes
\ifthenelse {\equal{\thefield{authortype}}{\authortyperedundant}}
{%then
@@ -2804,31 +2949,41 @@
\iftoggle{namedashflag}
{\bibnamedash}%
{\printnames{author}}%
- }%
- }%end then
+ }%end iffootnote
+ }%end then
{%else authortype not redundant, just print as usual
\iftoggle{namedashflag}
{\bibnamedash}%
{\unspace%Why is this necessary?
\printnames{author}}%
- }%
- }%endif
- }%endif
+ }%end ifthenelse redundant
+ }%endifthenelse unsure
+ }%endifthenelse anon; end uncertain/redundant authorship
\iffieldundef{nameaddon}
{\relax}%
{\setunit*{\addspace}%
- \printfield{nameaddon}
+ \printfield{nameaddon}%
\iffootnote
{\ifpunctmark{.}{\isdot}{\relax}}%
{\relax}%
\setunit*{\labelnamepunct\addspace}%
- }%
- }%
+ }%
+ }%endthen (from ifuseauthor)
{%else Author not in use
- \relax}%
-}%end of macro
+ \relax
+ }%end ifuseauthor
+}%end macro authortype+nameaddon
+
+\newbibmacro*{bynamea}{%-----------------------------------------------------------
+%Needed for government reports that give the institution as the author, but also
+% credit an individual, whose name goes in namea
+ \ifnameundef{namea}
+ {\relax}
+ {\bibstring{byauthor}%
+ \setunit{\addspace}%
+ \printnames[byauthor]{namea}}}%
-\newbibmacro*{volume+pages}{%
+\newbibmacro*{volume+pages}{%------------------------------------------------------
\iftoggle{volumeprinted}
{\setunit{\addcomma\addspace}}%
{\printfield[noformat]{volume}%
@@ -2837,11 +2992,12 @@
{\setunit{\addcomma\addspace}}%
{\setunit{\bibpagespunct}}}%
\printfield{pages}%
-}%
+}%endmacro volume+pages
+
%Custom field for general editor of a collection containing an edited collection
%Needed when there is both a booktitle and a maintitle. The editora/b/c fields all go with the booktitle. Here nameb goes with the maintitle.
-\newbibmacro{collectioneditor}{%
+\newbibmacro{collectioneditor}{%----------------------------------------------------
\iffieldundef{namebtype}
{%no descriptor in nametype field; use bibstring
% \iffootnote
@@ -2852,31 +3008,58 @@
{%Get descriptor from nametype
\setunit{\addcomma\addspace\thefield{namebtype}\addspace}}%
\printnames{nameb}%
-}%
+}%endmacro collectioneditor
-% Makeshift implementation of pubstate
-\renewbibmacro*{date}{%
- \ifthenelse{\iffieldundef{date}
- \AND\iffieldundef{year}}%
- {%then
+
+
+% Date routine, with pubstate and year as fallbacks
+\newbibmacro*{date-full}{%---------------------------------------------------------------
+ \ifthenelse{\iffieldundef{year}\and\iffieldundef{month}\and\iffieldundef{day}}
+ {%then no date; try pubstate
\iffieldundef{pubstate}%
{%then nothing available: insert `n.d.'
- \printtext{\bibstring{nodate}}}%
+ \bibstring{nodate}}%
+ {%else'substitute pubstate for date
+ \printfield{pubstate}}%
+ }%end then
+ {%else use the standard date routine
+ \usebibmacro{date}%
+ }%endif
+ }%end macro date
+
+
+% Date routine, with pubstate and year as fallbacks
+\newbibmacro*{date-optional}{%---------------------------------------------------------------
+ \ifthenelse{\iffieldundef{year}\and\iffieldundef{month}\and\iffieldundef{day}}
+ {%then no date; try pubstate
+ \iffieldundef{pubstate}%
+ {%then nothing available, but don't insert `n.d.'
+ \relax}%
{%else'substitute pubstate for date
- \printfield{pubstate}}}%
+ \printfield{pubstate}}%
+ }%end then
{%else use the standard date routine
- \printdate}%
- }% end macro date
-\newbibmacro*{year}{%
+ \usebibmacro{date}%
+ }%endif
+ }%end macro date-optional
+
+%Date routine to leave out month and day
+\newbibmacro{year}{%------------------------------------------------------------------
\iffieldundef{year}%
- {%then
+ {%then no year; try pubstate
\iffieldundef{pubstate}%
{%then nothing available: insert `n.d.'
- \printtext{\bibstring{nodate}}}%
- {%else'substitute pubstate for date
- \printfield{pubstate}}}%
- {%else print the year
- \printfield{year}}%
+ \bibstring{nodate}}%
+ {%else substitute pubstate for date
+ \printfield{pubstate}}%
+ }%
+ {%else print the year (or range, if there's an endyear)
+ \printfield{year}%
+ \iffieldundef{endyear}
+ {\relax}%
+ {\setunit*{\bibrangedash}%
+ \printfield{endyear}}%
+ }%
}% end macro year
@@ -2898,31 +3081,30 @@
\bibstring{namedash}
}
-%%%%% ANNOTATED BIBLIOGRAPHIES (new in v. 0.2)
+%%%%% ANNOTATED BIBLIOGRAPHIES
-\newbibmacro*{entrytail}{%
- \newunit
- \printtext{\unspace}%Just to force unit punctuation before indentannote environment
- \begingroup
- \ifbool{bbx:annotation}
- {%
- \begin{indentannote}
- \usebibmacro{annotation}%
- \finentry
- \end{indentannote}
- }%
- {\finentry}%
- \endgroup}
\renewbibmacro*{finentry}{%
\iffootnote
- {\relax}%No annotations in the footnotes
- {\ifcitation
- {\finentry}%Annotations in cite commands in the main text are handled in the cbx file
- {\usebibmacro{entrytail}}%Bibliography envrionment: annotate if options are set
- }%
- }%
-
-
+ {%then no annotations in the footnotes
+ \finentry}%
+ {%else
+ \ifcitation
+ {%then annotations in cite commands are handled in the cbx file
+ \finentry}
+ {%else bibliography environment: annotate if options are set
+ \printtext{\finentrypunct}%
+ \ifbool{bbx:annotation}
+ {%then add annotation in special environment
+ \begin{indentannote}
+ \usebibmacro{annotation}%
+ \finentry
+ \end{indentannote}%
+ }%
+ {%else no annotations
+ \finentry}%
+ }%end bibliography
+ }%end iffootnote
+}%end macro finentry
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-historian/historian.cbx b/Master/texmf-dist/tex/latex/biblatex-historian/historian.cbx
index 26c66639b3d..f181801d76f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-historian/historian.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-historian/historian.cbx
@@ -1,28 +1,30 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% historian.cbx, v0.3a, 2010/05/20
-% A citation style for use with biblatex v 0.9a
+% historian.cbx, v0.4, 2010/08/22
+% A citation style for use with biblatex
% Developed and maintained by Sander Gliboff,
% based on guidelines from the Turabian Manual for Writers, 7th ed.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{historian.cbx}[2010/05/20 v0.3a historian citation style]
+\ProvidesFile{historian.cbx}[2010/08/22 v0.4 historian citation style]
- \@ifpackagelater{biblatex}{2010/03/19}
+ \@ifpackagelater{biblatex}{2010/08/04}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package
- The 'historian' style requires biblatex v0.9 or later.\MessageBreak
+ The 'historian' style requires biblatex v0.9b or later.\MessageBreak
You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error.}%
\endinput}
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict, singletitle,pagetracker,autocite=footnote}
-\ExecuteBibliographyOptions{abbreviate=true}
-
%Redefine \blockcquote command of the csquotes package to generate a footnote
\SetCiteCommand{\footcite}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,singletitle,pagetracker,autocite=footnote}%
+\DeclareLanguageMapping{american}{historian}%Added
+\ExecuteBibliographyOptions{abbreviate=false,dateabbrev=false}%Added
+
%Option to suppress the crossreferences to first citation of a source (new in v. 0.2)
\newtoggle{noterefsflag}
\toggletrue{noterefsflag}
@@ -34,34 +36,112 @@
{\ifstrequal{#1}{true}
{\toggletrue{noterefsflag}}%
{\togglefalse{noterefsflag}}}%
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%This style builds on Lehman's original verbose-inote style,
%from which the following macros are copied:
+
+\DeclareFieldFormat{bibhyperlink}{%
+ \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
+
+\DeclareFieldFormat{bibhypertarget}{%
+ \bibhypertarget{\thefield{entrykey}:\the\value{instcount}}{#1}}
+
\providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:loccit}
-\newbool{cbx:pageref}
+
+\newtoggle{cbx:loccit}
+\newtoggle{cbx:pageref}
+
+%The following are changed from verbose-inote to initialize the citepages option as `omit'
+\newcommand\citepagesseparator{\bibpagespunct}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{\ifboolexpr{
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ test {\iffieldpages{postnote}}
+ }
+ {\togglefalse{printpagerange}}
+ {}}
+\newbibmacro*{cite:postnote}{\usebibmacro{cite:postnote:ibidpage}}
\DeclareBibliographyOption{ibidpage}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{loccittracker=constrict}}
{\ExecuteBibliographyOptions{loccittracker=false}}}
\DeclareBibliographyOption{pageref}[true]{%
- \setbool{cbx:pageref}{#1}}
-
+ \settoggle{cbx:pageref}{#1}}
+
+\DeclareBibliographyOption{citepages}[permit]{%
+ \ifcsdef{cbx@opt@citepages@#1}
+ {\csuse{cbx@opt@citepages@#1}}
+ {\PackageError{biblatex}
+ {Invalid option 'citepages=#1'}
+ {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+ \renewcommand\citepagesseparator{\addcomma\addspace}%Changed: no colon in this case
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \togglefalse{printpagerange}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+\relax}%Changed--macros initialized for the omit option
+
+\def\cbx@opt@citepages@separate{%
+ \renewcommand\citepagesseparator{\addcomma\addspace}%Changed: no colon in this case
+ \providetoggle{cbx:fullcite}%
+ \renewbibmacro*{cite:citepages}{%
+ \global\togglefalse{cbx:fullcite}}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \global\toggletrue{cbx:fullcite}}%
+ \renewbibmacro*{cite:postnote}{%
+ \ifboolexpr{
+ togl {cbx:fullcite}
+ and
+ test {\iffieldpages{postnote}}
+ and
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ (
+ not test {\iffieldundef{pages}}
+ or
+ not test {\iffieldundef{pagetotal}}
+ )
+ }
+ {\usebibmacro{cite:postnote:pages}}
+ {\usebibmacro{cite:postnote:ibidpage}}}
+ \providebibmacro*{cite:postnote:pages}{%
+ \setunit{\postnotedelim}%
+ \bibstring{thiscite}%
+ \setunit{\addspace}%
+ \printfield{postnote}}}
\newbibmacro*{cite}{%
- \global\boolfalse{cbx:loccit}%
+ \usebibmacro{cite:citepages}%
+ \global\togglefalse{cbx:loccit}%
\ifciteseen
{\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
{\usebibmacro{cite:short}}}
{\usebibmacro{cite:shorthand}}}
- {\usebibmacro{cite:full}}}
+ {\usebibmacro{cite:full}%
+ \usebibmacro{cite:save}}}
+
+\newbibmacro*{cite:save}{%
+ \csxdef{cbx@t@\thefield{entrykey}}{\the\value{instcount}}}
\newbibmacro*{cite:full}{%
+ \usebibmacro{cite:full:citepages}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
@@ -70,70 +150,186 @@
\newbibmacro*{cite:short}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}%
+ \setunit*{\nametitledelim}%
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}}}
\newbibmacro*{cite:shorthand}{%
- \printtext[bibhyperlink]{%
- \printfield{shorthand}}}
+ \printtext[bibhyperlink]{\printfield{shorthand}}}
\newbibmacro*{cite:ibid}{%
- \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}%
+ \printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
\ifloccit
- {\global\booltrue{cbx:loccit}}
+ {\global\toggletrue{cbx:loccit}}
{}}
+\newbibmacro*{cite:postnote:ibidpage}{%
+ \iftoggle{cbx:loccit}
+ {}
+ {\usebibmacro{postnote}}}
+
+%\newbibmacro*{footcite}{%
+% \usebibmacro{cite:citepages}%
+% \global\togglefalse{cbx:loccit}%
+% \ifciteseen
+% {\iffieldundef{shorthand}
+% {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+% {\usebibmacro{footcite:ibid}}
+% {\usebibmacro{footcite:note}}}
+% {\usebibmacro{footcite:shorthand}}}
+% {\usebibmacro{footcite:full}%
+% \usebibmacro{footcite:save}}}
+
\newbibmacro*{footcite:save}{%
- \csxdef{cbx@first@\thefield{entrykey}}{\the\value{instcount}}%
+ \csxdef{cbx@f@\thefield{entrykey}}{\the\value{instcount}}%
\label{cbx@\the\value{instcount}}}
-
-\newbibmacro*{cite:postnote}{%
- \ifbool{cbx:loccit}
- {}
- {\usebibmacro{postnote}}}
+%\newbibmacro*{footcite:full}{%
+% \usebibmacro{cite:full:citepages}%
+% \printtext[bibhypertarget]{%
+% \usedriver
+% {\DeclareNameAlias{sortname}{default}}
+% {\thefield{entrytype}}}%
+% \usebibmacro{shorthandintro}}
+
+%\newbibmacro*{footcite:note}{%
+% \ifnameundef{labelname}
+% {\printfield{label}}
+% {\printnames{labelname}}%
+% \ifsingletitle
+% {}
+% {\setunit*{\nametitledelim}%
+% \printfield[title]{labeltitle}}%
+% \setunit*{\addcomma\space}%
+% \printtext{%
+% \bibstring{seenote}\addnbspace
+% \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+% \iftoggle{cbx:pageref}
+% {\ifsamepage{\the\value{instcount}}
+% {\csuse{cbx@f@\thefield{entrykey}}}
+% {}
+% {\addcomma\space\bibstring{page}\addnbspace
+% \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}
+% {}}}
\newbibmacro*{footcite:shorthand}{%
- \printtext{%
- \bibhyperlink{\thefield{entrykey}:%
- \csuse{cbx@first@\thefield{entrykey}}}{%
- \printfield{shorthand}}}}
+ \printtext[bibhyperlink]{\printfield{shorthand}}}
\newbibmacro*{footcite:ibid}{%
- \printtext{%
- \bibhyperlink{\thefield{entrykey}:%
- \csuse{cbx@first@\thefield{entrykey}}}{%
- \bibstring[\mkibid]{ibidem}}}%
+ \printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
\ifloccit
- {\global\booltrue{cbx:loccit}}
+ {\global\toggletrue{cbx:loccit}}
{}}
-\DeclareCiteCommand{\cite}
+%\DeclareCiteCommand{\cite}
+% {\usebibmacro{prenote}}
+% {\usebibmacro{citeindex}%
+% \iffootnote
+% {\usebibmacro{footcite}}
+% {\usebibmacro{cite}}}
+% {\multicitedelim}
+% {\usebibmacro{cite:postnote}}
+
+%\DeclareCiteCommand{\parencite}[\mkbibparens]
+% {\usebibmacro{prenote}}
+% {\usebibmacro{citeindex}%
+% \iffootnote
+% {\usebibmacro{footcite}}
+% {\usebibmacro{cite}}}
+% {\multicitedelim}
+% {\usebibmacro{cite:postnote}}
+
+%\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+% {\usebibmacro{prenote}}
+% {\usebibmacro{citeindex}%
+% \usebibmacro{footcite}}
+% {\multicitedelim}
+% {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \iffootnote
- {\usebibmacro{footcite}}
- {\usebibmacro{cite}}}
+ \usebibmacro{footcite}}
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+
+%End of inherited routines from verbose-inote
+%%%%%%%%%% MODIFIED CITE AND FOOTCITE CITECOMMANDS %%%%%%%%%%%%%%%%%%%%%%%%%%
-\DeclareCiteCommand{\footcite}[\mkbibfootnote]
- {\usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{footcite}}
- {\multicitedelim}
- {\usebibmacro{cite:postnote}}
+\newtoggle{repeatedcitationflag}%Needed for punctuating postnote
-%End of inherited routines from verbose-inote
+\DeclareCiteCommand{\cite}
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+%Test for repeated citation before the new key gets saved
+ \ifciteseen
+ {\toggletrue{repeatedcitationflag}}%
+ {\togglefalse{repeatedcitationflag}}%
+ \iffootnote
+ {%then call footcite macro
+ \usebibmacro{footcite}}%
+ {%else cite macro instead of footcite
+ \usebibmacro{cite}}}%
+ {\multicitedelim}
+ {\ifthenelse{\equal{\thefield{entrytype}}{\entrytypearticle}}
+ {%Then special case for articles with page ranges in postnote
+ \ifboolexpr{test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and test {\iffieldpages{postnote}}}
+ {%Page range was suppressed; need colon instead of comma before postnote
+ \iftoggle{repeatedcitationflag}
+ {%then exception after short forms in repeated citations
+ \relax}%
+ {%else insert the colon
+ \citepagesseparator}%
+ }%
+ {%else no page range recognized in postnote
+ \relax}%
+ }%
+ {%Else not an article
+ \relax
+ }%
+ \usebibmacro{cite:postnote}
+ }%End postcode
-%%%%%%%%%% MODIFIED FOOTCITE COMMAND %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+%Test for repeated citation before the new key gets saved
+ \ifciteseen
+ {\toggletrue{repeatedcitationflag}}%
+ {\togglefalse{repeatedcitationflag}}%
+ \usebibmacro{footcite}}
+ {\multicitedelim}
+{\ifthenelse{\equal{\thefield{entrytype}}{\entrytypearticle}}
+ {%Then special case for articles with page ranges in postnote
+ \ifboolexpr{test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and test {\iffieldpages{postnote}}}
+ {%Pages field was suppressed; need colon instead of comma before postnote
+ \iftoggle{repeatedcitationflag}
+ {%then exception after short forms in repeated citations
+ \relax}%
+ {%else insert the colon
+ \citepagesseparator}%
+ }%
+ {%else no page range recognized in postnote
+ \relax}%
+ }%
+ {%Else not an article
+ \relax
+ }%
+ \usebibmacro{cite:postnote}
+ }%End postcode
+
+
+%%%%%%%%%% MODIFIED FOOTCITE MACRO %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%Loopcode of footcite command modified from verbose-inote to include special short forms
\newbibmacro*{footcite}{%
-\global\boolfalse{cbx:loccit}%
+\usebibmacro{cite:citepages}%
+\global\togglefalse{cbx:loccit}%
\ifciteseen
{%then1 repeated citation
\iffieldundef{shorthand}%
@@ -161,24 +357,42 @@
}%Endif, end else2
}%End then1
{%Else1 not a repeated citation: cite in full
- \usebibmacro{footcite:full}%
+ \usebibmacro{footcite:full}%
\usebibmacro{footcite:save}%
}%Endif, end else1
-}%End macro
-
+}%End footcite macro
+
-% Like the Verbose styles, historian.cbx uses the drivers from the bbx file
+%Like the Verbose styles, historian.cbx uses the drivers from the bbx file
\newbibmacro*{footcite:full}{%
-% Switch to commas as unit punctuation
+%Bbx file defines periods as unit punctuation; here we change to commas
\renewcommand\newunitpunct{\addcomma\addspace}%
-\printtext{%
- \bibhypertarget{\thefield{entrykey}:\the\value{instcount}}{%
- \usedriver{\DeclareNameAlias{sortname}{default}}{\thefield{entrytype}}}}%
-\usebibmacro{shorthandintro}%
-}%
+\usebibmacro{cite:full:citepages}%
+\printtext[bibhypertarget]{%
+ \usedriver
+ {\DeclareNameAlias{sortname}{default}}
+ {\thefield{entrytype}}}%
+ \usebibmacro{shorthandintro}}%
+
+
+\newbibmacro*{footcite:shorthand}{%
+ \printtext[bibhyperlink]{\printfield{shorthand}}}
+
+\newbibmacro*{footcite:ibid}{%
+ \printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
+ \ifloccit
+ {\global\toggletrue{cbx:loccit}}
+ {}}
-%Modified from verbose-inote.cbx to include special short forms for letters, archives, documents, and some non-print sources
+\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{footcite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
+%Modified from verbose-inote.cbx to include special short forms for letters, archives, documents, and some non-print sources
\newbibmacro*{footcite:note}{%
\ifnameundef{labelname}
{\printfield{label}}%
@@ -201,7 +415,7 @@
{\ifthenelse{\equal{\thefield{entrytype}}{performance}}
{%Title label already printed
\relax}%
- {\setunit*{\addcomma\space}%
+ {\setunit*{\nametitledelim}%
\printfield[title]{labeltitle}%
\ifthenelse{\equal{\thefield{entrytype}}{customd}}%
{\setunit*{\addcomma\addspace}%
@@ -211,31 +425,28 @@
{\relax}%
}%
}%
-\iftoggle{noterefsflag}%New option and test in v. 0.2a
+\iftoggle{noterefsflag}%
{%Then option set for note references
\iftoggle{xrefflag}
{%Then suppress note function in crossreferences in any case
\relax}%
{%Else print note number
\setunit{\addcomma\space}%
- \printtext
- {\bibstring{seenote}\addnbspace
- \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}%
- \ifbool{cbx:pageref}
- {\ifsamepage{\the\value{instcount}}
- {\csuse{cbx@first@\thefield{entrykey}}}%
- {}%
- {\addcomma\space\bibstring{page}\addnbspace
- \pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}}%
- {}%
- }%end printtext
- }%endelse, endiftoggle
+ \printtext {%
+ \bibstring{seenote}\addnbspace
+ \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+ \iftoggle{cbx:pageref}
+ {\ifsamepage{\the\value{instcount}}
+ {\csuse{cbx@f@\thefield{entrykey}}}
+ {}
+ {\addcomma\space\bibstring{page}\addnbspace
+ \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}
+ {}}%end printtext
+ }%endelse, endiftoggle
}%Endthen
{%Else option set to suppress note references
\relax}%Endiftoggle
-}%end macro
-
-
+}
\newbibmacro{footcite:shortclassic}{%
\iffieldundef{label}%
@@ -278,8 +489,7 @@
{\printfield{label}}%
}%
-
-%%%%%%%%%% CITE-COMMAND VARIATIONS WITH DIFFERENT PUNCTUATION %%%%%%%%
+%%%%%%%%%% CITE-COMMAND VARIATIONS WITH ALTERNATE PUNCTUATION %%%%%%%%
%Special foocite command with a period before the postnote
\DeclareCiteCommand{\footcitedot}[\mkbibfootnote]
@@ -288,25 +498,25 @@
{\usebibmacro{citeindex}%
\usebibmacro{footcite}}%
{\multicitedelim}%
- {\ifbool{cbx:loccit}
+ {\iftoggle{cbx:loccit}
{}
{\iffieldundef{postnote}
{}
{\addperiod\addspace
\printfield{postnote}}}}%
-%Special footcite command without punctuation before the postnote
+%Special footcite command without punctuation or spacing before the postnote
\DeclareCiteCommand{\footcitenodot}[\mkbibfootnote]
{\bibsentence
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{footcite}}%
{\multicitedelim}%
- {\ifbool{cbx:loccit}%
+ {\iftoggle{cbx:loccit}%
{}%
{\iffieldundef{postnote}%
{}%
- {%\addspace
+ {\setunit{\unspace}%
\printfield{postnote}}}}%
@@ -315,13 +525,13 @@
{\bibsentence
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
-%Set flag for article routine to print pages only when there's no postnote
+%Set flag to have article driver print pages field only when there's no postnote
\iffieldundef{postnote}
{\toggletrue{printpagerange}}%
{\togglefalse{printpagerange}}%
\usebibmacro{footcite}}%
{\multicitedelim}%
-{\ifbool{cbx:loccit}%
+{\iftoggle{cbx:loccit}%
{}
{\iffieldundef{postnote}%
{\relax}%
@@ -336,7 +546,7 @@
{\usebibmacro{citeindex}%
\usebibmacro{footcite}}% [Sic. The \cite macro doesn't have all the short forms]
{\multicitedelim}%
- {\ifbool{cbx:loccit}
+ {\iftoggle{cbx:loccit}
{}
{\iffieldundef{postnote}
{}
@@ -350,7 +560,7 @@
{\usebibmacro{citeindex}%
\usebibmacro{footcite}}% [Sic. The \cite macro doesn't have all the short forms]
{\multicitedelim}%
- {\ifbool{cbx:loccit}%
+ {\iftoggle{cbx:loccit}%
{}%
{\iffieldundef{postnote}%
{}%
@@ -362,13 +572,13 @@
{\bibsentence
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
-%Set flag for article routine to print pages only when there's no postnote
+%Set flag to have article driver print pages only when there's no postnote
\iffieldundef{postnote}
{\toggletrue{printpagerange}}%
{\togglefalse{printpagerange}}%
\usebibmacro{footcite}}% [Sic. The \cite macro doesn't have all the short forms]
{\multicitedelim}%
-{\ifbool{cbx:loccit}%
+{\iftoggle{cbx:loccit}%
{}
{\iffieldundef{postnote}%
{\relax}%
@@ -378,7 +588,7 @@
%Multicite versions with modified punctuation between citations
\DeclareMultiCiteCommand{\footcitedots}[\mkbibfootnote]{\footcite}{\addperiod\addspace}%
-\DeclareMultiCiteCommand{\footcitenodots}[\mkbibfootnote]{\footcite}{\unspace}
+\DeclareMultiCiteCommand{\footcitenodots}[\mkbibfootnote]{\footcite}{\space}
%%%%%%%%% MODIFIED PARENCITE %%%%%%%%%%%%%%%%%%%%%%%%%
@@ -395,7 +605,6 @@
{\printfield{shorthand}}}%
{\multicitedelim}%
{\usebibmacro{cite:postnote}}%
-
\newbibmacro{parenauthor}{%
\ifnameundef{author}
{%Then Author not in use; try editor, translator
@@ -445,9 +654,7 @@
}%end of macro
%%%%%%%%% CITE COMMAND FOR ANNOTATIONS---new in v. 0.2 %%%%%%%%%%%%%
-
%For printing both abstract and annotation after main citation (new in v. 0.2)
-
\DeclareCiteCommand{\citeannote}[]
{%
\bibsentence%
@@ -463,7 +670,7 @@
\end{indentannote}
}%
{}%
-{\ifbool{cbx:loccit}
+{\iftoggle{cbx:loccit}
{}
{\iffieldundef{postnote}
{}%
@@ -472,13 +679,33 @@
}%
}%
-%%%%%%%%% CITE COMMANDS FOR CROSSREFERENCING %%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%% MODIFIED CITE AND FOOTCITE WITH URL AFTER POSTNOTE %%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\DeclareCiteCommand{\citeurllast}
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \toggletrue{urllastflag}%
+ \iffootnote
+ {\usebibmacro{footcite}}%
+ {\usebibmacro{cite}}}%
+ {\multicitedelim}
+ {\relax}% Postnote already printed by onlinelocation macro in bbx
+
+
+\DeclareCiteCommand{\footciteurllast}[\mkbibfootnote]
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \toggletrue{urllastflag}%
+ \usebibmacro{footcite}}%
+ {\multicitedelim}%
+ {\relax}% Postnote already printed by onlinelocation macro in bbx
+%%%%%%%%%% CITE COMMANDS FOR CROSSREFERENCING %%%%%%%%%%%%%%%%%%%%%%
% Cross-referencing to collection in footnotes
%(The corresponding routine for bibliography cross-referencing is in the bbx file)
\DeclareCiteCommand{\cbx@crosstocoll}[]{}{%
\toggletrue{xrefflag}%
-\global\boolfalse{cbx:loccit}%
+\global\togglefalse{cbx:loccit}%
\ifciteseen
{\iffieldundef{shorthand}%
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
@@ -500,7 +727,7 @@
%(The corresponding routine for bibliography cross-referencing is in the bbx file)
\DeclareCiteCommand{\cbx@crosstoper}[]{}{%
\toggletrue{xrefflag}%
-\global\boolfalse{cbx:loccit}%
+\global\togglefalse{cbx:loccit}%
\ifciteseen
{\iffieldundef{shorthand}%
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
@@ -521,7 +748,7 @@
%(The corresponding routine for bibliography cross-referencing is in the bbx file)
\DeclareCiteCommand{\cbx@crosstoarch}[]{}{%
\toggletrue{xrefflag}%
-\global\boolfalse{cbx:loccit}%
+\global\togglefalse{cbx:loccit}%
\usebibmacro{in:}%
\ifciteseen%
{\iffieldundef{shorthand}%
@@ -544,7 +771,7 @@
%(The corresponding routine for bibliography cross-referencing is in the bbx file)
\DeclareCiteCommand{\cbx@crosstoref}[]{}{%
\toggletrue{xrefflag}%
-\global\boolfalse{cbx:loccit}%
+\global\togglefalse{cbx:loccit}%
\ifciteseen
{\iffieldundef{shorthand}%
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
@@ -555,12 +782,16 @@
}%
}%
{\printtext{\bibhypertarget{\thefield{entrykey}:\the\value{instcount}}{%
- \usebibmacro{getreferenceinfo}}%
+ \usebibmacro{getbooktitle}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \printfield{note}%
+ }%
\usebibmacro{shorthandintro}}%
\usebibmacro{footcite:save}%
}%
}{}{}%
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-historian/historian.lbx b/Master/texmf-dist/tex/latex/biblatex-historian/historian.lbx
new file mode 100644
index 00000000000..455966eab0b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-historian/historian.lbx
@@ -0,0 +1,387 @@
+% $Id: historian.lbx,v 0.4 2010/08/22 gliboff $
+
+\ProvidesFile{historian.lbx}
+
+\InheritBibliographyExtras{american}
+%\InheritBibliographyStrings{american}
+
+%Turabian calls for mostly abbreviated bibstrings in the footnotes, but mostly long forms in the bibliography. Here the entire list of bibstrings from the english.lbx file is redefined to select strings by bibliography vs. footnote environment, rather than long vs. short.
+
+
+\DeclareBibliographyStrings{%
+ bibliography = {{Bibliography}{Bibliography}},
+ references = {{References}{References}},
+ shorthands = {{List of Abbreviations}{Abbreviations}},
+ editor = {{\ifbibliography{editor}{ed\adddot}}{\relax}},
+ editors = {{\ifbibliography{editors}{eds\adddot}}{\relax}},
+ compiler = {{\ifbibliography{compiler}{comp\adddot}}{\relax}},
+ compilers = {{\ifbibliography{compilers}{comp\adddot}}{\relax}},
+ redactor = {{\ifbibliography{redactor}{red\adddot}}{\relax}},
+ redactors = {{\ifbibliography{redactors}{red\adddot}}{\relax}},
+ founder = {{\ifbibliography{founder}{found\adddot}}{\relax}},
+ founders = {{\ifbibliography{founders}{found\adddot}}{\relax}},
+ continuator = {{\ifbibliography{continued}{cont\adddot}}{\relax}}, % FIXME: unsure
+ continuators = {{\ifbibliography{continued}{cont\adddot}}{\relax}}, % FIXME: unsure
+ collaborator = {{\ifbibliography{collaborator}{collab\adddot}}{\relax}}, % FIXME: unsure
+ collaborators = {{\ifbibliography{collaborators}{collab\adddot}}{\relax}}, % FIXME: unsure
+ translator = {{\ifbibliography{translator}{trans\adddot}}{\relax}},
+ translators = {{\ifbibliography{translators}{trans\adddot}}{\relax}},
+ commentator = {{\ifbibliography{commentator}{comm\adddot}}{\relax}},
+ commentators = {{\ifbibliography{commentators}{comm\adddot}}{\relax}},
+ annotator = {{\ifbibliography{annotator}{annot\adddot}}{\relax}},
+ annotators = {{\ifbibliography{annotators}{annot\adddot}}{\relax}},
+ commentary = {{\ifbibliography{commentary}{comm\adddot}}{\relax}},
+ annotations = {{\ifbibliography{annotations}{annot\adddot}}{\relax}},
+ introduction = {{\ifbibliography{introduction}{intro\adddot}}{\relax}},
+ foreword = {{\ifbibliography{foreword}{forew\adddot}}{\relax}},
+ afterword = {{\ifbibliography{afterword}{afterw\adddot}}{\relax}},
+ editortr = {{\ifbibliography{editor and translator}%
+ {ed\adddotspace and trans\adddot}}{\relax}},
+ editorstr = {{\ifbibliography{editors and translators}%
+ {eds\adddotspace and trans\adddot}}{\relax}},
+ editorco = {{\ifbibliography{editor and commentator}%
+ {ed\adddotspace and comm\adddot}}{\relax}},
+ editorsco = {{\ifbibliography{editors and commentators}%
+ {eds\adddotspace and comm\adddot}}{\relax}},
+ editoran = {{\ifbibliography{editor and annotator}%
+ {ed\adddotspace and annot\adddot}}{\relax}},
+ editorsan = {{\ifbibliography{editors and annotators}%
+ {eds\adddotspace and annot\adddot}}{\relax}},
+ editorin = {{\ifbibliography{editor and introduction}%
+ {ed\adddotspace and introd\adddot}}{\relax}},
+ editorsin = {{\ifbibliography{editors and introduction}%
+ {eds\adddotspace and introd\adddot}}{\relax}},
+ editorfo = {{\ifbibliography{editor and foreword}%
+ {ed\adddotspace and forew\adddot}}{\relax}},
+ editorsfo = {{\ifbibliography{editors and foreword}%
+ {eds\adddotspace and forew\adddot}}{\relax}},
+ editoraf = {{\ifbibliography{editor and afterword}%
+ {ed\adddotspace and afterw\adddot}}{\relax}},
+ editorsaf = {{\ifbibliography{editors and afterword}%
+ {eds\adddotspace and afterw\adddot}}{\relax}},
+ editortrco = {{\ifbibliography{editor, translator\finalandcomma\ and commentator}%
+ {ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}{\relax}},
+ editorstrco = {{\ifbibliography{editors, translators\finalandcomma\ and commentators}%
+ {eds.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}{\relax}},
+ editortran = {{\ifbibliography{editor, translator\finalandcomma\ and annotator}%
+ {ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}{\relax}},
+ editorstran = {{\ifbibliography{editors, translators\finalandcomma\ and annotators}%
+ {eds.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}{\relax}},
+ editortrin = {{\ifbibliography{editor, translator\finalandcomma\ and introduction}%
+ {ed.,\addabbrvspace trans\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ editorstrin = {{\ifbibliography{editors, translators\finalandcomma\ and introduction}%
+ {eds.,\addabbrvspace trans\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ editortrfo = {{\ifbibliography{editor, translator\finalandcomma\ and foreword}%
+ {ed.,\addabbrvspace trans\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ editorstrfo = {{\ifbibliography{editors, translators\finalandcomma\ and foreword}%
+ {eds.,\addabbrvspace trans\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ editortraf = {{\ifbibliography{editor, translator\finalandcomma\ and afterword}%
+ {ed.,\addabbrvspace trans\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ editorstraf = {{\ifbibliography{editors, translators\finalandcomma\ and afterword}%
+ {eds.,\addabbrvspace trans\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ editorcoin = {{\ifbibliography{editor, commentator\finalandcomma\ and introduction}%
+ {ed.,\addabbrvspace comm\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ editorscoin = {{\ifbibliography{editors, commentators\finalandcomma\ and introduction}%
+ {eds.,\addabbrvspace comm\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ editorcofo = {{\ifbibliography{editor, commentator\finalandcomma\ and foreword}%
+ {ed.,\addabbrvspace comm\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ editorscofo = {{\ifbibliography{editors, commentators\finalandcomma\ and foreword}%
+ {eds.,\addabbrvspace comm\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ editorcoaf = {{\ifbibliography{editor, commentator\finalandcomma\ and afterword}%
+ {ed.,\addabbrvspace comm\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ editorscoaf = {{\ifbibliography{editors, commentators\finalandcomma\ and afterword}%
+ {eds.,\addabbrvspace comm\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ editoranin = {{\ifbibliography{editor, annotator\finalandcomma\ and introduction}%
+ {ed.,\addabbrvspace annot\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ editorsanin = {{\ifbibliography{editors, annotators\finalandcomma\ and introduction}%
+ {eds.,\addabbrvspace annot\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ editoranfo = {{\ifbibliography{editor, annotator\finalandcomma\ and foreword}%
+ {ed.,\addabbrvspace annot\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ editorsanfo = {{\ifbibliography{editors, annotators\finalandcomma\ and foreword}%
+ {eds.,\addabbrvspace annot\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ editoranaf = {{\ifbibliography{editor, annotator\finalandcomma\ and afterword}%
+ {ed.,\addabbrvspace annot\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ editorsanaf = {{\ifbibliography{editors, annotators\finalandcomma\ and afterword}%
+ {eds.,\addabbrvspace annot\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ editortrcoin = {{\ifbibliography{editor, translator, commentator\finalandcomma\ and introduction}%
+ {ed.,\addabbrvspace trans., comm\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ editorstrcoin = {{\ifbibliography{editors, translators, commentators\finalandcomma\ and introduction}%
+ {eds.,\addabbrvspace trans., comm\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ editortrcofo = {{\ifbibliography{editor, translator, commentator\finalandcomma\ and foreword}%
+ {ed.,\addabbrvspace trans., comm\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ editorstrcofo = {{\ifbibliography{editors, translators, commentators\finalandcomma\ and foreword}%
+ {eds.,\addabbrvspace trans., comm\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ editortrcoaf = {{\ifbibliography{editor, translator, commentator\finalandcomma\ and afterword}%
+ {ed.,\addabbrvspace trans., comm\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ editorstrcoaf = {{\ifbibliography{editors, translators, commentators\finalandcomma\ and afterword}%
+ {eds.,\addabbrvspace trans., comm\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ editortranin = {{\ifbibliography{editor, translator, annotator\finalandcomma\ and introduction}%
+ {ed.,\addabbrvspace trans., annot\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ editorstranin = {{\ifbibliography{editors, translators, annotators\finalandcomma\ and introduction}%
+ {eds.,\addabbrvspace trans., annot\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ editortranfo = {{\ifbibliography{editor, translator, annotator\finalandcomma\ and foreword}%
+ {ed.,\addabbrvspace trans., annot\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ editorstranfo = {{\ifbibliography{editors, translators, annotators\finalandcomma\ and foreword}%
+ {eds.,\addabbrvspace trans., annot\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ editortranaf = {{\ifbibliography{editor, translator, annotator\finalandcomma\ and afterword}%
+ {ed.,\addabbrvspace trans., annot\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ editorstranaf = {{\ifbibliography{editors, translators, annotators\finalandcomma\ and afterword}%
+ {eds.,\addabbrvspace trans., annot\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ translatorco = {{\ifbibliography{translator and commentator}%
+ {trans\adddot\ and comm\adddot}}{\relax}},
+ translatorsco = {{\ifbibliography{translators and commentators}%
+ {trans\adddot\ and comm\adddot}}{\relax}},
+ translatoran = {{\ifbibliography{translator and annotator}%
+ {trans\adddot\ and annot\adddot}}{\relax}},
+ translatorsan = {{\ifbibliography{translators and annotators}%
+ {trans\adddot\ and annot\adddot}}{\relax}},
+ translatorin = {{\ifbibliography{translation and introduction}%
+ {trans\adddot\ and introd\adddot}}{\relax}},
+ translatorsin = {{\ifbibliography{translation and introduction}%
+ {trans\adddot\ and introd\adddot}}{\relax}},
+ translatorfo = {{\ifbibliography{translation and foreword}%
+ {trans\adddot\ and forew\adddot}}{\relax}},
+ translatorsfo = {{\ifbibliography{translation and foreword}%
+ {trans\adddot\ and forew\adddot}}{\relax}},
+ translatoraf = {{\ifbibliography{translation and afterword}%
+ {trans\adddot\ and afterw\adddot}}{\relax}},
+ translatorsaf = {{\ifbibliography{translation and afterword}%
+ {trans\adddot\ and afterw\adddot}}{\relax}},
+ translatorcoin = {{\ifbibliography{translation, commentary\finalandcomma\ and introduction}%
+ {trans., comm\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ translatorscoin = {{\ifbibliography{translation, commentary\finalandcomma\ and introduction}%
+ {trans., comm\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ translatorcofo = {{\ifbibliography{translation, commentary\finalandcomma\ and foreword}%
+ {trans., comm\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ translatorscofo = {{\ifbibliography{translation, commentary\finalandcomma\ and foreword}%
+ {trans., comm\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ translatorcoaf = {{\ifbibliography{translation, commentary\finalandcomma\ and afterword}%
+ {trans., comm\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ translatorscoaf = {{\ifbibliography{translation, commentary\finalandcomma\ and afterword}%
+ {trans., comm\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ translatoranin = {{\ifbibliography{translation, annotations\finalandcomma\ and introduction}%
+ {trans., annot\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ translatorsanin = {{\ifbibliography{translation, annotations\finalandcomma\ and introduction}%
+ {trans., annot\adddot\finalandcomma\ and introd\adddot}}{\relax}},
+ translatoranfo = {{\ifbibliography{translation, annotations\finalandcomma\ and foreword}%
+ {trans., annot\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ translatorsanfo = {{\ifbibliography{translation, annotations\finalandcomma\ and foreword}%
+ {trans., annot\adddot\finalandcomma\ and forew\adddot}}{\relax}},
+ translatoranaf = {{\ifbibliography{translation, annotations\finalandcomma\ and afterword}%
+ {trans., annot\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ translatorsanaf = {{\ifbibliography{translation, annotations\finalandcomma\ and afterword}%
+ {trans., annot\adddot\finalandcomma\ and afterw\adddot}}{\relax}},
+ byauthor = {{\ifbibliography{by}{by}}{\relax}},
+ byeditor = {{\ifbibliography{edited by}{ed\adddotspace}}{\relax}},%changed
+ bycompiler = {{\ifbibliography{compiled by}{comp\adddotspace by}}{\relax}},
+ byredactor = {{\ifbibliography{redacted by}{red\adddotspace by}}{\relax}},
+ byfounder = {{\ifbibliography{founded by}{found\adddotspace by}}{\relax}},
+ bycontinuator = {{\ifbibliography{continued by}{cont\adddotspace by}}{\relax}},
+ bycollaborator = {{\ifbibliography{in collaboration with}{in collab\adddotspace with}}{\relax}}, % FIXME: unsure
+ bytranslator = {{\ifbibliography{translated by}{trans\adddotspace}}{\relax}},%changed
+ bycommentator = {{\ifbibliography{commented by}{comm\adddot\ by}}{\relax}},
+ byannotator = {{\ifbibliography{annotated by}{annot\adddot\ by}}{\relax}},
+ withcommentator = {{\ifbibliography{with a commentary by}{with a comment\adddot\ by}}{\relax}},
+ withannotator = {{\ifbibliography{with annotations by}{with annots\adddot\ by}}{\relax}},
+ withintroduction = {{\ifbibliography{with an introduction by}{with an intro\adddot\ by}}{\relax}},
+ withforeword = {{\ifbibliography{with a foreword by}{with a forew\adddot\ by}}{\relax}},
+ withafterword = {{\ifbibliography{with an afterword by}{with an afterw\adddot\ by}}{\relax}},
+ byeditortr = {{\ifbibliography{translated and edited by}%
+ {trans\adddotspace and ed\adddotspace}}{\relax}},%changed
+ byeditorco = {{\ifbibliography{edited and commented by}%
+ {ed\adddotspace and comm\adddot\ by}}{\relax}},
+ byeditoran = {{\ifbibliography{edited and annotated by}%
+ {ed\adddotspace and annot\adddot\ by}}{\relax}},
+ byeditorin = {{\ifbibliography{edited, with an introduction, by}%
+ {ed.,\addabbrvspace with an introd., by}}{\relax}},
+ byeditorfo = {{\ifbibliography{edited, with a foreword, by}%
+ {ed.,\addabbrvspace with a forew., by}}{\relax}},
+ byeditoraf = {{\ifbibliography{edited, with an afterword, by}%
+ {ed.,\addabbrvspace with an afterw., by}}{\relax}},
+ byeditortrco = {{\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and commented by}%
+ {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm\adddot\ by}}{\relax}},
+ byeditortran = {{\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and annotated by}%
+ {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot\adddot\ by}}{\relax}},
+ byeditortrin = {{\ifbibliography{edited and translated \lbx@fromlang, with an introduction, by}%
+ {ed\adddotspace and trans\adddot\ \lbx@fromlang, with an introd., by}}{\relax}},
+ byeditortrfo = {{\ifbibliography{edited and translated \lbx@fromlang, with a foreword, by}%
+ {ed\adddotspace and trans\adddot\ \lbx@fromlang, with a forew., by}}{\relax}},
+ byeditortraf = {{\ifbibliography{edited and translated \lbx@fromlang, with an afterword, by}%
+ {ed\adddotspace and trans\adddot\ \lbx@fromlang, with an afterw., by}}{\relax}},
+ byeditorcoin = {{\ifbibliography{edited and commented, with an introduction, by}%
+ {ed\adddotspace and comm., with an introd., by}}{\relax}},
+ byeditorcofo = {{\ifbibliography{edited and commented, with a foreword, by}%
+ {ed\adddotspace and comm., with a forew., by}}{\relax}},
+ byeditorcoaf = {{\ifbibliography{edited and commented, with an afterword, by}%
+ {ed\adddotspace and comm., with an afterw., by}}{\relax}},
+ byeditoranin = {{\ifbibliography{edited and annotated, with an introduction, by}%
+ {ed\adddotspace and annot., with an introd., by}}{\relax}},
+ byeditoranfo = {{\ifbibliography{edited and annotated, with a foreword, by}%
+ {ed\adddotspace and annot., with a forew., by}}{\relax}},
+ byeditoranaf = {{\ifbibliography{edited and annotated, with an afterword, by}%
+ {ed\adddotspace and annot., with an afterw., by}}{\relax}},
+ byeditortrcoin = {{\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and commented, with an introduction, by}%
+ {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm., with an introd., by}}{\relax}},
+ byeditortrcofo = {{\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and commented, with a foreword, by}%
+ {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm., with a forew., by}}{\relax}},
+ byeditortrcoaf = {{\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and commented, with an afterword, by}%
+ {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm., with an afterw., by}}{\relax}},
+ byeditortranin = {{\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and annotated, with an introduction, by}%
+ {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot, with an introd., by}}{\relax}},
+ byeditortranfo = {{\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and annotated, with a foreword, by}%
+ {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot, with a forew., by}}{\relax}},
+ byeditortranaf = {{\ifbibliography{edited, translated \lbx@fromlang\finalandcomma\ and annotated, with an afterword, by}%
+ {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot, with an afterw., by}}{\relax}},
+ bytranslatorco = {{\ifbibliography{translated \lbx@fromlang\ and commented by}%
+ {trans\adddot\ \lbx@fromlang\ and comm\adddot\ by}}{\relax}},
+ bytranslatoran = {{\ifbibliography{translated \lbx@fromlang\ and annotated by}%
+ {trans\adddot\ \lbx@fromlang\ and annot\adddot\ by}}{\relax}},
+ bytranslatorin = {{\ifbibliography{translated \lbx@fromlang, with an introduction, by}%
+ {trans\adddot\ \lbx@fromlang, with an introd., by}}{\relax}},
+ bytranslatorfo = {{\ifbibliography{translated \lbx@fromlang, with a foreword, by}%
+ {trans\adddot\ \lbx@fromlang, with a forew., by}}{\relax}},
+ bytranslatoraf = {{\ifbibliography{translated \lbx@fromlang, with an afterword, by}%
+ {trans\adddot\ \lbx@fromlang, with an afterw., by}}{\relax}},
+ bytranslatorcoin = {{\ifbibliography{translated \lbx@fromlang\ and commented, with an introduction, by}%
+ {trans\adddot\ \lbx@fromlang\ and comm., with an introd., by}}{\relax}},
+ bytranslatorcofo = {{\ifbibliography{translated \lbx@fromlang\ and commented, with a foreword, by}%
+ {trans\adddot\ \lbx@fromlang\ and comm., with a forew., by}}{\relax}},
+ bytranslatorcoaf = {{\ifbibliography{translated \lbx@fromlang\ and commented, with an afterword, by}%
+ {trans\adddot\ \lbx@fromlang\ and comm., with an afterw., by}}{\relax}},
+ bytranslatoranin = {{\ifbibliography{translated \lbx@fromlang\ and annotated, with an introduction, by}%
+ {trans\adddot\ \lbx@fromlang\ and annot., with an introd., by}}{\relax}},
+ bytranslatoranfo = {{\ifbibliography{translated \lbx@fromlang\ and annotated, with a foreword, by}%
+ {trans\adddot\ \lbx@fromlang\ and annot., with a forew., by}}{\relax}},
+ bytranslatoranaf = {{\ifbibliography{translated \lbx@fromlang\ and annotated, with an afterword, by}%
+ {trans\adddot\ \lbx@fromlang\ and annot., with an afterw., by}}{\relax}},
+ and = {{\ifbibliography{and}{and}}{\relax}},
+ andothers = {{\ifbibliography{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}{\relax}},
+ andmore = {{\ifbibliography{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}{\relax}},
+ volume = {{\ifbibliography{vol\adddot}{vol\adddot}}{\relax}},%changed
+ volumes = {{\ifbibliography{vols\adddot}{vols\adddot}}{\relax}},%changed
+ jourvol = {{\ifbibliography{volume}{vol\adddot}}{\relax}},
+ jourser = {{\ifbibliography{series}{ser\adddot}}{\relax}},
+ newseries = {{\ifbibliography{new series}{new ser\adddot}}{\relax}},
+ oldseries = {{\ifbibliography{old series}{old ser\adddot}}{\relax}},
+ edition = {{\ifbibliography{ed\adddot}{ed\adddot}}{\relax}},% Changed
+ reprint = {{\ifbibliography{reprint}{repr\adddot}}{\relax}},% Changed
+ reprintof = {{\ifbibliography{reprint of}{repr\adddotspace of}}{\relax}},
+ reprintas = {{\ifbibliography{reprinted as}{repr\adddotspace as}}{\relax}},% Changed
+ page = {{\ifbibliography{page}{p\adddot}}{\relax}},
+ pages = {{\ifbibliography{pages}{pp\adddot}}{\relax}},
+ column = {{\ifbibliography{column}{col\adddot}}{\relax}},
+ columns = {{\ifbibliography{columns}{cols\adddot}}{\relax}},
+ line = {{\ifbibliography{line}{l\adddot}}{\relax}},
+ lines = {{\ifbibliography{lines}{ll\adddot}}{\relax}},
+ verse = {{\ifbibliography{verse}{v\adddot}}{\relax}},
+ verses = {{\ifbibliography{verses}{vv\adddot}}{\relax}},
+ section = {{\ifbibliography{section}{\S}}{\relax}},
+ sections = {{\ifbibliography{sections}{\S\S}}{\relax}},
+ paragraph = {{\ifbibliography{paragraph}{par\adddot}}{\relax}},
+ paragraphs = {{\ifbibliography{paragraphs}{par\adddot}}{\relax}},
+ in = {{\ifbibliography{in}{in}}{\relax}},
+ inseries = {{\ifbibliography{in}{in}}{\relax}},
+ ofseries = {{\ifbibliography{of}{of}}{\relax}},
+ number = {{\ifbibliography{no\adddot}{no\adddot}}{\relax}},% Changed
+ chapter = {{\ifbibliography{chapter}{chap\adddot}}{\relax}},
+ mathesis = {{\ifbibliography{master's thesis}{master's thesis}}{\relax}},%Changed
+ phdthesis = {{\ifbibliography{PhD\addabbrvspace diss\adddot}{PhD\addabbrvspace diss\adddot}}{\relax}},
+ resreport = {{\ifbibliography{research report}{research rep\adddot}}{\relax}},
+ techreport = {{\ifbibliography{technical report}{tech\adddotspace rep\adddot}}{\relax}},
+ software = {{\ifbibliography{computer software}{comp\adddotspace software}}{\relax}},
+ datacd = {{\ifbibliography{CD-ROM}{CD-ROM}}{\relax}},
+ audiocd = {{\ifbibliography{audio CD}{audio CD}}{\relax}},
+ version = {{\ifbibliography{version}{version}}{\relax}},
+ url = {{\ifbibliography{address}{address}}{\relax}},
+ urlseen = {{\ifbibliography{accessed}{accessed}}{\relax}},% Changed
+ inpress = {{\ifbibliography{in press}{in press}}{\relax}},
+ submitted = {{\ifbibliography{submitted}{submitted}}{\relax}},
+ citedas = {{\ifbibliography{henceforth cited as}{henceforth cited as}}{\relax}},
+ thiscite = {{\ifbibliography{especially}{esp\adddot}}{\relax}},
+ seenote = {{\ifbibliography{see note}{see n\adddot}}{\relax}},
+ quotedin = {{\ifbibliography{quoted in}{qtd\adddotspace in}}{\relax}},
+ idem = {{\ifbibliography{idem}{idem}}{\relax}},
+ idemsm = {{\ifbibliography{idem}{idem}}{\relax}},
+ idemsf = {{\ifbibliography{eadem}{eadem}}{\relax}},
+ idemsn = {{\ifbibliography{idem}{idem}}{\relax}},
+ idempm = {{\ifbibliography{eidem}{eidem}}{\relax}},
+ idempf = {{\ifbibliography{eaedem}{eaedem}}{\relax}},
+ idempn = {{\ifbibliography{eadem}{eadem}}{\relax}},
+ idempp = {{\ifbibliography{eidem}{eidem}}{\relax}},
+ ibidem = {{\ifbibliography{ibidem}{ibid\adddot}}{\relax}},
+ opcit = {{\ifbibliography{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}}{\relax}},
+ loccit = {{\ifbibliography{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}}{\relax}},
+ confer = {{\ifbibliography{cf\adddot}{cf\adddot}}{\relax}},
+ sequens = {{\ifbibliography{sq\adddot}{sq\adddot}}{\relax}},
+ sequentes = {{\ifbibliography{sqq\adddot}{sqq\adddot}}{\relax}},
+ passim = {{\ifbibliography{passim}{pass\adddot}}{\relax}},
+ see = {{\ifbibliography{see}{see}}{\relax}},
+ seealso = {{\ifbibliography{see also}{see also}}{\relax}},
+ backrefpage = {{\ifbibliography{cited on page}{cit\adddotspace on p\adddot}}{\relax}},
+ backrefpages = {{\ifbibliography{cited on pages}{cit\adddotspace on pp\adddot}}{\relax}},
+ january = {{\ifbibliography{January}{Jan\adddot}}{\relax}},
+ february = {{\ifbibliography{February}{Feb\adddot}}{\relax}},
+ march = {{\ifbibliography{March}{Mar\adddot}}{\relax}},
+ april = {{\ifbibliography{April}{Apr\adddot}}{\relax}},
+ may = {{\ifbibliography{May}{May}}{\relax}},
+ june = {{\ifbibliography{June}{June}}{\relax}},
+ july = {{\ifbibliography{July}{July}}{\relax}},
+ august = {{\ifbibliography{August}{Aug\adddot}}{\relax}},
+ september = {{\ifbibliography{September}{Sept\adddot}}{\relax}},
+ october = {{\ifbibliography{October}{Oct\adddot}}{\relax}},
+ november = {{\ifbibliography{November}{Nov\adddot}}{\relax}},
+ december = {{\ifbibliography{December}{Dec\adddot}}{\relax}},
+ langamerican = {{\ifbibliography{American}{American}}{\relax}},
+ langbrazilian = {{\ifbibliography{Brazilian}{Brazilian}}{\relax}},
+ langdanish = {{\ifbibliography{Danish}{Danish}}{\relax}},
+ langdutch = {{\ifbibliography{Dutch}{Dutch}}{\relax}},
+ langenglish = {{\ifbibliography{English}{English}}{\relax}},
+ langfrench = {{\ifbibliography{French}{French}}{\relax}},
+ langgerman = {{\ifbibliography{German}{German}}{\relax}},
+ langgreek = {{\ifbibliography{Greek}{Greek}}{\relax}},
+ langitalian = {{\ifbibliography{Italian}{Italian}}{\relax}},
+ langlatin = {{\ifbibliography{Latin}{Latin}}{\relax}},
+ langnorwegian = {{\ifbibliography{Norwegian}{Norwegian}}{\relax}},
+ langportuguese = {{\ifbibliography{Portuguese}{Portuguese}}{\relax}},
+ langspanish = {{\ifbibliography{Spanish}{Spanish}}{\relax}},
+ langswedish = {{\ifbibliography{Swedish}{Swedish}}{\relax}},
+ fromamerican = {{\ifbibliography{from the American}{from the American}}{\relax}},
+ frombrazilian = {{\ifbibliography{from the Brazilian}{from the Brazilian}}{\relax}},
+ fromdanish = {{\ifbibliography{from the Danish}{from the Danish}}{\relax}},
+ fromdutch = {{\ifbibliography{from the Dutch}{from the Dutch}}{\relax}},
+ fromenglish = {{\ifbibliography{from the English}{from the English}}{\relax}},
+ fromfrench = {{\ifbibliography{from the French}{from the French}}{\relax}},
+ fromgerman = {{\ifbibliography{from the German}{from the German}}{\relax}},
+ fromgreek = {{\ifbibliography{from the Greek}{from the Greek}}{\relax}},
+ fromitalian = {{\ifbibliography{from the Italian}{from the Italian}}{\relax}},
+ fromlatin = {{\ifbibliography{from the Latin}{from the Latin}}{\relax}},
+ fromnorwegian = {{\ifbibliography{from the Norwegian}{from the Norwegian}}{\relax}},
+ fromportuguese = {{\ifbibliography{from the Portuguese}{from the Portuguese}}{\relax}},
+ fromspanish = {{\ifbibliography{from the Spanish}{from the Spanish}}{\relax}},
+ fromswedish = {{\ifbibliography{from the Swedish}{from the Swedish}}{\relax}},
+ countryde = {{\ifbibliography{Germany}{DE}}{\relax}},
+ countryeu = {{\ifbibliography{European Union}{EU}}{\relax}},
+ countryep = {{\ifbibliography{European Union}{EP}}{\relax}},
+ countryfr = {{\ifbibliography{France}{FR}}{\relax}},
+ countryuk = {{\ifbibliography{United Kingdom}{GB}}{\relax}},
+ countryus = {{\ifbibliography{United States of America}{US}}{\relax}},
+ patent = {{\ifbibliography{patent}{pat\adddot}}{\relax}},
+ patentde = {{\ifbibliography{German patent}{German pat\adddot}}{\relax}},
+ patenteu = {{\ifbibliography{European patent}{European pat\adddot}}{\relax}},
+ patentfr = {{\ifbibliography{French patent}{French pat\adddot}}{\relax}},
+ patentuk = {{\ifbibliography{British patent}{British pat\adddot}}{\relax}},
+ patentus = {{\ifbibliography{U.S\adddotspace patent}{U.S\adddotspace pat\adddot}}{\relax}},
+ patreq = {{\ifbibliography{patent request}{pat\adddot\ req\adddot}}{\relax}},
+ patreqde = {{\ifbibliography{German patent request}{German pat\adddot\ req\adddot}}{\relax}},
+ patreqeu = {{\ifbibliography{European patent request}{European pat\adddot\ req\adddot}}{\relax}},
+ patreqfr = {{\ifbibliography{French patent request}{French pat\adddot\ req\adddot}}{\relax}},
+ patrequk = {{\ifbibliography{British patent request}{British pat\adddot\ req\adddot}}{\relax}},
+ patrequs = {{\ifbibliography{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}}{\relax}},
+ file = {{\ifbibliography{file}{file}}{\relax}},
+ library = {{\ifbibliography{library}{library}}{\relax}},
+ abstract = {{\ifbibliography{abstract}{abstract}}{\relax}},
+ annotation = {{\ifbibliography{annotations}{annotations}}{\relax}}
+}
+
+
+\endinput