summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-08-04 21:32:25 +0000
committerKarl Berry <karl@freefriends.org>2016-08-04 21:32:25 +0000
commit1d4ca1a9f798fd54566f8a97e9b1a89839fba0c6 (patch)
treed6b3625584971561ac3db88b92d9b2455dcce9c3
parent8db7f7d6d00f6494fc682b4213ee88cc55f5b5c1 (diff)
biblatex-abnt (4aug16)
git-svn-id: svn://tug.org/texlive/trunk@41800 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md46
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abnt-testcase.pdf (renamed from Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abnt-testcase.pdf)bin257847 -> 257847 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abnt-testcase.tex (renamed from Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abnt-testcase.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc-abnt-10520.bib (renamed from Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc-abnt-10520.bib)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc-abnt-6023.bib (renamed from Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc-abnt-6023.bib)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc-test.bib (renamed from Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc-test.bib)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc.bib (renamed from Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc.bib)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/doc/biblatex-abnt.bib (renamed from Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.bib)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/doc/biblatex-abnt.pdf (renamed from Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.pdf)bin265780 -> 267867 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/doc/biblatex-abnt.tex (renamed from Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex)66
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/latex/bbx/abnt-numeric.bbx (renamed from Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx)2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/latex/bbx/abnt.bbx (renamed from Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx)59
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/latex/cbx/abnt-numeric.cbx (renamed from Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx)2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/latex/cbx/abnt.cbx (renamed from Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx)165
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/latex/lbx/abnt-brazilian.lbx (renamed from Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx)2
16 files changed, 268 insertions, 76 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md b/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md
new file mode 100644
index 00000000000..9ebd0740f6c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md
@@ -0,0 +1,46 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+
+## [2.0.1] - 2016-08-03
+
+### Added
+- Add CHANGELOG.md
+- Improve hyperref links
+
+### Changed
+- Make starred commands more consistent
+
+### Fixed
+- Improve handling of repeated titles
+- Improve sorting for patents
+- Allow citing with shorthand
+
+
+## [2.0] - 2016-07-08
+
+### Added
+- Add `abnt-numeric` style
+
+### Removed
+- Remove `biblatex`'s deprecated `\nameparts` macro
+
+### Fixed
+- Fix problem adding entries with no author
+- Fix problem with patent driver
+
+
+## [1.0.1] - 2016-06-07
+
+### Fixed
+- Stop repeating same authors in citations
+- Improve handling of small caps
+- Improve capitalization of organization fields
+- Add "et al." in citations
+
+
+[2.0.1]: https://github.com/abntex/biblatex-abnt/compare/v2.0...v2.0.1
+[2.0]: https://github.com/abntex/biblatex-abnt/compare/v1.0.1...v2.0
+[1.0.1]: https://github.com/abntex/biblatex-abnt/compare/v1.0...v1.0.1
+
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/README.md b/Master/texmf-dist/doc/latex/biblatex-abnt/README.md
index 12fdd780463..3ff787382ea 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/README.md
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/README.md
@@ -1,6 +1,6 @@
# biblatex-abnt
-Version 2.0
+Version 2.0.1
Permission is granted to copy, distribute and/or modify this software under
the terms of the LaTeX Project Public License, version
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abnt-testcase.pdf b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abnt-testcase.pdf
index 5995e05e400..5995e05e400 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abnt-testcase.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abnt-testcase.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abnt-testcase.tex b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abnt-testcase.tex
index 65ef138b7e2..65ef138b7e2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abnt-testcase.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abnt-testcase.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc-abnt-10520.bib b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc-abnt-10520.bib
index c4773b4e53f..c4773b4e53f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc-abnt-10520.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc-abnt-10520.bib
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc-abnt-6023.bib b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc-abnt-6023.bib
index f755f4e9892..f755f4e9892 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc-abnt-6023.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc-abnt-6023.bib
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc-test.bib b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc-test.bib
index 19b637e2192..19b637e2192 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc-test.bib
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc.bib b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc.bib
index 4cd19543101..4cd19543101 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase/abntex2-doc.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/abnt-testcase/abntex2-doc.bib
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.bib b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/biblatex-abnt.bib
index 44f9dae7aee..44f9dae7aee 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/biblatex-abnt.bib
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.pdf b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/biblatex-abnt.pdf
index 96ff8d26cb5..47a989b9a73 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/biblatex-abnt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/biblatex-abnt.tex
index 93486e95969..5237f266b7d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/doc/biblatex-abnt.tex
@@ -22,6 +22,7 @@
%hyperref, % Uncomment to turn citations into links
%backref, % Uncomment for back references (E.g. ``Cit. on p. 1")
%repeatfields, % Uncomment to repeat fields instead of using an underscore
+ %repeattitles, % Uncomment to repeat just titles, avoiding ____.____.
%usedashes, % Uncomment to use the standard dashes instead of underscores
%bftitles, % Uncomment to print titles in bold
%indent, % Uncomment to use hanging indentation in the bibliography
@@ -52,7 +53,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\version}{2.0}
+\newcommand{\version}{2.0.1}
\newcommand{\requirements}{\texttt{biblatex 3.4} e \texttt{biber 2.5}}
\title{biblatex-abnt \version}
\author{Daniel B. Marques}
@@ -106,32 +107,35 @@ Use o comando \verb"\printbibliography" para imprimir a bibliografia.
As opções a seguir podem ser usadas ao chamar o pacote \texttt{biblatex}:
-\begin{description}
- \item [hyperref] Transforma as citações em links que levam à bibliografia
- \item [backref] Aponta, na bibliografia, as páginas em que a entrada foi citada
- \item [repeatfields] Imprime os campos repetidos na bibliografia, em vez de substituí-los 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 [giveninits] Abrevia os primeiros nomes na bibliografia
- \item [uniquename=init] Necessário ao usar a opção \texttt{giveninits}
- \item [bftitles] Usa negrito para os títulos na bibliografia
+\begin{description}[parsep=8pt,itemindent=-1em,leftmargin=3em]
\item [indent] Indenta as entradas da bibliografia
- \item [scbib] Imprime os nomes em versalete na bibliografia
\item [sccite] Imprime os nomes em versalete nas citações
- \item [noslsn] Oculta as abreviações [s.l], [s.n] e [s.l.: s.n.] na bibliografia
- \item [nosl] Oculta apenas as abreviações [s.l.]
- \item [nosn] Oculta apenas as abreviações [s.n.]
+ \item [scbib] Imprime os nomes em versalete na bibliografia
+ \item [bftitles] Usa negrito para os títulos na bibliografia
+ \item [giveninits] Abrevia os primeiros nomes na bibliografia
+ \item [uniquename=init] Necessário ao usar a opção \texttt{giveninits}
+ \item [nosl] Oculta apenas as abreviações [s.l.] na bibliografia
+ \item [nosn] Oculta apenas 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
+ \item [repeattitles] Imprime apenas os títulos repetidos na bibliografia, 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 [hyperref] Transforma as citações em links que levam à bibliografia
+ \item [backref] Aponta, na bibliografia, as páginas em que a entrada foi citada
+ \item [sorting=none] Ordena as referências conforme aparecem no texto
\end{description}
+\vspace{\baselineskip}
E.g.: \verb"\usepackage[backend=biber, style=abnt, bftitles]{biblatex}"
-As opções \texttt{repeatfields}, \texttt{nosl}, \texttt{nosn} e \texttt{noslsn} também podem ser usadas apenas em entradas específicas. E.g.:
+As opções \texttt{repeatfields}, \texttt{repeattitles}, \texttt{nosl}, \texttt{nosn} e \texttt{noslsn} também podem ser usadas apenas em entradas específicas. E.g.:
\begin{verbatim}
@mvbook{assis08,
author = {Machado de Assis},
title = {Obra completa em quatro volumes},
year = {2008},
- options = {repeatfields, noslsn=false},
+ options = {repeattitles, noslsn=false},
}
\end{verbatim}
@@ -141,19 +145,39 @@ As opções \texttt{repeatfields}, \texttt{nosl}, \texttt{nosn} e \texttt{noslsn
\subsection{Estilo \texttt{abnt}}
-\begin{description}[style=nextline, parsep=8pt]
+Comandos principais:
+
+\begin{description}[style=nextline, labelindent=2em, leftmargin=4em]
\item [\PVerb{\cite{bosi08}}] \cite{bosi08}
\item [\PVerb{\textcite{bosi08}}] \textcite{bosi08}
- \item [\PVerb{\cite*{bosi08}}] \cite*{bosi08}
- \item [\PVerb{\textcite*{bosi08}}] \textcite*{bosi08}
- \item [\PVerb{\cites{mann09}{moretti09:1}{moretti09}}] \cites{mann09}{moretti09:1}{moretti09}
- \item [\PVerb{\cites{mann09}{moretti09:1, moretti09}}] \cites{mann09}{moretti09:1, moretti09}
- \item [\PVerb{\textcites{moretti09}{mann09}{amaral15}}] \textcites{moretti09}{mann09}{amaral15}
\item [\PVerb{\apud{assis08}{bosi08}}] \apud{assis08}{bosi08}
+ \item [\PVerb{\cites{moretti09}{mann09}{amaral15}}] \cites{moretti09}{mann09}{amaral15}
+ \item [\PVerb{\textcites{moretti09}{mann09}{amaral15}}] \textcites{moretti09}{mann09}{amaral15}
+\end{description}
+
+\vspace{1em}
+Outros exemplos:
+
+\begin{description}[style=nextline, labelindent=2em, leftmargin=4em]
+ \item [\PVerb{\cites{mann09}{moretti09:1, moretti09}}] \cites{mann09}{moretti09:1, moretti09}
\item [\PVerb{\apud[p.~12]{assis08}[p.~200]{bosi08}}] \apud[p.~12]{assis08}[p.~200]{bosi08}
\item [\PVerb{\textapud[p.~200]{assis08}[p.~12]{bosi08}}] \textapud[p.~200]{assis08}[p.~12]{bosi08}
\item [\PVerb{\apud[batman][]{bosi08}}] \apud[batman][]{bosi08}
\item [\PVerb{Assis \cite[apud][p.~200]{bosi08}}] Assis \cite[apud][p.~200]{bosi08}
+ \item [\PVerb{\citetitle{bosi08}}] \citetitle{bosi08}
+ \item [\PVerb{\citeauthor{bosi08}}] \citeauthor{bosi08}
+ \item [\PVerb{\citeyear{bosi08}}] \citeyear{bosi08}
+\end{description}
+
+
+Exceto pelo comando \PVerb{\textcite*}, que imprime o nome completo do autor, as versões com asterisco dos comandos acima imprimem o mesmo texto sem os parêntesis:
+
+\begin{description}[style=nextline, labelindent=2em, leftmargin=4em]
+ \item [\PVerb{\textcite*{bosi08}}] \textcite*{bosi08}
+ \item [\PVerb{\cite*{bosi08}}] \cite*{bosi08}
+ \item [\PVerb{\citetitle*{bosi08}}] \citetitle*{bosi08}
+ \item [\PVerb{\citeauthor*{bosi08}}] \citeauthor*{bosi08}
+ \item [\PVerb{\citeyear*{bosi08}}] \citeyear*{bosi08}
\end{description}
\begingroup
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx b/Master/texmf-dist/doc/latex/biblatex-abnt/latex/bbx/abnt-numeric.bbx
index 25595b86570..55b1581520b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/latex/bbx/abnt-numeric.bbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt-numeric.bbx}%
-[2016/07/06\space v2.0\space ABNT biblatex citation style]%
+[2016/07/06\space v2.0.1\space ABNT biblatex citation style]%
\RequireBibliographyStyle{abnt}
\ExecuteBibliographyOptions{labelnumber}
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx b/Master/texmf-dist/doc/latex/biblatex-abnt/latex/bbx/abnt.bbx
index 8ef713054ee..01fb395227a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/latex/bbx/abnt.bbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt.bbx}%
-[2016/07/06\space v2.0\space ABNT biblatex citation style]%
+[2016/07/06\space v2.0.1\space ABNT biblatex citation style]%
\RequireBiber[3]%
\DeclareLanguageMapping{brazilian}{abnt-brazilian}%
@@ -64,20 +64,39 @@
\settoggle{nosl}{#1}%
\settoggle{nosn}{#1}}%
+\newtoggle{repeattitle}%
+\DeclareBibliographyOption[boolean]{repeattitles}[true]{%
+ \settoggle{repeattitle}{#1}%
+ \ifstrequal{#1}{true}{%
+ \newbibmacro*{bbx:savetitle}{}%
+ \newbibmacro*{bbx:savesubtitle}{}%
+ }{%
+ \ExecuteBibliographyOptions{pagetracker}%
+ \newbibmacro*{bbx:savetitle}{\savefield{title}{\bbx@lasttitle}}%
+ \newbibmacro*{bbx:savesubtitle}{\savefield{subtitle}{\bbx@lastsubtitle}}%
+ }%
+}%
+\DeclareEntryOption[boolean]{repeattitle}[true]{%
+ \settoggle{repeattitle}{#1}%
+}%
+\DeclareEntryOption[boolean]{repeattitles}[true]{%
+ \settoggle{repeattitle}{#1}%
+}%
+
\newtoggle{repeatfields}%
\DeclareBibliographyOption[boolean]{repeatfields}[true]{%
\settoggle{repeatfields}{#1}%
\ifstrequal{#1}{true}{%
\renewbibmacro*{bbx:savehash}{}%
- \newbibmacro*{bbx:saveorg}{}%
- \newbibmacro*{bbx:savetitle}{}%
- \newbibmacro*{bbx:savesubtitle}{}%
+ \renewbibmacro*{bbx:saveorg}{}%
+ \renewbibmacro*{bbx:savetitle}{}%
+ \renewbibmacro*{bbx:savesubtitle}{}%
}{%
\ExecuteBibliographyOptions{pagetracker}%
\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}%
- \newbibmacro*{bbx:saveorg}{\savelist{organization}{\bbx@lasthash}}%
- \newbibmacro*{bbx:savetitle}{\savefield{title}{\bbx@lasttitle}}%
- \newbibmacro*{bbx:savesubtitle}{\savefield{subtitle}{\bbx@lastsubtitle}}%
+ \renewbibmacro*{bbx:saveorg}{\savelist{organization}{\bbx@lasthash}}%
+ \renewbibmacro*{bbx:savetitle}{\savefield{title}{\bbx@lasttitle}}%
+ \renewbibmacro*{bbx:savesubtitle}{\savefield{subtitle}{\bbx@lastsubtitle}}%
}%
}%
\DeclareEntryOption[boolean]{repeatfields}[true]{%
@@ -116,6 +135,7 @@
}%
\sort{%
\field{sortname}%
+ \field{holder}%
\field{author}%
\field{editor}%
\field{organization}%
@@ -509,8 +529,8 @@
{\global\undef\bbx@lasttitle%
\global\undef\bbx@lastsubtitle}%
{\usebibmacro{bbx:titledashcheck}%
- {\unspace\bibnamedash}%
- {\usebibmacro{bbx:savetitle}%
+ {\unspace\bibnamedash}%
+ {\usebibmacro{bbx:savetitle}%
\usebibmacro{bbx:savesubtitle}%
\printtext[title]{%
\usebibmacro{titleiskey}%
@@ -888,14 +908,15 @@
\newbibmacro*{bbx:dashcheck}[2]{%
\ifboolexpr{%
- (test {\iffieldequals{fullhash}{\bbx@lasthash}}%
- or%
- test {\iflistequals{organization}{\bbx@lastorg}}%
+ (%
+ test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+ or%
+ test {\iflistequals{organization}{\bbx@lastorg}}%
)%
and%
not test \iffirstonpage%
- and%
- not test {\iftoggle{repeatfields}}%
+ and%
+ not test {\iftoggle{repeatfields}}%
and%
(%
not bool {bbx@inset}%
@@ -910,8 +931,14 @@
\iftoggle{isdashed}{%
\ifboolexpr{%
test {\iffieldequals{title}{\bbx@lasttitle}}%
- and%
- test {\iffieldequals{subtitle}{\bbx@lastsubtitle}}%
+ and
+ (%
+ test {\iffieldequals{subtitle}{\bbx@lastsubtitle}}%
+ or%
+ test {\iffieldundef{subtitle}}%
+ )
+ and%
+ not test {\iftoggle{repeattitle}}
}%
{#1}%
{#2}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx b/Master/texmf-dist/doc/latex/biblatex-abnt/latex/cbx/abnt-numeric.cbx
index 542393e4572..20d8d66181f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/latex/cbx/abnt-numeric.cbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt-numeric.cbx}%
-[2016/07/06\space v2.0\space ABNT biblatex citation style]%
+[2016/07/06\space v2.0.1\space ABNT biblatex citation style]%
\RequireCitationStyle{numeric}
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx b/Master/texmf-dist/doc/latex/biblatex-abnt/latex/cbx/abnt.cbx
index df68b3acc4c..856e75a2b0d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/latex/cbx/abnt.cbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt.cbx}%
-[2016/07/06\space v2.0\space ABNT biblatex citation style]%
+[2016/07/06\space v2.0.1\space ABNT biblatex citation style]%
\RequireBiber[3]
\RequireCitationStyle{authoryear}
@@ -46,7 +46,13 @@
\space}%
}
-\DeclareFieldFormat{uppercasecite}{\iftoggle{sccite}{\textsc{\smartlowercase{#1}}}{\smartuppercase{#1}}}
+\DeclareFieldFormat{uppercasecite}{%
+ \iftoggle{sccite}{%
+ \textsc{\smartlowercase{#1}}%
+ }{%
+ \smartuppercase{#1}%
+ }%
+}
% ----------
% Options
@@ -152,11 +158,11 @@
\IfNoValueTF{#2}
{%
\IfNoValueTF{#1}
- {\citeyear{#3}}
- {\citeyear[#1]{#3}}%
+ {\citeyear*{#3}}
+ {\citeyear*[#1]{#3}}%
}
{%
- \citeyear[#1][#2]{#3}%
+ \citeyear*[#1][#2]{#3}%
}
\IfNoValueTF{#5}
{%
@@ -200,24 +206,24 @@
{}%
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\plaincite}
+\DeclareMultiCiteCommand{\cites}[\mkbibparens]
+ {\cite}%
+ {\setunit{\multicitedelim}}
+
+\DeclareCiteCommand*{\cite}
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
\usebibmacro{cite}}%
- {\multicitedelim}%
+ {}%
{\usebibmacro{postnote}}
-\DeclareMultiCiteCommand{\cites}[\mkbibparens]
- {\cite}%
- {\setunit{\multicitedelim}}
-
-\DeclareCiteCommand*{\cite}[\mkbibparens]
+\DeclareCiteCommand{\plaincite}
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
- \usebibmacro{citeyearpunct}}%
- {}%
+ \usebibmacro{cite}}%
+ {\multicitedelim}%
{\usebibmacro{postnote}}
\DeclareCiteCommand{\textcite}
@@ -260,7 +266,7 @@
{\ifciteindex%
{\indexfield{indextitle}}%
{}%
- \printfield[emphtitle]{labeltitle}}%
+ \printtext[bibhyperref]{\printfield[emphtitle]{labeltitle}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}
@@ -272,7 +278,7 @@
{\ifciteindex%
{\indexfield{indextitle}}%
{}%
- \printfield[citetitle]{title}\nopunct}%
+ \printtext[bibhyperref]{\printfield[emphtitle]{labeltitle}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}
@@ -284,10 +290,48 @@
{\ifciteindex%
{\indexnames{labelname}}%
{}%
- \printnames{labelname}}%
+ \printtext[bibhyperref]{\printnames{labelname}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\citeauthor}[\mkbibparens]
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\ifciteindex
+ {\indexnames{labelname}}
+ {}%
+ \printtext[bibhyperref]{\printnames[LAST]{labelname}}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\citeauthor}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\ifciteindex
+ {\indexnames{labelname}}
+ {}%
+ \printtext[bibhyperref]{\printnames{labelname}}}%
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\citeyear}[\mkbibparens]
+ {\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}}
+
% ----------
% newbibmacro
@@ -346,24 +390,27 @@
\renewbibmacro*{cite}{%
\iffieldequals{fullhash}{\cbx@lasthash}%
- {\setunit{\compcitedelim}%
- \usebibmacro{cite:plabelyear+extrayear}}%
- {\ifnameundef{shortauthor}{%
- \ifnameundef{holder}{%
- \ifnameundef{labelname}{%
- \iflistundef{organization}{%
- \usebibmacro{cite:noname}%
+ {\usebibmacro{cite:plabelyear+extrayear}}%
+ {\iffieldundef{shorthand}{%
+ \ifnameundef{shortauthor}{%
+ \ifnameundef{holder}{%
+ \ifnameundef{labelname}{%
+ \iflistundef{organization}{%
+ \usebibmacro{cite:noname}%
+ }{%
+ \printlist[uppercase]{organization}%
+ }
+ }{%
+ \printtext[bibhyperref]{\printnames[LAST]{labelname}}%
+ }
}{%
- \printlist[uppercase]{organization}%
+ \printnames[LAST]{holder}%
}
}{%
- \printtext[bibhyperref]{\printnames[LAST]{labelname}}%
+ \printnames[LAST]{shortauthor}%
}
- }{%
- \printnames[LAST]{holder}%
- }
}{%
- \printnames[LAST]{shortauthor}%
+ \usebibmacro{cite:shorthand}
}
\setunit{\nameyeardelim}%
\usebibmacro{cite:plabelyear+extrayear}%
@@ -393,11 +440,7 @@
{\addcomma\addspace\printfield{issue}}}
\renewbibmacro*{cite:shorthand}{%
- \ifciteseen%
- {\printfield{shorthand}}%
- {\printnames[labelname][-\value{listtotal}]{labelname}%
- \setunit{\nameyeardelim}%
- \printfield{title}\space\printfield{shorthand}}}
+ \printtext[bibhyperref]{\emph{\printfield{shorthand}}}}
\newbibmacro*{citeyearpunct}{%
\iffieldundef{labelyear}%
@@ -410,6 +453,58 @@
\setunit{\multicitedelim}}
+% Get the whole thing inside bibhyperref (including punctuation)
+
+\DeclareFieldFormat{citehyperref}{%
+ \DeclareFieldAlias{bibhyperref}{noformat}% Avoid nested links
+ \bibhyperref{#1}}
+
+\DeclareFieldFormat{textcitehyperref}{%
+ \DeclareFieldAlias{bibhyperref}{noformat}% Avoid nested links
+ \bibhyperref{%
+ #1%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
+
+\savebibmacro{cite}
+\savebibmacro{textcite}
+\savebibmacro{textcitefull}
+
+\renewbibmacro*{cite}{%
+ \printtext[citehyperref]{%
+ \restorebibmacro{cite}%
+ \usebibmacro{cite}}}
+
+\renewbibmacro*{textcite}{%
+ \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{textcite}%
+ \usebibmacro{textcite}}}
+
+\renewbibmacro*{textcitefull}{%
+ \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}}}
+
+
\newcommand\FirstWord[1]{\@firstword#1 \@nil}%
\def\@firstword#1 #2\@nil{\@removecomma#1,\@nil}%
\def\@removecomma#1,#2\@nil{\@removeperiod#1.\@nil}
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx b/Master/texmf-dist/doc/latex/biblatex-abnt/latex/lbx/abnt-brazilian.lbx
index ebe16afb8ad..65eae35ba75 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/latex/lbx/abnt-brazilian.lbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt.lbx}%
-[2016/07/06\space v2.0\space ABNT biblatex citation style]%
+[2016/07/06\space v2.0.1\space ABNT biblatex citation style]%
\InheritBibliographyExtras{brazilian}