Merge branch 'develop'

joaomlourenco · Aug 10, 2022 · 51d4254 · 51d4254
2 parents 10fefb2 + 558de2a
commit 51d4254
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 67 deletions.
diff --git a/Chapters/abstract-en.tex b/Chapters/abstract-en.tex
@@ -31,6 +31,13 @@
 \end{enumerate}
 
 % Palavras-chave do resumo em Inglês
-\begin{keywords}
-Keyword 1, Keyword 2, Keyword 3, Keyword 4, Keyword 5, Keyword 6, Keyword 7, Keyword 8, Keyword 9
-\end{keywords} 
+% \begin{keywords}
+% Keyword 1, Keyword 2, Keyword 3, Keyword 4, Keyword 5, Keyword 6, Keyword 7, Keyword 8, Keyword 9
+% \end{keywords}
+\keywords{
+  One keyword \and
+  Another keyword \and
+  Yet another keyword \and
+  One keyword more \and
+  The last keyword
+}
diff --git a/Chapters/abstract-pt.tex b/Chapters/abstract-pt.tex
@@ -37,7 +37,13 @@
 % Sim!  Funciona! :)
 
 % Palavras-chave do resumo em Português
-\begin{keywords}
-Palavra-chave 1, Palavra-chave 2, Palavra-chave 3, Palavra-chave 4
-\end{keywords}
+% \begin{keywords}
+% Palavra-chave 1, Palavra-chave 2, Palavra-chave 3, Palavra-chave 4
+% \end{keywords}
+\keywords{
+  Primeira palavra-chave \and
+  Outra palavra-chave \and
+  Mais uma palavra-chave \and
+  A última palavra-chave
+}
 % to add an extra black line
diff --git a/Makefile b/Makefile
@@ -57,7 +57,15 @@ rcb:
 publish:
 	Scripts/publish.sh
 
-.PHONY: bump
-bump:
+.PHONY: bump1 bump2 bump3
+bump1:
+	Scripts/newversion.sh 1
+	make publish
+
+bump2:
+	Scripts/newversion.sh 2
+	make publish
+
+bump3:
 	Scripts/newversion.sh 3
 	make publish
diff --git a/NOVAthesisFiles/nt-version.sty b/NOVAthesisFiles/nt-version.sty
@@ -1,2 +1,2 @@
-\newcommand*{\novathesisversion}{6.9.16}
+\newcommand*{\novathesisversion}{6.10.1}
 \newcommand*{\novathesisdate}{2022-08-10}
diff --git a/novathesis.cls b/novathesis.cls
@@ -8,7 +8,7 @@
 %% To view a copy of this license, visit
 %% https://www.latex-project.org/lppl/lppl-1-3c/
 %%
-%% Version 2022-05-16 [6.9.16]
+%% Version 2022-05-16 [6.10.1]
 %% Departamento de Informática (www.di.fct.unl.pt)
 %% Faculdade de Ciências e Tecnologia (www.fct.unl.pt)
 %% Universidade NOVA de Lisboa (www.unl.pt)
@@ -422,7 +422,7 @@
 \newdata{keywordsstringsuffix}
 \newdata{keywordsstringfont}
 \keywordsblockpre()={\bigskip\noindent}
-\keywordsstringsuffix()={:\quad}
+\keywordsstringsuffix()={:\enspace}
 \keywordsstringfont()={\bfseries}
 % \keywordspost()={\ \textbf{\Large\textperiodcentered}\ }
 \keywordspost()={, }
@@ -2016,50 +2016,68 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \RequirePackage{environ}
 
-\options{/@nt/kwprint/.new value}
-
-\newread\kwsfile
-\newcommand{\printkeywords}[1]{%
-  % #1 = current lang
-  % \csxdef{@savedkws/#1}{#2}
-  \options{/@nt/kwprint/.expanded = #1}
+% \options{/@nt/kwprint/.new value}
+%
+% \newread\kwsfile
+% \newcommand{\printkeywords}[1]{%
+%   % #1 = current lang
+%   % \csxdef{@savedkws/#1}{#2}
+%   \options{/@nt/kwprint/.expanded = #1}
+%   \NTRunHook{keywords/pre}%
+%   \NTRunHook{keywords/#1/pre}%
+%   \ifoptionvoid{/@nt/kwprint}{}{%
+%     \defifundef{\keywordsstringbox}{\newsavebox}
+%     \datadefault{keywordsenvpre}(#1)%
+%     \@for\i:=\expanded{\option{/@nt/kwprint}}\do{%
+%       \savebox{\keywordsstringbox}{%
+%         \datadefault{keywordsstringprefix}(\i)%
+%         \datadefault{keywordsstringfont}(\i)\csuse{thekeywordsstring}(\i)%
+%         \datadefault{keywordsstringsuffix}(\i)%
+%       }
+%       \par
+%       \datadefault{keywordsblockpre}(\i)%
+%       \datadefault{keywordsstringpre}(\i)%
+%       \usebox{\keywordsstringbox}%
+%       \datadefault{keywordsstringpost}(\i)%
+%       % \begin{minipage}[t]{\expanded{\datadefault{keywordsboxlen}(\i)}}
+%         \def\process{\def\process{\datadefault{keywordspost}(\i)}}
+%         \optionlistdo{/@nt/keywords/\i}{%
+%           \datadefault{keywordstringpre}(#1)%
+%           \process##1%
+%         }%
+%       % \end{minipage}
+%       \datadefault{keywordsblockpost}(\i)%
+%     }%
+%     \datadefault{keywordsenvpost}(#1)%
+%   }%
+%   \NTRunHook{keywords/#1/post}%
+%   \NTRunHook{keywords/post}%\
+% }
+%
+% \newenvironment{keywords}{%
+%   \filecontents[overwrite,nosearch,noheader]{\jobname.k\option{/@nt/currentlang}}
+% }{%
+%   \endfilecontents%
+%   \printkeywords{\option{/@nt/currentlang}}
+% }
+\providecommand{\keywords}[1]{%  
+  \def\keywordname{ASDF}%
   \NTRunHook{keywords/pre}%
-  \NTRunHook{keywords/#1/pre}%
-  \ifoptionvoid{/@nt/kwprint}{}{%
-    \defifundef{\keywordsstringbox}{\newsavebox}
-    \datadefault{keywordsenvpre}(#1)%
-    \@for\i:=\expanded{\option{/@nt/kwprint}}\do{%
-      \savebox{\keywordsstringbox}{%
-        \datadefault{keywordsstringprefix}(\i)%
-        \datadefault{keywordsstringfont}(\i)\csuse{thekeywordsstring}(\i)%
-        \datadefault{keywordsstringsuffix}(\i)%
-      }
-      \par
-      \datadefault{keywordsblockpre}(\i)%
-      \datadefault{keywordsstringpre}(\i)%
-      \usebox{\keywordsstringbox}%
-      \datadefault{keywordsstringpost}(\i)%
-      % \begin{minipage}[t]{\expanded{\datadefault{keywordsboxlen}(\i)}}
-        \def\process{\def\process{\datadefault{keywordspost}(\i)}}
-        \optionlistdo{/@nt/keywords/\i}{%
-          \datadefault{keywordstringpre}(#1)%
-          \process##1%
-        }%
-      % \end{minipage}
-      \datadefault{keywordsblockpost}(\i)%
-    }%
-    \datadefault{keywordsenvpost}(#1)%
-  }%
-  \NTRunHook{keywords/#1/post}%
-  \NTRunHook{keywords/post}%\
-}
-
-\newenvironment{keywords}{%
-  \filecontents[overwrite,nosearch,noheader]{\jobname.k\option{/@nt/currentlang}}
-}{%
-  \endfilecontents%
-  \printkeywords{\option{/@nt/currentlang}}
-}
+  % \NTRunHook{keywords/#1/pre}%
+  \def\and{\unskip\datadefault{keywordspost}(\option{/@nt/currentlang})}%
+  % \def\and{{\textperiodcentered} }%
+  \par\addvspace\baselineskip\noindent%
+  \begingroup
+  \datadefault{keywordsstringprefix}(\option{/@nt/currentlang})%
+  \datadefault{keywordsstringfont}(\option{/@nt/currentlang})%
+  \csuse{thekeywordsstring}(\option{/@nt/currentlang})%
+  \datadefault{keywordsstringsuffix}(\option{/@nt/currentlang})%
+  \endgroup
+  % \enspace
+  \ignorespaces#1%
+  % \NTRunHook{keywords/#1/post}%
+  % \NTRunHook{keywords/post}%\
+}%
 
 
 
@@ -2121,18 +2139,18 @@
 
 \AtBeginDocument{%
   \makeatletter
-  \def\@ntkwsi{}
-  \@for\@it:=\expanded{\theabstractorder(\option{/novathesis/mainlang})}\do{%
-    \openin\kwsfile=\expanded{\jobname.k\@it}
-    \ifeof\kwsfile\else
-      \read\kwsfile to \@ntkwsi
-      \closein\kwsfile
-      % \show\@ntkwsi
-      \options{/@nt/keywords/\@it/.expanded/.new list = \@ntkwsi}%
-      \IfStrEq{\@it}{\option{/novathesis/mainlang}}
-              {\hypersetup{pdfkeywords={\@ntkwsi}}}{}%
-    \fi
-  }%
+  % \def\@ntkwsi{}
+  % \@for\@it:=\expanded{\theabstractorder(\option{/novathesis/mainlang})}\do{%
+  %   \openin\kwsfile=\expanded{\jobname.k\@it}
+  %   \ifeof\kwsfile\else
+  %     \read\kwsfile to \@ntkwsi
+  %     \closein\kwsfile
+  %     % \show\@ntkwsi
+  %     \options{/@nt/keywords/\@it/.expanded/.new list = \@ntkwsi}%
+  %     \IfStrEq{\@it}{\option{/novathesis/mainlang}}
+  %             {\hypersetup{pdfkeywords={\@ntkwsi}}}{}%
+  %   \fi
+  % }%
   \hypersetup{%
     pdfauthor={\expanded{\thedocauthor(name)}},
     pdftitle={\expanded{\thedoctitle(\option{/novathesis/mainlang},main)}},

diff --git a/template.pdf b/template.pdf
diff --git a/template.tex b/template.tex
@@ -8,7 +8,7 @@
 %% To view a copy of this license, visit
 %% https://www.latex-project.org/lppl/lppl-1-3c/
 %%
-%% Version 2022-05-16 [6.9.16]
+%% Version 2022-05-16 [6.10.1]
 %% Departamento de Informática (www.di.fct.unl.pt)
 %% Faculdade de Ciências e Tecnologia (www.fct.unl.pt)
 %% Universidade NOVA de Lisboa (www.unl.pt)