texlive[45765] Master/texmf-dist: biblatex-abnt

commits+karl at tug.org commits+karl at tug.org
Sun Nov 12 23:33:35 CET 2017


Revision: 45765
          http://tug.org/svn/texlive?view=revision&revision=45765
Author:   karl
Date:     2017-11-12 23:33:34 +0100 (Sun, 12 Nov 2017)
Log Message:
-----------
biblatex-abnt

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002.bib
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/README.md
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.bib
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002.bib
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_reference.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_test.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_reference.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_test.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/test.sh
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/tests/
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/tests/README.md
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/brazil-abnt.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/brazilian-abnt.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/english-abnt.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/portuges-abnt.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/portuguese-abnt.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/spanish-abnt.lbx

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.tex
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-english.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-spanish.lbx

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md	2017-11-12 22:33:34 UTC (rev 45765)
@@ -3,6 +3,21 @@
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [3.2] - 2017-10-23
+
+### Added
+- Add better tests
+- Add `citecount` option
+
+### Changed
+- **Support (and require) BibLaTeX 3.8 and Biber 2.8**
+- Stop supporting abntex2cite
+- Improve abnt citation style (inherit from `authoryear-comp`)
+- Use small caps for authors' initials with `sccite` and `scbib` options
+- Set language to portuguese automatically
+- Disable sortcites
+
+
 ## [3.1] - 2017-07-28
 
 ### Added
@@ -80,6 +95,7 @@
 - Add "et al." in citations
 
 
+[3.2]: https://github.com/abntex/biblatex-abnt/compare/v3.1...v3.2
 [3.1]: https://github.com/abntex/biblatex-abnt/compare/v3.0...v3.1
 [3.0.1]: https://github.com/abntex/biblatex-abnt/compare/v3.0...v3.0.1
 [3.0]: https://github.com/abntex/biblatex-abnt/compare/v2.0.1...v3.0

Added: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002.bib	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002.bib	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,325 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+
+% section 5 >>>1
+
+ at book{authier1982,
+    author = {Authier-Reiriz},
+    date = {1982},
+}
+
+ at book{derrida1967,
+    author = {Derrida},
+    date = {1967},
+}
+
+ at book{mumford1949,
+    author = {Mumford},
+    date = {1949},
+}
+
+ at book{oliveira1943,
+    author = {Oliveira and Leonardos},
+    date = {1943},
+}
+
+ at book{assis1994,
+    author = {assis},
+    date = {1994},
+}
+
+ at book{barbour1971,
+    author = {Barbour},
+    date = {1971},
+}
+
+ at book{clarac1985,
+    author = {Clarac and Bonnin},
+    date = {1985},
+}
+
+ at book{sa1995,
+    author = {Sá},
+    date = {1995},
+}
+
+ at book{nichols1993,
+    author = {Nichols},
+    date = {1993},
+}
+
+ at unpublished{clemente2002,
+    author = {Elvo Clemente},
+    title = {Poetas rio-grandenses},
+    date = {2002},
+    publisher = {\mkbibacro{EDIPUCRS}},
+}
+
+ at book{souto1916,
+    author = {Souto},
+    date = {1916},
+}
+
+ at book{candido1993,
+    author = {Candido},
+    date = {1993},
+}
+
+ at book{rahner1962,
+    author = {Rahner},
+    date = {1962},
+}
+
+%  <<<1
+
+% Section 6 >>>1
+
+ at book{teatro1963,
+    title = {Teatro Aberto},
+    date = {1963},
+}
+
+ at book{morais1955,
+    author = {Morais},
+    date = {1955},
+}
+
+ at book{barbosa1958,
+    author = {C. Barbosa},
+    date = {1958},
+}
+
+ at book{barbosa1959,
+    author = {O. Barbosa},
+    date = {1959},
+}
+
+ at book{barbosa1965a,
+    author = {Cássio Barbosa},
+    date = {1965},
+}
+
+ at book{barbosa1965b,
+    author = {Celso Barbosa},
+    date = {1965},
+}
+
+ at book{reeside1927a,
+    author = {Reeside},
+    date = {1927},
+}
+
+ at book{reeside1927b,
+    author = {Reeside},
+    date = {1927},
+}
+
+ at book{dreyfuss1989,
+    author = {Dreyfuss},
+    date = {1989},
+}
+
+ at book{dreyfuss1991,
+    author = {Dreyfuss},
+    date = {1991},
+}
+
+ at book{dreyfuss1995,
+    author = {Dreyfuss},
+    date = {1995},
+}
+
+ at book{cruz1998,
+    author = {Cruz and Correa and Costa},
+    date = {1998},
+}
+
+ at book{cruz1999,
+    author = {Cruz and Correa and Costa},
+    date = {1999},
+}
+
+ at book{cruz2000,
+    author = {Cruz and Correa and Costa},
+    date = {2000},
+}
+
+ at book{fonseca1997,
+    author = {Fonseca},
+    date = {1997},
+}
+
+ at book{paiva1997,
+    author = {Paiva},
+    date = {1997},
+}
+
+ at book{silva1997,
+    author = {Silva},
+    date = {1997},
+}
+
+ at book{cross1984,
+    author = {Cross},
+    date = {1984},
+}
+
+ at book{knox1986,
+    author = {Knox},
+    date = {1986},
+}
+
+ at book{mezirow1991,
+    author = {Mezirow},
+    date = {1991},
+}
+
+ at book{ruibarbosa,
+    author = {{Rui Barbosa}},
+}
+
+ at book{lopes2000,
+    author = {Lopes, José Reinaldo de Lima},
+    title = {O Direito na História},
+    date = {2000},
+    publisher = {Max Limonad},
+    location = {São Paulo},
+}
+
+ at book{bobbio1995,
+    author = {Norberto Bobbio},
+    title = {O positivismo jurídico},
+    subtitle = {lições de Filosofia do Direito},
+    date = {1995},
+    publisher = {Ícone},
+    location = {São Paulo},
+}
+
+ at article{jossua1976,
+    author = {Jean Pierra Jossua and Johann Baptist Metz},
+    title = {Editorial: Teologia e Literatura},
+    date = {1976},
+    journaltitle = {Concilium},
+    location = {Petrópolis},
+    volume = {115},
+    number = {5},
+    pages = {2-5},
+}
+
+ at book{merriam1991,
+    author = {S. Merriam and R. Caffarella},
+    title = {Learning in adulthood},
+    subtitle = {a comprehensive guide},
+    date = {1991},
+    publisher = {Jossey-Bass},
+    location = {San Francisco},
+}
+
+ at book{comissao1992,
+    author = {{Comissão das Comunidades Européias}},
+    title = {A união européia},
+    date = {1992},
+    publisher = {Serviço das Publicações Oficiais das Comunidades Européias},
+    location = {Luxemburgo},
+}
+
+ at legislation{brasil1995,
+    author = {{Brasil}},
+    nameaddon = {Ministério da Administração Federal e da REforma do Estado},
+    title = {Plano diretora da reforma do aparelho do Estado},
+    date = {1995},
+    location = {Brasília, DF},
+}
+
+ at article{anteprojeto1987,
+    title = {Anteprojeto de lei},
+    date = {1987},
+    journaltitle = {Estudos e Debates},
+    location = {Brasília, DF},
+    number = {13},
+    pages = {51-60},
+    issue = {jan.\isdot},
+}
+
+ at article{aflor1995,
+    title = {A~flor Prometida},
+    journaltitle = {Folha de S. Paulo},
+    date = {1995},
+    location = {São Paulo},
+    pages = {4},
+    issue = {2 abr.},
+    date = {1995},
+}
+
+ at article{noscanaviais1995,
+    title = {Nos~canaviais, mutilação em vez de lazer e escola},
+    date = {1995},
+    journaltitle = {O Globo},
+    location = {Rio de Janeiro},
+    issue = {16 jul.},
+    note = {O País, p. 12},
+}
+
+%  <<<1
+
+% Section 7 >>>1
+
+ at collection{faria1994,
+    editor = {José Eduardo Faria},
+    editortype = {organizer},
+    title = {Direitos humanos, direitos sociais e justiça},
+    date = {1994},
+    publisher = {Malheiros},
+    location = {São Paulo},
+}
+
+ at book{silva1983,
+    author = {Silva},
+    date = {1983},
+}
+
+ at book{abreu1999,
+    author = {Abreu},
+    date = {1999},
+}
+
+ at book{vianna1986,
+    author = {Vianna},
+    date = {1986},
+}
+
+ at book{segatto1995,
+    author = {Segatto},
+    date = {1995},
+}
+
+ at book{gough1972,
+    author = {Gough},
+    date = {1972},
+}
+
+ at book{nardi1993,
+    author = {Nardi},
+    date = {1993},
+}
+
+ at book{morice1996,
+    author = {Morice},
+    date = {1996},
+}
+
+%  <<<1
+
+% vim: set foldmarker=\ >>>,\ <<< :
+


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002.tex	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,199 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+
+\documentclass[a4paper]{article}
+\usepackage[brazil]{babel}
+\usepackage{lmodern}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage{textcomp}
+\usepackage{microtype}
+\usepackage{etoolbox}
+\usepackage{xcolor}
+
+\usepackage[backend=biber, style=abnt]{biblatex}
+\usepackage[autostyle]{csquotes}
+
+\addbibresource{NBR10520-2002.bib}
+
+\setlength{\parskip}{\baselineskip}%
+\setlength{\parindent}{0pt}%
+\emergencystretch=1em
+
+\makeatletter
+\newcommand{\globalcolor}[1]{%
+  \color{#1}\global\let\default at color\current at color
+}
+\makeatother
+\AtBeginDocument{\iftoggle{reference}{}{\globalcolor{red!50}}}
+
+\usepackage{hyperref}
+
+
+\newtoggle{reference}
+\toggletrue{reference}
+
+\title{NBR 10520:2002 - \iftoggle{reference}{Referência}{Teste}}
+\author{Daniel Ballester Marques}
+
+\begin{document}
+
+\frenchspacing
+
+\maketitle
+
+Este documento imprime \textit{ipsis litteris} todas as entradas citadas na
+NBR 10520:2002 usando o sistema autor-data.
+
+\tableofcontents
+
+\clearpage
+
+\setcounter{section}{5}
+
+\section{Regras gerais de apresentação}
+
+A ironia seria assim uma forma implícita de heterogeneidade mostrada, conforme
+a classificação proposta por \textcite{authier1982}.
+
+\enquote{Apesar das aparências, a desconstrução do logocentrismo não é uma
+psicanálise da filosofia [\ldots]} \cite[293]{derrida1967}.
+
+A produção de lítio começa em Searles Lake, Califórnia, em 1928
+\cite[513]{mumford1949}.
+
+\textcite[146]{oliveira1943} dizem que a \enquote{[\ldots] relação da série
+São Roque com os granitos porfiróides pequenos é muito clara.}
+
+Meyer parte de uma passagem da crônica de \enquote{14 de maio}, de A Semana:
+\enquote{Houve sol, e grande sol, naquele domingo de 1888, em que o Senado
+votou a lei, que a regente sancionou [\ldots]} \cite[v. 3, p. 583]{assis1994}.
+
+\textcite[35]{barbour1971} descreve: \enquote{O estudo da morfologia dos
+terrenos [\ldots] ativos [\ldots]}
+
+\enquote{Não se mova, faça de conta que está morta.} \cite[72]{clarac1985}.
+
+Segundo \textcite[27]{sa1995}: \enquote{[\ldots] por meio da mesma \enquote{arte de
+conversação} que abrange tão extensa e significativa parte da nossa existência
+cotidiana [\ldots]}
+
+A teleconferência permite ao indivíduo participar de um encontro nacional ou
+regional sem a necessidade de deixar seu local de origem. Tipos comuns de
+teleconferência incluem o uso da televisão, telefone, e computador. Através de
+áudio-conferência, utilizando a companhia local de telefone, um sinal de áudio
+pode ser emitido em um salão de qualquer dimensão. \cite[181]{nichols1993}.
+
+\enquote{[\ldots] para que não tenha lugar a producção de degenerados, quer
+physicos quer moraes, misérias, verdadeiras ameaças à sociedade.} \cite[p. 46,
+grifo nosso]{souto1916}.
+
+\enquote{[\ldots] b) desejo de criar uma literatura independente, diversa, de
+vez que, aparecendo o classicismo como manifestação de passado colonial
+[\ldots]} \cite[v. 2, p. 12, grifo do autor]{candido1993}.
+
+\enquote{Ao fazê-lo pode estar envolto em culpa, perversão, ódio de si mesmo
+[\ldots] pode julgar-se pecador e identificar-se com seu pecado.} \cite[v. 4,
+p. 463, tradução nossa]{rahner1962}.
+
+
+\section{Sistema de chamada}
+
+Em \citetitle{teatro1963} relata-se a emergência do teatro do absurdo.
+
+Segundo \textcite[32]{morais1955} assinala \enquote{[\ldots] a presença de
+concreções de bauxita no Rio Cricon.}
+
+\cite{barbosa1958}
+
+\cite{barbosa1959}
+
+\cite{barbosa1965a}
+
+\cite{barbosa1965b}
+
+De acordo com \textcite{reeside1927a}
+
+\cite{reeside1927b}
+
+\cites{dreyfuss1989}{dreyfuss1991}{dreyfuss1995}
+
+\cites{cruz1998}{cruz1999}{cruz2000}
+
+Ela polariza e encaminha, sob a forma de \enquote{demanda coletiva}, as
+necessidades de todos \cites{fonseca1997}{paiva1997}{silva1997}.
+
+Diversos autores salientam a importância do \enquote{acontecimento
+desencadeador} no início de um processo de aprendizagem
+\cites{cross1984}{knox1986}{mezirow1991}.
+
+A chamada \enquote{pandectística havia sido a forma particular pela qual
+o direito romano fora integrado no século XIX na Alemanha em particular.}
+\cite[225]{lopes2000}.
+
+\textcite[30]{bobbio1995} com muita propriedade nos lembra, ao comentar esta
+situação, que os \enquote{juristas medievais justificaram formalmente
+  a validade do direito romano ponderando que este era o direito do Império
+  Romano que tinha sido reconstituído por Carlos Magno com o nome de Sacro
+Império Romano.}
+
+De fato, semelhante equacionamento do problema conteria o risco de se
+considerar a literatura meramente como uma fonte a mais de conteúdos já
+previamente disponíveis, em outros lugares, para a teologia
+\cite[3]{jossua1976}.
+
+\textcite{merriam1991} observam que a localização de recursos tem um papel
+crucial no processo de aprendizagem autodirigida.
+
+\enquote{Comunidade tem que poder ser intercambiada em qualquer circunstância,
+sem quaisquer restrições estatais, pelas moedas dos outros Estados-membros.}
+\cite[34]{comissao1992}.
+
+O mecanismo proposto para viabilizar esta concepção é o chamado Contrato de
+Gestão, que conduziria à captação de recursos privados como forma de reduzir
+os investimentos públicos no ensino superior \cite{brasil1995}.
+
+\enquote{As IES implementarão mecanismos democráticos, legítimos
+e transparentes de avaliação sistemática das suas atividades, levando em conta
+seus objetivos institucionais e seus compromissos para com a sociedade.}
+\cite[55]{anteprojeto1987}.
+
+E eles disseram \enquote{globalização}, e soubemos que era assim que chamavam
+a ordem absurda em que dinheiro é a única pátria à qual se serve e as
+fronteiras se diluem, não pela fraternidade, mas pelo sangramento que engorda
+poderosos sem nacionalidade. \cite[4]{aflor1995}.
+
+\enquote{Em Nova Londrina (PR), as crianças são levadas às lavouras a partir
+dos 5 anos.} \cite[12]{noscanaviais1995}.
+
+
+\section{Notas de rodapé}
+
+Segundo \textapud{silva1983}[3]{abreu1999} diz ser [\ldots]
+
+\enquote{[\ldots] o viés organicista da burocracia estatal e o antiliberalismo
+da cultura política de 1937, preservado de modo encapuçado na Carta de 1946.}
+\apud[172]{vianna1986}[214-215]{segatto1995}.
+
+No modelo serial de \textapud{gough1972}{nardi1993}, o ato de ler envolve um
+processamento serial que começa com uma fixação ocular sobre o texto,
+prosseguindo da esquerda para a direita de forma linear.
+
+\setcounter{footnote}{3}
+Os pais estão sempre confrontados diante das duas alternativas: vinculação
+escolar ou vinculação profissional.\footcite[Sobre essa opção dramática, ver
+também][269--290]{morice1996}
+
+\end{document}
+


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_reference.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_reference.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_reference.pdf	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_reference.pdf	2017-11-12 22:33:34 UTC (rev 45765)

Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_reference.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_test.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_test.tex	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,24 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+
+\documentclass{article}
+
+\usepackage{pdfpagediff}
+
+\begin{document}
+
+\layerPages{NBR10520-2002.pdf}{NBR10520-2002_reference.pdf}
+
+\end{document}
+


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR10520-2002_test.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002.bib	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002.bib	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,4 +1,4 @@
-%% Copyright 2016 Daniel B. Marques
+%% Copyright 2016 Daniel Ballester Marques
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,7 +10,7 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Daniel B. Marques.
+%% The Current Maintainer of this work is Daniel Ballester Marques.
 
 % section 7 {{{1
 
@@ -45,7 +45,7 @@
     title           = {Perfil da administração pública paulista},
     edition         = {6},
     location        = {São Paulo},
-    publisher       = {FUNDAP},
+    publisher       = {\mkbibacro{FUNDAP}},
     date            = {1994},
     pagetotal       = {317},
     note            = {Inclui índice},
@@ -54,8 +54,8 @@
 
 @booklet{ibict1993,
     keywords        = {7.1},
-    author          = {{IBICT}},
-    title           = {Manual de normas de editoração do {IBICT}},
+    author          = {{\mkbibacro{IBICT}}},
+    title           = {Manual de normas de editoração do {\mkbibacro{IBICT}}},
     edition         = {2},
     location        = {Brasília, DF},
     date            = {1993},
@@ -102,9 +102,8 @@
     authortype      = {Estado},
     nameaddon       = {Secretaria do Meio Ambiente.
                        Coordenadoria de Planejamento Ambiental.},
-    title           = {Estudo de impacto ambiental --
-                       EIA, Relatório de Impacto Ambiental --
-                       \mkbibacro{RIMA}},
+    title           = {Estudo de impacto ambiental -- \mkbibacro{EIA},
+                       Relatório de Impacto Ambiental -- \mkbibacro{RIMA}},
     subtitle        = {manual de orientação},
     location        = {São Paulo},
     date            = {1989},
@@ -179,7 +178,7 @@
     location        = {São Paulo},
     publisher       = {Delta: Estadão},
     date            = {1998},
-    note            = {5 CD-ROM},
+    note            = {5 \mkbibacro{CD-ROM}},
     % editora         = {André Koogan Breikman},
     % editoratype     = {gendir},
     % O ideal seria usar os campos `editora` e `editoratype` em vez de
@@ -194,7 +193,7 @@
     publisher       = {Virtual Books},
     url             = {http://www.terra.com.br/virtualbooks/
                        freebook/port/Lport2/navionegreiro.htm},
-    addendum        = {Acesso em: 10 jan 2002, 16:30:30},
+    addendum        = {Acesso em: 10 jan. 2002, 16:30:30},
     % urldate       = {2002-01-10},
     % É necessário colocar a data no campo `addendum` pra incluir o horário,
     % como no manual. O ideal seria usar o campo `urldate`.
@@ -268,7 +267,7 @@
     booktitle       = {Enciclopédia multimídia dos seres vivos},
     publisher       = {Planeta DeAgostini},
     year            = {c1998},
-    note            = {CD-ROM 9},
+    note            = {\mkbibacro{CD-ROM} 9},
 }
 
 @inbook{politica1998,
@@ -307,7 +306,7 @@
     keywords        = {7.5.1},
     title           = {Revista Brasileira de Geografia},
     location        = {Rio de Janeiro},
-    publisher       = {IBGE},
+    publisher       = {\mkbibacro{IBGE}},
     year            = {1939-\nopunct},
 }
 
@@ -315,9 +314,9 @@
     keywords        = {7.5.1},
     title           = {Revista Brasileira de Geografia},
     location        = {Rio de Janeiro},
-    publisher       = {IBGE},
-    note            = {Trimestral. Absorveu Boletim Geográfico, do IBGE.
-                       Índice acumulado. 1939-1983},
+    publisher       = {\mkbibacro{IBGE}},
+    note            = {Trimestral. Absorveu Boletim Geográfico, do
+                       \mkbibacro{IBGE}. Índice acumulado. 1939-1983},
     year            = {1939-~.},
     issn            = {0034-723X},
 }
@@ -326,8 +325,8 @@
     keywords        = {7.5.1},
     author          = {{Boletim Geográfico}},
     location        = {Rio de Janeiro},
-    publisher       = {IBGE},
-    year            = {1943-1978},
+    publisher       = {\mkbibacro{IBGE}},
+    date            = {1943/1978},
     note            = {Trimestral},
 }
 
@@ -468,7 +467,7 @@
     number          = {2},
     issue           = {inverno},
     year            = {1994},
-    note            = {1 CD-ROM},
+    note            = {1 \mkbibacro{CD-ROM}},
 }
 
 @article{silva1998a,
@@ -502,7 +501,7 @@
     keywords        = {7.5.4},
     title           = {Windows 98},
     subtitle        = {o melhor caminho para atualização},
-    journaltitle    = {PC World},
+    journaltitle    = {\mkbibacro{PC} World},
     location        = {São Paulo},
     number          = {75},
     date            = {1998-09},
@@ -524,7 +523,7 @@
 @article{naves1999,
     keywords        = {7.5.5},
     author          = {P. Naves},
-    title           = {Lagos andinos dão banho de belexa},
+    title           = {Lagos andinos dão banho de beleza},
     journaltitle    = {Folha de S. Paulo},
     location        = {São Paulo},
     date            = {1999-06-28},
@@ -534,7 +533,7 @@
 @article{leal1999,
     keywords        = {7.5.5},
     author          = {L. N. Leal},
-    title           = {MP fiscaliza com autonomia total},
+    title           = {\mkbibacro{MP} fiscaliza com autonomia total},
     journaltitle    = {Jornal do Brasil},
     location        = {Rio de Janeiro},
     pages           = {3},
@@ -570,9 +569,9 @@
     author          = {R. Kelly},
     title           = {Electronic publishing at \mkbibacro{APS}},
     subtitle        = {its not just online journalism},
-    journaltitle    = {APS News Online},
+    journaltitle    = {\mkbibacro{APS} News Online},
     location        = {Los Angeles},
-    month           = {{Nov}\adddot},
+    issue           = {{Nov}\adddot},
     year            = {1996},
     url             = {http://www.aps.org/apsnews/1196/11965.html},
     urldate         = {1998-11-25},
@@ -597,8 +596,8 @@
 
 @proceedings{iufrost1984,
     keywords        = {7.6.1},
-    eventtitle      = {IUFROST International Symposium
-                       on Chemical Changes During Food Processing},
+    eventtitle      = {IUFROST International Symposium on Chemical Changes
+                       During Food Processing},
     title           = {Proceedings\ldots},
     eventdate       = {1984},
     venue           = {Valencia},
@@ -649,7 +648,7 @@
     venue           = {São Paulo},
     booktitle       = {Anais\ldots},
     location        = {São Paulo},
-    publisher       = {USP},
+    publisher       = {\mkbibacro{USP}},
     date            = {1994},
     pages           = {16-29},
 }
@@ -667,7 +666,7 @@
     venue           = {Petrolina},
     booktitle       = {Anais\ldots},
     location        = {Petrolina},
-    publisher       = {EMPRAPA, CPATSA},
+    publisher       = {\mkbibacro{EMBRAPA}, \mkbibacro{CPATSA}},
     date            = {1994},
     pages           = {3-4},
 }
@@ -706,7 +705,7 @@
     location        = {Fortaleza},
     publisher       = {Tec Treina},
     date            = {1998},
-    note            = {1 CD-ROM},
+    note            = {1 \mkbibacro{CD-ROM}},
 }
 
 @inproceedings{silva1996a,
@@ -737,7 +736,7 @@
     venue           = {Rio de Janeiro},
     booktitle       = {Anais eletrônicos\ldots},
     location        = {Rio de Janeiro},
-    publisher       = {ABRASCO},
+    publisher       = {\mkbibacro{ABRASCO}},
     date            = {1998},
     note            = {Mesa-redonda},
     url             = {http://www.abrasco.com.br/epirio98/},
@@ -775,7 +774,7 @@
     author          = {Paulo Estevão Cruvinel},
     title           = {Medidor digital multisensorial
                        de temperatura para solos},
-    number          = {BR n. PI 8903105-9},
+    number          = {BR n. \mkbibacro{PI} 8903105-9},
     note            = {26 jun. 1989, 30 maio 1995},
 }
 
@@ -969,7 +968,8 @@
                        do Tribunal de Justiça do Estado de São Paulo,
                        Brasília, DF, 6 de dezembro de 1994},
     journaltitle    = {Lex},
-    journalsubtitle = {jurisprudência do STJ e Tribunais Regionais Federais},
+    journalsubtitle = {jurisprudência do \mkbibacro{STJ} e Tribunais Regionais
+                       Federais},
     location        = {São Paulo},
     volume          = {10},
     number          = {103},
@@ -987,7 +987,8 @@
                        Relator: Juiz Nereu Santos.
                        Recife, 4 de março de 1997},
     journaltitle    = {Lex},
-    journalsubtitle = {jurisprudência do STJ e Tribunais Regionais Federais},
+    journalsubtitle = {jurisprudência do \mkbibacro{STJ} e Tribunais Regionais
+                       Federais},
     location        = {São Paulo},
     volume          = {10},
     number          = {103},
@@ -1020,7 +1021,8 @@
                        do Tribunal de Justiça do Estado de São Paulo,
                        Brasília, DF, 6 de dezembro de 1994},
     journaltitle    = {Lex},
-    journalsubtitle = {jurisprudência do STJ e Tribunais Regionais Federais},
+    journalsubtitle = {jurisprudência do \mkbibacro{STJ} e Tribunais Regionais
+                       Federais},
     location        = {São Paulo},
     volume          = {10},
     number          = {103},
@@ -1044,7 +1046,8 @@
                        Relator: Juiz Nereu Santos.
                        Recife, 4 de março de 1997},
     journaltitle    = {Lex},
-    journalsubtitle = {jurisprudência do STJ e Tribunais Regionais Federais},
+    journalsubtitle = {jurisprudência do \mkbibacro{STJ} e Tribunais Regionais
+                       Federais},
     location        = {São Paulo},
     volume          = {10},
     number          = {103},
@@ -1074,10 +1077,10 @@
     location        = {Brasília, DF},
     publisher       = {Senado Federal},
     date            = {1999},
-    note            = {1 CD-ROM. Inclui resumos padronizados das normas
-                       jurídicas
-                       editadas entre janeiro de 1946 e agosto de 1999,
-                       assim como textos integrais de diversas normas},
+    note            = {1 \mkbibacro{CD-ROM}. Inclui resumos padronizados das
+                       normas jurídicas editadas entre janeiro de 1946
+                       e agosto de 1999, assim como textos integrais de
+                       diversas normas},
 }
 
 @inbook{brasil1999a,
@@ -1084,11 +1087,12 @@
     keywords        = {7.9.4},
     author          = {{Brasil}},
     title           = {Regulamento dos benefícios da previdência social},
-    booktitle       = {SISLEX: Sistema de Legislação, Jurisprudência
-                       e Pareceres da Previdência e Assistência Social},
-    publisher       = {DATAPREV},
+    booktitle       = {\mkbibacro{SISLEX}: Sistema de Legislação,
+                       Jurisprudência e Pareceres da Previdência e Assistência
+                       Social},
+    publisher       = {\mkbibacro{DATAPREV}},
     date            = {1999},
-    note            = {1 CD-ROM},
+    note            = {1 \mkbibacro{CD-ROM}},
 }
 
 @legal{brasil1999b,
@@ -1124,25 +1128,33 @@
 @movie{osperigos1983a,
     keywords        = {7.10},
     title           = {Os~perigos do uso de tóxicos},
-    editora         = {Jorge Ramos de Andrade},
-    editoratype     = {producer},
+    titleaddon      = {Produção de Jorge Ramos de Andrade},
     location        = {São Paulo},
-    publisher       = {CERAVI},
+    publisher       = {\mkbibacro{CERAVI}},
     date            = {1983},
     note            = {1 videocassete},
+    % editora         = {Jorge Ramos de Andrade},
+    % editoratype     = {producer},
+    % O ideal seria usar os campos `editora` e `editoratype` em vez de
+    % `titleaddon`.
 }
 
 @movie{osperigos1983b,
     keywords        = {7.10},
     title           = {Os~perigos do uso de tóxicos},
-    editora         = {Jorge Ramos de Andrade},
-    editoratype     = {producer},
-    editorb         = {Maria Izabel Azevedo},
-    editorbtype     = {coordinator},
+    titleaddon      = {Produção de Jorge Ramos de Andrade. Coordenação de
+                      Maria Izabel Azevedo.},
     location        = {São Paulo},
-    publisher       = {CERAVI},
+    publisher       = {\mkbibacro{CERAVI}},
     date            = {1983},
-    note            = {1 videocassete (30 min), VHS, son., color.},
+    note            = {1 videocassete (30 min), \mkbibacro{VHS}, son.,
+                       color.},
+    % editora         = {Jorge Ramos de Andrade},
+    % editoratype     = {producer},
+    % editorb         = {Maria Izabel Azevedo},
+    % editorbtype     = {coordinator},
+    % O ideal seria usar os campos `editora` e `editoratype` em vez de
+    % `titleaddon`.
 }
 
 @movie{central1998,
@@ -1154,7 +1166,8 @@
                        Oliveira; Sônia Lira; Othon Bastos; Matheus
                        Nachtergaele e outros. Roteiro: Marcos Bernstein,
                        João Emanuel Carneiro e Walter Salles Júnior},
-    publisher       = {Le Studio Canal; Riofilme; MACT Productions},
+    publisher       = {Le Studio Canal; Riofilme; \mkbibacro{MACT}
+                       Productions},
     date            = {1998},
     addendum        = {1 bobina cinematográfica (106 min),
                        son., color., 35 mm},
@@ -1180,9 +1193,9 @@
     location        = {Los Angeles},
     publisher       = {Warner Brothers},
     year            = {c1991},
-    addendum        = {1 DVD (117 min), widescreen, color.  Produzido por
-                       Warner Video Home. Baseado na novela ``Do androids
-                       dream of electric sheep?'' de Philip K. Dick},
+    addendum        = {1 \mkbibacro{DVD} (117 min), widescreen, color.
+                       Produzido por Warner Video Home. Baseado na novela ``Do
+                       androids dream of electric sheep?'' de Philip K. Dick},
     % editora       = {Ridley Scott},
     % editoratype   = {director},
     % editorb       = {Michael Deeley},
@@ -1220,10 +1233,10 @@
     author          = {E. Amiclar II Fraipont},
     journaltitle    = {O Estado de S. Paulo},
     location        = {São Paulo},
-    month           = {30 nov.},
+    issue           = {30 nov.},
     date            = {1998},
-    note            = {Caderno 2, Visuais p. D2. 1 fotografia, p\&b.
-                       Foto apresentada no Projeto ABRA/Coca-cola},
+    note            = {Caderno 2, Visuais. p. D2. 1 fotografia, p\&b. Foto
+                       apresentada no Projeto \mkbibacro{ABRA}/Coca-cola},
 }
 
 @image{oque1985,
@@ -1230,23 +1243,26 @@
     keywords        = {7.11.2},
     title           = {O~que acreditar em relação à maconha},
     location        = {São Paulo},
-    publisher       = {CERAVI},
+    publisher       = {\mkbibacro{CERAVI}},
     date            = {1985},
     note            = {22 transparências, color., 25 cm $\times$ 20 cm},
 }
 
 @image{odescobrimento1985,
-    keywords        = {7.11.2},
-    title           = {O~descobrimento do Brasil},
-    editora         = {Carmem Souza},
-    editoratype     = {photographer},
-    editorb         = {Marcos Lourenço},
-    editorbtype     = {recorder},
-    location        = {São Paulo},
-    publisher       = {CERAVI},
-    date            = {1985},
-    note            = {31 diapositivos, color. + 1
+    keywords   = {7.11.2},
+    title      = {O~descobrimento do Brasil},
+    titleaddon = {Fotografia de Carmem Souza. Gravação de Marcos Lourenço.},
+    location   = {São Paulo},
+    publisher  = {\mkbibacro{CERAVI}},
+    date       = {1985},
+    note       = {31 diapositivos, color. + 1
                        cassete sonoro (15 min), mono},
+    % editora         = {Carmem Souza},
+    % editoratype     = {photographer},
+    % editorb         = {Marcos Lourenço},
+    % editorbtype     = {recorder},
+    % O ideal seria usar os campos `editora` e `editoratype` em vez de
+    % `titleaddon`.
 }
 
 @image{samu1977,
@@ -1300,8 +1316,8 @@
     title           = {VASO.TIFF},
     date            = {1999},
     note            = {Altura: 1083 pixels. Largura: 827 pixels.
-                       300 dpi. 32 BIT CMYK. 3.5 Mb.
-                       Formato TIFF bitmap. Compactado.},
+                       300 dpi. 32 \mkbibacro{BIT} \mkbibacro{CMYK}. 3.5 Mb.
+                       Formato \mkbibacro{TIFF} bitmap. Compactado.},
     url             = {C:/Carol/VASO.TIFF},
     urldate         = {1999-10-28},
     options         = {noslsn},
@@ -1313,7 +1329,7 @@
     title           = {Geddes135.jpg},
     date            = {2000},
     note            = {Altura: 432 pixels. Largura: 376 pixels.
-                       51 Kb. Formato JPEG. 1 disquete, 5¼ pol.},
+                       51 Kb. Formato \mkbibacro{JPEG}. 1 disquete, 5¼ pol.},
     options         = {noslsn},
 }
 
@@ -1327,7 +1343,7 @@
     publisher       = {Prefeitura do Município de Araraquara},
     location        = {Araraquara},
     date            = {1999},
-    addendum        = {1 CD-ROM},
+    addendum        = {1 \mkbibacro{CD-ROM}},
 }
 
 @image{stockdale2002,
@@ -1415,11 +1431,11 @@
 
 @image{landsat1987,
     keywords        = {7.12.2},
-    title           = {LANDSAT TM 5},
+    title           = {\mkbibacro{LANDSAT} \mkbibacro{TM} 5},
     subtitle        = {imagem de satélide},
     location        = {São José dos Campos},
     publisher       = {Instituto Nacional de Pesquisas Espaciais},
-    year            = {1987-1988},
+    date            = {1987/1988},
     note            = {1 fotografia aérea. Escala 1:100.000. Canais 3, 4 e
                        composição colorida 3, 4 e 5},
 }
@@ -1431,9 +1447,10 @@
     title           = {1999071318.GIF},
     location        = {Itajaí},
     date            = {1999},
-    publisher       = {UNIVALI},
-    note            = {1 imagem de satélite. 557 Kb.  GOES-08: SE. 13 jul.
-                       1999, 17:42Z, IR04. 1 disquete, 3½ pol.},
+    publisher       = {\mkbibacro{UNIVALI}},
+    note            = {1 imagem de satélite. 557 Kb.  \mkbibacro{GOES}-08:
+                       \mkbibacro{SE}. 13 jul. 1999, 17:42Z, \mkbibacro{IR04}.
+                        1 disquete, 3½ pol.},
 }
 
 @article{percentagem1994,
@@ -1445,7 +1462,7 @@
     number          = {2},
     issue           = {inverno},
     year            = {1994},
-    note            = {1 CD-ROM},
+    note            = {1 \mkbibacro{CD-ROM}},
 }
 
 @misc{florida2000,
@@ -1485,7 +1502,7 @@
     author          = {Alcione},
     title           = {Ouro e cobre},
     location        = {São Paulo},
-    publisher       = {RCA Victor},
+    publisher       = {\mkbibacro{RCA} Victor},
     year            = {p1988},
     note            = {1 disco sonoro},
 }
@@ -1492,24 +1509,27 @@
 
 @audio{mpb1995,
     keywords        = {7.13},
-    title           = {MPB especial},
+    title           = {\mkbibacro{MPB} especial},
     location        = {[Rio de Janeiro]},
     publisher       = {Globo: Movieplay},
     year            = {c1995},
-    note            = {1 CD},
+    note            = {1 \mkbibacro{CD}},
 }
 
 @audio{alcione1988b,
-    keywords        = {7.13},
-    author          = {Alcione},
-    title           = {Ouro e cobre},
-    editor          = {Miguel Propschi},
-    editortype      = {artdir},
-    location        = {São Paulo},
-    publisher       = {RCA Victor},
-    year            = {p1988},
-    note            = {1 disco sonoro (45 min),
+    keywords   = {7.13},
+    author     = {Alcione},
+    title      = {Ouro e cobre},
+    titleaddon = {Direção artística: Miguel Propschi},
+    location   = {São Paulo},
+    publisher  = {\mkbibacro{RCA} Victor},
+    year       = {p1988},
+    note       = {1 disco sonoro (45 min),
                        33 1/3 rpm, estero., 12 pol.},
+    % editor          = {Miguel Propschi},
+    % editortype      = {artdir},
+    % O ideal seria usar os campos `editor` e `editortype` em vez de
+    % `titleaddon`.
 }
 
 @audio{silva1991,
@@ -1519,10 +1539,10 @@
     titleaddon      = {Entrevistadores: V. Tremel e M. Garcia},
     subtitle        = {depoimento [abr. 1991]},
     location        = {São Paulo},
-    publisher       = {SENAI-SP},
+    publisher       = {\mkbibacro{SENAI-SP}},
     date            = {1991},
     note            = {2 cassetes sonoros. Entrevista concedida
-                       ao Projeto Memória do SENAI-SP},
+                       ao Projeto Memória do \mkbibacro{SENAI-SP}},
     % editor        = {V. Tremel and M. Garcia},
     % editortype    = {interviewer},
     % O ideal seria usar os campos `editor` e `editortype` em vez de
@@ -1534,7 +1554,7 @@
     author          = {R. Fagner},
     title           = {Revelação},
     location        = {Rio de Janeiro},
-    publisher       = {CBS},
+    publisher       = {\mkbibacro{CBS}},
     date            = {1988},
     note            = {1 cassete sonoro (60 min), 3¾ pps, estereo},
 }
@@ -1545,7 +1565,8 @@
     title           = {Face a face},
     publisher       = {Emi-Odeon Brasil},
     year            = {p1977},
-    note            = {1 CD (ca. 40 min). Remasterizado em digital},
+    note            = {1 \mkbibacro{CD} (ca. 40 min). Remasterizado em
+                       digital},
 }
 
 % }}}
@@ -1561,7 +1582,7 @@
     booktitle       = {Face a face},
     publisher       = {Emi-Odeon Brasil},
     year            = {p1977},
-    note            = {1 CD. Faixa 7},
+    note            = {1 \mkbibacro{CD}. Faixa 7},
     % editor          = {Simone},
     % editortype      = {interpreter},
     % O ideal seria usar os campos `editor` e `editortype` em vez de
@@ -1576,7 +1597,7 @@
     bookauthor      = {Alcione},
     booktitle       = {Ouro e cobre},
     location        = {São Paulo},
-    publisher       = {RCA Victor},
+    publisher       = {\mkbibacro{RCA} Victor},
     year            = {p1988},
     note            = {1 disco sonoro. Lado A, faixa 1},
     % editor          = {Alcione},
@@ -1594,7 +1615,7 @@
     booktitle       = {Ouro e cobre},
     booktitleaddon  = {Direção artística: Miguel Propschi},
     location        = {São Paulo},
-    publisher       = {RCA Victor},
+    publisher       = {\mkbibacro{RCA} Victor},
     year            = {p1988},
     note            = {1 disco sonoro (45 min), 33 1/3 rpm,
                        estereo., 12 pol. Lado A, faixa 1 (4 min 3 s)},
@@ -1702,7 +1723,7 @@
     titleaddon      = {Version 4.1},
     publisher       = {Microsoft Corporation},
     date            = {1995},
-    note            = {1 CD-ROM},
+    note            = {1 \mkbibacro{CD-ROM}},
 }
 
 @software{universidade1998a,
@@ -1720,21 +1741,21 @@
     keywords        = {7.17},
     title           = {Allie's play house},
     location        = {Palo Alto, CA\adddot},
-    publisher       = {MPC/Opcode Interactive},
+    publisher       = {\mkbibacro{MPC}/Opcode Interactive},
     date            = {1993},
-    note            = {1 CD-ROM},
+    note            = {1 \mkbibacro{CD-ROM}},
 }
 
 @inbook{acaros1998,
-    keywords        = {7.17},
-    title           = {Ácaros no Estado de São Paulo},
-    bookauthor      = {{Fundação Tropical de Pesquisas e
-                        Tecnologia ``André Tosello''}},
-    booktitle       = {Base de Dados Tropical},
-    date            = {1985},
-    url             = {http://www.bdt.org/bdt/acarosp},
-    urldate         = {2002-03-30},
-    options         = {noslsn},
+    keywords   = {7.17},
+    title      = {Ácaros no Estado de São Paulo},
+    bookauthor = {{Fundação Tropical de Pesquisas e Tecnologia ``André Tosello''}},
+    booktitle  = {Base de Dados Tropical},
+    date       = {1985},
+    url        = {http://www.bdt.org/bdt/acarosp},
+    % urldate         = {2002-03-30},
+    addendum   = {Acesso em: 30 maio 2002},
+    options    = {noslsn},
 }
 
 @software{microsoft1995b,
@@ -1744,7 +1765,7 @@
     titleaddon      = {Version 4.1},
     publisher       = {Microsoft Corporation},
     date            = {1995},
-    note            = {1 CD-ROM},
+    note            = {1 \mkbibacro{CD-ROM}},
 }
 
 @software{allie1993b,
@@ -1751,9 +1772,9 @@
     keywords        = {7.17},
     title           = {Allie's play house},
     location        = {Palo Alto, CA\adddot},
-    publisher       = {MPC/Opcode Interactive},
+    publisher       = {\mkbibacro{MPC}/Opcode Interactive},
     date            = {1993},
-    note            = {1 CD-ROM. Windows 3.1},
+    note            = {1 \mkbibacro{CD-ROM}. Windows 3.1},
 }
 
 @software{universidade1998b,
@@ -1769,18 +1790,20 @@
 }
 
 @online{aves1998,
-    keywords        = {7.17},
-    title           = {Aves do Amapá},
-    subtitle        = {banco de dados},
-    url             = {http://www.bdt.org/bdt/avifauna/aves},
-    urldate         = {2002-05-30},
-    options         = {noslsn},
+    keywords = {7.17},
+    title    = {Aves do Amapá},
+    subtitle = {banco de dados},
+    url      = {http://www.bdt.org/bdt/avifauna/aves},
+    % urldate         = {2002-05-30},
+    addendum = {Acesso em: 30 maio 2002},
+    options  = {noslsn},
 }
 
 @online{bioline1998,
     keywords        = {7.17},
     title           = {Bioline Discussion List. List maintained
-                       by the Bases de Dados Tropical, BDT in Brasil},
+                       by the Bases de Dados Tropical, \mkbibacro{BDT} in
+                       Brasil},
     url             = {http://lisserv@bdt.org.br},
     urldate         = {1998-11-25},
     options         = {noslsn},
@@ -1787,17 +1810,20 @@
 }
 
 @online{civitas1995,
-    keywords        = {7.17},
-    title           = {Civitas},
-    editora         = {Simão Pedro P. Marinho},
-    editoratype     = {coordinator},
-    year            = {1995-1998},
-    note            = {Desenvolvido pela Pontifícia Universidade Católica
+    keywords   = {7.17},
+    title      = {Civitas},
+    titleaddon = {Coordenação de Simão Pedro P. Marinho},
+    date       = {1995/1998},
+    note       = {Desenvolvido pela Pontifícia Universidade Católica
                        de Minas Gerais 1995-1998. Apresenta textos sobre
                        urbanismo e desenvolvimento de cidades},
-    url             = {http://www.gcsnet.com/oamis/civitas},
-    urldate         = {1998-11-27},
-    options         = {noslsn},
+    url        = {http://www.gcsnet.com/oamis/civitas},
+    urldate    = {1998-11-27},
+    options    = {noslsn},
+    % editora         = {Simão Pedro P. Marinho},
+    % editoratype     = {coordinator},
+    % O ideal seria usar os campos `editora` e `editoratype` em vez de
+    % `titleaddon`.
 }
 
 @online{galeria1998,
@@ -1815,9 +1841,9 @@
 @online{almeida2002,
     keywords        = {7.17},
     author          = {M. P. S. Almeida},
-    title           = {Fichas para MARC\nopunct},
+    title           = {Fichas para \mkbibacro{MARC}\nopunct},
     titleaddon      = {[mensagem pessoal]. Mensagem recebida
-                       por \texttt{mtmendes at uol.com.br} em 12 jan. 2002.},
+                       por <\texttt{mtmendes at uol.com.br}> em 12 jan. 2002.},
     options         = {noslsn},
 }
 
@@ -1865,7 +1891,7 @@
     title           = {Constituição de uma matriz
                        de contabilidade social para o Brasil},
     location        = {Brasília, DF},
-    publisher       = {IPEA},
+    publisher       = {\mkbibacro{IPEA}},
     date            = {1994},
 }
 
@@ -1895,7 +1921,7 @@
     editor          = {W. Moore},
     title           = {Construtivismo del movimiento educacional},
     subtitle        = {soluciones},
-    location        = {Córdoba, AR},
+    location        = {Córdoba, AR.\isdot},
     date            = {1960},
 }
 
@@ -1904,7 +1930,7 @@
     editor          = {Roger Patrón Lujan},
     editortype      = {compiler},
     title           = {Um presente especial},
-    translator      = {Sonia da Silva},
+    titleaddon      = {Tradução Sonia da Silva},
     edition         = {3},
     location        = {São Paulo},
     publisher       = {Aquariana},
@@ -1925,28 +1951,34 @@
 }
 
 @book{dante1983,
-    keywords        = {8.1.1},
-    author          = {{Dante Alighieri}},
-    title           = {A divina comédia},
-    editor          = {Hernâni Donato},
-    editortype      = {translatoranfo},
-    location        = {São Paulo},
-    publisher       = {Círculo do Livro},
-    year            = {[1983]},
-    pagetotal       = {344},
+    keywords   = {8.1.1},
+    author     = {{Dante Alighieri}},
+    title      = {A divina comédia},
+    titleaddon = {Tradução, prefácio e notas: Hernâni Donato.},
+    location   = {São Paulo},
+    publisher  = {Círculo do Livro},
+    year       = {[1983]},
+    pagetotal  = {344},
+    % editor          = {Hernâni Donato},
+    % editortype      = {translatoranfo},
+    % O ideal seria usar os campos `editor` e `editortype` em vez de
+    % `titleaddon`.
 }
 
 @book{gomes1995,
-    keywords        = {8.1.1},
-    author          = {Orlando Gomes},
-    title           = {O direito de família},
-    editor          = {Humberto Theodoro Júnior},
-    editortype      = {updateran},
-    edition         = {11},
-    date            = {1995},
-    publisher       = {Forense},
-    location        = {Rio de Janeiro},
-    pagetotal       = {562},
+    keywords   = {8.1.1},
+    author     = {Orlando Gomes},
+    title      = {O direito de família},
+    titleaddon = {Atualização e notas de Humberto Theodoro Júnior},
+    edition    = {11},
+    date       = {1995},
+    publisher  = {Forense},
+    location   = {Rio de Janeiro},
+    pagetotal  = {562},
+    % editor     = {Humberto Theodoro Júnior},
+    % editortype = {updateran},
+    % O ideal seria usar os campos `editor` e `editortype` em vez de
+    % `titleaddon`.
 }
 
 @book{albergaria1994,
@@ -1957,11 +1989,11 @@
     titleaddon      = {Ilustrações de Paulo Lyra},
     edition         = {12},
     location        = {São Paulo},
-    publisher       = {FTD},
+    publisher       = {\mkbibacro{FTD}},
     date            = {1994},
     pagetotal       = {63},
-    editor          = {Paulo Lyra},
-    editortype      = {illustrator},
+    % editor          = {Paulo Lyra},
+    % editortype      = {illustrator},
     % O ideal seria usar os campos `editor` e `editortype` em vez de
     % `titleaddon`.
 }
@@ -1982,7 +2014,7 @@
 @standard{associação1988,
     keywords        = {8.1.2},
     author          = {{Associação Brasileira de Normas Técnicas}},
-    title           = {NBR 10520},
+    title           = {\mkbibacro{NBR} 10520},
     subtitle        = {informação e documentação:
                        citações em documentos: apresentação},
     location        = {Rio de Janeiro},
@@ -2138,7 +2170,7 @@
                        professores, técnicos, dentistas\ldots},
     foreword        = {Carlos da Silva Lacaz},
     location        = {São Paulo},
-    publisher       = {Cultrix: Ed. da USP},
+    publisher       = {Cultrix: Ed. da \mkbibacro{USP}},
     date            = {1971},
 }
 
@@ -2157,8 +2189,8 @@
     keywords        = {8.2},
     title           = {Revista brasileira de biblioteconomia e documentação},
     location        = {São Paulo},
-    publisher       = {FEBAB},
-    year            = {1973-1992},
+    publisher       = {\mkbibacro{FEBAB}},
+    date            = {1973/1992},
 }
 
 @periodical{boletim1965a,
@@ -2229,7 +2261,7 @@
                        de publicações técnico-científicas},
     edition         = {3. ed. rev. e aum.},
     location        = {Belo Horizonte},
-    publisher       = {Ed. da UFMG},
+    publisher       = {Ed. da \mkbibacro{UFMG}},
     date            = {1996},
 }
 
@@ -2240,7 +2272,7 @@
     location        = {Seattle},
     publisher       = {Multicom Publising},
     year            = {c1994},
-    note            = {1 CD-ROM},
+    note            = {1 \mkbibacro{CD-ROM}},
 }
 
 % }}}
@@ -2281,7 +2313,7 @@
     author          = {Lazzarini Neto, Sylvio},
     title           = {Cria e recria},
     location        = {[São Paulo]},
-    publisher       = {SDF Editores},
+    publisher       = {\mkbibacro{SDF} Editores},
     date            = {1994},
     pagetotal       = {108},
 }
@@ -2341,7 +2373,7 @@
     title           = {História da ciência},
     subtitle        = {o mapa do conhecimento},
     titleaddon      = {Rio de Janeiro: Expressão e Cultura;
-                       São Paulo: EDUSP, 1995},
+                       São Paulo: \mkbibacro{EDUSP}, 1995},
     pagetotal       = {968},
     series          = {América 500 anos},
     number          = {2},
@@ -2379,7 +2411,8 @@
     keywords        = {8.5},
     author          = {Antonia Motta {\relax de\nopunct}
                        Castro Memória Ribeiro},
-    title           = {AACR2, Anglo American Cataloguing Rules\nopunct},
+    title           = {\mkbibacro{AACR2}, Anglo American Cataloguing
+                       Rules\nopunct},
     titleaddon      = {\unspace, 2\textsuperscript{nd} edition:
                        descrição e pontos de acesso},
     date            = {2001},
@@ -2434,7 +2467,7 @@
     subtitle        = {da Antigüidade ao XX século},
     location        = {Rio de Janeiro},
     publisher       = {F. Briguiet},
-    year            = {1926-1940},
+    date            = {1926/1940},
     note            = {4 v.},
 }
 
@@ -2452,7 +2485,7 @@
     title           = {Desenvolvimento \& Conjuntura},
     location        = {Rio de Janeiro},
     publisher       = {Confederação Nacional da Indústria},
-    year            = {1957-1968},
+    date            = {1957/1968},
     note            = {Mensal},
 }
 
@@ -2627,7 +2660,7 @@
     title           = {Banco de dados e hipermídia},
     subtitle        = {construindo um metamodelo para o Projeto Portinari},
     location        = {Rio de Janeiro},
-    publisher       = {PUC, Departamento de Informática},
+    publisher       = {\mkbibacro{PUC}, Departamento de Informática},
     date            = {1993},
     note            = {Paginação irregular},
 }
@@ -2663,7 +2696,7 @@
     title           = {Viva vida},
     subtitle        = {estudos sociais, 4.},
     location        = {São Paulo},
-    publisher       = {FTD},
+    publisher       = {\mkbibacro{FTD}},
     date            = {1994},
     pagetotal       = {194},
     illustrated     = {il. color.},
@@ -2696,6 +2729,8 @@
     isbn            = {85-326-1087-0},
     % editora         = {Luciane Fadel},
     % editoratype     = {illustrator},
+    % O ideal seria usar os campos `editora` e `editoratype` em vez de
+    % `titleaddon`.
 }
 
 % }}}
@@ -2784,9 +2819,10 @@
     keywords        = {8.10},
     author          = {Amaral Sobrinho, J.},
     title           = {Ensino fundamental},
-    subtitle        = {gastos da União e do MEC em 1991: tendências},
+    subtitle        = {gastos da União e do \mkbibacro{MEC} em 1991:
+                       tendências},
     location        = {Brasília, DF},
-    publisher       = {IPEA},
+    publisher       = {\mkbibacro{IPEA}},
     date            = {1994},
     pagetotal       = {8},
     series          = {Texto para discussão},

Added: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002.tex	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,222 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+
+\documentclass[a4paper]{article}
+\usepackage[brazil]{babel}
+\usepackage{lmodern}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage{textcomp}
+\usepackage{microtype}
+\usepackage{etoolbox}
+\usepackage{xcolor}
+
+\usepackage[style=abnt, sorting=none, repeatfirstfields]{biblatex}
+\usepackage[autostyle]{csquotes}
+
+\addbibresource{NBR6023-2002.bib}
+
+\defbibheading{bibliography}[]{\subsection{#1}}
+
+\defbibenvironment{bibliography}
+  {\list{}{%
+     \leftmargin 6em
+     \itemsep\bibitemsep
+     \parsep\bibparsep}}
+  {\endlist}
+  {\item}
+
+\defbibheading{subbib}[]{\subsubsection{#1}}
+
+\let\origsection\section
+\renewcommand\section{\clearpage\origsection}
+
+\makeatletter
+\newcommand{\globalcolor}[1]{%
+  \color{#1}\global\let\default at color\current at color
+}
+\makeatother
+\AtBeginDocument{\iftoggle{reference}{}{\globalcolor{red!50}}}
+
+\usepackage{hyperref}
+
+
+\newtoggle{reference}
+\toggletrue{reference}
+
+\title{NBR 6023:2002 - \iftoggle{reference}{Referência}{Teste}}
+\author{Daniel Ballester Marques}
+
+\begin{document}
+
+\maketitle
+
+Este documento imprime \textit{ipsis litteris} todas as entradas citadas na
+NBR 6023:2002, da ABNT.
+
+Para expor as diferentes maneiras como cada campo pode ser usado, a ABNT
+imprime-os de modo diferente a cada entrada. A vantagem dos sistemas como
+o \texttt{biblatex}, por outro lado, é \emph{uniformizar} a bibliografia,
+imprimindo os campos do mesmo modo em todas as entradas. Para reproduzir
+fielmente o texto do manual, este documento faz \emph{mau uso} dos recursos do
+\texttt{biblatex}, aproveitando-se frequentemente de campos que devem ser
+evitados, como \texttt{note}, \texttt{addendum}, \texttt{nameaddon},
+\texttt{titleaddon} et al. Ele não deve ser usado, portanto, como referência
+para o uso do \texttt{biblatex-abnt}, mas apenas como exemplo de suas
+capacidades, mostrando que é possível (embora não seja recomendado) reproduzir
+todas as entradas do manual e expondo o modo de fazê-lo. Para o uso correto do
+\texttt{biblatex-abnt}, conferir o manual do estilo e o manual do próprio
+\texttt{biblatex}.
+
+\tableofcontents
+
+\nocite{*}
+
+
+\setcounter{section}{6}
+
+\section{Modelos de referências}
+
+
+	\printbibliography[keyword=7.1, title={Monografia no todo}]
+
+	\printbibliography[keyword=7.2,
+    title={Monografia no todo em meio eletrônico}]
+
+	\printbibliography[keyword=7.3, title={Parte de monografia}]
+
+	\printbibliography[keyword=7.4,
+    title={Parte de monografia em meio eletrônico}]
+
+	\subsection{Publicação periódica}
+
+	  \printbibliography[heading=subbib, keyword=7.5.1,
+      title={Publicação periódica como um todo}]
+	  \printbibliography[heading=subbib, keyword=7.5.2,
+      title={Partes de revista, boletim etc.}]
+	  \printbibliography[heading=subbib, keyword=7.5.3,
+      title={Artigo e/ou matéria de revista, boletim etc.}]
+	  \printbibliography[heading=subbib, keyword=7.5.4,
+      title={Artigo e/ou matéria de revista,
+             boletim etc.\ em meio eletrônico}]
+	  \printbibliography[heading=subbib, keyword=7.5.5,
+      title={Artigo e/ou matéria de jornal}]
+
+	   \printbibliography[heading=subbib, keyword=7.5.6,
+      title={Artigo e/ou matéria de jornal em meio eletrônico}]
+
+	\subsection{Evento como um todo}
+
+    \printbibliography[heading=subbib, keyword=7.6.1,
+      title={Elementos essenciais}]
+    \printbibliography[heading=subbib, keyword=7.6.2,
+      title={Elementos complementares}]
+    \printbibliography[heading=subbib, keyword=7.6.3,
+      title={Evento como um todo em meio eletrônico}]
+
+	\subsection{Trabalho apresentado em evento}
+
+    \printbibliography[heading=subbib, keyword=7.7.1,
+      title={Elementos essenciais}]
+    \printbibliography[heading=subbib, keyword=7.7.2,
+      title={Elementos complementares}]
+    \printbibliography[heading=subbib, keyword=7.7.3,
+      title={Trabalho apresentado em evento em meio eletrônico}]
+
+	\printbibliography[keyword=7.8, title={Patente}]
+
+	\subsection{Documento jurídico}
+
+    \printbibliography[heading=subbib, keyword=7.9.1, title={Legislação}]
+    \printbibliography[heading=subbib, keyword=7.9.2,
+      title={Jurisprudência (decisões judiciais)}]
+    \printbibliography[heading=subbib, keyword=7.9.3, title={Doutrina}]
+    \printbibliography[heading=subbib, keyword=7.9.4,
+      title={Documento jurídico em meio eletrônico}]
+
+	\printbibliography[keyword=7.10, title={Imagem em movimento}]
+
+	\subsection{Documento iconográfico}
+
+    \printbibliography[heading=subbib, keyword=7.11.1,
+      title={Elementos essenciais}]
+    \printbibliography[heading=subbib, keyword=7.11.2,
+      title={Elementos complementares}]
+    \printbibliography[heading=subbib, keyword=7.11.3,
+      title={Documento iconográfico em meio eletrônico}]
+
+	\subsection{Documento cartográfico}
+
+    \printbibliography[heading=subbib, keyword=7.12.1,
+      title={Elementos essenciais}]
+    \printbibliography[heading=subbib, keyword=7.12.2,
+      title={Elementos complementares}]
+    \printbibliography[heading=subbib, keyword=7.12.3,
+      title={Documento cartográfico em meio eletrônico}]
+
+	\printbibliography[keyword=7.13, title={Documento sonoro no todo}]
+
+	\printbibliography[keyword=7.14, title={Documento sonoro em parte}]
+
+	\subsection{Partitura}
+
+    \printbibliography[heading=subbib, keyword=7.15.1,
+      title={Elementos essenciais}]
+    \printbibliography[heading=subbib, keyword=7.15.2,
+      title={Elementos complementares}]
+    \printbibliography[heading=subbib, keyword=7.15.3,
+      title={Partitura em meio eletrônico}]
+
+	\printbibliography[keyword=7.16, title={Documento tridimensional}]
+
+	\printbibliography[keyword=7.17,
+    title={Documento de acesso exclusivo em meio eletrônico}]
+
+	\section{Transcrição dos elementos}
+
+	\subsection{Autoria}
+
+    \printbibliography[heading=subbib, keyword=8.1.1, title={Autor pessoal}]
+    \printbibliography[heading=subbib, keyword=8.1.2, title={Autor entidade}]
+    \printbibliography[heading=subbib, keyword=8.1.3,
+      title={Autoria desconhecida}]
+
+	\printbibliography[keyword=8.2, title={Título e subtítulo}]
+
+	\printbibliography[keyword=8.3, title={Edição}]
+
+	\printbibliography[keyword=8.4, title={Local}]
+
+	\printbibliography[keyword=8.5, title={Editora}]
+
+	\printbibliography[keyword=8.6, title={Data}]
+
+	\printbibliography[keyword=8.7, title={Descrição física}]
+
+	\printbibliography[keyword=8.8, title={Ilustrações}]
+
+	\printbibliography[keyword=8.9, title={Dimensões}]
+
+	\printbibliography[keyword=8.10, title={Séries e coleções}]
+
+	\printbibliography[keyword=8.11, title={Notas}]
+
+	\section{Ordenação das referências}
+
+	\printbibliography[keyword=9.1, title={Sistema alfabético}]
+
+	\printbibliography[keyword=9.2, title={Sistema numérico}]
+
+
+\end{document}


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_reference.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_reference.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_reference.pdf	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_reference.pdf	2017-11-12 22:33:34 UTC (rev 45765)

Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_reference.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_test.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_test.tex	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,24 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+
+\documentclass{article}
+
+\usepackage{pdfpagediff}
+
+\begin{document}
+
+\layerPages{NBR6023-2002.pdf}{NBR6023-2002_reference.pdf}
+
+\end{document}
+


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/NBR6023-2002_test.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/README.md	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/README.md	2017-11-12 22:33:34 UTC (rev 45765)
@@ -3,7 +3,7 @@
 BibLaTeX style for Brazil's ABNT (Brazilian Association of Technical Norms)
 rules.
 
-Version 3.1
+Version 3.2
 
 Permission is granted to copy, distribute and/or modify this software
 under the terms of the LaTeX Project Public License, version 1.3c
@@ -10,7 +10,9 @@
 (http://www.latex-project.org/lppl.txt).
 
 The current maintainer is
-Daniel B. Marques ([@dbmrq](https://github.com/dbmrq)).
+Daniel Ballester Marques ([@dbmrq](https://github.com/dbmrq)). With special
+thanks to [@moewew](https://github.com/moewew) and all the awesome people
+behind BibLaTeX.
 
 ---
 
@@ -18,16 +20,16 @@
 
 Substitui o pacote [`abntex2cite`](https://github.com/abntex/abntex2).
 
-**Requer `biblatex v3.6` e `biber v2.6`.**
+**Requer `biblatex v3.8` e `biber v2.8`.**
 
 O arquivo `biblatex-abnt.pdf` apresenta algumas informações sobre o uso do
-pacote e a compatibilidade com o `abntex2cite`. O arquivo `abnt-testcase.pdf`
-imprime *ipsis litteris* todas as entradas citadas na norma 6023:2002 da ABNT.
+pacote. Os arquivos `NBR6023-2002.pdf` e `NBR10520-2002.pdf` imprimem *ipsis
+litteris* todas as entradas usadas nas respectivas normas da ABNT.
 
 
 ## Instalação
 
-O `biblatex-abnt` está incluso no TeX Live 2016.
+O `biblatex-abnt` está incluso no TeX Live a partir de 2016.
 
 Para instalá-lo manualmente, copie os arquivos `.bbx`, `.cbx` e `.lbx` para
 
@@ -40,12 +42,12 @@
 1. Adicione as seguintes linhas ao preâmbulo do seu arquivo `.tex`:
 
   ```tex
-  \usepackage[style=abnt, language=brazil]{biblatex}
+  \usepackage[style=abnt]{biblatex}
   \addbibresource{arquivo.bib}        % Seus arquivos de
   \addbibresource{outroarquivo.bib}   % bibliografia vão aqui
   ```
 
-2. Use os comandos de citação (e.g. `\cite[10]{entrada2016}`) para citar
+2. Use os comandos de citação (e.g. `\cite[10]{entrada2018}`) para citar
 suas entradas.
 
 3. Use o comando `\printbibliography` para imprimir a bibliografia.

Deleted: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.pdf
===================================================================
(Binary files differ)

Deleted: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.tex	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.tex	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,218 +0,0 @@
-%% 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.
-
-\documentclass[a4paper]{article}
-\usepackage[brazil]{babel}
-\usepackage{lmodern}
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage{textcomp}
-\usepackage{microtype}
-\usepackage{hyperref}
-
-\usepackage[
-    backend=biber,
-    style=abnt,
-    sorting=none,
-    repeatfirstfields,
-    indent,
-]{biblatex}
-\usepackage[autostyle]{csquotes}
-
-\addbibresource{NBR6023-2002.bib}
-
-\defbibheading{bibliography}[]{
-    \subsection{#1}
-}
-\defbibenvironment{bibliography}
-  {\list{}{%
-     \leftmargin 6em
-     \itemsep\bibitemsep
-     \parsep\bibparsep}}
-  {\endlist}
-  {\item}
-
-\defbibheading{subbib}[]{
-    \subsubsection{#1}
-}
-
-\title{abnt-testcase}
-\author{Daniel B. Marques}
-
-
-\begin{document}
-
-\maketitle
-
-Este documento imprime \textit{ipsis litteris} todas as entradas citadas na NBR
-6023:2002, da ABNT.
-
-Para expor as diferentes maneiras como cada campo pode ser usado, a ABNT
-imprime-os de modo diferente a cada entrada. A vantagem dos sistemas como
-o \texttt{biblatex}, por outro lado, é \emph{uniformizar} a bibliografia,
-imprimindo os campos do mesmo modo em todas as entradas. Para reproduzir
-fielmente o texto do manual, este documento faz \emph{mau uso} dos recursos do
-\texttt{biblatex}, aproveitando-se frequentemente de campos que devem ser
-evitados, como \texttt{note}, \texttt{addendum}, \texttt{nameaddon},
-\texttt{titleaddon} et al. Ele não deve ser usado, portanto, como referência
-para o uso do \texttt{biblatex-abnt}, mas apenas como exemplo de suas
-capacidades, mostrando que é possível (embora não seja recomendado) reproduzir
-todas as entradas do manual e expondo o modo de fazê-lo. Para o uso correto do
-\texttt{biblatex-abnt}, conferir o manual do estilo e o manual do próprio
-\texttt{biblatex}.
-
-\tableofcontents
-
-\nocite{*}
-
-\clearpage
-
-
-\setcounter{section}{6}
-
-
-\section{Modelos de referências}
-
-
-	\printbibliography[keyword=7.1, title={Monografia no todo}]
-
-	\printbibliography[keyword=7.2,
-    title={Monografia no todo em meio eletrônico}]
-
-	\printbibliography[keyword=7.3, title={Parte de monografia}]
-
-	\printbibliography[keyword=7.4,
-    title={Parte de monografia em meio eletrônico}]
-
-	\subsection{Publicação periódica}
-
-	  \printbibliography[heading=subbib, keyword=7.5.1,
-      title={Publicação periódica como um todo}]
-	  \printbibliography[heading=subbib, keyword=7.5.2,
-      title={Partes de revista, boletim etc.}]
-	  \printbibliography[heading=subbib, keyword=7.5.3,
-      title={Artigo e/ou matéria de revista, boletim etc.}]
-	  \printbibliography[heading=subbib, keyword=7.5.4,
-      title={Artigo e/ou matéria de revista,
-             boletim etc.\ em meio eletrônico}]
-	  \printbibliography[heading=subbib, keyword=7.5.5,
-      title={Artigo e/ou matéria de jornal}]
-
-	   \printbibliography[heading=subbib, keyword=7.5.6,
-      title={Artigo e/ou matéria de jornal em meio eletrônico}]
-
-	\subsection{Evento como um todo}
-
-    \printbibliography[heading=subbib, keyword=7.6.1,
-      title={Elementos essenciais}]
-    \printbibliography[heading=subbib, keyword=7.6.2,
-      title={Elementos complementares}]
-    \printbibliography[heading=subbib, keyword=7.6.3,
-      title={Evento como um todo em meio eletrônico}]
-
-	\subsection{Trabalho apresentado em evento}
-
-    \printbibliography[heading=subbib, keyword=7.7.1,
-      title={Elementos essenciais}]
-    \printbibliography[heading=subbib, keyword=7.7.2,
-      title={Elementos complementares}]
-    \printbibliography[heading=subbib, keyword=7.7.3,
-      title={Trabalho apresentado em evento em meio eletrônico}]
-
-	\printbibliography[keyword=7.8, title={Patente}]
-
-	\subsection{Documento jurídico}
-
-    \printbibliography[heading=subbib, keyword=7.9.1, title={Legislação}]
-    \printbibliography[heading=subbib, keyword=7.9.2,
-      title={Jurisprudência (decisões judiciais)}]
-    \printbibliography[heading=subbib, keyword=7.9.3, title={Doutrina}]
-    \printbibliography[heading=subbib, keyword=7.9.4,
-      title={Documento jurídico em meio eletrônico}]
-
-	\printbibliography[keyword=7.10, title={Imagem em movimento}]
-
-	\subsection{Documento iconográfico}
-
-    \printbibliography[heading=subbib, keyword=7.11.1,
-      title={Elementos essenciais}]
-    \printbibliography[heading=subbib, keyword=7.11.2,
-      title={Elementos complementares}]
-    \printbibliography[heading=subbib, keyword=7.11.3,
-      title={Documento iconográfico em meio eletrônico}]
-
-	\subsection{Documento cartográfico}
-
-    \printbibliography[heading=subbib, keyword=7.12.1,
-      title={Elementos essenciais}]
-    \printbibliography[heading=subbib, keyword=7.12.2,
-      title={Elementos complementares}]
-    \printbibliography[heading=subbib, keyword=7.12.3,
-      title={Documento cartográfico em meio eletrônico}]
-
-	\printbibliography[keyword=7.13, title={Documento sonoro no todo}]
-
-	\printbibliography[keyword=7.14, title={Documento sonoro em parte}]
-
-	\subsection{Partitura}
-
-    \printbibliography[heading=subbib, keyword=7.15.1,
-      title={Elementos essenciais}]
-    \printbibliography[heading=subbib, keyword=7.15.2,
-      title={Elementos complementares}]
-    \printbibliography[heading=subbib, keyword=7.15.3,
-      title={Partitura em meio eletrônico}]
-
-	\printbibliography[keyword=7.16, title={Documento tridimensional}]
-
-	\printbibliography[keyword=7.17,
-    title={Documento de acesso exclusivo em meio eletrônico}]
-
-	\section{Transcrição dos elementos}
-
-	\subsection{Autoria}
-
-    \printbibliography[heading=subbib, keyword=8.1.1, title={Autor pessoal}]
-    \printbibliography[heading=subbib, keyword=8.1.2, title={Autor entidade}]
-    \printbibliography[heading=subbib, keyword=8.1.3,
-      title={Autoria desconhecida}]
-
-	\printbibliography[keyword=8.2, title={Título e subtítulo}]
-
-	\printbibliography[keyword=8.3, title={Edição}]
-
-	\printbibliography[keyword=8.4, title={Local}]
-
-	\printbibliography[keyword=8.5, title={Editora}]
-
-	\printbibliography[keyword=8.6, title={Data}]
-
-	\printbibliography[keyword=8.7, title={Descrição física}]
-
-	\printbibliography[keyword=8.8, title={Ilustrações}]
-
-	\printbibliography[keyword=8.9, title={Dimensões}]
-
-	\printbibliography[keyword=8.10, title={Séries e coleções}]
-
-	\printbibliography[keyword=8.11, title={Notas}]
-
-	\section{Ordenação das referências}
-
-	\printbibliography[keyword=9.1, title={Sistema alfabético}]
-
-	\printbibliography[keyword=9.2, title={Sistema numérico}]
-
-
-\end{document}

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.bib	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.bib	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,4 +1,4 @@
-%% Copyright 2016 Daniel B. Marques
+%% Copyright 2016 Daniel Ballester Marques
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,7 +10,7 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Daniel B. Marques.
+%% The Current Maintainer of this work is Daniel Ballester Marques.
 
 
 @mvbook{assis08,
@@ -127,4 +127,4 @@
     publisher   = {\mkbibacro{ANPOLL}},
     location    = {Campinas},
     year        = {2013},
-}
\ No newline at end of file
+}

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,4 +1,4 @@
-%% Copyright 2016 Daniel B. Marques
+%% Copyright 2016 Daniel Ballester Marques
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,7 +10,7 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Daniel B. Marques.
+%% The Current Maintainer of this work is Daniel Ballester Marques.
 
 
 % Preamble >>>1
@@ -50,27 +50,13 @@
 \setlength\itemsep{.6\baselineskip}
 
 \usepackage[%% Biblatex >>>2
-    style        = abnt,
-    language     = brazil,
-    giveninits,             % Use initials for first names
-    uniquename   = init,    % This is necessary when using giveninits
-    block        = space,   % Use spaces between blocks, making the text justified
-    hyperref,               % Turn citations into links
-    %backref,               % Back references (E.g. ``Cit. on p. 1")
-    %repeatfields,          % Repeat fields instead of using an underscore
-    %repeatfirstfields,     % Repeat only the first fields
-    %repeattitles,          % Repeat just titles, avoiding ____.____.
-    %usedashes,             % Use the standard dashes instead of underscores
-    %ittitles,              % Print titles in italics
-    %indent,                % Use hanging indentation in the bibliography
-    %scbib,                 % Use small caps in the bibliography
-    %sccite,                % Use small caps in the citations
-    %noslsn,                % Hide [s.l], [s.n] and [s.l.: s.n.]
-    %nosl,                  % Hide just [s.l]
-    %nosn,                  % Hide just [s.n]
-                            %
-    labelnumber,            % These two options are used to show the numbers
-    defernumbers = true,    % properly in the abnt-numeric examples
+    style = abnt,
+    language = brazil,
+    giveninits,
+    uniquename = init,
+    hyperref,
+    labelnumber,            % These two options are used just to show the
+    defernumbers = true,    % numbers properly in the abnt-numeric examples
 ]{biblatex}
 
 \addbibresource{biblatex-abnt.bib}% <<<2
@@ -94,10 +80,11 @@
   \printbibliography[heading=none,check=key#1]%
 }% <<<2
 
-\newcommand{\version}{3.1}
-\newcommand{\requirements}{\texttt{biblatex 3.6} e \texttt{biber 2.6}}
+\newcommand{\version}{3.2}
+\newcommand{\requirements}{\texttt{biblatex 3.8} e \texttt{biber 2.8}}
+
 \title{biblatex-abnt \version}
-\author{Daniel B. Marques}
+\author{Daniel Ballester Marques}
 
 % <<<1
 
@@ -116,7 +103,7 @@
 
 \section{Instalação}% >>>2
 
-O \texttt{biblatex-abnt} está incluso no TeX Live 2016.
+O \texttt{biblatex-abnt} está incluso no TeX Live a partir 2016.
 
 Para instalá-lo manualmente, copie os arquivos \texttt{.bbx}, \texttt{.cbx} e
 \texttt{.lbx} para
@@ -133,7 +120,6 @@
 
 \begin{verbatim}
     \usepackage[
-        language = brazil,
         style    = abnt,           % Sistema alfabético
       % style    = abnt-numeric,   % Sistema numérico
       % style    = abnt-ibid,      % Notas de referência
@@ -163,7 +149,7 @@
   \item [indent] Indenta as entradas da bibliografia
   \item [sccite] Imprime os nomes em versalete nas citações
   \item [scbib] Imprime os nomes em versalete na bibliografia
-  \item [pretty] Essa opção ativa as cinco primeiras opções citadas de uma vez
+  \item [pretty] Ativa as cinco primeiras opções citadas de uma vez
   \item [giveninits] Abrevia os primeiros nomes na bibliografia
   \item [extrayear] Mostra os anos diferenciados com letras (e.g., 2017a) também na bibliografia
   \item [nosl] Oculta as abreviações [s.l.] na bibliografia
@@ -170,7 +156,7 @@
   \item [nosn] Oculta as abreviações [s.n.] na bibliografia
   \item [noslsn] Oculta as abreviações [s.l], [s.n] e [s.l.: s.n.]
   \item [repeatfields] Imprime os campos repetidos na bibliografia, em vez de
-    substituí-los por traços sublineares
+    subs\-ti\-tu\-í-los por traços sublineares
   \item [repeatfirstfields] Repete apenas o primeiro campo de cada entrada,
     mas substitui uma segunda ocorrência com traços sublineares
   \item [repeattitles] Imprime apenas os títulos repetidos na bibliografia,
@@ -177,6 +163,13 @@
     mas substitui os autores por traços sublineares
   \item [usedashes] Usa os traços padrão do \texttt{biblatex} em vez de
     traços sublineares nos campos repetidos
+  \item [language=brazil] Essa opção é adicionada automaticamente. Para
+    imprimir a bibliografia em outros idiomas, substitua o termo
+    \texttt{brazil} pelo código da linguagem desejada
+  \item [backref] Especifica, na bibliografia, as páginas em que cada entrada
+    foi citada.
+  \item [citecount] Além das páginas, especifica quantas vezes cada entrada
+    foi citada.
 \end{description}% <<<3
 
 \vspace{\baselineskip}
@@ -227,7 +220,7 @@
 Outros exemplos:
 
 \begin{example}
-Como sabemos\footcite[Cf.][]{assis08},
+Como sabemos\footcite[Cf., e.g.,][]{assis08},
 \end{example}
 
 \begin{example}
@@ -262,88 +255,11 @@
 Assis \cite[apud][p.~200]{bosi08}
 \end{example}
 
-
-Enquanto o comando \PVerb{\footcite} imprime a versão abreviada da referência, o comando \PVerb{\footcite*} imprime a referência inteira, sua versão
-abreviada ou as abreviações ``id.'', ``ibid.'' e ``op. cit.'' de acordo com
-as instruções da ABNT (No estilo \texttt{abnt} os comandos \PVerb{\footcite} e \PVerb{\footcite*} são invertidos em relação ao estilo \texttt{abnt-ibid}):
-
-\begin{example}
-Como sabemos\footcite*[Cf.][]{bosi08},
-\end{example}
-
-O comando \PVerb{\textcite*}, por sua vez, imprime o nome completo do autor:
-
-\begin{example}
-\textcite*{bosi08}
-\end{example}
-
-A versão com asterisco dos demais comandos imprime o mesmo texto dos comandos
-originais excluindo os parênteses:
-
-\begin{example}
-\cite*{bosi08}
-\end{example}
-
-\begin{example}
-\citetitle*{bosi08}
-\end{example}
-
-\begin{example}
-\citeauthor*{bosi08}
-\end{example}
-
-\begin{example}
-\citeyear*{bosi08}
-\end{example}
 % <<<3
 
 
 \begingroup
 \let\clearpage\relax
-\subsection{Estilo \texttt{abnt-ibid}}% >>>3
-\endgroup
-
-\makeatletter
-\DeclareCiteCommand{\@apud}[\mkbibfootnote]%
-	{\iffieldundef{prenote}%
-		{}%
-		{\printfield[uppercasecite]{prenote}%
-		\addspace\bibstring{apud}\addspace}}%
-	{\usebibmacro{citeindex}%
-	\usebibmacro{footcite:short}}%
-	{\setunit{\multicitedelim}}%
-	{\usebibmacro{postnote}}%
-
-\DeclareMultiCiteCommand{\apud}[\addapud\mkbibfootnote]%
-	{\@apud}%
-	{\setunit{\multicitedelim}%
-}%
-\makeatother
-
-\begin{example}
-Segundo o autor\footcite{bosi08}\\
-Segundo o autor\footcite{assis08:1}
-\end{example}
-
-\begin{example}
-Segundo o autor\apud{assis08}{bosi08}
-\end{example}
-
-A referência é abreviada automaticamente e as abreviações ``id.'',
-``ibid.'', ``op. cit.'' e ``loc. cit.'' são adicionadas quando apropriado:
-
-\begin{example}
-Segundo o autor\footcite[25]{assis08}\\
-Segundo o autor\footcite[55]{assis08:1}\\
-Segundo o autor\footcite[43]{bosi08}\\
-Segundo o autor\footcite[134]{bosi08}\\
-Segundo o autor\footcite[25]{assis08}\\
-Segundo o autor\footcite[254]{bosi08}
-\end{example}% <<<3
-
-
-\begingroup
-\let\clearpage\relax
 \subsection{Estilo \texttt{abnt-numeric}}% >>>3
 \endgroup
 
@@ -370,7 +286,11 @@
       {}}}
 
 \makeatletter
-\newbibmacro*{textcite}{%
+\renewbibmacro*{textcite}{%
+  \let\mkbibnamefamily\origmkbibnamefamily%
+  \let\mkbibnamegiven\origmkbibnamegiven%
+  \let\mkbibnameprefix\origmkbibnameprefix%
+  \let\mkbibnamesuffix\origmkbibnamesuffix%
   \iffieldequals{namehash}{\cbx at lasthash}
     {\setunit{\multicitedelim}}
     {\ifnameundef{labelname}
@@ -406,6 +326,19 @@
 \end{example}
 % <<<3
 
+
+\begingroup
+\let\clearpage\relax
+\subsection{Estilo \texttt{abnt-ibid}}% >>>3
+\endgroup
+
+No estilo \texttt{abnt-ibid}, o comando \texttt{footcite} imprime, conforme as
+instruções da ABNT, a referência inteira, sua versão abreviada ou as
+abreviações ``id.'', ``ibid.'', ``op. cit.'' e ``loc. cit.''. O comando
+\texttt{apud} também é adaptado para usar as notas de rodapé.
+
+% <<<3
+
 % <<<2
 
 \clearpage
@@ -829,157 +762,157 @@
 
 % <<<2
 
-\clearpage
-\section{Compatibilidade com o pacote \texttt{abntex2cite}}% >>>2
+% \clearpage
+% \section{Compatibilidade com o pacote \texttt{abntex2cite}}% >>>2
 
-Em geral é possível usar o mesmo arquivo \texttt{.bib} utilizado pelo
-\texttt{abntex2cite}, e para a maior parte das entradas mais simples nenhuma
-mudança é necessária; estas são as principais exceções:
+% Em geral é possível usar o mesmo arquivo \texttt{.bib} utilizado pelo
+% \texttt{abntex2cite}, e para a maior parte das entradas mais simples nenhuma
+% mudança é necessária; estas são as principais exceções:
 
-\begin{itemize}
-  \begin{sloppypar}
-  \item Não consegui entender por que, mas os exemplos do
-    \texttt{abntex2cite} usam \verb"\'\i" para o caractere ``í'', enquanto o
-    normal me parece ser \verb"\'i" (para outras letras com acento agudo o
-    \texttt{abntex2cite} usa o formato normal). Isso pode causar alguns
-    problemas, o ideal é usar \verb"\'i" (ou aproveitar os recursos do biber
-    e usar a codificação utf-8). Caso isso não seja possível por algum
-    motivo, chamar o biblatex com a opção \texttt{safeinputenc} pode
-    resolver alguns problemas (mas também causa alguns outros, interferindo,
-    por exemplo, na capitalização automática de palavras acentuadas).
-  \item Os campos de datas (\texttt{date}, \texttt{year}, \texttt{month} etc.)
-    devem seguir o formato usado pelo \texttt{biblatex} (\texttt{yyyy-mm-dd}).
-    Cf. seção 2.2.1 do manual.
-  \item O \texttt{biblatex} diferencia os campos \texttt{pages} (e.g. ``p.
-    12-18'') e \texttt{pagetotal} (e.g. ``347 p.'').
-  \item Quando o primeiro campo impresso é o título, a primeira palavra é
-    automaticamente impressa em maiúsculas. Para que mais de uma palavra seja
-    impressa em maiúsculas, coloque-as entre chaves ou separadas por um
-    \emph{no breaking space} (\verb"~").
-  \item Quando o primeiro campo impresso é a organização, todo o campo é
-    impresso em maiúsculas. Para que a capitalização de uma palavra não
-    seja alterada, coloque-a entre chaves (e.g. \verb"{pAlaVRa}").
-  \item Pode-se incluir no campo \texttt{options} as opções \texttt{nosl}
-    (para não mostrar a abreviação ``[s.l]''), \texttt{nosn} (para não
-    mostrar ``[s.n.]'') ou \texttt{noslsn} (para não mostrar nenhuma das duas
-    abreviações) (e.g. \texttt{options = \{noslsn\}}); essa configuração
-    tem efeito em cada entrada específica. Pode-se também incluir essas
-    opções
-    ao chamar o \texttt{biblatex} para nunca mostrar as abreviações, e
-    então abrir exceções para entradas específicas (e.g. \texttt{options =
-    \{noslsn=false\}}).
-  \item Para periódicos, deve se utilizar entradas \texttt{@periodical}.
-    Usando-se \texttt{@book}, como no \texttt{abntex2cite}, o ISSN não
-    aparece.
-  \item Para teses de mestrado e doutorado, o campo \texttt{pagetotal} é
-    automaticamente formatado em folhas, como requer a norma (e.g. ``347
-    f.''). Para usar páginas também nessas entradas, use
-    \texttt{bookpagination =
-    \{page\}}. Para usar folhas em outras entradas, use
-    \texttt{bookpagination = \{sheet\}}.
-  \item Ao modificar o campo \texttt{type} em teses de mestrado e doutorado,
-    deve-se preenchê-lo com todo o texto desejado (e.g. ``Tese (Doutorado em
-    Nutrição)'').
-  \item Ao utilizar o campo \texttt{illustrated}, deve-se preenchê-lo com
-    todo o texto desejado (e.g. ``il.'').
-  \item Além do campo \texttt{organization}, há o campo \texttt{nameaddon},
-    de modo que organizações como ``BRASIL. Supremo Tribunal de Justiça'' e
-    ``BRASIL. Supremo Tribunal Federal'' podem ter uma mesma organização,
-    diferenciando-se por esse campo. Isso permite que a primeira parte,
-    ``BRASIL'', não seja repetida várias vezes seguidas (e.g.
-    ``\underline{\hspace*{4em}}. Supremo Tribunal Federal'').
-  \item O \texttt{abntex2cite} às vezes usa o campo \texttt{type} como um
-    complemento da organização (um exemplo é a entrada
-    \texttt{brasil1988}).
-    Com o \texttt{biblatex-abnt} deve-se usar o campo \texttt{nameaddon} em
-    vez de \texttt{type}. Embora nesse caso (``Constituição (1988)'') o
-    campo
-    \texttt{type} faça mais sentido semanticamente, colocá-lo nessa
-    posição causaria problemas na organização alfabética da bibliografia,
-    já que o campo \texttt{type} às vezes aparece antes do título e às
-    vezes depois.
-  \item A recomendação do manual do \texttt{biblatex} (seção 2.3.3) é de
-    que, para autores corporativos, utilize-se os campos \texttt{author} e
-    \texttt{editor}, colocando o nome da organização entre chaves. Essa
-    opção tem a vantagem de permitir que se misture autores corporativos e
-    autores comuns (e.g. \texttt{editor = \{National Aeronautics and Space
-    Administration\} and John Doe}).
-  \item Quando o nome do autor, editor ou organização for muito grande para
-    usar nas citações, pode-se acrescentar os campos \texttt{short\-author}
-    e \texttt{short\-editor} (e.g. \texttt{author = \{National Aeronautics and
-    Space Ad\-min\-is\-tra\-tion\},} \texttt{short\-author = \{NASA\}}
-    imprimirá ``NASA'' nas citações e ``National Aeronautics and Space
-    Administration'' na bibliografia). O campo \texttt{org-short}, usado pelo
-    \texttt{abntex\-2\-cite}, é automaticamente convertido para
-    \texttt{shortauthor}.
-  \item O separador ``de'' faz com que tudo o que vem depois dele seja
-    considerado um único sobrenome (e.g. na entrada \texttt{alves1995} o nome
-    \texttt{Roque de Brito} \texttt{Alves} é impresso como ``BRITO ALVES,
-    Roque de''). Cf. \url{http://tex.stackexchange.com/q/308625/102699}.
-  \item Quando os campos \texttt{number}, \texttt{volume}, \texttt{chapter} e
-    \texttt{edition} contêm apenas números, eles são formatados
-    automaticamente (e.g. \texttt{edition = \{5\}} imprime ``5. ed.''). Quando
-    esses campos contêm letras, deve-se preencher todo o conteúdo desejado
-    (e.g. \verb"edition = {5th. ed}" imprime ``5th. ed.''). Os caracteres
-    \texttt{.,-/} podem ser usados e o campo ainda será considerado como
-    contendo apenas números.
-  \item Em entradas dos tipos \texttt{phdthesis}, \texttt{mastersthesis} e
-    \texttt{monography}, há a data de publicação, que aparece logo após o
-    título, e a data da defesa, que aparece por último. O
-    \texttt{abntex2cite}
-    às vezes usa o campo \texttt{year-presented} para diferenciar entre as
-    duas
-    datas e às vezes muda as opções do pacote para mostrar uma mesma data
-    em
-    uma ou outra posição. No \texttt{biblatex-abnt} pode-se usar os campos
-    de
-    datas usuais para a data de publicação, que aparece após o título, e
-    os campos \texttt{eventdate}, \texttt{eventmonth} e \texttt{eventyear}
-    para a
-    data da defesa, que aparece no final. O campo \texttt{year-presented},
-    usado pelo \texttt{abntex2cite}, é automaticamente convertido para
-    \texttt{eventyear}. (Cf. entradas \texttt{morgado1990},
-    \texttt{morgadob1990} e \texttt{morgadoc1990} no arquivo
-    \texttt{abnt-testcase.tex}.)
-  \item Em vez dos campos \texttt{reprinted-from} e \texttt{reprinted-text},
-    utilizados pelo \texttt{abntex2cite}, usa-se o campo \texttt{related} para
-    citar uma entrada relacionada e o campo \texttt{relatedtype} para
-    especificar a natureza dessa relação. O campo \texttt{reprinted-from} é
-    automaticamente convertido para \texttt{related}; esse campo deve conter a
-    chave da obra relacionada. O campo \texttt{relatedtype} pode conter
-    algumas
-    opções: \texttt{relatedtype=\{reprintfrom\}} imprime ``Separata de''
-    (esse texto também é usado como padrão quando se escreve qualquer coisa
-    no campo \texttt{reprinted-text}, usado no \texttt{abntex2cite});
-    \texttt{recensionof} imprime ``Recensão de''; \texttt{reviewof} imprime
-    ``Resenha de''; \texttt{reprintof} imprime ``Reimpressão de'';
-    \texttt{translationof} imprime ``Tradução de''. Outras possibilidades
-    podem ser encontradas no arquivo \texttt{brazilian.lbx}, incluso na
-    instalação padrão do \texttt{biblatex}.
-  \item No \texttt{biblatex}, as entradas \texttt{inbook} e
-    \texttt{incollection} não se comportam como no \texttt{bibtex}. Entradas
-    \texttt{inbook} também podem ter um \texttt{bookauthor}; elas estão para
-    as entradas \texttt{book} assim como as entradas \texttt{incollection}
-    estão para as entradas \texttt{collection} (Cf. seção 2.3.1 do manual
-    do \texttt{biblatex}). Para que o autor da obra principal seja
-    substituído pelos traços sublineares, é necessário que o campo
-    \texttt{bookauthor} seja igual ao campo \texttt{author}.
-  \item É possível usar o campo \texttt{furtherresp} como no
-    \texttt{abntex2cite}, mas é preferível usar os campos \texttt{editora},
-    \texttt{editoratype}, \texttt{editorb}, \texttt{editorbtype} etc. (e.g.
-    \verb"editora = {Ismael Cardim},  editoratype={coeditor}" imprimirá
-    ``Co-edição de Ismael Cardim'' na biblioqgrafia; cf. entradas
-    \texttt{hou\-a\-iss\-1996}, \texttt{koogan1998}, \texttt{ceravi1983},
-    \texttt{riofilme1998} e pesquisar pelo campo \texttt{editor\-a\-type} para
-    mais exemplos). Todas as opções para o campo \texttt{editor\-type} podem
-    ser encontradas no arquivo \texttt{abnt-brazilian.lbx}. Usar esses campos
-    em lugar do campo \texttt{furtherresp} assegurará que as entradas sejam
-    impressas de forma consistente, embora os exemplos da própria ABNT não o
-    sejam.
-  \item Para tradutores pode-se usar o campo \texttt{translator}.
-  \end{sloppypar}
-\end{itemize}
-% <<<2
+% \begin{itemize}
+%   \begin{sloppypar}
+%   \item Não consegui entender por que, mas os exemplos do
+%     \texttt{abntex2cite} usam \verb"\'\i" para o caractere ``í'', enquanto o
+%     normal me parece ser \verb"\'i" (para outras letras com acento agudo o
+%     \texttt{abntex2cite} usa o formato normal). Isso pode causar alguns
+%     problemas, o ideal é usar \verb"\'i" (ou aproveitar os recursos do biber
+%     e usar a codificação utf-8). Caso isso não seja possível por algum
+%     motivo, chamar o biblatex com a opção \texttt{safeinputenc} pode
+%     resolver alguns problemas (mas também causa alguns outros, interferindo,
+%     por exemplo, na capitalização automática de palavras acentuadas).
+%   \item Os campos de datas (\texttt{date}, \texttt{year}, \texttt{month} etc.)
+%     devem seguir o formato usado pelo \texttt{biblatex} (\texttt{yyyy-mm-dd}).
+%     Cf. seção 2.2.1 do manual.
+%   \item O \texttt{biblatex} diferencia os campos \texttt{pages} (e.g. ``p.
+%     12-18'') e \texttt{pagetotal} (e.g. ``347 p.'').
+%   \item Quando o primeiro campo impresso é o título, a primeira palavra é
+%     automaticamente impressa em maiúsculas. Para que mais de uma palavra seja
+%     impressa em maiúsculas, coloque-as entre chaves ou separadas por um
+%     \emph{no breaking space} (\verb"~").
+%   \item Quando o primeiro campo impresso é a organização, todo o campo é
+%     impresso em maiúsculas. Para que a capitalização de uma palavra não
+%     seja alterada, coloque-a entre chaves (e.g. \verb"{pAlaVRa}").
+%   \item Pode-se incluir no campo \texttt{options} as opções \texttt{nosl}
+%     (para não mostrar a abreviação ``[s.l]''), \texttt{nosn} (para não
+%     mostrar ``[s.n.]'') ou \texttt{noslsn} (para não mostrar nenhuma das duas
+%     abreviações) (e.g. \texttt{options = \{noslsn\}}); essa configuração
+%     tem efeito em cada entrada específica. Pode-se também incluir essas
+%     opções
+%     ao chamar o \texttt{biblatex} para nunca mostrar as abreviações, e
+%     então abrir exceções para entradas específicas (e.g. \texttt{options =
+%     \{noslsn=false\}}).
+%   \item Para periódicos, deve se utilizar entradas \texttt{@periodical}.
+%     Usando-se \texttt{@book}, como no \texttt{abntex2cite}, o ISSN não
+%     aparece.
+%   \item Para teses de mestrado e doutorado, o campo \texttt{pagetotal} é
+%     automaticamente formatado em folhas, como requer a norma (e.g. ``347
+%     f.''). Para usar páginas também nessas entradas, use
+%     \texttt{bookpagination =
+%     \{page\}}. Para usar folhas em outras entradas, use
+%     \texttt{bookpagination = \{sheet\}}.
+%   \item Ao modificar o campo \texttt{type} em teses de mestrado e doutorado,
+%     deve-se preenchê-lo com todo o texto desejado (e.g. ``Tese (Doutorado em
+%     Nutrição)'').
+%   \item Ao utilizar o campo \texttt{illustrated}, deve-se preenchê-lo com
+%     todo o texto desejado (e.g. ``il.'').
+%   \item Além do campo \texttt{organization}, há o campo \texttt{nameaddon},
+%     de modo que organizações como ``BRASIL. Supremo Tribunal de Justiça'' e
+%     ``BRASIL. Supremo Tribunal Federal'' podem ter uma mesma organização,
+%     diferenciando-se por esse campo. Isso permite que a primeira parte,
+%     ``BRASIL'', não seja repetida várias vezes seguidas (e.g.
+%     ``\underline{\hspace*{4em}}. Supremo Tribunal Federal'').
+%   \item O \texttt{abntex2cite} às vezes usa o campo \texttt{type} como um
+%     complemento da organização (um exemplo é a entrada
+%     \texttt{brasil1988}).
+%     Com o \texttt{biblatex-abnt} deve-se usar o campo \texttt{nameaddon} em
+%     vez de \texttt{type}. Embora nesse caso (``Constituição (1988)'') o
+%     campo
+%     \texttt{type} faça mais sentido semanticamente, colocá-lo nessa
+%     posição causaria problemas na organização alfabética da bibliografia,
+%     já que o campo \texttt{type} às vezes aparece antes do título e às
+%     vezes depois.
+%   \item A recomendação do manual do \texttt{biblatex} (seção 2.3.3) é de
+%     que, para autores corporativos, utilize-se os campos \texttt{author} e
+%     \texttt{editor}, colocando o nome da organização entre chaves. Essa
+%     opção tem a vantagem de permitir que se misture autores corporativos e
+%     autores comuns (e.g. \texttt{editor = \{National Aeronautics and Space
+%     Administration\} and John Doe}).
+%   \item Quando o nome do autor, editor ou organização for muito grande para
+%     usar nas citações, pode-se acrescentar os campos \texttt{short\-author}
+%     e \texttt{short\-editor} (e.g. \texttt{author = \{National Aeronautics and
+%     Space Ad\-min\-is\-tra\-tion\},} \texttt{short\-author = \{NASA\}}
+%     imprimirá ``NASA'' nas citações e ``National Aeronautics and Space
+%     Administration'' na bibliografia). O campo \texttt{org-short}, usado pelo
+%     \texttt{abntex\-2\-cite}, é automaticamente convertido para
+%     \texttt{shortauthor}.
+%   \item O separador ``de'' faz com que tudo o que vem depois dele seja
+%     considerado um único sobrenome (e.g. na entrada \texttt{alves1995} o nome
+%     \texttt{Roque de Brito} \texttt{Alves} é impresso como ``BRITO ALVES,
+%     Roque de''). Cf. \url{http://tex.stackexchange.com/q/308625/102699}.
+%   \item Quando os campos \texttt{number}, \texttt{volume}, \texttt{chapter} e
+%     \texttt{edition} contêm apenas números, eles são formatados
+%     automaticamente (e.g. \texttt{edition = \{5\}} imprime ``5. ed.''). Quando
+%     esses campos contêm letras, deve-se preencher todo o conteúdo desejado
+%     (e.g. \verb"edition = {5th. ed}" imprime ``5th. ed.''). Os caracteres
+%     \texttt{.,-/} podem ser usados e o campo ainda será considerado como
+%     contendo apenas números.
+%   \item Em entradas dos tipos \texttt{phdthesis}, \texttt{mastersthesis} e
+%     \texttt{monography}, há a data de publicação, que aparece logo após o
+%     título, e a data da defesa, que aparece por último. O
+%     \texttt{abntex2cite}
+%     às vezes usa o campo \texttt{year-presented} para diferenciar entre as
+%     duas
+%     datas e às vezes muda as opções do pacote para mostrar uma mesma data
+%     em
+%     uma ou outra posição. No \texttt{biblatex-abnt} pode-se usar os campos
+%     de
+%     datas usuais para a data de publicação, que aparece após o título, e
+%     os campos \texttt{eventdate}, \texttt{eventmonth} e \texttt{eventyear}
+%     para a
+%     data da defesa, que aparece no final. O campo \texttt{year-presented},
+%     usado pelo \texttt{abntex2cite}, é automaticamente convertido para
+%     \texttt{eventyear}. (Cf. entradas \texttt{morgado1990},
+%     \texttt{morgadob1990} e \texttt{morgadoc1990} no arquivo
+%     \texttt{abnt-testcase.tex}.)
+%   \item Em vez dos campos \texttt{reprinted-from} e \texttt{reprinted-text},
+%     utilizados pelo \texttt{abntex2cite}, usa-se o campo \texttt{related} para
+%     citar uma entrada relacionada e o campo \texttt{relatedtype} para
+%     especificar a natureza dessa relação. O campo \texttt{reprinted-from} é
+%     automaticamente convertido para \texttt{related}; esse campo deve conter a
+%     chave da obra relacionada. O campo \texttt{relatedtype} pode conter
+%     algumas
+%     opções: \texttt{relatedtype=\{reprintfrom\}} imprime ``Separata de''
+%     (esse texto também é usado como padrão quando se escreve qualquer coisa
+%     no campo \texttt{reprinted-text}, usado no \texttt{abntex2cite});
+%     \texttt{recensionof} imprime ``Recensão de''; \texttt{reviewof} imprime
+%     ``Resenha de''; \texttt{reprintof} imprime ``Reimpressão de'';
+%     \texttt{translationof} imprime ``Tradução de''. Outras possibilidades
+%     podem ser encontradas no arquivo \texttt{brazilian.lbx}, incluso na
+%     instalação padrão do \texttt{biblatex}.
+%   \item No \texttt{biblatex}, as entradas \texttt{inbook} e
+%     \texttt{incollection} não se comportam como no \texttt{bibtex}. Entradas
+%     \texttt{inbook} também podem ter um \texttt{bookauthor}; elas estão para
+%     as entradas \texttt{book} assim como as entradas \texttt{incollection}
+%     estão para as entradas \texttt{collection} (Cf. seção 2.3.1 do manual
+%     do \texttt{biblatex}). Para que o autor da obra principal seja
+%     substituído pelos traços sublineares, é necessário que o campo
+%     \texttt{bookauthor} seja igual ao campo \texttt{author}.
+%   \item É possível usar o campo \texttt{furtherresp} como no
+%     \texttt{abntex2cite}, mas é preferível usar os campos \texttt{editora},
+%     \texttt{editoratype}, \texttt{editorb}, \texttt{editorbtype} etc. (e.g.
+%     \verb"editora = {Ismael Cardim},  editoratype={coeditor}" imprimirá
+%     ``Co-edição de Ismael Cardim'' na biblioqgrafia; cf. entradas
+%     \texttt{hou\-a\-iss\-1996}, \texttt{koogan1998}, \texttt{ceravi1983},
+%     \texttt{riofilme1998} e pesquisar pelo campo \texttt{editor\-a\-type} para
+%     mais exemplos). Todas as opções para o campo \texttt{editor\-type} podem
+%     ser encontradas no arquivo \texttt{abnt-brazilian.lbx}. Usar esses campos
+%     em lugar do campo \texttt{furtherresp} assegurará que as entradas sejam
+%     impressas de forma consistente, embora os exemplos da própria ABNT não o
+%     sejam.
+%   \item Para tradutores pode-se usar o campo \texttt{translator}.
+%   \end{sloppypar}
+% \end{itemize}
+% % <<<2
 
 \clearpage
 \nocite{*}

Added: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/test.sh
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/test.sh	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/test.sh	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+sed -i '' 's/\\toggletrue{reference}/% \\toggletrue{reference}/' NBR10520-2002.tex
+
+sed -i '' 's/\\toggletrue{reference}/% \\toggletrue{reference}/' NBR6023-2002.tex
+
+latexmk -pdf -norc NBR10520-2002.tex
+
+latexmk -pdf -norc NBR6023-2002.tex
+
+pdflatex NBR10520-2002_test.tex
+
+pdflatex NBR6023-2002_test.tex
+
+latexmk -norc -c
+
+rm NBR10520-2002.bbl
+
+rm NBR6023-2002.bbl
+
+rm NBR10520-2002.run.xml
+
+rm NBR6023-2002.run.xml
+
+sed -i '' 's/% \\toggletrue{reference}/\\toggletrue{reference}/' NBR10520-2002.tex
+
+sed -i '' 's/% \\toggletrue{reference}/\\toggletrue{reference}/' NBR6023-2002.tex
+


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/test.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/tests/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/tests/README.md	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/tests/README.md	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,33 @@
+
+# biblatex-abnt/tests
+
+- The files `NBR10520-2002.tex` and `NBR6023-2002.tex` use the biblatex-abnt
+  style to print every entry mentioned on the respective ABNT rules.
+
+- The files `NBR10520-2002_reference.pdf` and `NBR6023-2002_reference.pdf` are
+  the latest compilation of the files above that was manually checked against
+  ABNT's rules and confirmed to be accurate.
+
+- The files `NBR10520-2002_test.tex` and `NBR6023-2002_test.tex` compare the
+  reference files with a current compilation (which has to be generated from
+  the original tex files), making it easy to check if the style has strayed
+  from the rules.
+
+- The `test.sh` script automates that last step.
+
+---
+
+- Os arquivos `NBR10520-2002.tex` e `NBR6023-2002.tex` usam o biblatex-abnt
+  para imprimir todas as entradas citadas nas respectivas normas.
+
+- Os arquivos `NBR10520-2002_reference.pdf` e `NBR6023-2002_reference.pdf` são
+  a última compilação dos arquivos acima que foi manualmente comparada à norma
+  da ABNT com um resultado favorável.
+
+- Os arquivos `NBR10520-2002_test.tex` e `NBR6023-2002_test.tex` comparam os
+  arquivos de referência com uma compilação atual (que deve ser gerada
+  a partir dos arquivos tex originais), permitindo visualizar facilmente os
+  pontos em que o estilo distanciou-se da norma.
+
+- O script `test.sh` automatiza esse último passo.
+


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/tests/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,337 +0,0 @@
-%% 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.
-
-\ProvidesFile{abnt-brazilian.lbx}%
-[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]%
-
-
-% Init >>>
-
-\InheritBibliographyExtras{brazilian}%
-\InheritBibliographyStrings{brazilian}
-\DeclareBibliographyStrings{%
-  inherit = {brazil},%
-}%
-
-% <<<
-
-% 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           = {{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          = {{dispon\'ivel em}{dispon\'ivel em}},%
-  urlseen          = {{acesso em}{acesso em}},%
-  sheet            = {{folha}{f\adddot}},%
-  sheets           = {{folhas}{f\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\c{c}\~ao (Mestrado)}{Diss. (Mestrado)}},%
-  reprintfrom      = {{separata de}{separata de}},%
-  recensionof      = {{recens\~ao de}{recens\~ao de}},%
-  reviewof         = {{resenha de}{resenha de}},%
-}%
-
-% <<<
-
-% Languages >>>1
-
-\DeclareBibliographyStrings{%
-  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\^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\^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}},%
-  fromswedish      = {{do original sueco}{do original sueco}},%
-}%
-
-% <<<
-
-% Roles expressed as functions >>>1
-
-\NewBibliographyString{%
-  organizer,%
-  organizers,%
-  coordinator,%
-  coordinators,%
-}%
-
-\DeclareBibliographyStrings{%
-  editors         = {{editores}{ed\adddot}},%
-  collaborators   = {{colaboradores}{col\adddot}},%
-  translators     = {{tradutores}{trad\adddot}},%
-  commentators    = {{comentadores}{coment\adddot}},%
-  annotators      = {{anotadores}{anot\adddot}},%
-  organizer       = {{organizador}{org\adddot}},%
-  organizers      = {{organizadores}{org\adddot}},%
-  coordinator     = {{coordenador}{coord\adddot}},%
-  coordinators    = {{coordenadores}{coord\adddot}},%
-}%
-
-% <<<
-
-% Roles expressed as objects >>>1
-
-\DeclareBibliographyStrings{%
-  withcommentator  = {{coment\'ario\addcolon}{coment\'ario\addcolon}},%
-  withannotator    = {{notas\addcolon}{notas\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}},%
-}%
-
-% <<<
-
-% 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-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\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\c{c}\~ao\addcolon}%
-                     {grava\c{c}\~ao\addcolon}},%
-  byphotographer   = {{fotografia\addcolon}%
-                     {fotografia\addcolon}},%
-  bygenorg         = {{organiza\c{c}\~ao geral\addcolon}%
-                     {organiza\c{c}\~ao geral\addcolon}},%
-  byauthor         = {{por}%
-                     {por}},%
-  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\~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\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\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}},%
-}% <<<
-
-% <<<
-
-\endinput%
-
-% vim: set foldmarker=\ >>>,\ <<< :
-

Deleted: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-english.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-english.lbx	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-english.lbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,184 +0,0 @@
-%% 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=\ >>>,\ <<< :
-

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,4 +1,4 @@
-%% Copyright 2016 Daniel B. Marques
+%% Copyright 2016 Daniel Ballester Marques
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,10 +10,10 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Daniel B. Marques.
+%% The Current Maintainer of this work is Daniel Ballester Marques.
 
 \ProvidesFile{abnt-ibid.bbx}
-[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]%
+[2017/11/09\space v3.2\space ABNT BibLaTeX citation style]%
 
 \RequireBibliographyStyle{abnt}
 

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,4 +1,4 @@
-%% Copyright 2016 Daniel B. Marques
+%% Copyright 2016 Daniel Ballester Marques
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,61 +10,136 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Daniel B. Marques.
+%% The Current Maintainer of this work is Daniel Ballester Marques.
 
 \ProvidesFile{abnt-ibid.cbx}%
-[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]%
+[2017/11/09\space v3.2\space ABNT BibLaTeX citation style]%
 
-\newtoggle{sccite}%
+% Init >>>1
 
+\RequirePackage{xparse}%
+\RequirePackage{xpatch}%
+\RequirePackage{expl3}%
+\RequirePackage{l3regex}%
+
+% <<<1
+
 % Format >>>1
 
-\DeclareFieldFormat{citetitle}{%% >>>2
+\newcommand*{\UpperOrSCCite}[1]{% >>>2
   \iftoggle{sccite}{%
-    \normalfont\textsc{\MakeLowercase{\FirstWord{#1}}}%
+    \textsc{\MakeLowercase{#1}}%
   }{%
-    \normalfont\MakeUppercase{\FirstWord{#1}}%
+    \MakeUppercase{#1}%
   }%
-}%% <<<2
+}% <<<2
 
-\DeclareNameFormat{LAST}{%% >>>2
+\newcommand*{\NormalOrSCCite}[1]{% >>>2
+  \iftoggle{sccite}{%
+    \textsc{\MakeLowercase{#1}}%
+  }{%
+    #1%
+  }%
+}% <<<2
+
+% \IfInitial >>>2
+
+\ExplSyntaxOn
+
+\NewDocumentCommand{\IfInitial}{mmm}{%
+  \regex_match:nVTF {\w\.} \namepartgiven {#2} {#3}%
+}
+\cs_generate_variant:Nn \regex_match:nnTF { nV }
+
+\ExplSyntaxOff
+
+% <<<2
+
+\renewbibmacro*{name:family}[4]{% >>>2
+  \ifuseprefix
+    {\usebibmacro{name:delim}{#3#1}%
+     \usebibmacro{name:hook}{#3#1}%
+     \ifdefvoid{#3}{}{%
+       \ifcapital{%
+          \iftoggle{sccite}{%
+            \mkbibnameprefix{#3}\isdot%
+          }{%
+            \mkbibnameprefix{\MakeCapital{#3}}\isdot%
+          }
+       }{%
+          \mkbibnameprefix{#3}\isdot%
+       }%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \mkbibnamefamily{#1}\isdot
+     \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}
+    {\usebibmacro{name:delim}{#1}%
+     \usebibmacro{name:hook}{#1}%
+     \mkbibnamefamily{#1}\isdot
+     \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}% <<<2
+
+\DeclareNameFormat{labelname}{% >>>2
+  % Use family-given instead of given-family
   \ifcase\value{uniquename}%
     \usebibmacro{name:family}%
-      {\iftoggle{sccite}%
-        {\textsc{\MakeLowercase{\namepartfamily}}}%
-  			{\MakeUppercase{\namepartfamily}}}%
+      {\namepartfamily}%
       {\namepartgiven}%
       {\namepartprefix}%
       {\namepartsuffix}%
   \or%
     \ifuseprefix%
-      {\usebibmacro{name:given-family}%
-        {\iftoggle{sccite}%
-  	    	{\textsc{\MakeLowercase{\namepartfamily}}}%
-          {\MakeUppercase{\namepartfamily}}}%
+      {\usebibmacro{name:family-given}%
+        {\namepartfamily}%
         {\namepartgiveni}%
         {\namepartprefix}%
         {\namepartsuffixi}}%
-      {\usebibmacro{name:given-family}%
-        {\iftoggle{sccite}%
-  	    	{\textsc{\MakeLowercase{\namepartfamily}}}%
-  			{\MakeUppercase{\namepartfamily}}}%
+      {\usebibmacro{name:family-given}%
+        {\namepartfamily}%
         {\namepartgiveni}%
         {\namepartprefixi}%
         {\namepartsuffixi}}%
   \or%
-    \usebibmacro{name:given-family}%
-      {\iftoggle{sccite}%
-        {\textsc{\MakeLowercase{\namepartfamily}}}%
-  			{\MakeUppercase{\namepartfamily}}}%
+    \usebibmacro{name:family-given}%
+      {\namepartfamily}%
       {\namepartgiven}%
       {\namepartprefix}%
       {\namepartsuffix}%
   \fi%
-  \usebibmacro{name:andothers}%
+  \usebibmacro{name:andothers}}% <<<2
+
+\let\origmkbibnamefamily\mkbibnamefamily%
+\let\origmkbibnamegiven\mkbibnamegiven%
+\let\origmkbibnameprefix\mkbibnameprefix%
+\let\origmkbibnamesuffix\mkbibnamesuffix%
+
+\renewcommand*{\mkbibnamefamily}[1]{% >>>2
+  \UpperOrSCCite{#1}%
 }% <<<2
+\renewcommand*{\mkbibnamegiven}[1]{% >>>2
+  \ifnumequal{\value{uniquename}}{2}{%
+      \IfInitial{#1}{\NormalOrSCCite{#1}}{#1}%
+  }{%
+      \NormalOrSCCite{#1}%
+  }%
+}% <<<2
+\renewcommand*{\mkbibnameprefix}[1]{% >>>2
+  \ifuseprefix{%
+    \UpperOrSC{#1}%
+  }{%
+    \ifnumequal{\value{uniquename}}{2}{#1}{\NormalOrSCCite{#1}}%
+  }
+}% <<<2
+\renewcommand*{\mkbibnamesuffix}[1]{% >>>2
+  \UpperOrSCCite{#1}%
+}% <<<2
 
-% \DeclareDelimFormat{nameyeardelim}{\addcomma\addspace}%
+\DeclareFieldFormat{firstword}{%% >>>2
+  \iftoggle{sccite}{%
+    \normalfont\textsc{\MakeLowercase{\FirstWord{#1}}}%
+  }{%
+    \normalfont\MakeUppercase{\FirstWord{#1}}%
+  }%
+}%% <<<2
+
 \renewcommand*{\nameyeardelim}{\addcomma\addspace}%
 
 % <<<1
@@ -71,6 +146,8 @@
 
 % Options >>>1
 
+\newtoggle{sccite}%
+
 \DeclareBibliographyOption{sccite}[true]{
   \settoggle{sccite}{#1}%
 }
@@ -285,7 +362,7 @@
 \newbibmacro*{footcite:short}{%
   \ifnameundef{labelname}{%
     \printtext[bibhyperref]{%
-      \printfield[citetitle]{labeltitle}%
+      \printfield[firstword]{labeltitle}%
     }%
   }{%
     \printnames[LAST]{labelname}%
@@ -295,7 +372,7 @@
   }{%
     \printtext[bibhyperlink]{%
       \printfield{labelyear}%
-      \printfield{extrayear}%
+      \printfield{extradate}%
     }%
   }%
 }% <<<2
@@ -303,7 +380,7 @@
 \newbibmacro*{footcite:loccit}{% >>>2
   \ifnameundef{labelname}{%
     \printtext[bibhyperref]{%
-      \printfield[citetitle]{labeltitle}%
+      \printfield[firstword]{labeltitle}%
     }%
   }{%
     \printnames[LAST]{labelname}%
@@ -316,7 +393,7 @@
 \newbibmacro*{footcite:opcit}{% >>>2
   \ifnameundef{labelname}{%
     \printtext[bibhyperref]{%
-      \printfield[citetitle]{labeltitle}%
+      \printfield[firstword]{labeltitle}%
     }%
   }{%
     \printnames[LAST]{labelname}%
@@ -332,7 +409,7 @@
   }{%
     \printtext[bibhyperlink]{%
       \printfield{labelyear}%
-      \printfield{extrayear}%
+      \printfield{extradate}%
     }%
   }%
 }% <<<2
@@ -423,24 +500,16 @@
     \space}%
 }% <<<2
 
-\newcommand{\addand}{%% >>>2
-  \renewcommand*{\multicitedelim}{%
-    \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}%
-      {\space\bibstring{and}}%
-      {\addsemicolon}%
-    \space}%
-  \renewcommand*{\textcitedelim}{%
-    \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}%
-      {\addspace\bibstring{and}}%
-      {\addsemicolon}%
-    \space}%
-}% <<<2
-
-\DeclareCiteCommand{\@apud}[\mkbibfootnote]% >>>2
-	{\iffieldundef{prenote}%
-		{}%
-		{\printfield[uppercasecite]{prenote}%
-		\addspace\bibstring{apud}\addspace}}%
+\DeclareCiteCommand{\@apud}% >>>2
+	{\iffieldundef{prenote}{}{%
+      \ifnumgreater{\value{multicitetotal}}{1}{%
+        \usebibmacro{prenote}%
+      }{%
+        \printfield[uppercasecite]{prenote}%
+        \isdot\addspace\bibstring{apud}\addspace%
+      }%
+    }%
+  }%
 	{\usebibmacro{citeindex}%
 	\usebibmacro{footcite:short}}%
 	{\setunit{\multicitedelim}}%
@@ -455,9 +524,9 @@
 
 % textcite >>>1
 
-\renewbibmacro*{textcite}{% >>>2
+\newbibmacro*{textcite}{% >>>2
   \ifnameundef{labelname}%
-    {\printfield[citetitle]{labeltitle}}%
+    {\printfield[firstword]{labeltitle}}%
     {\printnames{labelname}}}% <<<2
 
 \newbibmacro*{textcite:init}{% >>>2
@@ -542,6 +611,15 @@
     \renewbibmacro{multiprenote}{}%
     \renewbibmacro{multipostnote}{}}}{}{}% <<<2
 
+\xpretobibmacro{textcite}{% >>>3
+  \let\multinamedelim\multinamedelimorig%
+  \let\finalnamedelim\finalnamedelimorig%
+  \let\mkbibnamefamily\origmkbibnamefamily%
+  \let\mkbibnamegiven\origmkbibnamegiven%
+  \let\mkbibnameprefix\origmkbibnameprefix%
+  \let\mkbibnamesuffix\origmkbibnamesuffix%
+}{}{}% <<<3
+
 % <<<1
 
 \endinput%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,4 +1,4 @@
-%% Copyright 2016 Daniel B. Marques
+%% Copyright 2016 Daniel Ballester Marques
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,10 +10,10 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Daniel B. Marques.
+%% The Current Maintainer of this work is Daniel Ballester Marques.
 
 \ProvidesFile{abnt-numeric.bbx}%
-[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]%
+[2017/11/09\space v3.2\space ABNT BibLaTeX citation style]%
 
 \RequireBibliographyStyle{abnt}
 \ExecuteBibliographyOptions{labelnumber}

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,4 +1,4 @@
-%% Copyright 2016 Daniel B. Marques
+%% Copyright 2016 Daniel Ballester Marques
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,13 +10,29 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Daniel B. Marques.
+%% The Current Maintainer of this work is Daniel Ballester Marques.
 
 \ProvidesFile{abnt-numeric.cbx}%
-[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]%
+[2017/11/09\space v3.2\space ABNT BibLaTeX citation style]%
 
 \RequireCitationStyle{numeric}
 
+\renewbibmacro*{name:family}[4]{% >>>1
+  \ifuseprefix
+    {\usebibmacro{name:delim}{#3#1}%
+     \usebibmacro{name:hook}{#3#1}%
+     \ifdefvoid{#3}{}{%
+       \ifcapital
+         {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+         {\mkbibnameprefix{#3}\isdot}%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \mkbibnamefamily{#1}\isdot
+     \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}
+    {\usebibmacro{name:delim}{#1}%
+     \usebibmacro{name:hook}{#1}%
+     \mkbibnamefamily{#1}\isdot
+     \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}% <<<1
+
 % Cite commands >>>1
 
 \DeclareCiteCommand{\cite}[\mkbibparens]% >>>2

Deleted: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-spanish.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-spanish.lbx	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-spanish.lbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,339 +0,0 @@
-%% 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=\ >>>,\ <<< :
-

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,4 +1,4 @@
-%% Copyright 2016 Daniel B. Marques
+%% Copyright 2016 Daniel Ballester Marques
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,29 +10,31 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Daniel B. Marques.
+%% The Current Maintainer of this work is Daniel Ballester Marques.
 
 \ProvidesFile{abnt.bbx}%
-[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]%
+[2017/11/09\space v3.2\space ABNT BibLaTeX citation style]%
 
 
 % Init >>>1
 
 \RequireBiber[3]%
-\DeclareLanguageMapping{brazil}{abnt-brazilian}%
-\DeclareLanguageMapping{brazilian}{abnt-brazilian}%
-\DeclareLanguageMapping{portuguese}{abnt-brazilian}%
-\DeclareLanguageMapping{portuges}{abnt-brazilian}%
-\DeclareLanguageMapping{spanish}{abnt-spanish}%
-\DeclareLanguageMapping{english}{abnt-english}%
 
+\RequirePackage{xparse}%
+\RequirePackage{xpatch}%
+\RequirePackage{expl3}%
+
+\DeclareLanguageMappingSuffix{-abnt}
+
 \RequireBibliographyStyle{standard}%
 
 \ExecuteBibliographyOptions{%
-  block=none,
-  urldate=long,
-  pagetracker,
-  uniquename=false,
+  language=brazil,%
+  block=none,%
+  urldate=long,%
+  pagetracker,%
+  uniquename=false,%
+  sorting=nty,%
 }%
 
 \InitializeBibliographyStyle{\global\undef\bbx at lasthash}%
@@ -40,6 +42,10 @@
 \let\origbibsetup\bibsetup%
 \appto{\bibsetup}{\raggedright}%
 
+\setcounter{biburlnumpenalty}{3000}%
+\setcounter{biburllcpenalty}{6000}%
+\setcounter{biburlucpenalty}{9000}%
+
 % <<<1
 
 
@@ -170,17 +176,21 @@
   }{}}%
 % <<<2
 
-% Show extrayear in bibliography >>>2
-\newtoggle{extrayear}%
+% Show extradate in bibliography >>>2
+\newtoggle{extradate}%
+\DeclareBibliographyOption{extradate}[true]{%
+  \settoggle{extradate}{#1}}%
+\DeclareEntryOption[boolean]{extradate}[true]{%
+  \settoggle{extradate}{#1}}%
 \DeclareBibliographyOption{extrayear}[true]{%
-  \settoggle{extrayear}{#1}}%
+  \settoggle{extradate}{#1}}%
 \DeclareEntryOption[boolean]{extrayear}[true]{%
-  \settoggle{extrayear}{#1}}%
+  \settoggle{extradate}{#1}}%
 % <<<2
 
 % Justify text >>>2
 \DeclareBibliographyOption{justify}[true]{%
-  \ExecuteBibliographyOptions{block=space}%
+  % \ExecuteBibliographyOptions{block=space}%
   \renewcommand*{\bibsetup}{\origbibsetup}%
 }%
 % <<<2
@@ -187,22 +197,34 @@
 
 % Make it pretty >>>2
 \DeclareBibliographyOption{pretty}[true]{%
-  \ExecuteBibliographyOptions{%
-    ittitles,
-    sccite,
-    scbib,
-    indent,
-    justify,
-  }%
+  \ifstrequal{#1}{true}{%
+    \ExecuteBibliographyOptions{%
+      ittitles,%
+      sccite,%
+      scbib,%
+      indent,%
+      justify,%
+    }%
+  }{}%
 }%
 % <<<2
 
+% Show count in backref >>>2
+\newtoggle{citecount}%
+\DeclareBibliographyOption{citecount}[true]{%
+  \settoggle{citecount}{#1}%
+  \ifstrequal{#1}{true}{%
+    \ExecuteBibliographyOptions{backref, citecounter}%
+  }{}%
+}%
+% <<<2
+
 % <<<1
 
 
 % Data model and sorting >>>1
 
-\DeclareSortingScheme{nty}{%% >>>2
+\DeclareSortingTemplate{nty}{%% >>>2
   \sort{%
     \field{presort}%
   }%
@@ -314,24 +336,20 @@
 
 % Capitalization commands >>>2
 
-\renewcommand*{\mkbibacro}[1]{%
-  \iftoggle{scbib}{%
-    \textsc{\MakeLowercase{#1}}%
-  }{\MakeUppercase{#1}}%
-}%
-
-\newcommand\FirstWordUpper[1]{\@firstwordupper#1 \@nil}%
+\newcommand\FirstWordUpper[1]{\@firstwordupper#1 \@nil}% >>>3
 \newcommand\@firstwordupper{}%
-\def\@firstwordupper#1 #2\@nil{\MakeUppercase{#1} #2\unskip}%
+\def\@firstwordupper#1 #2\@nil{\MakeUppercase{#1} #2\unskip}% <<<3
 
-\newcommand\FirstWordSC[1]{\@firstwordsc#1 \@nil}%
+\newcommand\FirstWordSC[1]{\@firstwordsc#1 \@nil}% >>>3
 \newcommand\@firstwordsc{}%
-\def\@firstwordsc#1 #2\@nil{\textsc{#1} #2\unskip}%
+\def\@firstwordsc#1 #2\@nil{\textsc{#1} #2\unskip}% <<<3
 
-\newcommand\FirstWordLCSC[1]{\@firstwordlcsc#1 \@nil}%
+\newcommand\FirstWordLCSC[1]{\@firstwordlcsc#1 \@nil}% >>>3
 \newcommand\@firstwordlcsc{}%
-\def\@firstwordlcsc#1 #2\@nil{\textsc{\MakeLowercase{#1}} #2\unskip}%
+\def\@firstwordlcsc#1 #2\@nil{\textsc{\MakeLowercase{#1}} #2\unskip}% <<<3
 
+% Helper macros >>>3
+
 \long\def\addto#1#2{\expandafter\def\expandafter#1\expandafter{#1#2}}%
 
 \def\traceparam#1{\def\paramL{}\traceparamA #1\end}%
@@ -354,78 +372,103 @@
 }%
 \def\traceparamE\end{}%
 
-\def\smartuppercase#1{%
+% <<<3
+
+\def\smartuppercase#1{% >>>3
    \bgroup %
    \traceparam{#1}%
    \MakeUppercase{\paramL}%
    \egroup%
-}%
+}% <<<3
 
-\def\smartlowercase#1{%
+\def\smartlowercase#1{% >>>3
    \bgroup %
    \traceparam{#1}%
    \MakeLowercase{\paramL}%
    \egroup%
-}%
+}% <<<3
 
-\def\smartlcsc#1{%
+\def\smartlcsc#1{% >>>3
    \bgroup %
    \traceparam{#1}%
    \textsc{\MakeLowercase{\paramL}}%
    \egroup%
-}%
+}% <<<3
 
-\def\smartsc#1{%
+\def\smartsc#1{% >>>3
    \bgroup %
    \traceparam{#1}%
    \textsc{\paramL}%
    \egroup%
-}%
+}% <<<3
 
-% <<<2
+\renewcommand*{\mkbibacro}[1]{% >>>3
+  \iftoggle{scbib}{%
+    \textsc{\MakeLowercase{#1}}%
+  }{\MakeUppercase{#1}}%
+}% <<<3
 
-% Name format >>>2
-
-% Name delimiters >>>3
-\newtoggle{byeditor+others}%
-
-\renewcommand*{\multinamedelim}{%
-  \iftoggle{byeditor+others}{%
-    \addcomma\addspace%
+\newcommand*{\UpperOrSC}[1]{% >>>3
+  \let\MakeCapital\relax%
+  \iftoggle{scbib}{%
+    \textsc{\MakeLowercase{#1}}%
   }{%
-    \addsemicolon\addspace%
+    \MakeUppercase{#1}%
   }%
-}%
+}% <<<3
 
-\renewcommand*{\finalnamedelim}{%
-  \iftoggle{byeditor+others}{%
-    \addspace\bibstring{and}\addspace%
+\newcommand*{\NormalOrSC}[1]{% >>>3
+  \iftoggle{scbib}{%
+    \textsc{\MakeLowercase{#1}}%
   }{%
-    \addsemicolon\addspace%
+    #1%
   }%
+}% <<<3
+
+% <<<2
+
+% \IfGivenIsInitial >>>2
+
+\ExplSyntaxOn%
+
+\ProvideDocumentCommand{\IfGivenIsInitial}{mm}{%
+  \regex_match:nVTF {\w\.} \namepartgiven {#1} {#2}%
 }%
-% <<<
+\cs_generate_variant:Nn \regex_match:nnTF { nV }%
 
+\ExplSyntaxOff%
+
+% <<<2
+
+% Name format >>>2
+
 \DeclareNameFormat{LAST-first}{%% >>>3
+  \renewcommand*{\mkbibnamefamily}[1]{\UpperOrSC{##1}}%
+  \renewcommand*{\mkbibnamegiven}[1]{\ifgiveninits{\NormalOrSC{##1}}{##1}}%
+  \renewcommand*{\mkbibnamegiven}[1]{%
+    \ifgiveninits{%
+      \NormalOrSC{##1}%
+    }{%
+      \IfGivenIsInitial{\NormalOrSC{##1}}{##1}%
+    }%
+  }%
+  \renewcommand*{\mkbibnameprefix}[1]{%
+    \ifuseprefix{%
+      \UpperOrSC{##1}%
+    }{%
+      \ifgiveninits{\NormalOrSC{##1}}{##1}%
+    }%
+  }%
+  \renewcommand*{\mkbibnamesuffix}[1]{\UpperOrSC{##1}}%
 	\ifgiveninits{%
-		\usebibmacro{name:family-given}{%
-			\iftoggle{scbib}{%
-				\textsc{\namepartfamily}%
-			}{%
-				\MakeUppercase{\namepartfamily}%
-			}%
-		}%
+		\usebibmacro{name:family-given}%
+    {\namepartfamily}%
 		{\namepartgiveni}%
 		{\namepartprefix}%
 		{\namepartsuffix}%
 	}{%
-		\usebibmacro{name:family-given}{%
-			\iftoggle{scbib}{%
-				\textsc{\MakeLowercase{\namepartfamily}}%
-			}{%
-				\MakeUppercase{\namepartfamily}%
-			}%
-		}%
+		\usebibmacro{name:family-given}%
+    {\namepartfamily}%
 		{\namepartgiven}%
 		{\namepartprefix}%
 		{\namepartsuffix}%
@@ -433,6 +476,8 @@
 	\usebibmacro{name:andothers}%
 }% <<<
 
+\DeclareNameAlias{default}{LAST-first}%
+
 \DeclareNameFormat{full}{%% >>>3
   \usebibmacro{name:given-family}%
     {\namepartfamily}%
@@ -441,8 +486,6 @@
     {\namepartsuffix}%
 }% <<<
 
-\DeclareNameAlias{default}{LAST-first}%
-
 \DeclareNameAlias{byauthor}{full}%
 \DeclareNameAlias{bybookauthor}{byauthor}%
 \DeclareNameAlias{byeditor}{full}%
@@ -461,6 +504,29 @@
 \DeclareBibliographyAlias{jurisdiction}{article}%
 \DeclareBibliographyAlias{legal}{article}%
 
+% Name delimiters >>>3
+\newtoggle{byeditor+others}%
+
+\let\multinamedelimorig\multinamedelim%
+\let\finalnamedelimorig\finalnamedelim%
+
+\renewcommand*{\multinamedelim}{%
+  \iftoggle{byeditor+others}{%
+    \addcomma\addspace%
+  }{%
+    \addsemicolon\addspace%
+  }%
+}%
+
+\renewcommand*{\finalnamedelim}{%
+  \iftoggle{byeditor+others}{%
+    \addspace\bibstring{and}\addspace%
+  }{%
+    \addsemicolon\addspace%
+  }%
+}%
+% <<<
+
 % <<<2
 
 % Field format >>>2
@@ -590,7 +656,7 @@
   \bibstring{monography}\addspace\printtext[parens]{#1}%
 }%% <<<
 
-\DeclareFieldFormat{origlanguage}{%% >>>4
+\DeclareListFormat{origlanguage}{%% >>>4
     \ifbibstring{#1}%
       {\bibxstring{#1}}%
       {\ifbibstring{from#1}%
@@ -1123,11 +1189,11 @@
 % Publisher, location, date, issue >>>2
 
 \renewbibmacro*{date}{%
-  \iftoggle{extrayear}{%
+  \iftoggle{extradate}{%
     \printdateextra%
   }{%
     \printdate%
-  }
+  }%
   \printunit{\addperiod\addspace}%
 }%
 
@@ -1248,7 +1314,7 @@
 
 % <<<2
 
-% Misc >>>
+% Misc >>>2
 
 \renewbibmacro*{volume+number+eid}{%% >>>3
   \printfield{volume}%
@@ -1268,17 +1334,6 @@
 		}%
 }%% <<<3
 
-\renewbibmacro*{pageref}{%% >>>3
-  \iflistundef{pageref}%
-    {}%
-	{\printunit{\addperiod\addspace}
-  \printtext{% \printtext[parens]{%
-	  \ifnumgreater{\value{pageref}}{1}%
-	    {\bibstring{backrefpages}\ppspace}%
-	    {\bibstring{backrefpage}\ppspace}%
-	  \printlist[pageref][-\value{listtotal}]{pageref}}}%
-}%% <<<3
-
 \renewbibmacro*{url+urldate}{%% >>>3
   \usebibmacro{url}%
   \iffieldundef{urlyear}%
@@ -1307,11 +1362,11 @@
 	\ifboolexpr{%
 		test {\iflistundef{language}}%
 		or%
-		test {\iffieldundef{origlanguage}}%
+		test {\iflistundef{origlanguage}}%
 	}%
 	{}%
 	{%
-		\printtext{\printlist{language}\addspace\printfield{origlanguage}}%
+		\printtext{\printlist{language}\addspace\printlist{origlanguage}}%
 	}%
 }%% <<<3
 
@@ -1329,16 +1384,46 @@
             {}}%
        \renewbibmacro*{related:init}{}%
        \DeclareNameAlias{sortname}{default}%
-       \ifbibmacroundef{date+extrayear}%
+       \ifbibmacroundef{date+extradate}%
          {}%
-         {\renewbibmacro*{date+extrayear}{}%
+         {\renewbibmacro*{date+extradate}{}%
           \renewbibmacro*{date}{\printdate}}%
        \renewbibmacro*{pageref}{}}%
       {\thefield{entrytype}}}%
 }%% <<<3
 
-% <<<
+\renewbibmacro*{pageref}{% >>>3
+  \iftoggle{citecount}{%
+    \printunit{\addperiod\addspace}%
+    \iflistundef{pageref}{%
+      \bibstring{citecountnopage}%
+    }{%
+      \printtext{%
+        \ifnumgreater{\value{pageref}}{1}{%
+          \bibstring{citecountpages}\ppspace%
+        }{%
+          \bibstring{citecountpage}\ppspace%
+        }%
+        \printlist[pageref][-\value{listtotal}]{pageref}%
+      }%
+    }%
+  }{%
+    \iflistundef{pageref}{}{%
+      \printunit{\addperiod\addspace}%
+      \printtext{%
+        \ifnumgreater{\value{pageref}}{1}{%
+          \bibstring{backrefpages}\ppspace%
+        }{%
+          \bibstring{backrefpage}\ppspace%
+        }%
+        \printlist[pageref][-\value{listtotal}]{pageref}%
+      }%
+    }%
+  }%
+}% <<<3
 
+% <<<2
+
 % <<<1
 
 
@@ -1395,9 +1480,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -1464,9 +1550,11 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -1520,9 +1608,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -1587,9 +1676,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -1648,9 +1738,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -1717,9 +1808,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -1772,9 +1864,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -1839,9 +1932,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -1900,9 +1994,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -1951,9 +2046,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -2028,9 +2124,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -2078,9 +2175,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -2145,9 +2243,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -2207,9 +2306,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -2291,9 +2391,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -2355,9 +2456,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -2406,9 +2508,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
@@ -2476,9 +2579,10 @@
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}%
+  \setunit*{\bibpagerefpunct}%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
+  \setunit*{\addperiod\addspace}%
   \newunit%
   \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx	2017-11-12 22:32:57 UTC (rev 45764)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -1,4 +1,4 @@
-%% Copyright 2016 Daniel B. Marques
+%% Copyright 2016 Daniel Ballester Marques
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,88 +10,148 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Daniel B. Marques.
+%% The Current Maintainer of this work is Daniel Ballester Marques.
 
 \ProvidesFile{abnt.cbx}%
-[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]%
+[2017/11/09\space v3.2\space ABNT BibLaTeX citation style]%
 
-
 % Init >>>1
 
 \RequireBiber[3]%
-\RequireCitationStyle{authoryear}%
-\RequireCitationStyle{abnt-ibid}%
+\RequireCitationStyle{authoryear-comp}%
 
 \RequirePackage{xparse}%
+\RequirePackage{xpatch}%
+\RequirePackage{expl3}%
 
-\renewcommand*{\iffinalcitedelim}{\iflastcitekey}
+\ExecuteBibliographyOptions{% >>>2
+  pagetracker,%
+  block=none,%
+  urldate=long,%
+  uniquename=full,%
+  sortcites=false,%
+}% <<<2
 
-\DeclareLabeldate{%
-  \field{date}
-  \field{year}
-  \field{eventdate}
-  \field{eventyear}
-  \field{origdate}
-  \field{urldate}
-  \literal{nodate}
-}
+\DeclareLabelname{% >>>2
+  \field{shortauthor}%
+  \field{author}%
+  \field{holder}%
+  \field{shorteditor}%
+  \field{editor}%
+  \field{translator}%
+}% <<<2
 
-\ExecuteBibliographyOptions{%
-  block=none,
-  urldate=long,
-  pagetracker,
-  uniquename=false,
-  sorting=nty,
-}%
+\newtoggle{sccite}% >>>2
+\DeclareBibliographyOption{sccite}[true]{%
+  \settoggle{sccite}{#1}%
+}% <<<2
 
-
 % <<<1
 
-
 % Format >>>1
 
 % Name format >>>2
 
-\DeclareNameFormat{LAST}{%% >>>3
+\newcommand*{\UpperOrSCCite}[1]{% >>>3
+  \iftoggle{sccite}{%
+    \textsc{\MakeLowercase{#1}}%
+  }{%
+    \MakeUppercase{#1}%
+  }%
+}% <<<3
+
+\newcommand*{\NormalOrSCCite}[1]{% >>>3
+  \let\MakeCapital\relax%
+  \iftoggle{sccite}{%
+    \textsc{\MakeLowercase{#1}}%
+  }{%
+    #1%
+  }%
+}% <<<3
+
+% \mkbibname* >>>3
+
+% \IfGivenIsInit >>>4
+
+\ExplSyntaxOn%
+
+\NewDocumentCommand{\IfGivenIsInit}{mm}{%
+  \regex_match:nVTF {\w\.} \namepartgiven {#1} {#2}%
+}%
+\cs_generate_variant:Nn \regex_match:nnTF { nV }%
+
+\ExplSyntaxOff%
+
+% <<<4
+
+\let\origmkbibnamefamily\mkbibnamefamily%
+\let\origmkbibnamegiven\mkbibnamegiven%
+\let\origmkbibnameprefix\mkbibnameprefix%
+\let\origmkbibnamesuffix\mkbibnamesuffix%
+
+\renewcommand*{\mkbibnamefamily}[1]{% >>>4
+  \UpperOrSCCite{#1}%
+}% <<<4
+\renewcommand*{\mkbibnamegiven}[1]{% >>>4
+  \ifnumequal{\value{uniquename}}{2}{%
+      \IfGivenIsInit{\NormalOrSCCite{#1}}{#1}%
+  }{%
+      \NormalOrSCCite{#1}%
+  }%
+}% <<<4
+\renewcommand*{\mkbibnameprefix}[1]{% >>>4
+  \ifuseprefix{%
+    \UpperOrSCCite{#1}%
+  }{%
+    \ifnumequal{\value{uniquename}}{2}{#1}{\NormalOrSCCite{#1}}%
+  }%
+}% <<<4
+\renewcommand*{\mkbibnamesuffix}[1]{% >>>4
+  \UpperOrSCCite{#1}%
+}% <<<4
+
+\AtBeginBibliography{%
+  \let\mkbibnamefamily\origmkbibnamefamily%
+  \let\mkbibnamegiven\origmkbibnamegiven%
+  \let\mkbibnameprefix\origmkbibnameprefix%
+  \let\mkbibnamesuffix\origmkbibnamesuffix%
+}%
+
+% <<<3
+
+\DeclareNameFormat{labelname}{% >>>3
+  % Use family-given instead of given-family
   \ifcase\value{uniquename}%
     \usebibmacro{name:family}%
-      {\iftoggle{sccite}%
-        {\textsc{\MakeLowercase{\namepartfamily}}}%
-  			{\MakeUppercase{\namepartfamily}}}%
+      {\namepartfamily}%
       {\namepartgiven}%
       {\namepartprefix}%
       {\namepartsuffix}%
   \or%
     \ifuseprefix%
-      {\usebibmacro{name:given-family}%
-        {\iftoggle{sccite}%
-  	    	{\textsc{\MakeLowercase{\namepartfamily}}}%
-          {\MakeUppercase{\namepartfamily}}}%
+      {\usebibmacro{name:family-given}%
+        {\namepartfamily}%
         {\namepartgiveni}%
         {\namepartprefix}%
         {\namepartsuffixi}}%
-      {\usebibmacro{name:given-family}%
-        {\iftoggle{sccite}%
-  	    	{\textsc{\MakeLowercase{\namepartfamily}}}%
-  			{\MakeUppercase{\namepartfamily}}}%
+      {\usebibmacro{name:family-given}%
+        {\namepartfamily}%
         {\namepartgiveni}%
         {\namepartprefixi}%
         {\namepartsuffixi}}%
   \or%
-    \usebibmacro{name:given-family}%
-      {\iftoggle{sccite}%
-        {\textsc{\MakeLowercase{\namepartfamily}}}%
-  			{\MakeUppercase{\namepartfamily}}}%
+    \usebibmacro{name:family-given}%
+      {\namepartfamily}%
       {\namepartgiven}%
       {\namepartprefix}%
       {\namepartsuffix}%
   \fi%
-  \usebibmacro{name:andothers}%
-}% <<<3
+  \usebibmacro{name:andothers}}% <<<3
 
-\DeclareNameFormat{fullcite}{%% >>>3
+\DeclareNameFormat{textlabelname}{% >>>3
+  % Use given-family instead of family-given
   \ifcase\value{uniquename}%
-    \usebibmacro{name:given-family}%
+    \usebibmacro{name:family}%
       {\namepartfamily}%
       {\namepartgiven}%
       {\namepartprefix}%
@@ -100,14 +160,14 @@
     \ifuseprefix%
       {\usebibmacro{name:given-family}%
         {\namepartfamily}%
-        {\namepartgiveni}%
+        {\namepartgiven}%
         {\namepartprefix}%
-        {\namepartsuffixi}}%
+        {\namepartsuffix}}%
       {\usebibmacro{name:given-family}%
         {\namepartfamily}%
-        {\namepartgiveni}%
-        {\namepartprefixi}%
-        {\namepartsuffixi}}%
+        {\namepartgiven}%
+        {\namepartprefix}%
+        {\namepartsuffix}}%
   \or%
     \usebibmacro{name:given-family}%
       {\namepartfamily}%
@@ -115,9 +175,25 @@
       {\namepartprefix}%
       {\namepartsuffix}%
   \fi%
-  \usebibmacro{name:andothers}%
-}% <<<3
+  \usebibmacro{name:andothers}}% <<<3
 
+\renewbibmacro*{name:family}[4]{% >>>3
+  % Add the suffix too
+  \ifuseprefix%
+    {\usebibmacro{name:delim}{#3#1}%
+     \usebibmacro{name:hook}{#3#1}%
+     \ifdefvoid{#3}{}{%
+       \ifcapital%
+         {\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
+         {\mkbibnameprefix{#3}\isdot}%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \mkbibnamefamily{#1}\isdot%
+     \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}%
+    {\usebibmacro{name:delim}{#1}%
+     \usebibmacro{name:hook}{#1}%
+     \mkbibnamefamily{#1}\isdot%
+     \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}% <<<3
+
 % <<<2
 
 % Field format >>>2
@@ -132,7 +208,7 @@
 \def\@removesemicolon#1;#2\@nil{#1}%
 % <<<3
 
-\DeclareFieldFormat{citetitle}{%% >>>3
+\DeclareFieldFormat{firstword}{%% >>>3
   \iftoggle{sccite}{%
     \normalfont\textsc{\MakeLowercase{\FirstWord{#1}}}\ldots\isdot%
   }{%
@@ -140,14 +216,6 @@
   }%
 }%% <<<3
 
-\DeclareFieldFormat{noname}{%% >>>3
-  \iftoggle{sccite}{%
-    \normalfont\textsc{\MakeLowercase{\FirstWord{#1}}}\ldots\isdot%
-  }{%
-    \normalfont\MakeUppercase{\FirstWord{#1}}\ldots\isdot%
-  }%
-}%% <<<3
-
 \DeclareFieldFormat{uppercasecite}{%% >>>3
   \iftoggle{sccite}{%
     \textsc{\smartlowercase{#1}}%
@@ -158,153 +226,297 @@
 
 % <<<2
 
+% Delimiter format >>>2
+
+\renewcommand*{\nameyeardelim}{\addcomma\addspace}%
+\renewcommand*{\nonameyeardelim}{\addcomma\addspace}%
+\renewcommand*{\multicitedelim}{\addsemicolon\addspace}%
+
+% <<<2
+
 % <<<1
 
+% Macros and commands >>>1
 
-% Cite commands >>>1
+% \cite >>>2
 
-\DeclareCiteCommand{\cite}[\mkbibparens]% >>>2
+\renewbibmacro*{cite}{% >>>3
+  \iffieldundef{shorthand}%
+    {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}%
+       {\usebibmacro{cite:label}%
+        \setunit{\printdelim{nonameyeardelim}}%
+        \usebibmacro{cite:labeldate+extradate}%
+        \usebibmacro{cite:reinit}}%
+       {\iffieldequals{namehash}{\cbx at lasthash}%
+          {\ifthenelse{\iffieldequals{labelyear}{\cbx at lastyear}\AND%
+                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
+             {\setunit{\addcomma}%
+              \usebibmacro{cite:extradate}}%
+             {\setunit{\compcitedelim}%
+              \usebibmacro{cite:labeldate+extradate}%
+              \savefield{labelyear}{\cbx at lastyear}}}%
+          {% Use `bibhyperref` for the `labelname`
+           \printtext[bibhyperref]{\printnames{labelname}}%
+           \setunit{\printdelim{nameyeardelim}}%
+           \usebibmacro{cite:labeldate+extradate}%
+           \savefield{namehash}{\cbx at lasthash}%
+           \savefield{labelyear}{\cbx at lastyear}}}}%
+    {\usebibmacro{cite:shorthand}%
+     \usebibmacro{cite:reinit}}%
+  \setunit{\multicitedelim}}% <<<3
+
+\DeclareCiteCommand{\cite}[\mkbibparens]% >>>3
   {\usebibmacro{cite:init}%
-  \usebibmacro{prenote}}%
+   \usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}%
   {}%
-  {\usebibmacro{postnote}}%
+  {\usebibmacro{postnote}}% <<<3
 
-\DeclareCiteCommand*{\cite}%
+\DeclareCiteCommand*{\cite}[\mkbibparens]% >>>3
   {\usebibmacro{cite:init}%
-  \usebibmacro{prenote}}%
+   \usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}%
+   \usebibmacro{citeyear}}%
   {}%
-  {\usebibmacro{postnote}}%
+  {\usebibmacro{postnote}}% <<<3
 
 \DeclareMultiCiteCommand{\cites}[\mkbibparens]%
-	{\cite}%
-	{\setunit{\multicitedelim}}% <<<2
+  {\cite}{\setunit{\multicitedelim}}%
 
-\DeclareCiteCommand{\textcite}% >>>2
-  {\usebibmacro{cite:init}%
-  \boolfalse{cbx:parens}%
-  \renewcommand*{\finalnamedelim}{\addspace\bibstring{and}\addspace}%
-  \renewcommand*{\multinamedelim}{\addcomma\addspace}}%
-  {\usebibmacro{citeindex}%
-   \iffirstcitekey%
-     {\setcounter{textcitetotal}{1}}%
-     {\stepcounter{textcitetotal}%
-      \textcitedelim}%
-   \usebibmacro{textcite}}%
-  {\ifbool{cbx:parens}%
-     {\bibcloseparen\global\boolfalse{cbx:parens}}%
-     {}}%
-  {\usebibmacro{textcite:postnote}}%
+% <<<2
 
-\DeclareCiteCommand*{\textcite}%
-  {\usebibmacro{cite:init}%
-  \boolfalse{cbx:parens}%
-  \renewcommand*{\finalnamedelim}{\addspace\bibstring{and}\addspace}%
-  \renewcommand*{\multinamedelim}{\addcomma\addspace}}%
+% \textcite >>>2
+
+\renewbibmacro*{textcite}{% >>>3
+  \iffieldequals{namehash}{\cbx at lasthash}%
+    {\iffieldundef{shorthand}%
+       {\ifthenelse{\iffieldequals{labelyear}{\cbx at lastyear}\AND%
+                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
+          {\setunit{\addcomma}%
+           \usebibmacro{cite:extradate}}%
+          {\setunit{\compcitedelim}%
+           \usebibmacro{cite:labeldate+extradate}%
+           \savefield{labelyear}{\cbx at lastyear}}}%
+       {\setunit{\compcitedelim}%
+        \usebibmacro{cite:shorthand}%
+        \global\undef\cbx at lastyear}}%
+    {\ifnameundef{labelname}%
+       {\iffieldundef{shorthand}%
+          {\usebibmacro{cite:label}%
+           \setunit{%
+             \global\booltrue{cbx:parens}%
+             \printdelim{nonameyeardelim}\bibopenparen}%
+           \ifnumequal{\value{citecount}}{1}%
+             {\usebibmacro{prenote}}%
+             {}%
+           \usebibmacro{cite:labeldate+extradate}}%
+          {\usebibmacro{cite:shorthand}}}%
+       {% Use `bibhyperref` so that the names are also hyperlinked
+        \printtext[bibhyperref]{\printnames[textlabelname]{labelname}}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \printdelim{nameyeardelim}\bibopenparen}%
+        \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}%
+          {}%
+        \iffieldundef{shorthand}%
+          {\iffieldundef{labelyear}%
+             {\usebibmacro{cite:label}}%
+             {\usebibmacro{cite:labeldate+extradate}}%
+           \savefield{labelyear}{\cbx at lastyear}}%
+          {\usebibmacro{cite:shorthand}%
+           \global\undef\cbx at lastyear}}%
+     \stepcounter{textcitecount}%
+     \savefield{namehash}{\cbx at lasthash}}%
+  \setunit{%
+    \ifbool{cbx:parens}%
+      {\bibcloseparen\global\boolfalse{cbx:parens}}%
+      {}%
+    % Use `\bibstring{and}` before the last name and commas before the rest
+    \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}{%
+      \finalnamedelim%
+    }{%
+      \multinamedelim%
+    }}}% <<<3
+
+\xpretobibmacro{textcite}{% >>>3
+  \let\multinamedelim\multinamedelimorig%
+  \let\finalnamedelim\finalnamedelimorig%
+  \let\mkbibnamefamily\origmkbibnamefamily%
+  \let\mkbibnamegiven\origmkbibnamegiven%
+  \let\mkbibnameprefix\origmkbibnameprefix%
+  \let\mkbibnamesuffix\origmkbibnamesuffix%
+}{}{}% <<<3
+
+% <<<2
+
+% \footcite >>>2
+
+\newbibmacro*{footcite}{% >>>3
+  \let\multinamedelim\multinamedelimorig%
+  \let\finalnamedelim\finalnamedelimorig%
+  \let\mkbibnamefamily\origmkbibnamefamily%
+  \let\mkbibnamegiven\origmkbibnamegiven%
+  \let\mkbibnameprefix\origmkbibnameprefix%
+  \let\mkbibnamesuffix\origmkbibnamesuffix%
+  \usebibmacro{prenote}%
+  \ifnameundef{labelname}%
+    {\iffieldundef{shorthand}%
+       {\usebibmacro{cite:label}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \addspace\bibopenparen}%
+        \usebibmacro{cite:labeldate+extradate}}%
+       {\usebibmacro{cite:shorthand}}}%
+    {\printtext[bibhyperref]{\printnames{labelname}}%
+     \setunit{%
+       \global\booltrue{cbx:parens}%
+       \addspace\bibopenparen}%
+     \usebibmacro{citeyear}}}% <<<3
+
+\newbibmacro*{footcite:postnote}{% >>>3
+  \iffieldundef{postnote}%
+    {\ifbool{cbx:parens}%
+       {\bibcloseparen}%
+       {}}%
+    {\ifbool{cbx:parens}%
+       {\setunit{\postnotedelim}}%
+       {\setunit{\extpostnotedelim\bibopenparen}}%
+     \printfield{postnote}\bibcloseparen}}% <<<3
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]% >>>3
+  {\boolfalse{cbx:parens}}%
   {\usebibmacro{citeindex}%
-   \iffirstcitekey%
-     {\setcounter{textcitetotal}{1}}%
+   \iffirstcitekey
+     {\setcounter{textcitetotal}{1}}
      {\stepcounter{textcitetotal}%
-      \textcitedelim}%
-   \usebibmacro{textcitefull}}%
+      \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}%
+        {\addspace\bibstring{and}}%
+        {\addcomma}%
+      \space}%
+   \usebibmacro{footcite}}%
   {\ifbool{cbx:parens}%
      {\bibcloseparen\global\boolfalse{cbx:parens}}%
      {}}%
-  {\usebibmacro{textcite:postnote}}
+  {\usebibmacro{footcite:postnote}}% <<<3
 
-\DeclareMultiCiteCommand{\textcites}{\textcite}{}% <<<2
+\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{}%
 
+% <<<2
 
-\DeclareCiteCommand{\parencite}[\mkbibparens]% >>>2
-  {\usebibmacro{cite:init}%
-  \usebibmacro{prenote}}%
+% \citetitle >>>2
+
+% \citetitle is pretty much a copy of authoryear-comp's \textcite that uses
+% labeltitle instead of labelname
+
+\newbibmacro*{citetitle}{% >>>3
+  \printtext[bibhyperref]{\printfield[labeltitle]{labeltitle}}%
+  \setunit{\global\booltrue{cbx:parens}\addspace\bibopenparen}%
+  \ifnumequal{\value{citecount}}{1}{\usebibmacro{prenote}}{}%
+  \iffieldundef{shorthand}{%
+    \usebibmacro{cite:labeldate+extradate}%
+  }{%
+    \usebibmacro{cite:shorthand}%
+  }%
+  \stepcounter{textcitecount}%
+  \setunit{%
+    \ifbool{cbx:parens}{\bibcloseparen\global\boolfalse{cbx:parens}}{}%
+    % Use `\bibstring{and}` before the last name and commas before the rest
+    \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}{%
+      \finalnamedelim%
+    }{%
+      \multinamedelim%
+    }%
+  }%
+}% <<<3
+
+\DeclareCiteCommand{\cbx at citetitle}% >>>3
+  {\usebibmacro{cite:init}}%
   {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}%
+   \usebibmacro{citetitle}}%
   {}%
-  {\usebibmacro{postnote}}% <<<2
+  {\usebibmacro{textcite:postnote}}% <<<3
 
-\DeclareCiteCommand{\citeauthor}[\mkbibparens]% >>>2
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \usebibmacro{prenote}}%
-  {\ifciteindex%
-     {\indexnames{labelname}}%
+\DeclareCiteCommand{\citetitle}[\cbx at textcite@init\cbx at citetitle]% >>>3
+  {\gdef\cbx at savedkeys{}%
+   \citetrackerfalse%
+   \pagetrackerfalse%
+   \DeferNextCitekeyHook%
+   \usebibmacro{cite:init}}%
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}%
+     {\protected at xappto\cbx at savedcites{()(\thefield{multipostnote})}%
+      \global\clearfield{multipostnote}}%
      {}%
-   \printtext[bibhyperref]{\printnames[LAST]{labelname}}}%
-  {\multicitedelim}%
-  {\usebibmacro{postnote}}%
-
-\DeclareCiteCommand*{\citeauthor}%
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \usebibmacro{prenote}}%
-  {\ifciteindex%
-     {\indexnames{labelname}}%
+   \xappto\cbx at savedkeys{\thefield{entrykey},}%
+   \iffieldequals{namehash}{\cbx at lasthash}%
      {}%
-   \printtext[bibhyperref]{\printnames{labelname}}}%
-  {\multicitedelim}%
-  {\usebibmacro{postnote}}% <<<2
+     {\stepcounter{textcitetotal}%
+      \savefield{namehash}{\cbx at lasthash}}}%
+  {}%
+  {\protected at xappto\cbx at savedcites{%
+     [\thefield{prenote}][\thefield{postnote}]{\cbx at savedkeys}}}% <<<3
 
-\DeclareCiteCommand{\citetitle}[\mkbibparens]% >>>2
-  {\usebibmacro{cite:init}%
-  \boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \usebibmacro{prenote}}%
-  {\ifciteindex%
-     {\indexfield{indextitle}}%
-     {}%
-   \printtext[bibhyperref]{\printfield[emphtitle]{labeltitle}}}%
-  {\multicitedelim}%
-  {\usebibmacro{postnote}}%
+% <<<2
 
-\DeclareCiteCommand*{\citetitle}%
-  {\usebibmacro{cite:init}%
-  \boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \usebibmacro{prenote}}%
-  {\ifciteindex%
-     {\indexfield{indextitle}}%
-     {}%
-   \printtext[bibhyperref]{\printfield[emphtitle]{labeltitle}}}%
-  {\multicitedelim}%
-  {\usebibmacro{postnote}}% <<<2
+% \apud >>>2
 
-\DeclareCiteCommand{\citeyear}[\mkbibparens]% >>>2
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \usebibmacro{prenote}}%
-  {\printfield[bibhyperref]{year}}%
-  {\multicitedelim}%
-  {\usebibmacro{postnote}}%
+\newbibmacro*{apud}{% >>>3
+  \iffieldundef{shorthand}%
+    {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}%
+       {\usebibmacro{cite:label}%
+        \setunit{\printdelim{nonameyeardelim}}%
+        \usebibmacro{cite:labeldate+extradate}%
+        \usebibmacro{cite:reinit}}%
+       {\iffieldequals{namehash}{\cbx at lasthash}%
+          {\setunit{\compcitedelim}%
+              \usebibmacro{cite:labeldate+extradate}}%
+          {\printtext[bibhyperref]{\printnames{labelname}}%
+           \setunit{\printdelim{nameyeardelim}}%
+           \usebibmacro{cite:labeldate+extradate}%
+           \savefield{namehash}{\cbx at lasthash}%
+           \savefield{labelyear}{\cbx at lastyear}}}}%
+    {\usebibmacro{cite:shorthand}%
+     \usebibmacro{cite:reinit}}%
+  \setunit{\multicitedelim}}% <<<3
 
-\DeclareCiteCommand*{\citeyear}%
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \usebibmacro{prenote}}%
-  {\printfield[bibhyperref]{year}}%
-  {\multicitedelim}%
-  {\usebibmacro{postnote}}% <<<2
+\newcommand{\addapud}{%% >>>3
+  \renewcommand*{\compcitedelim}{%
+    \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}%
+      {\space\bibstring{apud}}%
+      {\addsemicolon}%
+    \space}%
+  \renewcommand*{\multicitedelim}{%
+    \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}%
+      {\space\bibstring{apud}}%
+      {\addsemicolon}%
+    \space}%
+  \renewcommand*{\textcitedelim}{%
+    \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}%
+      {\addspace\bibstring{apud}}%
+      {\addsemicolon}%
+    \space}%
+}% <<<3
 
-% apud >>>2
-
 \DeclareCiteCommand{\@apud}% >>>3
 	{\usebibmacro{cite:init}%
-	\iffieldundef{prenote}%
-		{}%
-		{\printfield[uppercasecite]{prenote}%
-		\addspace\bibstring{apud}\addspace}}%
+    \iffieldundef{prenote}{}{%
+      \ifnumgreater{\value{multicitetotal}}{1}{%
+        \usebibmacro{prenote}%
+      }{%
+        \printfield[uppercasecite]{prenote}%
+        \isdot\addspace\bibstring{apud}\addspace%
+      }%
+    }%
+  }%
 	{\usebibmacro{citeindex}%
-	\usebibmacro{cite}}%
+	\usebibmacro{apud}}%
 	{\setunit{\multicitedelim}}%
 	{\usebibmacro{postnote}}% <<<3
 
 \DeclareMultiCiteCommand{\apud}[\addapud\mkbibparens]% >>>3
 	{\@apud}%
-	{\setunit{\multicitedelim}%
-}% <<<3
+	{\setunit{\multicitedelim}}% <<<3
 
 \DeclareCiteCommand{\plaincite}% >>>3
   {\usebibmacro{cite:init}%
@@ -318,7 +530,11 @@
   {\usebibmacro{cite:init}%
   \boolfalse{citetracker}%
    \boolfalse{pagetracker}%
-   \usebibmacro{prenote}
+   \usebibmacro{prenote}%
+   \let\mkbibnamefamily\origmkbibnamefamily%
+   \let\mkbibnamegiven\origmkbibnamegiven%
+   \let\mkbibnameprefix\origmkbibnameprefix%
+   \let\mkbibnamesuffix\origmkbibnamesuffix%
    \renewcommand*{\finalnamedelim}{\addspace\bibstring{and}\addspace}%
    \renewcommand*{\multinamedelim}{\addcomma\addspace}}%
   {\ifciteindex%
@@ -329,260 +545,100 @@
   {\usebibmacro{postnote}}% <<<3
 
 \NewDocumentCommand{\textapud}{o o m o o m}{%% >>>3
- \citelastname{#3}
- \mkbibparens{%
-  \IfNoValueTF{#2}
-   {%
-    \IfNoValueTF{#1}
-     {\citeyear*{#3}}
-     {\citeyear*[#1]{#3}}%
-   }
-   {%
-    \citeyear*[#1][#2]{#3}%
-   }
-  \IfNoValueTF{#5}
-   {%
-    \IfNoValueTF{#4}
-     {\plaincite[\blx at imc@bibxstring{apud}][]{#6}}
-     {\plaincite[\blx at imc@bibxstring{apud}][#4]{#6}}%
-   }
-   {%
-    \cite[\blx at imc@bibxstring{apud} #4][#5]{#6}%
-   }%
-  }%
-}%% <<<3
-
-% <<<2
-
-\DeclareCiteCommand*{\footcite}[\mkbibfootnote]% >>>2
-  {\usebibmacro{prenote}}%
-  {\usebibmacro{citeindex}%
-   \usebibmacro{footcite}}%
-  {\multicitedelim}%
-  {\usebibmacro{footcite:postnote}}% <<<2
-
-\DeclareCiteCommand{\footcite}[\mkbibfootnote]% >>>2
-  {\usebibmacro{prenote}}%
-  {\usebibmacro{citeindex}%
-   \usebibmacro{footcitestar}}%
-  {\multicitedelim}%
-  {\usebibmacro{footcite:postnote}}% <<<2
-
-% <<<1
-
-
-% Macros >>>1
-
-\renewbibmacro*{cite}{%% >>>2
-  \iffieldequals{fullhash}{\cbx at lasthash}{%
-    \usebibmacro{cite:plabelyear+extrayear}%
-  }{%
-    \iffieldundef{shorthand}{%
-      \ifnameundef{shortauthor}{%
-        \ifnameundef{holder}{%
-          \ifnameundef{labelname}{%
-            \iflistundef{organization}{%
-              \usebibmacro{cite:noname}%
-            }{%
-              \printlist[uppercase]{organization}%
-            }%
+  \citelastname{#3}\addspace%
+  \mkbibparens{%
+      \IfNoValueTF{#2}{%
+          \IfNoValueTF{#1}{%
+            \citeyearorsh*{#3}%
           }{%
-            \printtext[bibhyperref]{\printnames[LAST]{labelname}}%
+            \citeyearorsh*[#1]{#3}%
           }%
-        }{%
-          \printnames[LAST]{holder}%
-        }%
       }{%
-        \printnames[LAST]{shortauthor}%
+          \citeyearorsh*[#1][#2]{#3}%
+      }\addspace%
+      \IfNoValueTF{#5}{%
+          \IfNoValueTF{#4}{%
+            \plaincite[\blx at imc@bibxstring{apud}][]{#6}%
+          }{%
+            \plaincite[\blx at imc@bibxstring{apud}][#4]{#6}%
+          }%
+      }{%
+          \cite[\blx at imc@bibxstring{apud} #4][#5]{#6}%
       }%
-        \setunit{\nameyeardelim}%
-        \usebibmacro{cite:plabelyear+extrayear}%
-    }{%
-      \usebibmacro{cite:shorthand}%
-    }%
-   \savefield{fullhash}{\cbx at lasthash}%
   }%
-  \setunit{\multicitedelim}%
-}% <<<2
+}%% <<<3
 
-\renewbibmacro*{textcite}{%% >>>2
-  \ifnameundef{labelname}%
-    {\iffieldundef{shorthand}%
-       {\usebibmacro{cite:label}%
-        \setunit{%
-          \global\booltrue{cbx:parens}%
-          \nonameyeardelim\bibopenparen}%
-        \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}%
-          {}%
-        \usebibmacro{cite:labelyear+extrayear}}%
-       {\usebibmacro{cite:shorthand}}}%
-    {\printtext[bibhyperref]{\printnames{labelname}}%
-     \setunit{%
-       \global\booltrue{cbx:parens}%
-       \addspace\bibopenparen}%
-     \ifnumequal{\value{citecount}}{1}%
-       {\usebibmacro{prenote}}%
-       {}%
-     \usebibmacro{citeyear}}%
-}% <<<2
+% <<<2
 
-\newbibmacro*{textcitefull}{%% >>>2
-  \ifnameundef{labelname}%
-    {\iffieldundef{shorthand}%
-       {\usebibmacro{cite:label}%
-        \setunit{%
-          \global\booltrue{cbx:parens}%
-          \nonameyeardelim\bibopenparen}%
-        \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}%
-          {}%
-        \usebibmacro{cite:labelyear+extrayear}}%
-       {\usebibmacro{cite:shorthand}}}%
-    {\printtext[bibhyperref]{\printnames[fullcite]{labelname}}%
-     \setunit{%
-       \global\booltrue{cbx:parens}%
-       \addspace\bibopenparen}%
-     \ifnumequal{\value{citecount}}{1}%
-       {\usebibmacro{prenote}}%
-       {}%
-     \usebibmacro{citeyear}}%
-}% <<<2
-
-\newbibmacro*{cite:init}{%% >>>2
-  \global\undef\cbx at lasthash%
-}% <<<2
-
-\newbibmacro*{cite:author}{%% >>>2
-  \printtext[bibhyperref]{\printfield{author}}%
-}% <<<2
-
-\newbibmacro*{cite:noname}{%% >>>2
-  \printfield[noname]{title}%
-}% <<<2
-
-\def\citeresetabnt{\global\let\cbx at abnt@names\@empty}%
-\citeresetabnt%
-\def\cbx at abnt@ifnamesaved{%
-  \xifinlist{\thefield{fullhash}}{\cbx at abnt@names}%
-    {\@firstoftwo}%
-    {\@secondoftwo}}%
-
 \renewbibmacro*{cite:label}{%% >>>2
   \iffieldundef{label}{%
-    \printtext[bibhyperref]{%
-      \printfield[uppercasecite]{labeltitle}%
-    }%
+    \printtext[bibhyperref]{\printfield[firstword]{labeltitle}}%
   }{%
-    \printtext[bibhyperref]{%
-      \printfield{label}%
-    }%
+    \printtext[bibhyperref]{\printfield[uppercasecite]{label}}%
   }%
 }% <<<2
 
-\newbibmacro*{cite:plabelyear+extrayear}{%% >>>2
-  \iffieldundef{labelyear}{}{%
-    \printtext[bibhyperref]{%
-      \printfield[normalfont]{origyear}%
-      \setunit*{\addslash}%
-      \printfield{labelyear}%
-      \printfield{extrayear}%
-    }%
-  }%
-  % \iffieldundef{issue}{}{%
-  %   \addcomma\addspace\printfield{issue}%
-  % }%
-}% <<<2
+\DeclareCiteCommand{\smartcite}[\mkbibparens]% >>>2
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}%
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}%
+  {}%
+  {\usebibmacro{postnote}}% <<<2
 
-\renewbibmacro*{cite:shorthand}{%% >>>2
-  \printtext[bibhyperref]{%
-    \printfield{shorthand}%
-  }%
-}% <<<2
+\DeclareCiteCommand{\citeauthor}[\mkbibparens]% >>>2
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}%
+  {\ifciteindex%
+     {\indexnames{labelname}}%
+     {}%
+   \printtext[bibhyperref]{\printnames{labelname}}}%
+  {\multicitedelim}%
+  {\usebibmacro{postnote}}%
 
-\newbibmacro*{citeyearpunct}{%% >>>2
-  \iffieldundef{labelyear}{%
-    \usebibmacro{cite:init}%
-  }{% else
-    \iffieldequals{fullhash}{\cbx at lasthash}{%
-      \setunit{\compcitedelim}%
-        \usebibmacro{cite:plabelyear+extrayear}%
-    }{% else
-      \usebibmacro{cite:plabelyear+extrayear}%
-      \savefield{fullhash}{\cbx at lasthash}%
-    }%
-  }%
-  \setunit{\multicitedelim}%
-}% <<<2
+\DeclareCiteCommand*{\citeauthor}%
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}%
+  {\ifciteindex%
+     {\indexnames{labelname}}%
+     {}%
+   \printtext[bibhyperref]{\printnames{labelname}}}%
+  {\multicitedelim}%
+  {\usebibmacro{postnote}}% <<<2
 
-% <<<1
+\DeclareCiteCommand{\citeyear}[\mkbibparens]% >>>2
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}%
+  {\printfield[bibhyperref]{year}}%
+  {\multicitedelim}%
+  {\usebibmacro{postnote}}%
 
+\DeclareCiteCommand*{\citeyear}%
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}%
+  {\printfield[bibhyperref]{year}}%
+  {\multicitedelim}%
+  {\usebibmacro{postnote}}% <<<2
 
-% bibhyperref >>>1
-
-\DeclareFieldFormat{citehyperref}{%% >>>2
-  \DeclareFieldAlias{bibhyperref}{noformat}% Avoid nested links
-  \bibhyperref{#1}%
-}% <<<2
-
-\DeclareFieldFormat{textcitehyperref}{%% >>>2
-  \DeclareFieldAlias{bibhyperref}{noformat}% Avoid nested links
-  \bibhyperref{%
-    #1%
-    \ifbool{cbx:parens}%
-      {\bibcloseparen\global\boolfalse{cbx:parens}}%
-      {}}%
-}% <<<2
-
-\savebibmacro{cite}%
-\savebibmacro{textcite}%
-\savebibmacro{textcitefull}%
-
-\renewbibmacro*{cite}{%% >>>2
-  \printtext[citehyperref]{%
-    \restorebibmacro{cite}%
-    \usebibmacro{cite}}%
-}% <<<2
-
-\renewbibmacro*{textcite}{%% >>>2
-  \ifboolexpr{%
-    (%
-      not test {\iffieldundef{prenote}}%
-      and%
-      test {\ifnumequal{\value{citecount}}{1}}%
-    )%
-    or%
-    (%
-      not test {\iffieldundef{postnote}}%
-      and%
-      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}%
-    )%
+\DeclareCiteCommand*{\citeyearorsh}%
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}%
+  {\iffieldundef{shorthand}{%
+      \printfield[bibhyperref]{year}%
+    }{%
+      \printfield[bibhyperref]{shorthand}%
+    }%
   }%
-    {\DeclareFieldAlias{textcitehyperref}{noformat}}%
-    {}%
-  \printtext[textcitehyperref]{%
-    \restorebibmacro{textcite}%
-    \usebibmacro{textcite}}%
-}% <<<2
+  {\multicitedelim}%
+  {\usebibmacro{postnote}}% <<<2
 
-\renewbibmacro*{textcitefull}{%% >>>2
-  \ifboolexpr{%
-    ( not test {\iffieldundef{prenote}} and%
-      test {\ifnumequal{\value{citecount}}{1}} )%
-    or%
-    ( not test {\iffieldundef{postnote}} and%
-      test {\ifnumequal{\value{citecount}}{\value{citetotal}}} )%
-  }%
-    {\DeclareFieldAlias{textcitehyperref}{noformat}}%
-    {}%
-  \printtext[textcitehyperref]{%
-    \restorebibmacro{textcitefull}%
-    \usebibmacro{textcitefull}}%
-}% <<<2
-
 % <<<1
 
-
 \endinput%
 
 

Added: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/brazil-abnt.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/brazil-abnt.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/brazil-abnt.lbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,21 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+
+\ProvidesFile{brazil-abnt.lbx}
+[2017/11/09\space v3.2\space ABNT BibLaTeX citation style]%
+
+\InheritBibliographyExtras{brazilian-abnt}
+\InheritBibliographyStrings{brazilian-abnt}
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/brazilian-abnt.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/brazilian-abnt.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/brazilian-abnt.lbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,387 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+
+\ProvidesFile{abnt-brazilian.lbx}%
+[2017/11/09\space v3.2\space ABNT BibLaTeX citation style]%
+
+
+% Init >>>
+
+\InheritBibliographyExtras{brazilian}%
+\InheritBibliographyStrings{brazilian}
+\DeclareBibliographyStrings{%
+  inherit = {brazil},%
+}%
+
+% <<<
+
+% 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{% >>>2
+  apud,%
+  sineloco,%
+  sinenomine,%
+  sheet,%
+  sheets,%
+  sheettotal,%
+  sheettotals,%
+  illustrated,%
+  monography,%
+  recensionof,%
+}% <<<2
+
+\DeclareBibliographyStrings{% >>>2
+  apud         = {{apud}{apud}},%
+  idem         = {{idem}{id\adddot}},%
+  volume       = {{volume}{v\adddot}},%
+  volumes      = {{volumes}{v\adddot}},%
+  number       = {{n\'umero}{n\adddot}},%
+  pages        = {{p\'aginas}{p\adddot}},%
+  pagetotals   = {{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      = {{dispon\'ivel em}{dispon\'ivel em}},%
+  urlseen      = {{acesso em}{acesso em}},%
+  sheet        = {{folha}{f\adddot}},%
+  sheets       = {{folhas}{f\adddot}},%
+  sheettotal   = {{folha}{f\adddot}},%
+  sheettotals  = {{folhas}{f\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\c{c}\~ao (Mestrado)}{Diss. (Mestrado)}},%
+  reprintfrom  = {{separata de}{separata de}},%
+  recensionof  = {{recens\~ao de}{recens\~ao de}},%
+  reviewof     = {{resenha de}{resenha de}},%
+}% <<<2
+
+% <<<1
+
+% citecounter >>>1
+
+\NewBibliographyString{% >>>2
+  citecountpage,%
+  citecountpages,%
+  citecountnopage,%
+}% <<<2
+
+\DeclareBibliographyStrings{% >>>2
+  citecountpage = {{%
+    \ifnumgreater{\value{citecounter}}{1}{%
+      Citado \arabic{citecounter} vezes na p\'agina%
+    }{%
+      Citado \arabic{citecounter} vez na p\'agina%
+    }%
+  }{%
+    \ifnumgreater{\value{citecounter}}{1}{%
+      Citado \arabic{citecounter} vezes na p\'agina%
+    }{%
+      Citado \arabic{citecounter} vez na p\'agina%
+    }%
+  }},%
+  citecountpages = {{%
+    \ifnumgreater{\value{citecounter}}{1}{%
+      Citado \arabic{citecounter} vezes nas p\'aginas%
+    }{%
+      Citado \arabic{citecounter} vez nas p\'aginas%
+    }%
+  }{%
+    \ifnumgreater{\value{citecounter}}{1}{%
+      Citado \arabic{citecounter} vezes nas p\'aginas%
+    }{%
+      Citado \arabic{citecounter} vez nas p\'aginas%
+    }%
+  }},%
+  citecountnopage = {{Nenhuma cita\c{c}\~ao no texto}%
+                     {Nenhuma cita\c{c}\~ao no texto}}
+}% <<<2
+
+% <<<1
+
+% Languages >>>1
+
+\DeclareBibliographyStrings{%
+  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\^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\^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}},%
+  fromswedish      = {{do original sueco}{do original sueco}},%
+}%
+
+% <<<
+
+% Roles >>>1
+
+% Roles expressed as functions >>>2
+
+\NewBibliographyString{%
+  organizer,%
+  organizers,%
+  coordinator,%
+  coordinators,%
+}%
+
+\DeclareBibliographyStrings{%
+  editors         = {{editores}{ed\adddot}},%
+  collaborators   = {{colaboradores}{col\adddot}},%
+  translators     = {{tradutores}{trad\adddot}},%
+  commentators    = {{comentadores}{coment\adddot}},%
+  annotators      = {{anotadores}{anot\adddot}},%
+  organizer       = {{organizador}{org\adddot}},%
+  organizers      = {{organizadores}{org\adddot}},%
+  coordinator     = {{coordenador}{coord\adddot}},%
+  coordinators    = {{coordenadores}{coord\adddot}},%
+}%
+
+% <<<2
+
+% Roles expressed as objects >>>2
+
+\DeclareBibliographyStrings{%
+  withcommentator  = {{coment\'ario\addcolon}{coment\'ario\addcolon}},%
+  withannotator    = {{notas\addcolon}{notas\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}},%
+}%
+
+% <<<2
+
+% Roles expressed as actions >>>2
+
+\NewBibliographyString{% >>>3
+  byorganizer,%
+  byorganizerfo,%
+  bytechrev,%
+  byupdater,%
+  byupdateran,%
+  byphotographer,%
+  byartdir,%
+  byrecorder,%
+  byinterviewer,%
+  bygenorg,%
+  bygenorgfo,%
+  bycoordinator,%
+  bycoeditor,%
+  bydirector,%
+  bygendir,%
+  byproducer,%
+  byscreenwriter,%
+  byinterpreter,%
+  byillustrator,%
+  bytechrev,%
+}% <<<3
+
+\DeclareBibliographyStrings{% >>>3
+  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\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\c{c}\~ao\addcolon}%
+                     {grava\c{c}\~ao\addcolon}},%
+  byphotographer   = {{fotografia\addcolon}%
+                     {fotografia\addcolon}},%
+  bygenorg         = {{organiza\c{c}\~ao geral\addcolon}%
+                     {organiza\c{c}\~ao geral\addcolon}},%
+  byauthor         = {{por}%
+                     {por}},%
+  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\~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\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\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}},%
+}% <<<3
+
+% <<<2
+
+% <<<1
+
+\endinput%
+
+% vim: set foldmarker=\ >>>,\ <<< :
+

Added: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/english-abnt.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/english-abnt.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/english-abnt.lbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,184 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+%%
+%% Tradução para o espanhol de Juan-Ernesto Sepúlveda. Obrigado!
+
+\ProvidesFile{abnt-english.lbx}%
+2017/11/09\space v3.2\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=\ >>>,\ <<< :
+

Added: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/portuges-abnt.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/portuges-abnt.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/portuges-abnt.lbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,21 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+
+\ProvidesFile{portuges-abnt.lbx}
+[2017/11/09\space v3.2\space ABNT BibLaTeX citation style]%
+
+\InheritBibliographyExtras{brazilian-abnt}
+\InheritBibliographyStrings{brazilian-abnt}
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/portuguese-abnt.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/portuguese-abnt.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/portuguese-abnt.lbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,21 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+
+\ProvidesFile{portuguese-abnt.lbx}
+[2017/11/09\space v3.2\space ABNT BibLaTeX citation style]%
+
+\InheritBibliographyExtras{brazilian-abnt}
+\InheritBibliographyStrings{brazilian-abnt}
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/spanish-abnt.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/spanish-abnt.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/spanish-abnt.lbx	2017-11-12 22:33:34 UTC (rev 45765)
@@ -0,0 +1,339 @@
+%% Copyright 2016 Daniel Ballester 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 Ballester Marques.
+%%
+%% Tradução para o espanhol de Juan-Ernesto Sepúlveda. Obrigado!
+
+\ProvidesFile{abnt-spanish.lbx}%
+[2017/11/09\space v3.2\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=\ >>>,\ <<< :
+



More information about the tex-live-commits mailing list