summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-15 21:17:57 +0000
committerKarl Berry <karl@freefriends.org>2017-03-15 21:17:57 +0000
commite713cc2bf72641ba4b55583d6a4eebb89f464937 (patch)
tree4b5ead5bfc40edc04df2cb76914479240353e24b
parent2f6f34d157f2343544165ae24cb2a04434b058b0 (diff)
biblatex-abnt (15mar17)
git-svn-id: svn://tug.org/texlive/trunk@43510 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md12
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/README.md9
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.pdfbin306469 -> 306277 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.pdfbin402358 -> 405058 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex101
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx113
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx60
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx29
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx76
12 files changed, 289 insertions, 117 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md b/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md
index f94f47839f0..df18d7b9250 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md
@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+## [3.0.1] - 2017-03-15
+
+### Added
+- Add "loc. cit." to `abnt-ibid` style
+- Add \textcite to `abnt-ibid` style
+
+### Fixed
+- Fix citations of articles with no author
+- Add ellipsis after abbreviated titles in citations
+
+
## [3.0] - 2016-10-13
### Added
@@ -55,6 +66,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add "et al." in citations
+[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
[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
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/README.md b/Master/texmf-dist/doc/latex/biblatex-abnt/README.md
index e25dccd101b..6451c353ac6 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 3.0
+Version 3.0.1
Permission is granted to copy, distribute and/or modify this software
under the terms of the LaTeX Project Public License, version 1.3c
@@ -26,9 +26,11 @@ imprime *ipsis litteris* todas as entradas citadas na norma 6023:2002 da ABNT.
O `biblatex-abnt` está incluso no TeX Live 2016.
-Para instalá-lo manualmente, copie os arquivos `.bbx`, `.cbx` e `.lbx` para:
+Para instalá-lo manualmente, copie os arquivos `.bbx`, `.cbx` e `.lbx` para
-`<TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-abnt/`
+ <TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-abnt/
+
+e atualize o banco de dados do TeX (rodando o `texhash`, por exemplo).
## Uso
@@ -48,3 +50,4 @@ suas entradas.
*Consulte o arquivo `biblatex-abnt.pdf` e o [manual do
`biblatex`](http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex
.pdf) para informações sobre as opções e comandos disponíveis.*
+
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.pdf b/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.pdf
index d24466a6dae..8e3211941ce 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.pdf b/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.pdf
index 055a488f990..e44cafeaa09 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/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/biblatex-abnt.tex
index b71e986346a..d9d0e9b3d79 100644
--- a/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex
@@ -90,7 +90,7 @@
\printbibliography[heading=none,check=key#1]%
}% <<<2
-\newcommand{\version}{3.0}
+\newcommand{\version}{3.0.1}
\newcommand{\requirements}{\texttt{biblatex 3.6} e \texttt{biber 2.6}}
\title{biblatex-abnt \version}
\author{Daniel B. Marques}
@@ -115,10 +115,11 @@ problema na compilação, cheque se seus pacotes estão atualizados.
O \texttt{biblatex-abnt} está incluso no TeX Live 2016.
Para instalá-lo manualmente, copie os arquivos \texttt{.bbx}, \texttt{.cbx} e
-\texttt{.lbx} para:
+\texttt{.lbx} para
\begin{verbatim}
<TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-abnt/
\end{verbatim}
+e atualize o banco de dados do TeX (rodando o `texhash`, por exemplo).
% <<<2
\section{Uso}% >>>2
@@ -138,7 +139,7 @@ arquivo {.tex}:
\addbibresource{outroarquivo.bib} % bibliografia vão aqui.
\end{verbatim}
-Após as opções \texttt{backend} e \texttt{style}, podem ser acrescentadas
+Após a opção \texttt{style}, podem ser acrescentadas
as opções descritas na seção \ref{sec:opções}.
Use os comandos descritos na seção \ref{sec:comandos} para citar obras.
@@ -159,9 +160,9 @@ As opções a seguir podem ser usadas ao chamar o pacote \texttt{biblatex}:
\item [ittitles] Usa itálico 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 as abreviações [s.l.] na bibliografia
+ \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 [nosl] Oculta apenas as abreviações [s.l.] na bibliografia
- \item [nosn] Oculta apenas as abreviações [s.n.] na bibliografia
\item [repeatfields] Imprime os campos repetidos na bibliografia, em vez de
substituí-los por traços sublineares
\item [repeatfirstfields] Repete apenas o primeiro campo de cada entrada,
@@ -224,7 +225,7 @@ Comandos principais:
Outros exemplos:
\begin{example}
-Segundo o autor\footcite{assis08}
+Como sabemos\footcite[Cf.][]{assis08},
\end{example}
\begin{example}
@@ -260,13 +261,12 @@ Assis \cite[apud][p.~200]{bosi08}
\end{example}
-Enquanto o comando \PVerb{\footcite} imprime a referência inteira, sua versão
+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, a versão com asterisco (\PVerb{\footcite*}) imprime
-sempre a versão abreviada:
+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}
-Segundo o autor\footcite*{assis08}
+Como sabemos\footcite*[Cf.][]{bosi08},
\end{example}
O comando \PVerb{\textcite*}, por sua vez, imprime o nome completo do autor:
@@ -295,6 +295,47 @@ originais excluindo os parênteses:
\end{example}
% <<<3
+
+\subsection{Estilo \texttt{abnt-ibid}}% >>>3
+
+\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
+
\subsection{Estilo \texttt{abnt-numeric}}% >>>3
\DeclareCiteCommand{\supercite}[\mkbibsuperscript]
@@ -356,46 +397,6 @@ Bosi \supercite{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}
-\end{example}
-
-\begin{example}
-Segundo o autor\apud{assis08}{bosi08}
-\end{example}
-
-A referência é abreviada automaticamente e as abreviações ``id.'',
-``ibid.'' e ``op. cit.'' são adicionadas quando apropriado:
-
-\begin{example}
-Segundo o autor\footcite[25]{assis08}\\
-Segundo o autor\footcite[43]{bosi08}\\
-Segundo o autor\footcite[139]{assis08}\\
-Segundo o autor\footcite[258]{assis08}
-\end{example}% <<<3
-
% <<<2
\clearpage
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx
index 7a3798345cd..2249ed5f9af 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt.lbx}%
-[2016/10/03\space v3.0\space ABNT BibLaTeX citation style]%
+[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]%
% Init >>>
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx
index 1aa31d36df5..65db826e75a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt-ibid.bbx}
-[2016/10/03\space v3.0\space ABNT BibLaTeX citation style]%
+[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]%
\RequireBibliographyStyle{abnt}
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx
index 88941c28413..c2355bdccfd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt-ibid.cbx}%
-[2016/10/03\space v3.0\space ABNT BibLaTeX citation style]%
+[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]%
\newtoggle{sccite}%
@@ -86,6 +86,7 @@
\providecommand*{\mkidem}[1]{#1}%
\providecommand*{\mkibid}[1]{#1}%
\providecommand*{\mkopcit}[1]{#1}%
+\providecommand*{\mkloccit}[1]{#1}%
\renewcommand*{\iffinalcitedelim}{%
\ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}%
@@ -100,7 +101,7 @@
{\ExecuteBibliographyOptions{loccittracker=constrict}}%
{\ExecuteBibliographyOptions{loccittracker=false}}}%
-\DeclareBibliographyOption[string]{footcitepages}[permit]{%
+\DeclareBibliographyOption[string]{citepages}[permit]{%
\ifcsdef{cbx@opt@citepages@#1}%
{\csuse{cbx@opt@citepages@#1}}%
{\PackageError{biblatex}%
@@ -175,7 +176,7 @@
opcittracker=constrict,%
pagetracker,%
autocite=footnote,%
- footcitepages=permit,%
+ citepages=permit,%
labeldateparts,%
labeldate=year,%
}% <<<2
@@ -204,13 +205,21 @@
\usebibmacro{footcite:idem}%
}{%
\ifboolexpr{%
- test {\ifopcit}%
+ test {\ifloccit}%
and%
not test {\iffirstonpage}%
}{%
- \usebibmacro{footcite:opcit}%
+ \usebibmacro{footcite:loccit}%
}{%
- \usebibmacro{footcite:short}%
+ \ifboolexpr{%
+ test {\ifopcit}%
+ and%
+ not test {\iffirstonpage}%
+ }{%
+ \usebibmacro{footcite:opcit}%
+ }{%
+ \usebibmacro{footcite:short}%
+ }%
}%
}%
}%
@@ -222,6 +231,48 @@
}%
}% <<<2
+\newbibmacro*{footcitestar}{% >>>2
+ \usebibmacro{footcite:citepages}%
+ \global\togglefalse{cbx:loccit}%
+ \iffieldundef{shorthand}{%
+ \ifboolexpr{%
+ test {\ifciteibid}%
+ and%
+ not test {\iffirstonpage}%
+ }{%
+ \usebibmacro{footcite:ibid}%
+ }{%
+ \ifboolexpr{%
+ test {\ifciteidem}%
+ and%
+ not test {\iffirstonpage}%
+ }{%
+ \usebibmacro{footcite:idem}%
+ }{%
+ \ifboolexpr{%
+ test {\ifloccit}%
+ and%
+ not test {\iffirstonpage}%
+ }{%
+ \usebibmacro{footcite:loccit}%
+ }{%
+ \ifboolexpr{%
+ test {\ifopcit}%
+ and%
+ not test {\iffirstonpage}%
+ }{%
+ \usebibmacro{footcite:opcit}%
+ }{%
+ \usebibmacro{footcite:short}%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \usebibmacro{footcite:shorthand}%
+ }%
+}% <<<2
+
\newbibmacro*{footcite:full}{% >>>2
\usebibmacro{footcite:full:citepages}%
\printtext[bibhypertarget]{%
@@ -248,6 +299,19 @@
}%
}% <<<2
+\newbibmacro*{footcite:loccit}{% >>>2
+ \ifnameundef{labelname}{%
+ \printtext[bibhyperref]{%
+ \printfield[citetitle]{labeltitle}%
+ }%
+ }{%
+ \printnames[LAST]{labelname}%
+ }%
+ \setunit*{\nameyeardelim}%
+ \printtext[bibhyperlink]{\bibstring[\mkloccit]{loccit}}%
+ \global\toggletrue{cbx:loccit}
+}% <<<2
+
\newbibmacro*{footcite:opcit}{% >>>2
\ifnameundef{labelname}{%
\printtext[bibhyperref]{%
@@ -258,9 +322,9 @@
}%
\setunit*{\nameyeardelim}%
\printtext[bibhyperlink]{\bibstring[\mkopcit]{opcit}}%
-}%
+}% <<<2
-\newbibmacro*{footcite:idem}{%
+\newbibmacro*{footcite:idem}{% >>>2
\printtext[bibhyperlink]{\bibstring[\mkidem]{idem}}%
\setunit*{\nameyeardelim}%
\iffieldundef{labelyear}{%
@@ -291,13 +355,21 @@
% Commands >>>1
-\DeclareCiteCommand{\cite}% >>>2
+\DeclareCiteCommand{\cite}[\mkbibfootnote]% >>>2
{\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
\usebibmacro{footcite}}%
{\multicitedelim}%
{\usebibmacro{footcite:postnote}}% <<<2
+\DeclareCiteCommand*{\cite}[\mkbibfootnote]% >>>2
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \usebibmacro{footcite:citepages}%
+ \usebibmacro{footcite:short}}%
+ {\multicitedelim}%
+ {\usebibmacro{footcite:postnote}}% <<<2
+
\DeclareCiteCommand{\parencite}[\mkbibparens]% >>>2
{\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
@@ -315,9 +387,7 @@
\DeclareCiteCommand*{\footcite}[\mkbibfootnote]% >>>2
{\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
- \usebibmacro{footcite:citepages}%
- \global\togglefalse{cbx:loccit}%
- \usebibmacro{footcite:short}}%
+ \usebibmacro{footcitestar}}%
{\multicitedelim}%
{\usebibmacro{footcite:postnote}}% <<<2
@@ -436,20 +506,21 @@
{}%
{\usebibmacro{textcite:count}%
\savefield{namehash}{\cbx@lasthash}}%
- \ifnumequal{\value{footcitecount}}{\value{footcitetotal}}%
- {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+ \ifnumequal{\value{citecount}}{\value{citetotal}}{%
+ \protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
\protected@xappto\cbx@footcite@args{%
- [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
- \iflastcitekey%
- {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}%
- \protected@xappto\cbx@footcite@args{\nopunct}}%
- {}}%
- {}}%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}%
+ }%
+ \iflastcitekey{%
+ \protected@xappto\cbx@textcite@args{\thefield{postpunct}}%
+ \protected@xappto\cbx@footcite@args{\nopunct}%
+ }{}%
+ }{}}%
{}%
{}% <<<2
% textcite has nested \DeclareCiteCommand definitions for
-% textcite and we want to use % the normal textcite context
+% textcite and we want to use the normal textcite context
\DeclareDelimcontextAlias{cbx@textcite}{textcite}%
\newrobustcmd{\cbx@textcite@init}[3]{% >>>2
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx
index de9304d13a2..ac80d7c965b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt-numeric.bbx}%
-[2016/10/03\space v3.0\space ABNT BibLaTeX citation style]%
+[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]%
\RequireBibliographyStyle{abnt}
\ExecuteBibliographyOptions{labelnumber}
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx
index f2e2777143e..6667fc69ac5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt-numeric.cbx}%
-[2016/10/03\space v3.0\space ABNT BibLaTeX citation style]%
+[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]%
\RequireCitationStyle{numeric}
@@ -40,6 +40,16 @@
{\multicitedelim}
{\usebibmacro{postnote}}% <<<2
+\DeclareCiteCommand{\cbx@textcite}% >>>2
+ {\usebibmacro{textcite:init}% Mudar \multinamedelim e \finalnamedelim.
+ \boolfalse{cbx:parens}%
+ \renewcommand*{\finalnamedelim}{\addspace\bibstring{and}\addspace}%
+ \renewcommand*{\multinamedelim}{\addcomma\addspace}}%
+ {\usebibmacro{citeindex}%
+ \usebibmacro{textcite}}
+ {}
+ {\usebibmacro{textcite:postnote}}% <<<2
+
\DeclareMultiCiteCommand{\cites}[\mkbibparens]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}%
@@ -71,6 +81,54 @@
{}%
\textcitedelim}}% <<<1
+% 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}%
+
+\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}}}%
+ )%
+ }%
+ {\DeclareFieldAlias{textcitehyperref}{noformat}}%
+ {}%
+ \printtext[textcitehyperref]{%
+ \restorebibmacro{textcite}%
+ \usebibmacro{textcite}}%
+}% <<<2
+
+% <<<1
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx
index 199eed988bb..ebd4316ac26 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx
@@ -13,13 +13,16 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt.bbx}%
-[2016/10/03\space v3.0\space ABNT BibLaTeX citation style]%
+[2017/03/15\space v3.0.1\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}%
\RequireBibliographyStyle{standard}%
@@ -538,7 +541,7 @@
\DeclareFieldFormat{illustrated}{\addspace #1\isdot}%
-\DeclareFieldFormat{url}{\bibstring{url}\addcolon\addspace\url{<#1>}}%
+\DeclareFieldFormat{url}{\bibstring{url}\addcolon\addspace<\url{#1}>}%
\DeclareFieldFormat{urldate}{\bibstring{urlseen}\addcolon\addspace #1}%
\DeclareFieldFormat*{note}{\addspace #1}%
@@ -628,7 +631,7 @@
% <<<
-\DeclareFieldFormat{noformat}{\normalfont{#1}}%
+\DeclareFieldFormat{normalfont}{\normalfont{#1}}%
% <<<2
@@ -770,9 +773,9 @@
test {\iffieldundef{related}}%
}%
{\printfield[titlecase]{title}}%
- {\printfield[noformat]{title}}}%
+ {\printfield[normalfont]{title}}}%
\normalfont{\setunit*{\subtitlepunct}%
- \printfield[noformat]{subtitle}%
+ \printfield[normalfont]{subtitle}%
\setunit{\addperiod\addspace}}}%
\newunit}}%
\printfield{titleaddon}%
@@ -810,7 +813,7 @@
\printfield[titlecase]{booktitle}%
}%
\normalfont{\setunit*{\subtitlepunct}}%
- \printfield[noformat]{booksubtitle}}%
+ \printfield[normalfont]{booksubtitle}}%
\newunit}%
\printfield{booktitleaddon}%
}%% <<<3
@@ -829,7 +832,7 @@
\printfield[titlecase]{maintitle}%
}%
\normalfont{\setunit*{\subtitlepunct}}%
- \printfield[noformat]{mainsubtitle}}%
+ \printfield[normalfont]{mainsubtitle}}%
\newunit}%
\printfield{maintitleaddon}%
}%% <<<3
@@ -871,7 +874,7 @@
{\printtext[journaltitle]{%
\printfield[titlecase]{journaltitle}%
\setunit{\subtitlepunct}%
- \printfield[noformat]{journalsubtitle}}}%
+ \printfield[normalfont]{journalsubtitle}}}%
}%% <<<3
\newbibmacro{journal+section}{%% >>>3
@@ -901,12 +904,12 @@
\printtext[title]{%
\unspace\printfield[upperfirst]{title}%
\normalfont{\setunit*{\subtitlepunct}%
- \printfield[noformat]{subtitle}}}%
+ \printfield[normalfont]{subtitle}}}%
}%
{\printtext[title]{%
\printfield[titlecase]{title}%
\normalfont{\setunit*{\subtitlepunct}%
- \printfield[noformat]{subtitle}}}}%
+ \printfield[normalfont]{subtitle}}}}%
}%
}%% <<<3
@@ -1153,7 +1156,7 @@
{\printtext[issuetitle]{%
\printfield[upperfirst]{issuetitle}%
\setunit*{\subtitlepunct}%
- \printfield[noformat]{issuesubtitle}}}%
+ \printfield[normalfont]{issuesubtitle}}}%
}%% <<<3
\renewbibmacro*{issue+date}{%% >>>3
@@ -1219,7 +1222,7 @@
\printtext[parens]{%
\printfield{series}%
\setunit*{\addcomma\addspace}%
- \printfield[noformat]{number}%
+ \printfield[normalfont]{number}%
\newunit}%
}%
}%% <<<3
@@ -1848,7 +1851,7 @@
\setunit{\labelnamepunct}\newblock%
\printfield[uppercase]{title}%
\setunit*{\addcolon\addspace}%
- \printfield[noformat]{subtitle}%
+ \printfield[normalfont]{subtitle}%
\newunit%
\printfield{titleaddon}%
\newunit\newblock%
diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx
index afc7aeef0e9..5789a2a2557 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx
@@ -13,7 +13,7 @@
%% The Current Maintainer of this work is Daniel B. Marques.
\ProvidesFile{abnt.cbx}%
-[2016/10/03\space v3.0\space ABNT BibLaTeX citation style]%
+[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]%
% Init >>>1
@@ -125,9 +125,17 @@
\DeclareFieldFormat{citetitle}{%% >>>3
\iftoggle{sccite}{%
- \normalfont\textsc{\MakeLowercase{\FirstWord{#1}}}%
+ \normalfont\textsc{\MakeLowercase{\FirstWord{#1}}}\ldots\isdot%
}{%
- \normalfont\MakeUppercase{\FirstWord{#1}}%
+ \normalfont\MakeUppercase{\FirstWord{#1}}\ldots\isdot%
+ }%
+}%% <<<3
+
+\DeclareFieldFormat{noname}{%% >>>3
+ \iftoggle{sccite}{%
+ \normalfont\textsc{\MakeLowercase{\FirstWord{#1}}}\ldots\isdot%
+ }{%
+ \normalfont\MakeUppercase{\FirstWord{#1}}\ldots\isdot%
}%
}%% <<<3
@@ -335,39 +343,55 @@
% <<<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@lasthash}%
- {\usebibmacro{cite:plabelyear+extrayear}}%
- {\iffieldundef{shorthand}{%
+ \iffieldequals{fullhash}{\cbx@lasthash}{%
+ \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}}%
- }%
+ \ifnameundef{holder}{%
+ \ifnameundef{labelname}{%
+ \iflistundef{organization}{%
+ \usebibmacro{cite:noname}%
}{%
- \printnames[LAST]{holder}%
+ \printlist[uppercase]{organization}%
}%
}{%
- \printnames[LAST]{shortauthor}%
+ \printtext[bibhyperref]{\printnames[LAST]{labelname}}%
}%
+ }{%
+ \printnames[LAST]{holder}%
+ }%
}{%
- \usebibmacro{cite:shorthand}%
+ \printnames[LAST]{shortauthor}%
}%
- \setunit{\nameyeardelim}%
- \usebibmacro{cite:plabelyear+extrayear}%
- \savefield{fullhash}{\cbx@lasthash}}%
- \setunit{\multicitedelim}%
+ \setunit{\nameyeardelim}%
+ \usebibmacro{cite:plabelyear+extrayear}%
+ }{%
+ \usebibmacro{cite:shorthand}%
+ }%
+ \savefield{fullhash}{\cbx@lasthash}%
+ }%
+ \setunit{\multicitedelim}%
}% <<<2
\renewbibmacro*{textcite}{%% >>>2
@@ -423,7 +447,7 @@
}% <<<2
\newbibmacro*{cite:noname}{%% >>>2
- \printfield[citetitle]{title}%
+ \printfield[noname]{title}%
}% <<<2
\def\citeresetabnt{\global\let\cbx@abnt@names\@empty}%
@@ -448,7 +472,7 @@
\newbibmacro*{cite:plabelyear+extrayear}{%% >>>2
\iffieldundef{labelyear}{}{%
\printtext[bibhyperref]{%
- \printfield[noformat]{origyear}%
+ \printfield[normalfont]{origyear}%
\setunit*{\addslash}%
\printfield{labelyear}%
\printfield{extrayear}%
@@ -461,7 +485,7 @@
\renewbibmacro*{cite:shorthand}{%% >>>2
\printtext[bibhyperref]{%
- \emph{\printfield{shorthand}}%
+ \printfield{shorthand}%
}%
}% <<<2