diff options
author | Karl Berry <karl@freefriends.org> | 2016-07-09 22:06:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-07-09 22:06:46 +0000 |
commit | 5af25bafb7113aeac5878b6d479fcd5a7a8afc1f (patch) | |
tree | 6498a27085d58577336a1b2465bb3ce27c145d1f /Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx | |
parent | 06dfd0dc9ed518e23ce205cd3c37c30a70b65549 (diff) |
biblatex-abnt (9jul16)
git-svn-id: svn://tug.org/texlive/trunk@41668 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx | 68 |
1 files changed, 44 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx index 354c90b17d5..8ef713054ee 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx @@ -12,7 +12,9 @@ %% %% The Current Maintainer of this work is Daniel B. Marques. -\ProvidesFile{abnt.bbx}[2016/05/12\space v1.0.1\space ABNT biblatex citation style]% +\ProvidesFile{abnt.bbx}% +[2016/07/06\space v2.0\space ABNT biblatex citation style]% + \RequireBiber[3]% \DeclareLanguageMapping{brazilian}{abnt-brazilian}% @@ -62,19 +64,25 @@ \settoggle{nosl}{#1}% \settoggle{nosn}{#1}}% -% This is the dashed option from authorstyle.bbx, -% I changed it's name and made it default. \newtoggle{repeatfields}% \DeclareBibliographyOption[boolean]{repeatfields}[true]{% \settoggle{repeatfields}{#1}% - \ifstrequal{#1}{true}% - {\renewbibmacro*{bbx:savehash}{}% - \renewbibmacro*{saveorghash}{}}% - {\ExecuteBibliographyOptions{pagetracker}% - \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}% - \renewbibmacro*{saveorghash}{\savelist{organization}{\bbx@lasthash}}}}% + \ifstrequal{#1}{true}{% + \renewbibmacro*{bbx:savehash}{}% + \newbibmacro*{bbx:saveorg}{}% + \newbibmacro*{bbx:savetitle}{}% + \newbibmacro*{bbx:savesubtitle}{}% + }{% + \ExecuteBibliographyOptions{pagetracker}% + \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}% + \newbibmacro*{bbx:saveorg}{\savelist{organization}{\bbx@lasthash}}% + \newbibmacro*{bbx:savetitle}{\savefield{title}{\bbx@lasttitle}}% + \newbibmacro*{bbx:savesubtitle}{\savefield{subtitle}{\bbx@lastsubtitle}}% + }% +}% \DeclareEntryOption[boolean]{repeatfields}[true]{% - \settoggle{repeatfields}{#1}}% + \settoggle{repeatfields}{#1}% +}% % Option to use the original dashes instead of underscores. \DeclareBibliographyOption[boolean]{usedashes}[true]{% @@ -263,7 +271,6 @@ % ---------- \DeclareNameFormat{LAST-first}{% - \nameparts{#1}% \ifgiveninits{% \usebibmacro{name:family-given}{% \iftoggle{scbib}{% @@ -291,7 +298,6 @@ }% \DeclareNameFormat{full}{% - \nameparts{#1}% \usebibmacro{name:given-family}% {\namepartfamily}% {\namepartgiven}% @@ -326,6 +332,9 @@ \DeclareFieldFormat{citetitle}{\iftoggle{bftitles}{\addspace\mkbibbold{#1}\isdot}{\addspace\mkbibemph{#1}\isdot}}% \DeclareFieldFormat*{title}{\iftoggle{bftitles}{\addspace\mkbibbold{#1}\isdot}{\addspace\mkbibemph{#1}\isdot}}% +\DeclareFieldFormat{authortype}{\bibsentence#1} +\DeclareFieldFormat{editortype}{\bibsentence#1} + % Use normal text for the title in these entries. \DeclareFieldFormat% [article, inbook, incollection, bookinbook, inproceedings, unpublished]% @@ -756,7 +765,7 @@ }{% \usebibmacro{bbx:savehash}% \printnames{editor}% - \setunit{\addperiod\addspace}% + \setunit{\addspace}% \printtext[parens]{\usebibmacro{editor+othersstrg}}% }% \savenamecs*{editor}{saveded}% @@ -774,7 +783,7 @@ \printlist[uppercase]{organization}% }{% \printnames{editor}% - \setunit*{\addperiod\addspace}% + \setunit*{\addspace}% \printtext[parens]{\usebibmacro{editor+othersstrg}}% \clearname{editor}% }% @@ -787,7 +796,7 @@ \printlist[uppercase]{organization}% \clearlist{organization}% }{% - \printname{editor}% + \printnames{editor}% }% }{% \printfield[uppercase]{eventtitle}% @@ -846,7 +855,7 @@ \newbibmacro*{language}{% \ifboolexpr{% test {\iflistundef{language}}% - and% + or% test {\iffieldundef{origlanguage}}% }% {}% @@ -1628,15 +1637,26 @@ \DeclareBibliographyDriver{patent}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \iflistundef{organization}% - {\usebibmacro{author/editor+others}% - \clearnames{author}}% - {\usebibmacro{organization}}% + \ifnameundef{holder}{% + \iflistundef{organization}{% + \usebibmacro{author/editor+others}% + }{% + \usebibmacro{organization} + \ifnameundef{author}{% + \printnames[given-family]{editor}% + }{% + \printnames[given-family]{author} + }% + } + }{% + \printnames{holder} + \ifnameundef{author}{% + \printnames[given-family]{editor}% + }{% + \printnames[given-family]{author} + }% + } \setunit{\labelnamepunct}\newblock% - \ifnameundef{author}% - {\printnames[given-family]{editor}}% - {\printnames[given-family]{author}}% - \newunit% \usebibmacro{title}% \newunit% \printlist{language}% |