Merge pull request mateusduboli#20 from evandrocoan/master

Altera os links dos submódulos para domínio github.com/ufsc
evandrocoan · May 15, 2020 · a4c2835 · a4c2835
2 parents be56d8e + 2726328
commit a4c2835
Show file tree

Hide file tree

Showing 11 changed files with 481 additions and 313 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,9 @@
 /.gitignore
 /example.pdf
 /tmp
+/cache
+/latexcache
+/.time_flag.txt
 
 *.sublime-workspace
 *.pdf

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "imagens"]
 	path = pictures
-	url = https://github.com/evandrocoan/abntex2-ufsc-imagens.git
+	url = https://github.com/ufsc/ufscthesisx-images
 [submodule "setup"]
 	path = setup
-	url = https://github.com/evandrocoan/ufscthesisx-setup
+	url = https://github.com/ufsc/ufscthesisx-setup
diff --git a/Makefile b/Makefile
@@ -1,6 +1,58 @@
+#!/usr/bin/make -f
+# https://stackoverflow.com/questions/7123241/makefile-as-an-executable-script-with-shebang
+#
+#   Copyright 2017-2019 @ Evandro Coan
+#   Helper functions and classes
+#
+#  Redistributions of source code must retain the above
+#  copyright notice, this list of conditions and the
+#  following disclaimer.
+#
+#  Redistributions in binary form must reproduce the above
+#  copyright notice, this list of conditions and the following
+#  disclaimer in the documentation and/or other materials
+#  provided with the distribution.
+#
+#  Neither the name Evandro Coan nor the names of any
+#  contributors may be used to endorse or promote products
+#  derived from this software without specific prior written
+#  permission.
+#
+#  This program is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by the
+#  Free Software Foundation; either version 3 of the License, or ( at
+#  your option ) any later version.
+#
+#  This program is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+ECHOCMD:=/bin/echo -e
+SHELL := /bin/bash
 
-useless := $(eval export UFSCTHESISX_RSYNC_DIRECTORY=.)
-useless := $(eval export UFSCTHESISX_MAINTEX_DIRECTORY=.)
+ifeq (${UFSCTHESISX_RSYNC_DIRECTORY},)
+	useless := $(eval export UFSCTHESISX_RSYNC_DIRECTORY=.)
+endif
+
+ifeq (${UFSCTHESISX_MAINTEX_DIRECTORY},)
+	useless := $(eval export UFSCTHESISX_MAINTEX_DIRECTORY=.)
+endif
+
+ifeq (${UFSCTHESISX_ROOT_DIRECTORY},)
+	useless := $(eval export UFSCTHESISX_ROOT_DIRECTORY=LatexBuild/ufscthesisx)
+endif
+
+ifeq (${UFSCTHESISX_REMOTE_PASSWORD},)
+	useless := $(eval export UFSCTHESISX_REMOTE_PASSWORD=admin123)
+endif
+
+ifeq (${UFSCTHESISX_REMOTE_ADDRESS},)
+	useless := $(eval export [email protected])
+endif
 
 include ./setup/makefile.mk
 
diff --git a/README.md b/README.md
@@ -181,21 +181,28 @@ $ make help
               https://github.com/clarkwang/passh
 
        You can define the following parameters:
-       1. LATEXPASSWORD  - the remote machine SHH password
-       2. LATEXADDRESS   - the remote machine 'user@ipaddress'
-       3. rules          - the rules/arguments to pass to the remote invocation of make
-       4. args           - arguments to pass to the rsync program
-       5. dir            - the directory to put the files, defaults to '~/LatexBuild'
+       4. args - arguments to pass to the rsync program, see 'rsync --help'
+       3. rules - the rules/arguments to pass to the remote invocation of make
+       5. UFSCTHESISX_ROOT_DIRECTORY  - the directory to put the files, defaults to '~/LatexBuild'
+       1. UFSCTHESISX_REMOTE_PASSWORD - the remote machine SHH password, defaults to 'admin123'
+       2. UFSCTHESISX_REMOTE_ADDRESS  - the remote machine 'user@ipaddress', defaults to '[email protected]'
 
      Example usage for Linux:
-       make remote LATEXPASSWORD=123 [email protected] rules=latex &&
-                delete=1 dir=~/Downloads/Thesis
+       make remote rules="latex debug=1" &&
+              debug=1 &&
+              args="--delete"
+              UFSCTHESISX_ROOT_DIRECTORY=~/Downloads/Thesis &&
+              [email protected] &&
+              UFSCTHESISX_REMOTE_PASSWORD=123 &&
 
      Example usage for Windows:
-       set "LATEXPASSWORD=123" && set "[email protected]" &&
-                set "rules=latex" && set "delete=1" &&
-                set "dir=~/Downloads/Thesis" &&
-                make remote
+       set "rules=latex debug=1" &&
+              set "debug=1" &&
+              set "args=--delete" &&
+              set "UFSCTHESISX_ROOT_DIRECTORY=~/Downloads/Thesis" &&
+              set "[email protected]" &&
+              set "UFSCTHESISX_REMOTE_PASSWORD=123" &&
+              make remote
 ```
 
 Caso você tenha problemas,
@@ -252,6 +259,7 @@ Copyright (c) 2012-2014 by abnTeX2 group at http://abntex2.googlecode.com/
 Copyright (c) 2014-2015 Mateus Dubiela Oliveira
 Copyright (c) 2015-2016 Adriano Ruseler
 Copyright (c) 2017-2018 Evandro Coan, Luiz Rafael dos Santos
+Copyright (c) 2019-2019 Alisson Lopes Furlani
 
 É concedida permissão, gratuitamente, a qualquer pessoa que obtenha uma cópia deste modelo e
 software e arquivos de documentação associados (o "Software"), para ter estes arquivos com os

diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex
@@ -1,13 +1,11 @@
 
 
-% How to fix destination with the same identifier (name{page.A}) has been already used, duplicate ignored?
-% https://tex.stackexchange.com/questions/386446/how-to-fix-destination-with-the-same-identifier-namepage-a-has-been-already
-\hypersetup{pageanchor=false}
-
-
 % ELEMENTOS PRÉ-TEXTUAIS
 \ifforcedinclude\else
     % pretextual settings
+    % https://tex.stackexchange.com/questions/386446/how-to-fix-destination-with-the-same-identifier-namepage-a-has-been-already
+    % https://tex.stackexchange.com/questions/67989/pdftex-warning-has-been-referenced-but-does-not-exist-replaced-by-a-fixed-one
+    \hypersetup{pageanchor=false}
     \PRIVATEbookmarkthis{Capa}
     \addtotextpreliminarycontent{Capa}
     \pretextual
@@ -18,6 +16,10 @@
     \advisor{}{\AtBeginShipoutNext{\AtBeginShipoutNext{\AtBeginShipoutDiscard}}}
     \imprimircapa
 
+    % https://tex.stackexchange.com/questions/386446/how-to-fix-destination-with-the-same-identifier-namepage-a-has-been-already
+    % https://tex.stackexchange.com/questions/67989/pdftex-warning-has-been-referenced-but-does-not-exist-replaced-by-a-fixed-one
+    \hypersetup{pageanchor=true}
+
     % Custom list throw LaTeX Error: Command \mycustomfiction already defined?
     % https://tex.stackexchange.com/questions/388489/custom-list-throw-latex-error-command-mycustomfiction-already-defined/
     \advisor{}{%
@@ -30,9 +32,12 @@
         \phantomsection
         \addcontentsline{toc}{chapter}{\mytextpreliminarylistname}
 
-        \begin{KeepFromToc}
-            \textpreliminarycontents
-        \end{KeepFromToc}
+        % https://tex.stackexchange.com/questions/234398/list-of-figures-and-tables-when-there-are-no-figures-or-tables
+        \whenlistisnotempty{\mytextpreliminarylistname}{%
+            \begin{KeepFromToc}
+                \textpreliminarycontents
+            \end{KeepFromToc}
+        }
 
         \clearpage
     }
@@ -90,32 +95,51 @@
 
 % Some tables of contents
 \ifforcedinclude\else
+{
+    % https://tex.stackexchange.com/questions/179506/disable-colorlinks-locally-or-just-for-the-toc
+    \hypersetup{hidelinks}
+
     % inserir lista de figuras
     \ifforcedinclude\else\cleardoublepage\fi
-    \addtotextpreliminarycontent{\listfigurename}
-    \pdfbookmark[0]{\listfigurename}{lof}
-    \listoffigures*
+    % https://tex.stackexchange.com/questions/234398/list-of-figures-and-tables-when-there-are-no-figures-or-tables
+    \whenlistisnotempty{\listfigurename}{%
+        \addtotextpreliminarycontent{\listfigurename}
+        % https://tex.stackexchange.com/questions/121879/remove-spacing-between-per-chapter-figures-in-lof
+        {\renewcommand{\addvspace}[1]{}
+        \listoffigures*}
+    }{\pdfbookmark[0]{\listfigurename}{lof}}
 
     % inserir lista de quadros
     \ifforcedinclude\else\cleardoublepage\fi
-    \addtotextpreliminarycontent{\listofquadrosname}
-    \pdfbookmark[0]{\listofquadrosname}{loq}
-    \listofquadros*
+    % https://tex.stackexchange.com/questions/234398/list-of-figures-and-tables-when-there-are-no-figures-or-tables
+    \whenlistisnotempty{\listofquadrosname}{%
+        \addtotextpreliminarycontent{\listofquadrosname}
+        % https://tex.stackexchange.com/questions/121879/remove-spacing-between-per-chapter-figures-in-lof
+        {\renewcommand{\addvspace}[1]{}
+        \listofquadros*}
+    }{\pdfbookmark[0]{\listofquadrosname}{loq}}
 
     % inserir lista de tabelas
     \ifforcedinclude\else\cleardoublepage\fi
-    \addtotextpreliminarycontent{\listtablename}
-    \pdfbookmark[0]{\listtablename}{lot}
-    \listoftables*
+    % https://tex.stackexchange.com/questions/234398/list-of-figures-and-tables-when-there-are-no-figures-or-tables
+    \whenlistisnotempty{\listtablename}{%
+        \addtotextpreliminarycontent{\listtablename}
+        % https://tex.stackexchange.com/questions/121879/remove-spacing-between-per-chapter-figures-in-lof
+        {\renewcommand{\addvspace}[1]{}
+        \listoftables*}
+    }{\pdfbookmark[0]{\listtablename}{lot}}
 
     % inserir códigos fonte (List of Listings `lol`)
     % https://tex.stackexchange.com/questions/511519/latex-keeps-showing-minted-environment-as-figures-instead-of-listening/511579#511579
     \ifforcedinclude\else\cleardoublepage\fi
-    \addtotextpreliminarycontent{\lstlistlistingname}
-    \pdfbookmark[0]{\lstlistlistingname}{lol}
-    {\renewcommand{\cftfigurename}{\listingname\space}
-    \lstlistoflistings*
-    }
+    % https://tex.stackexchange.com/questions/234398/list-of-figures-and-tables-when-there-are-no-figures-or-tables
+    \whenlistisnotempty{\lstlistlistingname}{%
+        \addtotextpreliminarycontent{\lstlistlistingname}
+        % https://tex.stackexchange.com/questions/121879/remove-spacing-between-per-chapter-figures-in-lof
+        {\renewcommand{\addvspace}[1]{}
+        \lstlistoflistings*}
+    }{\pdfbookmark[0]{\lstlistlistingname}{lol}}
+}
 \fi
 
 
@@ -132,47 +156,32 @@
 \ifforcedinclude\else\cleardoublepage\fi
 
 \begin{KeepFromToc}
-    \pdfbookmark[0]{\contentsname}{toc}
-
-    % What does “overfull hbox” mean?
     % https://tex.stackexchange.com/questions/35/what-does-overfull-hbox-mean
-    %
-    % How to avoid using \sloppy document-wide to fix overfull \hbox problems?
     % https://tex.stackexchange.com/questions/59122/how-to-avoid-using-sloppy-document-wide-to-fix-overfull-hbox-problems
-    %
-    % Adding color to table of contents and section headings
     % https://tex.stackexchange.com/questions/257007/adding-color-to-table-of-contents-and-section-headings
     {
-        % underfull vbox (badness 10000) has occurred while \output is active with memoir
+        % https://tex.stackexchange.com/questions/179506/disable-colorlinks-locally-or-just-for-the-toc
+        \hypersetup{hidelinks}
+
         % https://tex.stackexchange.com/questions/65711/underfull-vbox-badness-10000-with-memoir
         \raggedbottom
 
-        % Overfull \hbox warning for TOC entries when using memoir documentclass
         % https://tex.stackexchange.com/questions/49887/overfull-hbox-warning-for-toc-entries-when-using-memoir-documentclass
         % \makeatletter
             % \renewcommand{\@pnumwidth}{2em}
             % \renewcommand{\@tocrmarg}{3em}
         % \makeatother
 
-        % Memoir mysterious overfull hbox in TOC when mathptmx is used
         % https://tex.stackexchange.com/questions/57544/memoir-mysterious-overfull-hbox-in-toc-when-mathptmx-is-used
         % \setlength{\cftchapternumwidth}{2.25em}
 
-        % Disable `colorlinks` locally (or just for the ToC)
-        % https://tex.stackexchange.com/questions/179506/disable-colorlinks-locally-or-just-for-the-toc
-        \hypersetup{hidelinks}
-
         % Add the table of contents to the brief table of contents
-        \addtotextpreliminarycontent{\contentsname}
-        \tableofcontents
+        % https://tex.stackexchange.com/questions/234398/list-of-figures-and-tables-when-there-are-no-figures-or-tables
+        \whenlistisnotempty{\contentsname}{%
+            \addtotextpreliminarycontent{\contentsname}
+            \tableofcontents
+        }{\pdfbookmark[0]{\contentsname}{toc}}
     }
 
 \end{KeepFromToc}
 
-
-
-% How to fix destination with the same identifier (name{page.A}) has been already used, duplicate ignored?
-% https://tex.stackexchange.com/questions/386446/how-to-fix-destination-with-the-same-identifier-namepage-a-has-been-already
-\hypersetup{pageanchor=true}
-
-
diff --git a/chapters/chapter_3.tex b/chapters/chapter_3.tex
@@ -17,7 +17,7 @@
     % \newpage
     \section{Before the very first basketball}
 
-	\englishword{\showfont}
+    \englishword{\showfont}
 
     lipsum me [21-22]
 

diff --git a/chapters/intro.tex b/chapters/intro.tex
@@ -91,7 +91,7 @@ \chapter{\lang{Introduction}{Introdução}}
 \endfoot
 
 \hline
-\multicolumn{2}{p{\dimexpr\textwidth-2\tabcolsep\relax}}{\fonte{O autor} }
+\multicolumn{2}{p{\dimexpr\textwidth-2\tabcolsep\relax}}{\fonte{O autor -- \showfont} }
 \endlastfoot
     Cor                          & Branco - \englishword{\showfont}                                 \\ \hline
     Formato do papel             & A4                                                               \\ \hline
@@ -121,7 +121,7 @@ \chapter{\lang{Introduction}{Introdução}}
     \label{fig:ex01}
     \centering
     \includegraphics[width=\linewidth]{pictures/ex01}
-\fonte{o autor}
+\fonte{o autor -- \showfont}
 \end{figure}
 
 
@@ -132,7 +132,7 @@ \chapter{\lang{Introduction}{Introdução}}
     \label{fig:tek0009}
     \centering
     \includegraphics[width=0.9\linewidth]{pictures/tek0009}
-    \fonte{o autor}
+    \fonte{o autor -- \showfont}
 \end{figure}
 
 Este documento e seu código-fonte são exemplos de referência de uso da classe