Commit 7994a00bfd9502bbfdc0f66a1a08e8cd0e18efda

Authored by Francisco Coelho
1 parent 34884d2f
Exists in master

Corrigido problema de fontes no m$windows; Melhor suporte multi-língua; Corrigid…

…os vários erros menores;
Showing 3 changed files with 53 additions and 27 deletions   Show diff stats
@@ -12,6 +12,8 @@ INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/base/bk11.clo @@ -12,6 +12,8 @@ INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/base/bk11.clo
12 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/base/bk11.clo 12 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/base/bk11.clo
13 INPUT /usr/local/texlive/2015/texmf-dist/fonts/map/fontname/texfonts.map 13 INPUT /usr/local/texlive/2015/texmf-dist/fonts/map/fontname/texfonts.map
14 INPUT /usr/local/texlive/2015/texmf-dist/fonts/tfm/public/cm/cmr10.tfm 14 INPUT /usr/local/texlive/2015/texmf-dist/fonts/tfm/public/cm/cmr10.tfm
  15 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/emptypage/emptypage.sty
  16 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/emptypage/emptypage.sty
15 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/geometry/geometry.sty 17 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/geometry/geometry.sty
16 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/geometry/geometry.sty 18 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/geometry/geometry.sty
17 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/graphics/keyval.sty 19 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/graphics/keyval.sty
@@ -137,6 +139,16 @@ INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libr @@ -137,6 +139,16 @@ INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libr
137 INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarytopaths.code.tex 139 INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarytopaths.code.tex
138 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/base/makeidx.sty 140 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/base/makeidx.sty
139 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/base/makeidx.sty 141 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/base/makeidx.sty
  142 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/tools/array.sty
  143 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/tools/array.sty
  144 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/polyglossia/polyglossia.sty
  145 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/polyglossia/polyglossia.sty
  146 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/makecmds/makecmds.sty
  147 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/makecmds/makecmds.sty
  148 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/xkeyval/xkeyval.sty
  149 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/xkeyval/xkeyval.sty
  150 +INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/xkeyval/xkeyval.tex
  151 +INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/xkeyval/xkvutils.tex
140 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/fontspec/fontspec.sty 152 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/fontspec/fontspec.sty
141 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/fontspec/fontspec.sty 153 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/fontspec/fontspec.sty
142 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/l3kernel/expl3.sty 154 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -166,16 +178,18 @@ INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/euenc/eu1lmss.fd @@ -166,16 +178,18 @@ INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/euenc/eu1lmss.fd
166 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/euenc/eu1lmss.fd 178 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/euenc/eu1lmss.fd
167 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/fontspec/fontspec.cfg 179 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/fontspec/fontspec.cfg
168 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/fontspec/fontspec.cfg 180 INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/fontspec/fontspec.cfg
169 -INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/tools/array.sty  
170 -INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/tools/array.sty  
171 -INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/babel/babel.sty  
172 -INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/babel/babel.sty  
173 -INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/babel-portuges/portuges.ldf  
174 -INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/babel-portuges/portuges.ldf  
175 -INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/babel/babel.def  
176 -INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/babel/xebabel.def  
177 -INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty  
178 -INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty 181 +INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/oberdiek/ifluatex.sty
  182 +INPUT /usr/local/texlive/2015/texmf-dist/tex/generic/oberdiek/ifluatex.sty
  183 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
  184 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
  185 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
  186 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf
  187 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf
  188 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf
  189 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/rotating/rotating.sty
  190 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/rotating/rotating.sty
  191 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/base/ifthen.sty
  192 +INPUT /usr/local/texlive/2015/texmf-dist/tex/latex/base/ifthen.sty
179 INPUT main.aux 193 INPUT main.aux
180 INPUT main.aux 194 INPUT main.aux
181 INPUT prefacio.aux 195 INPUT prefacio.aux
No preview for this file type
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
26 26
27 % Document adjustment 27 % Document adjustment
28 \LoadClass[11pt,a4paper]{book} 28 \LoadClass[11pt,a4paper]{book}
  29 +\RequirePackage{emptypage}
29 \RequirePackage[top=3cm, bottom=3cm, left=2cm, right=2cm]{geometry} 30 \RequirePackage[top=3cm, bottom=3cm, left=2cm, right=2cm]{geometry}
30 \RequirePackage{setspace} % for spacing environment 31 \RequirePackage{setspace} % for spacing environment
31 \RequirePackage{etoolbox} % for advanced authoring 32 \RequirePackage{etoolbox} % for advanced authoring
@@ -126,32 +127,35 @@ @@ -126,32 +127,35 @@
126 % --- Lista de Acrónimos --- 127 % --- Lista de Acrónimos ---
127 \newcommand{\@LST@ACRON@EN}{Acronyms} 128 \newcommand{\@LST@ACRON@EN}{Acronyms}
128 \newcommand{\@LST@ACRON@PT}{Lista de Acr\'{o}nimos} 129 \newcommand{\@LST@ACRON@PT}{Lista de Acr\'{o}nimos}
129 -\newcommand{\@LST@ACRON}{\@LST@ACRON@PT} 130 +\newcommand{\@LST@ACRON}{ND}
130 % --- Lista de Figuras --- 131 % --- Lista de Figuras ---
131 \newcommand{\@LST@FIG@EN}{List of Figures} 132 \newcommand{\@LST@FIG@EN}{List of Figures}
132 \newcommand{\@LST@FIG@PT}{Lista de Figuras} 133 \newcommand{\@LST@FIG@PT}{Lista de Figuras}
133 -\newcommand{\@LST@FIG}{\@LST@FIG@PT} 134 +\newcommand{\@LST@FIG}{ND}
134 % --- Tabela de Conteúdos --- 135 % --- Tabela de Conteúdos ---
135 \newcommand{\@LST@CONT@EN}{Contents} 136 \newcommand{\@LST@CONT@EN}{Contents}
136 \newcommand{\@LST@CONT@PT}{Conteúdo} 137 \newcommand{\@LST@CONT@PT}{Conteúdo}
137 -\newcommand{\@LST@CONT}{\@LST@CONT@PT} 138 +\newcommand{\@LST@CONT}{ND}
138 % --- Lista de Tabelas --- 139 % --- Lista de Tabelas ---
139 \newcommand{\@LST@TAB@EN}{List of Tables} 140 \newcommand{\@LST@TAB@EN}{List of Tables}
140 \newcommand{\@LST@TAB@PT}{Lista de Tabelas} 141 \newcommand{\@LST@TAB@PT}{Lista de Tabelas}
141 -\newcommand{\@LST@TAB}{\@LST@TAB@PT} 142 +\newcommand{\@LST@TAB}{ND}
142 % --- Termos intermutaveis --- 143 % --- Termos intermutaveis ---
143 \newcommand{\@TXT@SUMARIO@PT}{Sum\'{a}rio} 144 \newcommand{\@TXT@SUMARIO@PT}{Sum\'{a}rio}
144 \newcommand{\@TXT@SUMARIO@EN}{Abstact} 145 \newcommand{\@TXT@SUMARIO@EN}{Abstact}
145 -\newcommand{\@TXT@SUMARIO@A}{\@TXT@SUMARIO@PT}  
146 -\newcommand{\@TXT@SUMARIO@B}{\@TXT@SUMARIO@EN} 146 +\newcommand{\@TXT@SUMARIO@A}{ND}
  147 +\newcommand{\@TXT@SUMARIO@B}{ND}
147 % 148 %
148 \newcommand{\@TXT@PALCHAVE@PT}{Palavras chave} 149 \newcommand{\@TXT@PALCHAVE@PT}{Palavras chave}
149 \newcommand{\@TXT@PALCHAVE@EN}{Keywords} 150 \newcommand{\@TXT@PALCHAVE@EN}{Keywords}
150 -\newcommand{\@TXT@PALCHAVE@A}{\@TXT@PALCHAVE@PT}  
151 -\newcommand{\@TXT@PALCHAVE@B}{\@TXT@PALCHAVE@EN} 151 +\newcommand{\@TXT@PALCHAVE@A}{ND}
  152 +\newcommand{\@TXT@PALCHAVE@B}{ND}
152 % 153 %
153 \DeclareRobustCommand{\tueLINGUA}[1]{% 154 \DeclareRobustCommand{\tueLINGUA}[1]{%
154 \renewcommand{\@LINGUA}{#1} 155 \renewcommand{\@LINGUA}{#1}
  156 + \typeout{***}
  157 + \typeout{*** TeseUE}
  158 + \typeout{*** ------ LINGUA(\@LINGUA)}
155 \ifdefstring{\@LINGUA}{EN}{ 159 \ifdefstring{\@LINGUA}{EN}{
156 % 160 %
157 % English 161 % English
@@ -162,14 +166,13 @@ @@ -162,14 +166,13 @@
162 \renewcommand{\@LST@FIG}{\@LST@FIG@EN} 166 \renewcommand{\@LST@FIG}{\@LST@FIG@EN}
163 \renewcommand{\@LST@CONT}{\@LST@CONT@EN} 167 \renewcommand{\@LST@CONT}{\@LST@CONT@EN}
164 \renewcommand{\@LST@TAB}{\@LST@TAB@EN} 168 \renewcommand{\@LST@TAB}{\@LST@TAB@EN}
165 - \renewcommand{\contentsname}{\@LST@CONT@EN}  
166 \renewcommand{\@TXT@SUMARIO@A}{\@TXT@SUMARIO@EN} 169 \renewcommand{\@TXT@SUMARIO@A}{\@TXT@SUMARIO@EN}
167 \renewcommand{\@TXT@SUMARIO@B}{\@TXT@SUMARIO@PT} 170 \renewcommand{\@TXT@SUMARIO@B}{\@TXT@SUMARIO@PT}
168 \renewcommand{\@TXT@PALCHAVE@A}{\@TXT@PALCHAVE@EN} 171 \renewcommand{\@TXT@PALCHAVE@A}{\@TXT@PALCHAVE@EN}
169 \renewcommand{\@TXT@PALCHAVE@B}{\@TXT@PALCHAVE@PT} 172 \renewcommand{\@TXT@PALCHAVE@B}{\@TXT@PALCHAVE@PT}
170 }{ 173 }{
171 % 174 %
172 - % Portugues 175 + % Portugues
173 % 176 %
174 \setmainlanguage{portuges} 177 \setmainlanguage{portuges}
175 \setotherlanguage{english} 178 \setotherlanguage{english}
@@ -177,12 +180,17 @@ @@ -177,12 +180,17 @@
177 \renewcommand{\@LST@FIG}{\@LST@FIG@PT} 180 \renewcommand{\@LST@FIG}{\@LST@FIG@PT}
178 \renewcommand{\@LST@CONT}{\@LST@CONT@PT} 181 \renewcommand{\@LST@CONT}{\@LST@CONT@PT}
179 \renewcommand{\@LST@TAB}{\@LST@TAB@PT} 182 \renewcommand{\@LST@TAB}{\@LST@TAB@PT}
180 - \renewcommand{\contentsname}{\@LST@CONT@PT}  
181 - \renewcommand{\@TXT@PALCHAVE@A}{\@TXT@PALCHAVE@PT}  
182 - \renewcommand{\@TXT@PALCHAVE@B}{\@TXT@PALCHAVE@EN} 183 + \renewcommand{\@TXT@SUMARIO@A}{\@TXT@SUMARIO@PT}
  184 + \renewcommand{\@TXT@SUMARIO@B}{\@TXT@SUMARIO@EN}
183 \renewcommand{\@TXT@PALCHAVE@A}{\@TXT@PALCHAVE@PT} 185 \renewcommand{\@TXT@PALCHAVE@A}{\@TXT@PALCHAVE@PT}
184 \renewcommand{\@TXT@PALCHAVE@B}{\@TXT@PALCHAVE@EN} 186 \renewcommand{\@TXT@PALCHAVE@B}{\@TXT@PALCHAVE@EN}
  187 +
185 } 188 }
  189 + \typeout{*** ------ LSTACRON(\@LST@ACRON)}
  190 + \typeout{*** ------ SUMARIO(\@TXT@SUMARIO@A)}
  191 + \typeout{*** ------ ABSTRACT(\@TXT@SUMARIO@B)}
  192 + \typeout{*** ------ PAL.CHAV(\@TXT@PALCHAVE@A)}
  193 + \typeout{*** ------ KEYWORDS(\@TXT@PALCHAVE@B)}
186 } 194 }
187 % 195 %
188 %% Titulo 196 %% Titulo
@@ -405,6 +413,10 @@ @@ -405,6 +413,10 @@
405 %% Sumario/Resumo 413 %% Sumario/Resumo
406 % 414 %
407 \newenvironment{tueSUMARIO}{ 415 \newenvironment{tueSUMARIO}{
  416 + \typeout{***}
  417 + \typeout{*** tueSUMARIO}
  418 + \typeout{*** ------ SUMARIO(\@TXT@SUMARIO@A)}
  419 + \typeout{*** ------ PAL.CHAV(\@TXT@PALCHAVE@A)}
408 \chapter*{\@TXT@SUMARIO@A} 420 \chapter*{\@TXT@SUMARIO@A}
409 \addcontentsline{toc}{chapter}{\@TXT@SUMARIO@A} 421 \addcontentsline{toc}{chapter}{\@TXT@SUMARIO@A}
410 \markboth{\uppercase{\@TXT@SUMARIO@A}}{} 422 \markboth{\uppercase{\@TXT@SUMARIO@A}}{}
@@ -437,7 +449,7 @@ @@ -437,7 +449,7 @@
437 \textbf{\@TXT@PALCHAVE@B:}~\@KEYWORDS 449 \textbf{\@TXT@PALCHAVE@B:}~\@KEYWORDS
438 } 450 }
439 % 451 %
440 -%% Abstract 452 +%% Acronimos
441 % 453 %
442 \newenvironment{tueACRONIMOS}{ 454 \newenvironment{tueACRONIMOS}{
443 \chapter*{\@LST@ACRON}\addcontentsline{toc}{chapter}{\@LST@ACRON} 455 \chapter*{\@LST@ACRON}\addcontentsline{toc}{chapter}{\@LST@ACRON}
@@ -455,18 +467,18 @@ @@ -455,18 +467,18 @@
455 % 467 %
456 \@blankoddpage 468 \@blankoddpage
457 \cleardoublepage 469 \cleardoublepage
458 - \tableofcontents  
459 \addcontentsline{toc}{chapter}{\@LST@CONT} 470 \addcontentsline{toc}{chapter}{\@LST@CONT}
  471 + \tableofcontents
460 % 472 %
461 \@blankoddpage 473 \@blankoddpage
462 \cleardoublepage 474 \cleardoublepage
463 - \listoffigures  
464 \addcontentsline{toc}{chapter}{\@LST@FIG} 475 \addcontentsline{toc}{chapter}{\@LST@FIG}
  476 + \listoffigures
465 % 477 %
466 \@blankoddpage 478 \@blankoddpage
467 \cleardoublepage 479 \cleardoublepage
468 - \listoftables  
469 \addcontentsline{toc}{chapter}{\@LST@TAB} 480 \addcontentsline{toc}{chapter}{\@LST@TAB}
  481 + \listoftables
470 % 482 %
471 \@blankoddpage 483 \@blankoddpage
472 \cleardoublepage 484 \cleardoublepage