From 231eb9463d69c7599cff27b3ca0ba09388521e5c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 29 Jul 2017 21:39:35 +0000 Subject: biblatex-abnt (29jul17) git-svn-id: svn://tug.org/texlive/trunk@44915 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-abnt/abnt-brazilian.lbx | 321 ++++----- .../tex/latex/biblatex-abnt/abnt-english.lbx | 184 +++++ .../tex/latex/biblatex-abnt/abnt-ibid.bbx | 2 +- .../tex/latex/biblatex-abnt/abnt-ibid.cbx | 5 +- .../tex/latex/biblatex-abnt/abnt-numeric.bbx | 2 +- .../tex/latex/biblatex-abnt/abnt-numeric.cbx | 2 +- .../tex/latex/biblatex-abnt/abnt-spanish.lbx | 339 +++++++++ Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx | 757 ++++++++++++++------- Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx | 21 +- 9 files changed, 1233 insertions(+), 400 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-abnt/abnt-english.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-abnt/abnt-spanish.lbx (limited to 'Master/texmf-dist/tex/latex/biblatex-abnt') diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx index 2249ed5f9af..e810b56374f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx @@ -12,13 +12,14 @@ %% %% The Current Maintainer of this work is Daniel B. Marques. -\ProvidesFile{abnt.lbx}% -[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]% +\ProvidesFile{abnt-brazilian.lbx}% +[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]% % Init >>> \InheritBibliographyExtras{brazilian}% +\InheritBibliographyStrings{brazilian} \DeclareBibliographyStrings{% inherit = {brazil},% }% @@ -60,25 +61,25 @@ idem = {{idem}{id\adddot}},% volume = {{volume}{v\adddot}},% volumes = {{volumes}{v\adddot}},% - number = {{número}{n\adddot}},% - pages = {{páginas}{p\adddot}},% + number = {{n\'umero}{n\adddot}},% + pages = {{p\'aginas}{p\adddot}},% involumes = {{in}{in}},% in = {{in}{in}},% inseries = {{in}{in}},% sineloco = {{sine loco}{s\adddot l\adddot}},% sinenomine = {{sine nomine}{s\adddot n\adddot}},% - url = {{disponível em}{disponível em}},% + urlfrom = {{dispon\'ivel em}{dispon\'ivel em}},% urlseen = {{acesso em}{acesso em}},% sheet = {{folha}{f\adddot}},% sheets = {{folhas}{f\adddot}},% - backrefpage = {{citado na página}{citado na p\adddot}},% - backrefpages = {{citado nas páginas}{citado nas pp\adddot}},% + backrefpage = {{citado na p\'agina}{citado na p\adddot}},% + backrefpages = {{citado nas p\'aginas}{citado nas pp\adddot}},% illustrated = {{ilustrado}{il\adddot}},% monography = {{monografia}{monografia}},% phdthesis = {{Tese (Doutorado)}{Tese (Doutorado)}},% - mathesis = {{Dissertação (Mestrado)}{Diss. (Mestrado)}},% + mathesis = {{Disserta\c{c}\~ao (Mestrado)}{Diss. (Mestrado)}},% reprintfrom = {{separata de}{separata de}},% - recensionof = {{recensão de}{recensão de}},% + recensionof = {{recens\~ao de}{recens\~ao de}},% reviewof = {{resenha de}{resenha de}},% }% @@ -87,44 +88,44 @@ % Languages >>>1 \DeclareBibliographyStrings{% - langamerican = {{versão americana}{versão americana}},% - langbrazilian = {{versão brasileira}{versão brasileira}},% - langcatalan = {{versão catalã}{versão catalã}},% - langcroatian = {{versão croata}{versão croata}},% - langczech = {{versão tcheca}{versão tcheca}},% - langdanish = {{versão dinamarquesa}{versão dinamarquesa}},% - langdutch = {{versão holandesa}{versão holandesa}},% - langenglish = {{versão inglesa}{versão inglesa}},% - langfinnish = {{versão finlandesa}{versão finlandesa}},% - langfrench = {{versão francesa}{versão francesa}},% - langgerman = {{versão alemã}{versão alemã}},% - langgreek = {{versão grega}{versão grega}},% - langitalian = {{versão italiana}{versão italiana}},% - langlatin = {{versão latina}{versão latina}},% - langnorwegian = {{versão norueguesa}{versão norueguesa}},% - langpolish = {{versão polonesa}{versão polonesa}},% - langportuguese = {{versão portuguesa}{versão portuguesa}},% - langrussian = {{versão russa}{versão russa}},% - langslovene = {{versão eslovena}{versão eslovena}},% - langspanish = {{versão espanhola}{versão espanhola}},% - langswedish = {{versão sueca}{versão sueca}},% - fromamerican = {{do original inglês}{do original inglês}},% - frombrazilian = {{do original português}{do original português}},% - fromcatalan = {{do original catalão}{do original catalão}},% + langamerican = {{vers\~ao americana}{vers\~ao americana}},% + langbrazilian = {{vers\~ao brasileira}{vers\~ao brasileira}},% + langcatalan = {{vers\~ao catal\~a}{vers\~ao catal\~a}},% + langcroatian = {{vers\~ao croata}{vers\~ao croata}},% + langczech = {{vers\~ao tcheca}{vers\~ao tcheca}},% + langdanish = {{vers\~ao dinamarquesa}{vers\~ao dinamarquesa}},% + langdutch = {{vers\~ao holandesa}{vers\~ao holandesa}},% + langenglish = {{vers\~ao inglesa}{vers\~ao inglesa}},% + langfinnish = {{vers\~ao finlandesa}{vers\~ao finlandesa}},% + langfrench = {{vers\~ao francesa}{vers\~ao francesa}},% + langgerman = {{vers\~ao alem\~a}{vers\~ao alem\~a}},% + langgreek = {{vers\~ao grega}{vers\~ao grega}},% + langitalian = {{vers\~ao italiana}{vers\~ao italiana}},% + langlatin = {{vers\~ao latina}{vers\~ao latina}},% + langnorwegian = {{vers\~ao norueguesa}{vers\~ao norueguesa}},% + langpolish = {{vers\~ao polonesa}{vers\~ao polonesa}},% + langportuguese = {{vers\~ao portuguesa}{vers\~ao portuguesa}},% + langrussian = {{vers\~ao russa}{vers\~ao russa}},% + langslovene = {{vers\~ao eslovena}{vers\~ao eslovena}},% + langspanish = {{vers\~ao espanhola}{vers\~ao espanhola}},% + langswedish = {{vers\~ao sueca}{vers\~ao sueca}},% + fromamerican = {{do original ingl\^es}{do original ingl\^es}},% + frombrazilian = {{do original portugu\^es}{do original portugu\^es}},% + fromcatalan = {{do original catal\~ao}{do original catal\~ao}},% fromcroatian = {{do original croata}{do original croata}},% fromczech = {{do original tcheco}{do original tcheco}},% - fromdanish = {{do original dinamarquês}{do original dinamarquês}},% - fromdutch = {{do original holandês}{do original holandês}},% - fromenglish = {{do original inglês}{do original inglês}},% - fromfinnish = {{do original finlandês}{do original finlandês}},% - fromfrench = {{do original francês}{do original francês}},% - fromgerman = {{do original alemão}{do original alemão}},% + fromdanish = {{do original dinamarqu\^es}{do original dinamarqu\^es}},% + fromdutch = {{do original holand\^es}{do original holand\^es}},% + fromenglish = {{do original ingl\^es}{do original ingl\^es}},% + fromfinnish = {{do original finland\^es}{do original finland\^es}},% + fromfrench = {{do original franc\^es}{do original franc\^es}},% + fromgerman = {{do original alem\~ao}{do original alem\~ao}},% fromgreek = {{do original grego}{do original grego}},% fromitalian = {{do original italiano}{do original italiano}},% fromlatin = {{do original em latim}{do original em latim}},% - fromnorwegian = {{do original norueguês}{do original norueguês}},% - frompolish = {{do original polonês}{do original polonês}},% - fromportuguese = {{do original português}{do original português}},% + fromnorwegian = {{do original noruegu\^es}{do original noruegu\^es}},% + frompolish = {{do original polon\^es}{do original polon\^es}},% + fromportuguese = {{do original portugu\^es}{do original portugu\^es}},% fromrussian = {{do original russo}{do original russo}},% fromslovene = {{do original esloveno}{do original esloveno}},% fromspanish = {{do original espanhol}{do original espanhol}},% @@ -159,11 +160,11 @@ % Roles expressed as objects >>>1 \DeclareBibliographyStrings{% - withcommentator = {{comentário\addcolon}{comentário\addcolon}},% + withcommentator = {{coment\'ario\addcolon}{coment\'ario\addcolon}},% withannotator = {{notas\addcolon}{notas\addcolon}},% - withintroduction = {{introdução\addcolon}{introdução\addcolon}},% - withforeword = {{prefácio\addcolon}{prefácio\addcolon}},% - withafterword = {{posfácio\addcolon}{posfácio\addcolon}},% + withintroduction = {{introdu\c{c}\~ao\addcolon}{introdu\c{c}\~ao\addcolon}},% + withforeword = {{pref\'acio\addcolon}{pref\'acio\addcolon}},% + withafterword = {{posf\'acio\addcolon}{posf\'acio\addcolon}},% }% % <<< @@ -194,138 +195,138 @@ }% <<< \DeclareBibliographyStrings{% >>>2 - bycoeditor = {{co-edição\addcolon}% - {co-edição\addcolon}},% - bydirector = {{direção\addcolon}% - {direção\addcolon}},% - bygendir = {{direção geral\addcolon}% - {direção geral\addcolon}},% - bycoordinator = {{coordenação\addcolon}% - {coordenação\addcolon}},% - byproducer = {{produção\addcolon}% - {produção\addcolon}},% + bycoeditor = {{co-edi\c{c}\~ao\addcolon}% + {co-edi\c{c}\~ao\addcolon}},% + bydirector = {{dire\c{c}\~ao\addcolon}% + {dire\c{c}\~ao\addcolon}},% + bygendir = {{dire\c{c}\~ao geral\addcolon}% + {dire\c{c}\~ao geral\addcolon}},% + bycoordinator = {{coordena\c{c}\~ao\addcolon}% + {coordena\c{c}\~ao\addcolon}},% + byproducer = {{produ\c{c}\~ao\addcolon}% + {produ\c{c}\~ao\addcolon}},% byscreenwriter = {{roteiro\addcolon}% {roteiro\addcolon}},% - byinterpreter = {{interpretação\addcolon}% - {interpretação\addcolon}},% - byillustrator = {{ilustrações\addcolon}% - {ilustrações\addcolon}},% - byorganizer = {{organização\addcolon}% - {organização\addcolon}},% - bytechrev = {{revisão técnica\addcolon}% - {revisão técnica\addcolon}},% - byartdir = {{direção artística\addcolon}% - {direção artística\addcolon}},% + byinterpreter = {{interpreta\c{c}\~ao\addcolon}% + {interpreta\c{c}\~ao\addcolon}},% + byillustrator = {{ilustra\c{c}\~oes\addcolon}% + {ilustra\c{c}\~oes\addcolon}},% + byorganizer = {{organiza\c{c}\~ao\addcolon}% + {organiza\c{c}\~ao\addcolon}},% + bytechrev = {{revis\~ao t\'ecnica\addcolon}% + {revis\~ao t\'ecnica\addcolon}},% + byartdir = {{dire\c{c}\~ao art\'istica\addcolon}% + {dire\c{c}\~ao art\'istica\addcolon}},% byinterviewer = {{entrevista por}% {entrevista por}},% - byrecorder = {{gravação\addcolon}% - {gravação\addcolon}},% + byrecorder = {{grava\c{c}\~ao\addcolon}% + {grava\c{c}\~ao\addcolon}},% byphotographer = {{fotografia\addcolon}% {fotografia\addcolon}},% - bygenorg = {{organização geral\addcolon}% - {organização geral\addcolon}},% + bygenorg = {{organiza\c{c}\~ao geral\addcolon}% + {organiza\c{c}\~ao geral\addcolon}},% byauthor = {{por}% {por}},% - byeditor = {{edição\addcolon}% - {edição\addcolon}},% - bycompiler = {{compilação\addcolon}% - {compilação\addcolon}},% + byeditor = {{edi\c{c}\~ao\addcolon}% + {edi\c{c}\~ao\addcolon}},% + bycompiler = {{compila\c{c}\~ao\addcolon}% + {compila\c{c}\~ao\addcolon}},% byredactor = {{redigido por}% {redigido por}},% - byreviser = {{revisão\addcolon}% - {revisão\addcolon}},% - bytechrev = {{revisão técnica\addcolon}% - {revisão técnica\addcolon}},% + byreviser = {{revis\~ao\addcolon}% + {revis\~ao\addcolon}},% + bytechrev = {{revis\~ao t\'ecnica\addcolon}% + {revis\~ao t\'ecnica\addcolon}},% byreviewer = {{resenha\addcolon}% {resenha\addcolon}},% byfounder = {{fundado por}% {fundado por}},% bycontinuator = {{continuado por}% {continuado por}},% - bycollaborator = {{em colaboração com}% - {em colaboração com}},% - bytranslator = {{tradução\addcolon}% - {tradução\addcolon}},% - bycommentator = {{comentário\addcolon}% - {comentário\addcolon}},% + bycollaborator = {{em colabora\c{c}\~ao com}% + {em colabora\c{c}\~ao com}},% + bytranslator = {{tradu\c{c}\~ao\addcolon}% + {tradu\c{c}\~ao\addcolon}},% + bycommentator = {{coment\'ario\addcolon}% + {coment\'ario\addcolon}},% byannotator = {{notas\addcolon}% {notas\addcolon}},% - byupdateran = {{atualização e notas\addcolon}% - {atualização e notas\addcolon}},% - byupdater = {{atualização\addcolon}% - {atualização\addcolon}},% - byorganizerfo = {{organização e prefácio\addcolon}% - {organização e prefácio\addcolon}},% - bygenorgfo = {{organização geral e prefácio\addcolon}% - {organização geral e prefácio\addcolon}},% - byeditortr = {{edição e tradução\addcolon}% - {edição e tradução\addcolon}},% - byeditorco = {{edição e comentário\addcolon}% - {edição e comentário\addcolon}},% - byeditoran = {{edição e notas\addcolon}% - {edição e notas\addcolon}},% - byeditorin = {{edição e introdução\addcolon}% - {edição e introdução\addcolon}},% - byeditorfo = {{edição e prefácio\addcolon}% - {edição e prefácio\addcolon}},% - byeditoraf = {{edição e posfácio\addcolon}% - {edição e posfácio\addcolon}},% - byeditortrco = {{edição, tradução e comentário\addcolon}% - {edição, tradução e comentário\addcolon}},% - byeditortran = {{edição, tradução e notas\addcolon}% - {edição, tradução e notas\addcolon}},% - byeditortrin = {{edição, tradução e introdução\addcolon}% - {edição, tradução e introdução\addcolon}},% - byeditortrfo = {{edição, tradução e prefácio\addcolon}% - {edição, tradução e prefácio\addcolon}},% - byeditortraf = {{edição, tradução e posfácio\addcolon}% - {edição, tradução e posfácio\addcolon}},% - byeditorcoin = {{edição, comentário e introdução\addcolon}% - {edição, comentário e introdução\addcolon}},% - byeditorcofo = {{edição, comentário e prefácio\addcolon}% - {edição, comentário e prefácio\addcolon}},% - byeditorcoaf = {{edição, comentário e posfácio\addcolon}% - {edição, comentário e posfácio\addcolon}},% - byeditoranin = {{edição, introdução e notas\addcolon}% - {edição, introdução e notas\addcolon}},% - byeditoranfo = {{edição, prefácio e notas\addcolon}% - {edição, prefácio e notas\addcolon}},% - byeditoranaf = {{edição, posfácio e notas\addcolon}% - {edição, posfácio e notas\addcolon}},% - byeditortrcoin = {{edição, tradução, comentário e introdução\addcolon}% - {edição, tradução, comentário e introdução\addcolon}},% - byeditortrcofo = {{edição, tradução, comentário e prefácio\addcolon}% - {edição, tradução, comentário e prefácio\addcolon}},% - byeditortrcoaf = {{edição, tradução, comentário e posfácio\addcolon}% - {edição, tradução, comentário e posfácio\addcolon}},% - byeditortranin = {{edição, tradução, notas e introdução\addcolon}% - {edição, tradução, notas e introdução\addcolon}},% - byeditortranfo = {{edição, tradução, notas e prefácio\addcolon}% - {edição, tradução, notas e prefácio\addcolon}},% - byeditortranaf = {{edição, tradução, notas e posfácio\addcolon}% - {edição, tradução, notas e posfácio\addcolon}},% - bytranslatorco = {{tradução e comentário\addcolon}% - {tradução e comentário\addcolon}},% - bytranslatoran = {{tradução e notas\addcolon}% - {tradução e notas\addcolon}},% - bytranslatorin = {{tradução e introdução\addcolon}% - {tradução e introdução\addcolon}},% - bytranslatorfo = {{tradução e prefácio\addcolon}% - {tradução e prefácio\addcolon}},% - bytranslatoraf = {{tradução e posfácio\addcolon}% - {tradução e posfácio\addcolon}},% - bytranslatorcoin = {{tradução, comentário e introdução\addcolon}% - {tradução, comentário e introdução\addcolon}},% - bytranslatorcofo = {{tradução, comentário e prefácio\addcolon}% - {tradução, comentário e prefácio\addcolon}},% - bytranslatorcoaf = {{tradução, comentário e posfácio\addcolon}% - {tradução, comentário e posfácio\addcolon}},% - bytranslatoranin = {{tradução, notas e introdução\addcolon}% - {tradução, notas e introdução\addcolon}},% - bytranslatoranfo = {{tradução, notas e prefácio\addcolon}% - {tradução, notas e prefácio\addcolon}},% - bytranslatoranaf = {{tradução, notas e posfácio\addcolon}% - {tradução, notas e posfácio\addcolon}},% + byupdateran = {{atualiza\c{c}\~ao e notas\addcolon}% + {atualiza\c{c}\~ao e notas\addcolon}},% + byupdater = {{atualiza\c{c}\~ao\addcolon}% + {atualiza\c{c}\~ao\addcolon}},% + byorganizerfo = {{organiza\c{c}\~ao e pref\'acio\addcolon}% + {organiza\c{c}\~ao e pref\'acio\addcolon}},% + bygenorgfo = {{organiza\c{c}\~ao geral e pref\'acio\addcolon}% + {organiza\c{c}\~ao geral e pref\'acio\addcolon}},% + byeditortr = {{edi\c{c}\~ao e tradu\c{c}\~ao\addcolon}% + {edi\c{c}\~ao e tradu\c{c}\~ao\addcolon}},% + byeditorco = {{edi\c{c}\~ao e coment\'ario\addcolon}% + {edi\c{c}\~ao e coment\'ario\addcolon}},% + byeditoran = {{edi\c{c}\~ao e notas\addcolon}% + {edi\c{c}\~ao e notas\addcolon}},% + byeditorin = {{edi\c{c}\~ao e introdu\c{c}\~ao\addcolon}% + {edi\c{c}\~ao e introdu\c{c}\~ao\addcolon}},% + byeditorfo = {{edi\c{c}\~ao e pref\'acio\addcolon}% + {edi\c{c}\~ao e pref\'acio\addcolon}},% + byeditoraf = {{edi\c{c}\~ao e posf\'acio\addcolon}% + {edi\c{c}\~ao e posf\'acio\addcolon}},% + byeditortrco = {{edi\c{c}\~ao, tradu\c{c}\~ao e coment\'ario\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao e coment\'ario\addcolon}},% + byeditortran = {{edi\c{c}\~ao, tradu\c{c}\~ao e notas\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao e notas\addcolon}},% + byeditortrin = {{edi\c{c}\~ao, tradu\c{c}\~ao e introdu\c{c}\~ao\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao e introdu\c{c}\~ao\addcolon}},% + byeditortrfo = {{edi\c{c}\~ao, tradu\c{c}\~ao e pref\'acio\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao e pref\'acio\addcolon}},% + byeditortraf = {{edi\c{c}\~ao, tradu\c{c}\~ao e posf\'acio\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao e posf\'acio\addcolon}},% + byeditorcoin = {{edi\c{c}\~ao, coment\'ario e introdu\c{c}\~ao\addcolon}% + {edi\c{c}\~ao, coment\'ario e introdu\c{c}\~ao\addcolon}},% + byeditorcofo = {{edi\c{c}\~ao, coment\'ario e pref\'acio\addcolon}% + {edi\c{c}\~ao, coment\'ario e pref\'acio\addcolon}},% + byeditorcoaf = {{edi\c{c}\~ao, coment\'ario e posf\'acio\addcolon}% + {edi\c{c}\~ao, coment\'ario e posf\'acio\addcolon}},% + byeditoranin = {{edi\c{c}\~ao, introdu\c{c}\~ao e notas\addcolon}% + {edi\c{c}\~ao, introdu\c{c}\~ao e notas\addcolon}},% + byeditoranfo = {{edi\c{c}\~ao, pref\'acio e notas\addcolon}% + {edi\c{c}\~ao, pref\'acio e notas\addcolon}},% + byeditoranaf = {{edi\c{c}\~ao, posf\'acio e notas\addcolon}% + {edi\c{c}\~ao, posf\'acio e notas\addcolon}},% + byeditortrcoin = {{edi\c{c}\~ao, tradu\c{c}\~ao, coment\'ario e introdu\c{c}\~ao\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao, coment\'ario e introdu\c{c}\~ao\addcolon}},% + byeditortrcofo = {{edi\c{c}\~ao, tradu\c{c}\~ao, coment\'ario e pref\'acio\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao, coment\'ario e pref\'acio\addcolon}},% + byeditortrcoaf = {{edi\c{c}\~ao, tradu\c{c}\~ao, coment\'ario e posf\'acio\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao, coment\'ario e posf\'acio\addcolon}},% + byeditortranin = {{edi\c{c}\~ao, tradu\c{c}\~ao, notas e introdu\c{c}\~ao\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao, notas e introdu\c{c}\~ao\addcolon}},% + byeditortranfo = {{edi\c{c}\~ao, tradu\c{c}\~ao, notas e pref\'acio\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao, notas e pref\'acio\addcolon}},% + byeditortranaf = {{edi\c{c}\~ao, tradu\c{c}\~ao, notas e posf\'acio\addcolon}% + {edi\c{c}\~ao, tradu\c{c}\~ao, notas e posf\'acio\addcolon}},% + bytranslatorco = {{tradu\c{c}\~ao e coment\'ario\addcolon}% + {tradu\c{c}\~ao e coment\'ario\addcolon}},% + bytranslatoran = {{tradu\c{c}\~ao e notas\addcolon}% + {tradu\c{c}\~ao e notas\addcolon}},% + bytranslatorin = {{tradu\c{c}\~ao e introdu\c{c}\~ao\addcolon}% + {tradu\c{c}\~ao e introdu\c{c}\~ao\addcolon}},% + bytranslatorfo = {{tradu\c{c}\~ao e pref\'acio\addcolon}% + {tradu\c{c}\~ao e pref\'acio\addcolon}},% + bytranslatoraf = {{tradu\c{c}\~ao e posf\'acio\addcolon}% + {tradu\c{c}\~ao e posf\'acio\addcolon}},% + bytranslatorcoin = {{tradu\c{c}\~ao, coment\'ario e introdu\c{c}\~ao\addcolon}% + {tradu\c{c}\~ao, coment\'ario e introdu\c{c}\~ao\addcolon}},% + bytranslatorcofo = {{tradu\c{c}\~ao, coment\'ario e pref\'acio\addcolon}% + {tradu\c{c}\~ao, coment\'ario e pref\'acio\addcolon}},% + bytranslatorcoaf = {{tradu\c{c}\~ao, coment\'ario e posf\'acio\addcolon}% + {tradu\c{c}\~ao, coment\'ario e posf\'acio\addcolon}},% + bytranslatoranin = {{tradu\c{c}\~ao, notas e introdu\c{c}\~ao\addcolon}% + {tradu\c{c}\~ao, notas e introdu\c{c}\~ao\addcolon}},% + bytranslatoranfo = {{tradu\c{c}\~ao, notas e pref\'acio\addcolon}% + {tradu\c{c}\~ao, notas e pref\'acio\addcolon}},% + bytranslatoranaf = {{tradu\c{c}\~ao, notas e posf\'acio\addcolon}% + {tradu\c{c}\~ao, notas e posf\'acio\addcolon}},% }% <<< % <<< diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-english.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-english.lbx new file mode 100644 index 00000000000..5c5d32f9f81 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-english.lbx @@ -0,0 +1,184 @@ +%% Copyright 2016 Daniel B. Marques +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Daniel B. Marques. +%% +%% Tradução para o espanhol de Juan-Ernesto Sepúlveda. Obrigado! + +\ProvidesFile{abnt-english.lbx}% +[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]% + + +% Init >>> + +\InheritBibliographyExtras{english}% +\InheritBibliographyStrings{english} +\DeclareBibliographyStrings{% + inherit = {english},% +}% + +% <<< + +% No preposition between month and year >>>1 + +\DeclareBibliographyExtras{% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}% + \iffieldundef{#2}{}{\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\addspace}}% + \thefield{#1}}% +}% + +% <<< + +% Publication details >>>1 + +\NewBibliographyString{% + apud,% + sineloco,% + sinenomine,% + sheet,% + sheets,% + illustrated,% + monography,% + recensionof,% +}% + +\DeclareBibliographyStrings{% + apud = {{apud}{apud}},% + idem = {{idem}{id\adddot}},% + volume = {{volume}{v\adddot}},% + volumes = {{volumes}{v\adddot}},% + number = {{number}{n\adddot}},% + pages = {{pages}{p\adddot}},% + involumes = {{in}{in}},% + in = {{in}{in}},% + inseries = {{in}{in}},% + sineloco = {{sine loco}{s\adddot l\adddot}},% + sinenomine = {{sine nomine}{s\adddot n\adddot}},% + sheet = {{sheet}{s\adddot}},% + sheets = {{sheets}{s\adddot}},% + illustrated = {{illustrated}{il\adddot}},% + monography = {{monography}{monography}},% + recensionof = {{recension of}{recension of}},% + reviewof = {{review of}{review of}},% +}% + +% <<< + +% Roles expressed as functions >>>1 + +\NewBibliographyString{% + organizer,% + organizers,% + coordinator,% + coordinators,% +}% + +\DeclareBibliographyStrings{% + organizer = {{organizer}{org\adddot}},% + organizers = {{organizers}{org\adddot}},% + coordinator = {{coordinator}{coord\adddot}},% + coordinators = {{coordinators}{coord\adddot}},% +}% + +% <<< + +% Roles expressed as objects >>>1 + +\DeclareBibliographyStrings{% + withcommentator = {{commentary\addcolon}{commentary\addcolon}},% + withannotator = {{notes\addcolon}{notes\addcolon}},% + withintroduction = {{introduction\addcolon}{introduction\addcolon}},% + withforeword = {{foreword\addcolon}{foreword\addcolon}},% + withafterword = {{afterword\addcolon}{afterword\addcolon}},% +}% + +% <<< + +% Roles expressed as actions >>>1 + +\NewBibliographyString{% >>>2 + byorganizer,% + byorganizerfo,% + bytechrev,% + byupdater,% + byupdateran,% + byphotographer,% + byartdir,% + byrecorder,% + byinterviewer,% + bygenorg,% + bygenorgfo,% + bycoordinator,% + bycoeditor,% + bydirector,% + bygendir,% + byproducer,% + byscreenwriter,% + byinterpreter,% + byillustrator,% + bytechrev,% +}% <<< + +\DeclareBibliographyStrings{% >>>2 + byorganizer = {{organized by\addcolon}% + {organized by\addcolon}},% + byorganizerfo = {{organized, with a foreword, by\addcolon}% + {organized, with a foreword, by\addcolon}},% + bytechrev = {{technical revision by\addcolon}% + {technical revision by\addcolon}},% + byupdater = {{updated by\addcolon}% + {updated by\addcolon}},% + byupdateran = {{updated and annotated by\addcolon}% + {updated and annotated by\addcolon}},% + byphotographer = {{photography by\addcolon}% + {photography by\addcolon}},% + byartdir = {{art direction by\addcolon}% + {art direction by\addcolon}},% + byrecorder = {{recorded by\addcolon}% + {recorded by\addcolon}},% + byinterviewer = {{interviewed by\addcolon}% + {interviewed by\addcolon}},% + bygenorg = {{general organization by\addcolon}% + {general organization by\addcolon}},% + bygenorgfo = {{general organization and foreword by\addcolon}% + {general organization and foreword by\addcolon}},% + bycoordinator = {{coordinated by\addcolon}% + {coordinated by\addcolon}},% + bycoeditor = {{coedited by\addcolon}% + {coedited by\addcolon}},% + bydirector = {{directed by\addcolon}% + {directed by\addcolon}},% + bygendir = {{general direction by\addcolon}% + {general direction by\addcolon}},% + byproducer = {{produced by\addcolon}% + {produced by\addcolon}},% + byscreenwriter = {{script written by\addcolon}% + {script written by\addcolon}},% + byinterpreter = {{interpreted by\addcolon}% + {interpreted by\addcolon}},% + byillustrator = {{illustrated by\addcolon}% + {illustrated by\addcolon}},% +}% <<< + +% <<< + +\endinput% + +% vim: set foldmarker=\ >>>,\ <<< : + diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx index 65db826e75a..820d296218f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel B. Marques. \ProvidesFile{abnt-ibid.bbx} -[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]% +[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]% \RequireBibliographyStyle{abnt} diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx index c2355bdccfd..094adc0bb4e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel B. Marques. \ProvidesFile{abnt-ibid.cbx}% -[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]% +[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]% \newtoggle{sccite}% @@ -169,7 +169,7 @@ \printfield{postnote}}}% <<<2 \ExecuteBibliographyOptions{% >>>2 - loccittracker=constrict, + loccittracker=constrict,% citetracker=context,% ibidtracker=constrict,% idemtracker=constrict,% @@ -179,6 +179,7 @@ citepages=permit,% labeldateparts,% labeldate=year,% + sorting=none,% }% <<<2 % <<<1 diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx index ac80d7c965b..0b9d4de7a30 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel B. Marques. \ProvidesFile{abnt-numeric.bbx}% -[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]% +[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]% \RequireBibliographyStyle{abnt} \ExecuteBibliographyOptions{labelnumber} diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx index 6667fc69ac5..da68c224e94 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel B. Marques. \ProvidesFile{abnt-numeric.cbx}% -[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]% +[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]% \RequireCitationStyle{numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-spanish.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-spanish.lbx new file mode 100644 index 00000000000..e7dac8b4e0c --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-spanish.lbx @@ -0,0 +1,339 @@ +%% Copyright 2016 Daniel B. Marques +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Daniel B. Marques. +%% +%% Tradução para o espanhol de Juan-Ernesto Sepúlveda. Obrigado! + +\ProvidesFile{abnt-spanish.lbx}% +[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]% + + +% Init >>> + +\InheritBibliographyExtras{spanish}% +\InheritBibliographyStrings{spanish}% +\DeclareBibliographyStrings{% + inherit = {spanish},% +}% + +% <<< + +% No preposition between month and year >>>1 + +\DeclareBibliographyExtras{% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}% + \iffieldundef{#2}{}{\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\addspace}}% + \thefield{#1}}% +}% + +% <<< + +% Publication details >>>1 + +\NewBibliographyString{% + apud,% + sineloco,% + sinenomine,% + sheet,% + sheets,% + illustrated,% + monography,% + recensionof,% +}% + +\DeclareBibliographyStrings{% + apud = {{apud}{apud}},% + idem = {{idem}{id\adddot}},% + volume = {{volumen}{v\adddot}},% + volumes = {{volumenes}{v\adddot}},% + number = {{n\'umero}{n\adddot}},% + pages = {{p\'aginas}{p\adddot}},% + involumes = {{in}{in}},% + in = {{in}{in}},% + inseries = {{in}{in}},% + sineloco = {{sine loco}{s\adddot l\adddot}},% + sinenomine = {{sine nomine}{s\adddot n\adddot}},% + urlfrom = {{disponible en}{disponible en}},% + urlseen = {{acceso en}{acceso en}},% + sheet = {{hoja}{h\adddot}},% + sheets = {{hojas}{h\adddot}},% + backrefpage = {{citado en la p\'agina}{citado en la p\adddot}},% + backrefpages = {{citado en las p\'aginas}{citado en las pp\adddot}},% + illustrated = {{ilustrado}{il\adddot}},% + monography = {{monograf\'ia}{monograf\'ia}},% + phdthesis = {{Tesis (Doctorado)}{Tesis (Doctorado)}},% + mathesis = {{Tesis (Mag\'ister)}{Tesis (Mag\'ister)}},% + reprintfrom = {{separata de}{separata de}},% + recensionof = {{recensi\'on de}{recensi\'on de}},% + reviewof = {{rese\~na de}{rese\~na de}},% +}% + +% <<< + +% Languages >>>1 + +\DeclareBibliographyStrings{% + langamerican = {{versi\'on americana}{versi\'on americana}},% + langbrazilian = {{versi\'on brasile\~na}{versi\'on brasile\~na}},% + langcatalan = {{versi\'on catalana}{versi\'on catalana}},% + langcroatian = {{versi\'on croata}{versi\'on croata}},% + langczech = {{versi\'on checa}{versi\'on checa}},% + langdanish = {{versi\'on danesa}{versi\'on danesa}},% + langdutch = {{versi\'on holandesa}{versi\'on holandesa}},% + langenglish = {{versi\'on inglesa}{versi\'on inglesa}},% + langfinnish = {{versi\'on finlandesa}{versi\'on finlandesa}},% + langfrench = {{versi\'on francesa}{versi\'on francesa}},% + langgerman = {{versi\'on alemana}{versi\'on alemana}},% + langgreek = {{versi\'on griega}{versi\'on griega}},% + langitalian = {{versi\'on italiana}{versi\'on italiana}},% + langlatin = {{versi\'on latina}{versi\'on latina}},% + langnorwegian = {{versi\'on noruega}{versi\'on noruega}},% + langpolish = {{versi\'on polaca}{versi\'on polaca}},% + langportuguese = {{versi\'on portuguesa}{versi\'on portuguesa}},% + langrussian = {{versi\'on rusa}{versi\'on rusa}},% + langslovene = {{versi\'on eslovena}{versi\'on eslovena}},% + langspanish = {{versi\'on espa\~nola}{versi\'on espa\~nola}},% + langswedish = {{versi\'on sueca}{versi\'on sueca}},% + fromamerican = {{del original ingl\'es}{del original ingl\'es}},% + frombrazilian = {{del original portugu\'es}{del original portugu\'es}},% + fromcatalan = {{del original catalana}{del original catalana}},% + fromcroatian = {{del original croata}{del original croata}},% + fromczech = {{del original checo}{del original checo}},% + fromdanish = {{del original dan\'es}{del original dan\'es}},% + fromdutch = {{del original holand\'es}{del original holand\'es}},% + fromenglish = {{del original ingl\'es}{del original ingl\'es}},% + fromfinnish = {{del original finland\'es}{del original finland\'es}},% + fromfrench = {{del original franc\'es}{del original franc\'es}},% + fromgerman = {{del original alem\'an}{del original alem\'an}},% + fromgreek = {{del original griego}{del original griego}},% + fromitalian = {{del original italiano}{del original italiano}},% + fromlatin = {{del original em latin}{del original em latin}},% + fromnorwegian = {{del original noruego}{del original noruego}},% + frompolish = {{del original polaco}{del original polaco}},% + fromportuguese = {{del original portugu\'es}{del original portugu\'es}},% + fromrussian = {{del original ruso}{del original ruso}},% + fromslovene = {{del original esloveno}{del original esloveno}},% + fromspanish = {{del original espa\~nol}{del original espa\~nol}},% + fromswedish = {{del original sueco}{del original sueco}},% +}% + +% <<< + +% Roles expressed as functions >>>1 + +\NewBibliographyString{% + organizer,% + organizers,% + coordinator,% + coordinators,% +}% + +\DeclareBibliographyStrings{% + editors = {{editores}{ed\adddot}},% + collaborators = {{colaboradores}{col\adddot}},% + translators = {{traductores}{trad\adddot}},% + commentators = {{comentadores}{coment\adddot}},% + annotators = {{anotadores}{anot\adddot}},% + organizer = {{organizador}{org\adddot}},% + organizers = {{organizadores}{org\adddot}},% + coordinator = {{coordinador}{coord\adddot}},% + coordinators = {{coordinadores}{coord\adddot}},% +}% + +% <<< + +% Roles expressed as objects >>>1 + +\DeclareBibliographyStrings{% + withcommentator = {{comentario\addcolon}{comentario\addcolon}},% + withannotator = {{notas\addcolon}{notas\addcolon}},% + withintroduction = {{introducci\'on\addcolon}{introducci\'on\addcolon}},% + withforeword = {{prefacio\addcolon}{prefacio\addcolon}},% + withafterword = {{postfacio\addcolon}{postfacio\addcolon}},% +}% + +% <<< + +% Roles expressed as actions >>>1 + +\NewBibliographyString{% >>>2 + byorganizer,% + byorganizerfo,% + bytechrev,% + byupdater,% + byupdateran,% + byphotographer,% + byartdir,% + byrecorder,% + byinterviewer,% + bygenorg,% + bygenorgfo,% + bycoordinator,% + bycoeditor,% + bydirector,% + bygendir,% + byproducer,% + byscreenwriter,% + byinterpreter,% + byillustrator,% + bytechrev,% +}% <<< + +\DeclareBibliographyStrings{% >>>2 + bycoeditor = {{co-edici\'on\addcolon}% + {co-edici\'on\addcolon}},% + bydirector = {{direcci\'on\addcolon}% + {direcci\'on\addcolon}},% + bygendir = {{direcci\'on general\addcolon}% + {direcci\'on general\addcolon}},% + bycoordinator = {{coordinaci\'ono\addcolon}% + {coordinaci\'on\addcolon}},% + byproducer = {{producci\'on\addcolon}% + {producci\'on\addcolon}},% + byscreenwriter = {{gui\'on\addcolon}% + {gui\'on\addcolon}},% + byinterpreter = {{interpretaci\'on\addcolon}% + {interpretaci\'on\addcolon}},% + byillustrator = {{ilustraciones\addcolon}% + {ilustraciones\addcolon}},% + byorganizer = {{organizador\addcolon}% + {organizador\addcolon}},% + bytechrev = {{revisi\'on t\'ecnica\addcolon}% + {revisi\'on t\'ecnica\addcolon}},% + byartdir = {{direcci\'on art\'istica\addcolon}% + {direcci\'on art\'istica\addcolon}},% + byinterviewer = {{entrevista por}% + {entrevista por}},% + byrecorder = {{gravaci\'on\addcolon}% + {gravaci\'on\addcolon}},% + byphotographer = {{fotograf\'ia\addcolon}% + {fotograf\'ia\addcolon}},% + bygenorg = {{organizaci\'on general\addcolon}% + {organizaci\'on general\addcolon}},% + byauthor = {{por}% + {por}},% + byeditor = {{edici\'on\addcolon}% + {edici\'on\addcolon}},% + bycompiler = {{compilaci\'on\addcolon}% + {compilaci\'on\addcolon}},% + byredactor = {{redactado por}% + {redactado por}},% + byreviser = {{revisi\'on\addcolon}% + {revisis\'on\addcolon}},% + bytechrev = {{revisi\'on t\'ecnica\addcolon}% + {revisi\'on t\'ecnica\addcolon}},% + byreviewer = {{rese\~na\addcolon}% + {rese\~na\addcolon}},% + byfounder = {{fundado por}% + {fundado por}},% + bycontinuator = {{continuado por}% + {continuado por}},% + bycollaborator = {{en colaboraci\'on con}% + {en colaboraci\'on com}},% + bytranslator = {{traducci\'on\addcolon}% + {traducci\'ono\addcolon}},% + bycommentator = {{comentario\addcolon}% + {comentario\addcolon}},% + byannotator = {{notas\addcolon}% + {notas\addcolon}},% + byupdateran = {{actualizaci\'on y notas\addcolon}% + {actualizaci\'on y notas\addcolon}},% + byupdater = {{actualizaci\'on\addcolon}% + {actualizaci\'on\addcolon}},% + byorganizerfo = {{organizaci\'on y prefacio\addcolon}% + {organizaci\'on y prefacio\addcolon}},% + bygenorgfo = {{organizaci\'on general y prefacio\addcolon}% + {organizaci\'on general y prefacio\addcolon}},% + byeditortr = {{edici\'on y traducci\'on\addcolon}% + {edici\'on y traducci\'on\addcolon}},% + byeditorco = {{edici\'on y comentario\addcolon}% + {edici\'on y comentario\addcolon}},% + byeditoran = {{edici\'on y notas\addcolon}% + {edici\'on y notas\addcolon}},% + byeditorin = {{edici\'on y introducci\'on\addcolon}% + {edici\'on y introducci\'on\addcolon}},% + byeditorfo = {{edici\'on y prefacio\addcolon}% + {edici\'on y prefacio\addcolon}},% + byeditoraf = {{edici\'on y postfacio\addcolon}% + {edici\'on y postfacio\addcolon}},% + byeditortrco = {{edici\'on, traducci\'on y comentario\addcolon}% + {edici\'on, traducci\'on y comentario\addcolon}},% + byeditortran = {{edici\'on, traducci\'on y notas\addcolon}% + {edici\'on, traducci\'on y notas\addcolon}},% + byeditortrin = {{edici\'on, traducci\'on y introducci\'on\addcolon}% + {edici\'on, traducci\'on y introducci\'on\addcolon}},% + byeditortrfo = {{edici\'on, traducci\'on y prefacio\addcolon}% + {edici\'on, traducci\'on y prefacio\addcolon}},% + byeditortraf = {{edici\'on, traducci\'on y postfacio\addcolon}% + {edici\'on, traducci\'on y postfacio\addcolon}},% + byeditorcoin = {{edici\'on, comentario y introducci\'on\addcolon}% + {edici\'on, comentario y introducci\'on\addcolon}},% + byeditorcofo = {{edici\'on, comentario y prefacio\addcolon}% + {edici\'on, comentario y prefacio\addcolon}},% + byeditorcoaf = {{edici\'on, comentario y postfacio\addcolon}% + {edici\'on, comentario y postfacio\addcolon}},% + byeditoranin = {{edici\'on, introducci\'on y notas\addcolon}% + {edici\'on, introducci\'on y notas\addcolon}},% + byeditoranfo = {{edici\'on, prefacio y notas\addcolon}% + {edici\'on, prefacio y notas\addcolon}},% + byeditoranaf = {{edici\'on, postfacio y notas\addcolon}% + {edici\'on, postfacio y notas\addcolon}},% + byeditortrcoin = {{edici\'on, traducci\'on, comentario y introducci\'on\addcolon}% + {edici\'on, traducci\'on, comentario y introducci\'on\addcolon}},% + byeditortrcofo = {{edici\'on, traducci\'on, comentario y prefacio\addcolon}% + {edici\'on, traducci\'on, comentario y prefacio\addcolon}},% + byeditortrcoaf = {{edici\'on, traducci\'on, comentario y postfacio\addcolon}% + {edici\'on, traducci\'on, comentario y postfacio\addcolon}},% + byeditortranin = {{edici\'on, traducci\'on, notas y introducci\'on\addcolon}% + {edici\'on, traducci\'on, notas y introducci\'on\addcolon}},% + byeditortranfo = {{edici\'on, traducci\'on, notas y prefacio\addcolon}% + {edici\'on, traducci\'on, notas y prefacio\addcolon}},% + byeditortranaf = {{edici\'on, traducci\'on, notas y postfacio\addcolon}% + {edici\'on, traducci\'on, notas y postfacio\addcolon}},% + bytranslatorco = {{traducci\'on y comentario\addcolon}% + {traducci\'on y comentario\addcolon}},% + bytranslatoran = {{traducci\'on y notas\addcolon}% + {traducci\'on y notas\addcolon}},% + bytranslatorin = {{traducci\'on y introducci\'on\addcolon}% + {traducci\'on y introducci\'on\addcolon}},% + bytranslatorfo = {{traducci\'on y prefacio\addcolon}% + {traducci\'on y prefacio\addcolon}},% + bytranslatoraf = {{traducci\'on y postfacio\addcolon}% + {traducci\'on y postfacio\addcolon}},% + bytranslatorcoin = {{traducci\'on, comentario y introducci\'on\addcolon}% + {traducci\'on, comentario y introducci\'on\addcolon}},% + bytranslatorcofo = {{traducci\'on, comentario y prefacio\addcolon}% + {traducci\'on, comentario y prefacio\addcolon}},% + bytranslatorcoaf = {{traducci\'on, comentario y postfacio\addcolon}% + {traducci\'on, comentario y postfacio\addcolon}},% + bytranslatoranin = {{traducci\'on, notas y introducci\'on\addcolon}% + {traducci\'on, notas y introducci\'on\addcolon}},% + bytranslatoranfo = {{traducci\'on, notas y prefacio\addcolon}% + {traducci\'on, notas y prefacio\addcolon}},% + bytranslatoranaf = {{traducci\'on, notas y postfacio\addcolon}% + {traducci\'on, notas y postfacio\addcolon}},% +}% <<< + +% <<< + +\endinput% + +% vim: set foldmarker=\ >>>,\ <<< : + diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx index ebd4316ac26..110c6d09357 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel B. Marques. \ProvidesFile{abnt.bbx}% -[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]% +[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]% % Init >>>1 @@ -23,13 +23,23 @@ \DeclareLanguageMapping{brazilian}{abnt-brazilian}% \DeclareLanguageMapping{portuguese}{abnt-brazilian}% \DeclareLanguageMapping{portuges}{abnt-brazilian}% +\DeclareLanguageMapping{spanish}{abnt-spanish}% +\DeclareLanguageMapping{english}{abnt-english}% \RequireBibliographyStyle{standard}% -\ExecuteBibliographyOptions{block=none,urldate=long,pagetracker}% +\ExecuteBibliographyOptions{% + block=none, + urldate=long, + pagetracker, + uniquename=false, +}% \InitializeBibliographyStyle{\global\undef\bbx@lasthash}% +\let\origbibsetup\bibsetup% +\appto{\bibsetup}{\raggedright}% + % <<<1 @@ -160,6 +170,33 @@ }{}}% % <<<2 +% Show extrayear in bibliography >>>2 +\newtoggle{extrayear}% +\DeclareBibliographyOption{extrayear}[true]{% + \settoggle{extrayear}{#1}}% +\DeclareEntryOption[boolean]{extrayear}[true]{% + \settoggle{extrayear}{#1}}% +% <<<2 + +% Justify text >>>2 +\DeclareBibliographyOption{justify}[true]{% + \ExecuteBibliographyOptions{block=space}% + \renewcommand*{\bibsetup}{\origbibsetup}% +}% +% <<<2 + +% Make it pretty >>>2 +\DeclareBibliographyOption{pretty}[true]{% + \ExecuteBibliographyOptions{% + ittitles, + sccite, + scbib, + indent, + justify, + }% +}% +% <<<2 + % <<<1 @@ -541,7 +578,7 @@ \DeclareFieldFormat{illustrated}{\addspace #1\isdot}% -\DeclareFieldFormat{url}{\bibstring{url}\addcolon\addspace<\url{#1}>}% +\DeclareFieldFormat{url}{\bibstring{urlfrom}\addcolon\addspace<\url{#1}>}% \DeclareFieldFormat{urldate}{\bibstring{urlseen}\addcolon\addspace #1}% \DeclareFieldFormat*{note}{\addspace #1}% @@ -843,7 +880,7 @@ \iftoggle{repeatfields}% {\addspace\usebibmacro{author/editor+others}}% {\addspace\bibnamedash}% - \newunit\newblock% + \newunit% \usebibmacro{maintitle}% }% }%% <<<3 @@ -926,12 +963,12 @@ \usebibmacro{bbx:dashcheck}{% \iffieldundef{authortype}{% \bibnamedash% - \newunit\newblock% + \newunit% \printfield{nameaddon}% }{% \nopunctdash% \usebibmacro{authorstrg}% - \newunit\newblock% + \newunit% \printfield{nameaddon}% }% }{% @@ -939,7 +976,7 @@ \printnames{author}% \addspace% \usebibmacro{authorstrg}% - \newunit\newblock% + \newunit% \printfield{nameaddon}% }% }{% @@ -997,7 +1034,7 @@ \printlist[uppercase]{organization}}% \savelistcs*{organization}{savedorg}% \clearlist{organization}% - \newunit\newblock% + \newunit% \printfield{nameaddon}}% }%% <<<3 @@ -1086,7 +1123,11 @@ % Publisher, location, date, issue >>>2 \renewbibmacro*{date}{% - \printdate% + \iftoggle{extrayear}{% + \printdateextra% + }{% + \printdate% + } \printunit{\addperiod\addspace}% }% @@ -1307,22 +1348,26 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/organization}% - \setunit{\labelnamepunct}\newblock% - \usebibmacro{title}% - \newunit% + \setunit{\labelnamepunct}% + \usebibmacro{title}\newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byauthor}% - \newunit\newblock% - \usebibmacro{byeditor+others}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \usebibmacro{byeditor+others}\newunit% \usebibmacro{bytranslator+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{version}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffieldundef{relatedtype}{}{% - \bibstring{\strfield{relatedtype}}}% + \bibstring{\strfield{relatedtype}}}% \setunit*{\addcolon\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{journal+section}% \setunit*{\addcomma\addspace}% \printlist{publisher}% @@ -1337,21 +1382,27 @@ \setunit{\addcomma\addspace}% \usebibmacro{issue+date}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \printunit{\addperiod\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:isbn}% {\printfield{issn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% - \usebibmacro{related}}% + \usebibmacro{related}}% {}% \usebibmacro{finentry}% }%% <<<2 @@ -1360,48 +1411,64 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{title}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{in:maintitle}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{edition}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{publisher+location+date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volume}% \printfield{part}% \setunit{\addcomma\addspace}% \printfield{chapter}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{pages}% - \newunit\newblock% + \newunit% \printfield{pagetotal}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{illustrated}% \setunit*{\addcomma\addspace}% \printfield{dimensions}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{series+number}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{howpublished}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \printunit{\addperiod\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1413,38 +1480,51 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{title}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{in:bookauthor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{maintitle/booktitle}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{edition}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{publisher+location+date}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volume}% \printfield{part}% \setunit*{\addcomma\addspace}% \usebibmacro{chapter+pages}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{series+number}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \printunit{\addperiod\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1456,45 +1536,62 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{title}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{in:maintitle}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{edition}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{publisher+location+date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volumes}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{pagetotal}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{illustrated}% \setunit*{\addcomma\addspace}% \printfield{dimensions}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{series+number}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{howpublished}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \printunit{\addperiod\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1506,41 +1603,56 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{maintitle+title}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byauthor}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{edition}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{series+number}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{type}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{version}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{location+date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% \newunit% + \printfield{pagetotal}% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \newunit% - \printfield{pagetotal}% - \newunit\newblock% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1552,48 +1664,64 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{editor+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{title}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{in:maintitle}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{edition}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{publisher+location+date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volume}% \printfield{part}% \setunit{\addcomma\addspace}% \printfield{chapter}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{pages}% - \newunit\newblock% + \newunit% \printfield{pagetotal}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{illustrated}% \setunit*{\addcomma\addspace}% \printfield{dimensions}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{series+number}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{howpublished}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printunit{\addperiod\addspace}% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1605,38 +1733,50 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{title}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{in:editor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{maintitle/booktitle}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{edition}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{publisher+location+date}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volume}% \printfield{part}% - \newunit\newblock% + \newunit% \usebibmacro{series+number}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \printunit{\addperiod\addspace}% \usebibmacro{chapter+pages}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1648,45 +1788,62 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{editor+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{title}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{in:maintitle}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{edition}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{publisher+location+date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volumes}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{pagetotal}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{illustrated}% \setunit*{\addcomma\addspace}% \printfield{dimensions}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{series+number}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{howpublished}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printunit{\addperiod\addspace}% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1698,41 +1855,56 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{maintitle+title}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byauthor}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{edition}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{type}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{version}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{location+date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% \newunit% \printfield{pagetotal}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{series+number}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \printunit{\addperiod\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1744,35 +1916,46 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{title}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% \newunit% \printfield{pagetotal}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{type}% \setunit*{\addspace\textendash\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{institution}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{location}% \setunit*{\addcomma\addspace}% \printeventdate% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \printunit{\addperiod\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1793,50 +1976,63 @@ }{% \printnames[given-family]{author}% }% - \newunit\newblock% + \newunit% \printfield{nameaddon}% - \newunit\newblock% + \newunit% }% }{% \printnames{holder}% - \newunit\newblock% + \newunit% \printfield{nameaddon}% - \newunit\newblock% + \newunit% \ifnameundef{author}{% \printnames[given-family]{editor}% }{% \printnames[given-family]{author}% }% }% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{title}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byauthor}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{location}% \setunit*{\addcomma\addspace}% \usebibmacro{date}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{number}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{howpublished}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{type}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{version}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \printunit{\addperiod\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1848,35 +2044,45 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{editor+others/organization}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \printfield[uppercase]{title}% \setunit*{\addcolon\addspace}% \printfield[normalfont]{subtitle}% \newunit% \printfield{titleaddon}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{publisher+location+issue+date}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% \setunit*{\addcomma\addspace}% \printfield{pagetotal}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \printunit{\addperiod\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:isbn}% {\printfield{issn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1888,47 +2094,62 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{issue}% \setunit*{\addperiod\addspace}% \usebibmacro{periodical}% \setunit*{\addperiod\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{location}% \setunit*{\addcolon\addspace}% \usebibmacro{publisher}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volume}% \setunit*{\addcomma\addspace}% \printfield{number}% \setunit*{\addcomma\addspace}% \printfield{pages}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{date}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byauthor}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{howpublished}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{type}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{version}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% \setunit*{\addcomma\addspace}% \printfield{pagetotal}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% \printunit{\addperiod\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1947,37 +2168,50 @@ \setunit{\addcomma\addspace}% \usebibmacro{venue}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{maintitle+title}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{publisher+location+date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffieldundef{maintitle}% {\printfield{volume}% \printfield{part}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volumes}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printunit{\addperiod\addspace}% \printlist{organization}% % This has to be printed conditionally - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% \newunit% \printfield{pagetotal}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -1989,25 +2223,33 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{title}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byauthor}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{in:eventtitle/organization/editor}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{number}% \setunit*{\adddot\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printeventdate% \setunit*{\addcomma\addspace}% \printfield{venue}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{maintitle+booktitle}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifboolexpr{% test {\iffieldundef{booktitle}}% and% @@ -2015,34 +2257,45 @@ }% {}% {\usebibmacro{publisher+location+date}}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffieldundef{maintitle}% {\printfield{volume}% \printfield{part}}% {}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volumes}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{series+number}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{organization}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% \newunit% \printfield{pagetotal}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printunit{\addperiod\addspace}% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -2054,44 +2307,59 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{maintitle+title}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byauthor}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{edition}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffieldundef{maintitle}% {\printfield{volume}% \printfield{part}}% {}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volumes}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{location+date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% \newunit% \printfield{pagetotal}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{series+number}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printunit{\addperiod\addspace}% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -2103,35 +2371,46 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{title}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% \newunit% \printfield{pagetotal}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{type}% \setunit*{\addspace\textendash\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{institution}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{location}% \setunit*{\addcomma\addspace}% \printeventdate% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printunit{\addperiod\addspace}% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -2143,48 +2422,65 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\labelnamepunct}% \usebibmacro{maintitle+title}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printlist{language}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byauthor}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{byeditor+others}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{edition}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffieldundef{maintitle}% {\printfield{volume}% \printfield{part}}% {}% \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{volumes}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{publisher+location+date}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{chapter+pages}% \newunit% \printfield{pagetotal}% \setunit*{\addcomma\addspace}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{dimensions}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{howpublished}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{series+number}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printfield{note}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \printunit{\addperiod\addspace}% \iftoggle{bbx:isbn}% {\printfield{isbn}}% {}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{doi+eprint+url}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{addendum+pubstate}% - \printunit{\bibpagerefpunct}\newblock% + \printunit{\bibpagerefpunct}% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{pageref}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}}% @@ -2195,7 +2491,8 @@ \DeclareBibliographyDriver{set}{%% >>>2 \booltrue{bbx@inset}% \entryset{}{}% - \newunit\newblock% + \newunit% + \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usebibmacro{setpageref}% \finentry% }%% <<<2 diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx index 5789a2a2557..0b11b4ca496 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel B. Marques. \ProvidesFile{abnt.cbx}% -[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]% +[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]% % Init >>>1 @@ -36,6 +36,15 @@ \literal{nodate} } +\ExecuteBibliographyOptions{% + block=none, + urldate=long, + pagetracker, + uniquename=false, + sorting=nty, +}% + + % <<<1 @@ -309,7 +318,9 @@ {\usebibmacro{cite:init}% \boolfalse{citetracker}% \boolfalse{pagetracker}% - \usebibmacro{prenote}}% + \usebibmacro{prenote} + \renewcommand*{\finalnamedelim}{\addspace\bibstring{and}\addspace}% + \renewcommand*{\multinamedelim}{\addcomma\addspace}}% {\ifciteindex% {\indexnames{labelname}}% {}% @@ -478,9 +489,9 @@ \printfield{extrayear}% }% }% - \iffieldundef{issue}{}{% - \addcomma\addspace\printfield{issue}% - }% + % \iffieldundef{issue}{}{% + % \addcomma\addspace\printfield{issue}% + % }% }% <<<2 \renewbibmacro*{cite:shorthand}{%% >>>2 -- cgit v1.2.3