From b967e8bb72e78a299edf207c38b3107513e95b59 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 25 Sep 2018 11:12:34 -0300 Subject: [PATCH 001/148] Disabled * eol=lf on .gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 9aa3cc0..ecda61d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ # Force LF eol in git repo and working copy # https://stackoverflow.com/questions/9976986/force-lf-eol-in-git-repo-and-working-copy -* eol=lf +# * eol=lf From d74b89ad32c77a07f748dbef7b15c37da4593b29 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 23 Mar 2019 01:10:14 -0300 Subject: [PATCH 002/148] Documented \doincludeonly on main.tex --- main.tex | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/main.tex b/main.tex index f28883c..e90f634 100644 --- a/main.tex +++ b/main.tex @@ -194,6 +194,13 @@ % \addtoincludeonly{aftertext/apendice_a} % Control whether the full document will be generated +% Note: It will also generate severals errors like the following, which can be ignored +% Latexmk: Missing input file: 'chapters/test.aux' +% +% You can make latex stop generate these errors, if you generate a full version +% of the document, before uncommenting these lines. +% +% Uncomment these two lines, to only partially generate the document % \doincludeonly % \forcedincludetrue From 61c4238a4d661acc892e796e0085ab41f38b06b9 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 28 Mar 2019 23:09:01 -0300 Subject: [PATCH 003/148] Revert "deletes ufscthesisx" This reverts commit 4a79a35c956e9e971c01f7181d8e560fcf696ca5. --- .gitignore | 2 +- ufscthesisx.sublime-project | 99 +++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 ufscthesisx.sublime-project diff --git a/.gitignore b/.gitignore index 220f8ea..a679724 100644 --- a/.gitignore +++ b/.gitignore @@ -58,4 +58,4 @@ *.run.xml *.bcf *.cut -*.sublime* + diff --git a/ufscthesisx.sublime-project b/ufscthesisx.sublime-project new file mode 100644 index 0000000..9880813 --- /dev/null +++ b/ufscthesisx.sublime-project @@ -0,0 +1,99 @@ +{ + "settings": + { + "TEXroot": "main.tex" + }, + "folders": + [ + { + "path": ".", + "folder_exclude_patterns": + [ + "*cache*", + ], + }, + ], + "build_systems": + [ + { + "name": "Build Monograph - Thesis", + "cmd": ["make", "thesis"], + + "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, + "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + + // "selector": "source.c, source.c++, source.c++11", // comment this to build from everywhere + + "shell": true, + "working_dir": "$project_path/", + + "target": "exec", + "syntax": "Packages/Text/Plain text.tmLanguage", + }, + { + "name": "Build Monograph - Thesis Latex", + "cmd": ["make", "latex"], + + "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, + "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + + // "selector": "source.c, source.c++, source.c++11", // comment this to build from everywhere + + "shell": true, + "working_dir": "$project_path/", + + "target": "exec", + "syntax": "Packages/Text/Plain text.tmLanguage", + }, + { + "name": "Build Monograph - Thesis Biber", + "cmd": ["make", "biber"], + + "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, + "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + + // "selector": "source.c, source.c++, source.c++11", // comment this to build from everywhere + + "shell": true, + "working_dir": "$project_path/", + + "target": "exec", + "syntax": "Packages/Text/Plain text.tmLanguage", + }, + { + "name": "Build Monograph - Thesis Verbose", + "cmd": ["make", "verbose"], + + "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, + "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + + // "selector": "source.c, source.c++, source.c++11", // comment this to build from everywhere + + "shell": true, + "working_dir": "$project_path/", + + "target": "exec", + "syntax": "Packages/Text/Plain text.tmLanguage", + }, + { + "name": "Build Monograph - Thesis Clean", + "cmd": ["make", "clean"], + + "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, + "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + + // "selector": "source.c, source.c++, source.c++11", // comment this to build from everywhere + + "shell": true, + "working_dir": "$project_path/", + + "target": "exec", + "syntax": "Packages/Text/Plain text.tmLanguage", + }, + ] +} From 3c3814afeb3864a34c8219046bdf37c82b897cdd Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 28 Mar 2019 23:38:32 -0300 Subject: [PATCH 004/148] Grouped together all ufscthesisx.sublime-project build rules as variants from the standard rule. --- ufscthesisx.sublime-project | 98 ++++++++++++------------------------- 1 file changed, 30 insertions(+), 68 deletions(-) diff --git a/ufscthesisx.sublime-project b/ufscthesisx.sublime-project index 9880813..a224976 100644 --- a/ufscthesisx.sublime-project +++ b/ufscthesisx.sublime-project @@ -16,84 +16,46 @@ "build_systems": [ { - "name": "Build Monograph - Thesis", + "name": "Monograph", "cmd": ["make", "thesis"], - "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, - "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - - // "selector": "source.c, source.c++, source.c++11", // comment this to build from everywhere - - "shell": true, - "working_dir": "$project_path/", - - "target": "exec", - "syntax": "Packages/Text/Plain text.tmLanguage", - }, - { - "name": "Build Monograph - Thesis Latex", - "cmd": ["make", "latex"], - - "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, - "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - - // "selector": "source.c, source.c++, source.c++11", // comment this to build from everywhere - - "shell": true, - "working_dir": "$project_path/", - - "target": "exec", - "syntax": "Packages/Text/Plain text.tmLanguage", - }, - { - "name": "Build Monograph - Thesis Biber", - "cmd": ["make", "biber"], - - "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, - "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - - // "selector": "source.c, source.c++, source.c++11", // comment this to build from everywhere - "shell": true, "working_dir": "$project_path/", "target": "exec", "syntax": "Packages/Text/Plain text.tmLanguage", - }, - { - "name": "Build Monograph - Thesis Verbose", - "cmd": ["make", "verbose"], - "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, + "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)"}, "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, - "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - - // "selector": "source.c, source.c++, source.c++11", // comment this to build from everywhere - - "shell": true, - "working_dir": "$project_path/", + "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - "target": "exec", - "syntax": "Packages/Text/Plain text.tmLanguage", - }, - { - "name": "Build Monograph - Thesis Clean", - "cmd": ["make", "clean"], - - "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, - "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - - // "selector": "source.c, source.c++, source.c++11", // comment this to build from everywhere - - "shell": true, - "working_dir": "$project_path/", - - "target": "exec", - "syntax": "Packages/Text/Plain text.tmLanguage", + "variants": + [ + { + "name": "Thesis (Default)", + "cmd": ["make", "thesis"], + }, + { + "name": "Thesis Biber", + "cmd": ["make", "biber"], + }, + { + "name": "Thesis LaTeX", + "cmd": ["make", "latex"], + }, + { + "name": "Thesis Verbose", + "cmd": ["make", "thesis_verbose"], + }, + { + "name": "Thesis Clean", + "cmd": ["make", "clean"], + }, + { + "name": "Thesis Veryclean", + "cmd": ["make", "veryclean"], + }, + ], }, ] } From dafdbecdbc7da63d7f4cc858772c404ea5ffbc5b Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 30 Mar 2019 20:09:21 -0300 Subject: [PATCH 005/148] Updated setup/utilities submodule head pointer --- setup/utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/utilities b/setup/utilities index 4e4cefb..fb3cd2e 160000 --- a/setup/utilities +++ b/setup/utilities @@ -1 +1 @@ -Subproject commit 4e4cefbec0dea40cce847aaee6b7043440ef3928 +Subproject commit fb3cd2ec82059ce151a5755409e58ae01f86fa4b From 0941342ba4e0503897f14e1796a2e8db1f23c1db Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 31 Mar 2019 00:12:17 -0300 Subject: [PATCH 006/148] Fixed missing \listfigurename English translation on beforetext.tex --- setup/beforetext.tex | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/beforetext.tex b/setup/beforetext.tex index ce53c41..177e139 100644 --- a/setup/beforetext.tex +++ b/setup/beforetext.tex @@ -54,8 +54,8 @@ % Inserir errata -% Inserir folha de aprovação. Isto é um exemplo de Folha de aprovação, elemento obrigatório da -% NBR 14724/2011 (seção 4.2.1.3). Você pode utilizar este modelo até a aprovação do trabalho. +% Inserir folha de aprovação. Isto é um exemplo de Folha de aprovação, elemento obrigatório da +% NBR 14724/2011 (seção 4.2.1.3). Você pode utilizar este modelo até a aprovação do trabalho. % Após isso, substitua todo o conteúdo deste arquivo por uma imagem da página assinada pela banca com o comando abaixo: \ifforcedinclude\else\cleardoublepage\fi @@ -86,15 +86,15 @@ % Some tables of contents \ifforcedinclude\else % inserir lista de figuras - % Ao contrario da norma abnt-6027-2012, que as figuras estejam listadas na Lista de - % Ilustrações, a UFSC pede que as figuras estejam na Lista de Figuras. - \renewcommand{\listfigurename}{Lista de Figuras} + % Ao contrario da norma abnt-6027-2012, que as figuras estejam listadas na Lista de + % Ilustrações, a UFSC pede que as figuras estejam na Lista de Figuras. + \renewcommand{\listfigurename}{\lang{List of Figures}{Lista de Figuras}} \ifforcedinclude\else\cleardoublepage\fi \addtotextpreliminarycontent{\lang{List of Figures}{Lista de Figuras}} \pdfbookmark[0]{\listfigurename}{lof} \listoffigures* - % inserir lista de quados + % inserir lista de quadros \ifforcedinclude\else\cleardoublepage\fi \addtotextpreliminarycontent{\lang{List of Data Frames}{Lista de Quadros}} \pdfbookmark[0]{Lista de Quadros}{loq} @@ -106,7 +106,7 @@ \pdfbookmark[0]{\listtablename}{lot} \listoftables* - % inserir códigos fonte + % inserir códigos fonte (List of Listings `lol`) \ifforcedinclude\else\cleardoublepage\fi \addtotextpreliminarycontent{\lang{List of Source Codes}{Lista de Códigos Fonte}} \pdfbookmark[0]{\lstlistingname}{lol} From c64d0d93842310c7ad8010e07ff9f116b5f88d69 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 31 Mar 2019 21:30:49 -0300 Subject: [PATCH 007/148] Created the function print_results on Makefile to show the elapsed time and the path to the main log file. --- Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6cb91ad..c63e747 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,13 @@ LATEX = $(PDF_LATEX_COMMAND)\ -aux-directory="$(CACHE_FOLDER)" +# Calculate the elapsed seconds and print them to the screen +define print_results = +. ./setup/scripts/timer_calculator.sh +showTheElapsedSeconds "$(current_dir)" +echo "$(CACHE_FOLDER)/main.log:10 " +endef + # Run pdflatex, biber, pdflatex biber: start_timer biber_hook pdflatex_hook2 @@ -69,10 +76,7 @@ biber: start_timer biber_hook pdflatex_hook2 # Copies the PDF to the current folder cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf - - # Calculate the elapsed seconds and print them to the screen - . ./setup/scripts/timer_calculator.sh - showTheElapsedSeconds "$(current_dir)" + $(print_results) start_timer: @@ -111,8 +115,7 @@ latex: $(LATEX_PDF_FILES) $(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null # Calculate the elapsed seconds and print them to the screen - . ./setup/scripts/timer_calculator.sh - showTheElapsedSeconds "$(current_dir)" + $(print_results) # Dynamically generated recipes for all PDF and latex files @@ -171,7 +174,7 @@ thesis: cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf # Calculate the elapsed seconds and print them to the screen - showTheElapsedSeconds "$(current_dir)" + $(print_results) verbose: @@ -198,7 +201,7 @@ verbose: cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf # Calculate the elapsed seconds and print them to the screen - showTheElapsedSeconds "$(current_dir)" + $(print_results) clean: From 33ede71b21c5de0f1cd54b33ebc618c99d5c10b4 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 31 Mar 2019 21:44:53 -0300 Subject: [PATCH 008/148] Created a Makefile function to copy the output PDF --- Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index c63e747..4f7603f 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,12 @@ LATEX = $(PDF_LATEX_COMMAND)\ -aux-directory="$(CACHE_FOLDER)" +# Copies the PDF to the current folder +define copy_resulting_pdf= +cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf +# cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf /cygdrive/D/User/Downloads/$(THESIS_OUTPUT_NAME).pdf +endef + # Calculate the elapsed seconds and print them to the screen define print_results = . ./setup/scripts/timer_calculator.sh @@ -74,8 +80,7 @@ biber: start_timer biber_hook pdflatex_hook2 # Creates the shell variable `current_dir` within the current folder path $(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null - # Copies the PDF to the current folder - cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf + $(copy_resulting_pdf) $(print_results) @@ -128,7 +133,7 @@ latex: $(LATEX_PDF_FILES) $(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null @$(LATEX) $< - cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf + $(copy_resulting_pdf) # MAIN LATEXMK RULE @@ -170,10 +175,7 @@ thesis: --pdflatex="$(PDF_LATEX_COMMAND) --interaction=batchmode" \ $(THESIS_MAIN_FILE).tex - # Copy the generated PDF file from the cache folder - cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf - - # Calculate the elapsed seconds and print them to the screen + $(copy_resulting_pdf) $(print_results) @@ -197,10 +199,7 @@ verbose: --pdflatex="$(PDF_LATEX_COMMAND) --interaction=nonstopmode" \ $(THESIS_MAIN_FILE).tex - # Copy the generated PDF file from the cache folder - cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf - - # Calculate the elapsed seconds and print them to the screen + $(copy_resulting_pdf) $(print_results) From e6460d049097a0e43f080699006b50816f5f65ba Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 1 Apr 2019 22:03:15 -0300 Subject: [PATCH 009/148] Moved \listfigurename fix from beforetext.tex to ufscthesisx.sty --- setup/beforetext.tex | 5 +---- setup/ufscthesisx.sty | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/setup/beforetext.tex b/setup/beforetext.tex index 177e139..ac756c4 100644 --- a/setup/beforetext.tex +++ b/setup/beforetext.tex @@ -86,11 +86,8 @@ % Some tables of contents \ifforcedinclude\else % inserir lista de figuras - % Ao contrario da norma abnt-6027-2012, que as figuras estejam listadas na Lista de - % Ilustrações, a UFSC pede que as figuras estejam na Lista de Figuras. - \renewcommand{\listfigurename}{\lang{List of Figures}{Lista de Figuras}} \ifforcedinclude\else\cleardoublepage\fi - \addtotextpreliminarycontent{\lang{List of Figures}{Lista de Figuras}} + \addtotextpreliminarycontent{\listfigurename} \pdfbookmark[0]{\listfigurename}{lof} \listoffigures* diff --git a/setup/ufscthesisx.sty b/setup/ufscthesisx.sty index f888ac4..cb9876c 100644 --- a/setup/ufscthesisx.sty +++ b/setup/ufscthesisx.sty @@ -496,6 +496,13 @@ \newcommand{\defref}[1]{Definição~\ref{#1}} % +% Ao contrario da norma abnt-6027-2012, que as figuras estejam listadas na Lista de +% Ilustrações, a UFSC pede que as figuras estejam na Lista de Figuras. +% https://tex.stackexchange.com/questions/482523/how-to-override-command-on-my-preamble-after-its-redefinition-by-my-class-with +\addto\captionsbrazil{\renewcommand{\listfigurename}{Lista de Figuras}} +\addto\captionsenglish{\renewcommand{\listfigurename}{List of Figures}} + + % ------------------------------------------------------------------------ % ------------------------------------------------------------------------ % Estilo de capítulos From 5bbed4172573732b2ce7d6d0945f3f1df156072c Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 2 Apr 2019 22:27:13 -0300 Subject: [PATCH 010/148] Trimmed whitespaces from chapters/chapter_1.tex --- chapters/chapter_1.tex | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/chapters/chapter_1.tex b/chapters/chapter_1.tex index 065f246..4cf108c 100644 --- a/chapters/chapter_1.tex +++ b/chapters/chapter_1.tex @@ -258,7 +258,7 @@ \section{Rotação de equações} \section{Codificação dos arquivos: UTF8} % --- - + A codificação de todos os arquivos do \abnTeX{} é \texttt{UTF8}. É necessário que @@ -279,10 +279,10 @@ \section{Citações diretas} utilizado e sem as aspas. No caso de documentos datilografados, deve-se observar apenas o recuo \cite[5.3]{NBR10520:2002}. - + \end{citacao} - + Use o ambiente assim: \begin{lstlisting}[language=tex] @@ -292,7 +292,7 @@ \section{Citações diretas} \end{citacao} \end{lstlisting} - + O ambiente \texttt{citacao} pode receber como parâmetro opcional um nome de idioma previamente carregado nas opções da classe (\autoref{sec-hifenizacao}). Nesse @@ -373,7 +373,7 @@ \section{Tabelas} \begin{tabular}{ccc} \toprule \textbf{Nome} & \textbf{Nascimento} & \textbf{Documento} \\ - \midrule + \midrule Maria da Silva & 11/11/1111 & 111.111.111-11 \\ \midrule João Souza & 11/11/2111 & 211.111.111-11 \\ @@ -808,7 +808,7 @@ \section{Inclusão de outros arquivos}\label{sec-include} \section{Compilar o documento \LaTeX{}} % --- - + Geralmente os editores \LaTeX{}, como o TeXlipse\footnote{\url{http://texlipse.sourceforge.net/}}, o @@ -877,7 +877,7 @@ \subsection{Divisões do documento: subseção}\label{sec-divisoes-subsection} \texttt{subsubsection } do \LaTeX{}, mas é impressa chamada de ``subseção'' porque no Português não temos a palavra ``subsubseção''. - + \subsubsection{Divisões do documento: subsubseção} From e04106ba6c931de2d28f2299f1abbf5a3ca6e128 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 2 Apr 2019 23:18:42 -0300 Subject: [PATCH 011/148] Set the Makefile to output 10000000 instead of 10, forcing Sublime Text to go the last line of the log file, when using the double click feature. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4f7603f..ec74859 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ endef define print_results = . ./setup/scripts/timer_calculator.sh showTheElapsedSeconds "$(current_dir)" -echo "$(CACHE_FOLDER)/main.log:10 " +echo "$(CACHE_FOLDER)/main.log:10000000 " endef # Run pdflatex, biber, pdflatex From 63bc6142aa0902653e0721f05dde62c094226264 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 2 Apr 2019 23:21:25 -0300 Subject: [PATCH 012/148] Renamed \listofquadros to \listofboards and added babel support for multilaguage's definitions of \listofboards. --- chapters/chapter_1.tex | 8 ++++---- settings.tex | 22 +++++++++++++--------- setup/beforetext.tex | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/chapters/chapter_1.tex b/chapters/chapter_1.tex index 4cf108c..7c54b37 100644 --- a/chapters/chapter_1.tex +++ b/chapters/chapter_1.tex @@ -552,7 +552,7 @@ \section{Quadros} Depois de definir o ambiente \texttt{quadro} podemos ter um quadro: -\begin{quadro} +\begin{board} \caption{\label{quad:quadro_modelo1}Legenda do primeiro quadro.} \centering \begin{tabular}{|c|} @@ -561,12 +561,12 @@ \section{Quadros} \hline \end{tabular} \fonte{Teste.} -\end{quadro} +\end{board} Além do \autoref{quad:quadro_modelo1}, também é possível especificar outra ordem de posicionamento como [htb]: -\begin{quadro}[htb] +\begin{board}[htb] \centering \caption{\label{quad:quadro_modelo2}Legenda do segundo quadro.} \begin{tabular}{|c|} @@ -575,7 +575,7 @@ \section{Quadros} \hline \end{tabular} \fonte{O autor.} -\end{quadro} +\end{board} diff --git a/settings.tex b/settings.tex index aff0478..c6eb9dd 100644 --- a/settings.tex +++ b/settings.tex @@ -23,11 +23,16 @@ % Novo list of (listings) para QUADROS usando newfloat \usepackage{newfloat} + +% https://tex.stackexchange.com/questions/329631/creating-new-captions-and-caption-counters +\def\listofboardsname{List of Frames} +\DeclareFloatingEnvironment[fileext=loq,placement={!hbtp},name=Frame,within=chapter,listname=\listofboardsname]{board} + +% https://tex.stackexchange.com/questions/482886/how-to-add-babel-captions-to-newfloat-package-environments +\addto\captionsbrazil{\renewcommand{\boardname}{Quadro}} +\addto\captionsbrazil{\renewcommand{\listofboardsname}{Lista de Quadros}} + \makeatletter -%% we define a helper macro for adjusting lists of new floats to -%% accept a * behind them for not being shown in the TOC, like -%% the other list printing commands in memoir -% https://tex.stackexchange.com/questions/176418/remove-list-of-newfloat-from-toc \newcommand{\AdjustForMemoir}[1]{% \csletcs{kept@listof#1}{listof#1}% \csdef{listof#1}{% @@ -39,11 +44,10 @@ } \def\append@star#1{#1*} \makeatother -% \newcommand{\quadroname}{Quadro} -% \newcommand{\listofquadrosname}{Lista de Quadros} -\DeclareFloatingEnvironment[fileext=loq,placement={!hbtp},name=Quadro,within=chapter,listname=Lista de Quadros]{quadro} -\AdjustForMemoir{quadro} -\newlistentry{quadro}{loq}{0} + +% https://tex.stackexchange.com/questions/176418/remove-list-of-newfloat-from-toc +\AdjustForMemoir{board} +\newlistentry{board}{loq}{0} diff --git a/setup/beforetext.tex b/setup/beforetext.tex index ac756c4..aee6e23 100644 --- a/setup/beforetext.tex +++ b/setup/beforetext.tex @@ -95,7 +95,7 @@ \ifforcedinclude\else\cleardoublepage\fi \addtotextpreliminarycontent{\lang{List of Data Frames}{Lista de Quadros}} \pdfbookmark[0]{Lista de Quadros}{loq} - \listofquadros* + \listofboards* % inserir lista de tabelas \ifforcedinclude\else\cleardoublepage\fi From aadc53847b055b38c2eb53d41b1647426cf41761 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 2 Apr 2019 23:39:45 -0300 Subject: [PATCH 013/148] Moved \listofboardsname from settings.tex to ufscthesisx.sty --- .gitignore | 2 +- settings.tex | 29 ----------------------------- setup/beforetext.tex | 2 +- setup/ufscthesisx.sty | 28 ++++++++++++++++++++++++++++ 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index a679724..6262a38 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,7 @@ *.xdy *.tdo *.fls -*.loq +*.lob .DS_Store /.settings diff --git a/settings.tex b/settings.tex index c6eb9dd..524b4e9 100644 --- a/settings.tex +++ b/settings.tex @@ -21,35 +21,6 @@ % \usepackage{newtxtext} % \usepackage{newtxmath} -% Novo list of (listings) para QUADROS usando newfloat -\usepackage{newfloat} - -% https://tex.stackexchange.com/questions/329631/creating-new-captions-and-caption-counters -\def\listofboardsname{List of Frames} -\DeclareFloatingEnvironment[fileext=loq,placement={!hbtp},name=Frame,within=chapter,listname=\listofboardsname]{board} - -% https://tex.stackexchange.com/questions/482886/how-to-add-babel-captions-to-newfloat-package-environments -\addto\captionsbrazil{\renewcommand{\boardname}{Quadro}} -\addto\captionsbrazil{\renewcommand{\listofboardsname}{Lista de Quadros}} - -\makeatletter -\newcommand{\AdjustForMemoir}[1]{% - \csletcs{kept@listof#1}{listof#1}% - \csdef{listof#1}{% - \@ifstar - {\csappto{newfloat@listof#1@hook}{\append@star}% - \csuse{kept@listof#1}}% - {\csuse{kept@listof#1}}% - } -} -\def\append@star#1{#1*} -\makeatother - -% https://tex.stackexchange.com/questions/176418/remove-list-of-newfloat-from-toc -\AdjustForMemoir{board} -\newlistentry{board}{loq}{0} - - % Thesis settings \newcommand{\brazilword}[1]{\foreignlanguage{brazil}{#1}} diff --git a/setup/beforetext.tex b/setup/beforetext.tex index aee6e23..e9f7b77 100644 --- a/setup/beforetext.tex +++ b/setup/beforetext.tex @@ -94,7 +94,7 @@ % inserir lista de quadros \ifforcedinclude\else\cleardoublepage\fi \addtotextpreliminarycontent{\lang{List of Data Frames}{Lista de Quadros}} - \pdfbookmark[0]{Lista de Quadros}{loq} + \pdfbookmark[0]{Lista de Quadros}{lob} \listofboards* % inserir lista de tabelas diff --git a/setup/ufscthesisx.sty b/setup/ufscthesisx.sty index cb9876c..5fe130f 100644 --- a/setup/ufscthesisx.sty +++ b/setup/ufscthesisx.sty @@ -94,6 +94,9 @@ % https://tex.stackexchange.com/questions/66052/should-i-load-microtype-with-pdflatex \RequirePackage{microtype} +% https://tex.stackexchange.com/questions/482886/how-to-add-babel-captions-to-newfloat-package-environments +\RequirePackage{newfloat} + % How to auto adjust my last table column width, and why is there Underfull \vbox badness on this table? % https://tex.stackexchange.com/questions/387238/how-to-auto-adjust-my-last-table-column-width-and-why-is-there-underfull-vbox/387251 % @@ -720,3 +723,28 @@ }{} \makeatother + +% https://tex.stackexchange.com/questions/329631/creating-new-captions-and-caption-counters +\def\listofboardsname{List of Frames} +\DeclareFloatingEnvironment[fileext=lob,placement={!hbtp},name=Frame,within=chapter,listname=\listofboardsname]{board} + +% https://tex.stackexchange.com/questions/482886/how-to-add-babel-captions-to-newfloat-package-environments +\addto\captionsbrazil{\renewcommand{\boardname}{Quadro}} +\addto\captionsbrazil{\renewcommand{\listofboardsname}{Lista de Quadros}} + +% https://tex.stackexchange.com/questions/176418/remove-list-of-newfloat-from-toc +\makeatletter +\newcommand{\AdjustForMemoir}[1]{% + \csletcs{kept@listof#1}{listof#1}% + \csdef{listof#1}{% + \@ifstar + {\csappto{newfloat@listof#1@hook}{\append@star}% + \csuse{kept@listof#1}}% + {\csuse{kept@listof#1}}% + } +} +\def\append@star#1{#1*} +\makeatother +\AdjustForMemoir{board} +\newlistentry{board}{lob}{0} + From 3ed31dec43bf94d103be60dd5c9f7009830ab919 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 5 Apr 2019 19:54:46 -0300 Subject: [PATCH 014/148] Put latex auxiliary files on the end of the .gitignore file --- .gitignore | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 6262a38..54d553f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,23 @@ +.DS_Store +/.settings +/.project +/.texlipse +/.gitignore +/example.pdf +/tmp + +*.sublime-workspace +*.pdf + +# Latex files related +*.brf +*.lol +*.mtc1 +*.synctex(busy) +*.synctex.gz(busy) +*.run.xml +*.bcf +*.cut *.acn *.acr *.alg @@ -34,28 +54,3 @@ *.tdo *.fls *.lob - -.DS_Store -/.settings -/.project -/.texlipse -/.gitignore -/example.pdf -/tmp - - -# ========================= -# Latex files related -# ========================= -*.brf -*.lol -*.mtc1 -*.sublime-workspace -*.pdf -*.synctex(busy) -*.synctex.gz(busy) - -*.run.xml -*.bcf -*.cut - From 192ceca82cf60a26dafbdc8e589541a5d5a3fc22 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 5 Apr 2019 23:23:49 -0300 Subject: [PATCH 015/148] Created a bugged veryclean on Makefile --- Makefile | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index ec74859..0f0f8e2 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,13 @@ ECHOCMD:=/bin/echo -e # The main latex file -THESIS_MAIN_FILE = main +THESIS_MAIN_FILE := main # This will be the pdf generated -THESIS_OUTPUT_NAME = thesis +THESIS_OUTPUT_NAME := thesis # This is the folder where the temporary files are going to be -CACHE_FOLDER = setup/cache +CACHE_FOLDER := setup/cache # Find all files ending with `main.tex` LATEX_SOURCE_FILES := $(wildcard *main.tex) @@ -21,6 +21,7 @@ LATEX_PDF_FILES := $(LATEX_SOURCE_FILES:.tex=.pdf) # GNU Make silent by default # https://stackoverflow.com/questions/24005166/gnu-make-silent-by-default MAKEFLAGS += --silent +GITIGNORE_PATH := .gitignore .PHONY: all help biber start_timer biber_hook pdflatex_hook1 pdflatex_hook2 latex thesis verbose clean # How do I write the 'cd' command in a makefile? @@ -208,18 +209,42 @@ clean: $(RM) -v $(THESIS_OUTPUT_NAME).pdf -# Using Makefile to clean subdirectories -# https://stackoverflow.com/questions/26007005/using-makefile-to-clean-subdirectories -# -# Exclude directory from find . command # https://stackoverflow.com/questions/4210042/exclude-directory-from-find-command +DIRECTORIES_TO_CLEAN := $(shell /bin/find -not -path "./**.git**" -not -path "./pictures**" -type d) GARBAGE_TYPES := "*.gz(busy)" *.aux *.log *.aux *.bbl *.log *.out *.toc *.dvi *.blg\ -*.synctex.gz *.fdb_latexmk *.fls *.lot *.lol *.lof *.idx *.bcf *.mw *.run.xml +*.synctex.gz *.fdb_latexmk *.fls *.lot *.lol *.lof *.idx *.bcf *.mw *.run.xml .*loq -DIRECTORIES_TO_CLEAN := $(shell /bin/find -not -path "./**.git**" -not -path "./pictures**" -type d) GARBAGE_TYPED_FOLDERS := $(foreach DIR, $(DIRECTORIES_TO_CLEAN), $(addprefix $(DIR)/,$(GARBAGE_TYPES))) -veryclean: +veryclean: veryclean_broke veryclean_bugged clean +veryclean_bugged: $(RM) -v $(GARBAGE_TYPED_FOLDERS) +# https://stackoverflow.com/questions/55527923/how-to-stop-makefile-from-expanding-my-shell-output +RAW_GITIGNORE_CONTENTS := $(shell while read -r line; do printf "$$line "; done < "$(GITIGNORE_PATH)") +GITIGNORE_CONTENTS := $(shell echo "$(RAW_GITIGNORE_CONTENTS)" | sed -E $$'s/[^\#]+\# //g') + +# https://stackoverflow.com/questions/55545253/how-to-expand-wildcard-inside-shell-code-block-in-a-makefile +veryclean_broke: +# https://stackoverflow.com/questions/10586153/split-string-into-an-array-in-bash +# https://stackoverflow.com/questions/11289551/argument-list-too-long-error-for-rm-cp-mv-commands + readarray -td' ' GARBAGE_DIRECTORIES <<<"$(DIRECTORIES_TO_CLEAN) "; \ + unset 'GARBAGE_DIRECTORIES[-1]'; \ + declare -p GARBAGE_DIRECTORIES; \ + readarray -td' ' GARBAGE_EXTENSIONS <<<"$(GITIGNORE_CONTENTS) "; \ + unset 'GARBAGE_EXTENSIONS[-1]'; \ + declare -p GARBAGE_EXTENSIONS; \ + for filename in "$${GARBAGE_DIRECTORIES[@]}"; \ + do \ + arraylength="$${#GARBAGE_EXTENSIONS[@]}"; \ + printf 'Cleaning %s extensions on %s\n' "$${arraylength}" "$$filename"; \ + for extension in "$${GARBAGE_EXTENSIONS[@]}"; \ + do \ + [[ ! -z "$$filename" ]] || continue; \ + [[ ! -z "$$extension" ]] || continue; \ + full_expression="$${filename}/$${extension}" ;\ +# printf '%s\n' "$$full_expression"; \ + rm -vf "$$full_expression"; \ + done; \ + done; From 9649fcc6e71b1ed2ef8822967791e4a209e8d7f3 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 5 Apr 2019 23:29:32 -0300 Subject: [PATCH 016/148] Moved \citacao environment patch from settings to ufscthesisx.sty --- settings.tex | 12 ++++-------- setup/ufscthesisx.sty | 10 ++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/settings.tex b/settings.tex index 524b4e9..adfb4e2 100644 --- a/settings.tex +++ b/settings.tex @@ -39,14 +39,10 @@ \hyphenation{Ge-la-im} -% Patch the `abntex2` citacao environment -\xpatchcmd{\citacao} -{\list{}} -{\list{}{\topsep=0pt}} -{} -{\PackageWarning{ufscthesisx}{Citation \topsep is not patched. The 'citacao' environment must be -patched with 'topsep=0pt' but it failed. This is probably due an update on the main class 'abnTeX2', -therefore the \topsep patch must need to be updated accordingly}} +% https://tex.stackexchange.com/questions/391695/is-possible-to-remove-the-link-color-of-the-comma-on-the-citation-link +% Uncomment the next line to remove the commas link color on citations +% \DeclareFieldFormat{citehyperref}{#1} + % Remove the colon appended to theses variables, allowing us to use other separators \addto\captionsbrazil diff --git a/setup/ufscthesisx.sty b/setup/ufscthesisx.sty index 5fe130f..bfb122f 100644 --- a/setup/ufscthesisx.sty +++ b/setup/ufscthesisx.sty @@ -748,3 +748,13 @@ \AdjustForMemoir{board} \newlistentry{board}{lob}{0} +% Patch the `abntex2` citacao environment removing the extra space from its top +% https://tex.stackexchange.com/questions/300340/topsep-itemsep-partopsep-and-parsep-what-does-each-of-them-mean-and-wha +\xpatchcmd{\citacao} +{\list{}} +{\list{}{\topsep=0pt}} +{} +{\PackageWarning{ufscthesisx}{Citation \topsep is not patched. The 'citacao' environment must be +patched with 'topsep=0pt' but it failed. This is probably due an update on the main class 'abnTeX2', +therefore the \topsep patch must need to be updated accordingly}} + From bfcbb33da82a0b145c78ecb8e752112eb96214aa Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 6 Apr 2019 00:23:23 -0300 Subject: [PATCH 017/148] Fixed the Makefile veryclean rule --- Makefile | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 0f0f8e2..6bab639 100644 --- a/Makefile +++ b/Makefile @@ -211,23 +211,16 @@ clean: # https://stackoverflow.com/questions/4210042/exclude-directory-from-find-command DIRECTORIES_TO_CLEAN := $(shell /bin/find -not -path "./**.git**" -not -path "./pictures**" -type d) -GARBAGE_TYPES := "*.gz(busy)" *.aux *.log *.aux *.bbl *.log *.out *.toc *.dvi *.blg\ -*.synctex.gz *.fdb_latexmk *.fls *.lot *.lol *.lof *.idx *.bcf *.mw *.run.xml .*loq - -GARBAGE_TYPED_FOLDERS := $(foreach DIR, $(DIRECTORIES_TO_CLEAN), $(addprefix $(DIR)/,$(GARBAGE_TYPES))) - -veryclean: veryclean_broke veryclean_bugged clean -veryclean_bugged: - $(RM) -v $(GARBAGE_TYPED_FOLDERS) # https://stackoverflow.com/questions/55527923/how-to-stop-makefile-from-expanding-my-shell-output RAW_GITIGNORE_CONTENTS := $(shell while read -r line; do printf "$$line "; done < "$(GITIGNORE_PATH)") GITIGNORE_CONTENTS := $(shell echo "$(RAW_GITIGNORE_CONTENTS)" | sed -E $$'s/[^\#]+\# //g') +# https://stackoverflow.com/questions/10586153/split-string-into-an-array-in-bash +# https://stackoverflow.com/questions/11289551/argument-list-too-long-error-for-rm-cp-mv-commands # https://stackoverflow.com/questions/55545253/how-to-expand-wildcard-inside-shell-code-block-in-a-makefile -veryclean_broke: -# https://stackoverflow.com/questions/10586153/split-string-into-an-array-in-bash -# https://stackoverflow.com/questions/11289551/argument-list-too-long-error-for-rm-cp-mv-commands +veryclean: veryclean_hidden clean +veryclean_hidden: readarray -td' ' GARBAGE_DIRECTORIES <<<"$(DIRECTORIES_TO_CLEAN) "; \ unset 'GARBAGE_DIRECTORIES[-1]'; \ declare -p GARBAGE_DIRECTORIES; \ @@ -243,8 +236,7 @@ veryclean_broke: [[ ! -z "$$filename" ]] || continue; \ [[ ! -z "$$extension" ]] || continue; \ full_expression="$${filename}/$${extension}" ;\ -# printf '%s\n' "$$full_expression"; \ - rm -vf "$$full_expression"; \ + rm -vf $${full_expression}; \ done; \ done; From cdabc0599301dee4cb8ad8b09ff460c511af9704 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 6 Apr 2019 01:44:00 -0300 Subject: [PATCH 018/148] Removed excessive comments from settings.tex --- settings.tex | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/settings.tex b/settings.tex index adfb4e2..5d15c1d 100644 --- a/settings.tex +++ b/settings.tex @@ -2,16 +2,10 @@ % File settings %---------------------------------------------------------------------------------------- -% Comment this, unless you are debugging pages' badness Underfull & Overflow +% Uncomment this if you are debugging pages' badness Underfull & Overflow % https://tex.stackexchange.com/questions/115908/geometry-showframe-landscape -% -% What is the difference between \usepackage{showframe} and \usepackage[showframe]{geometry}? % https://tex.stackexchange.com/questions/387077/what-is-the-difference-between-usepackageshowframe-and-usepackageshowframe -% -% How to do the memoir headings fix but not have my text going over the page bottom margins? % https://tex.stackexchange.com/questions/387257/how-to-do-the-memoir-headings-fix-but-not-have-my-text-going-over-the-page-botto -% -% Print page margins of a document, for debugging bad boxes % https://tex.stackexchange.com/questions/14508/print-page-margins-of-a-document % \usepackage[showframe,pass]{geometry} @@ -22,19 +16,18 @@ % \usepackage{newtxmath} -% Thesis settings +% Simple alias for English and Portuguese words \newcommand{\brazilword}[1]{\foreignlanguage{brazil}{#1}} \newcommand{\englishword}[1]{\foreignlanguage{english}{#1}} -\lang % Switch between english and brazil for big text blocks +% Switch between english and brazil for big text blocks +\lang {\includecomment{englishtext}\excludecomment{braziltext}} {\includecomment{braziltext}\excludecomment{englishtext}} -% What is the difference between \def and \newcommand? % https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand \def\mytextpreliminarylistname{\lang{Brief Table of Contents}{Breve Sumário}} -% How to manually set where a word is split? % https://tex.stackexchange.com/questions/182569/how-to-manually-set-where-a-word-is-split \hyphenation{Ge-la-im} @@ -51,7 +44,7 @@ \renewcommand{\coorientadorname}{Coorientador} } -% Create caption English translations as the sections headers +% Add English translations % https://tex.stackexchange.com/questions/8564/what-is-the-right-way-to-redefine-macros-defined-by-babel \addto\captionsenglish { @@ -73,7 +66,6 @@ \renewcommand{\listadesimbolosname}{List of symbols} \renewcommand{\fontename}{Source} \renewcommand{\notaname}{Note} - %% adjusts names used by \autoref \renewcommand{\pageautorefname}{page} \renewcommand{\sectionautorefname}{section} \renewcommand{\subsectionautorefname}{subsection} @@ -102,8 +94,6 @@ % Espaçamentos entre linhas e parágrafos -% -% ifpackageloaded question % https://tex.stackexchange.com/questions/70212/ifpackageloaded-question \makeatletter \@ifclassloaded{memoir} @@ -162,10 +152,10 @@ \hypersetup { pdftitle={\@title}, - colorlinks=true, % false: boxed links; true: colored links - linkcolor=darkblue, % color of internal links + colorlinks=true, % false: boxed links; true: colored links + linkcolor=darkblue, % color of internal links citecolor=darkgreen, % color of links to bibliography - filecolor=black, % color of file links + filecolor=black, % color of file links urlcolor=linkcolor, bookmarksdepth=4 } @@ -190,8 +180,6 @@ }{} \makeatother - -% Changing the font of the numbers in the ToC in the memoir class % https://tex.stackexchange.com/questions/14314/changing-the-font-of-the-numbers-in-the-toc-in-the-memoir-class \renewcommand{\cftpartfont}{\ABNTEXpartfont\color{ultramarine}} \renewcommand{\cftpartpagefont}{\ABNTEXpartfont\color{black}} @@ -211,7 +199,6 @@ \renewcommand{\cftparagraphfont}{\ABNTEXsubsubsubsectionfont\color{ultramarine}} \renewcommand{\cftparagraphpagefont}{\ABNTEXsubsubsubsectionfont\color{black}} - % Backref package settings, pages with citations in bibliography \makeatletter \@ifpackageloaded{biblatex} From 869e9d4804da31a51f44f70537659a1e5eb40c1a Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 6 Apr 2019 19:55:51 -0300 Subject: [PATCH 019/148] Removed duplicated code and added the --max-print-line=10000 on Makefile to stop latex from breaking/wrapping console log lines at 80 characters. --- Makefile | 55 +++++++++++++------------------------------------------ 1 file changed, 13 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index 6bab639..ce49382 100644 --- a/Makefile +++ b/Makefile @@ -17,14 +17,11 @@ LATEX_SOURCE_FILES := $(wildcard *main.tex) # Create a new variable within all `LATEX_SOURCE_FILES` file names ending with `.pdf` LATEX_PDF_FILES := $(LATEX_SOURCE_FILES:.tex=.pdf) - -# GNU Make silent by default # https://stackoverflow.com/questions/24005166/gnu-make-silent-by-default MAKEFLAGS += --silent GITIGNORE_PATH := .gitignore .PHONY: all help biber start_timer biber_hook pdflatex_hook1 pdflatex_hook2 latex thesis verbose clean -# How do I write the 'cd' command in a makefile? # http://stackoverflow.com/questions/1789594/how-do-i-write-the-cd-command-in-a-makefile .ONESHELL: @@ -53,9 +50,9 @@ help: @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' -# Where to find official (!) and extended documentation for tex/latex's commandline options (especially -interaction modes)? # https://tex.stackexchange.com/questions/91592/where-to-find-official-and-extended-documentation-for-tex-latexs-commandlin -PDF_LATEX_COMMAND = pdflatex --time-statistics --synctex=1 -halt-on-error -file-line-error +# https://tex.stackexchange.com/questions/52988/avoid-linebreaks-in-latex-console-log-output-or-increase-columns-in-terminal +PDF_LATEX_COMMAND = pdflatex --time-statistics --synctex=1 -halt-on-error -file-line-error --max-print-line=10000 LATEX = $(PDF_LATEX_COMMAND)\ --interaction=batchmode\ -output-directory="$(CACHE_FOLDER)"\ @@ -75,27 +72,26 @@ showTheElapsedSeconds "$(current_dir)" echo "$(CACHE_FOLDER)/main.log:10000000 " endef +define setup_envinronment = +. ./setup/scripts/timer_calculator.sh +$(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null +endef + # Run pdflatex, biber, pdflatex biber: start_timer biber_hook pdflatex_hook2 - - # Creates the shell variable `current_dir` within the current folder path - $(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null - + $(setup_envinronment) $(copy_resulting_pdf) $(print_results) start_timer: - # Start counting the elapsed seconds to print them to the screen later . ./setup/scripts/timer_calculator.sh # Internally called rule which does not attempt to show the elapsed time biber_hook: - - # Creates the shell variable `current_dir` within the current folder path - $(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null + $(setup_envinronment) # Enters to the thesis folder to build the files cd ./$(THESIS_FOLDER) @@ -107,18 +103,14 @@ biber_hook: biber --quiet --input-directory="$(CACHE_FOLDER)" --output-directory="$(CACHE_FOLDER)" $(THESIS_MAIN_FILE).bcf -# How to call Makefile recipe/rule multiple times? # https://stackoverflow.com/questions/46135614/how-to-call-makefile-recipe-rule-multiple-times pdflatex_hook1 pdflatex_hook2: - @$(LATEX) $(LATEX_SOURCE_FILES) # This rule will be called for every latex file and pdf associated latex: $(LATEX_PDF_FILES) - - # Creates the shell variable `current_dir` within the current folder path - $(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null + $(setup_envinronment) # Calculate the elapsed seconds and print them to the screen $(print_results) @@ -126,12 +118,7 @@ latex: $(LATEX_PDF_FILES) # Dynamically generated recipes for all PDF and latex files %.pdf: %.tex - - # Start counting the compilation time and import its shell functions - . ./setup/scripts/timer_calculator.sh - - # Creates the shell variable `current_dir` within the current folder path - $(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null + $(setup_envinronment) @$(LATEX) $< $(copy_resulting_pdf) @@ -156,17 +143,9 @@ latex: $(LATEX_PDF_FILES) # https://www.ctan.org/pkg/latexmk # http://docs.miktex.org/manual/texfeatures.html#auxdirectory thesis: + $(setup_envinronment) - # Start counting the compilation time and import its shell functions - . ./setup/scripts/timer_calculator.sh - - # Creates the shell variable `current_dir` within the current folder path - $(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null - - # What is the difference between “-interaction=nonstopmode” and “-halt-on-error”? # https://tex.stackexchange.com/questions/258814/what-is-the-difference-between-interaction-nonstopmode-and-halt-on-error - # - # What reasons (if any) are there for compiling in interactive mode? # https://tex.stackexchange.com/questions/25267/what-reasons-if-any-are-there-for-compiling-in-interactive-mode latexmk \ --pdf \ @@ -181,17 +160,9 @@ thesis: verbose: + $(setup_envinronment) - # Start counting the compilation time and import its shell functions - . ./setup/scripts/timer_calculator.sh - - # Creates the shell variable `current_dir` within the current folder path - $(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null - - # What is the difference between “-interaction=nonstopmode” and “-halt-on-error”? # https://tex.stackexchange.com/questions/258814/what-is-the-difference-between-interaction-nonstopmode-and-halt-on-error - # - # What reasons (if any) are there for compiling in interactive mode? # https://tex.stackexchange.com/questions/25267/what-reasons-if-any-are-there-for-compiling-in-interactive-mode latexmk \ --pdf \ From 2f9a9536c14cd2e062a2fb02e6fa4327c6a83705 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 6 Apr 2019 21:22:15 -0300 Subject: [PATCH 020/148] Organized the main.tex and settings.tex options to their respective files. --- main.tex | 247 +++++++++++++----------------------------- settings.tex | 153 ++++++++++++++++---------- setup/setup.tex | 64 ++--------- setup/ufscthesisx.sty | 54 +-------- 4 files changed, 190 insertions(+), 328 deletions(-) diff --git a/main.tex b/main.tex index e90f634..73d422e 100644 --- a/main.tex +++ b/main.tex @@ -3,173 +3,107 @@ % 1. https://github.com/royertiago/tcc % 2. http://portal.bu.ufsc.br/normalizacao/ % 3. https://github.com/AdrianoRuseler/abntex2-ufsc - -% You need to run `pdfTeX` 5 times on the following order: 1. `pdfTeX`, 2. `biber`, 3. `pdfTeX` 4. -% `pdfTeX` 5. `pdfTeX` 6. `biber` 7. `pdfTeX`, when the bibliography includes a cyclic reference to -% another bibliography, so we need a last pass to fix the bibliography undefined references. - -% Includes and fixes several `abntex2` class problems -% Must be included before loading class -\input{setup/setup} - -% Uses abntex2 class +% +% When the bibliography includes a cyclic reference to another bibliography, +% you need to run `pdfTeX` 5 times on the following order: +% 1. `pdfTeX`, +% 2. `biber`, +% 3. `pdfTeX` +% 4. `pdfTeX` +% 5. `pdfTeX` +% 6. `biber` +% 7. `pdfTeX` + +% Allows you to write your thesis both in English and Portuguese +% https://tex.stackexchange.com/questions/5076/is-it-possible-to-keep-my-translation-together-with-original-text +\newif\ifenglish\englishfalse + +% Uncomment the line `\englishtrue` to set the document default language to English +% \englishtrue + +% https://tex.stackexchange.com/questions/131002/how-to-expand-ifthenelse-so-that-it-can-be-used-in-parshape +\newcommand{\lang}[2]{\ifenglish#1\else#2\fi} + +% https://tex.stackexchange.com/questions/385895/how-to-make-passoptionstopackage-add-the-option-as-the-last +\ifenglish + \newcommand{\swapcontents}[2]{#1 #2} + \PassOptionsToPackage{brazil,main=english,spanish,french}{babel} +\else + \newcommand{\swapcontents}[2]{#2 #1} + \PassOptionsToPackage{main=brazil,english,spanish,french}{babel} +\fi + +% Uncomment the following line if you want to use other biblatex settings +% \PassOptionsToPackage{style=numeric,backend=biber,backref=true,citecounter=true}{biblatex} + +% Disable the empty pages automatically put by memoir class, except the ones by \cleardoublepage +% \PassOptionsToClass{openany}{memoir} + +% Fixes several `abntex2` class problems +\input{setup/setup.tex} + +% The UFSC font size is 10.5, but memoir embedded by `abntex2` only accepts 10 and 11pt. +% However, problem will be fixed the `ufscthesisx` package. \documentclass[ -10pt, %Padrão UFSC para versão final -a5paper, %Padrão UFSC para versão final -% 12pt, %Pode usar tamanho 12pt para defesa -% a4paper, %Pode usar a4 para defesa -twoside, % Impressão nos dois lados da folha +10pt, % Padrão UFSC para versão final +a5paper, % Padrão UFSC para versão final +% 12pt, % Pode usar tamanho 12pt para defesa +% a4paper, % Pode usar a4 para defesa +twoside, % Impressão nos dois lados da folha chapter=TITLE, % Título de capítulos em caixa alta -section=TITLE, % Título de seções em caixa alta +section=TITLE, % Título de seções em caixa alta ]{abntex2} -% The UFSC font size is 10.5, but memoir embbeded on `abntex2` only accepts 10 and 11pt. However -% this will be fixed later by the ufscthesisx package. -% You can see whether the font sizes are correct with the \f@size at the `\begin{document}`. - - -%---------------------------------------------------------------------------------------- -% MINOR CORRECTIONS BEFORE LOADING UFSCThesis settings -%---------------------------------------------------------------------------------------- -% How can I put more space between bibliography entries (biblatex) -% https://tex.stackexchange.com/questions/19105/how-can-i-put-more-space-between-bibliography-entries-biblatex -% \setlength\bibitemsep{2.1\itemsep} - - -% % Reduce font size of bibliography; overfull bibliography -% % https://tex.stackexchange.com/questions/203764/reduce-font-size-of-bibliography-overfull-bibliography -% \newcommand{\bibliographyfontsize}{\fontsize{10.0pt}{10.5pt}\selectfont} -% \renewcommand*{\bibfont}{\bibliographyfontsize} - -% % How to correctly insert and justify abstract paragraph on my bibliography? -% % https://tex.stackexchange.com/questions/398666/how-to-correctly-insert-and-justify-abstract -% \DeclareFieldFormat{abstract}% -% {% -% \vspace*{-0.5mm}\par\justifying -% \begin{adjustwidth}{1cm}{} -% \textbf{\bibsentence\bibstring{abstract}:} #1 -% \end{adjustwidth} -% } - -% \renewbibmacro*{finentry}% -% {% -% \iffieldundef{abstract} -% {\finentry} -% {\finentrypunct -% \printfield{abstract}% -% \renewcommand*{\finentrypunct}{}% -% \finentry -% } -% } - -%---------------------------------------------------------------------------------------- -% LOAD UFSCThesis style -%---------------------------------------------------------------------------------------- -\usepackage{setup/ufscthesisx} -% Load all required basic packages +\usepackage{setup/ufscthesisx} \input{setup/utilities} +% FIXME: Descomente a linha correspondente ao seu tipo de trabalho +% \def\tcc{} +% \def\mestrado{} +% \def\doutorado{} +% FIXME: Descomente as linhas '\coorientador', '\subtitulo' e '\area', quando houver +\autor{Nome completo do autor/Nome completo da autora} +\orientador[Orientador/Orientadora]{Nome do orientador/Nome da orientadora, Dr./Dra.} +\coordenador[Coordenador/Coordenadora]{Nome do Coordenador/Nome da Coordenadora, Dr./Dra.} - -% FIXME Substituir 'Nome completo do autor' pelo seu nome. -\autor{Nome completo do autor(a)} - -% FIXME Substituir 'Título do trabalho' pelo título da trabalho. +% \coorientador[Coorientador/Coorientadora]{Nome do coorientador/Nome da coorientadora, Dr./Dra.} \titulo{Título do trabalho} -% FIXME Substituir 'Subtítulo (se houver)' pelo subtítulo da trabalho. -% Caso não tenha substítulo, comente a linha a seguir. -\subtitulo{Subtítulo (se houver)} -% FIXME Se estiver defendendo uma dissertação de mestrado, descomente a linha a seguir. - - - -% FIXME Substituir 'Nome do orientador' pelo nome do seu -% orientador. -\orientador{Nome do orientador, Dr.} -% FIXME Se for orientado por uma mulher, descomente a linha acima e comente a linha a seguir. -% \orientador[Orientadora]{Nome da orientadora, Dra.} - - -% FIXME Substituir 'Nome do coorientador' pelo nome do seu -% coorientador. Caso não tenha coorientador, comente a linha a seguir. -\coorientador{Nome do coorientador, Dr.} -% FIXME Se for coorientado por uma mulher, comente a linha acima e descomente a linha a seguir. -% \coorientador[Coorientadora]{Nome da coorientadora, Dra.} - -% FIXME Se for coorientado por uma mulher, descomente a linha a seguir. - -% FIXME Substituir 'Nome do Coordenador' pelo nome do Coordenador do -% programa/curso. -\coordenador{Nome do Coordenador, Dr.} -% FIXME Se for coordenadora mulher, comente a linha acima e descomente a linha a seguir. -% \coordenador[Coordenadora]{Nome da Coordenadora, Dra.} - -% FIXME Substituir '2018' pelo ano (ou mês e ano) em que seu trabalho foi defendido. -\ano{2018} - -% FIXME Substituir '\today' pela data em que ocorreu sua defesa. -\data{\today} - -% FIXME Substituir 'Local' pela cidade em que ocorreu sua defesa. -\local{Local} - -\instituicaosigla{UFSC} +% \subtitulo{Subtítulo (se houver)} +\ano{Ano da sua defesa} +\local{Local da sua Defesa} +\instituicaosigla{Sigla da sua instituição} \instituicao{Universidade Federal de Santa Catarina} \biblioteca{Biblioteca Universitária} +\tipotrabalho{Tese/Dissertação/Monografia/Trabalho de Conclusão de Curso} - -% FIXME Substituir 'Tese' pelo tipo de trabalho (Tese, Dissertação, Monografia, Trabalho de Conclusão de Curso). -\tipotrabalho{Tese} -% FIXME Se estiver apresentando um Trabalho de Conclusão de Curso, descomente a linha a seguir. -% \def\tcc{} - -% FIXME Substituir 'Área de Concentração' pela área de concentração. -% Caso não tenha área de concentração, comente a linha a seguir. % \area{Área de Concentração} - - -% FIXME Substituir 'Doutor em XXXXXX' pela grau adequado. -\formacao{Doutor em XXXXXX} - -% FIXME Substituir 'Programa de Pós-Graduação em XXXXXX' pela curso adequado. +\formacao{Doutor/Bacharel/Mestrando em XXXXXX} \programa{Programa de Pós-Graduação em XXXXXX} - -% FIXME Substituir 'Departamento de XXXXXX, Centro de XXXXXX' pela departamento e centro adequado. \centro{Departamento de XXXXXX, Centro de XXXXXX} +\data{\today} - -%---------------------------------------------------------------------------------------- -% Inserir palavras-chave aqui para aparecer na ficha-catalográfica. -%---------------------------------------------------------------------------------------- - -% Coloque aqui as palavras-chave em portugues \newcommand{\palavraschaveportugues} {% - \item Palavra Chave 1. \item Palavra Chave 2. \item Palavra Chave 3. + \item Palavra Chave 1. + \item Palavra Chave 2. + \item Palavra Chave 3. } -% Insert here the keyworkds in english + \newcommand{\palavraschaveingles} {% - \item Keyword 1. \item Keyword 2. \item Keyword 3. + \item Keyword 1. + \item Keyword 2. + \item Keyword 3. } - -% Altere o arquivo settings.tex para incluir suas configurações. -\input{settings} - -% Configurações do estilo de citação ABNT -\PassOptionsToPackage{style=abnt,backend=biber}{biblatex} - -% Descomente a linha a seguir e comente a anterior se desejar utilizar outras configurações -% do biblatex como por exemplo, style=numeric, entre outros. -% \PassOptionsToPackage{backend=biber,style=numeric,backref=false}{biblatex} +% Altere o arquivo 'settings.tex' para incluir customizações de aparência da sua tese +\input{settings.tex} % Utilize o arquivo aftertext/references.bib para incluir sua bibliografia. \addbibresource{aftertext/references.bib} - % When writing a large document, it is sometimes useful to work on selected sections of the document % to speed up compilation time: https://en.wikibooks.org/wiki/TeX/includeonly \newif\ifforcedinclude\forcedincludefalse @@ -203,36 +137,23 @@ % Uncomment these two lines, to only partially generate the document % \doincludeonly % \forcedincludetrue - - - - - - -% %---------------------------------------------------------------------------------------- -% % DOCUMENT CONTENTS -% %---------------------------------------------------------------------------------------- \begin{document} - % Comment this after finishing the thesis, so you can start fixing the \flushbottom vs \raggedbottom + % FIXME: Comment this after finishing the thesis, so you can start fixing the \flushbottom vs \raggedbottom % https://tex.stackexchange.com/questions/65355/flushbottom-vs-raggedbottom \raggedbottom - % Retira espaço extra obsoleto entre as frases `Double space between sentences` % https://tex.stackexchange.com/questions/4705/double-space-between-sentences \frenchspacing % ELEMENTOS PRÉ-TEXTUAIS \input{setup/beforetext} - - % ELEMENTOS TEXTUAIS \textual - % To automatically put a [Go To Top/Back] ←← | ← on each section + % Uncomment this to put a ←← | ← (Go To Top/Go Back) on each section header % \addGoToSummary - \setlength\beforechapskip{50pt} \setlength\midchapskip{20pt} \setlength\afterchapskip{20pt} @@ -240,12 +161,9 @@ % Introdução (exemplo de capítulo sem numeração, mas presente no Sumário) \include{chapters/intro} - - % Capitulo com exemplos de comandos inseridos de arquivo externo \include{chapters/chapter_1} - % Capitulo de revisão de literatura \include{chapters/chapter_2} @@ -255,18 +173,13 @@ % Segundo capitulo de Resultados \include{chapters/chapter_4} - - - % Finaliza a parte no bookmark do PDF - % para que se inicie o bookmark na raiz + % Finaliza a parte no bookmark do PDF para que se inicie o bookmark na raiz % e adiciona espaço de parte no Sumário \phantompart % Conclusão (outro exemplo de capítulo sem numeração e presente no sumário) \include{chapters/conclusion} - - % ELEMENTOS PÓS-TEXTUAIS \postextual \setlength\beforechapskip{0pt} @@ -275,21 +188,18 @@ % Referências bibliográficas \begingroup - % Using BibTeX to make a list of references without having citations in the body of the document? % https://tex.stackexchange.com/questions/17128/using-bibtex-to-make-a-list-of-references-without % \nocite{*} - \printbibliography[title=REFERÊNCIAS] \endgroup % Glossário, consulte o manual da classe abntex2 para orientações sobre o glossário. % \ifforcedinclude\else\glossary\fi - % Apêndices, inicia os apêndices + % Inicia os apêndices \begin{apendicesenv} % Imprime uma página indicando o início dos apêndices \ifforcedinclude\else\partapendices\fi - \setlength\beforechapskip{50pt} \setlength\midchapskip{20pt} \setlength\afterchapskip{20pt} @@ -297,11 +207,10 @@ \include{aftertext/apendice_a} \end{apendicesenv} - % Anexos, inicia os anexos + % Inicia os anexos \begin{anexosenv} % Imprime uma página indicando o início dos anexos \ifforcedinclude\else\partanexos\fi - \setlength\beforechapskip{50pt} \setlength\midchapskip{20pt} \setlength\afterchapskip{20pt} diff --git a/settings.tex b/settings.tex index 5d15c1d..7c6cfd5 100644 --- a/settings.tex +++ b/settings.tex @@ -1,7 +1,10 @@ %---------------------------------------------------------------------------------------- -% File settings +% Thesis Tweaks and Utilities %---------------------------------------------------------------------------------------- +% https://tex.stackexchange.com/questions/182569/how-to-manually-set-where-a-word-is-split +\hyphenation{Ge-la-im} + % Uncomment this if you are debugging pages' badness Underfull & Overflow % https://tex.stackexchange.com/questions/115908/geometry-showframe-landscape % https://tex.stackexchange.com/questions/387077/what-is-the-difference-between-usepackageshowframe-and-usepackageshowframe @@ -9,46 +12,36 @@ % https://tex.stackexchange.com/questions/14508/print-page-margins-of-a-document % \usepackage[showframe,pass]{geometry} - % To use the font Times New Roman, instead of the default LaTeX font % more up-to-date than '\usepackage{mathptmx}' % \usepackage{newtxtext} % \usepackage{newtxmath} - % Simple alias for English and Portuguese words \newcommand{\brazilword}[1]{\foreignlanguage{brazil}{#1}} \newcommand{\englishword}[1]{\foreignlanguage{english}{#1}} -% Switch between english and brazil for big text blocks -\lang +\lang % Switch between english and brazil for big text blocks {\includecomment{englishtext}\excludecomment{braziltext}} {\includecomment{braziltext}\excludecomment{englishtext}} +% Backward compatibility with `abntex2cite` package `\citeonline` command with the new `biblatex` package % https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand -\def\mytextpreliminarylistname{\lang{Brief Table of Contents}{Breve Sumário}} - -% https://tex.stackexchange.com/questions/182569/how-to-manually-set-where-a-word-is-split -\hyphenation{Ge-la-im} - +\let\citeonline\textcite % https://tex.stackexchange.com/questions/391695/is-possible-to-remove-the-link-color-of-the-comma-on-the-citation-link -% Uncomment the next line to remove the commas link color on citations % \DeclareFieldFormat{citehyperref}{#1} - -% Remove the colon appended to theses variables, allowing us to use other separators -\addto\captionsbrazil -{ +% Add new translations and remove the colon appended to theses variables by 'abntex2', allowing us to use other separators +\addto\captionsbrazil { % + \renewcommand{\mytextpreliminarylistname}{Breve Sumário} \renewcommand{\orientadorname}{Orientador} \renewcommand{\coorientadorname}{Coorientador} } -% Add English translations +% Add English translations and fix names from abnTeX2 % https://tex.stackexchange.com/questions/8564/what-is-the-right-way-to-redefine-macros-defined-by-babel -\addto\captionsenglish -{ - %% adjusts names from abnTeX2 +\addto\captionsenglish { % \renewcommand{\folhaderostoname}{Title page} \renewcommand{\epigraphname}{Epigraph} \renewcommand{\dedicatorianame}{Dedication} @@ -79,6 +72,7 @@ { \ifenglish % These default values are already in English + \else % Listing -> Codigo fonte \renewcommand{\lstlistingname}{Código--fonte} @@ -86,32 +80,61 @@ % List of Listings -> Lista de códigos-fonte \renewcommand{\lstlistlistingname}{Lista de códigos--fonte} - % Calculate the size of the header + % Recalculate the size of the header \calculatelisteningsheader \fi }{} \makeatother - -% Espaçamentos entre linhas e parágrafos +% Spacing between lines and paragraphs % https://tex.stackexchange.com/questions/70212/ifpackageloaded-question \makeatletter \@ifclassloaded{memoir} { - % Estilo de capítulos, ver classe para maiores detalhes.Veja outros estilos em: + % New custom chapter style VZ14, see other chapters styles in: + % http://repositorios.cpai.unb.br/ctan/info/latex-samples/MemoirChapStyles/MemoirChapStyles.pdf + \newcommand\thickhrulefill{\leavevmode \leaders \hrule height 1ex \hfill \kern \z@} + \makechapterstyle{VZ14} { % + % \thispagestyle{empty} + \setlength\beforechapskip{50pt} + \setlength\midchapskip{20pt} + \setlength\afterchapskip{20pt} + \renewcommand\chapternamenum{} + \renewcommand\printchaptername{} + \renewcommand\chapnamefont{\Huge\scshape} + \renewcommand\printchapternum {% + \chapnamefont\null\thickhrulefill\quad + \@chapapp\space\thechapter\quad\thickhrulefill + } + \renewcommand\printchapternonum {% + \par\thickhrulefill\par\vskip\midchapskip + \hrule\vskip\midchapskip + } + \renewcommand\chaptitlefont{\huge\scshape\centering} + \renewcommand\afterchapternum {% + \par\nobreak\vskip\midchapskip\hrule\vskip\midchapskip + } + \renewcommand\afterchaptertitle {% + \par\vskip\midchapskip\hrule\nobreak\vskip\afterchapskip + } + } + + % Apply the style `VZ14` just created + % \chapterstyle{VZ14} + + % Controlling the spacing between one paragraph and another, try also \onelineskip + % Default value for UFSC 0.0cm + \setlength{\parskip}{0.2cm} + + % Paragraph size is given by + % Default value for UFSC 1.0cm + \setlength{\parindent}{1.3cm} + % http://mirrors.ibiblio.org/CTAN/macros/latex/contrib/memoir/memman.pdf - \chapterstyle{VZ14} \setlength\beforechapskip{0pt} \setlength\midchapskip{15pt} \setlength\afterchapskip{15pt} - % O tamanho do parágrafo é dado por: - \setlength{\parindent}{1.3cm} - - % Controle do espaçamento entre um parágrafo e outro. Tente também - % \onelineskip - \setlength{\parskip}{0.2cm} - % Memoir: Warnings “The material used in the headers is too large” w/ accented titles % https://tex.stackexchange.com/questions/387293/how-to-change-the-page-layout-with-memoir \setheadfoot{30.0pt}{\footskip} @@ -119,7 +142,6 @@ }{} \makeatother - % Color settings across the document \makeatletter \@ifpackageloaded{xcolor} @@ -127,26 +149,22 @@ % RGB colors in absolute values from 0 to 255 by using `RGB` tag \definecolor{darkblue}{RGB}{26,13,178} - % Definição de cores, RGB colors in percentage notation by using `rgb` tag + % Colors names definitions as RGB colors in percentage notation by using `rgb` tag \definecolor{mygreen}{rgb}{0,0.6,0} \definecolor{mygray}{rgb}{0.5,0.5,0.5} \definecolor{mymauve}{rgb}{0.58,0,0.82} - - % Configurações de aparência do PDF final - \definecolor{figcolor}{rgb}{1,0.4,0} % orange - \definecolor{tabcolor}{rgb}{1,0.4,0} % orange - \definecolor{eqncolor}{rgb}{1,0.4,0} % orange - \definecolor{linkcolor}{rgb}{1,0.4,0} % orange - \definecolor{citecolor}{rgb}{1,0.4,0} % orange - \definecolor{seccolor}{rgb}{0,0,1} % blue - \definecolor{abscolor}{rgb}{0,0,1} % blue - \definecolor{titlecolor}{rgb}{0,0,1} % blue - \definecolor{biocolor}{rgb}{0,0,1} % blue - - % Alterando o aspecto da cor azul + \definecolor{figcolor}{rgb}{1,0.4,0} + \definecolor{tabcolor}{rgb}{1,0.4,0} + \definecolor{eqncolor}{rgb}{1,0.4,0} + \definecolor{linkcolor}{rgb}{1,0.4,0} + \definecolor{citecolor}{rgb}{1,0.4,0} + \definecolor{seccolor}{rgb}{0,0,1} + \definecolor{abscolor}{rgb}{0,0,1} + \definecolor{titlecolor}{rgb}{0,0,1} + \definecolor{biocolor}{rgb}{0,0,1} \definecolor{blue}{RGB}{41,5,195} - % Informações do PDF + % PDF Hyperlinks settings \@ifpackageloaded{hyperref} { \hypersetup @@ -236,28 +254,21 @@ }{} \makeatother - % Memoir has another mechanism for the job: \cftsetindents{‹kind›}{indent}{numwidth}. Here kind is % chapter, section, or whatever; the indent specifies the ‘margin’ before the entry starts; and the % width is of the box into which the number is typeset (so needs to be wide enough for the largest % number, with the necessary spacing to separate it from what comes after it in the line. % http://www.tex.ac.uk/FAQ-tocloftwrong.html -% -% memoir: indentation of unnumbered sections in table of contents % https://tex.stackexchange.com/questions/264668/memoir-indentation-of-unnumbered-sections-in-table-of-contents -% -% Memoir ToC: indent the second line by number+space width in the previous line OR set standard % https://tex.stackexchange.com/questions/394227/memoir-toc-indent-the-second-line-by-numberspace - -% `\cftlastnumwidth` and these `\cftsetindents` are defined by the abntex2 class saying they obey -% the `ABNTEXsumario-abnt-6027-2012`. -% \newlength{\cftlastnumwidth} - +% +% `\cftlastnumwidth` and these `\cftsetindents` are defined by the abntex2 class, +% obeying the `ABNTEXsumario-abnt-6027-2012`. \newlength{\cftlastnumwidth} \setlength{\cftlastnumwidth}{\cftsubsubsectionnumwidth} \addtolength{\cftlastnumwidth}{-1em} % http://www.tex.ac.uk/FAQ-tocloftwrong.html -% Use \setlength\cftsectionnumwidth{4em} to override all these values +% Use \setlength\cftsectionnumwidth{4em} to override all these values at once \cftsetindents{part} {0em}{\cftlastnumwidth} \cftsetindents{chapter} {0em}{\cftlastnumwidth} \cftsetindents{section} {0em}{\cftlastnumwidth} @@ -266,4 +277,30 @@ \cftsetindents{paragraph} {0em}{\cftlastnumwidth} \cftsetindents{subparagraph} {0em}{\cftlastnumwidth} +% https://tex.stackexchange.com/questions/19105/how-can-i-put-more-space-between-bibliography-entries-biblatex +% \setlength\bibitemsep{2.1\itemsep} + +% % https://tex.stackexchange.com/questions/203764/reduce-font-size-of-bibliography-overfull-bibliography +% \newcommand{\bibliographyfontsize}{\fontsize{10.0pt}{10.5pt}\selectfont} +% \renewcommand*{\bibfont}{\bibliographyfontsize} + +% % Uncomment this to insert the abstract into your bibliography entries when the abstract is available +% % https://tex.stackexchange.com/questions/398666/how-to-correctly-insert-and-justify-abstract +% \DeclareFieldFormat{abstract}% +% {% +% \vspace*{-0.5mm}\par\justifying +% \begin{adjustwidth}{1cm}{} +% \textbf{\bibsentence\bibstring{abstract}:} #1 +% \end{adjustwidth} +% } +% \renewbibmacro*{finentry}% +% {% +% \iffieldundef{abstract} +% {\finentry} +% {\finentrypunct +% \printfield{abstract}% +% \renewcommand*{\finentrypunct}{}% +% \finentry +% } +% } diff --git a/setup/setup.tex b/setup/setup.tex index 3f51fca..f4b1da3 100644 --- a/setup/setup.tex +++ b/setup/setup.tex @@ -2,43 +2,10 @@ % PACKAGES AND OTHER DOCUMENT CONFIGURATIONS BEFORE LOADING abntex2 %---------------------------------------------------------------------------------------- -% Uncomment the line `\englishtrue` to set the document default language to english. -% -% Is it possible to keep my translation together with original text? -% https://tex.stackexchange.com/questions/5076/is-it-possible-to-keep-my-translation-together-with-original-text -\newif\ifenglish\englishfalse -% \englishtrue - -% How to expand \ifthenelse so that it can be used in \parshape? -% https://tex.stackexchange.com/questions/131002/how-to-expand-ifthenelse-so-that-it-can-be-used-in-parshape -\newcommand{\lang}[2]{\ifenglish#1\else#2\fi} - -% Disable the empty pages automatically put by memoir class, except the ones by \cleardoublepage -% \PassOptionsToClass{openany}{memoir} - -% How to make \PassOptionsToPackage add the option as the last option? -% https://tex.stackexchange.com/questions/385895/how-to-make-passoptionstopackage-add-the-option-as-the-last -\ifenglish - \newcommand{\swapcontents}[2]{#1 #2} - - \PassOptionsToPackage{language=english}{biblatex} - \PassOptionsToPackage{brazil,main=english,spanish,french}{babel} -\else - \newcommand{\swapcontents}[2]{#2 #1} - - \PassOptionsToPackage{language=brazil}{biblatex} - \PassOptionsToPackage{main=brazil,english,spanish,french}{babel} -\fi - - - - -% Applying options to already loaded package -% https://tex.stackexchange.com/questions/124049/applying-options-to-already-loaded-package -% % For web links and paths with \path{..} and \url{https://www.python.org/downloads/} -% https://tex.stackexchange.com/questions/3033/forcing-linebreaks-in-url % ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/hyperref/doc/options.pdf +% https://tex.stackexchange.com/questions/3033/forcing-linebreaks-in-url +% https://tex.stackexchange.com/questions/124049/applying-options-to-already-loaded-package \PassOptionsToPackage{hyphens}{url} % Use its macro adjustwidth* to extend tables out of outer text border. @@ -51,14 +18,11 @@ \PassOptionsToPackage{hyperfootnotes=false}{hyperref} % The class `abntex2` loads the `enumitem` package with options. -% % With the package option shortlabels you can use an enumerate-like syntax, where A, a, I, i and 1 % stand for \Alph*, \alph*, \Roman*, \roman* and \arabic*. This is intended mainly as a sort of % compatibility mode with the enumerate package, and therefore the following special rule applies: % if the very first option (at any level) is not recognized as a valid key, then it will be % considered a label with the enumerate-like syntax. -% -% No spacing between enumerated items with \usepackage{enumerate} % https://tex.stackexchange.com/questions/119919/no-spacing-between-enumerated-items-with-usepackageenumerate \PassOptionsToPackage{shortlabels}{enumitem} @@ -68,13 +32,8 @@ % The `abntex2` package loads the `hyperref` package, however there are several packages which are % required to be loaded after and before `hyperref`. % -% Which packages should be loaded after hyperref instead of before? % https://tex.stackexchange.com/questions/1863/which-packages-should-be-loaded-after-hyperref-instead-of-before -% -% Hyperref is loaded by the class, and I need to load packages that are supposed to be loaded before % https://tex.stackexchange.com/questions/50846/hyperref-is-loaded-by-the-class-and-i-need-to-load-packages-that-are-supposed-t -% -% Using \BeforePackage to load a package before hyperref does not work % https://tex.stackexchange.com/questions/51094/using-beforepackage-to-load-a-package-before-hyperref-does-not-work \RequirePackage{scrlfile} \AfterClass{memoir} @@ -91,14 +50,19 @@ \RequirePackage{paralist} } -% Biblatex error: Incompatible backref package +% https://tex.stackexchange.com/questions/6529/newline-linebreak-in-message % https://tex.stackexchange.com/questions/383054/biblatex-error-incompatible-backref-package -% -% backreferencing in classicthesis package does not work % https://tex.stackexchange.com/questions/115828/backreferencing-in-classicthesis-package-does-not-work -% -% Citação alfabética por autor-data [alf], Why my biblatex document is not accepting UTF-8 on the bibliography? % https://tex.stackexchange.com/questions/390349/why-my-biblatex-document-is-not-accepting-utf-8-on-the-bibliography +% https://tex.stackexchange.com/questions/55478/how-to-print-out-to-log-without-affecting-anything-else-lua-print-equiv +% https://tex.stackexchange.com/questions/483570/how-to-detect-whether-passoptionstopackage-was-already-called +\ifcsname opt@biblatex.sty\endcsname + \message{Options have already been passed or the biblatex package has already been loaded!^^J} +\else + \message{No options have been passed yet for biblatex!^^J} + \PassOptionsToPackage{style=abnt,backend=biber,backref=true,citecounter=true}{biblatex} +\fi + \AfterClass{memoir} { \RequirePackage{biblatex} @@ -111,14 +75,10 @@ \RequirePackage{longtable} } -% How to silence memoir class warning against the use of caption package? % https://tex.stackexchange.com/questions/391993/how-to-silence-memoir-class-warning-against-the-use-of-caption-package \RequirePackage{silence} \WarningFilter*{memoir}{You are using the caption package with the memoir class} -% Can I silence a warning which is coming from a file like `bigfoot.sty`? % https://tex.stackexchange.com/questions/402676/can-i-silence-a-warning-which-is-coming-from-a-file-like-bigfoot-sty \WarningFilter*{hyperref}{Option `hyperfootnotes' has already been used} - - diff --git a/setup/ufscthesisx.sty b/setup/ufscthesisx.sty index bfb122f..acfa418 100644 --- a/setup/ufscthesisx.sty +++ b/setup/ufscthesisx.sty @@ -331,10 +331,8 @@ % Memoir ToC: indent the second line by number+space width in the previous line OR set standard % https://tex.stackexchange.com/questions/394227/memoir-toc-indent-the-second-line-by-numberspace -% `\cftlastnumwidth` and these `\cftsetindents` are defined by the abntex2 class saying they obey -% the `ABNTEXsumario-abnt-6027-2012`. -% \newlength{\cftlastnumwidth} - +% `\cftlastnumwidth` and these `\cftsetindents` are defined by the abntex2 class, +% obeying the `ABNTEXsumario-abnt-6027-2012`. \newlength{\cftlastnumwidth} \setlength{\cftlastnumwidth}{\cftsubsubsectionnumwidth} \addtolength{\cftlastnumwidth}{1em} @@ -442,13 +440,14 @@ % font={normalsize} % } + % Espaçamento depois do título \setlength{\afterchapskip}{0.38cm} -% Espaçamento depois dos paragráfos +% Controle do espaçamento entre um parágrafo e outro. Tente também \onelineskip \setlength{\parskip}{0.0cm} -% Espaçamento da primeira linha do parágrafo +% O tamanho do parágrafo é dado por \setlength{\parindent}{1.0cm} % Comando para inverter sobrenome e nome @@ -506,49 +505,6 @@ \addto\captionsenglish{\renewcommand{\listfigurename}{List of Figures}} -% ------------------------------------------------------------------------ -% ------------------------------------------------------------------------ -% Estilo de capítulos -% ------------------------------------------------------------------------ -% ------------------------------------------------------------------------ - -% % Custom settings -% \makeatletter -% \newcommand\thickhrulefill{\leavevmode \leaders \hrule height 1ex \hfill \kern \z@} - -% \makechapterstyle{VZ14} -% {% -% % \thispagestyle{empty} -% \setlength\beforechapskip{50pt} -% \setlength\midchapskip{20pt} -% \setlength\afterchapskip{20pt} -% \renewcommand\chapternamenum{} -% \renewcommand\printchaptername{} -% \renewcommand\chapnamefont{\Huge\scshape} -% \renewcommand\printchapternum -% {% -% \chapnamefont\null\thickhrulefill\quad -% \@chapapp\space\thechapter\quad\thickhrulefill -% } -% \renewcommand\printchapternonum -% {% -% \par\thickhrulefill\par\vskip\midchapskip -% \hrule\vskip\midchapskip -% } -% \renewcommand\chaptitlefont{\huge\scshape\centering} -% \renewcommand\afterchapternum -% {% -% \par\nobreak\vskip\midchapskip\hrule\vskip\midchapskip -% } -% \renewcommand\afterchaptertitle -% {% -% \par\vskip\midchapskip\hrule\nobreak\vskip\afterchapskip -% } -% } -% \makeatother - -% Veja outros estilos em: -% http://repositorios.cpai.unb.br/ctan/info/latex-samples/MemoirChapStyles/MemoirChapStyles.pdf \renewenvironment{resumo}[1][\resumoname] {% % Fixed double bookmark entries as `\pretextualchapter` bellow is already calling `\PRIVATEbookmarkthis` From c5b01b017e5ba05b802daccd34b4c38fd737d71a Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 6 Apr 2019 23:06:56 -0300 Subject: [PATCH 021/148] Moved Makefile to setup/makefile.mk --- Makefile => setup/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Makefile => setup/makefile.mk (98%) diff --git a/Makefile b/setup/makefile.mk similarity index 98% rename from Makefile rename to setup/makefile.mk index ce49382..728ce63 100644 --- a/Makefile +++ b/setup/makefile.mk @@ -62,7 +62,7 @@ LATEX = $(PDF_LATEX_COMMAND)\ # Copies the PDF to the current folder define copy_resulting_pdf= cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf -# cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf /cygdrive/D/User/Downloads/$(THESIS_OUTPUT_NAME).pdf +cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf /cygdrive/D/User/Downloads/$(THESIS_OUTPUT_NAME).pdf endef # Calculate the elapsed seconds and print them to the screen From 289f4df92d4a5d6c336f7f54e3f1a9491f72d160 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 6 Apr 2019 23:08:23 -0300 Subject: [PATCH 022/148] Created a new Makefile which just imports the one inside ./setup --- Makefile | 3 +++ setup/makefile.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a7e5848 --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ + +include ./setup/makefile.mk + diff --git a/setup/makefile.mk b/setup/makefile.mk index 728ce63..ce49382 100644 --- a/setup/makefile.mk +++ b/setup/makefile.mk @@ -62,7 +62,7 @@ LATEX = $(PDF_LATEX_COMMAND)\ # Copies the PDF to the current folder define copy_resulting_pdf= cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf -cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf /cygdrive/D/User/Downloads/$(THESIS_OUTPUT_NAME).pdf +# cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf /cygdrive/D/User/Downloads/$(THESIS_OUTPUT_NAME).pdf endef # Calculate the elapsed seconds and print them to the screen From fde1d0c539954873767b08c0b023cfdc71f017a1 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 6 Apr 2019 23:10:37 -0300 Subject: [PATCH 023/148] Moved the ufscthesisx.sublime-project to ./setup --- .../ufscthesisx.sublime-project | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename ufscthesisx.sublime-project => setup/ufscthesisx.sublime-project (95%) diff --git a/ufscthesisx.sublime-project b/setup/ufscthesisx.sublime-project similarity index 95% rename from ufscthesisx.sublime-project rename to setup/ufscthesisx.sublime-project index a224976..50f68fc 100644 --- a/ufscthesisx.sublime-project +++ b/setup/ufscthesisx.sublime-project @@ -6,7 +6,7 @@ "folders": [ { - "path": ".", + "path": "../", "folder_exclude_patterns": [ "*cache*", @@ -20,7 +20,7 @@ "cmd": ["make", "thesis"], "shell": true, - "working_dir": "$project_path/", + "working_dir": "$project_path/../", "target": "exec", "syntax": "Packages/Text/Plain text.tmLanguage", From 66708cf36228a61fdee930cfbbd01f71ebaa54e6 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 7 Apr 2019 00:54:32 -0300 Subject: [PATCH 024/148] Created the setup/README.md from README.md --- README.md | 174 ++++++++++++------------------------------------ setup/README.md | 119 +++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 130 deletions(-) create mode 100644 setup/README.md diff --git a/README.md b/README.md index b704155..f47752d 100644 --- a/README.md +++ b/README.md @@ -1,68 +1,34 @@ -ufscthesisx -================= +# Template para ufscthesisx -Modelo Canônico de TCC, Monografia, Dissertação, Tese ou Relatório de Pós--Doutorado da UFSC com -abnTeX2. Originado de endereço https://github.com/AdrianoRuseler/abntex2-ufsc com o nome -`abntex2-ufsc`, este projeto foi renomeado para `ufscthesisx`. +Modelo Canônico de TCC, +Monografia, Dissertação, +Tese ou Relatório de Pós--Doutorado da UFSC com abnTeX2. +Originado de endereço https://github.com/AdrianoRuseler/abntex2-ufsc com o nome `abntex2-ufsc`, +este projeto foi renomeado para `ufscthesisx`. Esse projeto não está vinculado a nenhum órgão da UFSC. -Esta não é uma classe LaTeX, mas um pacote. Para usá-lo, você deve utilizar a classe -`abnTeX2` como classe do seu documento e então incluir `ufscthesisx.sty` como um pacote LaTeX na -seguinte ordem: -```latex -\PassOptionsToPackage{style=abnt,backref=true,backend=biber,citecounter=true}{biblatex} -\AfterClass{memoir} -{ - \RequirePackage{biblatex} -} -\documentclass[ -10pt, %Padrão UFSC para versão final -a5paper, %Padrão UFSC para versão final -% 12pt, %Pode usar tamanho 12pt para defesa -% a4paper, %Pode usar a4 para defesa -twoside, % Impressão nos dois lados da folha -chapter=TITLE, % Título de capítulos em caixa alta -section=TITLE % Título de seções em caixa alta -]{abntex2} - -\usepackage{setup/ufscthesisx} -``` - -Se você inverter a ordem de inclusão, as citações bibliográficas não irão funcionar. - - - -Está disponibilizado, além o pacote `ufscthesisx.sty`, um *template* (arquivo `main.tex` e outros) -para que possa escrever seu trabalho. - - ## Modelo em PDF -Se você quer ter uma ideia de como é o modelo, a compialção deve resultar no seguinte [PDF](https://dl.dropbox.com/s/kevxtvs7bx9c8f7/main.pdf) - +Se você quer ter uma ideia de como é o modelo, +a compialção deve resultar no seguinte [PDF](https://dl.dropbox.com/s/kevxtvs7bx9c8f7/main.pdf) -# Instalação -### Instalar `LaTeX` e `abnTeX2` +### Instalar `LaTeX` e `abnTeX2` -Para poder utilizar a classe é necessário ter uma distribuição atual do LaTeX, incluindo o pacote abnTeX2. *Sugerimos formtemente a utilização da distribiução TeX Live para Windows e Linux e MacTeX para macOS*. +Para poder utilizar a classe é necessário ter uma distribuição atual do LaTeX, +incluindo o pacote abnTeX2. +*Sugerimos formtemente a utilização da distribiução TeX Live para Windows e Linux e MacTeX para macOS*. As configurações específicas para cada sistema podem ser encontradas nos link abaixo para o pacote `abnTeX2`: - - 1. [abntex2 CTAN](http://www.ctan.org/pkg/abntex2) 1. [abnTeX2 Instalação](https://github.com/abntex/abntex2/wiki/Instalacao) - - ## Baixando diretamente modelo UFSC -Caso queria, pode baixar diretamente o arquivo `zip` clique +Caso queria, +pode baixar diretamente o arquivo `zip` clique [aqui](https://github.com/UFSC/ufscthesisx/releases/download/v1.1/ufscthesisx.zip) e descompacte o arquivo. @@ -73,98 +39,51 @@ No diretório do seu projeto faça um clone (recursivo) dos arquivos do reposit git clone --recursive https://github.com/ufsc/ufscthesisx ``` -Este repositório já contém um exemplo de tese com uso avançado de conceitos e LaTeX. Se você tiver -interesse em utilizar esse *template*, você precisa preencher os seus dados como -nome do orientador, coorientador, seu nome, nome da sua instituição, do seu curso, departamento, +Este repositório já contém um exemplo de tese com uso avançado de conceitos e LaTeX. +Se você tiver interesse em utilizar esse *template*, +você precisa preencher os seus dados como nome do orientador, +coorientador, seu nome, +nome da sua instituição, +do seu curso, departamento, etc. -Para isso altere os dados fictícios para os corretos no arquivo `main.tex`, que é o arquivo principal do *template* utilizado, e carrega todos os pacotes necessários e incluir os arquivos LaTeX que contém as partes da sua -monografia. +Para isso altere os dados fictícios para os corretos no arquivo `main.tex`, +que é o arquivo principal do *template* utilizado, +e carrega todos os pacotes necessários e incluir os arquivos LaTeX que contém as partes da sua monografia. ## Utilizando Overleaf para digitar sua tese com modelo UFSC -Se você quiser, pode utilizar o [Overleaf](www.overleaf.com), um sistema de editoração *online* de textos em LaTeX. -Se você já tiver uma conta no Overleaf pode fazer o *upload* do arquivo `.zip` baixado acima ou então faça o *upload* automaticamente com a +Se você quiser, +pode utilizar o [Overleaf](www.overleaf.com), +um sistema de editoração *online* de textos em LaTeX. +Se você já tiver uma conta no Overleaf pode fazer o *upload* do arquivo `.zip` baixado acima ou então faça o *upload* automaticamente com a última versa clicando [aqui](http://overleaf.com/docs?snip_uri=https://github.com/UFSC/ufscthesisx/releases/download/v1.1/ufscthesisx.zip) # Uso -A ideia é fazer com que você utilize a classe abnTeX2, mas com customizações voltadas -para as normas de trabalhos acadêmicos da UFSC, fazendo com que o seu uso seja idêntico ao uso direto da classe abnTeX2. - -A documentação dessa classe pode ser encontrada nos link a seguir e também é possível encontrar -modelos de documentos que utilizam a classe para tomar como base: +A ideia é fazer com que você utilize a classe abnTeX2, +mas com customizações voltadas para as normas de trabalhos acadêmicos da UFSC, +fazendo com que o seu uso seja idêntico ao uso direto da classe abnTeX2. +A documentação dessa classe pode ser encontrada nos link a seguir e também é possível +encontrar modelos de documentos que utilizam a classe para tomar como base: 1. [Documentação e Modelos abnTeX2](https://www.ctan.org/pkg/abntex2) -Entretanto, apesar das instruções iniciais do projeto serem para utilizar diretamente a classe -`abntex2`, existem algumas incompatibilidades com outros pacotes do LaTeX que precisam ser corrigidos. Para isso -você pode utilizar você pode incluir o arquivo `setup.tex` que faz as correções do `abntex2`: - -```latex -\input{setup/setup} -\documentclass[ -10pt, %Padrão UFSC para versão final -a5paper, %Padrão UFSC para versão final -% 12pt, %Pode usar tamanho 12pt para defesa -% a4paper, %Pode usar a4 para defesa -twoside, % Impressão nos dois lados da folha -chapter=TITLE, % Título de capítulos em caixa alta -section=TITLE % Título de seções em caixa alta -]{abntex2} -\usepackage{setup/ufscthesisx} -``` - -Uma maneira de utilizar esse *template*, caso você seja usuário de `git`, é fazer o clone dele como um submodule de sua tese, -e em seu arquivo principal incluir o seguinte cabeçalho para carregar os pacotes básicos: -```latex -% You need to run `pdfTeX` 5 times on the following order: 1. `pdfTeX`, 2. `biber`, 3. `pdfTeX` 4. -% `pdfTeX` 5. `pdfTeX` 6. `biber` 7. `pdfTeX`, when the bibliography includes a cyclic reference to -% another bibliography, so we need a last pass to fix the bibliography undefined references. - -\input{ufscthesisx/setup/setup} - -\documentclass[ -10pt, %Padrão UFSC para versão final -a5paper, %Padrão UFSC para versão final -% 12pt, %Pode usar tamanho 12pt para defesa -% a4paper, %Pode usar a4 para defesa -twoside, % Impressão nos dois lados da folha -chapter=TITLE, % Título de capítulos em caixa alta -section=TITLE % Título de seções em caixa alta -]{abntex2} - -% Load the UFSC thesis settings -\usepackage{ufscthesisx/setup/ufscthesisx} - -% Load all required basic packages -\input{ufscthesisx/setup/utilities/basic} -\input{ufscthesisx/setup/utilities/commands} - -% Bad boxes settings and programming environments -\input{ufscthesisx/setup/utilities/badboxes} -\input{ufscthesisx/setup/utilities/programming} - -% Input a empty list of commands when on debug mode -\input{ufscthesisx/setup/utilities/commands_list} -``` - -Você também pode copiar o arquivo de configuração `settings.tex` para o seu diretório principal da -sua tese e então inclui-lo. Também deve utilizar `references.bib` : -```latex -% Altere o arquivo settings.tex para incluir suas configurações. -\input{settings} - -% Utilize ou altere o arquivo 'aftertext/references.bib' para incluir sua bibliografia. -\addbibresource{aftertext/references.bib} -``` +Para compilar este modelo, +você pode utilizar seu editor git favorito, +e pedir para ele compilar o documento a partir do arquivo `main.tex` no diretório principal. +Por conveniência, +você também pode executar o arquivo `build.cmd` caso você esteja no Windows, +ou executar o comando `make` caso você esteja no Linux. ## Normas da UFSC para trabalhos acadêmicos -Na UFSC, a Biblioteca Central disponibiliza um site específico para as normas e foi com base nessas informações que este projeto foi feito. + +Na UFSC, +a Biblioteca Central disponibiliza um site específico para as normas e foi com base nessas informações que este projeto foi feito. 1. [Geral](http://portal.bu.ufsc.br/normalizacao/) 1. [Normas de Citação](http://www.bu.ufsc.br/design/Citacao1.htm) 1. [Normas em docx](http://www.bu.ufsc.br/design/TemplateTrabalhoAcademico.docx) @@ -180,19 +99,17 @@ Na UFSC, a Biblioteca Central disponibiliza um site específico para as normas e 1. https://github.com/abntex/biblatex-abnt - - # Mudanças Para ver as mudanças, acesse o histórico do `git` no endereço: - 1. https://github.com/ufsc/ufscthesisx/commits/master Ou clone este repositório e execute seguinte comando do cliente git: - ```bash -git log https://git-scm.com/book/en/v2/Git-Basics-Viewing-the-Commit-History +git log ``` +1. https://git-scm.com/book/en/v2/Git-Basics-Viewing-the-Commit-History + # Licença @@ -223,6 +140,3 @@ RESPONSABILIDADE, SEJA EM AÇÃO DE CONTRATO, DELITO OU DE OUTRA FORMA, DECORREN RELACIONADO COM DOS ARQUIVOS DESTE REPOSITÓRIO OU O USO OU OUTRAS NEGOCIAÇÕES NO MODELO E SOFTWARE. ``` - - - diff --git a/setup/README.md b/setup/README.md new file mode 100644 index 0000000..4478caa --- /dev/null +++ b/setup/README.md @@ -0,0 +1,119 @@ +# ufscthesisx + +Esta não é uma classe LaTeX, +mas um pacote. + +O modelo disponibilizado pela Biblioteca Universitária da UFSC em 2015, +utiliza a `abntex` versão `0.8.2`, considerada muito antiga, +portanto tratou-se de buscar a criação deste novo modelo que utiliza a classe `abntex2` versão `1.9.6`. + + +### Utilizando `git` + +No diretório do seu projeto faça um clone (recursivo) dos arquivos do repositório: +```bash +git clone --recursive https://github.com/evandrocoan/ufscthesisx-setup +``` + +Para usá-lo, +você deve utilizar a classe `abnTeX2` como classe do seu documento e então incluir `ufscthesisx.sty` como um pacote LaTeX na seguinte ordem: +```latex +\input{ufscthesisx/setup.tex} + +\PassOptionsToPackage{style=abnt,backend=biber,backref=true,citecounter=true}{biblatex} +\AfterClass{memoir} +{ + \RequirePackage{biblatex} +} + +% The UFSC font size is 10.5, but memoir embedded by `abntex2` only accepts 10 and 11pt. +% However, problem will be fixed the `ufscthesisx` package. +\documentclass[ +10pt, % Padrão UFSC para versão final +a5paper, % Padrão UFSC para versão final +% 12pt, % Pode usar tamanho 12pt para defesa +% a4paper, % Pode usar a4 para defesa +twoside, % Impressão nos dois lados da folha +chapter=TITLE, % Título de capítulos em caixa alta +section=TITLE, % Título de seções em caixa alta +]{abntex2} + +\usepackage{setup/ufscthesisx} + +% Load the UFSC thesis settings +\usepackage{ufscthesisx/ufscthesisx.sty} + +% Load all required basic packages +\input{ufscthesisx/utilities/basic.tex} +\input{ufscthesisx/utilities/commands.tex} + +% Bad boxes settings and programming environments +\input{ufscthesisx/utilities/badboxes.tex} +\input{ufscthesisx/utilities/programming.tex} + +% Input a empty list of commands when on debug mode +\input{ufscthesisx/utilities/commands_list.tex} + +% Altere o arquivo settings.tex para incluir suas configurações. +\input{settings.tex} + +% Utilize ou altere o arquivo 'aftertext/references.bib' para incluir sua bibliografia. +\addbibresource{aftertext/references.bib} +``` +Se você inverter a ordem de inclusão do biblatex, +as citações bibliográficas não irão funcionar. + +Apesar das instruções iniciais do projeto serem para utilizar diretamente a classe `abntex2`, +existem algumas incompatibilidades com outros pacotes do LaTeX que precisam ser corrigidos. +Para isso você pode utilizar você pode incluir o arquivo `setup.tex` que faz as correções do `abntex2`. + +Uma maneira de utilizar esse *template*, +caso você seja usuário de `git`, +é fazer o clone desse repositório como um submodulo de sua tese, +e em seu arquivo principal incluir o seguinte cabeçalho para carregar os pacotes básicos mentionados acima. + + +### Mudanças + +Para ver as mudanças, acesse o histórico do `git` no endereço: +1. https://github.com/evandrocoan/ufscthesisx-setup/commits/master + +Ou clone este repositório e execute seguinte comando do cliente git: +```bash +git log +``` +1. https://git-scm.com/book/en/v2/Git-Basics-Viewing-the-Commit-History + + +## Licença + +``` +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 + +É 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 +direitos de uso, cópia, modificação, mesclagem, publicar, distribuir, e permitir que as pessoas a +quem o Software seja fornecido tenham estes mesmos direitos, ambos sujeitos às seguintes condições: + +O aviso de direitos autorais acima e este aviso de permissão devem ser incluídos em todas as cópias +ou partes substanciais do Software. + +Os arquivos `chapters/intro.tex`, `chapters/chapter_1.tex` e `setup/ufscthesisx.sty` estão +licenciados sobre a licença LPPL (The Latex Project License). Portanto você deve respeitar essa +licença para esses arquivos ao invés dessa. Entretanto a condição a seguir continuará valendo sobre +esses arquivos licenciados pela licença LPPL: + +OS ARQUIVOS NESTE REPOSITÓRIO SÃO FORNECIDOS "NO ESTADO EM QUE SE ENCONTRAM", SEM GARANTIA DE +QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO ÀS GARANTIAS DE +COMERCIALIZAÇÃO, APTIDÃO PARA UM PROPÓSITO ESPECÍFICO E NÃO INFRACÇÃO. EM NENHUMA CIRCUNSTÂNCIA, OS +AUTORES OU TITULARES DE DIREITOS AUTORAIS SERÃO RESPONSÁVEIS POR QUALQUER RECLAMAÇÃO, DANOS OU OUTRA +RESPONSABILIDADE, SEJA EM AÇÃO DE CONTRATO, DELITO OU DE OUTRA FORMA, DECORRENTE, DESTE OU +RELACIONADO COM DOS ARQUIVOS DESTE REPOSITÓRIO OU O USO OU OUTRAS NEGOCIAÇÕES NO MODELO E SOFTWARE. +``` + + + + From f5c1f30f7a4d1b911a9ab422abb3679130d61069 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 7 Apr 2019 01:02:13 -0300 Subject: [PATCH 025/148] Created the directory setup as a separate git submodule. --- .gitmodules | 9 +- setup | 1 + setup/README.md | 119 ----- setup/beforetext.tex | 169 ------- setup/makefile.mk | 213 --------- setup/scripts | 1 - setup/setup.tex | 84 ---- setup/ufscthesisx.sty | 716 ------------------------------ setup/ufscthesisx.sublime-project | 61 --- setup/utilities | 1 - setup/utilities.tex | 14 - 11 files changed, 4 insertions(+), 1384 deletions(-) create mode 160000 setup delete mode 100644 setup/README.md delete mode 100644 setup/beforetext.tex delete mode 100644 setup/makefile.mk delete mode 160000 setup/scripts delete mode 100644 setup/setup.tex delete mode 100644 setup/ufscthesisx.sty delete mode 100644 setup/ufscthesisx.sublime-project delete mode 160000 setup/utilities delete mode 100644 setup/utilities.tex diff --git a/.gitmodules b/.gitmodules index 4da3068..456460a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "imagens"] path = pictures url = https://github.com/evandrocoan/abntex2-ufsc-imagens.git -[submodule "utilities"] - path = setup/utilities - url = https://github.com/evandrocoan/latex_utilities -[submodule "setup/scripts"] - path = setup/scripts - url = https://github.com/evandrocoan/script_utilities +[submodule "setup"] + path = setup + url = https://github.com/evandrocoan/ufscthesisx-setup diff --git a/setup b/setup new file mode 160000 index 0000000..961bb3a --- /dev/null +++ b/setup @@ -0,0 +1 @@ +Subproject commit 961bb3a4d50103d774d4155ce9958ca73a79fcf9 diff --git a/setup/README.md b/setup/README.md deleted file mode 100644 index 4478caa..0000000 --- a/setup/README.md +++ /dev/null @@ -1,119 +0,0 @@ -# ufscthesisx - -Esta não é uma classe LaTeX, -mas um pacote. - -O modelo disponibilizado pela Biblioteca Universitária da UFSC em 2015, -utiliza a `abntex` versão `0.8.2`, considerada muito antiga, -portanto tratou-se de buscar a criação deste novo modelo que utiliza a classe `abntex2` versão `1.9.6`. - - -### Utilizando `git` - -No diretório do seu projeto faça um clone (recursivo) dos arquivos do repositório: -```bash -git clone --recursive https://github.com/evandrocoan/ufscthesisx-setup -``` - -Para usá-lo, -você deve utilizar a classe `abnTeX2` como classe do seu documento e então incluir `ufscthesisx.sty` como um pacote LaTeX na seguinte ordem: -```latex -\input{ufscthesisx/setup.tex} - -\PassOptionsToPackage{style=abnt,backend=biber,backref=true,citecounter=true}{biblatex} -\AfterClass{memoir} -{ - \RequirePackage{biblatex} -} - -% The UFSC font size is 10.5, but memoir embedded by `abntex2` only accepts 10 and 11pt. -% However, problem will be fixed the `ufscthesisx` package. -\documentclass[ -10pt, % Padrão UFSC para versão final -a5paper, % Padrão UFSC para versão final -% 12pt, % Pode usar tamanho 12pt para defesa -% a4paper, % Pode usar a4 para defesa -twoside, % Impressão nos dois lados da folha -chapter=TITLE, % Título de capítulos em caixa alta -section=TITLE, % Título de seções em caixa alta -]{abntex2} - -\usepackage{setup/ufscthesisx} - -% Load the UFSC thesis settings -\usepackage{ufscthesisx/ufscthesisx.sty} - -% Load all required basic packages -\input{ufscthesisx/utilities/basic.tex} -\input{ufscthesisx/utilities/commands.tex} - -% Bad boxes settings and programming environments -\input{ufscthesisx/utilities/badboxes.tex} -\input{ufscthesisx/utilities/programming.tex} - -% Input a empty list of commands when on debug mode -\input{ufscthesisx/utilities/commands_list.tex} - -% Altere o arquivo settings.tex para incluir suas configurações. -\input{settings.tex} - -% Utilize ou altere o arquivo 'aftertext/references.bib' para incluir sua bibliografia. -\addbibresource{aftertext/references.bib} -``` -Se você inverter a ordem de inclusão do biblatex, -as citações bibliográficas não irão funcionar. - -Apesar das instruções iniciais do projeto serem para utilizar diretamente a classe `abntex2`, -existem algumas incompatibilidades com outros pacotes do LaTeX que precisam ser corrigidos. -Para isso você pode utilizar você pode incluir o arquivo `setup.tex` que faz as correções do `abntex2`. - -Uma maneira de utilizar esse *template*, -caso você seja usuário de `git`, -é fazer o clone desse repositório como um submodulo de sua tese, -e em seu arquivo principal incluir o seguinte cabeçalho para carregar os pacotes básicos mentionados acima. - - -### Mudanças - -Para ver as mudanças, acesse o histórico do `git` no endereço: -1. https://github.com/evandrocoan/ufscthesisx-setup/commits/master - -Ou clone este repositório e execute seguinte comando do cliente git: -```bash -git log -``` -1. https://git-scm.com/book/en/v2/Git-Basics-Viewing-the-Commit-History - - -## Licença - -``` -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 - -É 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 -direitos de uso, cópia, modificação, mesclagem, publicar, distribuir, e permitir que as pessoas a -quem o Software seja fornecido tenham estes mesmos direitos, ambos sujeitos às seguintes condições: - -O aviso de direitos autorais acima e este aviso de permissão devem ser incluídos em todas as cópias -ou partes substanciais do Software. - -Os arquivos `chapters/intro.tex`, `chapters/chapter_1.tex` e `setup/ufscthesisx.sty` estão -licenciados sobre a licença LPPL (The Latex Project License). Portanto você deve respeitar essa -licença para esses arquivos ao invés dessa. Entretanto a condição a seguir continuará valendo sobre -esses arquivos licenciados pela licença LPPL: - -OS ARQUIVOS NESTE REPOSITÓRIO SÃO FORNECIDOS "NO ESTADO EM QUE SE ENCONTRAM", SEM GARANTIA DE -QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO ÀS GARANTIAS DE -COMERCIALIZAÇÃO, APTIDÃO PARA UM PROPÓSITO ESPECÍFICO E NÃO INFRACÇÃO. EM NENHUMA CIRCUNSTÂNCIA, OS -AUTORES OU TITULARES DE DIREITOS AUTORAIS SERÃO RESPONSÁVEIS POR QUALQUER RECLAMAÇÃO, DANOS OU OUTRA -RESPONSABILIDADE, SEJA EM AÇÃO DE CONTRATO, DELITO OU DE OUTRA FORMA, DECORRENTE, DESTE OU -RELACIONADO COM DOS ARQUIVOS DESTE REPOSITÓRIO OU O USO OU OUTRAS NEGOCIAÇÕES NO MODELO E SOFTWARE. -``` - - - - diff --git a/setup/beforetext.tex b/setup/beforetext.tex deleted file mode 100644 index e9f7b77..0000000 --- a/setup/beforetext.tex +++ /dev/null @@ -1,169 +0,0 @@ - - -% 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} - - -% O preambulo deve conter tipo do trabalho, objetivo, nome da instituição e a área de concentração. -\preambulo -{% - \imprimirtipotrabalho~\ifnotdefined\tcc{submetida}{submetido} ao \imprimirprograma~da \imprimirinstituicao~para a obtenção do Grau de \imprimirformacao. -} - -% ELEMENTOS PRÉ-TEXTUAIS -\ifforcedinclude\else - % pretextual settings - \pretextual - - % Capa - % \includepdf{pictures/FrenteCapaUFSC.pdf} - \imprimircapa - - % Folha de rosto (o * indica que haverá a ficha bibliográfica) - \imprimirfolhaderosto* -\fi - -% Inserir a ficha bibliografica -% -% Isto é um exemplo de Ficha Catalográfica, ou ``Dados internacionais de -% catalogação-na-publicação''. Você pode utilizar este modelo como referência. -% Porém, provavelmente a biblioteca da sua universidade lhe fornecerá um PDF -% com a ficha catalográfica definitiva após a defesa do trabalho. Quando estiver -% com o documento, salve-o como PDF no diretório do seu projeto e substitua todo -% o conteúdo de implementação deste arquivo pelo comando abaixo: -\include{beforetext/fichacatalografica} -\ifforcedinclude\else\cleardoublepage\fi - -% Custom list throw LaTeX Error: Command \mycustomfiction already defined? -% https://tex.stackexchange.com/questions/388489/custom-list-throw-latex-error-command-mycustomfiction-already-defined/ -% \ifforcedinclude\else - % Manually add the `\textpreliminarycontents` to the Table of Contents here - % to keep the hyper link pointing to the beginning of the page, instead of - % the beginning of `\textpreliminarycontents` - % - % When do I need to invoke \phantomsection? - % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection - % \phantomsection - % \addcontentsline{toc}{chapter}{\mytextpreliminarylistname} - - % \begin{KeepFromToc} - % \textpreliminarycontents - % \end{KeepFromToc} -% \fi - -% Inserir errata - -% Inserir folha de aprovação. Isto é um exemplo de Folha de aprovação, elemento obrigatório da -% NBR 14724/2011 (seção 4.2.1.3). Você pode utilizar este modelo até a aprovação do trabalho. -% Após isso, substitua todo o conteúdo deste arquivo por uma imagem da página assinada pela banca com o comando abaixo: - -\ifforcedinclude\else\cleardoublepage\fi -\include{beforetext/folhadeaprovacao} -% \includepdf{folhadeaprovacao_final.pdf} - - -% Dedicatória -\ifforcedinclude\else\cleardoublepage\fi -\ifforcedinclude\else\input{beforetext/dedicatoria}\fi - -% Agradecimentos -\ifforcedinclude\else\cleardoublepage\fi -\include{beforetext/agradecimentos} - -% Epígrafe -\ifforcedinclude\else\cleardoublepage\fi -\include{beforetext/epigrafe} - - -% Ajusta o espaçamento dos parágrafos do resumo -\setlength{\absparsep}{18pt} - -% RESUMOS -\ifforcedinclude\else\cleardoublepage\fi -\include{beforetext/resumos} - -% Some tables of contents -\ifforcedinclude\else - % inserir lista de figuras - \ifforcedinclude\else\cleardoublepage\fi - \addtotextpreliminarycontent{\listfigurename} - \pdfbookmark[0]{\listfigurename}{lof} - \listoffigures* - - % inserir lista de quadros - \ifforcedinclude\else\cleardoublepage\fi - \addtotextpreliminarycontent{\lang{List of Data Frames}{Lista de Quadros}} - \pdfbookmark[0]{Lista de Quadros}{lob} - \listofboards* - - % inserir lista de tabelas - \ifforcedinclude\else\cleardoublepage\fi - \addtotextpreliminarycontent{\lang{List of Tables}{Lista de Tabelas}} - \pdfbookmark[0]{\listtablename}{lot} - \listoftables* - - % inserir códigos fonte (List of Listings `lol`) - \ifforcedinclude\else\cleardoublepage\fi - \addtotextpreliminarycontent{\lang{List of Source Codes}{Lista de Códigos Fonte}} - \pdfbookmark[0]{\lstlistingname}{lol} - \lstlistoflistings* -\fi - - -% inserir lista de abreviaturas e siglas -\ifforcedinclude\else\cleardoublepage\fi -\include{beforetext/siglas} - -% Inserir lista de símbolos -\ifforcedinclude\else\cleardoublepage\fi -\include{beforetext/simbolos} - -% Add the table of contents to the brief table of contents -\addtotextpreliminarycontent{\lang{Table of Contents}{Sumário}} - -% How to remove the self-reference of the ToC from the ToC? -% https://tex.stackexchange.com/questions/10943/how-to-remove-the-self-reference-of-the-toc-from-the-toc -\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/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} - - \tableofcontents - } - -\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/setup/makefile.mk b/setup/makefile.mk deleted file mode 100644 index ce49382..0000000 --- a/setup/makefile.mk +++ /dev/null @@ -1,213 +0,0 @@ -#!/usr/bin/make -f -# https://stackoverflow.com/questions/7123241/makefile-as-an-executable-script-with-shebang -ECHOCMD:=/bin/echo -e - -# The main latex file -THESIS_MAIN_FILE := main - -# This will be the pdf generated -THESIS_OUTPUT_NAME := thesis - -# This is the folder where the temporary files are going to be -CACHE_FOLDER := setup/cache - -# Find all files ending with `main.tex` -LATEX_SOURCE_FILES := $(wildcard *main.tex) - -# Create a new variable within all `LATEX_SOURCE_FILES` file names ending with `.pdf` -LATEX_PDF_FILES := $(LATEX_SOURCE_FILES:.tex=.pdf) - -# https://stackoverflow.com/questions/24005166/gnu-make-silent-by-default -MAKEFLAGS += --silent -GITIGNORE_PATH := .gitignore -.PHONY: all help biber start_timer biber_hook pdflatex_hook1 pdflatex_hook2 latex thesis verbose clean - -# http://stackoverflow.com/questions/1789594/how-do-i-write-the-cd-command-in-a-makefile -.ONESHELL: - -# Default target -all: thesis - - -## -## Usage: -## make -## -## Targets: -## all call the `thesis` make rule -## biber build the main file with bibliography pass -## latex build the main file with no bibliography pass -## thesis completely build the main file with minimum output logs -## verbose completely build the main file with maximum output logs -## clean remove all cache folders and generated pdf files -## veryclean same as `clean`, but searches for all generated files outside -## the cache folders. -## - -# Print the usage instructions -# https://gist.github.com/prwhite/8168133 -help: - @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' - - -# https://tex.stackexchange.com/questions/91592/where-to-find-official-and-extended-documentation-for-tex-latexs-commandlin -# https://tex.stackexchange.com/questions/52988/avoid-linebreaks-in-latex-console-log-output-or-increase-columns-in-terminal -PDF_LATEX_COMMAND = pdflatex --time-statistics --synctex=1 -halt-on-error -file-line-error --max-print-line=10000 -LATEX = $(PDF_LATEX_COMMAND)\ ---interaction=batchmode\ --output-directory="$(CACHE_FOLDER)"\ --aux-directory="$(CACHE_FOLDER)" - - -# Copies the PDF to the current folder -define copy_resulting_pdf= -cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf $(current_dir)/$(THESIS_OUTPUT_NAME).pdf -# cp $(CACHE_FOLDER)/$(THESIS_MAIN_FILE).pdf /cygdrive/D/User/Downloads/$(THESIS_OUTPUT_NAME).pdf -endef - -# Calculate the elapsed seconds and print them to the screen -define print_results = -. ./setup/scripts/timer_calculator.sh -showTheElapsedSeconds "$(current_dir)" -echo "$(CACHE_FOLDER)/main.log:10000000 " -endef - -define setup_envinronment = -. ./setup/scripts/timer_calculator.sh -$(eval current_dir := $(shell pwd)) echo $(current_dir) > /dev/null -endef - -# Run pdflatex, biber, pdflatex -biber: start_timer biber_hook pdflatex_hook2 - $(setup_envinronment) - $(copy_resulting_pdf) - $(print_results) - - -start_timer: - # Start counting the elapsed seconds to print them to the screen later - . ./setup/scripts/timer_calculator.sh - - -# Internally called rule which does not attempt to show the elapsed time -biber_hook: - $(setup_envinronment) - - # Enters to the thesis folder to build the files - cd ./$(THESIS_FOLDER) - - # Call biber to process the bibliography - echo "Running biber quietly..." - - # https://www.mankier.com/1/biber --debug - biber --quiet --input-directory="$(CACHE_FOLDER)" --output-directory="$(CACHE_FOLDER)" $(THESIS_MAIN_FILE).bcf - - -# https://stackoverflow.com/questions/46135614/how-to-call-makefile-recipe-rule-multiple-times -pdflatex_hook1 pdflatex_hook2: - @$(LATEX) $(LATEX_SOURCE_FILES) - - -# This rule will be called for every latex file and pdf associated -latex: $(LATEX_PDF_FILES) - $(setup_envinronment) - - # Calculate the elapsed seconds and print them to the screen - $(print_results) - - -# Dynamically generated recipes for all PDF and latex files -%.pdf: %.tex - $(setup_envinronment) - - @$(LATEX) $< - $(copy_resulting_pdf) - - -# MAIN LATEXMK RULE -# -# -pdf tells latexmk to generate PDF directly (instead of DVI). -# -# -pdflatex="" tells latexmk to call a specific backend with specific options. -# -# -use-make tells latexmk to call make for generating missing files. When after a run of latex or -# pdflatex, there are warnings about missing files (e.g., as requested by the LaTeX \input, -# \include, and \includgraphics commands), latexmk tries to make them by a custom dependency. If no -# relevant custom dependency with an appropriate source file is found, and if the -use-make option -# is set, then as a last resort latexmk will try to use the make program to try to make the missing -# files. -# -# -interaction=nonstopmode keeps the pdflatex backend from stopping at a missing file reference and -# interactively asking you for an alternative. -# -# https://www.ctan.org/pkg/latexmk -# http://docs.miktex.org/manual/texfeatures.html#auxdirectory -thesis: - $(setup_envinronment) - - # https://tex.stackexchange.com/questions/258814/what-is-the-difference-between-interaction-nonstopmode-and-halt-on-error - # https://tex.stackexchange.com/questions/25267/what-reasons-if-any-are-there-for-compiling-in-interactive-mode - latexmk \ - --pdf \ - --silent \ - --output-directory="$(CACHE_FOLDER)" \ - --aux-directory="$(CACHE_FOLDER)" \ - --pdflatex="$(PDF_LATEX_COMMAND) --interaction=batchmode" \ - $(THESIS_MAIN_FILE).tex - - $(copy_resulting_pdf) - $(print_results) - - -verbose: - $(setup_envinronment) - - # https://tex.stackexchange.com/questions/258814/what-is-the-difference-between-interaction-nonstopmode-and-halt-on-error - # https://tex.stackexchange.com/questions/25267/what-reasons-if-any-are-there-for-compiling-in-interactive-mode - latexmk \ - --pdf \ - --output-directory="$(CACHE_FOLDER)" \ - --aux-directory="$(CACHE_FOLDER)" \ - --pdflatex="$(PDF_LATEX_COMMAND) --interaction=nonstopmode" \ - $(THESIS_MAIN_FILE).tex - - $(copy_resulting_pdf) - $(print_results) - - -clean: - $(RM) -rv $(CACHE_FOLDER) - $(RM) -v $(THESIS_OUTPUT_NAME).pdf - - -# https://stackoverflow.com/questions/4210042/exclude-directory-from-find-command -DIRECTORIES_TO_CLEAN := $(shell /bin/find -not -path "./**.git**" -not -path "./pictures**" -type d) - -# https://stackoverflow.com/questions/55527923/how-to-stop-makefile-from-expanding-my-shell-output -RAW_GITIGNORE_CONTENTS := $(shell while read -r line; do printf "$$line "; done < "$(GITIGNORE_PATH)") -GITIGNORE_CONTENTS := $(shell echo "$(RAW_GITIGNORE_CONTENTS)" | sed -E $$'s/[^\#]+\# //g') - -# https://stackoverflow.com/questions/10586153/split-string-into-an-array-in-bash -# https://stackoverflow.com/questions/11289551/argument-list-too-long-error-for-rm-cp-mv-commands -# https://stackoverflow.com/questions/55545253/how-to-expand-wildcard-inside-shell-code-block-in-a-makefile -veryclean: veryclean_hidden clean -veryclean_hidden: - readarray -td' ' GARBAGE_DIRECTORIES <<<"$(DIRECTORIES_TO_CLEAN) "; \ - unset 'GARBAGE_DIRECTORIES[-1]'; \ - declare -p GARBAGE_DIRECTORIES; \ - readarray -td' ' GARBAGE_EXTENSIONS <<<"$(GITIGNORE_CONTENTS) "; \ - unset 'GARBAGE_EXTENSIONS[-1]'; \ - declare -p GARBAGE_EXTENSIONS; \ - for filename in "$${GARBAGE_DIRECTORIES[@]}"; \ - do \ - arraylength="$${#GARBAGE_EXTENSIONS[@]}"; \ - printf 'Cleaning %s extensions on %s\n' "$${arraylength}" "$$filename"; \ - for extension in "$${GARBAGE_EXTENSIONS[@]}"; \ - do \ - [[ ! -z "$$filename" ]] || continue; \ - [[ ! -z "$$extension" ]] || continue; \ - full_expression="$${filename}/$${extension}" ;\ - rm -vf $${full_expression}; \ - done; \ - done; - diff --git a/setup/scripts b/setup/scripts deleted file mode 160000 index b3f676d..0000000 --- a/setup/scripts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b3f676d40dec43b21af86cdbd904769a66d845fb diff --git a/setup/setup.tex b/setup/setup.tex deleted file mode 100644 index f4b1da3..0000000 --- a/setup/setup.tex +++ /dev/null @@ -1,84 +0,0 @@ -%---------------------------------------------------------------------------------------- -% PACKAGES AND OTHER DOCUMENT CONFIGURATIONS BEFORE LOADING abntex2 -%---------------------------------------------------------------------------------------- - -% For web links and paths with \path{..} and \url{https://www.python.org/downloads/} -% ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/hyperref/doc/options.pdf -% https://tex.stackexchange.com/questions/3033/forcing-linebreaks-in-url -% https://tex.stackexchange.com/questions/124049/applying-options-to-already-loaded-package -\PassOptionsToPackage{hyphens}{url} - -% Use its macro adjustwidth* to extend tables out of outer text border. -% https://tex.stackexchange.com/questions/366155/how-to-write-a-table-a-little-larger-than-the-paragraphs-with-centered-columns -\PassOptionsToPackage{strict}{changepage} - -% Linked footnotes are not supported inside environment `tabularx', because they -% uses the optional argument of \footnotetext -% http://ctan.sharelatex.com/tex-archive/macros/latex/contrib/hyperref/README.pdf -\PassOptionsToPackage{hyperfootnotes=false}{hyperref} - -% The class `abntex2` loads the `enumitem` package with options. -% With the package option shortlabels you can use an enumerate-like syntax, where A, a, I, i and 1 -% stand for \Alph*, \alph*, \Roman*, \roman* and \arabic*. This is intended mainly as a sort of -% compatibility mode with the enumerate package, and therefore the following special rule applies: -% if the very first option (at any level) is not recognized as a valid key, then it will be -% considered a label with the enumerate-like syntax. -% https://tex.stackexchange.com/questions/119919/no-spacing-between-enumerated-items-with-usepackageenumerate -\PassOptionsToPackage{shortlabels}{enumitem} - -% Fixes `pdfTeX warning (ext4): destination with the same identifier (name{figure.1.1}) has been -% already used, duplicate ignored`. -% -% The `abntex2` package loads the `hyperref` package, however there are several packages which are -% required to be loaded after and before `hyperref`. -% -% https://tex.stackexchange.com/questions/1863/which-packages-should-be-loaded-after-hyperref-instead-of-before -% https://tex.stackexchange.com/questions/50846/hyperref-is-loaded-by-the-class-and-i-need-to-load-packages-that-are-supposed-t -% https://tex.stackexchange.com/questions/51094/using-beforepackage-to-load-a-package-before-hyperref-does-not-work -\RequirePackage{scrlfile} -\AfterClass{memoir} -{ - \RequirePackage{float} -} - -% The class `abntex2` loads the package `enumitem`, but `paralist` must be loaded before it -% https://tex.stackexchange.com/questions/162799/compilation-error-when-including-enumitem-and-paralist-packages -\AfterClass{memoir} -{ - % How to make horizontal lists? - % https://tex.stackexchange.com/questions/146306/how-to-make-horizontal-lists - \RequirePackage{paralist} -} - -% https://tex.stackexchange.com/questions/6529/newline-linebreak-in-message -% https://tex.stackexchange.com/questions/383054/biblatex-error-incompatible-backref-package -% https://tex.stackexchange.com/questions/115828/backreferencing-in-classicthesis-package-does-not-work -% https://tex.stackexchange.com/questions/390349/why-my-biblatex-document-is-not-accepting-utf-8-on-the-bibliography -% https://tex.stackexchange.com/questions/55478/how-to-print-out-to-log-without-affecting-anything-else-lua-print-equiv -% https://tex.stackexchange.com/questions/483570/how-to-detect-whether-passoptionstopackage-was-already-called -\ifcsname opt@biblatex.sty\endcsname - \message{Options have already been passed or the biblatex package has already been loaded!^^J} -\else - \message{No options have been passed yet for biblatex!^^J} - \PassOptionsToPackage{style=abnt,backend=biber,backref=true,citecounter=true}{biblatex} -\fi - -\AfterClass{memoir} -{ - \RequirePackage{biblatex} -} - -% Package longtable must be put before hyperref and arydshln, hyperref after arydshln generates an error -% http://ctan.sharelatex.com/tex-archive/macros/latex/contrib/hyperref/README.pdf -\AfterClass{memoir} -{ - \RequirePackage{longtable} -} - -% https://tex.stackexchange.com/questions/391993/how-to-silence-memoir-class-warning-against-the-use-of-caption-package -\RequirePackage{silence} -\WarningFilter*{memoir}{You are using the caption package with the memoir class} - -% https://tex.stackexchange.com/questions/402676/can-i-silence-a-warning-which-is-coming-from-a-file-like-bigfoot-sty -\WarningFilter*{hyperref}{Option `hyperfootnotes' has already been used} - diff --git a/setup/ufscthesisx.sty b/setup/ufscthesisx.sty deleted file mode 100644 index acfa418..0000000 --- a/setup/ufscthesisx.sty +++ /dev/null @@ -1,716 +0,0 @@ -%% setup/ufscthesisx.sty -%% -%% Copyright 2017 Evandro Coan -%% Copyright 2012-2016 by abnTeX2 group at https://www.abntex.net.br/ -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status `maintained'. -%% The Current Maintainer of this work is the Evandro Coan. -%% -%% The last Maintainer of this work was the abnTeX2 team, led -%% by Lauro César Araujo. Further information are available on -%% https://www.abntex.net.br/ -%% -%% This work consists of the file `abntex2-ufsc.sty` renamed as follows: -%% Renamed the `abntex2.cls, v-1.9.6 laurocesar` to `setup/ufscthesisx.sty` -%% - -% Define versão necessária do LaTeX -\NeedsTeXFormat{LaTeX2e} - -% How can I properly resolve relative paths in `\usepackage`? -% https://tex.stackexchange.com/questions/123999/how-can-i-properly-resolve-relative-paths-in-usepackage -% -% Commenting this allow to use this as a relative package, with no warnings. -% \ProvidesPackage{ufscthesisx}[2017/08/28 v0.0.1 Evandro] - -% Now we'll execute any options passed in -\ProcessOptions\relax - - -% Custom list throw LaTeX Error: Command \mycustomfiction already defined? -% https://tex.stackexchange.com/questions/388489/custom-list-throw-latex-error-command-mycustomfiction-already-defined -\RequirePackage{morewrites} - - - -% Package csquotes Warning: Load 'inputenc' before 'csquotes' -\RequirePackage[utf8]{inputenc} -\RequirePackage[T1]{fontenc} - -% Package biblatex Warning: 'babel/polyglossia' detected but 'csquotes' missing -% https://tex.stackexchange.com/questions/229638/package-biblatex-warning-babel-polyglossia-detected-but-csquotes-missing -\RequirePackage{csquotes} - -% Indent the first section paragraphs -% https://tex.stackexchange.com/questions/39227/no-indent-in-the-first-paragraph-in-a-section -\RequirePackage{indentfirst} - -% Is it possible to keep my translation together with original text? -% https://tex.stackexchange.com/questions/5076/is-it-possible-to-keep-my-translation-together-with-original-text -\RequirePackage{comment} - -% Please tutor the usage of patchcmd and xpatch -% https://tex.stackexchange.com/questions/152773/please-tutor-the-usage-of-patchcmd-and-xpatch -\RequirePackage{xpatch} - -% Why the environment ttfamily is hyphenated, but macro ttfamily is not hyphenating? -% https://tex.stackexchange.com/questions/387678/why-the-environment-ttfamily-is-hyphenated-but-macro-ttfamily-is-not-hyphenatin -\RequirePackage{letltxmacro} - -% Theorem packages: which to use, which conflict? -% https://tex.stackexchange.com/questions/5599/theorem-packages-which-to-use-which-conflict -\RequirePackage{amsthm} - -% Why is the ifthen package obsolete? (It is used by the abntex2 class) -% https://tex.stackexchange.com/questions/13866/why-is-the-ifthen-package-obsolete -\RequirePackage{ifthen} - -% How to make section name uppercase in ToC? -% https://tex.stackexchange.com/questions/156916/how-to-make-section-name-uppercase-in-toc -\RequirePackage{textcase} - -% The class memoir already provides these functionalities: Caption package and Memoir -% https://groups.google.com/forum/#!topic/comp.text.tex/RzpI2ATMev0 -% https://tex.stackexchange.com/questions/18931/memoir-class-with-subcaption-and-hyperref-packages -% \RequirePackage{caption} -% \RequirePackage{subfig} -% \RequirePackage{etoolbox} - -% The package `layouts` causes the: Warning: layout scale set to 0.5 on input line -% https://tex.stackexchange.com/questions/299372/warning-layout-scale-set-to-0-5-on-input-line -% \RequirePackage{layouts} - - -% Always use it as should improve full justification -% https://tex.stackexchange.com/questions/10377/texttt-overfull-hbox-problem -% https://tex.stackexchange.com/questions/66052/should-i-load-microtype-with-pdflatex -\RequirePackage{microtype} - -% https://tex.stackexchange.com/questions/482886/how-to-add-babel-captions-to-newfloat-package-environments -\RequirePackage{newfloat} - -% How to auto adjust my last table column width, and why is there Underfull \vbox badness on this table? -% https://tex.stackexchange.com/questions/387238/how-to-auto-adjust-my-last-table-column-width-and-why-is-there-underfull-vbox/387251 -% -% Why ltablex package breaks the changepage package? -% https://tex.stackexchange.com/questions/404339/why-ltablex-package-breaks-the-changepage-package -\RequirePackage{ltablex}\keepXColumns - - -% CONFIGURAÇÕES DE PACOTES -\newcommand{\ifnotempty}[2]{\ifthenelse{\not\equal{#1}{}}{#2}{}} -\newcommand{\ifnotdefined}[3]{\ifdefined #1 #3 \else #2 \fi} - -% Comandos de dados - programa -\providecommand{\imprimirprograma}{} -\newcommand{\programa}[1]{\renewcommand{\imprimirprograma}{#1}} - -\providecommand{\imprimirformacao}{} -\newcommand{\formacao}[1]{\renewcommand{\imprimirformacao}{#1}} - -\providecommand{\imprimirarea}{} -\newcommand{\area}[1]{\renewcommand{\imprimirarea}{#1}} - -\providecommand{\imprimirbiblioteca}{} -\newcommand{\biblioteca}[1]{\renewcommand{\imprimirbiblioteca}{#1}} - -\providecommand{\imprimirinstituicaosigla}{} -\newcommand{\instituicaosigla}[1]{\renewcommand{\imprimirinstituicaosigla}{#1}} - -\providecommand{\imprimirano}{} -\newcommand{\ano}[1]{\renewcommand{\imprimirano}{#1}} - - -% Comandos de dados - Coordenador -\newcommand{\coordenadorname}{Coordenador} -\providecommand{\imprimircoordenadorRotulo}{} -\providecommand{\imprimircoordenador}{} -\newcommand{\coordenador}[2][\coordenadorname]% - {\renewcommand{\imprimircoordenadorRotulo}{#1}% - \renewcommand{\imprimircoordenador}{#2}} - - -% inclui subtitulo na capa, folha de rosto e ficha catalografica -% https://github.com/lrsantos11/abntex2-ufsc/commit/fd30245353dcc49e193d281c78104afe54df9fe7 -% -% Cria o comando \subtitulo. A norma define que o TITULO deve ser em caixa alta -% negrito, mas o subtitulo deve ser em caixa baixa. -\providecommand{\imprimirsubtitulo}{} -\newcommand{\subtitulo}[1]{\renewcommand{\imprimirsubtitulo}{#1}} - -\newcounter{ufscthesisx@assuntos} -\providecommand{\listaassuntos}{} -\providecommand{\imprimirassuntos} -{% - \setcounter{ufscthesisx@assuntos}{1} - \@for\assunto:={\listaassuntos}\do - {% - \arabic{ufscthesisx@assuntos}.\assunto. % - \addtocounter{ufscthesisx@assuntos}{1} - } -} -\newcommand{\assuntos}[1]{\renewcommand{\listaassuntos}{#1}} - -\providecommand{\imprimircentro}{} -\newcommand{\centro}[1]{\renewcommand{\imprimircentro}{#1}} - - -\newtheorem{axioma}{Axioma}[chapter] -\newtheorem{postulado}{Postulado}[chapter] -\newtheorem{teorema}{Teorema}[chapter] -\newtheorem{conjectura}{Conjectura}[chapter] -\newtheorem{corolario}[teorema]{Corol\'ario} -\newtheorem{lema}[teorema]{Lema} -\newtheorem{proposicao}[teorema]{Proposi\c{c}\~ao} - - -% Commonly used in definitions, conditions, problems and examples. -\theoremstyle{definition} -\newtheorem{definicao}{Defini\c{c}\~ao}[chapter] -\newtheorem{exemplo}{Exemplo}[section] -\newtheorem{exercicio}{Exerc\'icio}[section] -\newtheorem{condicao}{Condi\c{c}\~ao}[chapter] - - -\theoremstyle{remark} -\newtheorem{observacao}{Observa\c{c}\~ao} - -\renewcommand{\qedsymbol}{$\blacksquare$} - - - -% Margens -\setlrmarginsandblock{2.5cm}{1.5cm}{*} -\setulmarginsandblock{2cm}{1.5cm}{*} -\checkandfixthelayout - - -% \def\autorefname{} -\renewcommand{\tableautorefname}{Tabela} -\renewcommand{\figureautorefname}{Figura} -\renewcommand{\chapterautorefname}{Cap\'itulo} -\renewcommand{\equationautorefname}{Equa\c{c}\~ao} - - - -% Fontes dos títulos e seções -% -% Tamanho da fonte padrão do 'ABNTEX' -\renewcommand{\normalsize}{\fontsize{10.5pt}{11pt}} - -% \renewcommand{\chapnumfont}{\chaptitlefont} -% \renewcommand{\parttitlefont}{\ABNTEXpartfont\ABNTEXpartfontsize} -% \renewcommand{\partnumfont}{\ABNTEXpartfont\ABNTEXpartfontsize} -% \renewcommand{\partnamefont}{\ABNTEXpartfont\ABNTEXpartfontsize} - -% Caption package and Memoir -% https://groups.google.com/forum/#!topic/comp.text.tex/RzpI2ATMev0 -% https://tex.stackexchange.com/questions/18931/memoir-class-with-subcaption-and-hyperref-packages -% \DeclareCaptionFont{small}{\fontsize{9.5pt}{10.5pt}} -% -% Set caption font size in memoir -% https://tex.stackexchange.com/questions/58943/set-caption-font-size-in-memoir -\newcommand{\ufsccaptionsize}{\fontsize{9.5pt}{10.5pt}\selectfont} -\captionnamefont{\ufsccaptionsize} -\captiontitlefont{\ufsccaptionsize} - -% Set the UFSC epigrafe font size -% -% Changing font size in an example environment -% https://tex.stackexchange.com/questions/123528/changing-font-size-in-an-example-environment -\expandafter\def\expandafter\epigrafe\expandafter{\epigrafe\ufsccaptionsize} - -% Fonte padrão utilizada no texto -% http://tug.org/fonts/ -% -% The three default family font variables and the \familydefault variable should not be confused with their respective switch: -% http://www.forkosh.com/pstex/latexcommands.htm -% -% variable value activated by -\renewcommand{\familydefault}{cmr} - -%\encodingdefault OT1 \normalfont, \textnormal{} -%\familydefault \rmdefault \normalfont, \textnormal{} -%\rmdefault cmr \rmfamily, \textrm{} -%\ttdefault cmtt \ttfamily, \texttt{} -%\sfdefault cmss \sffamily, \textsf{} -%\seriesdefault m \normalfont, \textnormal{} -%\mddefault m \mdseries, \textmd{} -%\bfdefault bx \bfseries, \textbf{} -%\shapedefault n \normalfont, \textnormal{} -%\updefault n \upshape, \textup{} -%\itdefault it \itshape, \textit{} -%\scdefault sc \scshape, \textsc{} -%\sldefault sl \slshape, \textsl{} - - -% Selects a roman (i.e., serifed) font family -\renewcommand{\rmdefault}{cmr} - -% Selects a sans serif font family -% \renewcommand{\sfdefault}{cmss} - -% Selects a monospaced (“typewriter”) font family -% \renewcommand{\ttdefault}{cmtt} - -% Fontes padroes de part, chapter, section, subsection e subsubsection -\renewcommand{\ABNTEXchapterfont}{\usefont{T1}{cmr}{bx}{n}} -\renewcommand{\ABNTEXchapterfontsize}{\fontsize{10.5pt}{12pt}} - -\renewcommand{\ABNTEXpartfont}{\usefont{T1}{cmr}{bx}{n}} -\renewcommand{\ABNTEXpartfontsize}{\fontsize{15pt}{18pt}} - -\renewcommand{\ABNTEXsectionfont}{\usefont{T1}{cmr}{m}{n}} -\renewcommand{\ABNTEXsectionfontsize}{\fontsize{10.5pt}{12pt}} - -\renewcommand{\ABNTEXsubsectionfont}{\usefont{T1}{cmr}{b}{n}} -\renewcommand{\ABNTEXsubsectionfontsize}{\fontsize{10.5pt}{12pt}} - -\renewcommand{\ABNTEXsubsubsectionfont}{\usefont{T1}{cmr}{m}{n}} -\renewcommand{\ABNTEXsubsubsectionfontsize}{\fontsize{10.5pt}{12pt}} - -\renewcommand{\ABNTEXsubsubsubsectionfont}{\usefont{T1}{cmr}{m}{it}} -\renewcommand{\ABNTEXsubsubsubsectionfontsize}{\fontsize{10.5pt}{12pt}} - - -% Comando que simula a finalizacao de uma parte no bookmark e -% adiciona espaco de \part no sumario -\renewcommand{\phantompart} -{% - \bookmarksetup{startatroot}% - \phantomsection% - \addtocontents{toc}{\vspace{0em}} -} - -% TOC Spacing in Memoir -% https://tex.stackexchange.com/questions/60317/toc-spacing-in-memoir -\setlength{\cftbeforechapterskip}{12pt} - - -% Fontes das entradas do sumario -% -% How to make the table of contents section title upper case without messing with the space between the chapter and section? -% https://tex.stackexchange.com/questions/399828/how-to-make-the-table-of-contents-section-title-upper-case-without-messing-with -% -% How to make section name uppercase in ToC? -% https://tex.stackexchange.com/questions/156916/how-to-make-section-name-uppercase-in-toc -\let\oldcontentsline\contentsline -\def\contentsline#1#2{% - \expandafter\ifx\csname l@#1\endcsname\l@section - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi - {% - \oldcontentsline{#1}{\MakeTextUppercase{#2}}% - }{% - \oldcontentsline{#1}{#2}% - }% -} - - -% No caso de Sumario (TOC) UFSC -% -% Memoir has another mechanism for the job: \cftsetindents{‹kind›}{indent}{numwidth}. Here kind is -% chapter, section, or whatever; the indent specifies the ‘margin’ before the entry starts; and the -% width is of the box into which the number is typeset (so needs to be wide enough for the largest -% number, with the necessary spacing to separate it from what comes after it in the line. -% http://www.tex.ac.uk/FAQ-tocloftwrong.html -% -% memoir: indentation of unnumbered sections in table of contents -% https://tex.stackexchange.com/questions/264668/memoir-indentation-of-unnumbered-sections-in-table-of-contents -% -% Memoir ToC: indent the second line by number+space width in the previous line OR set standard -% https://tex.stackexchange.com/questions/394227/memoir-toc-indent-the-second-line-by-numberspace - -% `\cftlastnumwidth` and these `\cftsetindents` are defined by the abntex2 class, -% obeying the `ABNTEXsumario-abnt-6027-2012`. \newlength{\cftlastnumwidth} -\setlength{\cftlastnumwidth}{\cftsubsubsectionnumwidth} -\addtolength{\cftlastnumwidth}{1em} - -% http://www.tex.ac.uk/FAQ-tocloftwrong.html -% Use \setlength\cftsectionnumwidth{4em} to override all these values -\cftsetindents{part} {0em}{\cftlastnumwidth} -\cftsetindents{chapter} {0em}{\cftlastnumwidth} -\cftsetindents{section} {0em}{\cftlastnumwidth} -\cftsetindents{subsection} {0em}{\cftlastnumwidth} -\cftsetindents{subsubsection}{0em}{\cftlastnumwidth} -\cftsetindents{paragraph} {0em}{\cftlastnumwidth} -\cftsetindents{subparagraph} {0em}{\cftlastnumwidth} - -\newlength{\cftnumberboxnumberwidth} -\setlength{\cftnumberboxnumberwidth}{2em} -\renewcommand{\tocprintchapter} -{% - \addtocontents{toc}{\cftsetindents{chapter}{0em}{\cftlastnumwidth}} -} -% -\renewcommand{\tocinnonumchapter} -{% - \addtocontents{toc}{\cftsetindents{chapter}{\cftlastnumwidth}{\cftnumberboxnumberwidth}}% - \cftinserthook{toc}{A} -} -\renewcommand{\tocprintchapternonum} -{% - \addtocontents{toc}{\cftsetindents{chapter}{\cftlastnumwidth}{\cftnumberboxnumberwidth}} -} -% -\renewcommand{\tocpartapendices} -{% - \addtocontents{toc}{\cftsetindents{chapter}{\cftlastnumwidth}{\cftnumberboxnumberwidth}} - \cftinserthook{toc}{A} -} -% -\renewcommand{\tocpartanexos} -{% - \addtocontents{toc}{\cftsetindents{chapter}{\cftlastnumwidth}{\cftnumberboxnumberwidth}} - \cftinserthook{toc}{A} -} - -\renewcommand{\cftpartfont}{\ABNTEXpartfont} -\renewcommand{\cftpartpagefont}{\cftpartfont} - -\renewcommand{\cftchapterfont}{\ABNTEXchapterfont} -\renewcommand{\cftchapterpagefont}{\cftchapterfont} - -\renewcommand{\cftsectionfont}{\ABNTEXsectionfont} -\renewcommand{\cftsectionpagefont}{\cftsectionfont} - -\renewcommand{\cftsubsectionfont}{\ABNTEXsubsectionfont} -\renewcommand{\cftsubsectionpagefont}{\cftsubsectionfont} - -\renewcommand{\cftsubsubsectionfont}{\ABNTEXsubsubsectionfont} -\renewcommand{\cftsubsubsectionpagefont}{\cftsubsubsectionfont} - -\renewcommand{\cftparagraphfont}{\ABNTEXsubsubsubsectionfont} -\renewcommand{\cftparagraphpagefont}{\cftparagraphfont} - -% Ajusta entrada Referencias -\renewcommand{\bibsection} -{% - \chapter*{\bibname} - \bibmark - \ifnobibintoc\else - \phantomsection - \addcontentsline{toc}{chapter}{\uppercase{\bibname}} - \fi - \prebibhook -} - - -% Caption package and Memoir -% https://groups.google.com/forum/#!topic/comp.text.tex/RzpI2ATMev0 -% https://tex.stackexchange.com/questions/18931/memoir-class-with-subcaption-and-hyperref-packages -% -% \captionsetup[table]{ -% % name=Tabela, -% % listformat=empty, -% % justification=justified, -% % labelsep=colon, -% % position=above, -% % skip=\onelineskip, -% % width=\linewidth, -% labelfont={normalsize}, -% textfont={small}, -% font={normalsize} -% } - -% Caption package and Memoir -% https://groups.google.com/forum/#!topic/comp.text.tex/RzpI2ATMev0 -% https://tex.stackexchange.com/questions/18931/memoir-class-with-subcaption-and-hyperref-packages -% -% \captionsetup[figure]{ -% % name=Tabela, -% % listformat=empty, -% % justification=justified, -% % labelsep=colon, -% % position=above, -% % skip=\onelineskip, -% % width=\linewidth, -% labelfont={normalsize}, -% textfont={small}, -% font={normalsize} -% } - - -% Espaçamento depois do título -\setlength{\afterchapskip}{0.38cm} - -% Controle do espaçamento entre um parágrafo e outro. Tente também \onelineskip -\setlength{\parskip}{0.0cm} - -% O tamanho do parágrafo é dado por -\setlength{\parindent}{1.0cm} - -% Comando para inverter sobrenome e nome -\newcommand{\ufscthesisx@inverter}[1] -{% - \StrBehind{#1}{{}}, - \StrBefore{#1}{{}} -} - -% Comandos auxiliares -\newcommand{\showfont} -{% - (\foreignlanguage{english} - {% - encoding: \f@encoding{}, - family: \f@family{}, - series: \f@series{}, - shape: \f@shape{}, - size: \f@size{}, - baseline: \f@baselineskip{} - }) -} - -% Comandos auxiliares -\newcommand{\justshowfont} -{% - (\foreignlanguage{english} - {% - \f@encoding{}, - \f@family{}, - \f@series{}, - \f@shape{}, - \f@size{}, - \f@baselineskip{} - }) -} - -%Numeração dos floats por capítulo -\counterwithin{figure}{chapter} -\counterwithin{table}{chapter} - - -% Macros for Cross-reference -\newcommand{\figref}[1]{Figura~\ref{#1}} % Cross-reference of figures -\newcommand{\tabref}[1]{Tabela~\ref{#1}} % Cross-reference of tables -\newcommand{\eqnref}[1]{\eqref{#1}} % Cross-reference of equations -\newcommand{\secref}[1]{Seção~\ref{#1}} % Cross-reference of equations -\newcommand{\defref}[1]{Definição~\ref{#1}} % - - -% Ao contrario da norma abnt-6027-2012, que as figuras estejam listadas na Lista de -% Ilustrações, a UFSC pede que as figuras estejam na Lista de Figuras. -% https://tex.stackexchange.com/questions/482523/how-to-override-command-on-my-preamble-after-its-redefinition-by-my-class-with -\addto\captionsbrazil{\renewcommand{\listfigurename}{Lista de Figuras}} -\addto\captionsenglish{\renewcommand{\listfigurename}{List of Figures}} - - -\renewenvironment{resumo}[1][\resumoname] -{% - % Fixed double bookmark entries as `\pretextualchapter` bellow is already calling `\PRIVATEbookmarkthis` - % \PRIVATEbookmarkthis{#1} - % \renewcommand{\abstractnamefont}{\chaptitlefont} - % \renewcommand{\abstractname}{\ABNTEXchapterupperifneeded{#1}} - \pretextualchapter{#1} -} -{% - \PRIVATEclearpageifneeded -} - -% Fix the resumo environment, which does not accept paragraphs on ufscthesisx -% -% Changing font size in an example environment -% https://tex.stackexchange.com/questions/123528/changing-font-size-in-an-example-environment -% -% How to disable automatic indentation on new paragraphs? -% https://tex.stackexchange.com/questions/14375/how-to-disable-automatic-indentation-on-new-paragraphs -% -% How to disable paragraphs inside my environment with \let\par\relax? -% https://tex.stackexchange.com/questions/388369/how-to-disable-paragraphs-inside-my-environment-with-let-par-relax -\xapptocmd{\resumo}{\setlength{\parindent}{0pt}\let\parOriginal\par\let\par\relax}{}{} -\xpretocmd{\endresumo}{\endgraf}{}{} - -% \imprimirpalavraschave{Palavras-chaves}{latex. abntex. editoração de texto.} -\newcommand{\imprimirpalavraschave}[2]{\parOriginal\vspace{\onelineskip}\textbf{#1}: #2} - - -% ------------------------------------------------------------------------ -% ------------------------------------------------------------------------ -% Configura layout -% ------------------------------------------------------------------------ -% ------------------------------------------------------------------------ - -% ------------------------------------------------------------------------ -%% criar um novo estilo incluindo logos da UFSC -% ------------------------------------------------------------------------ - -% Configura layout para elementos textuais, redefining the ABNT command `\textual`. -% Delete his to restore the ABNT default behavior. -\renewcommand{\textual} -{% - % Estilo original do Abntex2 - \pagestyle{abntheadings} - - % Remove a numeração das páginas no início dos capítulos. - % ABNT default value `{chapter}{abntchapfirst}` - \aliaspagestyle{chapter}{empty} - - \nouppercaseheads - \bookmarksetup{startatroot} -} - - -% ------------------------------------------------------------------------ -% ------------------------------------------------------------------------ -% Comandos e ambientes de editoracao APENDICES e ANEXOS -% ------------------------------------------------------------------------ -% ------------------------------------------------------------------------ -% --- -% Imprime uma pagina de divisao no estilo parte -\renewcommand{\partpage} -{% - % \phantomsection - % \addcontentsline{toc}{part}{\appendixtocname} - \appendixpage* -} - - -% --- -% Impressão da Capa -\renewcommand{\imprimircapa} -{% - \begin{capa}% - - \center - {% - \ABNTEXchapterfont\ufsccaptionsize\MakeTextUppercase{\imprimirinstituicao} - \par\MakeTextUppercase{\imprimirautor} - } - - - \vfill - {% - \center - {\ABNTEXchapterfont\MakeUppercase{\imprimirtitulo}} - \ifnotempty{\imprimirsubtitulo}{{\ABNTEXchapterfont\!:} \par \imprimirsubtitulo} - } - \vfill - - {% - \ufsccaptionsize - \imprimirlocal - - \imprimirano - } - \vspace*{1cm} - - \end{capa} -} -% --- - - -% Conteúdo padrao da Folha de Rosto -% -% Underfull \hbox (badness 10000) message -% https://tex.stackexchange.com/questions/199635/underfull-hbox-badness-10000-message -% -% Underfull \hbox (badness …) in paragraph at lines x-y -% https://tex.stackexchange.com/questions/356110/underfull-hbox-badness-in-paragraph-at-lines-x-y -% -% How to add an empty line between paragraphs? -% https://tex.stackexchange.com/questions/135134/how-to-add-an-empty-line-between-paragraphs -\makeatletter -\renewcommand{\folhaderostocontent} -{% - \begin{center} - {\ABNTEXchapterfont\ufsccaptionsize\imprimirautor} - - \vspace*{\fill}\vspace*{\fill} - \begin{center} - - {\ABNTEXchapterfont\MakeUppercase{\imprimirtitulo}} - \abntex@ifnotempty{\imprimirsubtitulo}{{\ABNTEXchapterfont\!:} \\ \imprimirsubtitulo} - - \end{center} - \vspace*{\fill} - - \abntex@ifnotempty{\imprimirpreambulo} - {% - \hspace{.45\textwidth} - \begin{minipage}{5,5cm} - - \SingleSpacing - {\ufsccaptionsize\imprimirpreambulo} - \bigskip - - { - \ufsccaptionsize\textbf{\imprimirorientadorRotulo}:~\imprimirorientador\par - \abntex@ifnotempty{\imprimircoorientador} - { - {\textbf{\imprimircoorientadorRotulo}:~\imprimircoorientador}% - } - } - - \end{minipage} - \vspace*{\fill} - } - - \vspace*{\fill} - - {% - \ufsccaptionsize - \imprimirlocal - - \imprimirano - } - - \end{center} -} -\makeatother - -% If document class is equal to something then do not use package -% https://tex.stackexchange.com/questions/46223/if-document-class-is-equal-to-something-then-do-not-use-package -\makeatletter -\@ifclassloaded{abntex2} -{ - % Package hyperref Warning: Token not allowed in a PDF string? - % https://tex.stackexchange.com/questions/384885/package-hyperref-warning-token-not-allowed-in-a-pdf-string - \pdfstringdefDisableCommands{\let\uppercase\relax} -}{} -\makeatother - - -% https://tex.stackexchange.com/questions/329631/creating-new-captions-and-caption-counters -\def\listofboardsname{List of Frames} -\DeclareFloatingEnvironment[fileext=lob,placement={!hbtp},name=Frame,within=chapter,listname=\listofboardsname]{board} - -% https://tex.stackexchange.com/questions/482886/how-to-add-babel-captions-to-newfloat-package-environments -\addto\captionsbrazil{\renewcommand{\boardname}{Quadro}} -\addto\captionsbrazil{\renewcommand{\listofboardsname}{Lista de Quadros}} - -% https://tex.stackexchange.com/questions/176418/remove-list-of-newfloat-from-toc -\makeatletter -\newcommand{\AdjustForMemoir}[1]{% - \csletcs{kept@listof#1}{listof#1}% - \csdef{listof#1}{% - \@ifstar - {\csappto{newfloat@listof#1@hook}{\append@star}% - \csuse{kept@listof#1}}% - {\csuse{kept@listof#1}}% - } -} -\def\append@star#1{#1*} -\makeatother -\AdjustForMemoir{board} -\newlistentry{board}{lob}{0} - -% Patch the `abntex2` citacao environment removing the extra space from its top -% https://tex.stackexchange.com/questions/300340/topsep-itemsep-partopsep-and-parsep-what-does-each-of-them-mean-and-wha -\xpatchcmd{\citacao} -{\list{}} -{\list{}{\topsep=0pt}} -{} -{\PackageWarning{ufscthesisx}{Citation \topsep is not patched. The 'citacao' environment must be -patched with 'topsep=0pt' but it failed. This is probably due an update on the main class 'abnTeX2', -therefore the \topsep patch must need to be updated accordingly}} - diff --git a/setup/ufscthesisx.sublime-project b/setup/ufscthesisx.sublime-project deleted file mode 100644 index 50f68fc..0000000 --- a/setup/ufscthesisx.sublime-project +++ /dev/null @@ -1,61 +0,0 @@ -{ - "settings": - { - "TEXroot": "main.tex" - }, - "folders": - [ - { - "path": "../", - "folder_exclude_patterns": - [ - "*cache*", - ], - }, - ], - "build_systems": - [ - { - "name": "Monograph", - "cmd": ["make", "thesis"], - - "shell": true, - "working_dir": "$project_path/../", - - "target": "exec", - "syntax": "Packages/Text/Plain text.tmLanguage", - - "osx": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)"}, - "windows": { "file_regex": "^((?:.:)?[^:\n\r]*):([0-9]+):?([0-9]+)?:? (.*)$" }, - "linux": { "file_regex": "^(...*?):([0-9]+): ([0-9]*)([^\\.]+)" }, - - "variants": - [ - { - "name": "Thesis (Default)", - "cmd": ["make", "thesis"], - }, - { - "name": "Thesis Biber", - "cmd": ["make", "biber"], - }, - { - "name": "Thesis LaTeX", - "cmd": ["make", "latex"], - }, - { - "name": "Thesis Verbose", - "cmd": ["make", "thesis_verbose"], - }, - { - "name": "Thesis Clean", - "cmd": ["make", "clean"], - }, - { - "name": "Thesis Veryclean", - "cmd": ["make", "veryclean"], - }, - ], - }, - ] -} diff --git a/setup/utilities b/setup/utilities deleted file mode 160000 index fb3cd2e..0000000 --- a/setup/utilities +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fb3cd2ec82059ce151a5755409e58ae01f86fa4b diff --git a/setup/utilities.tex b/setup/utilities.tex deleted file mode 100644 index ca49154..0000000 --- a/setup/utilities.tex +++ /dev/null @@ -1,14 +0,0 @@ - - -% Load all required basic packages -\input{setup/utilities/basic} -\input{setup/utilities/commands} - -% Bad boxes settings and programming environments -\input{setup/utilities/badboxes} -\input{setup/utilities/programming} - -% Input a empty list of commands when on debug mode -\input{setup/utilities/commands_list} - - From 9bd55cae31dd92e9e243d700ea0272ed58773b5a Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 7 Apr 2019 14:04:02 -0300 Subject: [PATCH 026/148] Fixed README.md documentation definitions --- README.md | 4 ++-- main.tex | 11 +++++++---- setup | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f47752d..b089ffc 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ git clone --recursive https://github.com/ufsc/ufscthesisx ``` Este repositório já contém um exemplo de tese com uso avançado de conceitos e LaTeX. -Se você tiver interesse em utilizar esse *template*, +Se você tiver interesse em utilizar esse **template**, você precisa preencher os seus dados como nome do orientador, coorientador, seu nome, nome da sua instituição, @@ -48,7 +48,7 @@ do seu curso, departamento, etc. Para isso altere os dados fictícios para os corretos no arquivo `main.tex`, -que é o arquivo principal do *template* utilizado, +que é o arquivo principal do **template** utilizado, e carrega todos os pacotes necessários e incluir os arquivos LaTeX que contém as partes da sua monografia. diff --git a/main.tex b/main.tex index 73d422e..259a23f 100644 --- a/main.tex +++ b/main.tex @@ -54,8 +54,14 @@ section=TITLE, % Título de seções em caixa alta ]{abntex2} +% Load the UFSC thesis package \usepackage{setup/ufscthesisx} -\input{setup/utilities} + +% Load extra commands for tables, lists, summaries, etc. +\input{setup/utilities.tex} + +% % Utilize o arquivo aftertext/references.bib para incluir sua bibliografia. +\addbibresource{aftertext/references.bib} % FIXME: Descomente a linha correspondente ao seu tipo de trabalho % \def\tcc{} @@ -101,9 +107,6 @@ % Altere o arquivo 'settings.tex' para incluir customizações de aparência da sua tese \input{settings.tex} -% Utilize o arquivo aftertext/references.bib para incluir sua bibliografia. -\addbibresource{aftertext/references.bib} - % When writing a large document, it is sometimes useful to work on selected sections of the document % to speed up compilation time: https://en.wikibooks.org/wiki/TeX/includeonly \newif\ifforcedinclude\forcedincludefalse diff --git a/setup b/setup index 961bb3a..8c8a6e2 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 961bb3a4d50103d774d4155ce9958ca73a79fcf9 +Subproject commit 8c8a6e20a93d4b05f3275455962081c0c5bfcf4f From 048603af9b5e99e3855d0474c6958f552cc3cc58 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 7 Apr 2019 18:34:42 -0300 Subject: [PATCH 027/148] Fixed page reference showing 0 citations when biblates citecounter option was disabled. --- main.tex | 18 +++++--- settings.tex | 128 ++++++++++++++++++++++++--------------------------- setup | 2 +- 3 files changed, 72 insertions(+), 76 deletions(-) diff --git a/main.tex b/main.tex index 259a23f..38b0823 100644 --- a/main.tex +++ b/main.tex @@ -69,14 +69,16 @@ % \def\doutorado{} % FIXME: Descomente as linhas '\coorientador', '\subtitulo' e '\area', quando houver -\autor{Nome completo do autor/Nome completo da autora} -\orientador[Orientador/Orientadora]{Nome do orientador/Nome da orientadora, Dr./Dra.} -\coordenador[Coordenador/Coordenadora]{Nome do Coordenador/Nome da Coordenadora, Dr./Dra.} +\autor{Escreva aqui o Nome completo do Autor ou da Autora} -% \coorientador[Coorientador/Coorientadora]{Nome do coorientador/Nome da coorientadora, Dr./Dra.} +% FIXME: Siglas para grau de formação Dr./Dra., Me./Ma, Bel. Bela. (inglês: PhD., MSc., Bs.) +\orientador{Nome completo do Orientador(a), \lang{Phd.}{Dr.}} +\coordenador{Nome do Coordenador(a), \lang{Phd.}{Dr.}} + +% \coorientador[Coorientador(a)]{Nome do coorientador(a), \lang{Phd.}{Dr.}} \titulo{Título do trabalho} -% \subtitulo{Subtítulo (se houver)} +% \subtitulo{Subtítulo (se houver, descomente esta linha)} \ano{Ano da sua defesa} \local{Local da sua Defesa} \instituicaosigla{Sigla da sua instituição} @@ -84,11 +86,13 @@ \biblioteca{Biblioteca Universitária} \tipotrabalho{Tese/Dissertação/Monografia/Trabalho de Conclusão de Curso} -% \area{Área de Concentração} +% \area{Área de Concentração, (se houver, descomente esta linha)} \formacao{Doutor/Bacharel/Mestrando em XXXXXX} \programa{Programa de Pós-Graduação em XXXXXX} \centro{Departamento de XXXXXX, Centro de XXXXXX} -\data{\today} + +% FIXME: Data da sua defesa +\data{30 de março de 2001} \newcommand{\palavraschaveportugues} {% diff --git a/settings.tex b/settings.tex index 7c6cfd5..bc7e6cf 100644 --- a/settings.tex +++ b/settings.tex @@ -2,9 +2,6 @@ % Thesis Tweaks and Utilities %---------------------------------------------------------------------------------------- -% https://tex.stackexchange.com/questions/182569/how-to-manually-set-where-a-word-is-split -\hyphenation{Ge-la-im} - % Uncomment this if you are debugging pages' badness Underfull & Overflow % https://tex.stackexchange.com/questions/115908/geometry-showframe-landscape % https://tex.stackexchange.com/questions/387077/what-is-the-difference-between-usepackageshowframe-and-usepackageshowframe @@ -17,11 +14,14 @@ % \usepackage{newtxtext} % \usepackage{newtxmath} +% https://tex.stackexchange.com/questions/182569/how-to-manually-set-where-a-word-is-split +\hyphenation{Ge-la-im} + % Simple alias for English and Portuguese words \newcommand{\brazilword}[1]{\foreignlanguage{brazil}{#1}} \newcommand{\englishword}[1]{\foreignlanguage{english}{#1}} -\lang % Switch between english and brazil for big text blocks +\lang % Environments to switch between english and brazil for big text blocks {\includecomment{englishtext}\excludecomment{braziltext}} {\includecomment{braziltext}\excludecomment{englishtext}} @@ -29,41 +29,15 @@ % https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand \let\citeonline\textcite -% https://tex.stackexchange.com/questions/391695/is-possible-to-remove-the-link-color-of-the-comma-on-the-citation-link -% \DeclareFieldFormat{citehyperref}{#1} - -% Add new translations and remove the colon appended to theses variables by 'abntex2', allowing us to use other separators +% Add missing translations for Portuguese \addto\captionsbrazil { % \renewcommand{\mytextpreliminarylistname}{Breve Sumário} - \renewcommand{\orientadorname}{Orientador} - \renewcommand{\coorientadorname}{Coorientador} } % Add English translations and fix names from abnTeX2 % https://tex.stackexchange.com/questions/8564/what-is-the-right-way-to-redefine-macros-defined-by-babel \addto\captionsenglish { % - \renewcommand{\folhaderostoname}{Title page} - \renewcommand{\epigraphname}{Epigraph} - \renewcommand{\dedicatorianame}{Dedication} - \renewcommand{\errataname}{Errata sheet} - \renewcommand{\agradecimentosname}{Acknowledgements} - \renewcommand{\anexoname}{ANNEX} - \renewcommand{\anexosname}{Annex} - \renewcommand{\apendicename}{APPENDIX} - \renewcommand{\apendicesname}{Appendix} - \renewcommand{\orientadorname}{Supervisor} \renewcommand{\coorientadorname}{Co\hyp{}supervisor} - \renewcommand{\folhadeaprovacaoname}{Approval} - \renewcommand{\resumoname}{Abstract} - \renewcommand{\listadesiglasname}{List of abbreviations and acronyms} - \renewcommand{\listadesimbolosname}{List of symbols} - \renewcommand{\fontename}{Source} - \renewcommand{\notaname}{Note} - \renewcommand{\pageautorefname}{page} - \renewcommand{\sectionautorefname}{section} - \renewcommand{\subsectionautorefname}{subsection} - \renewcommand{\subsubsectionautorefname}{subsubsection} - \renewcommand{\paragraphautorefname}{subsubsubsection} } % Source Code Settings in Document @@ -217,43 +191,6 @@ \renewcommand{\cftparagraphfont}{\ABNTEXsubsubsubsectionfont\color{ultramarine}} \renewcommand{\cftparagraphpagefont}{\ABNTEXsubsubsubsectionfont\color{black}} -% Backref package settings, pages with citations in bibliography -\makeatletter -\@ifpackageloaded{biblatex} -{ - \renewbibmacro*{pageref} - { - \iflistundef{pageref} - {\printtext{\lang{\autocap{n}o citation in the text}{\autocap{n}enhuma citação no texto}.}} - {% - \printtext - {% - \ifnumgreater{\value{citecounter}}{1} - {\lang{\autocap{c}ited}{\autocap{c}itado} \arabic{citecounter} \lang{times}{vezes}} - {\lang{\autocap{c}ited}{\autocap{c}itado} \arabic{citecounter} \lang{time}{vez}} - }% - \setunit{\addspace}% - \ifnumgreater{\value{pageref}}{1} - {\bibstring{backrefpages}\ppspace} - {\bibstring{backrefpage}\ppspace}% - \printlist[pageref][-\value{listtotal}]{pageref}% - }% - } - - \DefineBibliographyStrings{brazil} - { - backrefpage = {na página}, - backrefpages = {nas páginas}, - } - - \DefineBibliographyStrings{english} - { - backrefpage = {on page}, - backrefpages = {on pages}, - } -}{} -\makeatother - % Memoir has another mechanism for the job: \cftsetindents{‹kind›}{indent}{numwidth}. Here kind is % chapter, section, or whatever; the indent specifies the ‘margin’ before the entry starts; and the % width is of the box into which the number is typeset (so needs to be wide enough for the largest @@ -277,6 +214,61 @@ \cftsetindents{paragraph} {0em}{\cftlastnumwidth} \cftsetindents{subparagraph} {0em}{\cftlastnumwidth} +% Backref package settings, pages with citations in bibliography +\newcommand{\biblatexcitedntimes}{\autocap{c}ited \arabic{citecounter} times} +\newcommand{\biblatexcitedonetime}{\autocap{c}ited one time} +\newcommand{\biblatexcitednotimes}{\autocap{n}o citation in the text} + +\addto\captionsbrazil { % + \renewcommand{\biblatexcitedntimes}{\autocap{c}itado \arabic{citecounter} vezes} + \renewcommand{\biblatexcitedonetime}{\autocap{c}itado uma vez} + \renewcommand{\biblatexcitednotimes}{\autocap{n}enhuma citação no texto} +} + +\makeatletter +\@ifpackageloaded{biblatex} +{% + % https://tex.stackexchange.com/questions/483707/how-to-detect-whether-the-option-citecounter-was-enabled-on-biblatex + \ifx\blx@citecounter\relax + \ifbacktracker + \renewbibmacro*{pageref} + { + \iflistundef{pageref} + {\printtext{\biblatexcitednotimes}} + {% + \printtext + {% + \ifnumgreater{\value{citecounter}}{1} + {\biblatexcitedntimes} + {\biblatexcitedonetime} + }% + \setunit{\addspace}% + \ifnumgreater{\value{pageref}}{1} + {\bibstring{backrefpages}\ppspace} + {\bibstring{backrefpage}\ppspace}% + \printlist[pageref][-\value{listtotal}]{pageref}% + }% + } + \fi + \fi + + \DefineBibliographyStrings{brazil} + { + backrefpage = {na página}, + backrefpages = {nas páginas}, + } + + \DefineBibliographyStrings{english} + { + backrefpage = {on page}, + backrefpages = {on pages}, + } +}{} +\makeatother + +% https://tex.stackexchange.com/questions/391695/is-possible-to-remove-the-link-color-of-the-comma-on-the-citation-link +% \DeclareFieldFormat{citehyperref}{#1} + % https://tex.stackexchange.com/questions/19105/how-can-i-put-more-space-between-bibliography-entries-biblatex % \setlength\bibitemsep{2.1\itemsep} diff --git a/setup b/setup index 8c8a6e2..6d1f235 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 8c8a6e20a93d4b05f3275455962081c0c5bfcf4f +Subproject commit 6d1f235144c3bf4e992cc1e675d513714db9e03e From 7aa17aae4ec6d667058f901975b6d7d6d3d340d5 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 7 Apr 2019 19:14:47 -0300 Subject: [PATCH 028/148] Fixed use of 6 underscores on repeated authors abntex/biblatex-abnt#43 --- main.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tex b/main.tex index 38b0823..10f3620 100644 --- a/main.tex +++ b/main.tex @@ -34,7 +34,7 @@ \fi % Uncomment the following line if you want to use other biblatex settings -% \PassOptionsToPackage{style=numeric,backend=biber,backref=true,citecounter=true}{biblatex} +% \PassOptionsToPackage{style=numeric,repeatfields=true,backend=biber,backref=true,citecounter=true}{biblatex} % Disable the empty pages automatically put by memoir class, except the ones by \cleardoublepage % \PassOptionsToClass{openany}{memoir} From 7ae9b527d2f2d80c8d193b9d7c594b82dbcfe62e Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 7 Apr 2019 19:48:51 -0300 Subject: [PATCH 029/148] Fixed settings.tex biblatex citecounter checking logic --- settings.tex | 65 ++++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/settings.tex b/settings.tex index bc7e6cf..0771bf7 100644 --- a/settings.tex +++ b/settings.tex @@ -224,45 +224,50 @@ \renewcommand{\biblatexcitedonetime}{\autocap{c}itado uma vez} \renewcommand{\biblatexcitednotimes}{\autocap{n}enhuma citação no texto} } - \makeatletter \@ifpackageloaded{biblatex} {% % https://tex.stackexchange.com/questions/483707/how-to-detect-whether-the-option-citecounter-was-enabled-on-biblatex \ifx\blx@citecounter\relax - \ifbacktracker - \renewbibmacro*{pageref} - { - \iflistundef{pageref} - {\printtext{\biblatexcitednotimes}} - {% - \printtext + \message{Is citecounter defined? NO!^^J} + \else + \message{Is citecounter defined? YES!^^J} + \ifbacktracker + \message{Is backtracker defined? YES!^^J} + \renewbibmacro*{pageref} + { + \iflistundef{pageref} + {\printtext{\biblatexcitednotimes}} {% - \ifnumgreater{\value{citecounter}}{1} - {\biblatexcitedntimes} - {\biblatexcitedonetime} + \printtext + {% + \ifnumgreater{\value{citecounter}}{1} + {\biblatexcitedntimes} + {\biblatexcitedonetime} + }% + \setunit{\addspace}% + \ifnumgreater{\value{pageref}}{1} + {\bibstring{backrefpages}\ppspace} + {\bibstring{backrefpage}\ppspace}% + \printlist[pageref][-\value{listtotal}]{pageref}% }% - \setunit{\addspace}% - \ifnumgreater{\value{pageref}}{1} - {\bibstring{backrefpages}\ppspace} - {\bibstring{backrefpage}\ppspace}% - \printlist[pageref][-\value{listtotal}]{pageref}% - }% - } - \fi - \fi + } - \DefineBibliographyStrings{brazil} - { - backrefpage = {na página}, - backrefpages = {nas páginas}, - } + \DefineBibliographyStrings{brazil} + { + backrefpage = {na página}, + backrefpages = {nas páginas}, + } - \DefineBibliographyStrings{english} - { - backrefpage = {on page}, - backrefpages = {on pages}, - } + \DefineBibliographyStrings{english} + { + backrefpage = {on page}, + backrefpages = {on pages}, + } + \else + \message{Is backtracker defined? NO!^^J} + \fi + \fi }{} \makeatother From 49bc1bf4ef76377f4a737818aae2c79d98256561 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 7 Apr 2019 20:55:00 -0300 Subject: [PATCH 030/148] Remove the colon appended to variables by 'abntex2' because they show up on places they shouldn't. --- settings.tex | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/settings.tex b/settings.tex index 0771bf7..348e7d4 100644 --- a/settings.tex +++ b/settings.tex @@ -32,14 +32,26 @@ % Add missing translations for Portuguese \addto\captionsbrazil { % \renewcommand{\mytextpreliminarylistname}{Breve Sumário} + % Remove the colon appended to variables by 'abntex2' because they show up on places they shouldn't + \renewcommand{\orientadorname}{Orientador} + \renewcommand{\coorientadorname}{Coorientador} } % Add English translations and fix names from abnTeX2 % https://tex.stackexchange.com/questions/8564/what-is-the-right-way-to-redefine-macros-defined-by-babel \addto\captionsenglish { % \renewcommand{\coorientadorname}{Co\hyp{}supervisor} + % Remove the colon appended to variables by 'abntex2' because they show up on places they shouldn't + \renewcommand{\orientadorname}{Supervisor} + \renewcommand{\coorientadorname}{Co\hyp{}supervisor} } +% Selects a sans serif font family +% \renewcommand{\sfdefault}{cmss} + +% Selects a monospaced (“typewriter”) font family +% \renewcommand{\ttdefault}{cmtt} + % Source Code Settings in Document \makeatletter \@ifpackageloaded{listings} From dacc0c852a44128f372f41af0c6d541899d01fd1 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 8 Apr 2019 00:31:39 -0300 Subject: [PATCH 031/148] Fixed translations irregularities on settings.tex --- main.tex | 31 ++++++++++++++++++++++++++ settings.tex | 62 +--------------------------------------------------- setup | 2 +- 3 files changed, 33 insertions(+), 62 deletions(-) diff --git a/main.tex b/main.tex index 10f3620..2d76cee 100644 --- a/main.tex +++ b/main.tex @@ -144,6 +144,37 @@ % Uncomment these two lines, to only partially generate the document % \doincludeonly % \forcedincludetrue + +% Simple alias for English and Portuguese words +\newcommand{\brazilword}[1]{\foreignlanguage{brazil}{#1}} +\newcommand{\englishword}[1]{\foreignlanguage{english}{#1}} + +\lang % Environments to switch between english and brazil for big text blocks +{\includecomment{englishtext}\excludecomment{braziltext}} +{\includecomment{braziltext}\excludecomment{englishtext}} + +% Backward compatibility with `abntex2cite` package `\citeonline` command with the new `biblatex` package +% https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand +\let\citeonline\textcite + +\ifenglish + \hypersetup + { + pdfauthor={Author}, + pdfsubject={Thesis' Abstract}, + pdfcreator={LaTeX with abnTeX2 for UFSC}, + pdfkeywords={abnt}{latex}{UFSC}{abntex2}{thesis}, + } +\else + \hypersetup + { + pdfauthor={Autores}, + pdfsubject={Resumo da tese}, + pdfcreator={LaTeX com abnTeX2 para UFSC}, + pdfkeywords={abnt}{latex}{UFSC}{abntex2}{tese}, + } +\fi + \begin{document} % FIXME: Comment this after finishing the thesis, so you can start fixing the \flushbottom vs \raggedbottom diff --git a/settings.tex b/settings.tex index 348e7d4..53725be 100644 --- a/settings.tex +++ b/settings.tex @@ -17,33 +17,10 @@ % https://tex.stackexchange.com/questions/182569/how-to-manually-set-where-a-word-is-split \hyphenation{Ge-la-im} -% Simple alias for English and Portuguese words -\newcommand{\brazilword}[1]{\foreignlanguage{brazil}{#1}} -\newcommand{\englishword}[1]{\foreignlanguage{english}{#1}} - -\lang % Environments to switch between english and brazil for big text blocks -{\includecomment{englishtext}\excludecomment{braziltext}} -{\includecomment{braziltext}\excludecomment{englishtext}} - -% Backward compatibility with `abntex2cite` package `\citeonline` command with the new `biblatex` package -% https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand -\let\citeonline\textcite - % Add missing translations for Portuguese +% https://tex.stackexchange.com/questions/8564/what-is-the-right-way-to-redefine-macros-defined-by-babel \addto\captionsbrazil { % \renewcommand{\mytextpreliminarylistname}{Breve Sumário} - % Remove the colon appended to variables by 'abntex2' because they show up on places they shouldn't - \renewcommand{\orientadorname}{Orientador} - \renewcommand{\coorientadorname}{Coorientador} -} - -% Add English translations and fix names from abnTeX2 -% https://tex.stackexchange.com/questions/8564/what-is-the-right-way-to-redefine-macros-defined-by-babel -\addto\captionsenglish { % - \renewcommand{\coorientadorname}{Co\hyp{}supervisor} - % Remove the colon appended to variables by 'abntex2' because they show up on places they shouldn't - \renewcommand{\orientadorname}{Supervisor} - \renewcommand{\coorientadorname}{Co\hyp{}supervisor} } % Selects a sans serif font family @@ -52,26 +29,6 @@ % Selects a monospaced (“typewriter”) font family % \renewcommand{\ttdefault}{cmtt} -% Source Code Settings in Document -\makeatletter -\@ifpackageloaded{listings} -{ -\ifenglish - % These default values are already in English - -\else - % Listing -> Codigo fonte - \renewcommand{\lstlistingname}{Código--fonte} - - % List of Listings -> Lista de códigos-fonte - \renewcommand{\lstlistlistingname}{Lista de códigos--fonte} - - % Recalculate the size of the header - \calculatelisteningsheader -\fi -}{} -\makeatother - % Spacing between lines and paragraphs % https://tex.stackexchange.com/questions/70212/ifpackageloaded-question \makeatletter @@ -163,23 +120,6 @@ urlcolor=linkcolor, bookmarksdepth=4 } - \ifenglish - \hypersetup - { - pdfauthor={Author}, - pdfsubject={Thesis' Abstract}, - pdfcreator={LaTeX with abnTeX2 for UFSC}, - pdfkeywords={abnt}{latex}{UFSC}{abntex2}{thesis}, - } - \else - \hypersetup - { - pdfauthor={Autores}, - pdfsubject={Resumo da tese}, - pdfcreator={LaTeX com abnTeX2 para UFSC}, - pdfkeywords={abnt}{latex}{UFSC}{abntex2}{tese}, - } - \fi } }{} \makeatother diff --git a/setup b/setup index 6d1f235..a52f66a 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 6d1f235144c3bf4e992cc1e675d513714db9e03e +Subproject commit a52f66a63199ab9fed3a6d8a8aa6730edd5124da From 3c5d53014f2219f0c5d15f79e8d7cf5a0a00a694 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 8 Apr 2019 21:57:49 -0300 Subject: [PATCH 032/148] Replaced \begin{otherlanguage*} with \begin{english/braziltext} --- chapters/chapter_1.tex | 37 +++---------------------------------- chapters/chapter_2.tex | 11 ++++------- chapters/chapter_3.tex | 15 +++------------ chapters/chapter_4.tex | 13 +++---------- chapters/conclusion.tex | 4 ---- chapters/intro.tex | 12 +----------- 6 files changed, 14 insertions(+), 78 deletions(-) diff --git a/chapters/chapter_1.tex b/chapters/chapter_1.tex index 7c54b37..8929b7a 100644 --- a/chapters/chapter_1.tex +++ b/chapters/chapter_1.tex @@ -31,13 +31,9 @@ % The \phantomsection command is needed to create a link to a place in the document that is not a % figure, equation, table, section, subsection, chapter, etc. -% -% When do I need to invoke \phantomsection? % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection \phantomsection - -% Is it possible to keep my translation together with original text? % https://tex.stackexchange.com/questions/5076/is-it-possible-to-keep-my-translation-together-with-original-text \chapter[\lang{Abbreviation for the Table of Contents}{Abreviação para o Sumário}] { @@ -55,12 +51,7 @@ % \newpage - -% Multiple-language document - babel - selectlanguage vs begin/end{otherlanguage} -% https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage -\begin{otherlanguage*}{brazil} - - +\begin{braziltext} \section{Axiomas ou postulados} @@ -82,7 +73,6 @@ \section{Axiomas ou postulados} \section{Teorema} - Na matemática, um teorema é uma afirmação que pode ser provada como verdadeira através de outras afirmações já demonstradas, como outros teoremas, juntamente com afirmações anteriormente aceitas, como axiomas. Prova é o processo de mostrar que um teorema está correto. O termo teorema foi introduzido por Euclides, em Elementos, para significar "afirmação que pode ser provada". Em grego, originalmente significava "espetáculo" ou "festa". Atualmente, é mais comum deixar o termo "teorema" apenas para certas afirmações que podem ser provadas e de grande "importância matemática", o que torna a definição um tanto subjetiva. \begin{teorema}[Teorema de Pitágoras] @@ -93,9 +83,9 @@ \section{Teorema} \begin{proposicao} Em qualquer proposição a hipótese é considerada verdadeira. \end{proposicao} -\subsection{Terminologia} +\subsection{Terminologia} Usualmente deixa-se o termo ``teorema'' apenas para as afirmações que podem ser provadas de grande importância. Assim, são dados outros nomes para os outros tipos dessas afirmações: @@ -231,7 +221,6 @@ \section{Rotação de equações} Outra forma é utilizar o pacote pdflscape -% Reducing font size in equation % https://tex.stackexchange.com/questions/60453/reducing-font-size-in-equation \tiny \begin{equation} @@ -252,15 +241,11 @@ \section{Rotação de equações} \end{landscape} - - % --- \section{Codificação dos arquivos: UTF8} % --- - - A codificação de todos os arquivos do \abnTeX{} é \texttt{UTF8}. É necessário que você utilize a mesma codificação nos documentos que escrever, inclusive nos arquivos de base bibliográficas |.bib|. @@ -424,8 +409,6 @@ \section{Tabelas} \end{table} - - \clearpage % --- \section{Figuras} @@ -470,10 +453,6 @@ \section{Figuras} \end{figure} - - - - Ou então figuras podem ser incorporadas de arquivos externos, como é o caso da \autoref{fig_grafico}. Se a figura que ser incluída se tratar de um diagrama, um gráfico ou uma ilustração que você mesmo produza, priorize o uso de imagens @@ -609,10 +588,6 @@ \section{Expressões matemáticas} \url{https://code.google.com/p/abntex2/wiki/Referencias}. - - - - % --- \section{Enumerações: alíneas e subalíneas} % --- @@ -1072,11 +1047,7 @@ \section{Você pode ajudar?} desenvolvimento e de várias outras formas. Veja como contribuir com o \abnTeX{} em \url{https://code.google.com/p/abntex2/wiki/ComoContribuir}. -% -% Invisible Overfull \hbox in toc % https://tex.stackexchange.com/questions/264586/invisible-overfull-hbox-in-toc -% -% Hyperref - Token not allowed % https://tex.stackexchange.com/questions/53513/hyperref-token-not-allowed \section{Quer customizar os modelos do \texorpdfstring{\newline}{}\abnTeX{} para sua instituição ou universidade?} @@ -1085,7 +1056,5 @@ \section{Quer customizar os modelos do \texorpdfstring{\newline}{}\abnTeX{} para \url{https://code.google.com/p/abntex2/wiki/ComoCustomizar}. - -\end{otherlanguage*} - +\end{braziltext} diff --git a/chapters/chapter_2.tex b/chapters/chapter_2.tex index 135319c..2df830e 100644 --- a/chapters/chapter_2.tex +++ b/chapters/chapter_2.tex @@ -1,29 +1,26 @@ % The \phantomsection command is needed to create a link to a place in the document that is not a % figure, equation, table, section, subsection, chapter, etc. -% -% When do I need to invoke \phantomsection? % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection \phantomsection - % Multiple-language document - babel - selectlanguage vs begin/end{otherlanguage} % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage -\begin{otherlanguage*}{brazil} +\begin{braziltext} \chapter{Titulo do Capitulo} \begin{flushright} - + \end{flushright} % \newpage - \section{Título da Seção} Lipsum me [1] Lipsum me [2-3] -\end{otherlanguage*} +\end{braziltext} + diff --git a/chapters/chapter_3.tex b/chapters/chapter_3.tex index 7bc9e5a..90c0df2 100644 --- a/chapters/chapter_3.tex +++ b/chapters/chapter_3.tex @@ -1,34 +1,25 @@ % The \phantomsection command is needed to create a link to a place in the document that is not a % figure, equation, table, section, subsection, chapter, etc. -% -% When do I need to invoke \phantomsection? % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection \phantomsection - % Multiple-language document - babel - selectlanguage vs begin/end{otherlanguage} % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage -\begin{otherlanguage*}{english} +\begin{englishtext} \chapter[Graduated]{Graduated carton sauce} - \begin{flushright} - + \end{flushright} % \newpage - - \section{Before the very first basketball} lipsum me [21-22] - - \newpage -\end{otherlanguage*} - +\end{englishtext} diff --git a/chapters/chapter_4.tex b/chapters/chapter_4.tex index 6a8a2c3..13a7376 100644 --- a/chapters/chapter_4.tex +++ b/chapters/chapter_4.tex @@ -1,29 +1,22 @@ % The \phantomsection command is needed to create a link to a place in the document that is not a % figure, equation, table, section, subsection, chapter, etc. -% -% When do I need to invoke \phantomsection? % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection \phantomsection - % Multiple-language document - babel - selectlanguage vs begin/end{otherlanguage} % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage -\begin{otherlanguage*}{english} +\begin{englishtext} \chapter [Some very big title] {Some very big title you are cutting it out so if this nice on the table of contents} - \begin{flushright} - - \end{flushright} + \end{flushright} % \newpage - - \section[Some encoding tests]{ } Nutrition foot carrots and salad deductible hydrogen @@ -34,5 +27,5 @@ \newpage -\end{otherlanguage*} +\end{englishtext} diff --git a/chapters/conclusion.tex b/chapters/conclusion.tex index f2ee4ae..af50e47 100644 --- a/chapters/conclusion.tex +++ b/chapters/conclusion.tex @@ -1,9 +1,6 @@ - % The \phantomsection command is needed to create a link to a place in the document that is not a % figure, equation, table, section, subsection, chapter, etc. -% -% When do I need to invoke \phantomsection? % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection \phantomsection @@ -13,4 +10,3 @@ \chapter{\lang{Final Remarks}{Considerações Finais}} Lipsum me [31-33] - diff --git a/chapters/intro.tex b/chapters/intro.tex index 35a7bf0..060b2a7 100644 --- a/chapters/intro.tex +++ b/chapters/intro.tex @@ -38,23 +38,15 @@ % ------------------------------------------------------------------------ % ------------------------------------------------------------------------ - % The \phantomsection command is needed to create a link to a place in the document that is not a % figure, equation, table, section, subsection, chapter, etc. -% -% When do I need to invoke \phantomsection? % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection \phantomsection - -% Is it possible to keep my translation together with original text? % https://tex.stackexchange.com/questions/5076/is-it-possible-to-keep-my-translation-together-with-original-text \chapter{\lang{Introduction}{Introdução}} \phantomsection - - - A Tabela~\ref{tab:a_table_formatacao_de_texto} mostra informações do modelo de teses da Biblioteca Universitária da UFSC (BU-UFSC). % What does [t] and [ht] mean? @@ -125,8 +117,6 @@ \chapter{\lang{Introduction}{Introdução}} \end{tabularx} - - \begin{figure} \centering \caption{Exemplo de figura} @@ -135,8 +125,8 @@ \chapter{\lang{Introduction}{Introdução}} \fonte{o autor} \end{figure} -Por exemplo, na \figref{fig:ex01}, tem-se... +Por exemplo, na \figref{fig:ex01}, tem-se... \begin{figure} \centering From 98b5eb64948013527c90caf41979b1b390604c44 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 8 Apr 2019 22:17:13 -0300 Subject: [PATCH 033/148] Added .tex extension to all \input statements --- main.tex | 2 +- setup | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tex b/main.tex index 2d76cee..081cde7 100644 --- a/main.tex +++ b/main.tex @@ -185,7 +185,7 @@ \frenchspacing % ELEMENTOS PRÉ-TEXTUAIS - \input{setup/beforetext} + \input{setup/beforetext.tex} % ELEMENTOS TEXTUAIS \textual diff --git a/setup b/setup index a52f66a..4a6e883 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit a52f66a63199ab9fed3a6d8a8aa6730edd5124da +Subproject commit 4a6e883c14ec37e23797b93aed3cdc88edc8b546 From 163519313d6b5c001d2bcd638e61e527cbfc6742 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 8 Apr 2019 22:31:03 -0300 Subject: [PATCH 034/148] Deprecated the command \begin{english/braziltext} because it mess up with latex debug lines. --- chapters/chapter_1.tex | 4 ++-- chapters/chapter_2.tex | 4 ++-- chapters/chapter_3.tex | 4 ++-- chapters/chapter_4.tex | 4 ++-- main.tex | 4 ---- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/chapters/chapter_1.tex b/chapters/chapter_1.tex index 8929b7a..b56523e 100644 --- a/chapters/chapter_1.tex +++ b/chapters/chapter_1.tex @@ -51,7 +51,7 @@ % \newpage -\begin{braziltext} +\begin{otherlanguage*}{brazil} \section{Axiomas ou postulados} @@ -1056,5 +1056,5 @@ \section{Quer customizar os modelos do \texorpdfstring{\newline}{}\abnTeX{} para \url{https://code.google.com/p/abntex2/wiki/ComoCustomizar}. -\end{braziltext} +\end{otherlanguage*} diff --git a/chapters/chapter_2.tex b/chapters/chapter_2.tex index 2df830e..c5bfa55 100644 --- a/chapters/chapter_2.tex +++ b/chapters/chapter_2.tex @@ -6,7 +6,7 @@ % Multiple-language document - babel - selectlanguage vs begin/end{otherlanguage} % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage -\begin{braziltext} +\begin{otherlanguage*}{brazil} \chapter{Titulo do Capitulo} @@ -22,5 +22,5 @@ Lipsum me [2-3] -\end{braziltext} +\end{otherlanguage*} diff --git a/chapters/chapter_3.tex b/chapters/chapter_3.tex index 90c0df2..1d080fb 100644 --- a/chapters/chapter_3.tex +++ b/chapters/chapter_3.tex @@ -6,7 +6,7 @@ % Multiple-language document - babel - selectlanguage vs begin/end{otherlanguage} % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage -\begin{englishtext} +\begin{otherlanguage*}{english} \chapter[Graduated]{Graduated carton sauce} @@ -21,5 +21,5 @@ \newpage -\end{englishtext} +\end{otherlanguage*} diff --git a/chapters/chapter_4.tex b/chapters/chapter_4.tex index 13a7376..e90bf4f 100644 --- a/chapters/chapter_4.tex +++ b/chapters/chapter_4.tex @@ -6,7 +6,7 @@ % Multiple-language document - babel - selectlanguage vs begin/end{otherlanguage} % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage -\begin{englishtext} +\begin{otherlanguage*}{english} \chapter [Some very big title] @@ -27,5 +27,5 @@ \newpage -\end{englishtext} +\end{otherlanguage*} diff --git a/main.tex b/main.tex index 081cde7..c85d190 100644 --- a/main.tex +++ b/main.tex @@ -149,10 +149,6 @@ \newcommand{\brazilword}[1]{\foreignlanguage{brazil}{#1}} \newcommand{\englishword}[1]{\foreignlanguage{english}{#1}} -\lang % Environments to switch between english and brazil for big text blocks -{\includecomment{englishtext}\excludecomment{braziltext}} -{\includecomment{braziltext}\excludecomment{englishtext}} - % Backward compatibility with `abntex2cite` package `\citeonline` command with the new `biblatex` package % https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand \let\citeonline\textcite From b2b4be12e94ee4e866290adc9482051a9cbbff1c Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 8 Apr 2019 23:01:44 -0300 Subject: [PATCH 035/148] Renamed \listofboards back to \listofquadros --- chapters/chapter_1.tex | 8 ++++---- setup | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chapters/chapter_1.tex b/chapters/chapter_1.tex index b56523e..519bb1f 100644 --- a/chapters/chapter_1.tex +++ b/chapters/chapter_1.tex @@ -531,7 +531,7 @@ \section{Quadros} Depois de definir o ambiente \texttt{quadro} podemos ter um quadro: -\begin{board} +\begin{quadro} \caption{\label{quad:quadro_modelo1}Legenda do primeiro quadro.} \centering \begin{tabular}{|c|} @@ -540,12 +540,12 @@ \section{Quadros} \hline \end{tabular} \fonte{Teste.} -\end{board} +\end{quadro} Além do \autoref{quad:quadro_modelo1}, também é possível especificar outra ordem de posicionamento como [htb]: -\begin{board}[htb] +\begin{quadro}[htb] \centering \caption{\label{quad:quadro_modelo2}Legenda do segundo quadro.} \begin{tabular}{|c|} @@ -554,7 +554,7 @@ \section{Quadros} \hline \end{tabular} \fonte{O autor.} -\end{board} +\end{quadro} diff --git a/setup b/setup index 4a6e883..f501167 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 4a6e883c14ec37e23797b93aed3cdc88edc8b546 +Subproject commit f501167ca80d56f2709485ec081fff0bb397f727 From 8f7fbb208a731c02841fdaa63315606a0eb11b34 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 8 Apr 2019 23:08:23 -0300 Subject: [PATCH 036/148] Moved \brazilword and \englishword to the top of the file because they could be used inside the author, title, etc fields. --- main.tex | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/main.tex b/main.tex index c85d190..f81ddb4 100644 --- a/main.tex +++ b/main.tex @@ -33,6 +33,14 @@ \PassOptionsToPackage{main=brazil,english,spanish,french}{babel} \fi +% Simple alias for English and Portuguese words +\newcommand{\brazilword}[1]{\foreignlanguage{brazil}{#1}} +\newcommand{\englishword}[1]{\foreignlanguage{english}{#1}} + +% Backward compatibility with `abntex2cite` package `\citeonline` command with the new `biblatex` package +% https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand +\let\citeonline\textcite + % Uncomment the following line if you want to use other biblatex settings % \PassOptionsToPackage{style=numeric,repeatfields=true,backend=biber,backref=true,citecounter=true}{biblatex} @@ -145,14 +153,6 @@ % \doincludeonly % \forcedincludetrue -% Simple alias for English and Portuguese words -\newcommand{\brazilword}[1]{\foreignlanguage{brazil}{#1}} -\newcommand{\englishword}[1]{\foreignlanguage{english}{#1}} - -% Backward compatibility with `abntex2cite` package `\citeonline` command with the new `biblatex` package -% https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand -\let\citeonline\textcite - \ifenglish \hypersetup { From 377103a6fa0a4e1b2c4df16ee83496504d1b619b Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 9 Apr 2019 00:01:03 -0300 Subject: [PATCH 037/148] Documented main.tex required fields with FIXME --- beforetext/dedicatoria.tex | 2 +- main.tex | 42 ++++++++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/beforetext/dedicatoria.tex b/beforetext/dedicatoria.tex index 27f3aa9..af41d24 100644 --- a/beforetext/dedicatoria.tex +++ b/beforetext/dedicatoria.tex @@ -1,6 +1,6 @@ -\addtotextpreliminarycontent{\lang{Dedication}{Dedicatória}} +\addtotextpreliminarycontent{\lang{Dedicatory}{Dedicatória}} \begin{dedicatoria} diff --git a/main.tex b/main.tex index f81ddb4..2961670 100644 --- a/main.tex +++ b/main.tex @@ -71,32 +71,45 @@ % % Utilize o arquivo aftertext/references.bib para incluir sua bibliografia. \addbibresource{aftertext/references.bib} -% FIXME: Descomente a linha correspondente ao seu tipo de trabalho -% \def\tcc{} -% \def\mestrado{} -% \def\doutorado{} +% FIXME: Descomente a linha abaixo se seu trabalho for um TCC +\def\tcc{} -% FIXME: Descomente as linhas '\coorientador', '\subtitulo' e '\area', quando houver +% FIXME: Preencha com seus dados \autor{Escreva aqui o Nome completo do Autor ou da Autora} +\titulo{Título do trabalho} + +% FIXME: Se houver subtítulo, descomente a linha abaixo +% \subtitulo{Subtítulo } % FIXME: Siglas para grau de formação Dr./Dra., Me./Ma, Bel. Bela. (inglês: PhD., MSc., Bs.) \orientador{Nome completo do Orientador(a), \lang{Phd.}{Dr.}} -\coordenador{Nome do Coordenador(a), \lang{Phd.}{Dr.}} +% FIXME: Se houver coorientador, descomente a linha abaixo % \coorientador[Coorientador(a)]{Nome do coorientador(a), \lang{Phd.}{Dr.}} -\titulo{Título do trabalho} -% \subtitulo{Subtítulo (se houver, descomente esta linha)} -\ano{Ano da sua defesa} +% FIXME: Preencher com o nome do Coordenador de TCCs/Teses do seu curso +\coordenador{Nome do Coordenador(a), \lang{Phd.}{Dr.}} + +% FIXME: Local da sua defesa \local{Local da sua Defesa} + +% FIXME: Ano da sua defesa +\ano{Ano da sua defesa} +\biblioteca{Biblioteca Universitária} \instituicaosigla{Sigla da sua instituição} \instituicao{Universidade Federal de Santa Catarina} -\biblioteca{Biblioteca Universitária} -\tipotrabalho{Tese/Dissertação/Monografia/Trabalho de Conclusão de Curso} -% \area{Área de Concentração, (se houver, descomente esta linha)} -\formacao{Doutor/Bacharel/Mestrando em XXXXXX} +% FIXME: Preencha com Tese, Dissertação, Monografia ou Trabalho de Conclusão de Curso, Bachelor's Thesis, etc +\tipotrabalho{Monografia} + +% FIXME: Se houver Área de Concentração, descomente a linha abaixo +% \area{Área de Concentração} + +% FIXME: Preencha com Doutor, Bacharel ou Mestrando +\formacao{Doutor em XXXXXX} \programa{Programa de Pós-Graduação em XXXXXX} + +% FIXME: Preencha com Departamento de XXXXXX, Centro de XXXXXX \centro{Departamento de XXXXXX, Centro de XXXXXX} % FIXME: Data da sua defesa @@ -222,6 +235,9 @@ % Referências bibliográficas \begingroup + % https://tex.stackexchange.com/questions/163559/how-to-modify-line-spacing-per-entry-of-bibliography + % \linespread{1.18}\selectfont + % https://tex.stackexchange.com/questions/17128/using-bibtex-to-make-a-list-of-references-without % \nocite{*} \printbibliography[title=REFERÊNCIAS] From 857b549e007576ce7eed2da6132b447869ce6fba Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 9 Apr 2019 00:03:46 -0300 Subject: [PATCH 038/148] Moved setup/beforetext.tex to beforetext/beforetext.tex --- beforetext/beforetext.tex | 169 ++++++++++++++++++++++++++++++++++++++ main.tex | 2 +- setup | 2 +- 3 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 beforetext/beforetext.tex diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex new file mode 100644 index 0000000..aadec81 --- /dev/null +++ b/beforetext/beforetext.tex @@ -0,0 +1,169 @@ + + +% 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} + + +% O preambulo deve conter tipo do trabalho, objetivo, nome da instituição e a área de concentração. +\preambulo +{% + \imprimirtipotrabalho~\ifnotdefined\tcc{submetida}{submetido} ao \imprimirprograma~da \imprimirinstituicao~para a obtenção do Grau de \imprimirformacao. +} + +% ELEMENTOS PRÉ-TEXTUAIS +\ifforcedinclude\else + % pretextual settings + \pretextual + + % Capa + % \includepdf{pictures/FrenteCapaUFSC.pdf} + \imprimircapa + + % Folha de rosto (o * indica que haverá a ficha bibliográfica) + \imprimirfolhaderosto* +\fi + +% Inserir a ficha bibliografica +% +% Isto é um exemplo de Ficha Catalográfica, ou ``Dados internacionais de +% catalogação-na-publicação''. Você pode utilizar este modelo como referência. +% Porém, provavelmente a biblioteca da sua universidade lhe fornecerá um PDF +% com a ficha catalográfica definitiva após a defesa do trabalho. Quando estiver +% com o documento, salve-o como PDF no diretório do seu projeto e substitua todo +% o conteúdo de implementação deste arquivo pelo comando abaixo: +\include{beforetext/fichacatalografica} +\ifforcedinclude\else\cleardoublepage\fi + +% Custom list throw LaTeX Error: Command \mycustomfiction already defined? +% https://tex.stackexchange.com/questions/388489/custom-list-throw-latex-error-command-mycustomfiction-already-defined/ +% \ifforcedinclude\else + % Manually add the `\textpreliminarycontents` to the Table of Contents here + % to keep the hyper link pointing to the beginning of the page, instead of + % the beginning of `\textpreliminarycontents` + % + % When do I need to invoke \phantomsection? + % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection + % \phantomsection + % \addcontentsline{toc}{chapter}{\mytextpreliminarylistname} + + % \begin{KeepFromToc} + % \textpreliminarycontents + % \end{KeepFromToc} +% \fi + +% Inserir errata + +% Inserir folha de aprovação. Isto é um exemplo de Folha de aprovação, elemento obrigatório da +% NBR 14724/2011 (seção 4.2.1.3). Você pode utilizar este modelo até a aprovação do trabalho. +% Após isso, substitua todo o conteúdo deste arquivo por uma imagem da página assinada pela banca com o comando abaixo: + +\ifforcedinclude\else\cleardoublepage\fi +\include{beforetext/folhadeaprovacao} +% \includepdf{folhadeaprovacao_final.pdf} + + +% Dedicatória +\ifforcedinclude\else\cleardoublepage\fi +\ifforcedinclude\else\input{beforetext/dedicatoria.tex}\fi + +% Agradecimentos +\ifforcedinclude\else\cleardoublepage\fi +\include{beforetext/agradecimentos} + +% Epígrafe +\ifforcedinclude\else\cleardoublepage\fi +\include{beforetext/epigrafe} + + +% Ajusta o espaçamento dos parágrafos do resumo +\setlength{\absparsep}{18pt} + +% RESUMOS +\ifforcedinclude\else\cleardoublepage\fi +\include{beforetext/resumos} + +% Some tables of contents +\ifforcedinclude\else + % inserir lista de figuras + \ifforcedinclude\else\cleardoublepage\fi + \addtotextpreliminarycontent{\listfigurename} + \pdfbookmark[0]{\listfigurename}{lof} + \listoffigures* + + % inserir lista de quadros + \ifforcedinclude\else\cleardoublepage\fi + \addtotextpreliminarycontent{\lang{List of Data Frames}{Lista de Quadros}} + \pdfbookmark[0]{Lista de Quadros}{lob} + \listofquadros* + + % inserir lista de tabelas + \ifforcedinclude\else\cleardoublepage\fi + \addtotextpreliminarycontent{\lang{List of Tables}{Lista de Tabelas}} + \pdfbookmark[0]{\listtablename}{lot} + \listoftables* + + % inserir códigos fonte (List of Listings `lol`) + \ifforcedinclude\else\cleardoublepage\fi + \addtotextpreliminarycontent{\lang{List of Source Codes}{Lista de Códigos Fonte}} + \pdfbookmark[0]{\lstlistingname}{lol} + \lstlistoflistings* +\fi + + +% inserir lista de abreviaturas e siglas +\ifforcedinclude\else\cleardoublepage\fi +\include{beforetext/siglas} + +% Inserir lista de símbolos +\ifforcedinclude\else\cleardoublepage\fi +\include{beforetext/simbolos} + +% Add the table of contents to the brief table of contents +\addtotextpreliminarycontent{\lang{Table of Contents}{Sumário}} + +% How to remove the self-reference of the ToC from the ToC? +% https://tex.stackexchange.com/questions/10943/how-to-remove-the-self-reference-of-the-toc-from-the-toc +\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/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} + + \tableofcontents + } + +\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/main.tex b/main.tex index 2961670..049fc46 100644 --- a/main.tex +++ b/main.tex @@ -194,7 +194,7 @@ \frenchspacing % ELEMENTOS PRÉ-TEXTUAIS - \input{setup/beforetext.tex} + \input{beforetext/beforetext.tex} % ELEMENTOS TEXTUAIS \textual diff --git a/setup b/setup index f501167..5e2327b 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit f501167ca80d56f2709485ec081fff0bb397f727 +Subproject commit 5e2327be24b1d771da2491a3af225e69d3a09190 From 928ea1612b8322248f2cf6ed9e3759059a69150b Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 9 Apr 2019 00:58:32 -0300 Subject: [PATCH 039/148] Fixed translations on beforetext/siglas.tex --- beforetext/siglas.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/beforetext/siglas.tex b/beforetext/siglas.tex index 849ce8a..da67252 100644 --- a/beforetext/siglas.tex +++ b/beforetext/siglas.tex @@ -3,7 +3,7 @@ \addtotextpreliminarycontent{\lang{List of Acronyms}{Lista de Siglas}} \begin{siglas} - \item[ABNT] Associação Brasileira de Normas Técnicas \lang{}{, Brazilian Association of Technical Standards} - \item[abnTeX] ABsurdas Normas para TeX \lang{}{, Absurd Standards for TeX} + \item[ABNT] \lang{Brazilian Association of Technical Standards}{Associação Brasileira de Normas Técnicas} + \item[abnTeX] \lang{Absurd Standards for TeX}{ABsurdas Normas para TeX} \end{siglas} From a5a8b0868b71d2386198a1d27f1b5901b6577897 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 9 Apr 2019 00:58:54 -0300 Subject: [PATCH 040/148] Fixed translations on beforetext/siglas.tex and beforetext.tex --- beforetext/beforetext.tex | 8 ++++---- beforetext/fichacatalografica.tex | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex index aadec81..087e74f 100644 --- a/beforetext/beforetext.tex +++ b/beforetext/beforetext.tex @@ -93,19 +93,19 @@ % inserir lista de quadros \ifforcedinclude\else\cleardoublepage\fi - \addtotextpreliminarycontent{\lang{List of Data Frames}{Lista de Quadros}} - \pdfbookmark[0]{Lista de Quadros}{lob} + \addtotextpreliminarycontent{\listofquadrosname} + \pdfbookmark[0]{\listofquadrosname}{lob} \listofquadros* % inserir lista de tabelas \ifforcedinclude\else\cleardoublepage\fi - \addtotextpreliminarycontent{\lang{List of Tables}{Lista de Tabelas}} + \addtotextpreliminarycontent{\listtablename} \pdfbookmark[0]{\listtablename}{lot} \listoftables* % inserir códigos fonte (List of Listings `lol`) \ifforcedinclude\else\cleardoublepage\fi - \addtotextpreliminarycontent{\lang{List of Source Codes}{Lista de Códigos Fonte}} + \addtotextpreliminarycontent{\lstlistingname} \pdfbookmark[0]{\lstlistingname}{lol} \lstlistoflistings* \fi diff --git a/beforetext/fichacatalografica.tex b/beforetext/fichacatalografica.tex index adb719a..50f156f 100644 --- a/beforetext/fichacatalografica.tex +++ b/beforetext/fichacatalografica.tex @@ -37,7 +37,7 @@ \hspace{0.5cm} \lang{Includes references}{Inclui referências} \bigskip - \hspace{0.45cm} + \hspace{0.44cm} \begin{inparaenum} \lang{\palavraschaveingles}{\palavraschaveportugues} \end{inparaenum} From 5716e1fff35000673aa58798a29196d020d38b81 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 9 Apr 2019 01:00:39 -0300 Subject: [PATCH 041/148] Deprecated the \tcc command due its inflexibly/limited flexibility --- beforetext/beforetext.tex | 6 ------ beforetext/folhadeaprovacao.tex | 11 ++++++----- main.tex | 20 +++++++++++--------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex index 087e74f..23c9c79 100644 --- a/beforetext/beforetext.tex +++ b/beforetext/beforetext.tex @@ -5,12 +5,6 @@ \hypersetup{pageanchor=false} -% O preambulo deve conter tipo do trabalho, objetivo, nome da instituição e a área de concentração. -\preambulo -{% - \imprimirtipotrabalho~\ifnotdefined\tcc{submetida}{submetido} ao \imprimirprograma~da \imprimirinstituicao~para a obtenção do Grau de \imprimirformacao. -} - % ELEMENTOS PRÉ-TEXTUAIS \ifforcedinclude\else % pretextual settings diff --git a/beforetext/folhadeaprovacao.tex b/beforetext/folhadeaprovacao.tex index 9080453..e458cea 100644 --- a/beforetext/folhadeaprovacao.tex +++ b/beforetext/folhadeaprovacao.tex @@ -12,9 +12,10 @@ \end{center} \begin{minipage}{\textwidth} - \ifnotdefined\tcc{Esta \imprimirtipotrabalho~foi julgada adequada}{Este \imprimirtipotrabalho~foi julgado adequado}~para obtenção do Título de \imprimirformacao, \ifnotempty{\imprimirarea}{na área - de concentração \imprimirarea,} e \ifnotdefined{\tcc}{aprovada}{aprovado} em sua forma final pelo \imprimirprograma~do \imprimircentro~da - \imprimirinstituicao. + Este(a) \imprimirtipotrabalho~ foi julgado adequado(a) para obtenção do Título de \imprimirformacao, + \ifnotempty{\imprimirarea}{na área de concentração \imprimirarea,} + e foi aprovado em sua forma final pelo \imprimirprograma~ + do \imprimircentro~ da \imprimirinstituicao. \end{minipage}% \end{center} @@ -28,10 +29,10 @@ % \newpage \begin{flushleft} - \textbf{Banca Examinadora:} + \textbf{\lang{Examination Board:}{Banca Examinadora:}} \end{flushleft} - + \assinatura{\textbf{\imprimirorientador} \\ \imprimirorientadorRotulo\\ \imprimirinstituicao~--~\imprimirinstituicaosigla} diff --git a/main.tex b/main.tex index 049fc46..3948f7c 100644 --- a/main.tex +++ b/main.tex @@ -71,9 +71,6 @@ % % Utilize o arquivo aftertext/references.bib para incluir sua bibliografia. \addbibresource{aftertext/references.bib} -% FIXME: Descomente a linha abaixo se seu trabalho for um TCC -\def\tcc{} - % FIXME: Preencha com seus dados \autor{Escreva aqui o Nome completo do Autor ou da Autora} \titulo{Título do trabalho} @@ -94,9 +91,11 @@ \local{Local da sua Defesa} % FIXME: Ano da sua defesa -\ano{Ano da sua defesa} +\ano{2001} \biblioteca{Biblioteca Universitária} -\instituicaosigla{Sigla da sua instituição} + +% FIXME: Sigla da sua instituição +\instituicaosigla{UFSC} \instituicao{Universidade Federal de Santa Catarina} % FIXME: Preencha com Tese, Dissertação, Monografia ou Trabalho de Conclusão de Curso, Bachelor's Thesis, etc @@ -115,15 +114,18 @@ % FIXME: Data da sua defesa \data{30 de março de 2001} -\newcommand{\palavraschaveportugues} -{% +% O preambulo deve conter tipo do trabalho, objetivo, nome da instituição e a área de concentração. +\preambulo{% + \imprimirtipotrabalho submetido ao \imprimirprograma da \imprimirinstituicao para a obtenção do Grau de \imprimirformacao. +} + +\newcommand{\palavraschaveportugues}{% \item Palavra Chave 1. \item Palavra Chave 2. \item Palavra Chave 3. } -\newcommand{\palavraschaveingles} -{% +\newcommand{\palavraschaveingles}{% \item Keyword 1. \item Keyword 2. \item Keyword 3. From 55b7941f8ada493e238421ece1a6089591dc6895 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 9 Apr 2019 23:01:54 -0300 Subject: [PATCH 042/148] Added English translation for folhadeaprovacao.tex --- beforetext/folhadeaprovacao.tex | 68 +++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/beforetext/folhadeaprovacao.tex b/beforetext/folhadeaprovacao.tex index e458cea..58b4dbd 100644 --- a/beforetext/folhadeaprovacao.tex +++ b/beforetext/folhadeaprovacao.tex @@ -1,6 +1,6 @@ -\addtotextpreliminarycontent{Folha de Aprovação} +\addtotextpreliminarycontent{\lang{Approval Sheet}{Folha de Aprovação}} \begin{folhadeaprovacao} @@ -12,46 +12,66 @@ \end{center} \begin{minipage}{\textwidth} - Este(a) \imprimirtipotrabalho~ foi julgado adequado(a) para obtenção do Título de \imprimirformacao, - \ifnotempty{\imprimirarea}{na área de concentração \imprimirarea,} - e foi aprovado em sua forma final pelo \imprimirprograma~ - do \imprimircentro~ da \imprimirinstituicao. + \lang + { + This \imprimirtipotrabalho~ was considered appropriate to get the \imprimirformacao, + \ifnotempty{\imprimirarea}{in the area of \imprimirarea,} + and it was approved by the \imprimirprograma~ of \imprimircentro~ of \imprimirinstituicao. + } + { + Este(a) \imprimirtipotrabalho~ foi julgado adequado(a) para obtenção do Título de \imprimirformacao, + \ifnotempty{\imprimirarea}{na área de concentração \imprimirarea,} + e foi aprovado em sua forma final pelo \imprimirprograma~ + do \imprimircentro~ da \imprimirinstituicao. + } \end{minipage}% - \end{center} + \begin{center} \imprimirlocal, \imprimirdata. \end{center} - \assinatura{\textbf{\imprimircoordenador} \\ - \imprimircoordenadorRotulo~do \imprimirprograma } - + \assinatura{% + \textbf{\imprimircoordenador} \\ + \imprimircoordenadorRotulo~\lang{of}{do} \imprimirprograma + } % \newpage \begin{flushleft} - \textbf{\lang{Examination Board:}{Banca Examinadora:}} + \textbf{\lang{Examination Board}{Banca Examinadora}:} \end{flushleft} + \assinatura{% + \textbf{\imprimirorientador} \\ \imprimirorientadorRotulo\\ + \imprimirinstituicao~--~\imprimirinstituicaosigla + } - \assinatura{\textbf{\imprimirorientador} \\ \imprimirorientadorRotulo\\ - \imprimirinstituicao~--~\imprimirinstituicaosigla} - - \ifnotempty{\imprimircoorientador}{ - \assinatura{\textbf{\imprimircoorientador} \\ \imprimircoorientadorRotulo \\ - \imprimirinstituicao~--~\imprimirinstituicaosigla} + \ifnotempty{\imprimircoorientador}{% + \assinatura{% + \textbf{\imprimircoorientador} \\ \imprimircoorientadorRotulo \\ + \imprimirinstituicao~--~\imprimirinstituicaosigla + } } - \assinatura{\textbf{Prof. Convidado 1} \\ - Instituição 1 -- Sigla 1} + \assinatura{% + \textbf{Prof. Convidado 1} \\ + Instituição 1 -- Sigla 1 + } - \assinatura{\textbf{Prof. Convidado 2} \\ - Instituição 2 -- Sigla 2} + \assinatura{% + \textbf{Prof. Convidado 2} \\ + Instituição 2 -- Sigla 2 + } - \assinatura{\textbf{Prof. Convidado 3} \\ - Instituição 3 -- Sigla 3} + \assinatura{% + \textbf{Prof. Convidado 3} \\ + Instituição 3 -- Sigla 3 + } - \assinatura{\textbf{Prof. Convidado 4} \\ - Instituição 4 -- Sigla 4} + \assinatura{% + \textbf{Prof. Convidado 4} \\ + Instituição 4 -- Sigla 4 + } \end{folhadeaprovacao} From 231dba48e01580c3a611adb64f202572dd39595d Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 10 Apr 2019 00:15:56 -0300 Subject: [PATCH 043/148] Deprecated the \swapcontents command from resumos.tex --- beforetext/resumos.tex | 85 +++++++++++++++++++++++++----------------- main.tex | 2 - 2 files changed, 51 insertions(+), 36 deletions(-) diff --git a/beforetext/resumos.tex b/beforetext/resumos.tex index 3692229..dc2529c 100644 --- a/beforetext/resumos.tex +++ b/beforetext/resumos.tex @@ -1,22 +1,6 @@ -\swapcontents -{ - % Changing babel package inside a single chapter - % https://tex.stackexchange.com/questions/20987/changing-babel-package-inside-a-single-chapter - % - % Multiple-language document - babel - selectlanguage vs begin/end{otherlanguage} - % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage - \addtotextpreliminarycontent{English's Abstract} - \begin{otherlanguage*}{english} - \begin{resumo}[Abstract] - - This is the english abstract. - \imprimirpalavraschave{Keywords}{\begin{inparaitem}[]\palavraschaveingles\end{inparaitem}} - \end{resumo} - \end{otherlanguage*} -} -{ +\newcommand{\imprimirbrazilabstract}{% \addtotextpreliminarycontent{Resumo em Português} \begin{otherlanguage*}{brazil} \begin{resumo}[Resumo] @@ -34,7 +18,7 @@ ser significativo, composto de uma sequência de frases concisas, afirmativas e não de uma enumeração de tópicos. Não deve conter citações. Deve usar o verbo na voz passiva. Abaixo do resumo, deve-se informar as palavras-chave (palavras ou expressões significativas retiradas do - texto) ou, termos retirados de thesaurus da área. + texto) ou, termos retirados de thesaurus da área. \imprimirpalavraschave{Palavras-chaves}{\begin{inparaitem}[]\palavraschaveportugues\end{inparaitem}} @@ -43,27 +27,60 @@ } +\newcommand{\imprimirenglishabstract}{% + % https://tex.stackexchange.com/questions/20987/changing-babel-package-inside-a-single-chapter + % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage + \addtotextpreliminarycontent{English's Abstract} + \begin{otherlanguage*}{english} + \begin{resumo}[Abstract] + + This is the English abstract. + + \imprimirpalavraschave{Keywords}{\begin{inparaitem}[]\palavraschaveingles\end{inparaitem}} + + \end{resumo} + \end{otherlanguage*} +} + + +% \newcommand{\imprimirfrenchabstract}{% +% \addtotextpreliminarycontent{Français Résumé} +% \begin{resumo}[Résumé] +% \begin{otherlanguage*}{french} +% Il s'agit d'un résumé en français. + +% \imprimirpalavraschave{Mots-clés}{latex. abntex. publication de textes.} +% \end{otherlanguage*} +% \end{resumo} +% } + + +% \newcommand{\imprimirspanishabstract}{% +% \addtotextpreliminarycontent{Español Resumen} +% \begin{resumo}[Resumen] +% \begin{otherlanguage*}{spanish} +% Este es el resumen en español. + +% \imprimirpalavraschave{Palabras clave}{latex. abntex. publicación de textos.} +% \end{otherlanguage*} +% \end{resumo} +% } -% % resumo em francês -% \addtotextpreliminarycontent{Français Résumé} -% \begin{resumo}[Résumé] -% \begin{otherlanguage*}{french} -% Il s'agit d'un résumé en français. -% \imprimirpalavraschave{Mots-clés}{latex. abntex. publication de textes.} -% \end{otherlanguage*} -% \end{resumo} +\makeatletter -% % resumo em espanhol -% \addtotextpreliminarycontent{Español Resumen} -% \begin{resumo}[Resumen] -% \begin{otherlanguage*}{spanish} -% Este es el resumen en español. +\ifenglish + \@ifundefined{imprimirenglishabstract}{}{\imprimirenglishabstract} + \@ifundefined{imprimirbrazilabstract}{}{\imprimirbrazilabstract} +\else + \@ifundefined{imprimirbrazilabstract}{}{\imprimirbrazilabstract} + \@ifundefined{imprimirenglishabstract}{}{\imprimirenglishabstract} +\fi -% \imprimirpalavraschave{Palabras clave}{latex. abntex. publicación de textos.} -% \end{otherlanguage*} -% \end{resumo} +\@ifundefined{imprimirfrenchabstract}{}{\imprimirfrenchabstract} +\@ifundefined{imprimirspanishabstract}{}{\imprimirspanishabstract} +\makeatother diff --git a/main.tex b/main.tex index 3948f7c..e7e0cc7 100644 --- a/main.tex +++ b/main.tex @@ -26,10 +26,8 @@ % https://tex.stackexchange.com/questions/385895/how-to-make-passoptionstopackage-add-the-option-as-the-last \ifenglish - \newcommand{\swapcontents}[2]{#1 #2} \PassOptionsToPackage{brazil,main=english,spanish,french}{babel} \else - \newcommand{\swapcontents}[2]{#2 #1} \PassOptionsToPackage{main=brazil,english,spanish,french}{babel} \fi From 1efaf3f347db65947eba90df4892a4bf720916bc Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 10 Apr 2019 21:42:20 -0300 Subject: [PATCH 044/148] Fixed Underfull \hbox badness on chapter_1.tex --- chapters/chapter_1.tex | 4 +++- setup | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/chapters/chapter_1.tex b/chapters/chapter_1.tex index 519bb1f..0ce29bb 100644 --- a/chapters/chapter_1.tex +++ b/chapters/chapter_1.tex @@ -324,13 +324,15 @@ \section{Tabelas} \index{tabelas}A \autoref{tab-nivinv} é um exemplo de tabela construída em \LaTeX{}. +% https://tex.stackexchange.com/questions/2441/how-to-add-a-forced-line-break-inside-a-table-cell +% https://tex.stackexchange.com/questions/484039/how-to-use-thead-with-left-align-locally-instead-of-globally/ \begin{table}[htb] \caption[Níveis de investigação]{Níveis de investigação.} \label{tab-nivinv} \resizebox{\textwidth}{!}{% \begin{tabular}{p{2.6cm}p{6.0cm}p{2.25cm}p{3.40cm}} \toprule - \textbf{Nível de Investigação} & \textbf{Insumos} & \textbf{Sistemas de Investigação} & \textbf{Produtos} \\ + {\raggedright \bfseries Nível de \\ Investigação} & \textbf{Insumos} & \textbf{Sistemas de Investigação} & \textbf{Produtos} \\ \midrule Meta-nível & Filosofia\index{filosofia} da Ciência & Epistemologia & Paradigma \\ diff --git a/setup b/setup index 5e2327b..4dd445a 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 5e2327be24b1d771da2491a3af225e69d3a09190 +Subproject commit 4dd445a5c761690fbf5bf11871b144f6811d281f From 52e765308051a17c8e3dd7980236b5a5b9f7ac7b Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 11 Apr 2019 00:08:14 -0300 Subject: [PATCH 045/148] Created the expanded resume for foreign languages --- beforetext/resumos.tex | 150 ++++++++++++++++++++++++++++++++++++++++- main.tex | 40 ++++++----- setup | 2 +- 3 files changed, 173 insertions(+), 19 deletions(-) diff --git a/beforetext/resumos.tex b/beforetext/resumos.tex index dc2529c..5c408ab 100644 --- a/beforetext/resumos.tex +++ b/beforetext/resumos.tex @@ -1,6 +1,7 @@ \newcommand{\imprimirbrazilabstract}{% + \cleardoublepage\phantomsection \addtotextpreliminarycontent{Resumo em Português} \begin{otherlanguage*}{brazil} \begin{resumo}[Resumo] @@ -30,6 +31,7 @@ \newcommand{\imprimirenglishabstract}{% % https://tex.stackexchange.com/questions/20987/changing-babel-package-inside-a-single-chapter % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage + \cleardoublepage\phantomsection \addtotextpreliminarycontent{English's Abstract} \begin{otherlanguage*}{english} \begin{resumo}[Abstract] @@ -71,8 +73,154 @@ \ifenglish - \@ifundefined{imprimirenglishabstract}{}{\imprimirenglishabstract} \@ifundefined{imprimirbrazilabstract}{}{\imprimirbrazilabstract} + + % https://tex.stackexchange.com/questions/11707/how-to-force-output-to-a-left-or-right-page + % https://tex.stackexchange.com/questions/132966/do-not-display-chapter-title-in-memoir-class + \cleardoublepage\phantomsection + \pretextualchapter{Resumo Expandido} + \addtotextpreliminarycontent{Resumo Expandido} + + \begin{otherlanguage*}{brazil} + \setlength{\parskip}{0.2cm} + \setlength{\parindent}{0.0cm} + + \section*{Introdução} + O resumo expandido é previsto na Resolução Normativa nº 95/CUn/2017, Art. 55, § 2, de 4 de + abril de 2017, e exigido para teses e dissertações escritas em idiomas estrangeiros (com + exceção dos cursos pertinentes ao estudo de idiomas estrangeiros – Programa de Pós-Graduação + em Estudos da Tradução e Programa de Pós-Graduação em Inglês: Estudos Linguísticos e + Literários). + + O resumo expandido é considerado um elemento pré-textual e deverá ser incluído no trabalho + após o resumo e antes do abstract. Deverá iniciar em página impar (no anverso de uma folha) + continuando no verso da folha. O texto deverá seguir o formato A5, com margens espelhadas: + superior 2,0 cm, inferior 1,5 cm, interna 2,5 cm e externa 1,5. Deve ser empregada a fonte + Time New Roman. Todo o texto deve ser digitado em tamanho 10,5. O espaçamento entre as + linhas deverá ser simples. A expressão “resumo expandido” deve seguir a mesma tipografia das + demais sessões primárias do trabalho. + + O texto do resumo expandido deve ser redigido em português e conter as seguintes seções (ver + modelo): Introdução, Objetivos, Metodologia, Resultados e Discussão e Considerações Finais. + Deve apresentar no mínimo duas (02) e, no máximo, cinco (05) páginas contendo a mesma + formatação em A5 do resumo e do abstract, bem como palavras-chave. + + \section*{Objetivos} + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus vitae dolor lacus. Ut + accumsan vitae felis nec porttitor. Integer interdum fringilla feugiat. Nullam pulvinar sit + amet tellus eget maximus. Donec sit amet magna eget justo semper fermentum vel eget velit. + In iaculis imperdiet mauris, ac ornare libero placerat non. Nulla libero lectus, ullamcorper + ac ornare eget, pulvinar ac nulla. Curabitur vestibulum non nisl eget sagittis. Proin + gravida lacus id eros bibendum interdum. Mauris ullamcorper elementum tortor sed consequat. + Integer tempus, est a lobortis vehicula, nisi mi fringilla augue, non semper leo metus in + quam. Etiam in leo maximus, pulvinar mi eget, vehicula risus. Donec sed dui semper, dictum + eros at, suscipit felis. + + Nam sagittis vel orci at tempus. Nulla non pellentesque eros. + Quisque cursus leo massa, eu ultricies nisl lacinia a. Nulla sit amet elementum ligula. + Proin sodales venenatis dictum. Ut et est cursus, vulputate velit et, viverra odio. Interdum + et malesuada fames ac ante ipsum primis in faucibus. Maecenas purus diam, tempor a semper + et, finibus a ex. Cras sagittis felis urna, et consequat arcu lacinia ut. Praesent blandit + venenatis ante nec porta. Duis rutrum, tellus vitae ullamcorper auctor, lectus ex laoreet + est, ac tristique ipsum arcu vitae nibh. Nam efficitur felis ut mi consectetur, nec auctor + odio ornare. In tempor vulputate urna, vitae cursus enim egestas eu. Proin diam augue, + dignissim vitae ligula eget, lobortis ornare odio. Duis quis elit augue. Fusce quis rhoncus + tortor. Donec hendrerit at massa a mattis. Sed ipsum neque, aliquam ut sem sed, ultrices + varius ligula. Suspendisse blandit, dolor ac rhoncus lacinia, dolor purus cursus purus, et + accumsan orci neque a leo. + + \section*{Metodologia} + Quisque efficitur dolor in lectus dapibus elementum. Nam ultrices blandit consectetur. + Nullam ultricies sit amet odio quis placerat. Aenean eget est elit. Maecenas et nulla dolor. + Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In + pulvinar velit sed mi sagittis ornare. Aenean rutrum suscipit egestas. Phasellus pharetra + eget ex in volutpat. Quisque eu arcu nunc. Vivamus arcu ligula, pharetra at rhoncus sit + amet, pulvinar sed eros. Sed porta ipsum ipsum, et fermentum magna volutpat sed. Vivamus + pharetra facilisis orci, sit amet luctus nisl pretium id. Sed consequat, arcu et congue + pulvinar, risus enim aliquet purus, eget venenatis libero leo sit amet metus. Maecenas vitae + elit sapien. Fusce mollis libero et gravida placerat. Proin ut quam quis justo aliquam + dictum. Donec volutpat convallis suscipit. Vivamus metus nisl, placerat ac enim vitae, + tempus ultricies odio. + + Aliquam ac vehicula arcu, non bibendum nulla. Morbi libero sem, + imperdiet vel quam et, posuere tempus nunc. Maecenas dictum magna sit amet ligula facilisis + commodo. Aliquam tellus diam, ornare vel elementum in, dignissim id purus. Ut at tortor non + sem molestie euismod non at turpis. Phasellus vitae bibendum tellus. Suspendisse odio enim, + faucibus eget congue quis, semper sit amet tortor. Sed ac lectus est. Pellentesque nec + mattis mi, et varius dolor. Aliquam quis massa ac tellus malesuada sollicitudin. Maecenas + ultrices risus massa, nec auctor risus sagittis id. Praesent a sapien nulla. Donec + tincidunt, metus quis hendrerit facilisis, enim augue convallis elit, sed consequat lacus + odio vitae magna. + + \section*{Resultados e Discussão} + Nullam sed cursus leo. Donec commodo volutpat hendrerit. Fusce et tempus lectus, feugiat + consequat est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per + inceptos himenaeos. Nam quis cursus mauris, non tempus orci. Phasellus lobortis et mauris at + vulputate. Sed nec nisl elementum lorem commodo gravida non a enim. Phasellus neque erat, + aliquet ac ligula ac, maximus vestibulum sem. Vestibulum vel tincidunt turpis. Donec lacinia + rutrum dolor dapibus bibendum. Mauris pharetra nibh nec tincidunt iaculis. Vivamus pharetra + bibendum nisl eget blandit. In lobortis diam non justo eleifend, id lobortis ante fringilla. + Donec libero tortor, suscipit vestibulum vestibulum id, rutrum accumsan turpis. Phasellus + sollicitudin luctus tincidunt. Suspendisse potenti. Nam semper metus et mi pharetra, in + pretium ligula fermentum. Integer consectetur, orci non placerat feugiat, dui ex gravida + augue, vel placerat ligula augue vel velit. Aliquam sollicitudin pellentesque congue. Donec + vitae turpis in ante posuere posuere. Pellentesque eu justo leo. Donec quis elit vitae leo + varius luctus quis eget justo. + + Vestibulum elementum ex neque, quis commodo tortor porttitor + mattis. Mauris vel sagittis turpis. Aenean ligula turpis, eleifend at felis sed, cursus + condimentum orci. Fusce accumsan est odio, eu venenatis massa sodales in. Curabitur a tempor + nisl. Quisque consequat sed arcu a congue. In viverra, ex ut hendrerit condimentum, urna sem + euismod eros, nec suscipit turpis dolor eget augue. Aenean posuere tellus et consectetur + condimentum. Mauris et massa et nulla fringilla interdum. Duis quis posuere elit. Donec at + ex non arcu faucibus rutrum et vel lectus. Vivamus pellentesque vestibulum rutrum. Sed + pretium, purus sed efficitur feugiat, nisi justo eleifend nibh, id suscipit nunc massa nec + lectus. In euismod enim eu sapien dictum sodales. Fusce sit amet vulputate orci. Nulla + rutrum mauris at purus aliquet, ac sollicitudin leo laoreet. Etiam elementum posuere + feugiat. Maecenas sed libero non augue fermentum ultricies eget at mi. Aenean auctor + bibendum lacus, dignissim aliquet est tempus eget. Maecenas tempus, nulla id rhoncus + suscipit, augue leo auctor mi, eget tincidunt magna mi quis dui. Maecenas ut elit in turpis + tincidunt ultrices. Nulla id nulla aliquet, porttitor eros quis, egestas justo. Nunc nisi + quam, egestas a accumsan fermentum, ultricies ac elit. + + Nulla porta auctor vestibulum. Sed + consectetur lacus molestie iaculis ullamcorper. Proin porta posuere massa a lacinia. Nunc a + lacinia orci, non vehicula ante. Vestibulum ipsum velit, congue et neque aliquam, imperdiet + ornare augue. Donec et congue sapien. Pellentesque consequat consectetur neque ut varius. In + aliquam ex quis ante venenatis dapibus. Vivamus et imperdiet urna. Vestibulum quis nibh + magna. In a congue lectus, eu sodales nunc. Suspendisse id. + + \section*{Considerações Finais} + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus vitae dolor lacus. Ut + accumsan vitae felis nec porttitor. Integer interdum fringilla feugiat. Nullam pulvinar sit + amet tellus eget maximus. Donec sit amet magna eget justo semper fermentum vel eget velit. + In iaculis imperdiet mauris, ac ornare libero placerat non. Nulla libero lectus, ullamcorper + ac ornare eget, pulvinar ac nulla. Curabitur vestibulum non nisl eget sagittis. Proin + gravida lacus id eros bibendum interdum. Mauris ullamcorper elementum tortor sed consequat. + Integer tempus, est a lobortis vehicula, nisi mi fringilla augue, non semper leo metus in + quam. Etiam in leo maximus, pulvinar mi eget, vehicula risus. Donec sed dui semper, dictum + eros at, suscipit felis. + + Nam sagittis vel orci at tempus. Nulla non pellentesque eros. + Quisque cursus leo massa, eu ultricies nisl lacinia a. Nulla sit amet elementum ligula. + Proin sodales venenatis dictum. Ut et est cursus, vulputate velit et, viverra odio. Interdum + et malesuada fames ac ante ipsum primis in faucibus. Maecenas purus diam, tempor a semper + et, finibus a ex. Cras sagittis felis urna, et consequat arcu lacinia ut. Praesent blandit + venenatis ante nec porta. Duis rutrum, tellus vitae ullamcorper auctor, lectus ex laoreet + est, ac tristique ipsum arcu vitae nibh. Nam efficitur felis ut mi consectetur, nec auctor + odio ornare. In tempor vulputate urna, vitae cursus enim egestas eu. Proin diam augue, + dignissim vitae ligula eget, lobortis ornare odio. Duis quis elit augue. Fusce quis rhoncus + tortor. Donec hendrerit at massa a mattis. Sed ipsum neque, aliquam ut sem sed, ultrices + varius ligula. Suspendisse blandit, dolor ac rhoncus lacinia, dolor purus cursus purus, et + accumsan orci neque a leo. + + + \imprimirpalavraschave{Palavras-chaves}{\begin{inparaitem}[]\palavraschaveportugues\end{inparaitem}} + + \end{otherlanguage*} + + \@ifundefined{imprimirenglishabstract}{}{\imprimirenglishabstract} + \else \@ifundefined{imprimirbrazilabstract}{}{\imprimirbrazilabstract} \@ifundefined{imprimirenglishabstract}{}{\imprimirenglishabstract} diff --git a/main.tex b/main.tex index e7e0cc7..71d86a6 100644 --- a/main.tex +++ b/main.tex @@ -70,51 +70,57 @@ \addbibresource{aftertext/references.bib} % FIXME: Preencha com seus dados -\autor{Escreva aqui o Nome completo do Autor ou da Autora} -\titulo{Título do trabalho} +\autor{\brazilword{Escreva aqui o Nome completo do Autor ou da Autora}} +\titulo{\lang{Work Title}{Título do trabalho}} % FIXME: Se houver subtítulo, descomente a linha abaixo -% \subtitulo{Subtítulo } +% \subtitulo{\lang{Subtitle}{Subtítulo}} % FIXME: Siglas para grau de formação Dr./Dra., Me./Ma, Bel. Bela. (inglês: PhD., MSc., Bs.) -\orientador{Nome completo do Orientador(a), \lang{Phd.}{Dr.}} +\orientador[\lang{Supervisor}{Orientador(a)}]{\brazilword{Nome completo do Orientador(a)}, \lang{Phd.}{Dr.}} % FIXME: Se houver coorientador, descomente a linha abaixo -% \coorientador[Coorientador(a)]{Nome do coorientador(a), \lang{Phd.}{Dr.}} +% \coorientador[\lang{Co-supervisor}{Coorientador(a)}]{\brazilword{Nome do coorientador(a)}, \lang{Phd.}{Dr.}} % FIXME: Preencher com o nome do Coordenador de TCCs/Teses do seu curso -\coordenador{Nome do Coordenador(a), \lang{Phd.}{Dr.}} +\coordenador{\brazilword{Nome do Coordenador(a)}, \lang{Phd.}{Dr.}} % FIXME: Local da sua defesa -\local{Local da sua Defesa} +\local{\brazilword{Local da sua Defesa}} % FIXME: Ano da sua defesa \ano{2001} -\biblioteca{Biblioteca Universitária} +\biblioteca{\brazilword{Biblioteca Universitária}} % FIXME: Sigla da sua instituição \instituicaosigla{UFSC} -\instituicao{Universidade Federal de Santa Catarina} +\instituicao{\brazilword{Universidade Federal de Santa Catarina}} % FIXME: Preencha com Tese, Dissertação, Monografia ou Trabalho de Conclusão de Curso, Bachelor's Thesis, etc -\tipotrabalho{Monografia} +\tipotrabalho{\lang{Monograph}{Monografia}} % FIXME: Se houver Área de Concentração, descomente a linha abaixo -% \area{Área de Concentração} +% \area{\lang{Concentration Area}{Área de Concentração}} % FIXME: Preencha com Doutor, Bacharel ou Mestrando -\formacao{Doutor em XXXXXX} -\programa{Programa de Pós-Graduação em XXXXXX} +\formacao{\lang{Doctorate in XXXXXX}{Doutor em XXXXXX}} +\programa{\lang{Postgraduate Program in XXXXXX}{Programa de Pós-Graduação em XXXXXX}} % FIXME: Preencha com Departamento de XXXXXX, Centro de XXXXXX -\centro{Departamento de XXXXXX, Centro de XXXXXX} +\centro{\lang{Department of XXXXXX, Center of XXXXXX}{Departamento de XXXXXX, Centro de XXXXXX}} % FIXME: Data da sua defesa -\data{30 de março de 2001} +\data{\lang{30 of march of 2001}{30 de março de 2001}} % O preambulo deve conter tipo do trabalho, objetivo, nome da instituição e a área de concentração. -\preambulo{% - \imprimirtipotrabalho submetido ao \imprimirprograma da \imprimirinstituicao para a obtenção do Grau de \imprimirformacao. +\preambulo{\lang% + {% + \imprimirtipotrabalho~ submitted to the \imprimirprograma~ of + \imprimirinstituicao~ for degree acquirement in \imprimirformacao. + }{% + \imprimirtipotrabalho~ submetido ao \imprimirprograma~ da + \imprimirinstituicao~ para a obtenção do Grau de \imprimirformacao. + } } \newcommand{\palavraschaveportugues}{% diff --git a/setup b/setup index 4dd445a..2f419eb 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 4dd445a5c761690fbf5bf11871b144f6811d281f +Subproject commit 2f419eb0ac7852ba4dd850db9e00d1c409bac7dd From f40f4f42dfe79d41e4158b66695344d49ec91bcd Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 11 Apr 2019 22:27:33 -0300 Subject: [PATCH 046/148] Set makefile.mk to copy the .gitignore from its parent --- .gitignore | 2 +- setup | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 54d553f..a88c17c 100644 --- a/.gitignore +++ b/.gitignore @@ -53,4 +53,4 @@ *.xdy *.tdo *.fls -*.lob +*.loq diff --git a/setup b/setup index 2f419eb..9a12904 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 2f419eb0ac7852ba4dd850db9e00d1c409bac7dd +Subproject commit 9a12904fcbcdb829a4fcfae3f2e29e63fd300db2 From 3722741b376f828a402c4df3097af04e0f5ef730 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 11 Apr 2019 23:16:07 -0300 Subject: [PATCH 047/148] Added coordinator label translation on main.tex --- main.tex | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/main.tex b/main.tex index 71d86a6..2088b44 100644 --- a/main.tex +++ b/main.tex @@ -83,7 +83,7 @@ % \coorientador[\lang{Co-supervisor}{Coorientador(a)}]{\brazilword{Nome do coorientador(a)}, \lang{Phd.}{Dr.}} % FIXME: Preencher com o nome do Coordenador de TCCs/Teses do seu curso -\coordenador{\brazilword{Nome do Coordenador(a)}, \lang{Phd.}{Dr.}} +\coordenador[\lang{Coordinator}{Coordenador(a)}]{\brazilword{Nome do Coordenador(a)}, \lang{Phd.}{Dr.}} % FIXME: Local da sua defesa \local{\brazilword{Local da sua Defesa}} @@ -94,7 +94,7 @@ % FIXME: Sigla da sua instituição \instituicaosigla{UFSC} -\instituicao{\brazilword{Universidade Federal de Santa Catarina}} +\instituicao{\lang{Federal University of}{Universidade Federal de} \brazilword{Santa Catarina}} % FIXME: Preencha com Tese, Dissertação, Monografia ou Trabalho de Conclusão de Curso, Bachelor's Thesis, etc \tipotrabalho{\lang{Monograph}{Monografia}} @@ -103,11 +103,20 @@ % \area{\lang{Concentration Area}{Área de Concentração}} % FIXME: Preencha com Doutor, Bacharel ou Mestrando -\formacao{\lang{Doctorate in XXXXXX}{Doutor em XXXXXX}} -\programa{\lang{Postgraduate Program in XXXXXX}{Programa de Pós-Graduação em XXXXXX}} +\formacao{\lang + {Doctorate in XXXXXX} + {Doutor em XXXXXX} +} +\programa{\lang + {Postgraduate Program in XXXXXX} + {Programa de Pós-Graduação em XXXXXX} +} % FIXME: Preencha com Departamento de XXXXXX, Centro de XXXXXX -\centro{\lang{Department of XXXXXX, Center of XXXXXX}{Departamento de XXXXXX, Centro de XXXXXX}} +\centro{\lang + {Department of XXXXXX, Center of XXXXXX} + {Departamento de XXXXXX, Centro de XXXXXX} +} % FIXME: Data da sua defesa \data{\lang{30 of march of 2001}{30 de março de 2001}} From 01e725549a9fdf2685e053adead1bcb7f15a2c05 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 11 Apr 2019 23:24:40 -0300 Subject: [PATCH 048/148] Renamed List of Frames file extension from lob to loq --- beforetext/beforetext.tex | 4 ++-- main.tex | 2 +- setup | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex index 23c9c79..ddc449b 100644 --- a/beforetext/beforetext.tex +++ b/beforetext/beforetext.tex @@ -88,7 +88,7 @@ % inserir lista de quadros \ifforcedinclude\else\cleardoublepage\fi \addtotextpreliminarycontent{\listofquadrosname} - \pdfbookmark[0]{\listofquadrosname}{lob} + \pdfbookmark[0]{\listofquadrosname}{loq} \listofquadros* % inserir lista de tabelas @@ -114,7 +114,7 @@ \include{beforetext/simbolos} % Add the table of contents to the brief table of contents -\addtotextpreliminarycontent{\lang{Table of Contents}{Sumário}} +\addtotextpreliminarycontent{\contentsname} % How to remove the self-reference of the ToC from the ToC? % https://tex.stackexchange.com/questions/10943/how-to-remove-the-self-reference-of-the-toc-from-the-toc diff --git a/main.tex b/main.tex index 2088b44..72ce125 100644 --- a/main.tex +++ b/main.tex @@ -90,7 +90,7 @@ % FIXME: Ano da sua defesa \ano{2001} -\biblioteca{\brazilword{Biblioteca Universitária}} +\biblioteca{\lang{University Library}{Biblioteca Universitária}} % FIXME: Sigla da sua instituição \instituicaosigla{UFSC} diff --git a/setup b/setup index 9a12904..c47661c 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 9a12904fcbcdb829a4fcfae3f2e29e63fd300db2 +Subproject commit c47661c0172c9ea7e86913d70dec887f113e6c8d From ccb56f37cde85422a01de472226426a9c4dca370 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 12 Apr 2019 00:14:45 -0300 Subject: [PATCH 049/148] Fixed latex putting whitespaces where it should not on main.tex --- main.tex | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main.tex b/main.tex index 72ce125..dc70986 100644 --- a/main.tex +++ b/main.tex @@ -105,17 +105,17 @@ % FIXME: Preencha com Doutor, Bacharel ou Mestrando \formacao{\lang {Doctorate in XXXXXX} - {Doutor em XXXXXX} + {Doutor em XXXXXX}% } \programa{\lang {Postgraduate Program in XXXXXX} - {Programa de Pós-Graduação em XXXXXX} + {Programa de Pós-Graduação em XXXXXX}% } % FIXME: Preencha com Departamento de XXXXXX, Centro de XXXXXX \centro{\lang {Department of XXXXXX, Center of XXXXXX} - {Departamento de XXXXXX, Centro de XXXXXX} + {Departamento de XXXXXX, Centro de XXXXXX}% } % FIXME: Data da sua defesa @@ -125,11 +125,11 @@ \preambulo{\lang% {% \imprimirtipotrabalho~ submitted to the \imprimirprograma~ of - \imprimirinstituicao~ for degree acquirement in \imprimirformacao. + \imprimirinstituicao~ for degree acquirement in \imprimirformacao.% }{% \imprimirtipotrabalho~ submetido ao \imprimirprograma~ da - \imprimirinstituicao~ para a obtenção do Grau de \imprimirformacao. - } + \imprimirinstituicao~ para a obtenção do Grau de \imprimirformacao.% + }% } \newcommand{\palavraschaveportugues}{% From cfb0b3c07bbf5622a92dd7e268fe7d22dce37e31 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 12 Apr 2019 00:29:03 -0300 Subject: [PATCH 050/148] Fixed possibility of double white spacing by using ~ and a space --- beforetext/folhadeaprovacao.tex | 8 ++++---- main.tex | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/beforetext/folhadeaprovacao.tex b/beforetext/folhadeaprovacao.tex index 58b4dbd..f500d13 100644 --- a/beforetext/folhadeaprovacao.tex +++ b/beforetext/folhadeaprovacao.tex @@ -14,15 +14,15 @@ \begin{minipage}{\textwidth} \lang { - This \imprimirtipotrabalho~ was considered appropriate to get the \imprimirformacao, + This \imprimirtipotrabalho~was considered appropriate to get the \imprimirformacao, \ifnotempty{\imprimirarea}{in the area of \imprimirarea,} - and it was approved by the \imprimirprograma~ of \imprimircentro~ of \imprimirinstituicao. + and it was approved by the \imprimirprograma~of \imprimircentro~of \imprimirinstituicao. } { - Este(a) \imprimirtipotrabalho~ foi julgado adequado(a) para obtenção do Título de \imprimirformacao, + Este(a) \imprimirtipotrabalho~foi julgado adequado(a) para obtenção do Título de \imprimirformacao, \ifnotempty{\imprimirarea}{na área de concentração \imprimirarea,} e foi aprovado em sua forma final pelo \imprimirprograma~ - do \imprimircentro~ da \imprimirinstituicao. + do \imprimircentro~da \imprimirinstituicao. } \end{minipage}% \end{center} diff --git a/main.tex b/main.tex index dc70986..db4fa1e 100644 --- a/main.tex +++ b/main.tex @@ -119,16 +119,16 @@ } % FIXME: Data da sua defesa -\data{\lang{30 of march of 2001}{30 de março de 2001}} +\data{\lang{30 of march of}{30 de março de} 2001} % O preambulo deve conter tipo do trabalho, objetivo, nome da instituição e a área de concentração. \preambulo{\lang% {% - \imprimirtipotrabalho~ submitted to the \imprimirprograma~ of - \imprimirinstituicao~ for degree acquirement in \imprimirformacao.% + \imprimirtipotrabalho~submitted to the \imprimirprograma~of + \imprimirinstituicao~for degree acquirement in \imprimirformacao.% }{% - \imprimirtipotrabalho~ submetido ao \imprimirprograma~ da - \imprimirinstituicao~ para a obtenção do Grau de \imprimirformacao.% + \imprimirtipotrabalho~submetido ao \imprimirprograma~da + \imprimirinstituicao~para a obtenção do Grau de \imprimirformacao.% }% } From f57e3cbd4d5a45a554c722182ef37f6737915cff Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 12 Apr 2019 00:39:41 -0300 Subject: [PATCH 051/148] Set to use Times New Roman font on expanded summary at resumos.tex --- beforetext/resumos.tex | 2 ++ 1 file changed, 2 insertions(+) diff --git a/beforetext/resumos.tex b/beforetext/resumos.tex index 5c408ab..d9ce5af 100644 --- a/beforetext/resumos.tex +++ b/beforetext/resumos.tex @@ -75,6 +75,7 @@ \ifenglish \@ifundefined{imprimirbrazilabstract}{}{\imprimirbrazilabstract} + % https://tex.stackexchange.com/questions/331108/times-new-roman-in-latex-just-some-text % https://tex.stackexchange.com/questions/11707/how-to-force-output-to-a-left-or-right-page % https://tex.stackexchange.com/questions/132966/do-not-display-chapter-title-in-memoir-class \cleardoublepage\phantomsection @@ -84,6 +85,7 @@ \begin{otherlanguage*}{brazil} \setlength{\parskip}{0.2cm} \setlength{\parindent}{0.0cm} + \fontfamily{ptm}\selectfont \section*{Introdução} O resumo expandido é previsto na Resolução Normativa nº 95/CUn/2017, Art. 55, § 2, de 4 de From d239c6165a5a1af8c9cc5042b32c251c667ca481 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 12 Apr 2019 01:06:47 -0300 Subject: [PATCH 052/148] Re-added removed \showfont commands old from commit changes to allow easier to set several parameters 4ef05ede356b0a1cd18543e78e37d198cec3589c --- aftertext/anexo_b.tex | 10 +++++----- aftertext/apendice_a.tex | 10 +++++----- beforetext/epigrafe.tex | 4 ++-- beforetext/resumos.tex | 4 ++-- chapters/chapter_1.tex | 12 +++++++++--- chapters/chapter_2.tex | 4 +++- chapters/chapter_3.tex | 4 +++- chapters/chapter_4.tex | 4 +++- chapters/intro.tex | 9 ++++----- setup | 2 +- 10 files changed, 37 insertions(+), 26 deletions(-) diff --git a/aftertext/anexo_b.tex b/aftertext/anexo_b.tex index de8f729..dd02d97 100644 --- a/aftertext/anexo_b.tex +++ b/aftertext/anexo_b.tex @@ -17,14 +17,14 @@ % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage \begin{otherlanguage*}{english} - +\englishword{\showfont} 1. How to display the font size in use in the final output, 2. How to display the font size in use in the final output, 3. How to display the font size in use in the final output, -\section[Some encoding tests]{ } +\section[Some encoding tests]{\englishword{\showfont}} 1. How to display the font size in use in the final output, 2. How to display the font size in use in the final output, @@ -40,7 +40,7 @@ 11. How to display the font size in use in the final output, 12. How to display the font size in use in the final output, -\subsection{ } +\subsection{\englishword{\showfont}} 1. How to display the font size in use in the final output, 2. How to display the font size in use in the final output, @@ -56,7 +56,7 @@ \subsection{ } 11. How to display the font size in use in the final output, 12. How to display the font size in use in the final output, -\subsubsection{ } +\subsubsection{\englishword{\showfont}} 1. How to display the font size in use in the final output, 2. How to display the font size in use in the final output, @@ -72,7 +72,7 @@ \subsubsection{ } 11. How to display the font size in use in the final output, 12. How to display the font size in use in the final output, -\subsubsubsection{ } +\subsubsubsection{\englishword{\showfont}} 1. How to display the font size in use in the final output, 2. How to display the font size in use in the final output, diff --git a/aftertext/apendice_a.tex b/aftertext/apendice_a.tex index 4d6e949..5f2c070 100644 --- a/aftertext/apendice_a.tex +++ b/aftertext/apendice_a.tex @@ -18,7 +18,7 @@ % https://tex.stackexchange.com/questions/36526/multiple-language-document-babel-selectlanguage-vs-begin-endotherlanguage \begin{otherlanguage*}{english} - +\englishword{\showfont} 1. How to display the font size in use in the final output, 2. How to display the font size in use in the final output, @@ -40,7 +40,7 @@ -\section[Some encoding tests]{ } +\section[Some encoding tests]{\englishword{\showfont}} 1. How to display the font size in use in the final output, 2. How to display the font size in use in the final output, @@ -56,7 +56,7 @@ 11. How to display the font size in use in the final output, 12. How to display the font size in use in the final output, -\subsection{ } +\subsection{\englishword{\showfont}} 1. How to display the font size in use in the final output, 2. How to display the font size in use in the final output, @@ -72,7 +72,7 @@ \subsection{ } 11. How to display the font size in use in the final output, 12. How to display the font size in use in the final output, -\subsubsection{ } +\subsubsection{\englishword{\showfont}} 1. How to display the font size in use in the final output, 2. How to display the font size in use in the final output, @@ -88,7 +88,7 @@ \subsubsection{ } 11. How to display the font size in use in the final output, 12. How to display the font size in use in the final output, -\subsubsubsection{ } +\subsubsubsection{\englishword{\showfont}} 1. How to display the font size in use in the final output, 2. How to display the font size in use in the final output, diff --git a/beforetext/epigrafe.tex b/beforetext/epigrafe.tex index 5fa4a07..e81c2cd 100644 --- a/beforetext/epigrafe.tex +++ b/beforetext/epigrafe.tex @@ -30,10 +30,10 @@ } { \begin{flushright} - \textit{``Assim como aquele pecado da juventude, este documento te perseguirá pelo resto da vida. ''} \\ Enio Valmor Kassick + \textit{``Assim como aquele pecado da juventude, este documento te perseguirá pelo resto da vida.''} \\ Enio Valmor Kassick \end{flushright} \begin{flushright} - \textit{``Estupidez trará mais autoconfiança do que o conhecimento e a bravura juntas.''} \\ Adriano Ruseler + \textit{``Estupidez trará mais autoconfiança do que o conhecimento e a bravura juntas. \englishword{\showfont}''} \\ Adriano Ruseler \end{flushright} } diff --git a/beforetext/resumos.tex b/beforetext/resumos.tex index d9ce5af..c8420e8 100644 --- a/beforetext/resumos.tex +++ b/beforetext/resumos.tex @@ -19,7 +19,7 @@ ser significativo, composto de uma sequência de frases concisas, afirmativas e não de uma enumeração de tópicos. Não deve conter citações. Deve usar o verbo na voz passiva. Abaixo do resumo, deve-se informar as palavras-chave (palavras ou expressões significativas retiradas do - texto) ou, termos retirados de thesaurus da área. + texto) ou, termos retirados de thesaurus da área. \englishword{\showfont} \imprimirpalavraschave{Palavras-chaves}{\begin{inparaitem}[]\palavraschaveportugues\end{inparaitem}} @@ -105,7 +105,7 @@ O texto do resumo expandido deve ser redigido em português e conter as seguintes seções (ver modelo): Introdução, Objetivos, Metodologia, Resultados e Discussão e Considerações Finais. Deve apresentar no mínimo duas (02) e, no máximo, cinco (05) páginas contendo a mesma - formatação em A5 do resumo e do abstract, bem como palavras-chave. + formatação em A5 do resumo e do abstract, bem como palavras-chave. \englishword{\showfont} \section*{Objetivos} Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus vitae dolor lacus. Ut diff --git a/chapters/chapter_1.tex b/chapters/chapter_1.tex index 0ce29bb..4e81d66 100644 --- a/chapters/chapter_1.tex +++ b/chapters/chapter_1.tex @@ -46,9 +46,14 @@ \begin{flushright} - \englishword{ } + \englishword{\showfont} \end{flushright} +% Why latex is letting my text goes out of the screen? +% https://tex.stackexchange.com/questions/386762/why-latex-is-letting-my-text-goes-out-of-the-screen +\sloppy +\textbf{textbf: \englishword{\showfont}} +\fussy % \newpage \begin{otherlanguage*}{brazil} @@ -245,6 +250,7 @@ \section{Rotação de equações} \section{Codificação dos arquivos: UTF8} % --- +\englishword{\showfont} A codificação de todos os arquivos do \abnTeX{} é \texttt{UTF8}. É necessário que você utilize a mesma codificação nos documentos que escrever, inclusive nos @@ -264,10 +270,10 @@ \section{Citações diretas} utilizado e sem as aspas. No caso de documentos datilografados, deve-se observar apenas o recuo \cite[5.3]{NBR10520:2002}. - +\englishword{\showfont} \end{citacao} - +\englishword{\showfont} Use o ambiente assim: \begin{lstlisting}[language=tex] diff --git a/chapters/chapter_2.tex b/chapters/chapter_2.tex index c5bfa55..0fac9d9 100644 --- a/chapters/chapter_2.tex +++ b/chapters/chapter_2.tex @@ -11,7 +11,7 @@ \chapter{Titulo do Capitulo} \begin{flushright} - + \englishword{\showfont} \end{flushright} @@ -20,6 +20,8 @@ Lipsum me [1] + \englishword{\showfont} + Lipsum me [2-3] \end{otherlanguage*} diff --git a/chapters/chapter_3.tex b/chapters/chapter_3.tex index 1d080fb..3cca416 100644 --- a/chapters/chapter_3.tex +++ b/chapters/chapter_3.tex @@ -11,12 +11,14 @@ \chapter[Graduated]{Graduated carton sauce} \begin{flushright} - + \englishword{\showfont} \end{flushright} % \newpage \section{Before the very first basketball} + \englishword{\showfont} + lipsum me [21-22] \newpage diff --git a/chapters/chapter_4.tex b/chapters/chapter_4.tex index e90bf4f..a8b69d8 100644 --- a/chapters/chapter_4.tex +++ b/chapters/chapter_4.tex @@ -13,7 +13,7 @@ {Some very big title you are cutting it out so if this nice on the table of contents} \begin{flushright} - + \englishword{\showfont} \end{flushright} % \newpage @@ -23,6 +23,8 @@ Nutrition foot carrots + \englishword{\showfont} + Lipsum me [24-26] \newpage diff --git a/chapters/intro.tex b/chapters/intro.tex index 060b2a7..b8d8f7b 100644 --- a/chapters/intro.tex +++ b/chapters/intro.tex @@ -72,7 +72,7 @@ \chapter{\lang{Introduction}{Introdução}} \setlength\extrarowheight{2pt} \begin{tabularx}{\linewidth}{>{\RaggedRight}p{3cm}|>{\arraybackslash}X} -\caption{Formatação do texto \protect } +\caption{Formatação do texto \protect\englishword{\showfont}} \label{tab:a_table_formatacao_de_texto} \\ \hline \endfirsthead @@ -80,21 +80,20 @@ \chapter{\lang{Introduction}{Introdução}} % How to set font size of footnotes correctly in memoir? % https://tex.stackexchange.com/questions/213927/how-to-set-font-size-of-footnotes-correctly-in-memoir \multicolumn{2}{p{\dimexpr\textwidth-2\tabcolsep\relax}}{\ufsccaptionsize\tablename~\thetable: -Formatação do texto (continuação) \protect } \\ +Formatação do texto (continuação) \protect\englishword{\showfont}} \\ \hline \endhead % Set multicolumn width to default table width % https://tex.stackexchange.com/questions/99326/set-multicolumn-width-to-default-table-width \hline -\multicolumn{2}{p{\dimexpr\textwidth-2\tabcolsep\relax}}{\footnotesize continua na próxima página\protect } +\multicolumn{2}{p{\dimexpr\textwidth-2\tabcolsep\relax}}{\footnotesize continua na próxima página\protect\englishword{\showfont}} \endfoot \hline \multicolumn{2}{p{\dimexpr\textwidth-2\tabcolsep\relax}}{\fonte{O autor} } \endlastfoot - - Cor & Branco - \\ \hline + Cor & Branco - \englishword{\showfont} \\ \hline Formato do papel & A5 \\ \hline Gramatura & 75 \\ \hline Impressão & Frente e verso \\ \hline diff --git a/setup b/setup index c47661c..fea6db1 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit c47661c0172c9ea7e86913d70dec887f113e6c8d +Subproject commit fea6db1db93832766537466e051d8fc76fdd3597 From 2bee97887e3a8a3062e6a5bd3892382c27a07dd2 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 12 Apr 2019 01:16:02 -0300 Subject: [PATCH 053/148] Created the thesis_before.pdf as a full PDF example of the template --- README.md | 2 +- pictures | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b089ffc..bdf829e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Esse projeto não está vinculado a nenhum órgão da UFSC. ## Modelo em PDF Se você quer ter uma ideia de como é o modelo, -a compialção deve resultar no seguinte [PDF](https://dl.dropbox.com/s/kevxtvs7bx9c8f7/main.pdf) +a compilação deve resultar no seguinte [PDF](https://github.com/evandroforks/abntex2-ufsc-imagens/blob/master/pdf_exemplo_completo.pdf) ### Instalar `LaTeX` e `abnTeX2` diff --git a/pictures b/pictures index 7732bea..ba4dc38 160000 --- a/pictures +++ b/pictures @@ -1 +1 @@ -Subproject commit 7732beae38b242bd68476c98afba4d685058759a +Subproject commit ba4dc38b1ec6e4ace537d7b6f7b798add5037e4e From 946670b87be6209304a88577d6fd6f0bd475eb31 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 12 Apr 2019 01:37:24 -0300 Subject: [PATCH 054/148] Fixed misspelled extension name on README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bdf829e..34f54c8 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ você pode utilizar seu editor git favorito, e pedir para ele compilar o documento a partir do arquivo `main.tex` no diretório principal. Por conveniência, -você também pode executar o arquivo `build.cmd` caso você esteja no Windows, +você também pode executar o arquivo `build.bat` caso você esteja no Windows, ou executar o comando `make` caso você esteja no Linux. From 866624a75bb830d6a5a1afdf648197a72cb8453a Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 14 Apr 2019 15:02:58 -0300 Subject: [PATCH 055/148] Added installation instructions for latex on Linux and Windows --- README.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 34f54c8..47d84c6 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,13 @@ Se você quer ter uma ideia de como é o modelo, a compilação deve resultar no seguinte [PDF](https://github.com/evandroforks/abntex2-ufsc-imagens/blob/master/pdf_exemplo_completo.pdf) -### Instalar `LaTeX` e `abnTeX2` +## Instalar `LaTeX` e `abnTeX2` + +Para Linux, +é necessário ter a instalação TeXLive 2018, +e não TeXLive 2017. +Veja a sua versão do TeXLive com o comando: +1. `tex --version` Para poder utilizar a classe é necessário ter uma distribuição atual do LaTeX, incluindo o pacote abnTeX2. @@ -25,6 +31,20 @@ As configurações específicas para cada sistema podem ser encontradas nos link 1. [abnTeX2 Instalação](https://github.com/abntex/abntex2/wiki/Instalacao) +### Instalação Ubuntu/Linux Mint and others + +``` +sudo apt-get install texlive-full +sudo apt-get install xzdec +``` + + +### Instalação Windows + +1. Download the Installer on: https://miktex.org/download +1. When installing, select for it to install all latex packages. + + ## Baixando diretamente modelo UFSC Caso queria, From 6b74ca10704aa66e28b299bcea986e529fbfdd7e Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 15 Apr 2019 00:10:46 -0300 Subject: [PATCH 056/148] Fixed it not building on Tex Live 2017 --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index fea6db1..92ca843 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit fea6db1db93832766537466e051d8fc76fdd3597 +Subproject commit 92ca843f897073f6edcf712557783436b19fcda3 From 8c1b2e12d6d0becb85624a01e68b58f9791321b3 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 15 Apr 2019 00:22:59 -0300 Subject: [PATCH 057/148] Fixed it not creating the index and reenabled the latexmk rule on Tex Live because it is working now the cache directories are created. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 92ca843..a326b85 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 92ca843f897073f6edcf712557783436b19fcda3 +Subproject commit a326b8565ce548713108982388c50ddff4815692 From 8391c5fb7cf89d63adc46e3015a498ac3e99dd9a Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 15 Apr 2019 01:55:02 -0300 Subject: [PATCH 058/148] Created the file fc-portuges.def to fix th Ovefleaf shameless bug Portuguese issue on sharelatex https://github.com/nlct/fmtcount/issues/26 --- fc-portuges.def | 714 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 714 insertions(+) create mode 100644 fc-portuges.def diff --git a/fc-portuges.def b/fc-portuges.def new file mode 100644 index 0000000..ccc22b9 --- /dev/null +++ b/fc-portuges.def @@ -0,0 +1,714 @@ +%% +%% +%% This fix exists here only to fix Ovefleaf shameless bug: +%% https://github.com/nlct/fmtcount/issues/26 +%% +%% This is file `fc-portuges.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% fmtcount.dtx (with options: `fc-portuges.def,package') +%% +%% fmtcount.dtx +%% Copyright 2017 Nicola Talbot and Vincent Belache +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%%\subsection{Prefixes} +%%\label{sec:latin-prefixes} +%% +%%\begin{definition}[\DescribeMacro{\latinnumeralstring}] +%%\cs{latinnumeralstring}\marg{counter}\oarg{prefix options} +%%\end{definition} +%% +%%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}] +%%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options} +%%\end{definition} +%% Local Variables: +%% coding: utf-8 +%% End: +\ProvidesFCLanguage{portuges}[2017/12/26]% +\newcommand*\@ordinalMportuges[2]{% + \ifnum#1=0\relax + \edef#2{\number#1}% + \else + \edef#2{\number#1\relax\noexpand\fmtord{o}}% + \fi +}% +\global\let\@ordinalMportuges\@ordinalMportuges +\newcommand*\@ordinalFportuges[2]{% + \ifnum#1=0\relax + \edef#2{\number#1}% + \else + \edef#2{\number#1\relax\noexpand\fmtord{a}}% + \fi +}% +\global\let\@ordinalFportuges\@ordinalFportuges +\global\let\@ordinalNportuges\@ordinalMportuges +\newcommand*\@@unitstringportuges[1]{% + \ifcase#1\relax + zero% + \or um% + \or dois% + \or tr\^es% + \or quatro% + \or cinco% + \or seis% + \or sete% + \or oito% + \or nove% + \fi +}% +\global\let\@@unitstringportuges\@@unitstringportuges +\newcommand*\@@unitstringFportuges[1]{% + \ifcase#1\relax + zero% + \or uma% + \or duas% + \or tr\^es% + \or quatro% + \or cinco% + \or seis% + \or sete% + \or oito% + \or nove% + \fi +}% +\global\let\@@unitstringFportuges\@@unitstringFportuges +\newcommand*\@@tenstringportuges[1]{% + \ifcase#1\relax + \or dez% + \or vinte% + \or trinta% + \or quarenta% + \or cinq\"uenta% + \or sessenta% + \or setenta% + \or oitenta% + \or noventa% + \or cem% + \fi +}% +\global\let\@@tenstringportuges\@@tenstringportuges +\newcommand*\@@teenstringportuges[1]{% + \ifcase#1\relax + dez% + \or onze% + \or doze% + \or treze% + \or catorze% + \or quinze% + \or dezasseis% + \or dezassete% + \or dezoito% + \or dezanove% + \fi +}% +\global\let\@@teenstringportuges\@@teenstringportuges +\newcommand*\@@hundredstringportuges[1]{% + \ifcase#1\relax + \or cento% + \or duzentos% + \or trezentos% + \or quatrocentos% + \or quinhentos% + \or seiscentos% + \or setecentos% + \or oitocentos% + \or novecentos% + \fi +}% +\global\let\@@hundredstringportuges\@@hundredstringportuges +\newcommand*\@@hundredstringFportuges[1]{% + \ifcase#1\relax + \or cento% + \or duzentas% + \or trezentas% + \or quatrocentas% + \or quinhentas% + \or seiscentas% + \or setecentas% + \or oitocentas% + \or novecentas% + \fi +}% +\global\let\@@hundredstringFportuges\@@hundredstringFportuges +\newcommand*\@@Unitstringportuges[1]{% + \ifcase#1\relax + Zero% + \or Um% + \or Dois% + \or Tr\^es% + \or Quatro% + \or Cinco% + \or Seis% + \or Sete% + \or Oito% + \or Nove% + \fi +}% +\global\let\@@Unitstringportuges\@@Unitstringportuges +\newcommand*\@@UnitstringFportuges[1]{% + \ifcase#1\relax + Zera% + \or Uma% + \or Duas% + \or Tr\^es% + \or Quatro% + \or Cinco% + \or Seis% + \or Sete% + \or Oito% + \or Nove% + \fi +}% +\global\let\@@UnitstringFportuges\@@UnitstringFportuges +\newcommand*\@@Tenstringportuges[1]{% + \ifcase#1\relax + \or Dez% + \or Vinte% + \or Trinta% + \or Quarenta% + \or Cinq\"uenta% + \or Sessenta% + \or Setenta% + \or Oitenta% + \or Noventa% + \or Cem% + \fi +}% +\global\let\@@Tenstringportuges\@@Tenstringportuges +\newcommand*\@@Teenstringportuges[1]{% + \ifcase#1\relax + Dez% + \or Onze% + \or Doze% + \or Treze% + \or Catorze% + \or Quinze% + \or Dezasseis% + \or Dezassete% + \or Dezoito% + \or Dezanove% + \fi +}% +\global\let\@@Teenstringportuges\@@Teenstringportuges +\newcommand*\@@Hundredstringportuges[1]{% + \ifcase#1\relax + \or Cento% + \or Duzentos% + \or Trezentos% + \or Quatrocentos% + \or Quinhentos% + \or Seiscentos% + \or Setecentos% + \or Oitocentos% + \or Novecentos% + \fi +}% +\global\let\@@Hundredstringportuges\@@Hundredstringportuges +\newcommand*\@@HundredstringFportuges[1]{% + \ifcase#1\relax + \or Cento% + \or Duzentas% + \or Trezentas% + \or Quatrocentas% + \or Quinhentas% + \or Seiscentas% + \or Setecentas% + \or Oitocentas% + \or Novecentas% + \fi +}% +\global\let\@@HundredstringFportuges\@@HundredstringFportuges +\newcommand*{\@numberstringMportuges}[2]{% + \let\@unitstring=\@@unitstringportuges + \let\@teenstring=\@@teenstringportuges + \let\@tenstring=\@@tenstringportuges + \let\@hundredstring=\@@hundredstringportuges + \def\@hundred{cem}\def\@thousand{mil}% + \def\@andname{e}% + \@@numberstringportuges{#1}{#2}% +}% +\global\let\@numberstringMportuges\@numberstringMportuges +\newcommand*{\@numberstringFportuges}[2]{% + \let\@unitstring=\@@unitstringFportuges + \let\@teenstring=\@@teenstringportuges + \let\@tenstring=\@@tenstringportuges + \let\@hundredstring=\@@hundredstringFportuges + \def\@hundred{cem}\def\@thousand{mil}% + \def\@andname{e}% + \@@numberstringportuges{#1}{#2}% +}% +\global\let\@numberstringFportuges\@numberstringFportuges +\global\let\@numberstringNportuges\@numberstringMportuges +\newcommand*{\@NumberstringMportuges}[2]{% + \let\@unitstring=\@@Unitstringportuges + \let\@teenstring=\@@Teenstringportuges + \let\@tenstring=\@@Tenstringportuges + \let\@hundredstring=\@@Hundredstringportuges + \def\@hundred{Cem}\def\@thousand{Mil}% + \def\@andname{e}% + \@@numberstringportuges{#1}{#2}% +}% +\global\let\@NumberstringMportuges\@NumberstringMportuges +\newcommand*{\@NumberstringFportuges}[2]{% + \let\@unitstring=\@@UnitstringFportuges + \let\@teenstring=\@@Teenstringportuges + \let\@tenstring=\@@Tenstringportuges + \let\@hundredstring=\@@HundredstringFportuges + \def\@hundred{Cem}\def\@thousand{Mil}% + \def\@andname{e}% + \@@numberstringportuges{#1}{#2}% +}% +\global\let\@NumberstringFportuges\@NumberstringFportuges +\global\let\@NumberstringNportuges\@NumberstringMportuges +\newcommand*{\@ordinalstringMportuges}[2]{% + \let\@unitthstring=\@@unitthstringportuges + \let\@unitstring=\@@unitstringportuges + \let\@teenthstring=\@@teenthstringportuges + \let\@tenthstring=\@@tenthstringportuges + \let\@hundredthstring=\@@hundredthstringportuges + \def\@thousandth{mil\'esimo}% + \@@ordinalstringportuges{#1}{#2}% +}% +\global\let\@ordinalstringMportuges\@ordinalstringMportuges +\newcommand*{\@ordinalstringFportuges}[2]{% + \let\@unitthstring=\@@unitthstringFportuges + \let\@unitstring=\@@unitstringFportuges + \let\@teenthstring=\@@teenthstringportuges + \let\@tenthstring=\@@tenthstringFportuges + \let\@hundredthstring=\@@hundredthstringFportuges + \def\@thousandth{mil\'esima}% + \@@ordinalstringportuges{#1}{#2}% +}% +\global\let\@ordinalstringFportuges\@ordinalstringFportuges +\global\let\@ordinalstringNportuges\@ordinalstringMportuges +\newcommand*{\@OrdinalstringMportuges}[2]{% + \let\@unitthstring=\@@Unitthstringportuges + \let\@unitstring=\@@Unitstringportuges + \let\@teenthstring=\@@teenthstringportuges + \let\@tenthstring=\@@Tenthstringportuges + \let\@hundredthstring=\@@Hundredthstringportuges + \def\@thousandth{Mil\'esimo}% + \@@ordinalstringportuges{#1}{#2}% +}% +\global\let\@OrdinalstringMportuges\@OrdinalstringMportuges +\newcommand*{\@OrdinalstringFportuges}[2]{% + \let\@unitthstring=\@@UnitthstringFportuges + \let\@unitstring=\@@UnitstringFportuges + \let\@teenthstring=\@@teenthstringportuges + \let\@tenthstring=\@@TenthstringFportuges + \let\@hundredthstring=\@@HundredthstringFportuges + \def\@thousandth{Mil\'esima}% + \@@ordinalstringportuges{#1}{#2}% +}% +\global\let\@OrdinalstringFportuges\@OrdinalstringFportuges +\global\let\@OrdinalstringNportuges\@OrdinalstringMportuges +\newcommand*\@@unitthstringportuges[1]{% + \ifcase#1\relax + zero% + \or primeiro% + \or segundo% + \or terceiro% + \or quarto% + \or quinto% + \or sexto% + \or s\'etimo% + \or oitavo% + \or nono% + \fi +}% +\global\let\@@unitthstringportuges\@@unitthstringportuges +\newcommand*\@@tenthstringportuges[1]{% + \ifcase#1\relax + \or d\'ecimo% + \or vig\'esimo% + \or trig\'esimo% + \or quadrag\'esimo% + \or q\"uinquag\'esimo% + \or sexag\'esimo% + \or setuag\'esimo% + \or octog\'esimo% + \or nonag\'esimo% + \fi +}% +\global\let\@@tenthstringportuges\@@tenthstringportuges +\newcommand*\@@teenthstringportuges[1]{% + \@tenthstring{1}% + \ifnum#1>0\relax + -\@unitthstring{#1}% + \fi +}% +\global\let\@@teenthstringportuges\@@teenthstringportuges +\newcommand*\@@hundredthstringportuges[1]{% + \ifcase#1\relax + \or cent\'esimo% + \or ducent\'esimo% + \or trecent\'esimo% + \or quadringent\'esimo% + \or q\"uingent\'esimo% + \or seiscent\'esimo% + \or setingent\'esimo% + \or octingent\'esimo% + \or nongent\'esimo% + \fi +}% +\global\let\@@hundredthstringportuges\@@hundredthstringportuges +\newcommand*\@@unitthstringFportuges[1]{% + \ifcase#1\relax + zero% + \or primeira% + \or segunda% + \or terceira% + \or quarta% + \or quinta% + \or sexta% + \or s\'etima% + \or oitava% + \or nona% + \fi +}% +\global\let\@@unitthstringFportuges\@@unitthstringFportuges +\newcommand*\@@tenthstringFportuges[1]{% + \ifcase#1\relax + \or d\'ecima% + \or vig\'esima% + \or trig\'esima% + \or quadrag\'esima% + \or q\"uinquag\'esima% + \or sexag\'esima% + \or setuag\'esima% + \or octog\'esima% + \or nonag\'esima% + \fi +}% +\global\let\@@tenthstringFportuges\@@tenthstringFportuges +\newcommand*\@@hundredthstringFportuges[1]{% + \ifcase#1\relax + \or cent\'esima% + \or ducent\'esima% + \or trecent\'esima% + \or quadringent\'esima% + \or q\"uingent\'esima% + \or seiscent\'esima% + \or setingent\'esima% + \or octingent\'esima% + \or nongent\'esima% + \fi +}% +\global\let\@@hundredthstringFportuges\@@hundredthstringFportuges +\newcommand*\@@Unitthstringportuges[1]{% + \ifcase#1\relax + Zero% + \or Primeiro% + \or Segundo% + \or Terceiro% + \or Quarto% + \or Quinto% + \or Sexto% + \or S\'etimo% + \or Oitavo% + \or Nono% + \fi +}% +\global\let\@@Unitthstringportuges\@@Unitthstringportuges +\newcommand*\@@Tenthstringportuges[1]{% + \ifcase#1\relax + \or D\'ecimo% + \or Vig\'esimo% + \or Trig\'esimo% + \or Quadrag\'esimo% + \or Q\"uinquag\'esimo% + \or Sexag\'esimo% + \or Setuag\'esimo% + \or Octog\'esimo% + \or Nonag\'esimo% + \fi +}% +\global\let\@@Tenthstringportuges\@@Tenthstringportuges +\newcommand*\@@Hundredthstringportuges[1]{% + \ifcase#1\relax + \or Cent\'esimo% + \or Ducent\'esimo% + \or Trecent\'esimo% + \or Quadringent\'esimo% + \or Q\"uingent\'esimo% + \or Seiscent\'esimo% + \or Setingent\'esimo% + \or Octingent\'esimo% + \or Nongent\'esimo% + \fi +}% +\global\let\@@Hundredthstringportuges\@@Hundredthstringportuges +\newcommand*\@@UnitthstringFportuges[1]{% + \ifcase#1\relax + Zera% + \or Primeira% + \or Segunda% + \or Terceira% + \or Quarta% + \or Quinta% + \or Sexta% + \or S\'etima% + \or Oitava% + \or Nona% + \fi +}% +\global\let\@@UnitthstringFportuges\@@UnitthstringFportuges +\newcommand*\@@TenthstringFportuges[1]{% + \ifcase#1\relax + \or D\'ecima% + \or Vig\'esima% + \or Trig\'esima% + \or Quadrag\'esima% + \or Q\"uinquag\'esima% + \or Sexag\'esima% + \or Setuag\'esima% + \or Octog\'esima% + \or Nonag\'esima% + \fi +}% +\global\let\@@TenthstringFportuges\@@TenthstringFportuges +\newcommand*\@@HundredthstringFportuges[1]{% + \ifcase#1\relax + \or Cent\'esima% + \or Ducent\'esima% + \or Trecent\'esima% + \or Quadringent\'esima% + \or Q\"uingent\'esima% + \or Seiscent\'esima% + \or Setingent\'esima% + \or Octingent\'esima% + \or Nongent\'esima% + \fi +}% +\global\let\@@HundredthstringFportuges\@@HundredthstringFportuges +\newcommand*\@@numberstringportuges[2]{% +\ifnum#1>99999\relax + \PackageError{fmtcount}{Out of range}% + {This macro only works for values less than 100000}% +\else + \ifnum#1<0\relax + \PackageError{fmtcount}{Negative numbers not permitted}% + {This macro does not work for negative numbers, however + you can try typing "minus" first, and then pass the modulus of + this number}% + \fi +\fi +\def#2{}% +\@strctr=#1\relax \divide\@strctr by 1000\relax +\ifnum\@strctr>9\relax + \divide\@strctr by 10\relax + \ifnum\@strctr>1\relax + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\@tenstring{\@strctr}}% + \@strctr=#1 \divide\@strctr by 1000\relax + \@FCmodulo{\@strctr}{10}% + \ifnum\@strctr>0 + \ifnum\@strctr=1\relax + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\ \@andname}% + \fi + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\ \@unitstring{\@strctr}}% + \fi + \else + \@strctr=#1\relax + \divide\@strctr by 1000\relax + \@FCmodulo{\@strctr}{10}% + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\@teenstring{\@strctr}}% + \fi + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\ \@thousand}% +\else + \ifnum\@strctr>0\relax + \ifnum\@strctr>1\relax + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\@unitstring{\@strctr}\ }% + \fi + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\@thousand}% + \fi +\fi +\@strctr=#1\relax \@FCmodulo{\@strctr}{1000}% +\divide\@strctr by 100\relax +\ifnum\@strctr>0\relax + \ifnum#1>1000 \relax + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\ }% + \fi + \@tmpstrctr=#1\relax + \@FCmodulo{\@tmpstrctr}{1000}% + \let\@@fc@numstr#2\relax + \ifnum\@tmpstrctr=100\relax + \protected@edef#2{\@@fc@numstr\@tenstring{10}}% + \else + \protected@edef#2{\@@fc@numstr\@hundredstring{\@strctr}}% + \fi% +\fi +\@strctr=#1\relax \@FCmodulo{\@strctr}{100}% +\ifnum#1>100\relax + \ifnum\@strctr>0\relax + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\ \@andname\ }% + \fi +\fi +\ifnum\@strctr>19\relax + \divide\@strctr by 10\relax + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\@tenstring{\@strctr}}% + \@strctr=#1\relax \@FCmodulo{\@strctr}{10}% + \ifnum\@strctr>0 + \ifnum\@strctr=1\relax + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\ \@andname}% + \else + \ifnum#1>100\relax + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\ \@andname}% + \fi + \fi + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\ \@unitstring{\@strctr}}% + \fi +\else + \ifnum\@strctr<10\relax + \ifnum\@strctr=0\relax + \ifnum#1<100\relax + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\@unitstring{\@strctr}}% + \fi + \else %(>0,<10) + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\@unitstring{\@strctr}}% + \fi + \else%>10 + \@FCmodulo{\@strctr}{10}% + \let\@@fc@numstr#2\relax + \protected@edef#2{\@@fc@numstr\@teenstring{\@strctr}}% + \fi +\fi +}% +\global\let\@@numberstringportuges\@@numberstringportuges +\newcommand*\@@ordinalstringportuges[2]{% +\@strctr=#1\relax +\ifnum#1>99999 +\PackageError{fmtcount}{Out of range}% +{This macro only works for values less than 100000}% +\else +\ifnum#1<0 +\PackageError{fmtcount}{Negative numbers not permitted}% +{This macro does not work for negative numbers, however +you can try typing "minus" first, and then pass the modulus of +this number}% +\else +\def#2{}% +\ifnum\@strctr>999\relax + \divide\@strctr by 1000\relax + \ifnum\@strctr>1\relax + \ifnum\@strctr>9\relax + \@tmpstrctr=\@strctr + \ifnum\@strctr<20 + \@FCmodulo{\@tmpstrctr}{10}% + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr\@teenthstring{\@tmpstrctr}}% + \else + \divide\@tmpstrctr by 10\relax + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr\@tenthstring{\@tmpstrctr}}% + \@tmpstrctr=\@strctr + \@FCmodulo{\@tmpstrctr}{10}% + \ifnum\@tmpstrctr>0\relax + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr\@unitthstring{\@tmpstrctr}}% + \fi + \fi + \else + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr\@unitstring{\@strctr}}% + \fi + \fi + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr\@thousandth}% +\fi +\@strctr=#1\relax +\@FCmodulo{\@strctr}{1000}% +\ifnum\@strctr>99\relax + \@tmpstrctr=\@strctr + \divide\@tmpstrctr by 100\relax + \ifnum#1>1000\relax + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr-}% + \fi + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr\@hundredthstring{\@tmpstrctr}}% +\fi +\@FCmodulo{\@strctr}{100}% +\ifnum#1>99\relax + \ifnum\@strctr>0\relax + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr-}% + \fi +\fi +\ifnum\@strctr>9\relax + \@tmpstrctr=\@strctr + \divide\@tmpstrctr by 10\relax + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr\@tenthstring{\@tmpstrctr}}% + \@tmpstrctr=\@strctr + \@FCmodulo{\@tmpstrctr}{10}% + \ifnum\@tmpstrctr>0\relax + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr-\@unitthstring{\@tmpstrctr}}% + \fi +\else + \ifnum\@strctr=0\relax + \ifnum#1=0\relax + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr\@unitstring{0}}% + \fi + \else + \let\@@fc@ordstr#2\relax + \protected@edef#2{\@@fc@ordstr\@unitthstring{\@strctr}}% + \fi +\fi +\fi +\fi +}% +\global\let\@@ordinalstringportuges\@@ordinalstringportuges +\iffalse Local variables: \fi +\iffalse mode: docTeX \fi +\iffalse End: \fi +\endinput +%% +%% End of file `fc-portuges.def'. From 08fe7e3de4317a991e19c1d335c16b041baf158b Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 15 Apr 2019 01:58:58 -0300 Subject: [PATCH 059/148] Fixed English instead of Portuguese text on README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 47d84c6..45fe959 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,9 @@ sudo apt-get install xzdec ### Instalação Windows -1. Download the Installer on: https://miktex.org/download -1. When installing, select for it to install all latex packages. +1. Baixe o arquivo do instalador em: https://miktex.org/download +1. Enquando seguindo dos passas do instalador, + assegure-se de marcar para instalar todos os pacotes latex (full install). ## Baixando diretamente modelo UFSC From ee5f0344a239543d1b7ff1215333809d1b6b0ed8 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 15 Apr 2019 22:49:26 -0300 Subject: [PATCH 060/148] Fixed python version not working and set to only run the Tex Live version checking if python is installed. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index a326b85..823d2e9 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit a326b8565ce548713108982388c50ddff4815692 +Subproject commit 823d2e99927d249b55a8150d547f12ac8e465579 From 0434f53fb8cafa86a1e549a400c3d2cff97639fe Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 16 Apr 2019 21:48:23 -0300 Subject: [PATCH 061/148] Improved setup/makefile.mk array variable names --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 823d2e9..33dce35 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 823d2e99927d249b55a8150d547f12ac8e465579 +Subproject commit 33dce357aedf609f9c2461aa3c05fb65be981fd8 From d6559367f96a9d450d2c5578664357879ac59afb Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 16 Apr 2019 21:52:31 -0300 Subject: [PATCH 062/148] Created the \s single quote command on main.tex --- main.tex | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/main.tex b/main.tex index db4fa1e..4c398fc 100644 --- a/main.tex +++ b/main.tex @@ -35,6 +35,10 @@ \newcommand{\brazilword}[1]{\foreignlanguage{brazil}{#1}} \newcommand{\englishword}[1]{\foreignlanguage{english}{#1}} +% Allow you to write `Evandro's house` in latex as `Evandro\s house` instead of `Evandro\textquotesingle{}s house` +\newcommand{\s}[0]{\textquotesingle{}s{ }} +\newcommand{\q}[0]{\textquotesingle{}{}} + % Backward compatibility with `abntex2cite` package `\citeonline` command with the new `biblatex` package % https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand \let\citeonline\textcite From 767d23b05b0bb02896f5240ebced9c6201e77b28 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 20 Apr 2019 20:47:36 -0300 Subject: [PATCH 063/148] Fixed Undefined control sequence error when babel package is not loaded. --- settings.tex | 9 +++++---- setup | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/settings.tex b/settings.tex index 53725be..7f4cec3 100644 --- a/settings.tex +++ b/settings.tex @@ -19,9 +19,9 @@ % Add missing translations for Portuguese % https://tex.stackexchange.com/questions/8564/what-is-the-right-way-to-redefine-macros-defined-by-babel -\addto\captionsbrazil { % +\@ifpackageloaded{babel}{\@ifpackagewith{babel}{brazil}{\addto\captionsbrazil{% \renewcommand{\mytextpreliminarylistname}{Breve Sumário} -} +}}{}}{} % Selects a sans serif font family % \renewcommand{\sfdefault}{cmss} @@ -171,11 +171,12 @@ \newcommand{\biblatexcitedonetime}{\autocap{c}ited one time} \newcommand{\biblatexcitednotimes}{\autocap{n}o citation in the text} -\addto\captionsbrazil { % +\@ifpackageloaded{babel}{\@ifpackagewith{babel}{brazil}{\addto\captionsbrazil{% \renewcommand{\biblatexcitedntimes}{\autocap{c}itado \arabic{citecounter} vezes} \renewcommand{\biblatexcitedonetime}{\autocap{c}itado uma vez} \renewcommand{\biblatexcitednotimes}{\autocap{n}enhuma citação no texto} -} +}}{}}{} + \makeatletter \@ifpackageloaded{biblatex} {% diff --git a/setup b/setup index 33dce35..494015b 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 33dce357aedf609f9c2461aa3c05fb65be981fd8 +Subproject commit 494015b8ce946a430f7f9db8828def83e78f50a6 From bccb6dd4ce46544cee6e9de1eb2b52c2b576e198 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 21 Apr 2019 00:16:12 -0300 Subject: [PATCH 064/148] Fixed commands.tex addGoToSummary not working with abntex2 class --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 494015b..e6adaf2 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 494015b8ce946a430f7f9db8828def83e78f50a6 +Subproject commit e6adaf2e9af8229a3bf4f85facd885e164fafedc From 9b26875abf191c6d8e0a9202ce0d8aa76211df81 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 21 Apr 2019 00:19:44 -0300 Subject: [PATCH 065/148] Fixed missing \makeatletter on settings.tex --- settings.tex | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/settings.tex b/settings.tex index 7f4cec3..5db7614 100644 --- a/settings.tex +++ b/settings.tex @@ -19,9 +19,11 @@ % Add missing translations for Portuguese % https://tex.stackexchange.com/questions/8564/what-is-the-right-way-to-redefine-macros-defined-by-babel +\makeatletter \@ifpackageloaded{babel}{\@ifpackagewith{babel}{brazil}{\addto\captionsbrazil{% \renewcommand{\mytextpreliminarylistname}{Breve Sumário} }}{}}{} +\makeatother % Selects a sans serif font family % \renewcommand{\sfdefault}{cmss} @@ -171,11 +173,13 @@ \newcommand{\biblatexcitedonetime}{\autocap{c}ited one time} \newcommand{\biblatexcitednotimes}{\autocap{n}o citation in the text} +\makeatletter \@ifpackageloaded{babel}{\@ifpackagewith{babel}{brazil}{\addto\captionsbrazil{% \renewcommand{\biblatexcitedntimes}{\autocap{c}itado \arabic{citecounter} vezes} \renewcommand{\biblatexcitedonetime}{\autocap{c}itado uma vez} \renewcommand{\biblatexcitednotimes}{\autocap{n}enhuma citação no texto} }}{}}{} +\makeatother \makeatletter \@ifpackageloaded{biblatex} From 2592fbdbe35a842b0808e27e8177b5a34b3898e5 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 21 Apr 2019 00:27:26 -0300 Subject: [PATCH 066/148] Created \part commands as example main.tex --- main.tex | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/main.tex b/main.tex index 4c398fc..7371b5d 100644 --- a/main.tex +++ b/main.tex @@ -224,6 +224,10 @@ \setlength\midchapskip{20pt} \setlength\afterchapskip{20pt} + % PARTE + % \ifforcedinclude\else\part{\lang{Research}{Pesquisa}}\fi + % \label{sec:primeira_parte} + % Introdução (exemplo de capítulo sem numeração, mas presente no Sumário) \include{chapters/intro} @@ -236,6 +240,10 @@ % Primeiro capitulo de Resultados \include{chapters/chapter_3} + % PARTE + % \ifforcedinclude\else\part{\lang{Implementation}{Implementação}}\fi + % \label{sec:segunda_parte} + % Segundo capitulo de Resultados \include{chapters/chapter_4} From 4512211ef1dc0b47bf3b2fb934917b0c0a4bbe1d Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 21 Apr 2019 07:38:56 -0300 Subject: [PATCH 067/148] Fixed \s command not adding a space when needed. --- main.tex | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main.tex b/main.tex index 7371b5d..065bec4 100644 --- a/main.tex +++ b/main.tex @@ -36,8 +36,9 @@ \newcommand{\englishword}[1]{\foreignlanguage{english}{#1}} % Allow you to write `Evandro's house` in latex as `Evandro\s house` instead of `Evandro\textquotesingle{}s house` -\newcommand{\s}[0]{\textquotesingle{}s{ }} -\newcommand{\q}[0]{\textquotesingle{}{}} +% https://tex.stackexchange.com/questions/31091/space-after-latex-commands +\newcommand{\s}[0]{\textquotesingle{}s\xspace} +\newcommand{\q}[0]{\textquotesingle{}\xspace} % Backward compatibility with `abntex2cite` package `\citeonline` command with the new `biblatex` package % https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand From 1501a377ab00cb63d080bcbe7f2924fa1570f734 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 21 Apr 2019 07:40:56 -0300 Subject: [PATCH 068/148] Added new reference to xspace package space-after-latex-commands --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index e6adaf2..bc5f7a3 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit e6adaf2e9af8229a3bf4f85facd885e164fafedc +Subproject commit bc5f7a3d40ca5fc8f06b2e61db1587066652bb41 From 5f2757b54faf00820dce8bc82b94a38faaf984b6 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 21 Apr 2019 16:40:06 -0300 Subject: [PATCH 069/148] Fixed \addGoToSummary messing up with others elements formatting --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index bc5f7a3..9e23cfd 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit bc5f7a3d40ca5fc8f06b2e61db1587066652bb41 +Subproject commit 9e23cfd70a421619d97b9dfc2d6f83b284334ce8 From afc4b97993881ccb97c1f7e2b08f89afb1c2230b Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 21 Apr 2019 17:31:17 -0300 Subject: [PATCH 070/148] Fixed \addGoToSummary messing up with others elements formatting --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 9e23cfd..9b24069 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 9e23cfd70a421619d97b9dfc2d6f83b284334ce8 +Subproject commit 9b240694333eaac9fc9ed0c538bd55ee985f4d10 From 07e1004606328facf1ff11e700c70acd239a5127 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 21 Apr 2019 22:20:51 -0300 Subject: [PATCH 071/148] Put makefile.mk expensive global variables inside rules for lazy evaluation. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 9b24069..1098793 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 9b240694333eaac9fc9ed0c538bd55ee985f4d10 +Subproject commit 1098793a05725d85661d364a3ee6784523bb9fd1 From d95263e7f149e86faa2fa387234b8f96200d2550 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 21 Apr 2019 22:24:32 -0300 Subject: [PATCH 072/148] Created the pdflatex alias for the latex rule. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 1098793..d1e43a7 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 1098793a05725d85661d364a3ee6784523bb9fd1 +Subproject commit d1e43a7037de86cbf25f8b5f5e1f4b75b9d95fcd From e1a81395e961ec7c57305d718fd86a327b73c0ba Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 21 Apr 2019 22:35:07 -0300 Subject: [PATCH 073/148] Allowed to enabled the makefile.mk debug mode from the command line passing debug=anything. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index d1e43a7..d908b03 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit d1e43a7037de86cbf25f8b5f5e1f4b75b9d95fcd +Subproject commit d908b03f2fd69093730550d311a7db91bbef19c2 From 31e71ddf737893aeb4a87d0c3cbf16e12aeda6c5 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 23 Apr 2019 02:37:55 -0300 Subject: [PATCH 074/148] Allowed to enabled the makefile.mk debug mode from the command line passing debug=anything. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index d908b03..883b992 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit d908b03f2fd69093730550d311a7db91bbef19c2 +Subproject commit 883b9924727fd8f68cf743719a5626ef6255993b From 07eb15ddd0690cf3c262b3209b2329a0a24acdae Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 23 Apr 2019 02:46:40 -0300 Subject: [PATCH 075/148] Created the section Compiling on README.md --- README.md | 21 +++++++++++++++++++++ setup | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 45fe959..091b36d 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,27 @@ você também pode executar o arquivo `build.bat` caso você esteja no Windows, ou executar o comando `make` caso você esteja no Linux. +## Compilação + +Se você quiser saber quais são todos os comandos de compilação disponíveis, +basta chamar utilizar o comando `make help` + +Caso você tenha problemas, +error ou algo não funcione, +execute o make file em modo debug. +Para isso, +basta chamar ele como você normalmente faz, +mas passando o parâmetro `debug=true`. +Por exemplo, +`make latex debug=true`. + +Por conveniência, +você também pode chamar `make latex debug=a` qualquer outra coisa desde que não seja vazio. +Por exemplo, +`make latex debug=` Você também pode diretamente editar o arquivo `setup/makefile.mk` e +descomentar a linha `# ENABLE_DEBUG_MODE := true` para ativar o modo debug permanentemente. + + ## Normas da UFSC para trabalhos acadêmicos Na UFSC, diff --git a/setup b/setup index 883b992..bfd3382 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 883b9924727fd8f68cf743719a5626ef6255993b +Subproject commit bfd3382f72b7da0b9dae74e78b3b09664ea115b7 From 21080c993e977abeb2c56b9d6b307b1e6f86eb31 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 23 Apr 2019 23:50:55 -0300 Subject: [PATCH 076/148] Created the command make release version=1.1 --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index bfd3382..30622ac 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit bfd3382f72b7da0b9dae74e78b3b09664ea115b7 +Subproject commit 30622aca6cb3cf34d4a85215de00451b7312bf16 From 05acde10dca41c812fa4e692bd38bd5e30abbe36 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 23 Apr 2019 23:59:45 -0300 Subject: [PATCH 077/148] Documented the make release version=1.1 command on makefile.mk and renamed the thesis main file to `main.pdf`. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 30622ac..4add41c 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 30622aca6cb3cf34d4a85215de00451b7312bf16 +Subproject commit 4add41c6038ed2c433a965b0e74b5a7b7ddfd0a5 From 2bfc6f15ce51e8daafbac0bce9e301db4ef5dbe6 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 24 Apr 2019 00:05:08 -0300 Subject: [PATCH 078/148] Fixed python code inside makefile.mk using spaces instead of tabs as indentation. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 4add41c..98affaa 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 4add41c6038ed2c433a965b0e74b5a7b7ddfd0a5 +Subproject commit 98affaafe53d8316625dd3e3474b6324f9121ec0 From 26fb7c38efc69fcbb2dd2d82df6612ef30d569be Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 24 Apr 2019 00:18:14 -0300 Subject: [PATCH 079/148] Fixed make release exiting with success on failure --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 98affaa..046a622 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 98affaafe53d8316625dd3e3474b6324f9121ec0 +Subproject commit 046a6220fa09548b062c8a1c7b4146c70f3c5f3f From 90ceba1594b704d4d0bc78ec3cdb76ae2a9963e6 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 24 Apr 2019 00:43:38 -0300 Subject: [PATCH 080/148] Deprecated texlive version requirements on README.md because it also works with texlive 2017 --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 091b36d..968ccd8 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,6 @@ a compilação deve resultar no seguinte [PDF](https://github.com/evandroforks/a ## Instalar `LaTeX` e `abnTeX2` -Para Linux, -é necessário ter a instalação TeXLive 2018, -e não TeXLive 2017. -Veja a sua versão do TeXLive com o comando: -1. `tex --version` - Para poder utilizar a classe é necessário ter uma distribuição atual do LaTeX, incluindo o pacote abnTeX2. *Sugerimos formtemente a utilização da distribiução TeX Live para Windows e Linux e MacTeX para macOS*. From fd91a52d4d415243ddb3e8d053353e4bd54d5bef Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 24 Apr 2019 18:21:55 -0300 Subject: [PATCH 081/148] Documented how to run make release and debug on Windows --- README.md | 38 +++++++++++++++++++++++++++++++++++++- setup | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 968ccd8..fd9d97b 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,43 @@ ou executar o comando `make` caso você esteja no Linux. ## Compilação Se você quiser saber quais são todos os comandos de compilação disponíveis, -basta chamar utilizar o comando `make help` +basta chamar utilizar o comando `make help`. Exemplo: +``` + Usage: + make [debug=1] + + Use debug=1 to run make in debug mode. Use this if something does not work! + Examples: + make debug=1 + make latex debug=1 + make thesis debug=1 + + If you are using Windows Command Prompt `cmd.exe`, you must use this + command like this: + set "debug=1" && make + set "debug=1" && make latex + set "debug=1" && make thesis + + Targets: + all call the `thesis` make rule + biber build the main file with bibliography pass + latex build the main file with no bibliography pass + pdflatex the same as latex rule, i.e., an alias for it + latexmk build the main file with pdflatex biber pdflatex pdflatex + pdflatex makeindex biber pdflatex + + thesis completely build the main file with minimum output logs + verbose completely build the main file with maximum output logs + clean remove all cache directories and generated pdf files + veryclean same as `clean`, but searches for all generated files outside + the cache directories. + + release version=1.1 creates the zip file `1.1.zip` on the root of this + project, within all latex required files. This is useful to share or + public your thesis source files with others. + If you are using Windows Command Prompt `cmd.exe`, you must use this + command like this: set "version=1.1" && make release +``` Caso você tenha problemas, error ou algo não funcione, diff --git a/setup b/setup index 046a622..952a4dc 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 046a6220fa09548b062c8a1c7b4146c70f3c5f3f +Subproject commit 952a4dcc5a560e3ef7b7f614b057aa8550a3c56b From 8129d8d11fc37c586eff2dc4a12da1cc5206905d Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 24 Apr 2019 21:27:05 -0300 Subject: [PATCH 082/148] Fixed makefile.mk release rule not using new lines on its output --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 952a4dc..3fbad94 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 952a4dcc5a560e3ef7b7f614b057aa8550a3c56b +Subproject commit 3fbad9480ff6c6e961fe733b7d47ecdbedb2a02a From 04c71cad98e31a23b2b4efa5477e7320d5110b8f Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 25 Apr 2019 04:55:59 -0300 Subject: [PATCH 083/148] Set .gitignore line ending to CRLF --- .gitignore | 112 ++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/.gitignore b/.gitignore index a88c17c..a80484d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,56 +1,56 @@ -.DS_Store -/.settings -/.project -/.texlipse -/.gitignore -/example.pdf -/tmp - -*.sublime-workspace -*.pdf - -# Latex files related -*.brf -*.lol -*.mtc1 -*.synctex(busy) -*.synctex.gz(busy) -*.run.xml -*.bcf -*.cut -*.acn -*.acr -*.alg -*.aux -*.bbl -*.blg -*.dvi -*.fdb_latexmk -*.glg -*.glo -*.gls -*.idx -*.ilg -*.ind -*.mw -*.tpc -*.ist -*.lof -*.log -*.lot -*.maf -*.mtc -*.mtc0 -*.nav -*.nlo -*.out -*.pdfsync -*.ps -*.snm -*.synctex.gz -*.toc -*.vrb -*.xdy -*.tdo -*.fls -*.loq +.DS_Store +/.settings +/.project +/.texlipse +/.gitignore +/example.pdf +/tmp + +*.sublime-workspace +*.pdf + +# Latex files related +*.brf +*.lol +*.mtc1 +*.synctex(busy) +*.synctex.gz(busy) +*.run.xml +*.bcf +*.cut +*.acn +*.acr +*.alg +*.aux +*.bbl +*.blg +*.dvi +*.fdb_latexmk +*.glg +*.glo +*.gls +*.idx +*.ilg +*.ind +*.mw +*.tpc +*.ist +*.lof +*.log +*.lot +*.maf +*.mtc +*.mtc0 +*.nav +*.nlo +*.out +*.pdfsync +*.ps +*.snm +*.synctex.gz +*.toc +*.vrb +*.xdy +*.tdo +*.fls +*.loq From 1a8b991c8d6a54dfd94e5b3bd0e5b81cd79365f8 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 25 Apr 2019 04:56:10 -0300 Subject: [PATCH 084/148] Fixed biber rule not building latex if required --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 3fbad94..605c866 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 3fbad9480ff6c6e961fe733b7d47ecdbedb2a02a +Subproject commit 605c866ac617602b731cd8453d00e588883157e6 From 03e213e844e5b5e51825cdfb40d519e4ace54c5f Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 25 Apr 2019 20:09:06 -0300 Subject: [PATCH 085/148] Fixed makefile.mk rule latex not build the PDF --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 605c866..8d54cce 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 605c866ac617602b731cd8453d00e588883157e6 +Subproject commit 8d54cceeb33a2830b1a0bfc3e0b4b71ddcf18f58 From 1bee9de1ec5a1a73af435df8ab371a6fbb3d4a6c Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 25 Apr 2019 20:56:03 -0300 Subject: [PATCH 086/148] Deprecated the verbose command by the new debug mode just added --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 8d54cce..25b84cd 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 8d54cceeb33a2830b1a0bfc3e0b4b71ddcf18f58 +Subproject commit 25b84cd11449e0b8c27b5ca1b1a10c31492499f1 From bad505f7328c7281b3903b8f617312de5ab66b7c Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Thu, 25 Apr 2019 22:35:08 -0300 Subject: [PATCH 087/148] Fixed makefile.mk latex, thesis and biber rules not showing the log file on error. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 25b84cd..abf3853 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 25b84cd11449e0b8c27b5ca1b1a10c31492499f1 +Subproject commit abf385304b00ff00cd3e89ca0e7433719028c98b From dfd9dded2c5ae272fea7a94ee794f4316ee3e57a Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 26 Apr 2019 01:06:24 -0300 Subject: [PATCH 088/148] Fixed makefile.mk rule release not adding files from a directory junction or symlink. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index abf3853..87e3255 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit abf385304b00ff00cd3e89ca0e7433719028c98b +Subproject commit 87e3255ee39a8f5d3f4afb4b1e7f31b67737855f From e2ff941cb90f1ce952cae487dbeda39224fd3c3f Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 27 Apr 2019 15:31:26 -0300 Subject: [PATCH 089/148] Fixed \citeonline command not working --- main.tex | 4 ---- setup | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/main.tex b/main.tex index 065bec4..c331c47 100644 --- a/main.tex +++ b/main.tex @@ -40,10 +40,6 @@ \newcommand{\s}[0]{\textquotesingle{}s\xspace} \newcommand{\q}[0]{\textquotesingle{}\xspace} -% Backward compatibility with `abntex2cite` package `\citeonline` command with the new `biblatex` package -% https://tex.stackexchange.com/questions/655/what-is-the-difference-between-def-and-newcommand -\let\citeonline\textcite - % Uncomment the following line if you want to use other biblatex settings % \PassOptionsToPackage{style=numeric,repeatfields=true,backend=biber,backref=true,citecounter=true}{biblatex} diff --git a/setup b/setup index 87e3255..9de9ea3 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 87e3255ee39a8f5d3f4afb4b1e7f31b67737855f +Subproject commit 9de9ea3c5aba7b9895924d4f24f11efe0ad8b1f2 From e0e0801a75470de0791af677642ae6095974114b Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 27 Apr 2019 22:43:45 -0300 Subject: [PATCH 090/148] Fixed make thesis not syncing the .gitignore file --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 9de9ea3..60ef1a1 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 9de9ea3c5aba7b9895924d4f24f11efe0ad8b1f2 +Subproject commit 60ef1a1bf72d2b4ca17241bf0d86dc07f4e52b49 From 2e08fc347c603c07c48d3ff0bba11d5cd2ce7999 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 05:54:36 -0300 Subject: [PATCH 091/148] Created the \useshorthands{-} \defineshorthand{-=}{\hyp} --- main.tex | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/main.tex b/main.tex index c331c47..bde517e 100644 --- a/main.tex +++ b/main.tex @@ -148,6 +148,11 @@ % Altere o arquivo 'settings.tex' para incluir customizações de aparência da sua tese \input{settings.tex} +% Allows you to use -= instead of `\hyp{}` +% https://tex.stackexchange.com/questions/488008/how-to-create-an-alternative-to-shortcut-or-hyp +\useshorthands{-} +\defineshorthand{-=}{\hyp} + % When writing a large document, it is sometimes useful to work on selected sections of the document % to speed up compilation time: https://en.wikibooks.org/wiki/TeX/includeonly \newif\ifforcedinclude\forcedincludefalse From f2967db596bd746ba26d25fada421fad9539b252 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 08:31:53 -0300 Subject: [PATCH 092/148] Fixed usage of \useshorthands{-} breaking latex compilation by using !- --- main.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tex b/main.tex index bde517e..35f6803 100644 --- a/main.tex +++ b/main.tex @@ -150,8 +150,8 @@ % Allows you to use -= instead of `\hyp{}` % https://tex.stackexchange.com/questions/488008/how-to-create-an-alternative-to-shortcut-or-hyp -\useshorthands{-} -\defineshorthand{-=}{\hyp} +\useshorthands{!} +\defineshorthand{!-}{\hyp} % When writing a large document, it is sometimes useful to work on selected sections of the document % to speed up compilation time: https://en.wikibooks.org/wiki/TeX/includeonly From 1893fa8295e69b6a7f13171083820c7d5659bc78 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 08:34:29 -0300 Subject: [PATCH 093/148] Created the command \newkeywordslist to dynamically create lists of things. --- beforetext/resumos.tex | 4 ---- main.tex | 17 +++++++---------- setup | 2 +- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/beforetext/resumos.tex b/beforetext/resumos.tex index c8420e8..dc2590d 100644 --- a/beforetext/resumos.tex +++ b/beforetext/resumos.tex @@ -70,8 +70,6 @@ \makeatletter - - \ifenglish \@ifundefined{imprimirbrazilabstract}{}{\imprimirbrazilabstract} @@ -230,7 +228,5 @@ \@ifundefined{imprimirfrenchabstract}{}{\imprimirfrenchabstract} \@ifundefined{imprimirspanishabstract}{}{\imprimirspanishabstract} - - \makeatother diff --git a/main.tex b/main.tex index 35f6803..d133b98 100644 --- a/main.tex +++ b/main.tex @@ -133,17 +133,14 @@ }% } -\newcommand{\palavraschaveportugues}{% - \item Palavra Chave 1. - \item Palavra Chave 2. - \item Palavra Chave 3. -} +\palavraschaveufsc{palavraschaveingles}{Keyword 1} +\palavraschaveufsc{palavraschaveportugues}{Palavra Chave 1} -\newcommand{\palavraschaveingles}{% - \item Keyword 1. - \item Keyword 2. - \item Keyword 3. -} +\palavraschaveufsc{palavraschaveingles}{Keyword 2} +\palavraschaveufsc{palavraschaveportugues}{Palavra Chave 2} + +\palavraschaveufsc{palavraschaveingles}{Keyword 3} +\palavraschaveufsc{palavraschaveportugues}{Palavra Chave 3} % Altere o arquivo 'settings.tex' para incluir customizações de aparência da sua tese \input{settings.tex} diff --git a/setup b/setup index 60ef1a1..ab0c568 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 60ef1a1bf72d2b4ca17241bf0d86dc07f4e52b49 +Subproject commit ab0c568bdac1bc846554159ddfdf8a6665999a8b From 37f3b33fafa6e339a10d69b2c1ffeebe6063b4bd Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 08:48:41 -0300 Subject: [PATCH 094/148] Fixed makefile.mk always running the copy .gitignore rule --- main.tex | 2 +- setup | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tex b/main.tex index d133b98..dd43f34 100644 --- a/main.tex +++ b/main.tex @@ -145,7 +145,7 @@ % Altere o arquivo 'settings.tex' para incluir customizações de aparência da sua tese \input{settings.tex} -% Allows you to use -= instead of `\hyp{}` +% Allows you to use !- instead of `\hyp{}` % https://tex.stackexchange.com/questions/488008/how-to-create-an-alternative-to-shortcut-or-hyp \useshorthands{!} \defineshorthand{!-}{\hyp} diff --git a/setup b/setup index ab0c568..d281230 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit ab0c568bdac1bc846554159ddfdf8a6665999a8b +Subproject commit d28123055a9abd0e8a25a084e57dfc3e686db32b From 0c50864e5048102d0b885db42590c771ea9b6f37 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 09:09:17 -0300 Subject: [PATCH 095/148] Deprecated the !- shorthand for \hyp{} because it is breaking more than helping. --- main.tex | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main.tex b/main.tex index dd43f34..14d880b 100644 --- a/main.tex +++ b/main.tex @@ -145,10 +145,9 @@ % Altere o arquivo 'settings.tex' para incluir customizações de aparência da sua tese \input{settings.tex} -% Allows you to use !- instead of `\hyp{}` +% Allows you to use $- instead of `\hyp{}` % https://tex.stackexchange.com/questions/488008/how-to-create-an-alternative-to-shortcut-or-hyp -\useshorthands{!} -\defineshorthand{!-}{\hyp} +% \useshorthands{$}\defineshorthand{$-}{\hyp} % When writing a large document, it is sometimes useful to work on selected sections of the document % to speed up compilation time: https://en.wikibooks.org/wiki/TeX/includeonly From 3ddfdd3a12c79c125752ee97bc1d459701cffb0d Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 09:37:12 -0300 Subject: [PATCH 096/148] Fixed makefile not exiting on error for latex rule --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index d281230..ebd81c7 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit d28123055a9abd0e8a25a084e57dfc3e686db32b +Subproject commit ebd81c757e56652340d39b1d75178d1e9ba6289a From ab9248e0872ffe6d0b974932f229777ce1b6b9c8 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 10:11:11 -0300 Subject: [PATCH 097/148] Fixed makefile.mk veryclean not working when there is another .gitignore defined on the root of the project. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index ebd81c7..46bb02c 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit ebd81c757e56652340d39b1d75178d1e9ba6289a +Subproject commit 46bb02cf717162a88d7fe897bd7a1e7140170eb1 From 035404f0558c1af524ba2de4d1bd6ed02eead1d1 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 10:25:22 -0300 Subject: [PATCH 098/148] Aligned English and Portuguese keywords on main.tex --- main.tex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.tex b/main.tex index 14d880b..2b38308 100644 --- a/main.tex +++ b/main.tex @@ -133,13 +133,13 @@ }% } -\palavraschaveufsc{palavraschaveingles}{Keyword 1} +\palavraschaveufsc{palavraschaveingles} {Keyword 1} \palavraschaveufsc{palavraschaveportugues}{Palavra Chave 1} -\palavraschaveufsc{palavraschaveingles}{Keyword 2} +\palavraschaveufsc{palavraschaveingles} {Keyword 2} \palavraschaveufsc{palavraschaveportugues}{Palavra Chave 2} -\palavraschaveufsc{palavraschaveingles}{Keyword 3} +\palavraschaveufsc{palavraschaveingles} {Keyword 3} \palavraschaveufsc{palavraschaveportugues}{Palavra Chave 3} % Altere o arquivo 'settings.tex' para incluir customizações de aparência da sua tese From c27c5298cf9ca52ad7763d46350f6efbd4925be1 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 17:31:12 -0300 Subject: [PATCH 099/148] Renamed the makefile.mk remote arguments, fixed return code values, and created the args parameter to pass options not rsync. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 46bb02c..222af81 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 46bb02cf717162a88d7fe897bd7a1e7140170eb1 +Subproject commit 222af81944e86476dab558d635a3e09e6bbfdf68 From 6f5e24d7e7ba4e1ab06583222d674c11b3e24ce0 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 19:53:09 -0300 Subject: [PATCH 100/148] Replaced the usage of \useshorthands{$} breaking Sublime Text latex parsing by using ~ --- main.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tex b/main.tex index 2b38308..955d23c 100644 --- a/main.tex +++ b/main.tex @@ -145,9 +145,9 @@ % Altere o arquivo 'settings.tex' para incluir customizações de aparência da sua tese \input{settings.tex} -% Allows you to use $- instead of `\hyp{}` +% Allows you to use ~- instead of `\hyp{}` % https://tex.stackexchange.com/questions/488008/how-to-create-an-alternative-to-shortcut-or-hyp -% \useshorthands{$}\defineshorthand{$-}{\hyp} +% \useshorthands{~}\defineshorthand{~-}{\hyp{}} % When writing a large document, it is sometimes useful to work on selected sections of the document % to speed up compilation time: https://en.wikibooks.org/wiki/TeX/includeonly From a327c81671d079ada906e24f3a91f69b24a469d8 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 22:29:19 -0300 Subject: [PATCH 101/148] Fixed fichacatalografica.tex printing subtitle when it does not exists. --- beforetext/fichacatalografica.tex | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/beforetext/fichacatalografica.tex b/beforetext/fichacatalografica.tex index 50f156f..e115b6d 100644 --- a/beforetext/fichacatalografica.tex +++ b/beforetext/fichacatalografica.tex @@ -22,8 +22,11 @@ \ttfamily \imprimirautor - \hspace{0.5cm} \imprimirtitulo~:~\imprimirsubtitulo~/~\imprimirautor; - \imprimirorientadorRotulo,~\imprimirorientador;~\imprimircoorientadorRotulo,~\imprimircoorientador + \hspace{0.5cm} \imprimirtitulo% + \ifnotempty{\imprimirsubtitulo}{~:~\imprimirsubtitulo}% + ~/~\imprimirautor% + ;~\imprimirorientadorRotulo,~\imprimirorientador% + \ifnotempty{\imprimircoorientador}{;~\imprimircoorientadorRotulo,~\imprimircoorientador}% ~--~\imprimirlocal,~\currenttime,~\imprimirdata. % Prints how much pages there are on the document and links to the last page @@ -37,14 +40,18 @@ \hspace{0.5cm} \lang{Includes references}{Inclui referências} \bigskip + % https://tex.stackexchange.com/questions/54055/using-lower-case-roman-numerals-in-enumerate-lists + % https://tex.stackexchange.com/questions/61811/how-to-define-inparaenum-in-the-preamble \hspace{0.44cm} \begin{inparaenum} \lang{\palavraschaveingles}{\palavraschaveportugues} \end{inparaenum} - I. \imprimirorientador~ - II. \imprimircoorientador~ - III. \imprimirprograma~ - IV. \imprimirtitulo~ + \begin{inparaenum}[I.] + \item \imprimirorientador~ + \ifnotempty{\imprimircoorientador}{\item \imprimircoorientador~} + \item \imprimirprograma~ + \item \imprimirtitulo~ + \end{inparaenum} \bigskip \hspace{7.75cm} CDU 02:141:005.7 From b3c81928013b702d2ab353f33547c2324c7e9166 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 22:29:39 -0300 Subject: [PATCH 102/148] Fixed makefile.mk remote rule not logging the remote command --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 222af81..c84f61c 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 222af81944e86476dab558d635a3e09e6bbfdf68 +Subproject commit c84f61c746f7cf400d9613d1e5528a77035398e6 From 28b1df80947deb9e83389b8a48460fa838fb3786 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 22:30:29 -0300 Subject: [PATCH 103/148] Updated the pictures/pdf_exemplo_completo.pdf --- pictures | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pictures b/pictures index ba4dc38..c612d2f 160000 --- a/pictures +++ b/pictures @@ -1 +1 @@ -Subproject commit ba4dc38b1ec6e4ace537d7b6f7b798add5037e4e +Subproject commit c612d2f077e294e56f87534f4a1e3d4fc8dbfba1 From 479e4fb647d53145e012cd4ceb17f6886c6bf8cf Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 23:22:48 -0300 Subject: [PATCH 104/148] Replaced the usage of \useshorthands{~} with -- breaking dashes ~--~ latex parsing by using ~= --- main.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tex b/main.tex index 955d23c..e4ab9dc 100644 --- a/main.tex +++ b/main.tex @@ -145,9 +145,9 @@ % Altere o arquivo 'settings.tex' para incluir customizações de aparência da sua tese \input{settings.tex} -% Allows you to use ~- instead of `\hyp{}` +% Allows you to use ~= instead of `\hyp{}` % https://tex.stackexchange.com/questions/488008/how-to-create-an-alternative-to-shortcut-or-hyp -% \useshorthands{~}\defineshorthand{~-}{\hyp{}} +% \useshorthands{~}\defineshorthand{~=}{\hyp{}} % When writing a large document, it is sometimes useful to work on selected sections of the document % to speed up compilation time: https://en.wikibooks.org/wiki/TeX/includeonly From 0d7635b4023210b329ba3809c534002b645c3ce5 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 28 Apr 2019 23:45:18 -0300 Subject: [PATCH 105/148] Fixed makefile.mk remote sending the compiled PDF back to the server --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index c84f61c..face4d3 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit c84f61c746f7cf400d9613d1e5528a77035398e6 +Subproject commit face4d3c629fa4ff557a74087c7c06baf71d3bd4 From 56b490736c03e832b3502e3f53b7331783ac3dd0 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 29 Apr 2019 22:44:43 -0300 Subject: [PATCH 106/148] Added to make debug=1 check whether fgrep is installed or not --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index face4d3..7dafa97 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit face4d3c629fa4ff557a74087c7c06baf71d3bd4 +Subproject commit 7dafa976836d1eea0f0605298cf5c7b980992bf6 From 9376b7388fa22224e14a3d404c410827980875c8 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 29 Apr 2019 22:59:25 -0300 Subject: [PATCH 107/148] Converted ufscthesisx.sty to ufscthesisx.cls --- main.tex | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main.tex b/main.tex index e4ab9dc..8f942f2 100644 --- a/main.tex +++ b/main.tex @@ -59,10 +59,7 @@ twoside, % Impressão nos dois lados da folha chapter=TITLE, % Título de capítulos em caixa alta section=TITLE, % Título de seções em caixa alta -]{abntex2} - -% Load the UFSC thesis package -\usepackage{setup/ufscthesisx} +]{setup/ufscthesisx} % Load extra commands for tables, lists, summaries, etc. \input{setup/utilities.tex} From 349f308a105e9548a98ef7ecc70056f6af92c9a1 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 29 Apr 2019 23:08:35 -0300 Subject: [PATCH 108/148] Integrated setup.tex inside ufscthesisx.cls --- main.tex | 3 --- setup | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/main.tex b/main.tex index 8f942f2..d356573 100644 --- a/main.tex +++ b/main.tex @@ -46,9 +46,6 @@ % Disable the empty pages automatically put by memoir class, except the ones by \cleardoublepage % \PassOptionsToClass{openany}{memoir} -% Fixes several `abntex2` class problems -\input{setup/setup.tex} - % The UFSC font size is 10.5, but memoir embedded by `abntex2` only accepts 10 and 11pt. % However, problem will be fixed the `ufscthesisx` package. \documentclass[ diff --git a/setup b/setup index 7dafa97..343bde7 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 7dafa976836d1eea0f0605298cf5c7b980992bf6 +Subproject commit 343bde7dc309de4321fbff15fd9a16ea698c0dfe From 6552c08b8d7818bbdc07037b4f3316721c3342b7 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 29 Apr 2019 23:15:54 -0300 Subject: [PATCH 109/148] Moved utilities git submodule into ufscthesisx.cls --- main.tex | 3 --- setup | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/main.tex b/main.tex index d356573..e9a813d 100644 --- a/main.tex +++ b/main.tex @@ -58,9 +58,6 @@ section=TITLE, % Título de seções em caixa alta ]{setup/ufscthesisx} -% Load extra commands for tables, lists, summaries, etc. -\input{setup/utilities.tex} - % % Utilize o arquivo aftertext/references.bib para incluir sua bibliografia. \addbibresource{aftertext/references.bib} diff --git a/setup b/setup index 343bde7..acefdef 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 343bde7dc309de4321fbff15fd9a16ea698c0dfe +Subproject commit acefdef530290f49a65d02d06b4265bb998f91cb From 95a4b0a850c2e11e0db027f2a27ed0e02c3d1f19 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 30 Apr 2019 03:20:50 -0300 Subject: [PATCH 110/148] Deprecated makefile.mk redundant check if ".git" in direcory_name --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index acefdef..849f7ac 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit acefdef530290f49a65d02d06b4265bb998f91cb +Subproject commit 849f7ac9aad40fe326cfc0abb53080494dcbef09 From b6ff7632269b3cfe9e506a20610f0d3201dbc6d5 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 30 Apr 2019 04:19:04 -0300 Subject: [PATCH 111/148] Created the script remove_lang.py to remove the \lang tags from all latex source files. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 849f7ac..e5d1521 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 849f7ac9aad40fe326cfc0abb53080494dcbef09 +Subproject commit e5d15214ec5b756d59398e7496ad22168e76a7d4 From 9e1540cfd2071df3c67cd2e38fbc5e9b14047a47 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 30 Apr 2019 04:19:31 -0300 Subject: [PATCH 112/148] Ran the script remove_lang.py on this project. --- aftertext/anexo_a.tex | 2 +- aftertext/anexo_b.tex | 4 +--- aftertext/apendice_a.tex | 4 +--- beforetext/agradecimentos.tex | 10 +++------- beforetext/dedicatoria.tex | 11 +++-------- beforetext/epigrafe.tex | 30 +++--------------------------- beforetext/fichacatalografica.tex | 12 ++++-------- beforetext/folhadeaprovacao.tex | 16 +++++----------- beforetext/siglas.tex | 6 +++--- beforetext/simbolos.tex | 10 +++++----- chapters/chapter_1.tex | 6 ++---- chapters/conclusion.tex | 2 +- chapters/intro.tex | 2 +- 13 files changed, 33 insertions(+), 82 deletions(-) diff --git a/aftertext/anexo_a.tex b/aftertext/anexo_a.tex index 965f42b..602d3bf 100644 --- a/aftertext/anexo_a.tex +++ b/aftertext/anexo_a.tex @@ -6,7 +6,7 @@ % % ---------------------------------------------------------- -\chapter{\lang{Article published in SOBRAEP magazine}{Artigo publicado}} +\chapter{Artigo publicado} % ---------------------------------------------------------- diff --git a/aftertext/anexo_b.tex b/aftertext/anexo_b.tex index dd02d97..460d3cc 100644 --- a/aftertext/anexo_b.tex +++ b/aftertext/anexo_b.tex @@ -7,9 +7,7 @@ % % ---------------------------------------------------------- -\lang -{\chapter[Sample example]{How to display the font size in use in the final output}} -{\chapter[Anexo exemplo]{Como exibir o tamanho da fonte em uso na saída final}} +\chapter[Anexo exemplo]{Como exibir o tamanho da fonte em uso na saída final} % ---------------------------------------------------------- diff --git a/aftertext/apendice_a.tex b/aftertext/apendice_a.tex index 5f2c070..f7f9774 100644 --- a/aftertext/apendice_a.tex +++ b/aftertext/apendice_a.tex @@ -8,9 +8,7 @@ % --- -\lang -{\chapter[Page not filled]{Since this page is not being completely filled, it is generating the bottom bottom of the page}} -{\chapter[Página não gerada]{Como esta página não está sendo completamente preenchida, ele está gerando a caixa inferior inferior da página}} +\chapter[Página não gerada]{Como esta página não está sendo completamente preenchida, ele está gerando a caixa inferior inferior da página} % --- diff --git a/beforetext/agradecimentos.tex b/beforetext/agradecimentos.tex index 7d3e78a..8bdc757 100644 --- a/beforetext/agradecimentos.tex +++ b/beforetext/agradecimentos.tex @@ -1,14 +1,10 @@ -\addtotextpreliminarycontent{\lang{Acknowledgement}{Agradecimentos}} +\addtotextpreliminarycontent{Agradecimentos} \begin{agradecimentos} -\lang -{ - Greetings. -} -{ + Os agradecimentos principais são direcionados à Gerald Weber, Miguel Frasson, Leslie H. Watter, Bruno Parente Lima, Flávio de Vasconcellos Corrêa, Otavio Real Salvador, Renato Machnievscz\footnote{Os nomes dos integrantes do primeiro @@ -25,7 +21,7 @@ \emph{\abnTeX{}}\footnote{\url{http://groups.google.com/group/abntex2} e \url{http://abntex2.googlecode.com/}}~que contribuíram e que ainda contribuirão para a evolução do \abnTeX{}. -} + \end{agradecimentos} diff --git a/beforetext/dedicatoria.tex b/beforetext/dedicatoria.tex index af41d24..70a3df8 100644 --- a/beforetext/dedicatoria.tex +++ b/beforetext/dedicatoria.tex @@ -1,21 +1,16 @@ -\addtotextpreliminarycontent{\lang{Dedicatory}{Dedicatória}} +\addtotextpreliminarycontent{Dedicatória} \begin{dedicatoria} \vspace*{\fill} \centering \noindent - \textit{\lang - { - This work is dedicated to adult children who, \\ - When small, dreamed of becoming scientists. - } - { + \textit{ Este trabalho é dedicado às crianças adultas que,\\ quando pequenas, sonharam em se tornar cientistas. - }} + } \vspace*{\fill} \end{dedicatoria} diff --git a/beforetext/epigrafe.tex b/beforetext/epigrafe.tex index e81c2cd..a6f49f5 100644 --- a/beforetext/epigrafe.tex +++ b/beforetext/epigrafe.tex @@ -1,41 +1,17 @@ -\addtotextpreliminarycontent{\lang{Epigraph}{Epigrafe}} +\addtotextpreliminarycontent{Epigrafe} \begin{epigrafe} -\vspace*{\fill}\lang -{ - \begin{flushright} - \textit{``Learn from yesterday, live for today, hope for tomorrow. The important thing is not to stop questioning.''} \\ Albert Einstein - \end{flushright} - \begin{flushright} - \textit{``The true sign of intelligence is not knowledge but imagination.''} \\ Albert Einstein - \end{flushright} - \begin{flushright} - \textit{``Peace cannot be kept by force; it can only be achieved by understanding.''} \\ Albert Einstein - \end{flushright} - \begin{flushright} - \textit{``Whoever is careless with the truth in small matters cannot be trusted with important matters.''} \\ Albert Einstein - \end{flushright} - \begin{flushright} - \textit{``Extraordinary claims require extraordinary evidence''} \\ Carl Sagan - \end{flushright} - \begin{flushright} - \textit{``Catholic, which I was until I reached the age of reason.''} \\ George Carlin - \end{flushright} - \begin{flushright} - \textit{``We made too many wrong mistakes.''} \\ Yogi Berra - \end{flushright} -} -{ +\vspace*{\fill} \begin{flushright} \textit{``Assim como aquele pecado da juventude, este documento te perseguirá pelo resto da vida.''} \\ Enio Valmor Kassick \end{flushright} \begin{flushright} \textit{``Estupidez trará mais autoconfiança do que o conhecimento e a bravura juntas. \englishword{\showfont}''} \\ Adriano Ruseler \end{flushright} -} + \end{epigrafe} diff --git a/beforetext/fichacatalografica.tex b/beforetext/fichacatalografica.tex index e115b6d..155373d 100644 --- a/beforetext/fichacatalografica.tex +++ b/beforetext/fichacatalografica.tex @@ -7,13 +7,9 @@ \begin{center} - \lang - {Cataloging at source by the University Library of the Federal University of Santa Catarina.} - {Catalogação na fonte pela Biblioteca Universitária da Universidade Federal de Santa Catarina.} + Catalogação na fonte pela Biblioteca Universitária da Universidade Federal de Santa Catarina. - \lang - {File compiled at \currenttime h of the day \today.} - {Arquivo compilado às \currenttime h do dia \today.} + Arquivo compilado às \currenttime h do dia \today. \framebox[\textwidth] { @@ -37,14 +33,14 @@ \imprimircentro,~\imprimirprograma. \bigskip - \hspace{0.5cm} \lang{Includes references}{Inclui referências} + \hspace{0.5cm} Inclui referências \bigskip % https://tex.stackexchange.com/questions/54055/using-lower-case-roman-numerals-in-enumerate-lists % https://tex.stackexchange.com/questions/61811/how-to-define-inparaenum-in-the-preamble \hspace{0.44cm} \begin{inparaenum} - \lang{\palavraschaveingles}{\palavraschaveportugues} + \palavraschaveportugues \end{inparaenum} \begin{inparaenum}[I.] \item \imprimirorientador~ diff --git a/beforetext/folhadeaprovacao.tex b/beforetext/folhadeaprovacao.tex index f500d13..a512f24 100644 --- a/beforetext/folhadeaprovacao.tex +++ b/beforetext/folhadeaprovacao.tex @@ -1,6 +1,6 @@ -\addtotextpreliminarycontent{\lang{Approval Sheet}{Folha de Aprovação}} +\addtotextpreliminarycontent{Folha de Aprovação} \begin{folhadeaprovacao} @@ -12,18 +12,12 @@ \end{center} \begin{minipage}{\textwidth} - \lang - { - This \imprimirtipotrabalho~was considered appropriate to get the \imprimirformacao, - \ifnotempty{\imprimirarea}{in the area of \imprimirarea,} - and it was approved by the \imprimirprograma~of \imprimircentro~of \imprimirinstituicao. - } - { + Este(a) \imprimirtipotrabalho~foi julgado adequado(a) para obtenção do Título de \imprimirformacao, \ifnotempty{\imprimirarea}{na área de concentração \imprimirarea,} e foi aprovado em sua forma final pelo \imprimirprograma~ do \imprimircentro~da \imprimirinstituicao. - } + \end{minipage}% \end{center} @@ -33,12 +27,12 @@ \assinatura{% \textbf{\imprimircoordenador} \\ - \imprimircoordenadorRotulo~\lang{of}{do} \imprimirprograma + \imprimircoordenadorRotulo~do \imprimirprograma } % \newpage \begin{flushleft} - \textbf{\lang{Examination Board}{Banca Examinadora}:} + \textbf{Banca Examinadora:} \end{flushleft} \assinatura{% diff --git a/beforetext/siglas.tex b/beforetext/siglas.tex index da67252..0e5f093 100644 --- a/beforetext/siglas.tex +++ b/beforetext/siglas.tex @@ -1,9 +1,9 @@ -\addtotextpreliminarycontent{\lang{List of Acronyms}{Lista de Siglas}} +\addtotextpreliminarycontent{Lista de Siglas} \begin{siglas} - \item[ABNT] \lang{Brazilian Association of Technical Standards}{Associação Brasileira de Normas Técnicas} - \item[abnTeX] \lang{Absurd Standards for TeX}{ABsurdas Normas para TeX} + \item[ABNT] Associação Brasileira de Normas Técnicas + \item[abnTeX] ABsurdas Normas para TeX \end{siglas} diff --git a/beforetext/simbolos.tex b/beforetext/simbolos.tex index 73ac2d0..4061589 100644 --- a/beforetext/simbolos.tex +++ b/beforetext/simbolos.tex @@ -1,11 +1,11 @@ -\addtotextpreliminarycontent{\lang{List of Symbols}{Lista de Símbolos}} +\addtotextpreliminarycontent{Lista de Símbolos} % Devam aparecer na mesma ordem de ocorrência no texto. \begin{simbolos} - \item[$ \Gamma $] \lang{Greek letter Gama}{Letra grega Gama} - \item[$ \Lambda $] \lang{Lambda}{Lambda} - \item[$ \zeta $] \lang{Minimal Greek letter zeta}{Letra grega minúscula zeta} - \item[$ \in $] \lang{Belongs}{Pertence} + \item[$ \Gamma $] Letra grega Gama + \item[$ \Lambda $] Lambda + \item[$ \zeta $] Letra grega minúscula zeta + \item[$ \in $] Pertence \end{simbolos} diff --git a/chapters/chapter_1.tex b/chapters/chapter_1.tex index 4e81d66..ecffe47 100644 --- a/chapters/chapter_1.tex +++ b/chapters/chapter_1.tex @@ -35,11 +35,9 @@ \phantomsection % https://tex.stackexchange.com/questions/5076/is-it-possible-to-keep-my-translation-together-with-original-text -\chapter[\lang{Abbreviation for the Table of Contents}{Abreviação para o Sumário}] +\chapter[Abreviação para o Sumário] { - \lang - {Long title to present in the chapter, Axioms, Theorems, Postulates, corollaries, lemmas} - {Longo título apresentar no capítulo, Axiomas, Teoremas, Postulados, corolários, lemas} + Longo título apresentar no capítulo, Axiomas, Teoremas, Postulados, corolários, lemas } \label{cap_exemplos} diff --git a/chapters/conclusion.tex b/chapters/conclusion.tex index af50e47..2f0cf2c 100644 --- a/chapters/conclusion.tex +++ b/chapters/conclusion.tex @@ -5,7 +5,7 @@ \phantomsection % --- -\chapter{\lang{Final Remarks}{Considerações Finais}} +\chapter{Considerações Finais} \phantomsection Lipsum me [31-33] diff --git a/chapters/intro.tex b/chapters/intro.tex index b8d8f7b..5b30de1 100644 --- a/chapters/intro.tex +++ b/chapters/intro.tex @@ -44,7 +44,7 @@ \phantomsection % https://tex.stackexchange.com/questions/5076/is-it-possible-to-keep-my-translation-together-with-original-text -\chapter{\lang{Introduction}{Introdução}} +\chapter{Introdução} \phantomsection A Tabela~\ref{tab:a_table_formatacao_de_texto} mostra informações do modelo de teses da Biblioteca Universitária da UFSC (BU-UFSC). From 44f67e61fc3ef0027af0b9b9279a9999c49c0e52 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 30 Apr 2019 04:22:50 -0300 Subject: [PATCH 113/148] Added copyright notice to makefile.mk --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index e5d1521..7e6997b 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit e5d15214ec5b756d59398e7496ad22168e76a7d4 +Subproject commit 7e6997bb81558c33614f97fb6220d6453458913d From 16906c80470991aacde3181feadf62dedb643bc8 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 30 Apr 2019 04:50:26 -0300 Subject: [PATCH 114/148] Fixed remove_lang.py not running on main.tex --- main.tex | 34 ++++++++++++---------------------- setup | 2 +- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/main.tex b/main.tex index e9a813d..853cb63 100644 --- a/main.tex +++ b/main.tex @@ -63,65 +63,55 @@ % FIXME: Preencha com seus dados \autor{\brazilword{Escreva aqui o Nome completo do Autor ou da Autora}} -\titulo{\lang{Work Title}{Título do trabalho}} +\titulo{Título do trabalho} % FIXME: Se houver subtítulo, descomente a linha abaixo % \subtitulo{\lang{Subtitle}{Subtítulo}} % FIXME: Siglas para grau de formação Dr./Dra., Me./Ma, Bel. Bela. (inglês: PhD., MSc., Bs.) -\orientador[\lang{Supervisor}{Orientador(a)}]{\brazilword{Nome completo do Orientador(a)}, \lang{Phd.}{Dr.}} +\orientador[Orientador(a)]{\brazilword{Nome completo do Orientador(a)}, Dr.} % FIXME: Se houver coorientador, descomente a linha abaixo % \coorientador[\lang{Co-supervisor}{Coorientador(a)}]{\brazilword{Nome do coorientador(a)}, \lang{Phd.}{Dr.}} % FIXME: Preencher com o nome do Coordenador de TCCs/Teses do seu curso -\coordenador[\lang{Coordinator}{Coordenador(a)}]{\brazilword{Nome do Coordenador(a)}, \lang{Phd.}{Dr.}} +\coordenador[Coordenador(a)]{\brazilword{Nome do Coordenador(a)}, Dr.} % FIXME: Local da sua defesa \local{\brazilword{Local da sua Defesa}} % FIXME: Ano da sua defesa \ano{2001} -\biblioteca{\lang{University Library}{Biblioteca Universitária}} +\biblioteca{Biblioteca Universitária} % FIXME: Sigla da sua instituição \instituicaosigla{UFSC} -\instituicao{\lang{Federal University of}{Universidade Federal de} \brazilword{Santa Catarina}} +\instituicao{Universidade Federal de \brazilword{Santa Catarina}} % FIXME: Preencha com Tese, Dissertação, Monografia ou Trabalho de Conclusão de Curso, Bachelor's Thesis, etc -\tipotrabalho{\lang{Monograph}{Monografia}} +\tipotrabalho{Monografia} % FIXME: Se houver Área de Concentração, descomente a linha abaixo % \area{\lang{Concentration Area}{Área de Concentração}} % FIXME: Preencha com Doutor, Bacharel ou Mestrando -\formacao{\lang - {Doctorate in XXXXXX} - {Doutor em XXXXXX}% +\formacao{Doutor em XXXXXX% } -\programa{\lang - {Postgraduate Program in XXXXXX} - {Programa de Pós-Graduação em XXXXXX}% +\programa{Programa de Pós-Graduação em XXXXXX% } % FIXME: Preencha com Departamento de XXXXXX, Centro de XXXXXX -\centro{\lang - {Department of XXXXXX, Center of XXXXXX} - {Departamento de XXXXXX, Centro de XXXXXX}% +\centro{Departamento de XXXXXX, Centro de XXXXXX% } % FIXME: Data da sua defesa -\data{\lang{30 of march of}{30 de março de} 2001} +\data{30 de março de 2001} % O preambulo deve conter tipo do trabalho, objetivo, nome da instituição e a área de concentração. -\preambulo{\lang% - {% - \imprimirtipotrabalho~submitted to the \imprimirprograma~of - \imprimirinstituicao~for degree acquirement in \imprimirformacao.% - }{% +\preambulo{% \imprimirtipotrabalho~submetido ao \imprimirprograma~da \imprimirinstituicao~para a obtenção do Grau de \imprimirformacao.% - }% + % } \palavraschaveufsc{palavraschaveingles} {Keyword 1} diff --git a/setup b/setup index 7e6997b..a1eec73 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 7e6997bb81558c33614f97fb6220d6453458913d +Subproject commit a1eec736b233adbb6a57f5290bfb00b586e6c89a From e8179b5d73f9bc0cb0dde859383d18c7e0086b27 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Tue, 30 Apr 2019 21:41:11 -0300 Subject: [PATCH 115/148] Created unit tests for remove_lang.py --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index a1eec73..f43bc65 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit a1eec736b233adbb6a57f5290bfb00b586e6c89a +Subproject commit f43bc6599fe7b7b444f9dadba1e20f73570dc7db From 714df877371fce4f0bc13fc6e3fb19440117677c Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 1 May 2019 02:19:54 -0300 Subject: [PATCH 116/148] Added bookmark entry for the cover on beforetext.tex --- beforetext/beforetext.tex | 1 + 1 file changed, 1 insertion(+) diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex index ddc449b..7e58ff2 100644 --- a/beforetext/beforetext.tex +++ b/beforetext/beforetext.tex @@ -8,6 +8,7 @@ % ELEMENTOS PRÉ-TEXTUAIS \ifforcedinclude\else % pretextual settings + \PRIVATEbookmarkthis{Capa} \pretextual % Capa From c0c6c3f19a9cad0c62aa817e36b23b6629a59021 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 1 May 2019 02:31:05 -0300 Subject: [PATCH 117/148] Revert "Converted ufscthesisx.sty to ufscthesisx.cls" This reverts commit 78ced0c391d9f394ce3bd355198b6334983c71bc. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index f43bc65..73fa7ea 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit f43bc6599fe7b7b444f9dadba1e20f73570dc7db +Subproject commit 73fa7eabacbef7ec40f9f436d6b924a6f8a41a46 From 96e4b139f3e6199385021b5cb3f14dd7360f10a7 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 1 May 2019 02:31:31 -0300 Subject: [PATCH 118/148] Revert "Ran the script remove_lang.py on this project." This reverts commit 9e1540cfd2071df3c67cd2e38fbc5e9b14047a47. --- aftertext/anexo_a.tex | 2 +- aftertext/anexo_b.tex | 4 +++- aftertext/apendice_a.tex | 4 +++- beforetext/agradecimentos.tex | 10 +++++++--- beforetext/dedicatoria.tex | 11 ++++++++--- beforetext/epigrafe.tex | 30 +++++++++++++++++++++++++++--- beforetext/fichacatalografica.tex | 12 ++++++++---- beforetext/folhadeaprovacao.tex | 16 +++++++++++----- beforetext/siglas.tex | 6 +++--- beforetext/simbolos.tex | 10 +++++----- chapters/chapter_1.tex | 6 ++++-- chapters/conclusion.tex | 2 +- chapters/intro.tex | 2 +- 13 files changed, 82 insertions(+), 33 deletions(-) diff --git a/aftertext/anexo_a.tex b/aftertext/anexo_a.tex index 602d3bf..965f42b 100644 --- a/aftertext/anexo_a.tex +++ b/aftertext/anexo_a.tex @@ -6,7 +6,7 @@ % % ---------------------------------------------------------- -\chapter{Artigo publicado} +\chapter{\lang{Article published in SOBRAEP magazine}{Artigo publicado}} % ---------------------------------------------------------- diff --git a/aftertext/anexo_b.tex b/aftertext/anexo_b.tex index 460d3cc..dd02d97 100644 --- a/aftertext/anexo_b.tex +++ b/aftertext/anexo_b.tex @@ -7,7 +7,9 @@ % % ---------------------------------------------------------- -\chapter[Anexo exemplo]{Como exibir o tamanho da fonte em uso na saída final} +\lang +{\chapter[Sample example]{How to display the font size in use in the final output}} +{\chapter[Anexo exemplo]{Como exibir o tamanho da fonte em uso na saída final}} % ---------------------------------------------------------- diff --git a/aftertext/apendice_a.tex b/aftertext/apendice_a.tex index f7f9774..5f2c070 100644 --- a/aftertext/apendice_a.tex +++ b/aftertext/apendice_a.tex @@ -8,7 +8,9 @@ % --- -\chapter[Página não gerada]{Como esta página não está sendo completamente preenchida, ele está gerando a caixa inferior inferior da página} +\lang +{\chapter[Page not filled]{Since this page is not being completely filled, it is generating the bottom bottom of the page}} +{\chapter[Página não gerada]{Como esta página não está sendo completamente preenchida, ele está gerando a caixa inferior inferior da página}} % --- diff --git a/beforetext/agradecimentos.tex b/beforetext/agradecimentos.tex index 8bdc757..7d3e78a 100644 --- a/beforetext/agradecimentos.tex +++ b/beforetext/agradecimentos.tex @@ -1,10 +1,14 @@ -\addtotextpreliminarycontent{Agradecimentos} +\addtotextpreliminarycontent{\lang{Acknowledgement}{Agradecimentos}} \begin{agradecimentos} - +\lang +{ + Greetings. +} +{ Os agradecimentos principais são direcionados à Gerald Weber, Miguel Frasson, Leslie H. Watter, Bruno Parente Lima, Flávio de Vasconcellos Corrêa, Otavio Real Salvador, Renato Machnievscz\footnote{Os nomes dos integrantes do primeiro @@ -21,7 +25,7 @@ \emph{\abnTeX{}}\footnote{\url{http://groups.google.com/group/abntex2} e \url{http://abntex2.googlecode.com/}}~que contribuíram e que ainda contribuirão para a evolução do \abnTeX{}. - +} \end{agradecimentos} diff --git a/beforetext/dedicatoria.tex b/beforetext/dedicatoria.tex index 70a3df8..af41d24 100644 --- a/beforetext/dedicatoria.tex +++ b/beforetext/dedicatoria.tex @@ -1,16 +1,21 @@ -\addtotextpreliminarycontent{Dedicatória} +\addtotextpreliminarycontent{\lang{Dedicatory}{Dedicatória}} \begin{dedicatoria} \vspace*{\fill} \centering \noindent - \textit{ + \textit{\lang + { + This work is dedicated to adult children who, \\ + When small, dreamed of becoming scientists. + } + { Este trabalho é dedicado às crianças adultas que,\\ quando pequenas, sonharam em se tornar cientistas. - } + }} \vspace*{\fill} \end{dedicatoria} diff --git a/beforetext/epigrafe.tex b/beforetext/epigrafe.tex index a6f49f5..e81c2cd 100644 --- a/beforetext/epigrafe.tex +++ b/beforetext/epigrafe.tex @@ -1,17 +1,41 @@ -\addtotextpreliminarycontent{Epigrafe} +\addtotextpreliminarycontent{\lang{Epigraph}{Epigrafe}} \begin{epigrafe} -\vspace*{\fill} +\vspace*{\fill}\lang +{ + \begin{flushright} + \textit{``Learn from yesterday, live for today, hope for tomorrow. The important thing is not to stop questioning.''} \\ Albert Einstein + \end{flushright} + \begin{flushright} + \textit{``The true sign of intelligence is not knowledge but imagination.''} \\ Albert Einstein + \end{flushright} + \begin{flushright} + \textit{``Peace cannot be kept by force; it can only be achieved by understanding.''} \\ Albert Einstein + \end{flushright} + \begin{flushright} + \textit{``Whoever is careless with the truth in small matters cannot be trusted with important matters.''} \\ Albert Einstein + \end{flushright} + \begin{flushright} + \textit{``Extraordinary claims require extraordinary evidence''} \\ Carl Sagan + \end{flushright} + \begin{flushright} + \textit{``Catholic, which I was until I reached the age of reason.''} \\ George Carlin + \end{flushright} + \begin{flushright} + \textit{``We made too many wrong mistakes.''} \\ Yogi Berra + \end{flushright} +} +{ \begin{flushright} \textit{``Assim como aquele pecado da juventude, este documento te perseguirá pelo resto da vida.''} \\ Enio Valmor Kassick \end{flushright} \begin{flushright} \textit{``Estupidez trará mais autoconfiança do que o conhecimento e a bravura juntas. \englishword{\showfont}''} \\ Adriano Ruseler \end{flushright} - +} \end{epigrafe} diff --git a/beforetext/fichacatalografica.tex b/beforetext/fichacatalografica.tex index 155373d..e115b6d 100644 --- a/beforetext/fichacatalografica.tex +++ b/beforetext/fichacatalografica.tex @@ -7,9 +7,13 @@ \begin{center} - Catalogação na fonte pela Biblioteca Universitária da Universidade Federal de Santa Catarina. + \lang + {Cataloging at source by the University Library of the Federal University of Santa Catarina.} + {Catalogação na fonte pela Biblioteca Universitária da Universidade Federal de Santa Catarina.} - Arquivo compilado às \currenttime h do dia \today. + \lang + {File compiled at \currenttime h of the day \today.} + {Arquivo compilado às \currenttime h do dia \today.} \framebox[\textwidth] { @@ -33,14 +37,14 @@ \imprimircentro,~\imprimirprograma. \bigskip - \hspace{0.5cm} Inclui referências + \hspace{0.5cm} \lang{Includes references}{Inclui referências} \bigskip % https://tex.stackexchange.com/questions/54055/using-lower-case-roman-numerals-in-enumerate-lists % https://tex.stackexchange.com/questions/61811/how-to-define-inparaenum-in-the-preamble \hspace{0.44cm} \begin{inparaenum} - \palavraschaveportugues + \lang{\palavraschaveingles}{\palavraschaveportugues} \end{inparaenum} \begin{inparaenum}[I.] \item \imprimirorientador~ diff --git a/beforetext/folhadeaprovacao.tex b/beforetext/folhadeaprovacao.tex index a512f24..f500d13 100644 --- a/beforetext/folhadeaprovacao.tex +++ b/beforetext/folhadeaprovacao.tex @@ -1,6 +1,6 @@ -\addtotextpreliminarycontent{Folha de Aprovação} +\addtotextpreliminarycontent{\lang{Approval Sheet}{Folha de Aprovação}} \begin{folhadeaprovacao} @@ -12,12 +12,18 @@ \end{center} \begin{minipage}{\textwidth} - + \lang + { + This \imprimirtipotrabalho~was considered appropriate to get the \imprimirformacao, + \ifnotempty{\imprimirarea}{in the area of \imprimirarea,} + and it was approved by the \imprimirprograma~of \imprimircentro~of \imprimirinstituicao. + } + { Este(a) \imprimirtipotrabalho~foi julgado adequado(a) para obtenção do Título de \imprimirformacao, \ifnotempty{\imprimirarea}{na área de concentração \imprimirarea,} e foi aprovado em sua forma final pelo \imprimirprograma~ do \imprimircentro~da \imprimirinstituicao. - + } \end{minipage}% \end{center} @@ -27,12 +33,12 @@ \assinatura{% \textbf{\imprimircoordenador} \\ - \imprimircoordenadorRotulo~do \imprimirprograma + \imprimircoordenadorRotulo~\lang{of}{do} \imprimirprograma } % \newpage \begin{flushleft} - \textbf{Banca Examinadora:} + \textbf{\lang{Examination Board}{Banca Examinadora}:} \end{flushleft} \assinatura{% diff --git a/beforetext/siglas.tex b/beforetext/siglas.tex index 0e5f093..da67252 100644 --- a/beforetext/siglas.tex +++ b/beforetext/siglas.tex @@ -1,9 +1,9 @@ -\addtotextpreliminarycontent{Lista de Siglas} +\addtotextpreliminarycontent{\lang{List of Acronyms}{Lista de Siglas}} \begin{siglas} - \item[ABNT] Associação Brasileira de Normas Técnicas - \item[abnTeX] ABsurdas Normas para TeX + \item[ABNT] \lang{Brazilian Association of Technical Standards}{Associação Brasileira de Normas Técnicas} + \item[abnTeX] \lang{Absurd Standards for TeX}{ABsurdas Normas para TeX} \end{siglas} diff --git a/beforetext/simbolos.tex b/beforetext/simbolos.tex index 4061589..73ac2d0 100644 --- a/beforetext/simbolos.tex +++ b/beforetext/simbolos.tex @@ -1,11 +1,11 @@ -\addtotextpreliminarycontent{Lista de Símbolos} +\addtotextpreliminarycontent{\lang{List of Symbols}{Lista de Símbolos}} % Devam aparecer na mesma ordem de ocorrência no texto. \begin{simbolos} - \item[$ \Gamma $] Letra grega Gama - \item[$ \Lambda $] Lambda - \item[$ \zeta $] Letra grega minúscula zeta - \item[$ \in $] Pertence + \item[$ \Gamma $] \lang{Greek letter Gama}{Letra grega Gama} + \item[$ \Lambda $] \lang{Lambda}{Lambda} + \item[$ \zeta $] \lang{Minimal Greek letter zeta}{Letra grega minúscula zeta} + \item[$ \in $] \lang{Belongs}{Pertence} \end{simbolos} diff --git a/chapters/chapter_1.tex b/chapters/chapter_1.tex index ecffe47..4e81d66 100644 --- a/chapters/chapter_1.tex +++ b/chapters/chapter_1.tex @@ -35,9 +35,11 @@ \phantomsection % https://tex.stackexchange.com/questions/5076/is-it-possible-to-keep-my-translation-together-with-original-text -\chapter[Abreviação para o Sumário] +\chapter[\lang{Abbreviation for the Table of Contents}{Abreviação para o Sumário}] { - Longo título apresentar no capítulo, Axiomas, Teoremas, Postulados, corolários, lemas + \lang + {Long title to present in the chapter, Axioms, Theorems, Postulates, corollaries, lemmas} + {Longo título apresentar no capítulo, Axiomas, Teoremas, Postulados, corolários, lemas} } \label{cap_exemplos} diff --git a/chapters/conclusion.tex b/chapters/conclusion.tex index 2f0cf2c..af50e47 100644 --- a/chapters/conclusion.tex +++ b/chapters/conclusion.tex @@ -5,7 +5,7 @@ \phantomsection % --- -\chapter{Considerações Finais} +\chapter{\lang{Final Remarks}{Considerações Finais}} \phantomsection Lipsum me [31-33] diff --git a/chapters/intro.tex b/chapters/intro.tex index 5b30de1..b8d8f7b 100644 --- a/chapters/intro.tex +++ b/chapters/intro.tex @@ -44,7 +44,7 @@ \phantomsection % https://tex.stackexchange.com/questions/5076/is-it-possible-to-keep-my-translation-together-with-original-text -\chapter{Introdução} +\chapter{\lang{Introduction}{Introdução}} \phantomsection A Tabela~\ref{tab:a_table_formatacao_de_texto} mostra informações do modelo de teses da Biblioteca Universitária da UFSC (BU-UFSC). From 1d8f188c03dccbeec987b99670870952c7cf47fc Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 1 May 2019 02:33:06 -0300 Subject: [PATCH 119/148] Revert "Moved utilities git submodule into ufscthesisx.cls" This reverts commit 6552c08b8d7818bbdc07037b4f3316721c3342b7. # Conflicts: # setup --- main.tex | 3 +++ setup | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/main.tex b/main.tex index 853cb63..47bb076 100644 --- a/main.tex +++ b/main.tex @@ -58,6 +58,9 @@ section=TITLE, % Título de seções em caixa alta ]{setup/ufscthesisx} +% Load extra commands for tables, lists, summaries, etc. +\input{setup/utilities.tex} + % % Utilize o arquivo aftertext/references.bib para incluir sua bibliografia. \addbibresource{aftertext/references.bib} diff --git a/setup b/setup index 73fa7ea..343bde7 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 73fa7eabacbef7ec40f9f436d6b924a6f8a41a46 +Subproject commit 343bde7dc309de4321fbff15fd9a16ea698c0dfe From ae2119b94126660f31df62946d412c0ee062da9d Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 1 May 2019 02:33:30 -0300 Subject: [PATCH 120/148] Revert "Integrated setup.tex inside ufscthesisx.cls" This reverts commit 349f308a105e9548a98ef7ecc70056f6af92c9a1. --- main.tex | 3 +++ setup | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/main.tex b/main.tex index 47bb076..e8bef92 100644 --- a/main.tex +++ b/main.tex @@ -46,6 +46,9 @@ % Disable the empty pages automatically put by memoir class, except the ones by \cleardoublepage % \PassOptionsToClass{openany}{memoir} +% Fixes several `abntex2` class problems +\input{setup/setup.tex} + % The UFSC font size is 10.5, but memoir embedded by `abntex2` only accepts 10 and 11pt. % However, problem will be fixed the `ufscthesisx` package. \documentclass[ diff --git a/setup b/setup index 343bde7..7dafa97 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 343bde7dc309de4321fbff15fd9a16ea698c0dfe +Subproject commit 7dafa976836d1eea0f0605298cf5c7b980992bf6 From ec6bc6dc0cb9074ab8a54d87afc4db87bd246ebf Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 1 May 2019 02:33:43 -0300 Subject: [PATCH 121/148] Revert "Converted ufscthesisx.sty to ufscthesisx.cls" This reverts commit 9376b7388fa22224e14a3d404c410827980875c8. --- main.tex | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main.tex b/main.tex index e8bef92..ca12ee8 100644 --- a/main.tex +++ b/main.tex @@ -59,7 +59,10 @@ twoside, % Impressão nos dois lados da folha chapter=TITLE, % Título de capítulos em caixa alta section=TITLE, % Título de seções em caixa alta -]{setup/ufscthesisx} +]{abntex2} + +% Load the UFSC thesis package +\usepackage{setup/ufscthesisx} % Load extra commands for tables, lists, summaries, etc. \input{setup/utilities.tex} From a828f9b5eeb9b9af648c1005ee0044fe18876693 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 1 May 2019 02:35:53 -0300 Subject: [PATCH 122/148] Revert "Fixed remove_lang.py not running on main.tex" This reverts commit 16906c80470991aacde3181feadf62dedb643bc8. # Conflicts: # setup --- main.tex | 34 ++++++++++++++++++++++------------ setup | 2 +- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/main.tex b/main.tex index ca12ee8..e4ab9dc 100644 --- a/main.tex +++ b/main.tex @@ -72,55 +72,65 @@ % FIXME: Preencha com seus dados \autor{\brazilword{Escreva aqui o Nome completo do Autor ou da Autora}} -\titulo{Título do trabalho} +\titulo{\lang{Work Title}{Título do trabalho}} % FIXME: Se houver subtítulo, descomente a linha abaixo % \subtitulo{\lang{Subtitle}{Subtítulo}} % FIXME: Siglas para grau de formação Dr./Dra., Me./Ma, Bel. Bela. (inglês: PhD., MSc., Bs.) -\orientador[Orientador(a)]{\brazilword{Nome completo do Orientador(a)}, Dr.} +\orientador[\lang{Supervisor}{Orientador(a)}]{\brazilword{Nome completo do Orientador(a)}, \lang{Phd.}{Dr.}} % FIXME: Se houver coorientador, descomente a linha abaixo % \coorientador[\lang{Co-supervisor}{Coorientador(a)}]{\brazilword{Nome do coorientador(a)}, \lang{Phd.}{Dr.}} % FIXME: Preencher com o nome do Coordenador de TCCs/Teses do seu curso -\coordenador[Coordenador(a)]{\brazilword{Nome do Coordenador(a)}, Dr.} +\coordenador[\lang{Coordinator}{Coordenador(a)}]{\brazilword{Nome do Coordenador(a)}, \lang{Phd.}{Dr.}} % FIXME: Local da sua defesa \local{\brazilword{Local da sua Defesa}} % FIXME: Ano da sua defesa \ano{2001} -\biblioteca{Biblioteca Universitária} +\biblioteca{\lang{University Library}{Biblioteca Universitária}} % FIXME: Sigla da sua instituição \instituicaosigla{UFSC} -\instituicao{Universidade Federal de \brazilword{Santa Catarina}} +\instituicao{\lang{Federal University of}{Universidade Federal de} \brazilword{Santa Catarina}} % FIXME: Preencha com Tese, Dissertação, Monografia ou Trabalho de Conclusão de Curso, Bachelor's Thesis, etc -\tipotrabalho{Monografia} +\tipotrabalho{\lang{Monograph}{Monografia}} % FIXME: Se houver Área de Concentração, descomente a linha abaixo % \area{\lang{Concentration Area}{Área de Concentração}} % FIXME: Preencha com Doutor, Bacharel ou Mestrando -\formacao{Doutor em XXXXXX% +\formacao{\lang + {Doctorate in XXXXXX} + {Doutor em XXXXXX}% } -\programa{Programa de Pós-Graduação em XXXXXX% +\programa{\lang + {Postgraduate Program in XXXXXX} + {Programa de Pós-Graduação em XXXXXX}% } % FIXME: Preencha com Departamento de XXXXXX, Centro de XXXXXX -\centro{Departamento de XXXXXX, Centro de XXXXXX% +\centro{\lang + {Department of XXXXXX, Center of XXXXXX} + {Departamento de XXXXXX, Centro de XXXXXX}% } % FIXME: Data da sua defesa -\data{30 de março de 2001} +\data{\lang{30 of march of}{30 de março de} 2001} % O preambulo deve conter tipo do trabalho, objetivo, nome da instituição e a área de concentração. -\preambulo{% +\preambulo{\lang% + {% + \imprimirtipotrabalho~submitted to the \imprimirprograma~of + \imprimirinstituicao~for degree acquirement in \imprimirformacao.% + }{% \imprimirtipotrabalho~submetido ao \imprimirprograma~da \imprimirinstituicao~para a obtenção do Grau de \imprimirformacao.% - % + }% } \palavraschaveufsc{palavraschaveingles} {Keyword 1} diff --git a/setup b/setup index 7dafa97..73fa7ea 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 7dafa976836d1eea0f0605298cf5c7b980992bf6 +Subproject commit 73fa7eabacbef7ec40f9f436d6b924a6f8a41a46 From 5ba02bb9134b1217b086969787094e328edef851 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 1 May 2019 02:54:42 -0300 Subject: [PATCH 123/148] Created the command \covername on ufscthesisx.sty to translate the beforetext.tex bookmark entry. --- beforetext/beforetext.tex | 3 +-- setup | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex index 7e58ff2..87959fd 100644 --- a/beforetext/beforetext.tex +++ b/beforetext/beforetext.tex @@ -8,8 +8,7 @@ % ELEMENTOS PRÉ-TEXTUAIS \ifforcedinclude\else % pretextual settings - \PRIVATEbookmarkthis{Capa} - \pretextual + \pretextual\PRIVATEbookmarkthis{\covername} % Capa % \includepdf{pictures/FrenteCapaUFSC.pdf} diff --git a/setup b/setup index 73fa7ea..00f2e91 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 73fa7eabacbef7ec40f9f436d6b924a6f8a41a46 +Subproject commit 00f2e913f4531c3374b78bc4c8953632638f3a11 From 26558c9f420222ac6df4a2c350f3facd0a6b4c4c Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 1 May 2019 02:59:58 -0300 Subject: [PATCH 124/148] Added missing \cleardoublepage to beforetext.tex --- beforetext/beforetext.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex index 87959fd..a7ded2b 100644 --- a/beforetext/beforetext.tex +++ b/beforetext/beforetext.tex @@ -118,6 +118,7 @@ % How to remove the self-reference of the ToC from the ToC? % https://tex.stackexchange.com/questions/10943/how-to-remove-the-self-reference-of-the-toc-from-the-toc +\ifforcedinclude\else\cleardoublepage\fi \begin{KeepFromToc} \pdfbookmark[0]{\contentsname}{toc} @@ -151,7 +152,6 @@ \tableofcontents } - \end{KeepFromToc} From bcefc423f9c9513a2be5f793728f91a586d2fb6c Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 13 May 2019 21:06:05 -0300 Subject: [PATCH 125/148] Fixed missing % causing a space to be added on all URL footnotes beginning. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 00f2e91..2547907 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 00f2e913f4531c3374b78bc4c8953632638f3a11 +Subproject commit 254790718425ad9b6641d2a7e33db0bf380f7cc0 From ff2aa3fff8e31bba499e960da4c4e77c44618a0c Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 10 Jun 2019 00:02:35 -0300 Subject: [PATCH 126/148] Fixed list of codes using only Code as title instead of List of Codes --- beforetext/beforetext.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex index a7ded2b..dbedf6d 100644 --- a/beforetext/beforetext.tex +++ b/beforetext/beforetext.tex @@ -99,8 +99,8 @@ % inserir códigos fonte (List of Listings `lol`) \ifforcedinclude\else\cleardoublepage\fi - \addtotextpreliminarycontent{\lstlistingname} - \pdfbookmark[0]{\lstlistingname}{lol} + \addtotextpreliminarycontent{\lstlistlistingname} + \pdfbookmark[0]{\lstlistlistingname}{lol} \lstlistoflistings* \fi From 0284fdd82da9a45eb785049d47da17d9e8436233 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 10 Jun 2019 00:02:48 -0300 Subject: [PATCH 127/148] Set \lstset listening default language as Python and set the option upquote=true by default. --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 2547907..be7e75e 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 254790718425ad9b6641d2a7e33db0bf380f7cc0 +Subproject commit be7e75ea1f075510a5b317db11522ec599b30f5e From 6f54400930f0faacec39ebd39522b3edfba57035 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Fri, 12 Jul 2019 01:14:52 -0300 Subject: [PATCH 128/148] Fixed Frame environment excessive caption spacing on ufscthesisx.sty --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index be7e75e..cd60c03 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit be7e75ea1f075510a5b317db11522ec599b30f5e +Subproject commit cd60c03e74778f0f613a22ab1baa4617ba7b9c12 From dde3702a25bcb6dc03b54717205e1871da989a94 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 22 Sep 2019 16:34:39 -0300 Subject: [PATCH 129/148] Converted ufscthesisx.sty package to a class ufscthesisx.cls --- main.tex | 11 +---------- setup | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/main.tex b/main.tex index e4ab9dc..e9a813d 100644 --- a/main.tex +++ b/main.tex @@ -46,9 +46,6 @@ % Disable the empty pages automatically put by memoir class, except the ones by \cleardoublepage % \PassOptionsToClass{openany}{memoir} -% Fixes several `abntex2` class problems -\input{setup/setup.tex} - % The UFSC font size is 10.5, but memoir embedded by `abntex2` only accepts 10 and 11pt. % However, problem will be fixed the `ufscthesisx` package. \documentclass[ @@ -59,13 +56,7 @@ twoside, % Impressão nos dois lados da folha chapter=TITLE, % Título de capítulos em caixa alta section=TITLE, % Título de seções em caixa alta -]{abntex2} - -% Load the UFSC thesis package -\usepackage{setup/ufscthesisx} - -% Load extra commands for tables, lists, summaries, etc. -\input{setup/utilities.tex} +]{setup/ufscthesisx} % % Utilize o arquivo aftertext/references.bib para incluir sua bibliografia. \addbibresource{aftertext/references.bib} diff --git a/setup b/setup index cd60c03..64d6e02 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit cd60c03e74778f0f613a22ab1baa4617ba7b9c12 +Subproject commit 64d6e028f83bb2a6bfb2ea631ba853f252e2103c From dcdd369626a3b8719d6c1057edfa3cc9dd2b4aba Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 22 Sep 2019 17:27:49 -0300 Subject: [PATCH 130/148] Fix cover by @lucaspetry https://github.com/UFSC/ufscthesisx/pull/16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mudança para formato A4 #14 fix https://github.com/UFSC/ufscthesisx/issues/14 Reestruturação da capa de acordo com as normas da UFSC #15 fix https://github.com/UFSC/ufscthesisx/issues/15 https://repositorio.ufsc.br/bitstream/handle/123456789/180829/TrabalhoAcademico_A4_15-07-2019.pdf?sequence=3&isAllowed=y --- main.tex | 9 +++++++-- setup | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/main.tex b/main.tex index e9a813d..18611d8 100644 --- a/main.tex +++ b/main.tex @@ -50,9 +50,8 @@ % However, problem will be fixed the `ufscthesisx` package. \documentclass[ 10pt, % Padrão UFSC para versão final -a5paper, % Padrão UFSC para versão final +a4paper, % Padrão UFSC para versão final % 12pt, % Pode usar tamanho 12pt para defesa -% a4paper, % Pode usar a4 para defesa twoside, % Impressão nos dois lados da folha chapter=TITLE, % Título de capítulos em caixa alta section=TITLE, % Título de seções em caixa alta @@ -110,6 +109,12 @@ {Departamento de XXXXXX, Centro de XXXXXX}% } +% FIXME: Preencha com Campus de XXXXXX ou Centro de XXXXXX +\campus{\lang + {Campus/Center of XXXXXX} + {Campus/Centro de XXXXXX}% +} + % FIXME: Data da sua defesa \data{\lang{30 of march of}{30 de março de} 2001} diff --git a/setup b/setup index 64d6e02..b687878 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 64d6e028f83bb2a6bfb2ea631ba853f252e2103c +Subproject commit b687878d0bb9a418627a6ba129c790d0a4164822 From 332c8ba18d6af49a4ed8eb7b639f6c526a00d87a Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 22 Sep 2019 17:39:17 -0300 Subject: [PATCH 131/148] Updated README.md instructions --- main.tex | 2 +- setup | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tex b/main.tex index 18611d8..ceeba79 100644 --- a/main.tex +++ b/main.tex @@ -50,8 +50,8 @@ % However, problem will be fixed the `ufscthesisx` package. \documentclass[ 10pt, % Padrão UFSC para versão final -a4paper, % Padrão UFSC para versão final % 12pt, % Pode usar tamanho 12pt para defesa +a4paper, % Padrão UFSC para versão final twoside, % Impressão nos dois lados da folha chapter=TITLE, % Título de capítulos em caixa alta section=TITLE, % Título de seções em caixa alta diff --git a/setup b/setup index b687878..2566d17 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit b687878d0bb9a418627a6ba129c790d0a4164822 +Subproject commit 2566d17ee89ac43084bcff0e5e6211ebaaaeaaf4 From c94d075163e72b90fae106b95b07d9865b9f8384 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 22 Sep 2019 18:18:26 -0300 Subject: [PATCH 132/148] Updated beforetext.tex --- beforetext/beforetext.tex | 56 +++++++---- main.tex | 17 +++- pictures | 2 +- settings.tex | 193 ++++++++++++++++++++++++-------------- 4 files changed, 174 insertions(+), 94 deletions(-) diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex index dbedf6d..a0a82ff 100644 --- a/beforetext/beforetext.tex +++ b/beforetext/beforetext.tex @@ -8,12 +8,40 @@ % ELEMENTOS PRÉ-TEXTUAIS \ifforcedinclude\else % pretextual settings - \pretextual\PRIVATEbookmarkthis{\covername} + \PRIVATEbookmarkthis{Capa} + \addtotextpreliminarycontent{Capa} + \pretextual % Capa % \includepdf{pictures/FrenteCapaUFSC.pdf} + % https://tex.stackexchange.com/questions/227711/blank-page-after-titlingpage + \advisor{}{\AtBeginShipoutNext{\AtBeginShipoutNext{\AtBeginShipoutDiscard}}} \imprimircapa + % 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{}{% + \ifforcedinclude\else + % Manually add the `\textpreliminarycontents` to the Table of Contents here + % to keep the hyper link pointing to the beginning of the page, instead of + % the beginning of `\textpreliminarycontents` + + % When do I need to invoke \phantomsection? + % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection + \phantomsection + \addcontentsline{toc}{chapter}{\mytextpreliminarylistname} + + \begin{KeepFromToc} + \textpreliminarycontents + \end{KeepFromToc} + + \ifforcedinclude\else\clearpage\fi + \fi + } + + \PRIVATEbookmarkthis{Contracapa} + \addtotextpreliminarycontent{Contracapa} + % Folha de rosto (o * indica que haverá a ficha bibliográfica) \imprimirfolhaderosto* \fi @@ -26,25 +54,12 @@ % com a ficha catalográfica definitiva após a defesa do trabalho. Quando estiver % com o documento, salve-o como PDF no diretório do seu projeto e substitua todo % o conteúdo de implementação deste arquivo pelo comando abaixo: +\PRIVATEbookmarkthis{Ficha Catalográfica} +\addtotextpreliminarycontent{Ficha Catalográfica} + \include{beforetext/fichacatalografica} \ifforcedinclude\else\cleardoublepage\fi -% Custom list throw LaTeX Error: Command \mycustomfiction already defined? -% https://tex.stackexchange.com/questions/388489/custom-list-throw-latex-error-command-mycustomfiction-already-defined/ -% \ifforcedinclude\else - % Manually add the `\textpreliminarycontents` to the Table of Contents here - % to keep the hyper link pointing to the beginning of the page, instead of - % the beginning of `\textpreliminarycontents` - % - % When do I need to invoke \phantomsection? - % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection - % \phantomsection - % \addcontentsline{toc}{chapter}{\mytextpreliminarylistname} - - % \begin{KeepFromToc} - % \textpreliminarycontents - % \end{KeepFromToc} -% \fi % Inserir errata @@ -113,12 +128,10 @@ \ifforcedinclude\else\cleardoublepage\fi \include{beforetext/simbolos} -% Add the table of contents to the brief table of contents -\addtotextpreliminarycontent{\contentsname} - % How to remove the self-reference of the ToC from the ToC? % https://tex.stackexchange.com/questions/10943/how-to-remove-the-self-reference-of-the-toc-from-the-toc \ifforcedinclude\else\cleardoublepage\fi + \begin{KeepFromToc} \pdfbookmark[0]{\contentsname}{toc} @@ -150,8 +163,11 @@ % 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 } + \end{KeepFromToc} diff --git a/main.tex b/main.tex index ceeba79..6fcf9c9 100644 --- a/main.tex +++ b/main.tex @@ -17,12 +17,15 @@ % Allows you to write your thesis both in English and Portuguese % https://tex.stackexchange.com/questions/5076/is-it-possible-to-keep-my-translation-together-with-original-text \newif\ifenglish\englishfalse +\newif\ifadvisor\advisorfalse % Uncomment the line `\englishtrue` to set the document default language to English % \englishtrue +\advisortrue % https://tex.stackexchange.com/questions/131002/how-to-expand-ifthenelse-so-that-it-can-be-used-in-parshape \newcommand{\lang}[2]{\ifenglish#1\else#2\fi} +\newcommand{\advisor}[2]{\ifadvisor#1\else#2\fi} % https://tex.stackexchange.com/questions/385895/how-to-make-passoptionstopackage-add-the-option-as-the-last \ifenglish @@ -213,14 +216,16 @@ \textual % Uncomment this to put a ←← | ← (Go To Top/Go Back) on each section header - % \addGoToSummary + \advisor{}{\addGoToSummary} \setlength\beforechapskip{50pt} \setlength\midchapskip{20pt} \setlength\afterchapskip{20pt} % PARTE - % \ifforcedinclude\else\part{\lang{Research}{Pesquisa}}\fi - % \label{sec:primeira_parte} + \advisor{}{% + \ifforcedinclude\else\part{\lang{Research}{Pesquisa}}\fi + \label{primeira_parte} + } % Introdução (exemplo de capítulo sem numeração, mas presente no Sumário) \include{chapters/intro} @@ -235,8 +240,10 @@ \include{chapters/chapter_3} % PARTE - % \ifforcedinclude\else\part{\lang{Implementation}{Implementação}}\fi - % \label{sec:segunda_parte} + \advisor{}{% + \ifforcedinclude\else\part{\lang{Implementation}{Implementação}}\fi + \label{segunda_parte} + } % Segundo capitulo de Resultados \include{chapters/chapter_4} diff --git a/pictures b/pictures index c612d2f..49c3328 160000 --- a/pictures +++ b/pictures @@ -1 +1 @@ -Subproject commit c612d2f077e294e56f87534f4a1e3d4fc8dbfba1 +Subproject commit 49c332836e89d0e1181d37d4a1f1d7879c2574ea diff --git a/settings.tex b/settings.tex index 5db7614..bfc992e 100644 --- a/settings.tex +++ b/settings.tex @@ -16,6 +16,7 @@ % https://tex.stackexchange.com/questions/182569/how-to-manually-set-where-a-word-is-split \hyphenation{Ge-la-im} +\hyphenation{Cis-la-ghi} % Add missing translations for Portuguese % https://tex.stackexchange.com/questions/8564/what-is-the-right-way-to-redefine-macros-defined-by-babel @@ -114,60 +115,18 @@ { \hypersetup { - pdftitle={\@title}, + pdftitle={\imprimirtitulo}, colorlinks=true, % false: boxed links; true: colored links linkcolor=darkblue, % color of internal links - citecolor=darkgreen, % color of links to bibliography + citecolor=darkblue, % color of links to bibliography filecolor=black, % color of file links - urlcolor=linkcolor, + urlcolor=\advisor{black}{darkgreen}, bookmarksdepth=4 } } }{} \makeatother -% https://tex.stackexchange.com/questions/14314/changing-the-font-of-the-numbers-in-the-toc-in-the-memoir-class -\renewcommand{\cftpartfont}{\ABNTEXpartfont\color{ultramarine}} -\renewcommand{\cftpartpagefont}{\ABNTEXpartfont\color{black}} - -\renewcommand{\cftchapterfont}{\ABNTEXchapterfont\color{ultramarine}} -\renewcommand{\cftchapterpagefont}{\ABNTEXchapterfont\color{black}} - -\renewcommand{\cftsectionfont}{\ABNTEXsectionfont\color{ultramarine}} -\renewcommand{\cftsectionpagefont}{\ABNTEXsectionfont\color{black}} - -\renewcommand{\cftsubsectionfont}{\ABNTEXsubsectionfont\color{ultramarine}} -\renewcommand{\cftsubsectionpagefont}{\ABNTEXsubsectionfont\color{black}} - -\renewcommand{\cftsubsubsectionfont}{\ABNTEXsubsubsectionfont\color{ultramarine}} -\renewcommand{\cftsubsubsectionpagefont}{\ABNTEXsubsubsectionfont\color{black}} - -\renewcommand{\cftparagraphfont}{\ABNTEXsubsubsubsectionfont\color{ultramarine}} -\renewcommand{\cftparagraphpagefont}{\ABNTEXsubsubsubsectionfont\color{black}} - -% Memoir has another mechanism for the job: \cftsetindents{‹kind›}{indent}{numwidth}. Here kind is -% chapter, section, or whatever; the indent specifies the ‘margin’ before the entry starts; and the -% width is of the box into which the number is typeset (so needs to be wide enough for the largest -% number, with the necessary spacing to separate it from what comes after it in the line. -% http://www.tex.ac.uk/FAQ-tocloftwrong.html -% https://tex.stackexchange.com/questions/264668/memoir-indentation-of-unnumbered-sections-in-table-of-contents -% https://tex.stackexchange.com/questions/394227/memoir-toc-indent-the-second-line-by-numberspace -% -% `\cftlastnumwidth` and these `\cftsetindents` are defined by the abntex2 class, -% obeying the `ABNTEXsumario-abnt-6027-2012`. \newlength{\cftlastnumwidth} -\setlength{\cftlastnumwidth}{\cftsubsubsectionnumwidth} -\addtolength{\cftlastnumwidth}{-1em} - -% http://www.tex.ac.uk/FAQ-tocloftwrong.html -% Use \setlength\cftsectionnumwidth{4em} to override all these values at once -\cftsetindents{part} {0em}{\cftlastnumwidth} -\cftsetindents{chapter} {0em}{\cftlastnumwidth} -\cftsetindents{section} {0em}{\cftlastnumwidth} -\cftsetindents{subsection} {0em}{\cftlastnumwidth} -\cftsetindents{subsubsection}{0em}{\cftlastnumwidth} -\cftsetindents{paragraph} {0em}{\cftlastnumwidth} -\cftsetindents{subparagraph} {0em}{\cftlastnumwidth} - % Backref package settings, pages with citations in bibliography \newcommand{\biblatexcitedntimes}{\autocap{c}ited \arabic{citecounter} times} \newcommand{\biblatexcitedonetime}{\autocap{c}ited one time} @@ -179,9 +138,6 @@ \renewcommand{\biblatexcitedonetime}{\autocap{c}itado uma vez} \renewcommand{\biblatexcitednotimes}{\autocap{n}enhuma citação no texto} }}{}}{} -\makeatother - -\makeatletter \@ifpackageloaded{biblatex} {% % https://tex.stackexchange.com/questions/483707/how-to-detect-whether-the-option-citecounter-was-enabled-on-biblatex @@ -232,29 +188,130 @@ % \DeclareFieldFormat{citehyperref}{#1} % https://tex.stackexchange.com/questions/19105/how-can-i-put-more-space-between-bibliography-entries-biblatex -% \setlength\bibitemsep{2.1\itemsep} +\advisor{}{\setlength\bibitemsep{2.1\itemsep}} % % https://tex.stackexchange.com/questions/203764/reduce-font-size-of-bibliography-overfull-bibliography % \newcommand{\bibliographyfontsize}{\fontsize{10.0pt}{10.5pt}\selectfont} % \renewcommand*{\bibfont}{\bibliographyfontsize} -% % Uncomment this to insert the abstract into your bibliography entries when the abstract is available -% % https://tex.stackexchange.com/questions/398666/how-to-correctly-insert-and-justify-abstract -% \DeclareFieldFormat{abstract}% -% {% -% \vspace*{-0.5mm}\par\justifying -% \begin{adjustwidth}{1cm}{} -% \textbf{\bibsentence\bibstring{abstract}:} #1 -% \end{adjustwidth} -% } -% \renewbibmacro*{finentry}% -% {% -% \iffieldundef{abstract} -% {\finentry} -% {\finentrypunct -% \printfield{abstract}% -% \renewcommand*{\finentrypunct}{}% -% \finentry -% } -% } +% Uncomment this to insert the abstract into your bibliography entries when the abstract is available +% https://tex.stackexchange.com/questions/398666/how-to-correctly-insert-and-justify-abstract +\ifadvisor +\else + \DeclareFieldFormat{abstract}% + {% + \vspace*{-0.5mm}\par\justifying + \begin{adjustwidth}{1cm}{} + \textbf{\bibsentence\bibstring{abstract}:} #1 + \end{adjustwidth} + } + \renewbibmacro*{finentry}% + {% + \iffieldundef{abstract} + {\finentry} + {\finentrypunct + \printfield{abstract}% + \renewcommand*{\finentrypunct}{}% + \finentry + } + } +\fi + + +% https://tex.stackexchange.com/questions/14314/changing-the-font-of-the-numbers-in-the-toc-in-the-memoir-class +\renewcommand{\cftpartfont}{\ABNTEXpartfont\color{black}} +\renewcommand{\cftpartpagefont}{\ABNTEXpartfont\color{black}} + +\renewcommand{\cftchapterfont}{\ABNTEXchapterfont\color{black}} +\renewcommand{\cftchapterpagefont}{\ABNTEXchapterfont\color{black}} + +\renewcommand{\cftsectionfont}{\ABNTEXsectionfont\color{black}} +\renewcommand{\cftsectionpagefont}{\ABNTEXsectionfont\color{black}} + +\renewcommand{\cftsubsectionfont}{\ABNTEXsubsectionfont\color{black}} +\renewcommand{\cftsubsectionpagefont}{\ABNTEXsubsectionfont\color{black}} + +\renewcommand{\cftsubsubsectionfont}{\ABNTEXsubsubsectionfont\color{black}} +\renewcommand{\cftsubsubsectionpagefont}{\ABNTEXsubsubsectionfont\color{black}} + +\renewcommand{\cftparagraphfont}{\ABNTEXsubsubsubsectionfont\color{black}} +\renewcommand{\cftparagraphpagefont}{\ABNTEXsubsubsubsectionfont\color{black}} + +% Memoir has another mechanism for the job: \cftsetindents{‹kind›}{indent}{numwidth}. Here kind is +% chapter, section, or whatever; the indent specifies the ‘margin’ before the entry starts; and the +% width is of the box into which the number is typeset (so needs to be wide enough for the largest +% number, with the necessary spacing to separate it from what comes after it in the line. +% http://www.tex.ac.uk/FAQ-tocloftwrong.html +% https://tex.stackexchange.com/questions/264668/memoir-indentation-of-unnumbered-sections-in-table-of-contents +% https://tex.stackexchange.com/questions/394227/memoir-toc-indent-the-second-line-by-numberspace +% +% `\cftlastnumwidth` and these `\cftsetindents` are defined by the abntex2 class, +% obeying the `ABNTEXsumario-abnt-6027-2012`. \newlength{\cftlastnumwidth} +% \setlength{\cftlastnumwidth}{\cftsubsubsectionnumwidth} +% \addtolength{\cftlastnumwidth}{-1em} + +% http://www.tex.ac.uk/FAQ-tocloftwrong.html +% Use \setlength\cftsectionnumwidth{4em} to override all these values at once +\ifadvisor +\else + \cftsetindents{part} {0em} {3em} + \cftsetindents{chapter} {0em} {3em} + \cftsetindents{section} {0em} {4.3em} + \cftsetindents{subsection} {0em} {5.2em} + \cftsetindents{subsubsection} {0em} {5.1em} + \cftsetindents{paragraph} {0em} {6.0em} + \cftsetindents{subparagraph} {0em} {7.0em} + + \makechapterstyle{fixedabntex2indentation}{% + \renewcommand{\chapterheadstart}{} + + \ifx \chapternamenumlength \undefined + \newlength{\chapternamenumlength} + \fi + + % tamanhos de fontes de chapter e part + \ifthenelse{\equal{\ABNTEXisarticle}{true}}{% + \setlength\beforechapskip{\baselineskip} + \renewcommand{\chaptitlefont}{\ABNTEXsectionfont\ABNTEXsectionfontsize} + }{%else + \setlength{\beforechapskip}{0pt} + \renewcommand{\chaptitlefont}{\ABNTEXchapterfont\ABNTEXchapterfontsize} + } + + \renewcommand{\chapnumfont}{\chaptitlefont} + \renewcommand{\parttitlefont}{\ABNTEXpartfont\ABNTEXpartfontsize} + \renewcommand{\partnumfont}{\ABNTEXpartfont\ABNTEXpartfontsize} + \renewcommand{\partnamefont}{\ABNTEXpartfont\ABNTEXpartfontsize} + + % tamanhos de fontes de section, subsection, subsubsection e subsubsubsection + \setsecheadstyle{\ABNTEXsectionfont\ABNTEXsectionfontsize\ABNTEXsectionupperifneeded} + \setsubsecheadstyle{\ABNTEXsubsectionfont\ABNTEXsubsectionfontsize\ABNTEXsubsectionupperifneeded} + \setsubsubsecheadstyle{\ABNTEXsubsubsectionfont\ABNTEXsubsubsectionfontsize\ABNTEXsubsubsectionupperifneeded} + \setsubsubsubsecheadstyle{\ABNTEXsubsubsubsectionfont\ABNTEXsubsubsubsectionfontsize\ABNTEXsubsubsubsectionupperifneeded} + + % impressao do numero do capitulo + \renewcommand{\chapternamenum}{} + + % impressao do nome do capitulo + \renewcommand{\printchaptername}{% + \chaptitlefont + \ifthenelse{\boolean{abntex@apendiceousecao}}{\appendixname}{}% + } + + % impressao do titulo do capitulo + \def\printchaptertitle##1{% + \chaptitlefont% + \ifthenelse{\boolean{abntex@innonumchapter}}{\centering\ABNTEXchapterupperifneeded{##1}}{% + \ifthenelse{\boolean{abntex@apendiceousecao}}{% + \centering% + \settowidth{\chapternamenumlength}{\printchaptername\printchapternum\afterchapternum}% + \ABNTEXchapterupperifneeded{##1}% + }{% + \settowidth{\chapternamenumlength}{\printchaptername\printchapternum\afterchapternum}% + \parbox[t]{\columnwidth-\chapternamenumlength}{\ABNTEXchapterupperifneeded{##1}}}% + } + } + } + \chapterstyle{fixedabntex2indentation} +\fi From fccb966314360fcaa5bbc280bbba3db8e30424b6 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 22 Sep 2019 18:22:28 -0300 Subject: [PATCH 133/148] Added new commands to the of main.tex --- main.tex | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/main.tex b/main.tex index 6fcf9c9..4d30405 100644 --- a/main.tex +++ b/main.tex @@ -200,6 +200,28 @@ } \fi + +% https://tex.stackexchange.com/questions/171999/overfull-hbox-in-biblatex +% https://tex.stackexchange.com/questions/499457/why-my-document-is-not-hyphenation-on-words-starting-with-upper-case-letter-i +\emergencystretch=5em + +% https://www.overleaf.com/learn/latex/Inserting_Images +\graphicspath{{pictures/}} + +% https://tex.stackexchange.com/questions/23313/how-can-i-reduce-padding-after-figure +% https://tex.stackexchange.com/questions/499580/how-to-keep-my-default-floating-environment-spacing-before-them-while-reducing +% \xpretocmd{\figure}{\setlength{\belowcaptionskip}{-10pt}}{}{} + +% https://tex.stackexchange.com/questions/85113/xrightarrow-text +\makeatletter +\newcommand{\xRightarrow}[2][]{\ext@arrow 0359\Rightarrowfill@{#1}{#2}} +\newcommand{\xLeftarrow}[2][]{\ext@arrow 0359\Leftarrowfill@{#1}{#2}} +\makeatother + +% https://tex.stackexchange.com/questions/32208/footnote-runs-onto-second-page +\interfootnotelinepenalty=10000 + + \begin{document} % FIXME: Comment this after finishing the thesis, so you can start fixing the \flushbottom vs \raggedbottom From 5fb187219c1cdf8300a6882ae2bd96688a2ad91c Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 22 Sep 2019 19:54:10 -0300 Subject: [PATCH 134/148] Created the latex1 ... latex5 rules for easy usage with biber on debug mode. --- main.tex | 1 + setup | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/main.tex b/main.tex index 4d30405..7f6c8ee 100644 --- a/main.tex +++ b/main.tex @@ -182,6 +182,7 @@ % \doincludeonly % \forcedincludetrue + \ifenglish \hypersetup { diff --git a/setup b/setup index 2566d17..9bd5141 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 2566d17ee89ac43084bcff0e5e6211ebaaaeaaf4 +Subproject commit 9bd514108648e25126578d5895d69f6f0b0f6b58 From d79e44a321a597a54f9facfc75d21be7f62deb1e Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 22 Sep 2019 21:20:38 -0300 Subject: [PATCH 135/148] Fixed fichacatalografica beind displayed when using \forcedinclude modes. --- beforetext/beforetext.tex | 52 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex index a0a82ff..c52e4c6 100644 --- a/beforetext/beforetext.tex +++ b/beforetext/beforetext.tex @@ -21,22 +21,20 @@ % 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{}{% - \ifforcedinclude\else - % Manually add the `\textpreliminarycontents` to the Table of Contents here - % to keep the hyper link pointing to the beginning of the page, instead of - % the beginning of `\textpreliminarycontents` - - % When do I need to invoke \phantomsection? - % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection - \phantomsection - \addcontentsline{toc}{chapter}{\mytextpreliminarylistname} - - \begin{KeepFromToc} - \textpreliminarycontents - \end{KeepFromToc} - - \ifforcedinclude\else\clearpage\fi - \fi + % Manually add the `\textpreliminarycontents` to the Table of Contents here + % to keep the hyper link pointing to the beginning of the page, instead of + % the beginning of `\textpreliminarycontents` + + % When do I need to invoke \phantomsection? + % https://tex.stackexchange.com/questions/44088/when-do-i-need-to-invoke-phantomsection + \phantomsection + \addcontentsline{toc}{chapter}{\mytextpreliminarylistname} + + \begin{KeepFromToc} + \textpreliminarycontents + \end{KeepFromToc} + + \clearpage } \PRIVATEbookmarkthis{Contracapa} @@ -44,18 +42,18 @@ % Folha de rosto (o * indica que haverá a ficha bibliográfica) \imprimirfolhaderosto* -\fi -% Inserir a ficha bibliografica -% -% Isto é um exemplo de Ficha Catalográfica, ou ``Dados internacionais de -% catalogação-na-publicação''. Você pode utilizar este modelo como referência. -% Porém, provavelmente a biblioteca da sua universidade lhe fornecerá um PDF -% com a ficha catalográfica definitiva após a defesa do trabalho. Quando estiver -% com o documento, salve-o como PDF no diretório do seu projeto e substitua todo -% o conteúdo de implementação deste arquivo pelo comando abaixo: -\PRIVATEbookmarkthis{Ficha Catalográfica} -\addtotextpreliminarycontent{Ficha Catalográfica} + % Inserir a ficha bibliografica + % + % Isto é um exemplo de Ficha Catalográfica, ou ``Dados internacionais de + % catalogação-na-publicação''. Você pode utilizar este modelo como referência. + % Porém, provavelmente a biblioteca da sua universidade lhe fornecerá um PDF + % com a ficha catalográfica definitiva após a defesa do trabalho. Quando estiver + % com o documento, salve-o como PDF no diretório do seu projeto e substitua todo + % o conteúdo de implementação deste arquivo pelo comando abaixo: + \PRIVATEbookmarkthis{Ficha Catalográfica} + \addtotextpreliminarycontent{Ficha Catalográfica} +\fi \include{beforetext/fichacatalografica} \ifforcedinclude\else\cleardoublepage\fi From 0a4b3c2135edc4c834e8051af2ec00cf113150e3 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 12 Oct 2019 12:55:47 -0300 Subject: [PATCH 136/148] Fixed \lstlistoflistings showing Figure instead do Code --- beforetext/beforetext.tex | 3 +++ 1 file changed, 3 insertions(+) diff --git a/beforetext/beforetext.tex b/beforetext/beforetext.tex index c52e4c6..b55852a 100644 --- a/beforetext/beforetext.tex +++ b/beforetext/beforetext.tex @@ -111,10 +111,13 @@ \listoftables* % 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* + } \fi From df1ba482db08a22415fcc63fed707101ac1f5bb3 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 12 Oct 2019 16:18:14 -0300 Subject: [PATCH 137/148] Fixed \lstlistoflistings showing Figure instead do Code --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 9bd5141..4ec257a 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 9bd514108648e25126578d5895d69f6f0b0f6b58 +Subproject commit 4ec257a17e12afb866bc6629214b5348a9406414 From b3b2263e0bf5b70987c87d9a84411271b2b66f8b Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 12 Oct 2019 18:34:59 -0300 Subject: [PATCH 138/148] Added recommended build commands to README.md --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index fd9d97b..5fb3d46 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,20 @@ ou executar o comando `make` caso você esteja no Linux. ## Compilação +O jeito mais legal de compilar é executando um dos seguintes comandos: +1. **`make clean`** +1. **`make clean halt=1 debug=1`** +1. **`make latex biber latex1`** +1. **`make latex biber latex1 halt=1 debug=1`** +1. **`make latex biber latex1 biber latex2`** +1. **`make latex biber latex1 biber latex2 halt=1 debug=1`** +1. **`make latex biber latex1 biber latex2 latex3`** +1. **`make latex biber latex1 biber latex2 latex3 halt=1 debug=1`** +1. **`make latex biber latex1 biber latex2 latex3 latex4 halt=1 debug=1`** +1. **`make latex biber latex1 biber latex2 latex3 latex4`** +1. **`make latex biber latex1 biber latex2 latex3 latex4 biber latex5 halt=1 debug=1`** +1. **`make latex biber latex1 biber latex2 latex3 latex4 biber latex5`** + Se você quiser saber quais são todos os comandos de compilação disponíveis, basta chamar utilizar o comando `make help`. Exemplo: ``` From ae599cc4c5407c81b2508d8b240bc2ef2689aead Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 12 Oct 2019 18:37:43 -0300 Subject: [PATCH 139/148] Updated pdf_exemplo_completo.pdf --- pictures | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pictures b/pictures index 49c3328..923a1b2 160000 --- a/pictures +++ b/pictures @@ -1 +1 @@ -Subproject commit 49c332836e89d0e1181d37d4a1f1d7879c2574ea +Subproject commit 923a1b2119092e7769bfb603f7ae8d7fd64b5c6c From 692b726388b49bbbdd07a53d63a42e0419f04de4 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 12 Oct 2019 18:42:43 -0300 Subject: [PATCH 140/148] Updated make help example on README.md --- README.md | 65 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 5fb3d46..06e41b4 100644 --- a/README.md +++ b/README.md @@ -114,40 +114,75 @@ O jeito mais legal de compilar é executando um dos seguintes comandos: Se você quiser saber quais são todos os comandos de compilação disponíveis, basta chamar utilizar o comando `make help`. Exemplo: ``` +$ make help + Usage: make [debug=1] Use debug=1 to run make in debug mode. Use this if something does not work! Examples: + make help make debug=1 make latex debug=1 make thesis debug=1 If you are using Windows Command Prompt `cmd.exe`, you must use this command like this: + make help set "debug=1" && make set "debug=1" && make latex set "debug=1" && make thesis + Use halt=1 to stop running on errors instead of continuing the compilation! + Also, use debug=1 to halt on errors and fix the errors dynamically. + + Examples: + make halt=1 + make latex halt=1 + make thesis halt=1 + Targets: - all call the `thesis` make rule - biber build the main file with bibliography pass - latex build the main file with no bibliography pass - pdflatex the same as latex rule, i.e., an alias for it - latexmk build the main file with pdflatex biber pdflatex pdflatex + all Call the `thesis` make rule + index Build the main file with index pass + biber Build the main file with bibliography pass + latex Build the main file with no bibliography pass + pdflatex The same as latex rule, i.e., an alias for it + latexmk Build the main file with pdflatex biber pdflatex pdflatex pdflatex makeindex biber pdflatex - thesis completely build the main file with minimum output logs - verbose completely build the main file with maximum output logs - clean remove all cache directories and generated pdf files - veryclean same as `clean`, but searches for all generated files outside + thesis Completely build the main file with minimum output logs + verbose Completely build the main file with maximum output logs + clean Remove all cache directories and generated pdf files + veryclean Same as `clean`, but searches for all generated files outside the cache directories. - release version=1.1 creates the zip file `1.1.zip` on the root of this - project, within all latex required files. This is useful to share or - public your thesis source files with others. - If you are using Windows Command Prompt `cmd.exe`, you must use this - command like this: set "version=1.1" && make release + release version=1.1 + creates the zip file `1.1.zip` on the root of this project, + within all latex required files. This is useful to share or + public your thesis source files with others. If you are using + Windows Command Prompt `cmd.exe`, you must use this command like this: + set "version=1.1" && make release + + remote Runs the make command remotely on another machine by ssh. + This requires `passh` program installed. You can download it from: + 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' + + Example usage for Linux: + make remote LATEXPASSWORD=123 LATEXADDRESS=linux@192.168.0.222 rules=latex + delete=1 dir=~/Downloads/Thesis + + Example usage for Windows: + set "LATEXPASSWORD=123" && set "LATEXADDRESS=linux@192.168.0.222" && + set "rules=latex" && set "delete=1" && + set "dir=~/Downloads/Thesis" && + make remote ``` Caso você tenha problemas, @@ -162,7 +197,7 @@ Por exemplo, Por conveniência, você também pode chamar `make latex debug=a` qualquer outra coisa desde que não seja vazio. Por exemplo, -`make latex debug=` Você também pode diretamente editar o arquivo `setup/makefile.mk` e +`make latex debug=1` Você também pode diretamente editar o arquivo `setup/makefile.mk` e descomentar a linha `# ENABLE_DEBUG_MODE := true` para ativar o modo debug permanentemente. From d02dca4fb694353fc71b73148125fbf24aa12780 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 12 Oct 2019 19:38:26 -0300 Subject: [PATCH 141/148] Fixed commands sorting on README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 06e41b4..1f5389d 100644 --- a/README.md +++ b/README.md @@ -106,10 +106,10 @@ O jeito mais legal de compilar é executando um dos seguintes comandos: 1. **`make latex biber latex1 biber latex2 halt=1 debug=1`** 1. **`make latex biber latex1 biber latex2 latex3`** 1. **`make latex biber latex1 biber latex2 latex3 halt=1 debug=1`** -1. **`make latex biber latex1 biber latex2 latex3 latex4 halt=1 debug=1`** 1. **`make latex biber latex1 biber latex2 latex3 latex4`** -1. **`make latex biber latex1 biber latex2 latex3 latex4 biber latex5 halt=1 debug=1`** +1. **`make latex biber latex1 biber latex2 latex3 latex4 halt=1 debug=1`** 1. **`make latex biber latex1 biber latex2 latex3 latex4 biber latex5`** +1. **`make latex biber latex1 biber latex2 latex3 latex4 biber latex5 halt=1 debug=1`** Se você quiser saber quais são todos os comandos de compilação disponíveis, basta chamar utilizar o comando `make help`. Exemplo: From d44051209e59b3e61a1afb16dbb314c23b5c9cc1 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 12 Oct 2019 19:59:54 -0300 Subject: [PATCH 142/148] Fixed Makefile elapsed time counter not working --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 4ec257a..539ef33 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 4ec257a17e12afb866bc6629214b5348a9406414 +Subproject commit 539ef335c8567158419e725efa30f76356b046c3 From 366024ab0be72df9ea78820fd840fe3ec6f34a1d Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 12 Oct 2019 20:05:00 -0300 Subject: [PATCH 143/148] Created a new makefile.mk main caller --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 539ef33..a3e3cac 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 539ef335c8567158419e725efa30f76356b046c3 +Subproject commit a3e3cacc1b284b6c441242d8965205f73024222a From 7d6de72313beaaf9dc28469989db7e0224ae32f3 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 12 Oct 2019 20:05:09 -0300 Subject: [PATCH 144/148] Created a new makefile.mk main caller --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index a3e3cac..cc7518b 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit a3e3cacc1b284b6c441242d8965205f73024222a +Subproject commit cc7518b0e525044c106645e1737f80da4dc1b8c0 From 383446f1e37fe54c48f10ba62c722e6b60d55b17 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 12 Oct 2019 22:41:08 -0300 Subject: [PATCH 145/148] Fixed makefile.mk running several times --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index cc7518b..748df5d 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit cc7518b0e525044c106645e1737f80da4dc1b8c0 +Subproject commit 748df5dc7cf49a04bd1cd7b2ab74f7f5d900cca5 From f429306d84a4b0acdc86dec0c5a7080753dda074 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 13 Oct 2019 03:02:03 -0300 Subject: [PATCH 146/148] Fixed makefile saying make: 'target' is up to date. --- README.md | 16 ++++++++-------- setup | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1f5389d..099b62f 100644 --- a/README.md +++ b/README.md @@ -102,14 +102,14 @@ O jeito mais legal de compilar é executando um dos seguintes comandos: 1. **`make clean halt=1 debug=1`** 1. **`make latex biber latex1`** 1. **`make latex biber latex1 halt=1 debug=1`** -1. **`make latex biber latex1 biber latex2`** -1. **`make latex biber latex1 biber latex2 halt=1 debug=1`** -1. **`make latex biber latex1 biber latex2 latex3`** -1. **`make latex biber latex1 biber latex2 latex3 halt=1 debug=1`** -1. **`make latex biber latex1 biber latex2 latex3 latex4`** -1. **`make latex biber latex1 biber latex2 latex3 latex4 halt=1 debug=1`** -1. **`make latex biber latex1 biber latex2 latex3 latex4 biber latex5`** -1. **`make latex biber latex1 biber latex2 latex3 latex4 biber latex5 halt=1 debug=1`** +1. **`make latex biber latex1 biber1 latex2`** +1. **`make latex biber latex1 biber1 latex2 halt=1 debug=1`** +1. **`make latex biber latex1 biber1 latex2 latex3`** +1. **`make latex biber latex1 biber1 latex2 latex3 halt=1 debug=1`** +1. **`make latex biber latex1 biber1 latex2 latex3 latex4`** +1. **`make latex biber latex1 biber1 latex2 latex3 latex4 halt=1 debug=1`** +1. **`make latex biber latex1 biber1 latex2 latex3 latex4 biber2 latex5`** +1. **`make latex biber latex1 biber1 latex2 latex3 latex4 biber2 latex5 halt=1 debug=1`** Se você quiser saber quais são todos os comandos de compilação disponíveis, basta chamar utilizar o comando `make help`. Exemplo: diff --git a/setup b/setup index 748df5d..41ac4ec 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 748df5dc7cf49a04bd1cd7b2ab74f7f5d900cca5 +Subproject commit 41ac4ec266c0d3584f7a23cea725a8e93989b39e From 21e4d18d56122a3788774cc707968912ad4ad986 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 13 Oct 2019 12:52:22 -0300 Subject: [PATCH 147/148] Fixed timer_calculator.sh showing negative second time sometimes --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 41ac4ec..98e1ad4 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 41ac4ec266c0d3584f7a23cea725a8e93989b39e +Subproject commit 98e1ad4393f521bde5b869e3a56fc48be1cc47c6 From 1c551634a8310650e9d05ccdc8ce2a8003835616 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sun, 13 Oct 2019 15:01:18 -0300 Subject: [PATCH 148/148] Fixed makefile.mk not running the setup function --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 98e1ad4..cba990d 160000 --- a/setup +++ b/setup @@ -1 +1 @@ -Subproject commit 98e1ad4393f521bde5b869e3a56fc48be1cc47c6 +Subproject commit cba990df660c94df841ef1808bc5099b37f5b96a