fei (18mar17)

git-svn-id: svn://tug.org/texlive/trunk@43536 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 257 insertions, 190 deletions

diff --git a/Master/texmf-dist/doc/latex/fei/fei.pdf b/Master/texmf-dist/doc/latex/fei/fei.pdf
index ad56bc801c5..48d18d38c15 100644
--- a/Master/texmf-dist/doc/latex/fei/fei.pdf
+++ b/Master/texmf-dist/doc/latex/fei/fei.pdf
diff --git a/Master/texmf-dist/doc/latex/fei/referencias.bib b/Master/texmf-dist/doc/latex/fei/referencias.bib
index 12a41616331..57125f65198 100644
--- a/Master/texmf-dist/doc/latex/fei/referencias.bib
+++ b/Master/texmf-dist/doc/latex/fei/referencias.bib
@@ -1,185 +1,242 @@
-@article{turing50,
-author = {Alan Turing},
-journal = {Mind},
-pages = {433--460},
-title = {Computing Machinery and Intelligence},
-volume = {59},
-year = {1950},
-}
-
-@book{Goldberg1989,
-address = {Boston, MA, USA},
-author = {David Goldberg},
-edition = {1st},
-isbn = {0201157675},
-publisher = {Addison-Wesley Longman Publishing Co., Inc.},
-title = {Genetic Algorithms in Search, Optimization and Machine Learning},
-year = {1989},
-}
-
-@article{Mcc43,
-  author = {Warrren McCulloch and Walter Pitts},
-  journal = {Bulletin of Mathematical Biophysic},
-  keywords = {imported},
-  number = 5,
-  pages = {115-133},
-  title = {A logical calculus of the ideas immanent in nervous activity},
-  year = {1943},
-}
-
-@book{mittelbach_latex_2004,
-	edition = {2},
-	title = {The Latex Companion},
-	publisher = {Addison-Wesley},
-	author = {Frank Mittelbach and Michel Goossens},
-	year = {2004},
-}
-
-@book{russell2010,
-	address = {Upper Saddle River, {NJ}},
-	edition = {3},
-	title = {Artificial intelligence: a modern approach},
-	shorttitle = {Artificial intelligence},
-	language = {English},
-	publisher = {Prentice Hall},
-	author = {Stuart Russell and Peter Norvig and Ernest Davis},
-	year = {2010},
-}
-
-@book{haykin99a,
-  author = {Simon Haykin},
-  publisher = {Prentice Hall},
-  title = {Neural Networks: A Comprehensive Foundation},
-  year = {1999},
-}
-
-@book{galilei_dialogue_1953,
-	title = {Dialogue concerning the two chief world systems: Ptolemaic and Copernican},
-	shorttitle = {Dialogue concerning the two chief world systems},
-	publisher = {University of California Pr},
-	author = {Galileo Galilei},
-	year = {1953},
-}
-
-@book{galilei_sidereus_2004,
-	title = {Sidereus Nuncius, Or The Sidereal Messenger},
-    author = {Galileo Galilei},
-	publisher = {Byzantium Press},
-	isbn = {9780226279039},
-	language = {en},
-	year = {2004},
-}
-
-@book{dyson_disturbing_1979,
-  title={Disturbing the Universe},
-  author={Freeman Dyson},
-  series={Basic Books 50 years},
-  url={http://books.google.com.br/books?id=RHzoMeU2bxsC},
-  year={1979},
-  publisher={Basic Books},
-}
-
-@book{heath1921history,
-  title={A History of Greek Mathematics},
-  author={Thomas Little Heath},
-  number={v. 1},
-  series={A History of Greek Mathematics},
-  url={http://books.google.com.br/books?id=h4JsAAAAMAAJ},
-  year={1921},
-  publisher={Clarendon Press},
-}
-
- @Unpublished{lshort,
-    author = {Tobias Oetiker and Hubert Partl and Irene Hyna and Elisabeth Schlegl},
-    title = {The Not So Short Introduction to {\LaTeXe}},
-    month = {apr},
-    year = {2014},
-    note = {Distribuido digitalmente},
-    url={http://tobi.oetiker.ch/lshort/},
- }
-
- @book{lamport1994latex,
-  title={{\LaTeX} - A Document Preparation System},
-  author={Leslie Lamport},
-  year={1994},
-  publisher={Adisson-Wesley},
-}
-
-
-@book{kurzweil2013,
-	address = {New York, NY},
-	title = {How to create a mind: the secret of human thought revealed},
-	isbn = {978-0-14-312404-7 978-0-670-02529-9},
-	shorttitle = {How to create a mind},
-	language = {eng},
-	publisher = {Penguin Books},
-	author = {Kurzweil, Ray},
-	year = {2013},
-}
-
-@book{assange2012,
-	address = {New York ; London},
-	title = {Cypherpunks: freedom and the future of the internet},
-	isbn = {978-1-939293-00-8 978-1-939293-01-5},
-	shorttitle = {Cypherpunks},
-	publisher = {OR Books},
-	author = {Assange, Julian and Appelbaum, Jacob and Müller-Maguhn, Andy and Zimmermann, Jérémie},
-	year = {2012},
-}
-
-@book{kernighan1988,
-	title = {The {C} programming language},
-	volume = {2},
-	publisher = {Prentice-Hall Englewood Cliffs},
-	author = {Kernighan, Brian W. and Ritchie, Dennis M. and Ejeklint, Per},
-	year = {1988},
-}
-
-@book{kahneman2011,
-	title = {Thinking, fast and slow},
-	publisher = {Macmillan},
-	author = {Kahneman, Daniel},
-	year = {2011},
-}
-
-@book{stewart2012,
-	address = {Australia ; Belmont, CA},
-	edition = {7},
-	title = {Calculus - 7th edition},
-	isbn = {978-0-538-49781-7 0-538-49781-5},
-	language = {English},
-	publisher = {Brooks/Cole, Cengage Learning},
-	author = {Stewart, James},
-	year = {2012},
-}
-
-@book{clarke19932001,
-  title={2001, a Space Odyssey},
-  author={Arthur Charles Clarke and Kubrick, Stanley},
-  isbn={9780451452733},
-  lccn={92245352},
-  series={ROC Book},
-  url={https://books.google.com.br/books?id=atx0AAAACAAJ},
-  year={1993},
-  publisher={ROC}
-}
-@book{hamlet,
- ISBN = {9780300101751},
- URL = {http://www.jstor.org/stable/j.ctt1njkw8},
- author = {William Shakespeare and Burton Raffel and Harold Bloom},
- publisher = {Yale University Press},
- title = {Hamlet},
- year = {2003}
-}
-
-@book{art1,
-  title={The Art of Computer Programming: Fundamental algorithms},
-  author={Donald Knuth},
-  number={v. 1},
-  isbn={9780201896831},
-  lccn={97002147},
-  series={Addison-Wesley series in computer science and information processing},
-  url={https://books.google.com.br/books?id=B31GAAAAYAAJ},
-  year={1997},
-  publisher={Addison-Wesley}
+
+@Book{art1,
+  title         = {The Art of Computer Programming: Fundamental algorithms},
+  author        = {Donald Knuth},
+  year          = {1997},
+  publisher     = {Addison-Wesley},
+  url           = {https://books.google.com.br/books?id=B31GAAAAYAAJ},
+  number        = {v. 1},
+  lccn          = {97002147},
+  series        = {Addison-Wesley series in computer science and information processing}
+}
+
+@Book{assange2012,
+  title         = {Cypherpunks: freedom and the future of the internet},
+  author        = {Assange, Julian and Appelbaum, Jacob and Müller-Maguhn, Andy and Zimmermann, Jérémie},
+  year          = {2012},
+  publisher     = {OR Books},
+  shorttitle    = {Cypherpunks},
+  address       = {New York ; London}
+}
+
+@Book{clarke19932001,
+  title         = {2001, a Space Odyssey},
+  author        = {Arthur Charles Clarke and Kubrick, Stanley},
+  year          = {1993},
+  publisher     = {ROC},
+  url           = {https://books.google.com.br/books?id=atx0AAAACAAJ},
+  lccn          = {92245352},
+  series        = {ROC Book}
+}
+
+@Article{duan2012large,
+  title         = {Large-scale brain networks in board game experts: insights from a domain-related task and task-free resting state},
+  author        = {Duan, Xujun and Liao, Wei and Liang, Dongmei and Qiu, Lihua and Gao, Qing and Liu, Chengyi and Gong, Qiyong and Chen, Huafu},
+  year          = {2012},
+  journal       = {PloS one},
+  publisher     = {Public Library of Science},
+  volume        = {7},
+  pages         = {e32532},
+  number        = {3}
+}
+
+@Article{duan2012reduced,
+  title         = {Reduced caudate volume and enhanced striatal-DMN integration in chess experts},
+  author        = {Duan, Xujun and He, Sheng and Liao, Wei and Liang, Dongmei and Qiu, Lihua and Wei, Luqing and Li, Yuan and Liu, Chengyi and Gong, Qiyong and Chen, Huafu},
+  year          = {2012},
+  journal       = {Neuroimage},
+  publisher     = {Elsevier},
+  volume        = {60},
+  pages         = {1280--1286},
+  number        = {2}
+}
+
+@Article{duan2014functional,
+  title         = {Functional organization of intrinsic connectivity networks in Chinese-chess experts},
+  author        = {Duan, Xujun and Long, Zhiliang and Chen, Huafu and Liang, Dongmei and Qiu, Lihua and Huang, Xiaoqi and Liu, Timon Cheng-Yi and Gong, Qiyong},
+  year          = {2014},
+  journal       = {Brain research},
+  publisher     = {Elsevier},
+  volume        = {1558},
+  pages         = {33--43}
+}
+
+@Book{dyson_disturbing_1979,
+  title         = {Disturbing the Universe},
+  author        = {Freeman Dyson},
+  year          = {1979},
+  publisher     = {Basic Books},
+  url           = {http://books.google.com.br/books?id=RHzoMeU2bxsC},
+  series        = {Basic Books 50 years}
+}
+
+@Book{galilei_dialogue_1953,
+  title         = {Dialogue concerning the two chief world systems: Ptolemaic and Copernican},
+  author        = {Galileo Galilei},
+  year          = {1953},
+  publisher     = {University of California Pr},
+  shorttitle    = {Dialogue concerning the two chief world systems}
+}
+
+@Book{galilei_sidereus_2004,
+  title         = {Sidereus Nuncius, Or The Sidereal Messenger},
+  author        = {Galileo Galilei},
+  year          = {2004},
+  publisher     = {Byzantium Press},
+  language      = {en}
+}
+
+@Book{goldberg1989,
+  title         = {Genetic Algorithms in Search, Optimization and Machine Learning},
+  author        = {David Goldberg},
+  year          = {1989},
+  publisher     = {Addison-Wesley Longman Publishing Co., Inc.},
+  address       = {Boston, MA, USA},
+  edition       = {1st}
+}
+
+@Book{hamlet,
+  title         = {Hamlet},
+  author        = {William Shakespeare and Burton Raffel and Harold Bloom},
+  year          = {2003},
+  publisher     = {Yale University Press},
+  url           = {http://www.jstor.org/stable/j.ctt1njkw8}
+}
+
+@Book{haykin99a,
+  title         = {Neural Networks: A Comprehensive Foundation},
+  author        = {Simon Haykin},
+  year          = {1999},
+  publisher     = {Prentice Hall}
+}
+
+@Book{heath1921history,
+  title         = {A History of Greek Mathematics},
+  author        = {Thomas Little Heath},
+  year          = {1921},
+  publisher     = {Clarendon Press},
+  url           = {http://books.google.com.br/books?id=h4JsAAAAMAAJ},
+  number        = {v. 1},
+  series        = {A History of Greek Mathematics}
+}
+
+@Book{kahneman2011,
+  title         = {Thinking, fast and slow},
+  author        = {Kahneman, Daniel},
+  year          = {2011},
+  publisher     = {Macmillan}
+}
+
+@Book{kernighan1988,
+  title         = {The {C} programming language},
+  author        = {Kernighan, Brian W. and Ritchie, Dennis M. and Ejeklint, Per},
+  year          = {1988},
+  publisher     = {Prentice-Hall Englewood Cliffs},
+  volume        = {2}
+}
+
+@Book{kurzweil2013,
+  title         = {How to create a mind: the secret of human thought revealed},
+  author        = {Kurzweil, Ray},
+  year          = {2013},
+  publisher     = {Penguin Books},
+  shorttitle    = {How to create a mind},
+  address       = {New York, NY},
+  language      = {eng}
+}
+
+@Book{lamport1994latex,
+  title         = {{\LaTeX} - A Document Preparation System},
+  author        = {Leslie Lamport},
+  year          = {1994},
+  publisher     = {Adisson-Wesley}
+}
+
+@Unpublished{lshort,
+  title         = {The Not So Short Introduction to {\LaTeXe}},
+  author        = {Tobias Oetiker and Hubert Partl and Irene Hyna and Elisabeth Schlegl},
+  year          = {2014},
+  month         = {apr},
+  url           = {http://tobi.oetiker.ch/lshort/},
+  note          = {Distribuido digitalmente}
+}
+
+@Article{mcc43,
+  title         = {A logical calculus of the ideas immanent in nervous activity},
+  author        = {Warren McCulloch and Walter Pitts},
+  year          = {1943},
+  journal       = {Bulletin of Mathematical Biophysic},
+  pages         = {115-133},
+  keywords      = {imported},
+  number        = 5
+}
+
+@Book{mittelbach_latex_2004,
+  title         = {The Latex Companion},
+  author        = {Frank Mittelbach and Michel Goossens},
+  year          = {2004},
+  publisher     = {Addison-Wesley},
+  edition       = {2}
+}
+
+@Article{rocha2005brain,
+  title         = {Brain mappings of the arithmetic processing in children and adults},
+  author        = {Rocha, Fabio and Rocha, Armando F and Massad, Eduardo and Menezes, Renee},
+  year          = {2005},
+  journal       = {Cognitive Brain Research},
+  publisher     = {Elsevier},
+  volume        = {22},
+  pages         = {359--372},
+  number        = {3}
+}
+
+@Article{rocha2014brain,
+  title         = {Brain mapping and interpretation of reading processing in children using EEG and multivariate statistical analysis},
+  author        = {Rocha, Fabio and Thomaz, Carlos Eduardo and da Rocha, Armando Freitas and Massad, Eduardo},
+  year          = {2014},
+  booktitle     = {2014 27th SIBGRAPI Conference on Graphics, Patterns and Images},
+  pages         = {251--258},
+  organization  = {IEEE}
+}
+
+@Article{rocha2016eeg,
+  title         = {EEG acquisition and processing for cognitive brain mapping during chess problem solving},
+  author        = {Rocha, Fabio and de Magalhaes Junior, Roberto Goncalves and Horta, Thomas Oliveira and Cesar, Fabio Henrique Goncalves and D'Israel, David Maurice and da Silva, Wilson and Thomaz,
+                  Carlos Eduardo},
+  year          = {2016},
+  journal       = {IEEE Latin America Transactions},
+  publisher     = {IEEE},
+  volume        = {14},
+  pages         = {1129--1134},
+  number        = {3}
+}
+
+@Book{russell2010,
+  title         = {Artificial intelligence: a modern approach},
+  author        = {Stuart Russell and Peter Norvig and Ernest Davis},
+  year          = {2010},
+  publisher     = {Prentice Hall},
+  shorttitle    = {Artificial intelligence},
+  address       = {Upper Saddle River, {NJ}},
+  edition       = {3},
+  language      = {English}
+}
+
+@Book{stewart2012,
+  title         = {Calculus - 7th edition},
+  author        = {Stewart, James},
+  year          = {2012},
+  publisher     = {Brooks/Cole, Cengage Learning},
+  address       = {Australia ; Belmont, CA},
+  edition       = {7},
+  language      = {English}
+}
+
+@Article{turing50,
+  title         = {Computing Machinery and Intelligence},
+  author        = {Alan Turing},
+  year          = {1950},
+  journal       = {Mind},
+  volume        = {59},
+  pages         = {433--460}
 }
diff --git a/Master/texmf-dist/source/latex/fei/fei.dtx b/Master/texmf-dist/source/latex/fei/fei.dtx
index 13812ac5dfb..83157981c2d 100644
--- a/Master/texmf-dist/source/latex/fei/fei.dtx
+++ b/Master/texmf-dist/source/latex/fei/fei.dtx
@@ -680,6 +680,14 @@ Exemplo:
 	I propose to consider the question, `Can machines think?' This should begin with definitions of the meaning of the terms `machine' and `think'. The definitions might be framed so as to reflect so far as possible the normal use of the words, but this attitude is dangerous. If the meaning of the words `machine' and `think' are to be found by examining how they are commonly used it is difficult to escape the conclusion that the meaning and the answer to the question, `Can machines think?' is to be sought in a statistical survey such as a Gallup poll. But this is absurd. Instead of attempting such a definition I shall replace the question by another, which is closely related to it and is expressed in relatively unambiguous words. \cite{turing50}
 \end{quote}
 
+\section{CITAÇÕES DE MÚLTIPLAS OBRAS COM MESMO AUTOR}
+
+Essa seção demonstra a formatação de citações quando o(s) primeiro(s) autor(es) de uma obra é(são) o(s) mesmo(s).
+
+Por exemplo, os trabalhos de \textcite{rocha2005brain,rocha2014brain,rocha2016eeg} possuem todos o mesmo primeiro autor; os dois primeiros trabalhos possuem os mesmos primeiro e segundo autores. Por ser possível diferenciar entre as obras através das diferentes datas, não é necessário adicionar nenhuma informação extra à citação. Citações entre parênteses para os mesmos trabalhos tomam a seguinte forma: \cite{rocha2005brain, rocha2014brain,rocha2016eeg}.
+
+Já nos trabalhos de \textcite{duan2012large,duan2012reduced,duan2014functional}, é necessário diferenciar as duas primeiras obras devido às datas semelhantes. Citações entre parênteses para os mesmos trabalhos tomam a seguinte forma: \cite{duan2012large,duan2012reduced,duan2014functional}.
+
 \chapter{ÍNDICES}\label{chap:indice}
 
 Assim como as referências são geradas por um programa a parte (o Bib\TeX), a criação de índices remissivos também o é. Neste quesito, o \index{makeindex@\emph{MakeIndex}}\emph{MakeIndex} é o programa pioneiro na geração de índices e é parte integrante de todas as instalações do \LaTeX{}. Contudo, o \emph{MakeIndex} foi codificado com suporte apenas para o idioma inglês, o que significa que palavras que contêm caracteres mais exóticos -- como acentos ou cedilha -- não serão organizados corretamente. Para solucionar este problema, usuários de Linux possuem como opção secundária o \index{xindy@\emph{xindy}}\emph{xindy}, um outro gerador de índices que possui as mesmas funcionalidades e aceita os mesmos comandos do \emph{MakeIndex}, porém com suporte a uma infinidade de idiomas.
@@ -1240,7 +1248,7 @@ A seguir, as descrições dos arquivos auxiliares gerados durante o processo de
 % \fi
 %<*class>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{fei}[2017/03/14 3.0.4 Modelo da FEI]
+\ProvidesClass{fei}[2017/03/18 3.0.5 Modelo da FEI]
 % passa a opção do xindy pros pacotes que podem utilizá-lo
 \DeclareOption{xindy}{
 	\PassOptionsToPackage{\CurrentOption}{imakeidx}
@@ -1715,7 +1723,7 @@ postheadspace=1em
 
 							% referências e citações
 							%abnTeX alfabético com títulos das publicações em negrito nas referências (como no modelo antigo da ABNT)
-							\RequirePackage[backend=biber, safeinputenc=true, isbn=false, doi=false, style=abnt]{biblatex}
+							\RequirePackage[backend=biber, safeinputenc=true, uniquelist=false, isbn=false, doi=false, style=abnt]{biblatex}
 							\setlength{\bibitemsep}{1.0\baselineskip}
 
 							\DefineBibliographyStrings{brazil}{%
@@ -1728,7 +1736,8 @@ postheadspace=1em
 
 							\defbibheading{bibliography}[\bibname]{%
 								\clearpage\phantomsection\addcontentsline{toc}{chapter}{\bfseries\hspace{\cftchapternumwidth}REFER\^ENCIAS}% adiciona o titulo ao sumario
-								\hfill \textbf{REFER\^ENCIAS} \hfill\mbox{}
+								\hfill \textbf{REFER\^ENCIAS} \hfill\mbox{}%
+								\urlstyle{same} % URLs nas referências devem ter a mesma fonte do texto
 							}
 
 							\newcommand*{\citefloat}[1]{\citeauthor*{#1}, \citeyear*{#1}}
diff --git a/Master/texmf-dist/tex/latex/fei/fei.cls b/Master/texmf-dist/tex/latex/fei/fei.cls
index 4806aa9817e..16d6bbbb765 100644
--- a/Master/texmf-dist/tex/latex/fei/fei.cls
+++ b/Master/texmf-dist/tex/latex/fei/fei.cls
@@ -14,7 +14,7 @@
 %% See http://www.latex-project.org/lppl.txt
 %% -----------------------------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{fei}[2017/03/14 3.0.4 Modelo da FEI]
+\ProvidesClass{fei}[2017/03/18 3.0.5 Modelo da FEI]
 \DeclareOption{xindy}{
 \PassOptionsToPackage{\CurrentOption}{imakeidx}
 \PassOptionsToPackage{\CurrentOption}{glossaries}
@@ -403,7 +403,7 @@ postheadspace=1em
 }%
 }%
 
-\RequirePackage[backend=biber, safeinputenc=true, isbn=false, doi=false, style=abnt]{biblatex}
+\RequirePackage[backend=biber, safeinputenc=true, uniquelist=false, isbn=false, doi=false, style=abnt]{biblatex}
 \setlength{\bibitemsep}{1.0\baselineskip}
 
 \DefineBibliographyStrings{brazil}{%
@@ -416,7 +416,8 @@ bibliography = {REFER\^ENCIAS}
 
 \defbibheading{bibliography}[\bibname]{%
 \clearpage\phantomsection\addcontentsline{toc}{chapter}{\bfseries\hspace{\cftchapternumwidth}REFER\^ENCIAS}% adiciona o titulo ao sumario
-\hfill \textbf{REFER\^ENCIAS} \hfill\mbox{}
+\hfill \textbf{REFER\^ENCIAS} \hfill\mbox{}%
+\urlstyle{same} % URLs nas refer^^c3^^aancias devem ter a mesma fonte do texto
 }
 
 \newcommand*{\citefloat}[1]{\citeauthor*{#1}, \citeyear*{#1}}