From 98f219417fa46e55f7a2d5f6288a1914ca7724f6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 31 Oct 2017 21:23:16 +0000 Subject: abnt (31oct17) git-svn-id: svn://tug.org/texlive/trunk@45655 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/abnt/abnt-doc.pdf | Bin 31186 -> 92709 bytes Master/texmf-dist/doc/latex/abnt/abnt-doc.tex | 21 +++++++++++++++----- Master/texmf-dist/tex/latex/abnt/abnt.sty | 27 +++++++++++++++++++------- Master/tlpkg/libexec/ctan2tds | 2 +- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/Master/texmf-dist/doc/latex/abnt/abnt-doc.pdf b/Master/texmf-dist/doc/latex/abnt/abnt-doc.pdf index 78dab62f28a..1c63d4d0164 100644 Binary files a/Master/texmf-dist/doc/latex/abnt/abnt-doc.pdf and b/Master/texmf-dist/doc/latex/abnt/abnt-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/abnt/abnt-doc.tex b/Master/texmf-dist/doc/latex/abnt/abnt-doc.tex index 731f3232325..9e26add1b3f 100644 --- a/Master/texmf-dist/doc/latex/abnt/abnt-doc.tex +++ b/Master/texmf-dist/doc/latex/abnt/abnt-doc.tex @@ -8,6 +8,8 @@ \setmainlanguage{brazil} \usepackage{tcolorbox} \tcbuselibrary{listings,skins,xparse} +\usepackage{tikz} +\usetikzlibrary{positioning,shapes,snakes} \newtcblisting[auto counter,list inside=codigo]{codigo}[2][]{% %title={Código~\thetcbcounter:~#2}, @@ -22,15 +24,24 @@ -\title{O pacote <<\texttt{abnt}>>} +\title{\tikz \node[inner sep=0pt,remember picture,overlay] at (0,1){\includegraphics[height=3cm,width=0.4\textwidth,keepaspectratio]{icone}};\\O pacote <<\texttt{abnt}>>} \author{Youssef Cherem} \date{2017} - \begin{document} \frenchspacing -\maketitle +\begin{center} + \tikz\node[diamond,shape aspect=1.2,%draw=green,ultra thick, + overlay,remember picture,overlay,%minimum size=0.6\textwidth, + left color=SpringGreen,shading angle=45,align=center] at (0,0){\includegraphics[height=3cm,width=0.4\textwidth,keepaspectratio]{icone}\\{\Large O pacote <<\texttt{abnt}>>}\\[10pt]\large Youssef Cherem\\[6pt]2017}; +\end{center} + +\vspace{4cm} + +%\maketitle + +%\BgThispage %\tcblistof[\section*]{codigo}{Lista de Códigos} @@ -39,9 +50,9 @@ O pacote \tcboxverb[blank,fuzzy halo=.5mm with green]{abnt} é uma interpretaç Seus comandos são: \begin{codigo}{} -\orientador{} \coorientador{} \orientadora{} \coorientadora{} +\orientador{} \orientadora{} \coorientador{} \coorientadora{} -\tipotrabalho{} \local{} \instituicao{} \capa \folhaderosto +\tipotrabalho{} \local{} \instituicao{} \capa \folhaderosto \end{codigo} Para mudar as fontes dos elementos: diff --git a/Master/texmf-dist/tex/latex/abnt/abnt.sty b/Master/texmf-dist/tex/latex/abnt/abnt.sty index 2c5965ddf5b..28a90a6a258 100644 --- a/Master/texmf-dist/tex/latex/abnt/abnt.sty +++ b/Master/texmf-dist/tex/latex/abnt/abnt.sty @@ -14,7 +14,7 @@ % The Current Maintainer of this work is Youssef Cherem. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{abnt}[2017/08/28] +\ProvidesPackage{abnt}[2017/10/31] \RequirePackage[left=3cm,top=3cm,right=2cm,bottom=2cm]{geometry} \RequirePackage{setspace} \RequirePackage[automark,markcase=used]{scrlayer-scrpage} @@ -29,6 +29,8 @@ \RequirePackage{emptypage} +\RequirePackage{etoolbox}%\ifdefempty{def}{true}{false} + \def\@makechapterhead#1{% %\vspace*{50\p@}% <----------------- Space from top of page to Chapter # @@ -114,14 +116,23 @@ \newcommand{\@orientador}{} \newcommand{\orientador}[1]{\gdef\@orientador{#1}} -\newcommand{\oorientador}{Orientador: \@orientador} -\newcommand{\aorientadora}{Orientador: \@orientador} -\newcommand{\ocoorientador}{Coorientador: \@orientador} -\newcommand{\acoorientadora}{Coorientadora: \@orientador} +\newcommand{\@orientadora}{} +\newcommand{\orientadora}[1]{\gdef\@orientadora{#1}} + \newcommand{\@coorientador}{} \newcommand{\coorientador}[1]{\gdef\@coorientador{#1}} +\newcommand{\@coorientadora}{} +\newcommand{\coorientadora}[1]{\gdef\@coorientadora{#1}} + + +\newcommand{\oorientador}{\if\@orientador\empty\relax \else Orientador: \@orientador\fi} +\newcommand{\aorientadora}{\if\@orientadora\empty\relax \else Orientadora: \@orientadora\fi} +\newcommand{\ocoorientador}{\if\@coorientador\empty\relax \else Coorientador: \@coorientador\fi} +\newcommand{\acoorientadora}{\if\@coorientadora\empty\relax \else Coorientadora: \@coorientadora\fi} + + \newcommand{\@instituicao}{} \newcommand{\instituicao}[1]{\gdef\@instituicao{#1}} @@ -171,8 +182,10 @@ \leftskip=6cm \singlespacing% \noindent\@tipotrabalho\par\medskip -\noindent \oorientador\par -\noindent \ocoorientador\par +\noindent \ifdefempty{\@orientador}{\aorientadora}{\oorientador}\par +\noindent \ifdefempty{\@coorientador}{\acoorientadora}{\ocoorientador} + +\par \egroup \vfill \vfill diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 761e468ed70..5bbd58175ab 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1101,7 +1101,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'thaifonts-arundina', "die 'skipping, fontforge format only'", 'thaifonts-scalable', "die 'skipping, fontforge format only'", 'thailatex', "die 'skipping, use babel-thai'", - 'thesis', "die 'skipping, await request, 1996'", + 'thesis', "die 'skipping, contradictory licenses'", # texdev.net/2016/12/18/tex-on-windows-tex-live-versus-miktex-revisited/ 'thesis-titlepage-fhAC',"die 'skipping, use ...fhac'", 'thsmc', "die 'skipping, requires nonfree font'", 'ticket', "&MAKEflatten", -- cgit v1.2.3