diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-trad/README.md | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.pdf | bin | 342578 -> 344035 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.tex | 37 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.bbx | 30 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.cbx | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.bbx | 25 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.cbx | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.bbx | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.cbx | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx | 273 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.cbx | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.bbx | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.cbx | 2 |
13 files changed, 198 insertions, 201 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-trad/README.md b/Master/texmf-dist/doc/latex/biblatex-trad/README.md index 0a28a3ad494..c58e1af416d 100644 --- a/Master/texmf-dist/doc/latex/biblatex-trad/README.md +++ b/Master/texmf-dist/doc/latex/biblatex-trad/README.md @@ -7,23 +7,25 @@ Introduction ------------- The complete idea was inspired by a question at [tex.stackexchange](http://tex.stackexchange.com/): - -[How to emulate the traditional BibTeX styles (plain, abbrv, unsrt, alpha) as closely as possible with biblatex?](http://tex.stackexchange.com/a/69706/) +[How to emulate the traditional BibTeX styles (plain, abbrv, unsrt, alpha) as closely as possible with biblatex?](https://tex.stackexchange.com/a/69706/) Installation ------------- The package is published via [CTAN](https://www.ctan.org/pkg/biblatex-trad) and should be available via your favourite distribution. -The development branch can be downloaded here. I provide a simple `Makefile` which allows you to install the current development branch via +The development branch can be downloaded from github (https://github.com/moewew/biblatex-trad). +Bugs reports and feature requests can be directed to the project's [issue page](https://github.com/plk/biblatex/issues) + +There is a simple `Makefile` which allows you to install the current development branch via make localinstall Licence ------------- Copyright (c) 2012 -- 2015 Marco Daniel - 2016 -- Moritz Wemheuer + 2016 -- 2018 Moritz Wemheuer This package is released under the terms of the LaTeX Project -Public License v1.3c or later. +Public License v1.3c (LPPL-1.3c) or later. See http://www.latex-project.org/lppl.txt
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.pdf b/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.pdf Binary files differindex 8321701ff36..96a60634dd1 100644 --- a/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.tex b/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.tex index e966076c33f..fec3346366e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.tex +++ b/Master/texmf-dist/doc/latex/biblatex-trad/biblatex-trad.tex @@ -33,7 +33,7 @@ url={}, author={Marco Daniel\\Moritz Wemheuer}, email={}, - revision={0.3}, + revision={0.4}, date={\today}} \hypersetup{% @@ -76,8 +76,8 @@ The package is motivated by a question at \tex{} -- \latex Stack Exchange (\sty{plain}, \sty{abbrv}, \sty{unsrt}, \sty{alpha}) as closely as possible with \sty{biblatex}?}} \subsection{Requirements} -The usage of the styles requires the \sty{biblatex} package. -It is tested with the current version of \sty{biblatex} (at the time of writing that is 3.4). +The use of the styles requires the \sty{biblatex} package. +It is tested with the current version of \sty{biblatex} (at the time of writing that is 3.10). Care has been taken to retain backwards compatibility with older versions, but please do not expect the styles to work flawlessly with ancient versions of \sty{biblatex}. Note also that the style may fail silently with older versions, it need not necessarily emit noisy @@ -85,11 +85,11 @@ warnings or error messages, the output might just be wrong. Note that in recent versions of \sty{biblatex} the \bibtex backend has been degraded to the status of \enquote{fallback backend}. -Many features of this style will only work properly if you use the default Biber backend. +Some features of this style will only work properly if you use the default Biber backend. \subsection{License} -Copyright \textcopyright\ 2012--2015 Marco Daniel, 2016 Moritz Wemheuer. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.latex-project.org/lppl.txt} +Copyright \textcopyright\ 2012--2015 Marco Daniel, 2016--2018 Moritz Wemheuer. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.latex-project.org/lppl.txt} \subsection{Feedback}\label{subsec:int:feb} @@ -133,21 +133,26 @@ files handle those fields. \section{Revision History}\label{apx:log} \begin{changelog} +\begin{release}{0.4}{2018-02-02} +\item Fixed incorrect bibstring for chapters (\gitissuelink{32}) +\item Various small modifications +\end{release} + \begin{release}{0.3}{2016-06-26} -\item fix issues with new name formats in \sty{biblatex} versions $\geq$~3.3 (\gitissuelink{25}) -\item fix problems with the related mechanism (\gitissuelink{24}) -\item proper support for \bibtype{thesis}-types (\gitissuelink{23}) -\item modify \opt{maxalphanames}/\opt{minalphanames} and \cmd{labelalphaothers} in \sty{trad-alpha} to mirror \sty{alpha} more closely (\gitissuelink{22}) -\item use \bibfield{labelprefix} instead of \bibfield{prefixnumber} +\item Fix issues with new name formats in \sty{biblatex} versions $\geq$~3.3 (\gitissuelink{25}) +\item Fix problems with the related mechanism (\gitissuelink{24}) +\item Proper support for \bibtype{thesis}-types (\gitissuelink{23}) +\item Modify \opt{maxalphanames}/\opt{minalphanames} and \cmd{labelalphaothers} in \sty{trad-alpha} to mirror \sty{alpha} more closely (\gitissuelink{22}) +\item Use \bibfield{labelprefix} instead of \bibfield{prefixnumber} \end{release} \begin{release}{0.2}{2012-09-29} -\item fixed missing comma after journal name if journal name has a period -\item make titles sentence case -\item removed extra \emph{in} -\item removed extra \cmd{printfield} -\item fixed extra comma if \bibtype{article} doesn't have a year -\item use package \sty{libertine-type1} for documentation +\item Fixed missing comma after journal name if journal name has a period +\item Make titles sentence case +\item Removed extra \emph{in} +\item Removed extra \cmd{printfield} +\item Fixed extra comma if \bibtype{article} doesn't have a year +\item Use package \sty{libertine-type1} for documentation \end{release} \begin{release}{0.1}{2012-09-09} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.bbx index 76949ca278f..681e95f8cac 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.bbx @@ -5,39 +5,21 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-abbrv.bbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-abbrv.bbx}[2018/02/02 v0.4 biblatex-trad abbrv bibliography style] \RequireBibliographyStyle{trad-standard} \ExecuteBibliographyOptions{% - maxnames = 99 , % set the maximum number of authors + maxnames = 999 , % set the maximum number of authors sorting = nty , % sorting name - title - year dateabbrev = true , % short form of dates abbreviate = false , labelnumber= true , } -\@ifpackagelater{biblatex}{2016/03/01}{% - \@ifpackagelater{biblatex}{2016/05/14}{% - \DeclareNameFormat{abbrv}{% - \usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefixi} - {\namepartsuffixi}% - \usebibmacro{name:andothers}}} - {\DeclareNameFormat{abbrv}{% - \nameparts{#1}% - \usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefixi} - {\namepartsuffixi}% - \usebibmacro{name:andothers}}}} -{\DeclareNameFormat{abbrv}{% - \usebibmacro{name:first-last}{#1}{#4}{#6}{#8}% - \usebibmacro{name:andothers}}} -\DeclareNameAlias{default}{abbrv} +\@ifpackagelater{biblatex}{2016/03/01} + {\ExecuteBibliographyOptions{giveninits=true}} + {\ExecuteBibliographyOptions{firstinits=true}} \DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}} @@ -93,7 +75,7 @@ \entryset {\ifbool{bbx:subentry} {\printfield[bibentrysetcount]{entrysetcount}% - \setunit*{\addnbspace}} + \printunit*{\addnbspace}} {}} {}% \newunit\newblock diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.cbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.cbx index abe90797975..35510e55050 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-abbrv.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-abbrv.cbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-abbrv.cbx}[2018/02/02 v0.4 biblatex-trad abbrv citation style] \RequireCitationStyle{numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.bbx index f0aa9333dc9..fc1438777d2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.bbx @@ -5,12 +5,12 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-alpha.bbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-alpha.bbx}[2018/02/02 v0.4 biblatex-trad alpha bibliograhy style] \RequireBibliographyStyle{trad-standard} \ExecuteBibliographyOptions{% - maxnames = 99 , % set the maximum number of authors + maxnames = 999 , % set the maximum number of authors sorting = anyt , % sorting alphlabel-name-title year dateabbrev = false , % no short form of dates abbreviate = false , @@ -60,9 +60,7 @@ \setlength{\parsep}{\bibparsep}}% \renewcommand*{\makelabel}[1]{##1\hss}} {\endlist} - {\item}% - -} + {\item}} \defbibenvironment{shorthands} {\list @@ -80,7 +78,20 @@ \renewbibmacro*{crossref:label}{% \entrydata {\strfield{crossref}} - {\printtext[brackets]{% - {\printfield{labelalpha}\printfield{extraalpha}}}}} + {\printtext[labelalphawidth]{% + \printfield{labelprefix}% + \printfield{labelalpha}% + \printfield{extraalpha}}}} + +\DeclareBibliographyDriver{set}{% + \entryset + {\ifbool{bbx:subentry} + {\printfield[bibentrysetcount]{entrysetcount}% + \printunit*{\addnbspace}} + {}} + {}% + \newunit\newblock + \usebibmacro{setpageref}% + \finentry} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.cbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.cbx index 379b34bc9c6..791ceacea81 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-alpha.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-alpha.cbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-alpha.cbx}[2018/02/02 v0.4 biblatex-trad alpha citation style] \RequireCitationStyle{alphabetic} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.bbx index 531dfe4df02..756390d3598 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.bbx @@ -5,12 +5,12 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-plain.bbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-plain.bbx}[2018/02/02 v0.4 biblatex-trad plain bibliography style] \RequireBibliographyStyle{trad-standard} \ExecuteBibliographyOptions{% - maxnames = 99 , % set the maximum number of authors + maxnames = 999 , % set the maximum number of authors sorting = nty , % sorting name - title - year dateabbrev = false , % no short form of dates abbreviate = false , @@ -70,7 +70,7 @@ \entryset {\ifbool{bbx:subentry} {\printfield[bibentrysetcount]{entrysetcount}% - \setunit*{\addnbspace}} + \printunit*{\addnbspace}} {}} {}% \newunit\newblock diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.cbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.cbx index decd942ae5a..06e8c216e23 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-plain.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-plain.cbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-plain.cbx}[2018/02/02 v0.4 biblatex-trad plain citation style] \RequireCitationStyle{numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx index 5b5afcddf06..5f6a5ed36aa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx @@ -1,11 +1,11 @@ %% Copyright (c) 2012 -- 2015 Marco Daniel -%% 2016 -- Moritz Wemheuer +%% 2016 -- 2018 Moritz Wemheuer %% %% This package is released under the terms of the %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-standard.bbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-standard.bbx}[2018/02/02 v0.4 biblatex-trad base bibliography style] %==========================================% %==========================================% %==========================================% @@ -14,7 +14,7 @@ %==========================================% %==========================================% \providebool{bbx:subentry} -\DeclareBibliographyOption{subentry}[true]{% +\DeclareBibliographyOption[boolean]{subentry}[true]{% \setbool{bbx:subentry}{#1}} \newbool{bbxtrad:doisequal} \newbool{bbxtrad:eprintsequal} @@ -48,14 +48,15 @@ {title}{\mkbibemph{#1}} \DeclareFieldFormat*{number}{\mkbibparens{#1}} -\DeclareFieldFormat[book,incollection,inproceedings,proceedings]{number}{\biblstring{number}~#1} +\DeclareFieldFormat[book,incollection,inproceedings,proceedings] + {number}{\biblstring{number}~#1} \DeclareFieldFormat[techreport,report]{number}{#1} \DeclareFieldFormat{edition}{% \ifinteger{#1} {\mkbibordedition{#1}~\bibstring{edition}} {\MakeLowercase{#1}~\bibstring{edition}}} -\DeclareFieldFormat{chapter}{\bibstring{part}~#1} -\DeclareFieldFormat[article]{pages}{{#1}} +\DeclareFieldFormat{chapter}{\bibstring{chapter}~#1} +\DeclareFieldFormat[article]{pages}{#1} \DeclareFieldFormat[book,inproceedings,proceedings]{series}{\mkbibemph{#1}} \DeclareFieldFormat{journaltitle}{\mkbibemph{#1}\isdot} \DeclareFieldFormat{titlecase}{\MakeTitleCase{#1}} @@ -76,7 +77,7 @@ {#1} {\MakeSentenceCase{#1}}} -\newbibmacro*{in:}{% +\renewbibmacro*{in:}{% \printtext{% \bibstring{in}% \printunit{\intitlepunct}}} @@ -89,7 +90,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -126,7 +127,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{maintitle+title}% \newunit \printlist{language}% @@ -145,7 +146,9 @@ test {\iffieldundef{part}} and test {\iffieldundef{number}} - }{}{\newblock}% + } + {} + {\newblock}% \usebibmacro{publisher+location+date}% \newunit\newblock \usebibmacro{chapter+pages}% @@ -175,7 +178,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -197,7 +200,7 @@ \usebibmacro{series+number}% \newcommaunit\newblock \usebibmacro{chapter+pages}% - \setunit{\addperiod\space} + \newunit \usebibmacro{publisher+location+date}% \newunit\newblock \iftoggle{bbx:isbn} @@ -222,7 +225,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -232,11 +235,11 @@ \usebibmacro{in:}% \iffieldundef{crossref} {\usebibmacro{inproc:crossref:full}} - {\usebibmacro{crossref:label}} + {\usebibmacro{crossref:label}}% \usebibmacro{chapter+pages}% \iffieldundef{crossref} {\usebibmacro{inproc:crossref:extra}} - {\usebibmacro{inproc:crossref:conditional}} + {\usebibmacro{inproc:crossref:conditional}}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock @@ -250,7 +253,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -287,7 +290,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{editor+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{maintitle+title}% \newunit \printlist{language}% @@ -299,20 +302,18 @@ and test {\iffieldundef{eventyear}} }% - {}% - {% - \newunit\newblock - \usebibmacro{event+venue+date}% - \newunit\newblock - }% + {}% + {\newunit\newblock + \usebibmacro{event+venue+date}% + \newunit\newblock}% \usebibmacro{byeditor+others}% \newcommaunit \usebibmacro{book:series+number}% - \newcommaunit% + \newcommaunit \iffieldundef{maintitle}% - {\printfield{volumes}% - \newcommaunit}% - {}% + {\printfield{volumes}% + \newcommaunit} + {}% \newunit \printlist{location}% \newcommaunit @@ -321,7 +322,7 @@ \usebibmacro{date}% \newunit \printlist{organization}% - \newcommaunit* + \newcommaunit*% \printlist{publisher}% \newunit \usebibmacro{chapter+pages}% @@ -350,7 +351,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -388,7 +389,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -431,7 +432,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -466,7 +467,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -474,9 +475,9 @@ \usebibmacro{byauthor}% \newunit\newblock \printfield{howpublished}% - \newcommaunit* + \newcommaunit*% \printfield{note}% - \newcommaunit* + \newcommaunit*% \usebibmacro{location+date}% \newunit\newblock \iftoggle{bbx:url} @@ -499,21 +500,22 @@ %new-/redefinition of bibmacros \newbibmacro*{crossref:label}{% \usebibmacro{maintitle+booktitle:noemph}% - \setunit{\addspace} - \entrydata - {\strfield{crossref}} - {\printtext{\mkbibbrackets{\printfield{labelnumber}}}}} + \setunit{\addspace}% + \entrydata{\strfield{crossref}} + {\printtext[labelnumberwidth]{% + \printfield{prefixnumber}% + \printfield{labelnumber}}}} \newbibmacro*{maintitle+booktitle:noemph}{% \iffieldundef{maintitle} - {} - {\usebibmacro{maintitle:noemph}% - \newunit\newblock - \iffieldundef{volume} {} - {\printfield{volume}% - \printfield{part}% - \setunit{\addcolon\space}}}% + {\usebibmacro{maintitle:noemph}% + \newunit\newblock + \iffieldundef{volume} + {} + {\printfield{volume}% + \printfield{part}% + \setunit{\addcolon\space}}}% \usebibmacro{booktitle:noemph}% \newunit} @@ -523,12 +525,12 @@ and test {\iffieldundef{mainsubtitle}} }% - {}% - {\printtext{% - \printfield[titlecase]{maintitle}% - \setunit{\subtitlepunct}% - \printfield[titlecase]{mainsubtitle}}% - \newunit}% + {}% + {\printtext{% + \printfield[titlecase]{maintitle}% + \setunit{\subtitlepunct}% + \printfield[titlecase]{mainsubtitle}}% + \newunit}% \printfield{maintitleaddon}} \newbibmacro*{booktitle:noemph}{% @@ -537,12 +539,12 @@ and test {\iffieldundef{booksubtitle}} }% - {}% - {\printtext{% - \printfield[titlecase]{booktitle}% - \setunit{\subtitlepunct}% - \printfield[titlecase]{booksubtitle}}% - \newunit}% + {}% + {\printtext{% + \printfield[titlecase]{booktitle}% + \setunit{\subtitlepunct}% + \printfield[titlecase]{booksubtitle}}% + \newunit}% \printfield{booktitleaddon}} \newbibmacro*{inproc:crossref:full}{% @@ -557,30 +559,29 @@ and test {\ifnameundef{translator}} }% - {}% - {\usebibmacro{byeditor+others}\newcommaunit}% + {}% + {\usebibmacro{byeditor+others}\newcommaunit}% \usebibmacro{maintitle+booktitle}% \newunit \usebibmacro{event+venue+date}% \newcommaunit \iffieldundef{maintitle}% - {\printfield{volume}% - \printfield{part}% - \ifboolexpr{ - test {\iffieldundef{volume}} - and - test {\iffieldundef{part}} - }% + {\printfield{volume}% + \printfield{part}% + \ifboolexpr{ + test {\iffieldundef{volume}} + and + test {\iffieldundef{part}} + }% + {}% + {\setunit{\addspace\bibstring{ofseries}\addspace}}}% {}% - {\setunit{\addspace\bibstring{ofseries}\addspace}}}% - {}% \usebibmacro{series+number:emphcond}% - \newcommaunit% + \newcommaunit \iffieldundef{maintitle}% - {\printfield{volumes}% - \newcommaunit}% - {}% -} + {\printfield{volumes}% + \newcommaunit}% + {}} \newbibmacro*{inproc:crossref:extra}{% \newcommaunit @@ -589,14 +590,14 @@ \printfield{edition}% \newunit \printlist{organization}% - \newcommaunit* + \newcommaunit*% \printlist{publisher}% \newcommaunit \usebibmacro{date}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url} \newunit\newblock @@ -605,34 +606,34 @@ \usebibmacro{addendum+pubstate}} \newbibmacro*{inproc:crossref:conditional}{% - \entrydata*{\strfield{crossref}}{ + \entrydata*{\strfield{crossref}}{% \iffieldsequal{doi}{saveddoi} - {\global\booltrue{bbxtrad:doisequal}} - {\global\boolfalse{bbxtrad:doisequal}} + {\global\booltrue{bbxtrad:doisequal}} + {\global\boolfalse{bbxtrad:doisequal}} \iffieldsequal{eprint}{savedeprint} - {\global\booltrue{bbxtrad:eprintsequal}} - {\global\boolfalse{bbxtrad:eprintsequal}} + {\global\booltrue{bbxtrad:eprintsequal}} + {\global\boolfalse{bbxtrad:eprintsequal}} \iffieldsequal{url}{savedurl} - {\global\booltrue{bbxtrad:urlsequal}} - {\global\boolfalse{bbxtrad:urlsequal}} + {\global\booltrue{bbxtrad:urlsequal}} + {\global\boolfalse{bbxtrad:urlsequal}} \iffieldsequal{note}{savednote} - {\global\booltrue{bbxtrad:notesequal}} - {\global\boolfalse{bbxtrad:notesequal}} + {\global\booltrue{bbxtrad:notesequal}} + {\global\boolfalse{bbxtrad:notesequal}} \iffieldsequal{addendum}{savedaddendum} - {\global\booltrue{bbxtrad:addendumsequal}} - {\global\boolfalse{bbxtrad:addendumsequal}}} + {\global\booltrue{bbxtrad:addendumsequal}} + {\global\boolfalse{bbxtrad:addendumsequal}}} \newunit\newblock \iftoggle{bbx:doi} - {\ifbool{bbxtrad:doisequal}{}{\printfield{saveddoi}}} - {}% + {\ifbool{bbxtrad:doisequal}{}{\printfield{saveddoi}}} + {}% \newunit\newblock \iftoggle{bbx:eprint} - {\ifbool{bbxtrad:eprintsequal}{}{\usebibmacro{eprint}}} - {}% + {\ifbool{bbxtrad:eprintsequal}{}{\usebibmacro{eprint}}} + {}% \newunit\newblock \iftoggle{bbx:url} - {\ifbool{bbxtrad:urlsequal}{}{\usebibmacro{url+urldate}}} - {}% + {\ifbool{bbxtrad:urlsequal}{}{\usebibmacro{url+urldate}}} + {}% \newunit\newblock \ifbool{bbxtrad:notesequal}{}{\printfield{note}}% \newunit\newblock @@ -660,22 +661,20 @@ \printfield{number}% \setunit{\addcolon} \printfield{pages}% - \newcommaunit% - \printfield{eid}}% + \newcommaunit + \printfield{eid}} \renewbibmacro*{byeditor+others}{% \ifnameundef{editor} {} - {% - \printnames[byeditor]{editor}% - \setunit{\addcomma\space}% - \usebibmacro{editorlstr}% - \clearname{editor}% - \newunit}% + {\printnames[byeditor]{editor}% + \setunit{\addcomma\space}% + \usebibmacro{editorlstr}% + \clearname{editor}% + \newunit}% \usebibmacro{byeditorx}% - \usebibmacro{bytranslator+others} -} + \usebibmacro{bytranslator+others}} \newbibmacro*{editorlstr}{% @@ -684,8 +683,8 @@ or test {\ifandothers{editor}} }% - {\biblstring{editors}}% - {\biblstring{editor}}% + {\biblstring{editors}}% + {\biblstring{editor}}% } \renewbibmacro*{series+number}{% @@ -700,33 +699,33 @@ \ifboolexpr{ not test {\iffieldundef{volume}} }% - {\printfield{series}}% - {\ifboolexpr{ - test {\iffieldundef{volume}} - and - test {\iffieldundef{part}} - and - test {\iffieldundef{number}} - and - test {\ifentrytype{book}} + {\printfield{series}}% + {\ifboolexpr{ + test {\iffieldundef{volume}} + and + test {\iffieldundef{part}} + and + test {\iffieldundef{number}} + and + test {\ifentrytype{book}} }% - {\newunit\newblock}% - {}% - \printfield[noformat]{series}}% + {\newunit\newblock}% + {}% + \printfield[noformat]{series}}% \newunit} \newbibmacro*{book:series+number}{% \iffieldundef{maintitle}% - {\printfield{volume}% - \printfield{part}% - \ifboolexpr{ - test {\iffieldundef{volume}} - and - test {\iffieldundef{part}} - }% + {\printfield{volume}% + \printfield{part}% + \ifboolexpr{ + test {\iffieldundef{volume}} + and + test {\iffieldundef{part}} + }% + {}% + {\setunit{\addspace\bibstring{ofseries}\addspace}}}% {}% - {\setunit{\addspace\bibstring{ofseries}\addspace}}}% - {}% \usebibmacro{series+number:emphcond}% \newunit} @@ -739,37 +738,35 @@ \renewbibmacro*{publisher+location+date}{% \printlist{publisher}% - \newcommaunit* + \newcommaunit*% \printlist{location}% - \newcommaunit* + \newcommaunit*% \printfield{edition}% - \newcommaunit* + \newcommaunit*% \usebibmacro{date}% \newunit} \renewbibmacro*{institution+location+date}{% \printlist{institution}% - \newcommaunit* + \newcommaunit*% \printlist{location}% - \newcommaunit* + \newcommaunit*% \usebibmacro{date}% \newunit} \newbibmacro*{location+date+publisher}{% \printlist{location}% - \newcommaunit* + \newcommaunit*% \printfield{edition}% - \newcommaunit* + \newcommaunit*% \usebibmacro{date}% \newunit \printlist{publisher}} \newbibmacro*{issue+date-parens}{% - \iffieldundef{issue}% - {\usebibmacro{date}}% - {\printfield{issue}% - \newcommaunit*% - \usebibmacro{date}}% + \printfield{issue}% + \newcommaunit*% + \usebibmacro{date}% \newunit} diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.cbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.cbx index a6e97b168ca..a44f8ca399e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.cbx @@ -5,6 +5,6 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-standard.cbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-standard.cbx}[2018/02/02 v0.4 biblatex-trad base citation style] \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.bbx index ff736172061..b58651e3a55 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.bbx @@ -4,12 +4,12 @@ %% This package is released under the terms of the %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt -\ProvidesFile{trad-unsrt.bbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-unsrt.bbx}[2018/02/02 v0.4 biblatex-trad unsrt bibliography style] \RequireBibliographyStyle{trad-standard} \ExecuteBibliographyOptions{% - maxnames = 99 , % set the maximum number of authors + maxnames = 999 , % set the maximum number of authors sorting = none , % sorting none dateabbrev = false , % no short form of dates abbreviate = false , @@ -52,7 +52,7 @@ \entryset {\ifbool{bbx:subentry} {\printfield[bibentrysetcount]{entrysetcount}% - \setunit*{\addnbspace}} + \printunit*{\addnbspace}} {}} {}% \newunit\newblock diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.cbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.cbx index ebc1810bc9d..1275a1b9874 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-unsrt.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-unsrt.bbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-unsrt.bbx}[2018/02/02 v0.4 biblatex-trad unsrt citation style] \RequireCitationStyle{numeric} |