texlive[43510] Master/texmf-dist: biblatex-abnt (15mar17)

commits+karl at tug.org commits+karl at tug.org
Wed Mar 15 22:17:58 CET 2017


Revision: 43510
          http://tug.org/svn/texlive?view=revision&revision=43510
Author:   karl
Date:     2017-03-15 22:17:57 +0100 (Wed, 15 Mar 2017)
Log Message:
-----------
biblatex-abnt (15mar17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/README.md
    trunk/Master/texmf-dist/doc/latex/biblatex-abnt/abnt-testcase.pdf
    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-brazilian.lbx
    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

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md	2017-03-15 21:17:44 UTC (rev 43509)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/CHANGELOG.md	2017-03-15 21:17:57 UTC (rev 43510)
@@ -3,6 +3,17 @@
 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 @@
 - 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

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-abnt/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-abnt/README.md	2017-03-15 21:17:44 UTC (rev 43509)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/README.md	2017-03-15 21:17:57 UTC (rev 43510)
@@ -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,10 +26,12 @@
 
 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
 
 1. Adicione as seguintes linhas ao preâmbulo do seu arquivo `.tex`:
@@ -48,3 +50,4 @@
 *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.*
+

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

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-03-15 21:17:44 UTC (rev 43509)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-abnt/biblatex-abnt.tex	2017-03-15 21:17:57 UTC (rev 43510)
@@ -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 @@
 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 @@
     \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 @@
   \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 @@
 Outros exemplos:
 
 \begin{example}
-Segundo o autor\footcite{assis08}
+Como sabemos\footcite[Cf.][]{assis08},
 \end{example}
 
 \begin{example}
@@ -260,13 +261,12 @@
 \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 @@
 \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 @@
 \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

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx	2017-03-15 21:17:44 UTC (rev 43509)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-brazilian.lbx	2017-03-15 21:17:57 UTC (rev 43510)
@@ -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 >>>

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx	2017-03-15 21:17:44 UTC (rev 43509)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx	2017-03-15 21:17:57 UTC (rev 43510)
@@ -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}
 

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx	2017-03-15 21:17:44 UTC (rev 43509)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx	2017-03-15 21:17:57 UTC (rev 43510)
@@ -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 at opt@citepages@#1}%
     {\csuse{cbx at 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,7 +355,7 @@
 
 % Commands >>>1
 
-\DeclareCiteCommand{\cite}% >>>2
+\DeclareCiteCommand{\cite}[\mkbibfootnote]% >>>2
   {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
    \usebibmacro{footcite}}%
@@ -298,6 +362,14 @@
   {\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 at lasthash}}%
-   \ifnumequal{\value{footcitecount}}{\value{footcitetotal}}%
-     {\protected at xappto\cbx at textcite@args{{\cbx at savedkeys}}%
+   \ifnumequal{\value{citecount}}{\value{citetotal}}{%
+      \protected at xappto\cbx at textcite@args{{\cbx at savedkeys}}%
       \protected at xappto\cbx at footcite@args{%
-        [\thefield{prenote}][\thefield{postnote}]{\cbx at savedkeys}}%
-      \iflastcitekey%
-        {\protected at xappto\cbx at textcite@args{\thefield{postpunct}}%
-         \protected at xappto\cbx at footcite@args{\nopunct}}%
-        {}}%
-     {}}%
+        [\thefield{prenote}][\thefield{postnote}]{\cbx at savedkeys}%
+      }%
+      \iflastcitekey{%
+         \protected at xappto\cbx at textcite@args{\thefield{postpunct}}%
+         \protected at xappto\cbx at 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 at textcite}{textcite}%
 
 \newrobustcmd{\cbx at textcite@init}[3]{% >>>2

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx	2017-03-15 21:17:44 UTC (rev 43509)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx	2017-03-15 21:17:57 UTC (rev 43510)
@@ -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}

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx	2017-03-15 21:17:44 UTC (rev 43509)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx	2017-03-15 21:17:57 UTC (rev 43510)
@@ -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 at 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
 
 

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx	2017-03-15 21:17:44 UTC (rev 43509)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx	2017-03-15 21:17:57 UTC (rev 43510)
@@ -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%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx	2017-03-15 21:17:44 UTC (rev 43509)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx	2017-03-15 21:17:57 UTC (rev 43510)
@@ -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,12 +125,20 @@
 
 \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
+
 \DeclareFieldFormat{uppercasecite}{%% >>>3
   \iftoggle{sccite}{%
     \textsc{\smartlowercase{#1}}%
@@ -335,6 +343,20 @@
 
 % <<<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
 
 
@@ -341,33 +363,35 @@
 % Macros >>>1
 
 \renewbibmacro*{cite}{%% >>>2
-  \iffieldequals{fullhash}{\cbx at lasthash}%
-   {\usebibmacro{cite:plabelyear+extrayear}}%
-   {\iffieldundef{shorthand}{%
+  \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}%
-                }%
-              }{%
-                \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 at lasthash}}%
-   \setunit{\multicitedelim}%
+        \setunit{\nameyeardelim}%
+        \usebibmacro{cite:plabelyear+extrayear}%
+    }{%
+      \usebibmacro{cite:shorthand}%
+    }%
+   \savefield{fullhash}{\cbx at 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 at 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
 



More information about the tex-live-commits mailing list