Hello community, here is the log from the commit of package texlive-specs-a for openSUSE:Factory checked in at 2015-04-25 09:49:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-a (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-a.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-a" Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-a/texlive-specs-a.changes 2015-03-01 14:45:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.texlive-specs-a.new/texlive-specs-a.changes 2015-04-25 09:49:20.000000000 +0200 @@ -1,0 +2,60 @@ +Wed Apr 15 13:43:57 UTC 2015 - [email protected] + +- Handle unkown scripts + +------------------------------------------------------------------- +Tue Apr 14 13:53:08 UTC 2015 - [email protected] + +- Make sure that tabs are used within <<-EOF...EOF pair + +------------------------------------------------------------------- +Thu Apr 2 12:25:21 UTC 2015 - [email protected] + +- Package pas-cours: move runfiles from doc to working directory + +------------------------------------------------------------------- +Thu Apr 2 10:33:38 UTC 2015 - [email protected] + +- Handle rpmlintrc for each meta spec file its self + +------------------------------------------------------------------- +Wed Apr 1 16:47:12 UTC 2015 - [email protected] + +- The new TeXLive package layout had suppressed the detection of many + Provides which is fixed now. +- The null.tex is now in texlive-knuth-lib, therefore require + tex(null.tex) in luatex.requires and tex.requires instead of the + gone texlive-misc. + +------------------------------------------------------------------- +Wed Apr 1 07:47:29 UTC 2015 - [email protected] + +- Add exceltex.requires which now Requires perl(Spreadsheet::ParseExcel) + (boo#891617) +- Patch kpathsea_cnf.dif moved from texlive-specs-m to texlive-specs-l + +------------------------------------------------------------------- +Mon Mar 30 08:39:12 UTC 2015 - [email protected] + +- Add patch dvips_config.dif (boo#897284) +- Remove patch pgf_plain.dif as now upstream +- Remove patch latexdiff_env.dif as the affected file is gone +- Modified patches + luaotfload_varfonts.dif + tetex_scripts.dif + tex4ht_env.dif +- Removed files pst-node.moves and pst-plot.moves as now the files + are at the correct location + +------------------------------------------------------------------- +Thu Mar 26 14:05:48 UTC 2015 - [email protected] + +- Update to TeXLive 2014 (timestamp 20140525 revision 34252) + * Support DVIPDFMx + * [fix] avoid luatex crash under math_mode 'decimal' + * luaotfload: Fix incorrect handling of font file formats luaotfload) + * Sync with Context beta as of 2014-04-05 + * pdfTeX: sync with Knuth TeX 3.14159265, e-TeX 2.6 + * Many more ... + +------------------------------------------------------------------- New: ---- accanthis.doc.tar.xz accanthis.tar.xz ajl.tar.xz alegreya.doc.tar.xz alegreya.tar.xz anonymouspro.doc.tar.xz anonymouspro.tar.xz aobs-tikz.doc.tar.xz aobs-tikz.tar.xz texlive-specs-a-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-a.spec ++++++ ++++ 10437 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-a/texlive-specs-a.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-a.new/texlive-specs-a.spec ++++++ Asana-Math.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/Asana-Math/FontLog.txt new/doc/fonts/Asana-Math/FontLog.txt --- old/doc/fonts/Asana-Math/FontLog.txt 2012-07-29 19:03:56.000000000 +0200 +++ new/doc/fonts/Asana-Math/FontLog.txt 2014-05-09 00:42:28.000000000 +0200 @@ -4,7 +4,8 @@ 000.934 Adde3d accent circumflex. -000.935 Modified glyphs uni2257,uni2258, uni2259, uni225A, uni225B, uni225C, uni225D, uni225E, and uni225F. +000.935 Modified glyphs uni2257,uni2258, uni2259, uni225A, + uni225B, uni225C, uni225D, uni225E, and uni225F. 000.936 Modified glyphs uni22A7, uni22A8, and uni22AD. @@ -27,14 +28,25 @@ 000.944 Fixed math kern information for math script letters. 000.945 Value of constant DisplayOperatorMinHeight - has been adjusted. Thanks to Mateus Araújo for - finding what caused the problem of big display - operatos. + has been adjusted. Thanks to Mateus Araújo for + finding what caused the problem of big display + operators. -000.946 Fixed math kern information for math script letters. Thanks again to Mateus Araújo for sorting this out. +000.946 Fixed math kern information for math script letters. + Thanks again to Mateus Araújo for sorting this out. -000.947 Math kern information removed due to a bug. Added the six die symbols. +000.947 Math kern information removed due to a bug. Added the + six die symbols. 000.948 Added U+2031 -000.949 Added versical variants for slash \ No newline at end of file +000.949 Added versical variants for slash + +000.950 Fixed overbrace and underbrace horizontal constructs + +000.951 Fixed braces, parentheses, and square brackets vertical constructs + +000.952 The symbol RIGHT WHITE TORTOISE SHELL BRACKET was not correct. Added + LEFT and RIGHT ANGLE BRACKET, LEFT and RIGHT DOUBLE ANGLE BRACKET, + LEFT and RIGHT WHITE SQUARE BRACKET. Thanks to Peter Tönnies for + finding this bug. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/Asana-Math.doc.tlpobj new/tlpkg/tlpobj/Asana-Math.doc.tlpobj --- old/tlpkg/tlpobj/Asana-Math.doc.tlpobj 2012-07-30 04:42:12.000000000 +0200 +++ new/tlpkg/tlpobj/Asana-Math.doc.tlpobj 2014-05-09 03:21:45.000000000 +0200 @@ -1,6 +1,6 @@ name Asana-Math.doc category Package -revision 27228 +revision 33917 shortdesc doc files of Asana-Math relocated 1 docfiles size=2 ++++++ Asana-Math.tar.xz ++++++ Files old/fonts/opentype/public/Asana-Math/Asana-Math.otf and new/fonts/opentype/public/Asana-Math/Asana-Math.otf differ Files old/fonts/truetype/public/Asana-Math/Asana-Math.ttf and new/fonts/truetype/public/Asana-Math/Asana-Math.ttf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/Asana-Math.tlpobj new/tlpkg/tlpobj/Asana-Math.tlpobj --- old/tlpkg/tlpobj/Asana-Math.tlpobj 2012-07-30 04:42:12.000000000 +0200 +++ new/tlpkg/tlpobj/Asana-Math.tlpobj 2014-05-09 03:21:45.000000000 +0200 @@ -1,6 +1,6 @@ name Asana-Math category Package -revision 27228 +revision 33917 shortdesc A font to typeset maths in Xe(La)TeX and Lua(La)TeX. relocated 1 longdesc The Asana-Math font is an OpenType font that includes almost @@ -14,6 +14,6 @@ RELOC/fonts/opentype/public/Asana-Math/Asana-Math.otf RELOC/fonts/truetype/public/Asana-Math/Asana-Math.ttf catalogue-ctan /fonts/Asana-Math -catalogue-date 2012-06-11 11:02:36 +0200 +catalogue-date 2014-05-08 07:11:39 +0200 catalogue-license ofl -catalogue-version 000.949 +catalogue-version 000.952 ++++++ FAQ-en.doc.tar.xz ++++++ ++++ 52220 lines of diff (skipped) ++++++ abntex2.doc.tar.xz ++++++ ++++ 12298 lines of diff (skipped) ++++++ abntex2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/abntex2/abntex2-alf.bst new/bibtex/bst/abntex2/abntex2-alf.bst --- old/bibtex/bst/abntex2/abntex2-alf.bst 2013-05-28 01:08:58.000000000 +0200 +++ new/bibtex/bst/abntex2/abntex2-alf.bst 2014-01-26 22:57:28.000000000 +0100 @@ -1,5 +1,5 @@ -%% abntex2-alf.bst, v<VERSION> laurocesar -%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ +%% abntex2-alf.bst, v-1.9.2 laurocesar +%% Copyright 2012-2014 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -25,6 +25,13 @@ %% %% Revision history: %% +%% 2013/08/27 PauloQuinan +%% Corrige a formatação de url com https +%% Corrige caracter & não escapado em urls de referências quando se usa hyperref +%% +%% 2013/06/01 laurocesar +%% Ajusta opção iso-690-1987 para @article +%% %% 2013/05/26 laurocesar %% Corrige problemas de duplicação de ano nas funções article e jornalpart %% @@ -974,14 +981,16 @@ FUNCTION {get.url.type} {s #1 #5 substring$ "http:" = {http.url} + {s #1 #6 substring$ "https:" = {http.url} {s #1 #5 substring$ "file:" = {file.url} - {s #1 #4 substring$ "ftp:" = {ftp.url} - {s #1 #4 substring$ "doi:" = {doi.url} - {s #1 #7 substring$ "mailto:"; = {mailto.url} {unknown.url} if$} - if$} + {s #1 #4 substring$ "ftp:" = {ftp.url} + {s #1 #4 substring$ "doi:" = {doi.url} + {s #1 #7 substring$ "mailto:"; = {mailto.url} {unknown.url} if$} + if$} if$} + if$} if$} - if$ + if$ 'url.type := } @@ -1000,10 +1009,13 @@ {s url.pos #1 substring$ duplicate$ "_" = {pop$ "\underline{\ }" } 'skip$ if$ duplicate$ "%" = {pop$ "\%" } 'skip$ if$ + duplicate$ "&" = {pop$ "\&" } 'skip$ if$ duplicate$ "~" = {pop$ "\~{}" } 'skip$ if$ duplicate$ "/" = {pop$ "\-/" } 'skip$ if$ duplicate$ "." = {pop$ "\-." } 'skip$ if$ duplicate$ "\" = {pop$ "{\textbackslash}" } 'skip$ if$ + duplicate$ "#" = {pop$ "\#" } 'skip$ if$ + duplicate$ "_" = {pop$ "\_" } 'skip$ if$ t swap$ * 't := url.pos #1 + 'url.pos := } @@ -1016,6 +1028,8 @@ {url.pos url.length <} {s url.pos #1 substring$ duplicate$ "%" = {pop$ "\%" } 'skip$ if$ + duplicate$ "#" = {pop$ "\#" } 'skip$ if$ + duplicate$ "_" = {pop$ "\_" } 'skip$ if$ t swap$ * 't := url.pos #1 + 'url.pos := } @@ -1032,7 +1046,7 @@ abnt.doi abnt.doi.expand.to.url = 'expand.doi {s} if$ * "$>$" *} 'skip$ if$ abnt.url.package #1 = - { "\url{" * s * "}" *} 'skip$ if$ + { "\url{" * filter.url.html * "}" *} 'skip$ if$ abnt.url.package #2 = {url.type http.url = {"\htmladdnormallink{$<$" * filter.url.tex * "$>$}{" * filter.url.html * "}" *} @@ -1696,7 +1710,8 @@ iso.year.label format.title "title" output.check new.block format.journal output - iso.date.place {format.date output} 'skip$ if$ + iso.date.place {format.year output} 'skip$ if$ + %iso.date.place {format.date output} 'skip$ if$ %iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$} % {format.year output new.sentence} if$ section "section" bibinfo.check output.dash @@ -2087,7 +2102,7 @@ "$RCSfile: abnt-alf.bst,v $ " extract.cvs.key % "abnt-alf.bst,v " = 'abnt.alf := % #1 para abnt-alf #0 para abnt-num - "$Revision: v<VERSION> $" extract.cvs.key 'abnt.bst.revision := + "$Revision: v-1.9.2 $" extract.cvs.key 'abnt.bst.revision := #0 'abnt.and.type := % #0 "e"; #1 "&" "\emph" 'abnt.emphasize := #0 'abnt.cite.style := %default norm version for NBR10520 @@ -2209,8 +2224,8 @@ "| http://abntex2.googlecode.com |" "| Em caso de dúvidas ou problemas com este estilo procure |" abnt.alf - {"| Estilo bibliográfico abnt-alf.bst versão " abnt.bst.revision * " |" *} - {"| Estilo bibliográfico abnt-num.bst versão " abnt.bst.revision * " |" *} + {"| Estilo bibliográfico abntex2-alf.bst versão " abnt.bst.revision * " |" *} + {"| Estilo bibliográfico abntex2-num.bst versão " abnt.bst.revision * " |" *} if$ "+---------------------------------------------------------+" stack$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/abntex2/abntex2-num.bst new/bibtex/bst/abntex2/abntex2-num.bst --- old/bibtex/bst/abntex2/abntex2-num.bst 2013-05-28 01:08:58.000000000 +0200 +++ new/bibtex/bst/abntex2/abntex2-num.bst 2014-01-26 22:57:28.000000000 +0100 @@ -1,5 +1,5 @@ -%% abntex2-num.bst, v<VERSION> laurocesar -%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ +%% abntex2-num.bst, v-1.9.2 laurocesar +%% Copyright 2012-2014 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -25,6 +25,13 @@ %% %% Revision history: %% +%% 2013/08/27 PauloQuinan +%% Corrige a formatação de url com https +%% Corrige caracter & não escapado em urls de referências quando se usa hyperref +%% +%% 2013/06/01 laurocesar +%% Ajusta opção iso-690-1987 para @article +%% %% 2013/05/26 laurocesar %% Corrige problemas de duplicação de ano nas funções article e jornalpart %% @@ -974,14 +981,16 @@ FUNCTION {get.url.type} {s #1 #5 substring$ "http:" = {http.url} + {s #1 #6 substring$ "https:" = {http.url} {s #1 #5 substring$ "file:" = {file.url} - {s #1 #4 substring$ "ftp:" = {ftp.url} - {s #1 #4 substring$ "doi:" = {doi.url} - {s #1 #7 substring$ "mailto:"; = {mailto.url} {unknown.url} if$} - if$} + {s #1 #4 substring$ "ftp:" = {ftp.url} + {s #1 #4 substring$ "doi:" = {doi.url} + {s #1 #7 substring$ "mailto:"; = {mailto.url} {unknown.url} if$} + if$} if$} + if$} if$} - if$ + if$ 'url.type := } @@ -1000,10 +1009,13 @@ {s url.pos #1 substring$ duplicate$ "_" = {pop$ "\underline{\ }" } 'skip$ if$ duplicate$ "%" = {pop$ "\%" } 'skip$ if$ + duplicate$ "&" = {pop$ "\&" } 'skip$ if$ duplicate$ "~" = {pop$ "\~{}" } 'skip$ if$ duplicate$ "/" = {pop$ "\-/" } 'skip$ if$ duplicate$ "." = {pop$ "\-." } 'skip$ if$ duplicate$ "\" = {pop$ "{\textbackslash}" } 'skip$ if$ + duplicate$ "#" = {pop$ "\#" } 'skip$ if$ + duplicate$ "_" = {pop$ "\_" } 'skip$ if$ t swap$ * 't := url.pos #1 + 'url.pos := } @@ -1016,6 +1028,8 @@ {url.pos url.length <} {s url.pos #1 substring$ duplicate$ "%" = {pop$ "\%" } 'skip$ if$ + duplicate$ "#" = {pop$ "\#" } 'skip$ if$ + duplicate$ "_" = {pop$ "\_" } 'skip$ if$ t swap$ * 't := url.pos #1 + 'url.pos := } @@ -1032,7 +1046,7 @@ abnt.doi abnt.doi.expand.to.url = 'expand.doi {s} if$ * "$>$" *} 'skip$ if$ abnt.url.package #1 = - { "\url{" * s * "}" *} 'skip$ if$ + { "\url{" * filter.url.html * "}" *} 'skip$ if$ abnt.url.package #2 = {url.type http.url = {"\htmladdnormallink{$<$" * filter.url.tex * "$>$}{" * filter.url.html * "}" *} @@ -1696,7 +1710,8 @@ iso.year.label format.title "title" output.check new.block format.journal output - iso.date.place {format.date output} 'skip$ if$ + iso.date.place {format.year output} 'skip$ if$ + %iso.date.place {format.date output} 'skip$ if$ %iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$} % {format.year output} if$ section "section" bibinfo.check output.dash @@ -2087,7 +2102,7 @@ "$RCSfile: abnt-num.bst,v $ " extract.cvs.key % "abnt-alf.bst,v " = 'abnt.alf := % #1 para abnt-alf #0 para abnt-num - "$Revision: v<VERSION> $" extract.cvs.key 'abnt.bst.revision := + "$Revision: v-1.9.2 $" extract.cvs.key 'abnt.bst.revision := #0 'abnt.and.type := % #0 "e"; #1 "&" "\emph" 'abnt.emphasize := #0 'abnt.cite.style := %default norm version for NBR10520 @@ -2209,8 +2224,8 @@ "| http://abntex2.googlecode.com |" "| Em caso de dúvidas ou problemas com este estilo procure |" abnt.alf - {"| Estilo bibliográfico abnt-alf.bst versão " abnt.bst.revision * " |" *} - {"| Estilo bibliográfico abnt-num.bst versão " abnt.bst.revision * " |" *} + {"| Estilo bibliográfico abntex2-alf.bst versão " abnt.bst.revision * " |" *} + {"| Estilo bibliográfico abntex2-num.bst versão " abnt.bst.revision * " |" *} if$ "+---------------------------------------------------------+" stack$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/abntex2/abntex2.cls new/tex/latex/abntex2/abntex2.cls --- old/tex/latex/abntex2/abntex2.cls 2013-05-28 01:08:58.000000000 +0200 +++ new/tex/latex/abntex2/abntex2.cls 2014-01-26 22:57:28.000000000 +0100 @@ -1,5 +1,5 @@ -%% abntex2.cls, v-1.7.1 laurocesar -%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ +%% abntex2.cls, v-1.9.2 laurocesar +%% Copyright 2012-2014 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -17,6 +17,39 @@ %% %% This work consists of the file abntex2.cls. %% +%% 2014.1.26 8h24 laurocesar +%% Corrige declaracao de opcoes para abnt-6027-2012 quando versao de memoir for +%% antiga +%% +%% 2013.12.26 06h41 laurocesar (volanski) +%% Replaced ~--~ by ~\textendash~ +%% +%% 2013.10.26 17h45 laurocesar +%% Adiciona a macro \phantompart +%% Revisa código do sumário 6027-2012 +%% +%% 2013.11.30 15h12 laurocesar +%% conclusão dos ajustes no sumário abnt-6027-2012 +%% \phantompart adiciona espaço ao sumário mesmo se abnt-6027-2012 +%% não estiver ativa +%% +%% 2013.10.24 09h53 laurocesar +%% Revisa as alterações de quinto nível +%% +%% 2013.10.11 07h27 sggranja +%% Adiciona opções sumario=abnt-6027-2012 e sumario=tradicional +%% +%% 2013.10.02 11h00 carlini +%% Adiciona suporte a subsubsubsection (utilizando paragraph) +%% e adiciona a opcao subsubsubsection=TITLE. +%% +%% 2013.8.19 07h27 sggranja +%% Adiciona macros \IBGEtab e \fonte +%% +%% 2013.6.20 07h27 laurocesar / ricardoerikson +%% Adiciona condição para a criação de length \chapternamenumlength na +%% definição do chapterstyle abnt +%% %% 2013.5.24 10h29 laurocesar %% Adiciona a opção language ao ambiente citacao. %% @@ -121,7 +154,7 @@ % ------------------------------------------------------------------------ % ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{abntex2}[2013/06/01 v1.7 abnTeX2] +\ProvidesClass{abntex2}[2014/01/26 v1.9.2 abnTeX2] \RequirePackage{ifthen} % % Captura as options article e twocolumn @@ -144,15 +177,31 @@ \newboolean{ABNTEXuppersection} %true=titles of sections in uppercase \newboolean{ABNTEXuppersubsection} %true=titles of subsections in uppercase \newboolean{ABNTEXuppersubsubsection} %true=titles of subsubsections in uppercase +\newboolean{ABNTEXuppersubsubsubsection} %true=titles of subsubsubsections in uppercase \setboolean{ABNTEXupperchapter}{false} \setboolean{ABNTEXuppersection}{false} \setboolean{ABNTEXuppersubsection}{false} \setboolean{ABNTEXuppersubsubsection}{false} +\setboolean{ABNTEXuppersubsubsubsection}{false} \DeclareOption{chapter=TITLE}{\setboolean{ABNTEXupperchapter}{true}} \DeclareOption{section=TITLE}{\setboolean{ABNTEXuppersection}{true}} \DeclareOption{subsection=TITLE}{\setboolean{ABNTEXuppersubsection}{true}} \DeclareOption{subsubsection=TITLE}{\setboolean{ABNTEXuppersubsubsection}{true}} - +\DeclareOption{subsubsubsection=TITLE}{\setboolean{ABNTEXuppersubsubsubsection}{true}} +% +% Opções de diagramação de sumários +% sumario=tradicional : Sumário tradicional do LaTeX/Memoir +% sumario=abnt-6027-2012 : Sumário conforme recomendação da ABNT NBR 6027:2012 +\newboolean{ABNTEXsumario-tradicional} %true=titles of chapter/appendix in uppercase +\newboolean{ABNTEXsumario-abnt-6027-2012} +\setboolean{ABNTEXsumario-tradicional}{false} +\setboolean{ABNTEXsumario-abnt-6027-2012}{true} +\DeclareOption{sumario=tradicional}{% + \setboolean{ABNTEXsumario-tradicional}{true}% + \setboolean{ABNTEXsumario-abnt-6027-2012}{false}} +\DeclareOption{sumario=abnt-6027-2012}{% + \setboolean{ABNTEXsumario-abnt-6027-2012}{true} + \setboolean{ABNTEXsumario-tradicional}{false}} % % Repassa demais opcoes a memoir % @@ -162,6 +211,16 @@ \ProcessOptions\relax \LoadClass{memoir} +% sumario=abnt-6027-2012 : Sumário conforme recomendação da ABNT NBR 6027:2012, que +% soh pode ser usado com memoir v3.6k ou superior +% \settocpreprocessor \changes{v3.6k}{2012/09/18}{Added} +\ifdefined\settocpreprocessor +\else + \setboolean{ABNTEXsumario-tradicional}{true} + \setboolean{ABNTEXsumario-abnt-6027-2012}{false} +\fi + + % ------------------------------------------------------------------------ % ------------------------------------------------------------------------ % Comandos para tratamento de opcoes proprias @@ -179,6 +238,7 @@ \newcommand{\ABNTEXsectionupperifneeded}{\ifthenelse{\boolean{ABNTEXuppersection}}{\MakeTextUppercase}{}} \newcommand{\ABNTEXsubsectionupperifneeded}{\ifthenelse{\boolean{ABNTEXuppersubsection}}{\MakeTextUppercase}{}} \newcommand{\ABNTEXsubsubsectionupperifneeded}{\ifthenelse{\boolean{ABNTEXuppersubsubsection}}{\MakeTextUppercase}{}} +\newcommand{\ABNTEXsubsubsubsectionupperifneeded}{\ifthenelse{\boolean{ABNTEXuppersubsubsubsection}}{\MakeTextUppercase}{}} % --- % ------------------------------------------------------------------------ @@ -224,6 +284,8 @@ \newcommand{\resumoname}{Resumo} \newcommand{\listadesiglasname}{Lista de abreviaturas e siglas} \newcommand{\listadesimbolosname}{Lista de s\'imbolos} +\newcommand{\fontename}{Fonte} +\newcommand{\notaname}{Nota} % \addto\captionsbrazil{% portugues-brasil %% ajusta nomes padroes do babel @@ -236,7 +298,7 @@ \renewcommand{\sectionautorefname}{se{\c c}\~ao} \renewcommand{\subsectionautorefname}{subse{\c c}\~ao} \renewcommand{\subsubsectionautorefname}{subse{\c c}\~ao} - \renewcommand{\paragraphautorefname}{par\'agrafo} + \renewcommand{\paragraphautorefname}{subse{\c c}\~ao} } \addto\captionsenglish{% ingles %% adjusts names from abnTeX2 @@ -255,12 +317,14 @@ \renewcommand{\resumoname}{Abstract} \renewcommand{\listadesiglasname}{List of abbreviations and acronyms} \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} \renewcommand{\subsubsectionautorefname}{subsubsection} - \renewcommand{\paragraphautorefname}{paragraph} + \renewcommand{\paragraphautorefname}{subsubsubsection} } % --- @@ -321,6 +385,9 @@ \newcommand{\ABNTEXsubsubsectionfont}{\ABNTEXsubsectionfont} \newcommand{\ABNTEXsubsubsectionfontsize}{\normalsize} + +\newcommand{\ABNTEXsubsubsubsectionfont}{\ABNTEXsubsectionfont} +\newcommand{\ABNTEXsubsubsubsectionfontsize}{\normalsize} % --- % ------------------------------------------------------------------------ @@ -400,31 +467,215 @@ % --- % Estilos de caption -\captiondelim{\space--\space} -\captionnamefont{\ABNTEXfontereduzida} -\captiontitlefont{\ABNTEXfontereduzida} +\hangcaption +\captiondelim{~\textendash~} +%\captionnamefont{\ABNTEXfontereduzida} +%\captiontitlefont{\ABNTEXfontereduzida} + +% Para uso com pacotes subfig e caption dentro do memoir se estes forem carregados ou não. +% É necessário para que os comandos \IBGEtab e \fonte funcionem +% independente do carregamento de pacotes externos ao memoir que tratam captions. +\newcommand{\IBGEtabfontsize}{\ABNTEXfontereduzida} +\AtBeginDocument{% + % comandos auxiliares para manipular os captions dentro do comando \IBGEtab. + \newcommand{\configurecaptions}{\captionstyle[\raggedright]{}} + \newcommand{\configureseparator}{\captiondelim{: }} + % Define o comando \IBGEtab{}{}{} com caption e legenda da largura do conteúdo tabular, tabular*, etc + % Parece funcionar com qualque pacote + \newsavebox{\myptabbox} + \newlength{\myptabboxwidth} + \newcommand{\IBGEtab}[3]{% + \savebox{\myptabbox}{{\IBGEtabfontsize #2}}% + \settowidth{\myptabboxwidth}{\usebox{\myptabbox}}% + \centering% + \parbox{\myptabboxwidth}{% + \configurecaptions + #1% + \par% + {\IBGEtabfontsize% + #2% + }% + \par% + #3}% + } + \let\ibgetab\IBGEtab +} + +% Define o comando \fonte que respeita as configurações de caption do memoir ou do caption +\makeatletter +\newcommand{\fonte}[2][\fontename]{% + \M@gettitle{#2}% + \memlegendinfo{#2}% + \par + \begingroup + \@parboxrestore + \if@minipage + \@setminipage + \fi + \ABNTEXfontereduzida + \configureseparator + \@makecaption{\ABNTEXfontereduzida #1}{\ignorespaces\ABNTEXfontereduzida #2}\par + \endgroup} +\makeatother + +% Define o comando \notas que respeita as configurações de caption do memoir ou do caption +\makeatletter +\newcommand{\nota}[2][\notaname]{\fonte[#1]{#2}} +\makeatother + + +% Altera os comandos \configurecaptions e \configureseparator para trabalhar com +% o pacote caption e amigos. +\AtEndPackage{caption}{ + \AtBeginDocument{% + \DeclareCaptionLabelSeparator{barr}{~\textendash~} + \DeclareCaptionFont{ABNTEXfontereduzida}{\ABNTEXfontereduzida} + \captionsetup{format=hang, + labelseparator=barr, + %labelfont=ABNTEXfontereduzida, + %font=ABNTEXfontereduzida + } + \renewcommand{\configurecaptions}{% + \captionsetup{justification=justified,% + singlelinecheck=false}} + \renewcommand{\configureseparator}{\captionsetup{labelsep=colon}} + } +} % --- % ----- % Configuracoes do TOC % ----- -% nivel de profundidade -\setsecnumdepth{subsubsection} -\settocdepth{subsubsection} %\maxtocdepth{subsubsection} +% nivel de profundidade (implementa o quinto nivel - subsubsubsection) +\setsecnumdepth{paragraph} +\settocdepth{paragraph} +\setcounter{tocdepth}{5} +\setcounter{secnumdepth}{5} +\maxsecnumdepth{paragraph} + +% redefine os comandos *paragraph* para *subsubsubsection* **** +\newcommand{\subsubsubsection}{\paragraph} +\newcommand{\cftbeforesubsubsubsectionskip}{\cftbeforeparagraphskip} +\newcommand{\cftsubsubsubsectionfont}{\cftparagraphfont} +\newcommand{\setsubsubsubsecheadstyle}{\setparaheadstyle} + +\setafterparaskip{1.0\onelineskip plus 0.5\onelineskip minus 0.2\onelineskip} +\setparaheadstyle{\normalfont\sffamily\raggedright}% % lista de ilustracoes \renewcommand{\cftfigurename}{\figurename\space} -\renewcommand*{\cftfigureaftersnum}{~~--} +\renewcommand*{\cftfigureaftersnum}{\hfill\textendash\hfill} % lista de tabelas \renewcommand{\cfttablename}{\tablename\space} -\renewcommand*{\cfttableaftersnum}{~~--} +\renewcommand*{\cfttableaftersnum}{\hfill\textendash\hfill} % fonte das partes e do capitulo do TOC \renewcommand{\tocheadstart}{\ABNTEXchapterfont} % leaders para os capitulos \renewcommand*{\cftchapterdotsep}{\cftdotsep} + +% suprime espaço entre os itens de listings de diferentes capítulos +\setlength{\cftbeforechapterskip}{0pt plus 0pt} +\renewcommand*{\insertchapterspace}{} + +% macros para configurar o Sumário conforme 6027-2012 ou tradicional cft +\cftinsertcode{A}{} + +\newlength{\cftlastnumwidth} +\setlength{\cftlastnumwidth}{\cftsubsubsectionnumwidth+1em} + +\newcommand{\tocprintchapter}{} +\newcommand{\tocinnonumchapter}{} +\newcommand{\tocprintchapternonum}{} +\newcommand{\tocpartapendices}{} +\newcommand{\tocpartanexos}{} + +% insere o hifen no anexo/apendice do toc +\cftinsertcode{A}{\renewcommand{\cftchapteraftersnum}{\hfill\textendash\hfill}} + +% No caso de Sumario (TOC) tradicional +\ifthenelse{\boolean{ABNTEXsumario-tradicional}}{}{} % essa linha não faz nada, + % mas se houver necessidade de alterar o comportamento + % do sumário tradicional altere aqui. + +% No caso de Sumario (TOC) especifico da ABNT-6027-2012 + +\makeatletter +\ifthenelse{\boolean{ABNTEXsumario-abnt-6027-2012}}{ + \settocpreprocessor{chapter}{% + \let\tempf@rtoc\f@rtoc% + \def\f@rtoc{% + \texorpdfstring{\MakeTextUppercase{\tempf@rtoc}}{\tempf@rtoc}}% + } + \settocpreprocessor{part}{% + \let\tempf@rtoc\f@rtoc% + \def\f@rtoc{% + \texorpdfstring{\MakeTextUppercase{\tempf@rtoc}}{\tempf@rtoc}}% + } +}{} +\makeatother +% +\ifthenelse{\boolean{ABNTEXsumario-abnt-6027-2012}}{% + + \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} + % + \renewcommand{\tocprintchapter}{% + \addtocontents{toc}{\cftsetindents{chapter}{0em}{\cftlastnumwidth}}} + % + \renewcommand{\tocinnonumchapter}{% + \addtocontents{toc}{\cftsetindents{chapter}{\cftlastnumwidth}{2em}}% + \cftinserthook{toc}{A}} + % + \renewcommand{\tocprintchapternonum}{% + \addtocontents{toc}{\cftsetindents{chapter}{\cftlastnumwidth}{2em}}} + % + \renewcommand{\tocpartapendices}{% + \addtocontents{toc}{\cftsetindents{part}{\cftlastnumwidth}{2em}} + \cftinserthook{toc}{A}} + % + \renewcommand{\tocpartanexos}{% + \addtocontents{toc}{\cftsetindents{part}{\cftlastnumwidth}{2em}} + \cftinserthook{toc}{A}} + % + \setlength{\cftbeforechapterskip}{1em} + % + % Fontes das entradas do sumario + % + \renewcommand{\cftpartfont}{\bfseries\larger} + % + \renewcommand{\cftchapterfont}{\bfseries} + \renewcommand{\cftchapterpagefont}{\normalsize\cftchapterfont} + % + \renewcommand{\cftsectionfont}{\bfseries} + \renewcommand{\cftsectionpagefont}{\cftsectionfont} + % + \renewcommand{\cftsubsectionfont}{\normalsize} + \renewcommand{\cftsubsectionpagefont}{\cftsubsectionfont} + % + \renewcommand{\cftsubsubsectionfont}{\smaller} + \renewcommand{\cftsubsubsectionpagefont}{\cftsubsubsectionfont} + % + \renewcommand{\cftparagraphfont}{\smaller\smaller} + \renewcommand{\cftparagraphpagefont}{\cftparagraphfont} +}{} + +% Comando que simula a finalizacao de uma parte no bookmark e +% adiciona espaco de \part no sumario +\newcommand{\phantompart}{% + \bookmarksetup{startatroot}% + \phantomsection% + \ifthenelse{\boolean{ABNTEXsumario-abnt-6027-2012}}{% + \addtocontents{toc}{\vspace{\cftbeforechapterskip}}}{% + \addtocontents{toc}{\vspace{\cftbeforepartskip}}}% +} % ----- % --- @@ -436,7 +687,9 @@ \makechapterstyle{abnt}{% \renewcommand{\chapterheadstart}{} - \newlength{\chapternamenumlength} + \ifx \chapternamenumlength \undefined + \newlength{\chapternamenumlength} + \fi % tamanhos de fontes de chapter e part \ifthenelse{\equal{\ABNTEXisarticle}{true}}{% @@ -452,10 +705,11 @@ \renewcommand{\partnumfont}{\ABNTEXpartfont\ABNTEXpartfontsize} \renewcommand{\partnamefont}{\ABNTEXpartfont\ABNTEXpartfontsize} - % tamanhos de fontes de section, subsection e subsubsection + % 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}{} @@ -470,25 +724,32 @@ \def\printchaptertitle##1{% \chaptitlefont% \ifthenelse{\boolean{abntex@innonumchapter}}{\centering\ABNTEXchapterupperifneeded{##1}}{% - % else - \settowidth{\chapternamenumlength}{\printchaptername\printchapternum\afterchapternum}% - \parbox[t]{\columnwidth-\chapternamenumlength}{\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}}}% + } } % impressao do numero do capitulo \renewcommand{\printchapternum}{% + \tocprintchapter \setboolean{abntex@innonumchapter}{false} \chapnumfont% \space\thechapter\space% \ifthenelse{\boolean{abntex@apendiceousecao}}{% - --\space% + \tocinnonumchapter + ~\textendash~% }{} % else } \renewcommand{\afterchapternum}{} % impressao do capitulo nao numerado \renewcommand\printchapternonum{% + \tocprintchapternonum \setboolean{abntex@innonumchapter}{true}% } } @@ -540,9 +801,7 @@ % --- % Configura layout para elementos pos-textuais -\newcommand{\postextual}{% - \bookmarksetup{startatroot}% -} +\newcommand{\postextual}{\phantompart} \renewcommand{\backmatter}{\postextual} % ----- @@ -561,6 +820,8 @@ \newcommand{\imprimirautor}{\theauthor} % Comandos de dados - data +\let\olddate\date +\renewcommand{\date}[1]{\AtBeginDocument{\olddate{#1}}} \newcommand{\data}[1]{\date{#1}} \newcommand{\imprimirdata}{\thedate} @@ -660,12 +921,30 @@ % --- % Resumo e abstracts em diferentes idiomas - NBR 14724/2011 + +% altera as margens padrões do memoir para abstract caso nao seja article +\ifthenelse{\equal{\ABNTEXisarticle}{true}}{% + % em artigos, margens e fontes são as mesmas de memoir + }{ % else + % Ajusta as margens para serem a mesma do documento + \setlength\absleftindent{0cm} + \setlength\absrightindent{0cm} + % Garante que a fonte do texto do abstract será a mesma do documento, pois + % na classe memoir está \small + \renewcommand{\abstracttextfont}{\normalfont\normalsize} + } + +% A norma não diz nada sobre identação e separação entre parágrafos no abstract, +% porém o uso mostra que muitos abstracts são montados sem identação. +\AtBeginDocument{% + \setlength{\absparindent}{0pt} +} + \newenvironment{resumo}[1][\resumoname]{% \PRIVATEbookmarkthis{#1} \renewcommand{\abstractnamefont}{\chaptitlefont} \renewcommand{\abstractname}{\ABNTEXchapterupperifneeded{#1}} \begin{abstract} - \SingleSpacing }{\end{abstract}\PRIVATEclearpageifneeded} \newenvironment{resumoumacoluna}[1][\resumoname]{% @@ -673,7 +952,6 @@ \renewcommand{\abstractnamefont}{\chaptitlefont} \renewcommand{\abstractname}{\ABNTEXchapterupperifneeded{#1}} \begin{onecolabstract} - \SingleSpacing }{\end{onecolabstract}\PRIVATEclearpageifneeded} % --- @@ -718,9 +996,11 @@ \newcommand{\PRIVATEapendiceconfig}[2]{% \setboolean{abntex@apendiceousecao}{true}% \renewcommand{\appendixname}{#1} + \ifthenelse{\boolean{ABNTEXsumario-abnt-6027-2012}}{ + \renewcommand{\appendixtocname}{\uppercase{#2}} + }{% + \renewcommand{\appendixtocname}{#2}} \renewcommand{\appendixpagename}{#2} - \renewcommand{\appendixtocname}{#2} - \switchchapname{#1}% Corrected from \switchapname -> \switchchapname \renewcommand*{\cftappendixname}{#1 \space} } @@ -771,15 +1051,19 @@ \newcommand{\partpage}{% \cleardoublepage \phantomsection - \addcontentsline{toc}{part}{\appendixpagename} + \addcontentsline{toc}{part}{\appendixtocname}% \appendixpage* } % atalhos para \partpage ou \appendixpage* \makeatletter -\newcommand{\partapendices}{\@ifstar{\appendixpage*}{\partpage}} - -\newcommand{\partanexos}{\@ifstar{\appendixpage*}{\partpage}} +\newcommand{\partapendices}{% +\tocpartapendices% +\@ifstar{\appendixpage*}{\partpage}} + +\newcommand{\partanexos}{% +\tocpartanexos% +\@ifstar{\appendixpage*}{\partpage}} \makeatother % --- @@ -800,7 +1084,7 @@ } \newenvironment*{citacao}[1][default]{% \list{}% - \footnotesize% + \ABNTEXfontereduzida% \addtolength{\leftskip}{\ABNTEXcitacaorecuo}% \item[]% \begin{SingleSpace}% @@ -862,16 +1146,15 @@ \newcommand{\imprimircapa}{% \begin{capa}% \center - %\vspace*{1cm} - {\ABNTEXchapterfont\large\imprimirautor} + \ABNTEXchapterfont\large\imprimirautor - \vspace*{\fill} - {\ABNTEXchapterfont\bfseries\LARGE\imprimirtitulo} - \vspace*{\fill} + \vfill + \ABNTEXchapterfont\bfseries\LARGE\imprimirtitulo + \vfill - {\large\imprimirlocal} - \par - {\large\imprimirdata} + \large\imprimirlocal + + \large\imprimirdata \vspace*{1cm} \end{capa} @@ -896,11 +1179,13 @@ %\vspace*{1cm} {\ABNTEXchapterfont\large\imprimirautor} - + \vspace*{\fill}\vspace*{\fill} - {\ABNTEXchapterfont\bfseries\Large\imprimirtitulo} + \begin{center} + \ABNTEXchapterfont\bfseries\Large\imprimirtitulo + \end{center} \vspace*{\fill} - + \abntex@ifnotempty{\imprimirpreambulo}{% \hspace{.45\textwidth} \begin{minipage}{.5\textwidth} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/abntex2/abntex2abrev.sty new/tex/latex/abntex2/abntex2abrev.sty --- old/tex/latex/abntex2/abntex2abrev.sty 2013-05-28 01:08:58.000000000 +0200 +++ new/tex/latex/abntex2/abntex2abrev.sty 2014-01-26 22:57:28.000000000 +0100 @@ -1,5 +1,5 @@ -%% abntex2abrev.sty, v-1.7.1 laurocesar -%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ +%% abntex2abrev.sty, v-1.9.2 laurocesar +%% Copyright 2012-2014 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/abntex2/abntex2cite.sty new/tex/latex/abntex2/abntex2cite.sty --- old/tex/latex/abntex2/abntex2cite.sty 2013-05-28 01:08:58.000000000 +0200 +++ new/tex/latex/abntex2/abntex2cite.sty 2014-01-26 22:57:28.000000000 +0100 @@ -1,5 +1,5 @@ -%% abntex2cite.sty, v-1.7.1 laurocesar -%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ +%% abntex2cite.sty, v-1.9.2 laurocesar +%% Copyright 2012-2014 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -21,6 +21,9 @@ %% %% Revision history: %% +%% 2014/1/26 7h58 laurocesar +%% Adiciona \ProvidesPackage +%% %% 2013/05/22 07h05 laurocesar %% Adiciona a macro \footciteref para referências em notas de rodapé. %% @@ -174,11 +177,12 @@ %\input{cvs-id.def} %\CVSExtract$Id: abntcite.sty,v 1.26 2003/10/13 09:40:41 gweber Exp $ %\CVSPackage{abntcite}{\space Chamadas de referencias no texto (NBR10520)} %substitui \ProvidesPackage (replaces \ProvidesPackage) - +\ProvidesPackage{abntex2cite}[2014/01/26 v1.9.2 abnTeX2] \RequirePackage{ifthen} \RequirePackage{calc} \RequirePackage{abntex2abrev} -\RequirePackage{setspace} %***** +\RequirePackage{setspace} +\RequirePackage{url} %***** %%%%%% Options Declaration %%%%%% @@ -365,10 +369,16 @@ \provideboolean{ABNThyperref} \@ifpackageloaded{hyperref}{% -\addtociteoptionlist{abnt-url-package=hyperref} +%\addtociteoptionlist{abnt-url-package=hyperref} \setboolean{ABNThyperref}{true} }{\setboolean{ABNThyperref}{false}} +\@ifpackageloaded{url}{% +\addtociteoptionlist{abnt-url-package=url} +\def\UrlLeft{<} +\def\UrlRight{>} +\urlstyle{same}} + \provideboolean{ABNTbackref} %By AWSS \@ifpackageloaded{backref}{% %By AWSS @@ -377,6 +387,25 @@ \ProcessOptions +% Check if not running pdf/xe/lua/htlatex, then load breakurl +% From http://tex.stackexchange.com/a/53943 +\RequirePackage{ifpdf,ifxetex} +\edef\texforht{TT\noexpand\fi + \@ifpackageloaded{tex4ht} + {\noexpand\iftrue} + {\noexpand\iffalse}} +\ifpdf +\else + \ifxetex + \else + \if\texforht + \else + \@ifpackageloaded{hyperref} + {\RequirePackage{breakurl}}{} + \fi% texforht + \fi% xetex +\fi% pdftex + % really foot? \ifthenelse{\boolean{ABCIfoot}\and\equal{\AbntCitetype}{num}} {\setboolean{ABCIfoot}{true}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/abntex2.tlpobj new/tlpkg/tlpobj/abntex2.tlpobj --- old/tlpkg/tlpobj/abntex2.tlpobj 2013-05-28 17:06:48.000000000 +0200 +++ new/tlpkg/tlpobj/abntex2.tlpobj 2014-01-27 03:22:54.000000000 +0100 @@ -1,6 +1,6 @@ name abntex2 category Package -revision 30737 +revision 32794 shortdesc Typeset technical and scientific Brazilian documents based on ABNT rules. relocated 1 longdesc The bundle provides support for writing technical and @@ -8,7 +8,7 @@ longdesc reports, research project and others) based on ABNT rules longdesc (Associacao Brasileira de Normas Tecnicas). It replaces the old longdesc abntex. -runfiles size=55 +runfiles size=58 RELOC/bibtex/bib/abntex2/abntex2-options.bib RELOC/bibtex/bst/abntex2/abntex2-alf.bst RELOC/bibtex/bst/abntex2/abntex2-num.bst @@ -16,6 +16,6 @@ RELOC/tex/latex/abntex2/abntex2abrev.sty RELOC/tex/latex/abntex2/abntex2cite.sty catalogue-ctan /macros/latex/contrib/abntex2 -catalogue-date 2013-05-27 20:07:27 +0200 +catalogue-date 2014-01-26 14:22:53 +0100 catalogue-license lppl1.3 -catalogue-version 1.7.1 +catalogue-version 1.9.2 ++++++ achemso.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/achemso/README new/doc/latex/achemso/README --- old/doc/latex/achemso/README 2010-01-17 00:45:27.000000000 +0100 +++ new/doc/latex/achemso/README 2013-06-29 00:23:53.000000000 +0200 @@ -1,42 +1,36 @@ ----------------------------------------------------------------- -achemso --- Support for submissions to American Chemical Society - journals -E-mail: [email protected] -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------- - -The achemso bundle provides a LaTeX class file and BibTeX style -file in accordance with the requirements of the American -Chemical Society (ACS). The files can be used for any documents, +achemso - Support for submissions to American Chemical Society journals +======================================================================= + +The `achemso` bundle provides a LaTeX class file and BibTeX +style file in accordance with the requirements of the American +Chemical Society (ACS). The files can be used for any documents, but have been carefully designed and tested to be suitable for submission to ACS journals. -The bundle also includes the natmove package. This package is -loaded by achemso, and provides automatic moving of superscript -citations after punctuation. +The bundle also includes the `natmove` package. This package is +loaded by `achemso`, and provides automatic moving of +superscript citations after punctuation. Installation ------------ -The package is supplied in dtx format and as a pre-extracted zip -file, achemso.tds.zip. The later is most convenient for most -users: simply unzip this in your local texmf directory and run -texhash to update the database of file locations. If you want to -unpack the dtx yourself, running 'tex achemso.dtx' will extract -the package whereas 'latex achemso.dtx will extract it and also -typeset the documentation. +The package is supplied in `.dtx` format and as a pre-extracted +`.zip` file, `achemso.tds.zip`. The later is most convenient for +most users: simply unzip this in your local `texmf` directory. +If you want to unpack the `.dtx` yourself, running `tex +achemso.dtx` will extract the package whereas `latex +achemso.dtx` will extract it and also typeset the documentation. Typesetting the documentation requires a number of packages in addition to those needed to use the package. This is mainly because of the number of demonstration items included in the text. To compile the documentation without error, you will need the packages: - - array - - booktabs - - hypdoc - - listings - - lmodern - - mathpazo - - microtype + - `array` + - `booktabs` + - `hypdoc` + - `listings` + - `lmodern` + - `mathpazo` + - `microtype` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/achemso/achemso-demo.bib new/doc/latex/achemso/achemso-demo.bib --- old/doc/latex/achemso/achemso-demo.bib 2013-03-09 01:16:16.000000000 +0100 +++ new/doc/latex/achemso/achemso-demo.bib 1970-01-01 01:00:00.000000000 +0100 @@ -1,153 +0,0 @@ - -@ARTICLE{Abernethy2003, - author = {Colin D. Abernethy and Gareth M. Codd and Mark D. Spicer - and Michelle K. Taylor}, - title = {{A} highly stable {N}-heterocyclic carbene complex of - trichloro-oxo-vanadium(\textsc{v}) displaying novel - {C}l---{C}(carbene) bonding interactions}, - journal = {{J}. {A}m. {C}hem. {S}oc.}, - year = {2003}, - volume = {125}, - pages = {1128--1129}, - number = {5}, - doi = {10.1021/ja0276321}, -} - -@MISC{ACS2007, - url = {http://pubs.acs.org/books/references.shtml}, -} - -@ARTICLE{Arduengo1992, - author = {Arduengo, III, Anthony J. and H. V. Rasika Dias and - Richard L. Harlow and Michael Kline}, - title = {{E}lectronic stabilization of nucleophilic carbenes}, - journal = {{J}.~{A}m.\ {C}hem.\ {S}oc.}, - year = {1992}, - volume = {114}, - pages = {5530--5534}, - number = {14}, - doi = {10.1021/ja00040a007}, -} - -@ARTICLE{Arduengo1994, - author = {Arduengo, III, Anthony J. and Siegfried F. Gamper and - Joseph C. Calabrese and Fredric Davidson}, - title = {{L}ow-coordinate carbene complexes of nickel(0) and - platinum(0)}, - journal = jacsat, - year = {1994}, - volume = {116}, - pages = {4391--4394}, - number = {10}, - doi = {10.1021/ja00089a029}, -} - -@ARTICLE{Eisenstein2005, - author = {Appelhans, Leah N. and Zuccaccia, Daniele and Kovacevic, - Anes and Chianese, Anthony R. and Miecznikowski, John R. and - Macchioni, Aleco and Clot, Eric and Eisenstein, Odile and - Crabtree, Robert H.}, - title = {{A}n anion-dependent switch in selectivity results from a - change of {C}---{H} activation mechanism in the reaction of an - imidazolium salt with \ce{IrH5(PPh3)2}}, - journal = {{J}.~{A}m.\ {C}hem. {S}oc.}, - year = {2005}, - volume = {127}, - pages = {16299--16311}, - number = {46}, - doi = {10.1021/ja055317j}, -} - -@BOOK{Coghill2006, - title = {{T}he {ACS} {S}tyle {G}uide}, - publisher = {{O}xford {U}niversity {P}ress, {I}nc. and - {T}he {A}merican {C}hemical {S}ociety}, - year = {2006}, - editor = {Coghill, Anne M. and Garson, Lorrin R.}, - address = {{N}ew {Y}ork}, - edition = {3}, - subtitle = {{E}ffective {C}ommunication of {S}cientific - {I}nformation}, -} - -@BOOK{Cotton1999, - title = {{A}dvanced {I}norganic {C}hemistry}, - publisher = {Wiley}, - year = {1999}, - author = {Cotton, Frank Albert and Wilkinson, Geoffrey and - Murillio, Carlos A. and Bochmann, Manfred}, - address = {Chichester, United Kingdom}, - edition = {6}, -} - -@TECHREPORT{EuropeanCommission2008, - address = {Brussels, Belgium}, - organization = {European Commission}, - title = {Communication from the European Commission to the - European Council and the European Parliament: - 20 20 by 2020: Europe's climate change opportunity}, - year = {2008} -} - -@INBOOK{Friedman-Hill2003, - author = {E. Friedman-Hill}, - booktitle = {{J}ess in {A}ction: {J}ava {R}ule-based {S}ystems}, - publisher = {Manning Publications Co.}, - address = {Greenwich, CT, USA}, - title = {Writing Rules in Jess}, - edition = {1}, - year = {2003} -} - -@PATENT{Johnson1972, - author = {Johnson, Alexander Lawrence}, - organization = {E.~I.~du Pont de Nemours}, - number = {3637731}, - title = {1-(Alkylsubstituted phenyl)imidazoles useful in ACTH - reverse assay}, - type = {US~Patent}, - year = {1972} -} - -@MANUAL{Pople2003, - title = {{G}aussian 03}, - author = {M.~J. Frisch and G.~W. Trucks and H.~B. Schlegel and G.~E. Scuseria -and M.~A. Robb and J.~R. Cheeseman and Montgomery and Jr. and J. -A. and T. Vreven and K.~N. Kudin and J.~C. Burant and J.~M. Millam -and S.~S. Iyengar and J. Tomasi and V. Barone and B. Mennucci and -M. Cossi and G. Scalmani and N. Rega and G.~A. Petersson and H. Nakatsuji -and M. Hada and M. Ehara and K. Toyota and R. Fukuda and J. Hasegawa -and M. Ishida and T. Nakajima and Y. Honda and O. Kitao and H. Nakai -and M. Klene and X. Li and J.~E. Knox and H.~P. Hratchian and J.~B. -Cross and V. Bakken and C. Adamo and J. Jaramillo and R. Gomperts -and R.~E. Stratmann and O. Yazyev and A.~J. Austin and R. Cammi and -C. Pomelli and J.~W. Ochterski and P.~Y. Ayala and K. Morokuma and -G.~A. Voth and P. Salvador and J.~J. Dannenberg and V.~G. Zakrzewski -and S. Dapprich and A.~D. Daniels and M.~C. Strain and O. Farkas -and D.~K. Malick and A.~D. Rabuck and K. Raghavachari and J.~B. Foresman -and J.~V. Ortiz and Q. Cui and A.~G. Baboul and S. Clifford and J. -Cioslowski and B.~B. Stefanov and G. Liu and A. Liashenko and P. -Piskorz and I. Komaromi and R.~L. Martin and D.~J. Fox and T. Keith -and M.~A. Al-Laham and C.~Y. Peng and A. Nanayakkara and M. Challacombe -and P.~M.~W. Gill and B. Johnson and W. Chen and M.~W. Wong and C. -Gonzalez and J.~A. Pople}, - organization = {Gaussian, Inc.}, - address = {Wallingford, CT}, - year = {2004}, - howpublished = {Gaussian, Inc., Wallingford, CT, USA}, - institution = {Gaussian, Inc.}, - publisher = {Gaussian, Inc.} -} - -@ARTICLE{Mena2000, - author = {Angel Abarca and Pilar G\'omez-Sal and Avelino Mart\'in - and Miguel Mena and Josep Mar\'ia Poblet and Carlos Y\'elamos}, - title = {{A}mmonolysis of mono(pentamethylcyclopentadienyl) - titanium(\textsc{iv}) derivatives}, - journal = {Inorg. Chem.}, - year = {2000}, - volume = {39}, - pages = {642--651}, - number = {4}, - doi = {10.1021/ic9907718}, -} Files old/doc/latex/achemso/achemso-demo.pdf and new/doc/latex/achemso/achemso-demo.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/achemso/achemso-demo.tex new/doc/latex/achemso/achemso-demo.tex --- old/doc/latex/achemso/achemso-demo.tex 2012-01-13 00:17:41.000000000 +0100 +++ new/doc/latex/achemso/achemso-demo.tex 2013-09-16 00:33:25.000000000 +0200 @@ -90,12 +90,41 @@ \abbreviations{IR,NMR,UV} \keywords{American Chemical Society, \LaTeX} -\begin{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% The manuscript does not need to include \maketitle, which is -%% executed automatically. The document should begin with an -%% abstract, if appropriate. If one is given and should not be, the -%% contents will be gobbled. +%% executed automatically. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\begin{document} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% The "tocentry" environment can be used to create an entry for the +%% graphical table of contents. It is given here as some journals +%% require that it is printed as part of the abstract page. It will +%% be automatically moved as appropriate. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\begin{tocentry} + +Some journals require a graphical entry for the Table of Contents. +This should be laid out ``print ready'' so that the sizing of the +text is correct. + +Inside the \texttt{tocentry} environment, the font used is Helvetica +8\,pt, as required by \emph{Journal of the American Chemical +Society}. + +The surrounding frame is 9\,cm by 3.5\,cm, which is the maximum +permitted for \emph{Journal of the American Chemical Society} +graphical table of content entries. The box will not resize if the +content is too big: instead it will overflow the edge of the box. + +This box and the associated title will always be printed on a +separate page at the end of the document. + +\end{tocentry} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% The abstract environment will automatically gobble the contents +%% if an abstract is not used by the target journal. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{abstract} This is an example document for the \textsf{achemso} document @@ -148,7 +177,8 @@ encounter problems with the citation macros, please check that your copy of \textsf{natbib} is up to date. The demonstration database file \texttt{achemso-demo.bib} shows how to complete -entries correctly. +entries correctly. Notice that ``\latin{et al.}'' is auto-formatted +using the \texttt{\textbackslash latin} command. Multiple citations to be combined into a list can be given as a single citation. This uses the \textsf{mciteplus} package @@ -338,29 +368,4 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \bibliography{achemso-demo} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% The "tocentry" environment can be used to create an entry for the -%% graphical table of contents. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\begin{tocentry} - -Some journals require a graphical entry for the Table of Contents. -This should be laid out ``print ready'' so that the sizing of the -text is correct. - -Inside the \texttt{tocentry} environment, the font used is Helvetica -8\,pt, as required by \emph{Journal of the American Chemical -Society}. - -The surrounding frame is 9\,cm by 3.5\,cm, which is the maximum -permitted for \emph{Journal of the American Chemical Society} -graphical table of content entries. The box will not resize if the -content is too big: instead it will overflow the edge of the box. - -This box and the associated title will always be printed on a -separate page at the end of the document. - -\end{tocentry} - \end{document} Files old/doc/latex/achemso/achemso.pdf and new/doc/latex/achemso/achemso.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/achemso.doc.tlpobj new/tlpkg/tlpobj/achemso.doc.tlpobj --- old/tlpkg/tlpobj/achemso.doc.tlpobj 2013-04-16 20:01:39.000000000 +0200 +++ new/tlpkg/tlpobj/achemso.doc.tlpobj 2014-05-15 03:24:38.000000000 +0200 @@ -1,11 +1,10 @@ name achemso.doc category Package -revision 29938 +revision 34034 shortdesc doc files of achemso relocated 1 -docfiles size=123 +docfiles size=108 RELOC/doc/latex/achemso/README - RELOC/doc/latex/achemso/achemso-demo.bib RELOC/doc/latex/achemso/achemso-demo.pdf RELOC/doc/latex/achemso/achemso-demo.tex RELOC/doc/latex/achemso/achemso.pdf ++++++ achemso.tar.xz ++++++ ++++ 1666 lines of diff (skipped) ++++++ acro.doc.tar.xz ++++++ ++++ 2276 lines of diff (skipped) ++++++ acro.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/acro/acro.sty new/tex/latex/acro/acro.sty --- old/tex/latex/acro/acro.sty 2013-05-12 00:52:12.000000000 +0200 +++ new/tex/latex/acro/acro.sty 2013-12-19 23:49:47.000000000 +0100 @@ -28,11 +28,11 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -\RequirePackage{expl3,xparse,l3keys2e,xtemplate} +\RequirePackage{expl3,l3sort,xparse,l3keys2e,xtemplate} \ProvidesExplPackage {acro} - {2013/05/09} - {1.3a} + {2013/12/18} + {1.5} {Typeset Acronyms} % -------------------------------------------------------------------------- @@ -130,7 +130,7 @@ % -------------------------------------------------------------------------- % boolean variables: \bool_new:N \l__acro_mark_as_used_bool -\bool_new:N \l__acro_mark_first_as_used_bool +\bool_new:N \g__acro_mark_first_as_used_bool \bool_new:N \l__acro_use_single_bool \bool_new:N \l__acro_print_only_used_bool \bool_set_true:N \l__acro_print_only_used_bool @@ -169,7 +169,11 @@ \bool_new:N \l__acro_first_reversed_bool \bool_new:N \l__acro_use_note_bool \bool_new:N \l__acro_extra_punct_bool -\bool_new:N \l__acro_extra_use_brackets_bool +\bool_new:N \l__acro_extra_use_brackets_bool +\bool_new:N \l__acro_in_list_bool +\bool_new:N \l__acro_place_label_bool +\bool_new:N \l__acro_list_all_pages_bool +\bool_set_true:N \l__acro_list_all_pages_bool % -------------------------------------------------------------------------- % token list variables: @@ -236,6 +240,9 @@ \tl_new:N \l__acro_index_short_tl \tl_new:N \l__acro_index_format_tl \tl_new:N \l__acro_acc_supp_tl +\tl_new:N \l__acro_acc_supp_options_tl +\tl_new:N \l__acro_label_prefix_tl +\tl_set:Nn \l__acro_label_prefix_tl { ac: } % -------------------------------------------------------------------------- % comma list variables @@ -247,10 +254,11 @@ \prop_new:N \l__acro_alt_prop \prop_new:N \l__acro_sort_prop \prop_new:N \l__acro_long_prop +\prop_new:N \l__acro_list_prop \prop_new:N \l__acro_class_prop -\prop_new:N \l__acro_replace_plural_prop \prop_new:N \l__acro_short_plural_prop \prop_new:N \l__acro_long_plural_prop +\prop_new:N \l__acro_replace_long_plural_prop \prop_new:N \l__acro_short_indefinite_prop \prop_new:N \l__acro_long_indefinite_prop \prop_new:N \l__acro_alt_indefinite_prop @@ -287,6 +295,9 @@ \cs_new_eq:NN \acro_first_upper_case:n \__acro_first_upper_case:n +\NewDocumentCommand \acfirstupper { m } + { \acro_first_upper_case:n { #1 } } + % -------------------------------------------------------------------------- % versioning: \clist_put_right:Nn \l__acro_versions_clist { 0 } @@ -313,6 +324,7 @@ { version .code:n = \__acro_select_version:n { #1 } , accsupp .bool_set:N = \l__acro_acc_supp_bool , + accsupp-options .tl_set:N = \l__acro_acc_supp_options_tl , macros .bool_set:N = \l__acro_create_macros_bool , xspace .bool_set:N = \l__acro_xspace_bool , strict .bool_set:N = \l__acro_strict_bool , @@ -335,6 +347,14 @@ single .bool_set:N = \l__acro_use_single_bool , first-style .tl_set:N = \l__acro_first_instance_tl , extra-style .tl_set:N = \l__acro_extra_instance_tl , + label .bool_set:N = \l__acro_place_label_bool , + label-prefix .tl_set:N = \l__acro_label_prefix_tl , + pages .choice: , + pages / all .code:n = + \bool_set_true:N \l__acro_list_all_pages_bool , + pages / first .code:n = + \bool_set_true:N \l__acro_place_label_bool + \bool_set_false:N \l__acro_list_all_pages_bool , page-ref .tl_set:N = \l__acro_page_instance_tl , page-name .tl_set:N = \l__acro_page_name_tl , pages-name .tl_set:N = \l__acro_pages_name_tl , @@ -360,9 +380,9 @@ only-used .bool_set:N = \l__acro_print_only_used_bool , mark-as-used .choice: , mark-as-used / first .code:n = - \bool_set_true:N \l__acro_mark_first_as_used_bool , + \bool_gset_true:N \g__acro_mark_first_as_used_bool , mark-as-used / any .code:n = - \bool_set_false:N \l__acro_mark_first_as_used_bool , + \bool_gset_false:N \g__acro_mark_first_as_used_bool , plural-ending .tl_set:N = \l__acro_default_plural_tl , list-caps .bool_set:N = \l__acro_capitalize_list_bool , cite .choice: , @@ -414,7 +434,7 @@ \bool_if:NTF \l__acro_custom_format_bool { \l__acro_custom_format_tl } { \l__acro_short_format_tl } - { \hbox:n { #1 } } + { #1 } \group_end: \bool_if:NT \l__acro_use_plural_bool { \tl_use:N \l__acro_short_plural_tl } @@ -461,16 +481,18 @@ \cs_new_protected:Npn \__acro_make_link:nNN #1#2#3 { - \tl_set:Nn #2 - { - \acro_hyper_link:nn { #1 } { \phantom { #3 } } - \__acro_is_single:nTF { #1 } { \hbox_overlap_left:n { #3 } } + \bool_if:nTF + { \l__acro_use_hyperref_bool && \l__acro_hyperref_loaded_bool } + { + \tl_set:Nn #2 { - \bool_if:nTF { \l__acro_use_hyperref_bool && \l__acro_hyperref_loaded_bool } - { \acro_color_link:n { \hbox_overlap_left:n { #3 } } } + \acro_hyper_link:nn { #1 } { \phantom { #3 } } + \__acro_is_single:nTF { #1 } { \hbox_overlap_left:n { #3 } } + { \acro_color_link:n { \hbox_overlap_left:n { #3 } } } } } + { \tl_set:Nn #2 { #3 } } } \cs_new:Npn \acro_color_link:n #1 @@ -888,7 +910,12 @@ \AtBeginDocument { - \tl_if_eq:NNT \l__acro_active_version_tl \l__acro_version_zero_tl + \bool_if:nT + { + \tl_if_eq_p:NN \l__acro_active_version_tl \l__acro_version_zero_tl + || + !\l__acro_list_all_pages_bool + } { \cs_set:Npn \acro_print_page_numbers:n #1 { @@ -896,7 +923,7 @@ \skip_horizontal:N \l__acro_page_space_dim \acro_no_break: \tl_use:N \l__acro_page_name_tl - \pageref{ac:#1} + \pageref{\l__acro_label_prefix_tl #1} } } } @@ -1039,8 +1066,17 @@ \acro_get:n { ##1 } \bool_if:nT { - ( \l__acro_use_single_bool && \cs_if_exist_p:c { acro@##1@twice } ) || - ( !\l__acro_use_single_bool && \cs_if_exist_p:c { acro@##1@once } && \l__acro_print_only_used_bool ) || + \bool_if_p:c { g__acro_##1_in_list_bool } && + ( + ( \l__acro_use_single_bool && \cs_if_exist_p:c { acro@##1@twice } ) + || + ( + !\l__acro_use_single_bool && + \cs_if_exist_p:c { acro@##1@once } && + \l__acro_print_only_used_bool + ) + ) + || ( !\l__acro_use_single_bool && !\l__acro_print_only_used_bool ) } { @@ -1094,6 +1130,7 @@ { foreign-sep = \l__acro_foreign_sep_tl } { \AssignTemplateKeys + \bool_set_true:N \l__acro_in_list_bool \__acro_activate_hyperref_support: \cs_set:Npn \acro_print_list_short:nn ##1##2 { @@ -1111,7 +1148,11 @@ \cs_set:Npn \acro_print_list_long:n ##1 { \__acro_write_long:Nf \l__acro_list_long_format_tl - { \prop_get:Nn \l__acro_long_prop { ##1 } } + { + \prop_if_in:NnTF \l__acro_list_prop { ##1 } + { \prop_get:Nn \l__acro_list_prop { ##1 } } + { \prop_get:Nn \l__acro_long_prop { ##1 } } + } \__acro_cite_if:Nn \l__acro_citation_all_bool { ##1 } } \cs_set_protected:Npn \acro_print_list_extra:n ##1 @@ -1163,7 +1204,11 @@ \cs_set:Npn \acro_print_list_long:n ##1 { \__acro_write_long:Nf \l__acro_list_long_format_tl - { \prop_get:Nn \l__acro_long_prop { ##1 } } + { + \prop_if_in:NnTF \l__acro_list_prop { ##1 } + { \prop_get:Nn \l__acro_list_prop { ##1 } } + { \prop_get:Nn \l__acro_long_prop { ##1 } } + } \__acro_cite_if:Nn \l__acro_citation_all_bool { ##1 } } \cs_set_protected:Npn \acro_print_list_extra:n ##1 @@ -1214,7 +1259,11 @@ \cs_set:Npn \acro_print_list_long:n ##1 { \__acro_write_long:Nf \l__acro_list_long_format_tl - { \prop_get:Nn \l__acro_long_prop { ##1 } } + { + \prop_if_in:NnTF \l__acro_list_prop { ##1 } + { \prop_get:Nn \l__acro_list_prop { ##1 } } + { \prop_get:Nn \l__acro_long_prop { ##1 } } + } \__acro_cite_if:Nn \l__acro_citation_all_bool { ##1 } & } @@ -1265,7 +1314,11 @@ \bool_if:NT \l__acro_capitalize_list_bool { \bool_set_true:N \l__acro_first_upper_bool } \__acro_write_long:Nf \l__acro_long_format_tl - { \prop_get:Nn \l__acro_long_prop { ##1 } } + { + \prop_if_in:NnTF \l__acro_list_prop { ##1 } + { \prop_get:Nn \l__acro_list_prop { ##1 } } + { \prop_get:Nn \l__acro_long_prop { ##1 } } + } \__acro_cite_if:Nn \l__acro_citation_all_bool { ##1 } & } @@ -1345,7 +1398,7 @@ } } -\prg_new_conditional:Npnn \__acro_is_single:n #1 { T,TF } +\prg_new_conditional:Npnn \__acro_is_single:n #1 { p,T,TF } { \bool_if:nTF { !\l__acro_use_single_bool || \cs_if_exist_p:c { acro@#1@twice } } { \prg_return_false: } { \prg_return_true: } @@ -1368,6 +1421,8 @@ \cs_new_protected:Npn \acro_get:n #1 { + \bool_if:NF \l__acro_in_list_bool + { \leavevmode } \acro_defined:n { #1 } \__acro_activate_hyperref_support: \prop_get:NnNF \l__acro_short_prop { #1 } \l__acro_tmpa_tl {} @@ -1397,7 +1452,7 @@ { \bool_if:NT \l__acro_use_plural_bool { - \bool_if:nTF { \prop_get:Nn \l__acro_replace_plural_prop { #1 } } + \bool_if:nTF { \prop_get:Nn \l__acro_replace_long_plural_prop { #1 } } { \prop_get:NnNF \l__acro_long_plural_prop { #1 } \l__acro_long_tl {} } { \tl_put_right:Nn \l__acro_long_tl @@ -1417,53 +1472,66 @@ ( ( \bool_if_p:c { g__acro_#1_first_use_bool } && - \l__acro_mark_first_as_used_bool + \g__acro_mark_first_as_used_bool ) || - ! \l__acro_mark_first_as_used_bool + ! \g__acro_mark_first_as_used_bool ) } { - \bool_if:NTF \l__acro_mark_as_used_bool - { - \iow_shipout_x:Nn \@auxout - { - \token_to_str:N \acro@used@twice { #1 } - { \thepage } - { \arabic{page} } - { \arabic{abspage} } - } - } - { - \iow_shipout_x:Nn \@auxout - { \token_to_str:N \acro@used@twice { #1 } {} {} {} } - } + \if@filesw + \bool_if:NTF \l__acro_mark_as_used_bool + { + \iow_shipout_x:Nn \@auxout + { + \token_to_str:N \acro@used@twice { #1 } + { \thepage } + { \arabic{page} } + { \arabic{abspage} } + } + } + { + \iow_shipout_x:Nn \@auxout + { \token_to_str:N \acro@used@twice { #1 } {} {} {} } + } + \fi \prg_return_true: } { \bool_if:NTF \l__acro_mark_as_used_bool { - \iow_shipout_x:Nn \@auxout - { - \token_to_str:N \acro@used@once { #1 } - { \thepage } - { \arabic{page} } - { \arabic{abspage} } - } +% \if@filesw + \iow_shipout_x:Nn \@auxout + { + \token_to_str:N \acro@used@once { #1 } + { \thepage } + { \arabic{page} } + { \arabic{abspage} } + } + +% \fi \bool_if:nT { !\bool_if_p:c { g__acro_#1_label_bool } && - \tl_if_eq_p:NN \l__acro_active_version_tl \l__acro_version_zero_tl + ( + \tl_if_eq_p:NN + \l__acro_active_version_tl + \l__acro_version_zero_tl + || + \l__acro_place_label_bool + ) } { \bool_gset_true:c { g__acro_#1_label_bool } - \label{ac:#1} + \label{\l__acro_label_prefix_tl #1} } \bool_gset_true:c { g__acro_#1_used_bool } } { - \iow_shipout_x:Nn \@auxout - { \token_to_str:N \acro@used@once { #1 } {} {} {} } + \if@filesw + \iow_shipout_x:Nn \@auxout + { \token_to_str:N \acro@used@once { #1 } {} {} {} } + \fi } \prg_return_false: } @@ -1476,13 +1544,14 @@ % the commands for the auxiliary file: \cs_new_protected:Npn \acro@used@once #1#2#3#4 { - \expandafter\xdef\csname acro@#1@once \endcsname { #1 } + \cs_gset_nopar:cpn { acro@#1@once } { #1 } + \bool_gset_true:c { g__acro_#1_in_list_bool } \tl_if_empty:nF { #2#3#4 } { \seq_gput_right:cn { g__acro_#1_pages_seq } { {#2}{#3}{#4} } } } \cs_new_protected:Npn \acro@used@twice #1#2#3#4 { - \expandafter\xdef\csname acro@#1@twice \endcsname { #1 } + \cs_gset_nopar:cpn { acro@#1@twice } { #1 } \tl_if_empty:nF { #2#3#4 } { \seq_gput_right:cn { g__acro_#1_pages_seq } { {#2}{#3}{#4} } } } @@ -1502,16 +1571,19 @@ { \seq_if_empty:cF { g__acro_#1_pages_seq } { - \iow_shipout_x:Nn \@auxout - { - \token_to_str:N \acro@pages { #1 } - { \seq_use:cnnn { g__acro_#1_pages_seq } { | } { | } { | } } - } + \if@filesw + \iow_shipout_x:Nn \@auxout + { + \token_to_str:N \acro@pages { #1 } + { \seq_use:cnnn { g__acro_#1_pages_seq } { | } { | } { | } } + } + \fi } } } % if `acro' is deactivated prevent unnecessary errors from aux file: +\if@filesw \AtBeginDocument { \iow_now:Nx \@auxout @@ -1521,6 +1593,7 @@ \token_to_str:N \providecommand \token_to_str:N \acro@pages [2] {} } } +\fi % -------------------------------------------------------------------------- \cs_new:Npn \acro_after:n #1 @@ -1680,13 +1753,13 @@ % accessability support \cs_new_eq:NN \__acro_acc_supp:nn \use_ii:nn -\cs_new:Npn \__acro_acc_supp_aux:nn #1#2 +\cs_new:Npn \acro_acc_supp:nnn #1#2#3 { - \BeginAccSupp { ActualText = #1 } - #2 + \BeginAccSupp { ActualText = #1 , #2 } + #3 \EndAccSupp { } } -\cs_generate_variant:Nn \__acro_acc_supp_aux:nn { V } +\cs_generate_variant:Nn \acro_acc_supp:nnn { VV } \AtBeginDocument { @@ -1699,7 +1772,10 @@ { \prop_get:NnNF \l__acro_short_prop { #1 } \l__acro_acc_supp_tl {} } \bool_if:NT \l__acro_use_plural_bool { \tl_put_right:NV \l__acro_acc_supp_tl \l__acro_short_plural_tl } - \__acro_acc_supp_aux:Vn \l__acro_acc_supp_tl { #2 } + \acro_acc_supp:VVn + \l__acro_acc_supp_tl + \l__acro_acc_supp_options_tl + { #2 } } } } @@ -1723,7 +1799,6 @@ { \bool_if:NT \l__acro_sort_bool { - \RequirePackage { l3sort } \cs_new_protected:Npn \acro_sort_prop:N #1 { \seq_clear:N \l__acro_tmpa_seq @@ -1737,7 +1812,7 @@ \seq_sort:Nn \l__acro_tmpa_seq { \tl_to_lowercase:n { - \int_compare:nTF { \pdfstrcmp { ##1 } { ##2 } = -1 } + \int_compare:nTF { \pdftex_strcmp:D { ##1 } { ##2 } = -1 } { \sort_ordered: } { \sort_reversed: } } @@ -2145,17 +2220,42 @@ { \bool_gset_true:c { g__acro_#1_used_bool } \bool_gset_true:c { g__acro_#1_first_use_bool } + \bool_gset_true:c { g__acro_#1_in_list_bool } \cs_if_exist:cTF { acro@#1@once } - { \cs_gset:cpn { acro@#1@twice } { #1 } } - { \cs_gset:cpn { acro@#1@once } { #1 } } + { \cs_gset_nopar:cpn { acro@#1@twice } { #1 } } + { + \cs_gset_nopar:cpn { acro@#1@once } { #1 } + \cs_gset_nopar:cpn { acro@#1@twice } { #1 } + } + \if@filesw + \iow_shipout_x:Nn \@auxout + { \token_to_str:N \acro@used@once { #1 } {} {} {} } + \iow_shipout_x:Nn \@auxout + { \token_to_str:N \acro@used@twice { #1 } {} {} {} } + \fi } + \cs_new_protected:Npn \acro_reset_all: { \prop_map_inline:Nn \l__acro_short_prop { \acro_reset:n { ##1 } } } \cs_new_protected:Npn \acro_mark_all_as_used: { \prop_map_inline:Nn \l__acro_short_prop { \acro_mark_as_used:n { ##1 } } } +\DeclareExpandableDocumentCommand \acifused { m } + { \acro_if_acronym_used:nTF { #1 } } + +\prg_new_conditional:Npnn \acro_if_acronym_used:n #1 { TF } + { + \bool_if:nTF + { + \bool_if_p:c { g__acro_#1_used_bool } && + ( !\__acro_is_single_p:n { #1 } ) + } + { \prg_return_true: } + { \prg_return_false: } + } + \NewDocumentCommand \acresetall {} { \acro_reset_all: } @@ -2354,6 +2454,30 @@ - cleaned the sty file, added a few more comments 2013/05/09 v1.3a - Bug fix: corrected wrong argument checking in \Ac, thanks to Michel Voßkuhle +2013/05/30 v1.3b - obey \if@filesw +2013/06/16 v1.3c - added \leavevmode to \acro_get:n +2013/07/08 v1.3d - corrected wrong call of \leavevmode in the list + (list-type=list) +2013/08/07 v1.3e - bug fix in the list when testing for used acronyms + - new commands \acifused, \acfirstupper +2013/08/27 v1.4 - new property `list' +2013/09/02 v1.4a - bug fix: used acronyms are added to the list when the list + is printed before the use + - \DeclareAcronym may now be used after \begin{document} +2013/09/24 v1.4b - bug fix: only-used=false works again for only declared but + unused acronyms (only if option single is not used) +2013/11/04 v1.4c - remove \hbox from the written short form + - changed \__acro_make_link:nNN in a way that it doesn't box + its when links are deactivated +2013/11/22 v1.4d - require `l3sort' independently from the `sort' option + instead of at begin document in order to avoid conflicts + with `babel' and `french' +2013/12/18 v1.5 - new option `label=true|false' that + places \label{<prefix>:<id>} the first time an acronym is + used + - new option `pages=first|all' that determines if in the list + of acronyms all appearances are listed or only the first + time; implicitly sets `label=true' % -------------------------------------------------------------------------- % TODO: @@ -2362,4 +2486,4 @@ this probably needs a handfull of macros that give access to the entries without worrying about internals - add \ACF, \ACFP, \ACL and \ACLP that will print all words of the long form - capitalized \ No newline at end of file + capitalized diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/acro/acro0.def new/tex/latex/acro/acro0.def --- old/tex/latex/acro/acro0.def 2013-02-11 00:12:30.000000000 +0100 +++ new/tex/latex/acro/acro0.def 2013-09-05 00:49:05.000000000 +0200 @@ -44,8 +44,8 @@ \cs_new:Npn \acro_new:nnnnnnnnn #1#2#3#4#5#6#7#8#9 { \IfBooleanTF { #1 } - { \prop_put:Nnn \l__acro_replace_plural_prop { #2 } { \c_true_bool } } - { \prop_put:Nnn \l__acro_replace_plural_prop { #2 } { \c_false_bool } } + { \prop_put:Nnn \l__acro_replace_long_plural_prop { #2 } { \c_true_bool } } + { \prop_put:Nnn \l__acro_replace_long_plural_prop { #2 } { \c_false_bool } } \prop_put:Nnn \l__acro_short_prop { #2 } { #3 } \prop_put:Nnn \l__acro_sort_prop { #2 } { #2 } \prop_put:Nnn \l__acro_pdfstring_prop { #2 } { #3 } @@ -74,6 +74,7 @@ { \prop_put:Nnn \l__acro_extra_prop { #2 } { #9 } } \bool_new:c { g__acro_#2_first_use_bool } \bool_new:c { g__acro_#2_used_bool } + \bool_new:c { g__acro_#2_in_list_bool } \bool_new:c { g__acro_#2_label_bool } \bool_if:NT \l__acro_create_macros_bool { @@ -166,4 +167,4 @@ \NewDocumentCommand \printacronyms { G{}O{} } { \acro_print_acronyms:nn { #1 } { #2 } } -\tex_endinput:D \ No newline at end of file +\tex_endinput:D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/acro/acro1.def new/tex/latex/acro/acro1.def --- old/tex/latex/acro/acro1.def 2013-05-07 00:03:16.000000000 +0200 +++ new/tex/latex/acro/acro1.def 2013-09-26 01:12:19.000000000 +0200 @@ -103,6 +103,7 @@ } \cs_generate_variant:Nn \__acro_declare_short:nn { V } +% short plural: \cs_new_protected:Npn \__acro_declare_short_plural:nn #1#2 { \__acro_key_check:nn { #1 } { short-plural } @@ -114,7 +115,7 @@ \cs_new_protected:Npn \__acro_declare_long:nn #1#2 { \__acro_key_check:nn { #1 } { long } - \prop_put:Nnn \l__acro_replace_plural_prop { #1 } { \c_false_bool } + \prop_put:Nnn \l__acro_replace_long_plural_prop { #1 } { \c_false_bool } \prop_put:Nnn \l__acro_long_prop { #1 } { #2 } \prop_put:Nnx \l__acro_long_indefinite_prop { #1 } { \l__acro_default_indefinite_tl } @@ -126,11 +127,19 @@ } \cs_generate_variant:Nn \__acro_declare_long:nn { V } +% list: +\cs_new_protected:Npn \__acro_declare_list:nn #1#2 + { + \__acro_key_check:nn { #1 } { list } + \prop_put:Nnn \l__acro_list_prop { #1 } { #2 } + } +\cs_generate_variant:Nn \__acro_declare_list:nn { V } + % long plural: \cs_new_protected:Npn \__acro_declare_long_plural:nn #1#2 { \__acro_key_check:nn { #1 } { long-plural } - \prop_put:Nnn \l__acro_replace_plural_prop { #1 } { \c_false_bool } + \prop_put:Nnn \l__acro_replace_long_plural_prop { #1 } { \c_false_bool } \prop_put:Nnn \l__acro_long_plural_prop { #1 } { #2 } } \cs_generate_variant:Nn \__acro_declare_long_plural:nn { V } @@ -139,7 +148,7 @@ \cs_new_protected:Npn \__acro_declare_long_plural_form:nn #1#2 { \__acro_key_check:nn { #1 } { long-plural-form } - \prop_put:Nnn \l__acro_replace_plural_prop { #1 } { \c_true_bool } + \prop_put:Nnn \l__acro_replace_long_plural_prop { #1 } { \c_true_bool } \prop_put:Nnn \l__acro_long_plural_prop { #1 } { #2 } } \cs_generate_variant:Nn \__acro_declare_long_plural_form:nn { V } @@ -350,6 +359,8 @@ \__acro_declare_short:Vn \l__acro_current_key_tl { #1 } , short-plural .code:n = \__acro_declare_short_plural:Vn \l__acro_current_key_tl { #1 } , +% short-plural-form .code:n = +% \__acro_declare_short_plural_form:Vn \l__acro_current_key_tl { #1 } , alt .code:n = \__acro_declare_alt:Vn \l__acro_current_key_tl { #1 } , long .code:n = @@ -358,6 +369,8 @@ \__acro_declare_long_plural:Vn \l__acro_current_key_tl { #1 } , long-plural-form .code:n = \__acro_declare_long_plural_form:Vn \l__acro_current_key_tl { #1 } , + list .code:n = + \__acro_declare_list:Vn \l__acro_current_key_tl { #1 } , short-indefinite .code:n = \__acro_declare_short_indefinite:Vn \l__acro_current_key_tl { #1 } , alt-indefinite .code:n = @@ -420,6 +433,9 @@ \bool_new:c { g__acro_#1_first_use_bool } \bool_new:c { g__acro_#1_used_bool } \bool_new:c { g__acro_#1_label_bool } + \bool_new:c { g__acro_#1_in_list_bool } + \bool_if:NF \l__acro_print_only_used_bool + { \bool_gset_true:c { g__acro_#1_in_list_bool } } \acro_create_page_records:n { #1 } \acro_define_acronym_macro:n { #1 } \tl_clear:N \l__acro_current_key_tl @@ -433,7 +449,7 @@ % the user command: \NewDocumentCommand \DeclareAcronym { mm } { \acro_declare_acronym:nn { #1 } { #2 } } -\@onlypreamble\DeclareAcronym +% \@onlypreamble\DeclareAcronym % -------------------------------------------------------------------------- % print the list: @@ -488,4 +504,4 @@ \NewDocumentCommand \printacronyms { O{} } { \acro_print_acronyms:n { #1 } } -\tex_endinput:D \ No newline at end of file +\tex_endinput:D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/acro.tlpobj new/tlpkg/tlpobj/acro.tlpobj --- old/tlpkg/tlpobj/acro.tlpobj 2013-05-12 03:39:30.000000000 +0200 +++ new/tlpkg/tlpobj/acro.tlpobj 2013-12-20 03:21:24.000000000 +0100 @@ -1,6 +1,6 @@ name acro category Package -revision 30406 +revision 32450 shortdesc Typeset acronyms. relocated 1 longdesc The package enables the author to create acronyms in a simple @@ -10,11 +10,11 @@ longdesc acronyms that are used only once in the whole document. As an longdesc experimental feature the package also offers the option 'sort' longdesc which automatically sorts the list created by \printacronyms. -runfiles size=27 +runfiles size=28 RELOC/tex/latex/acro/acro.sty RELOC/tex/latex/acro/acro0.def RELOC/tex/latex/acro/acro1.def catalogue-ctan /macros/latex/contrib/acro -catalogue-date 2013-05-11 15:56:53 +0200 +catalogue-date 2013-12-19 18:38:49 +0100 catalogue-license lppl -catalogue-version 1.3a +catalogue-version 1.5 ++++++ afm2pl.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/afm2pl.1 new/texmf-dist/doc/man/man1/afm2pl.1 --- old/texmf-dist/doc/man/man1/afm2pl.1 2009-06-21 14:15:02.000000000 +0200 +++ new/texmf-dist/doc/man/man1/afm2pl.1 2014-04-29 00:59:31.000000000 +0200 @@ -337,29 +337,34 @@ .PP Letterspacing has various side\-effects for ligkern info\&. Instead of simply applying the extra ligkern info (see previous section), the following is done: .sp -.RS 4 -\h'-04' 1.\h'+02'In case of positive letterspacing, native ligatures are removed, unless the \-k option is specified\&. -.RE +.IP 1. +In case of positive letterspacing, native ligatures are removed, unless the \-k option is specified\&. .sp -.RS 4 -\h'-04' 2.\h'+02'Extra ligkern info is applied as usual, except that in case of positive letterspacing different defaults apply: +.IP 2. +Extra ligkern info is applied as usual, except that in case of positive letterspacing different defaults apply: \-l 0 is quietly ignored, ligkern comments in the encoding file are ignored, and defpre\&.lig is read instead of default\&.lig\&. -.RE .sp -.RS 4 -\h'-04' 3.\h'+02'Letterspacing is applied\&. This adds a lot of kerns, and modifies existing kerns\&. -.RE +.IP 3. +Letterspacing is applied\&. This adds a lot of kerns, and modifies existing kerns\&. .sp -.RS 4 -\h'-04' 4.\h'+02'The extra ligkern info specified with \-L is applied\&. The only ligkern specs which are allowed here, are removals of kerning pairs (with the +.IP 4. +The extra ligkern info specified with \-L is applied\&. The only ligkern specs which are allowed here, are removals of kerning pairs (with the {} operator)\&. Values 0 and 1 have a similar meaning as for the \-l parameter\&. \fIThe tfm format has room for only about 180x180 ligatures and kerning pairs\&.\fR This is enough for OT1 encoding, but for texnansi encoding quite a few ligkern specifications have to be removed\&. The pltotf program will remove \fIall\fR -ligkern info if too many ligatures and kerns remain\&. The default lig file is defpost\&.lig\&. This file throws out kerning pairs which are unlikely to be involved in letterspacing, such as kerns involving accents or kerns with a punctuation character or right bracket at the left\&. It does not add letterspacing kerns involving boundarychars\&. Instead, fontspace is increased by twice the letterspacing\&. defpost\&.lig throws out enough kerns in case of texnansi encoding\&. With other encodings, you may have to throw out additional kerning pairs\&. -.RE +ligkern info if too many ligatures and kerns remain\&. The default lig +file is defpost\&.lig\&. This file throws out kerning pairs which are +unlikely to be involved in letterspacing, such as kerns involving +accents or kerns with a punctuation character or right bracket at the +left\&. It does not add letterspacing kerns involving +boundarychars\&. Instead, fontspace is increased by twice the +letterspacing\&. defpost\&.lig throws out enough kerns in case of +texnansi encoding\&. With other encodings, you may have to throw out +additional kerning pairs\&. + .SH "FONT-BASED UPPER- AND LOWERCASING" .PP The distribution includes encoding vectors texnanuc\&.enc and texnanlc\&.enc which produce all\-uppercase and all\-lowercase fonts Files old/texmf-dist/doc/man/man1/afm2pl.man1.pdf and new/texmf-dist/doc/man/man1/afm2pl.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/afm2pl.doc.tlpobj new/tlpkg/tlpobj/afm2pl.doc.tlpobj --- old/tlpkg/tlpobj/afm2pl.doc.tlpobj 2013-04-08 21:23:05.000000000 +0200 +++ new/tlpkg/tlpobj/afm2pl.doc.tlpobj 2014-04-29 03:25:18.000000000 +0200 @@ -1,6 +1,6 @@ name afm2pl.doc category TLCore -revision 29752 +revision 33736 shortdesc doc files of afm2pl docfiles size=9 texmf-dist/doc/man/man1/afm2pl.1 ++++++ afm2pl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/afm2pl.tlpobj new/tlpkg/tlpobj/afm2pl.tlpobj --- old/tlpkg/tlpobj/afm2pl.tlpobj 2013-04-08 21:23:05.000000000 +0200 +++ new/tlpkg/tlpobj/afm2pl.tlpobj 2014-04-29 03:25:18.000000000 +0200 @@ -1,6 +1,6 @@ name afm2pl category TLCore -revision 29752 +revision 33736 depend afm2pl.ARCH runfiles size=24 texmf-dist/fonts/enc/dvips/afm2pl/afm2pl-ot1.enc ++++++ aleph.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/aleph.1 new/texmf-dist/doc/man/man1/aleph.1 --- old/texmf-dist/doc/man/man1/aleph.1 2013-04-08 23:16:34.000000000 +0200 +++ new/texmf-dist/doc/man/man1/aleph.1 2014-04-29 00:59:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH ALEPH 1 "1 March 2011" "Web2C 2013" +.TH ALEPH 1 "1 March 2011" "Web2C 2014" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF M\s-2ETAFONT\s0 Files old/texmf-dist/doc/man/man1/aleph.man1.pdf and new/texmf-dist/doc/man/man1/aleph.man1.pdf differ Files old/texmf-dist/doc/man/man1/lamed.man1.pdf and new/texmf-dist/doc/man/man1/lamed.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aleph.doc.tlpobj new/tlpkg/tlpobj/aleph.doc.tlpobj --- old/tlpkg/tlpobj/aleph.doc.tlpobj 2013-04-09 03:40:03.000000000 +0200 +++ new/tlpkg/tlpobj/aleph.doc.tlpobj 2014-04-29 03:25:19.000000000 +0200 @@ -1,6 +1,6 @@ name aleph.doc category Package -revision 29764 +revision 33736 shortdesc doc files of aleph docfiles size=11 texmf-dist/doc/aleph/base/News ++++++ amiri.doc.tar.xz ++++++ ++++ 52506 lines of diff (skipped) ++++++ amiri.tar.xz ++++++ Files old/fonts/truetype/public/amiri/amiri-bold.ttf and new/fonts/truetype/public/amiri/amiri-bold.ttf differ Files old/fonts/truetype/public/amiri/amiri-boldslanted.ttf and new/fonts/truetype/public/amiri/amiri-boldslanted.ttf differ Files old/fonts/truetype/public/amiri/amiri-quran.ttf and new/fonts/truetype/public/amiri/amiri-quran.ttf differ Files old/fonts/truetype/public/amiri/amiri-regular.ttf and new/fonts/truetype/public/amiri/amiri-regular.ttf differ Files old/fonts/truetype/public/amiri/amiri-slanted.ttf and new/fonts/truetype/public/amiri/amiri-slanted.ttf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amiri.tlpobj new/tlpkg/tlpobj/amiri.tlpobj --- old/tlpkg/tlpobj/amiri.tlpobj 2013-05-30 03:50:25.000000000 +0200 +++ new/tlpkg/tlpobj/amiri.tlpobj 2013-12-31 03:22:33.000000000 +0100 @@ -1,6 +1,6 @@ name amiri category Package -revision 30816 +revision 32506 shortdesc A classical Arabic typeface, Naskh style. relocated 1 longdesc This is a beta-release of the font, though it is believed to be @@ -9,13 +9,13 @@ longdesc and Arabic Supplement blocks of Unicode 6.0, which means it longdesc essentially covers any language written in Arabic script and longdesc supported by Unicode. -runfiles size=648 +runfiles size=566 RELOC/fonts/truetype/public/amiri/amiri-bold.ttf RELOC/fonts/truetype/public/amiri/amiri-boldslanted.ttf RELOC/fonts/truetype/public/amiri/amiri-quran.ttf RELOC/fonts/truetype/public/amiri/amiri-regular.ttf RELOC/fonts/truetype/public/amiri/amiri-slanted.ttf catalogue-ctan /fonts/amiri -catalogue-date 2012-12-31 19:16:18 +0100 +catalogue-date 2013-12-30 07:20:52 +0100 catalogue-license ofl -catalogue-version 0.105 +catalogue-version 0.107 ++++++ amsmath-it.doc.tar.xz ++++++ ++++++ amstex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/amstex.1 new/texmf-dist/doc/man/man1/amstex.1 --- old/texmf-dist/doc/man/man1/amstex.1 2013-04-08 23:16:34.000000000 +0200 +++ new/texmf-dist/doc/man/man1/amstex.1 2014-04-29 00:59:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH AMSTEX 1 "14 May 2010" "Web2C 2013" +.TH AMSTEX 1 "14 May 2010" "Web2C 2014" .\"===================================================================== .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP .if n .ds TX TeX Files old/texmf-dist/doc/man/man1/amstex.man1.pdf and new/texmf-dist/doc/man/man1/amstex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amstex.doc.tlpobj new/tlpkg/tlpobj/amstex.doc.tlpobj --- old/tlpkg/tlpobj/amstex.doc.tlpobj 2013-04-09 03:40:04.000000000 +0200 +++ new/tlpkg/tlpobj/amstex.doc.tlpobj 2014-04-29 03:25:22.000000000 +0200 @@ -1,6 +1,6 @@ name amstex.doc category Package -revision 29764 +revision 33736 shortdesc doc files of amstex docfiles size=188 texmf-dist/doc/amstex/base/README ++++++ amstex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amstex.tlpobj new/tlpkg/tlpobj/amstex.tlpobj --- old/tlpkg/tlpobj/amstex.tlpobj 2013-04-09 03:40:04.000000000 +0200 +++ new/tlpkg/tlpobj/amstex.tlpobj 2014-04-29 03:25:23.000000000 +0200 @@ -1,6 +1,6 @@ name amstex category Package -revision 29764 +revision 33736 shortdesc American Mathematical Society plain TeX macros. longdesc AMSTeX is a TeX macro package, originally written by Michael longdesc Spivak for the American Mathematical Society (AMS) during 1983- ++++++ animate.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/animate/ChangeLog new/doc/latex/animate/ChangeLog --- old/doc/latex/animate/ChangeLog 2013-04-24 00:07:34.000000000 +0200 +++ new/doc/latex/animate/ChangeLog 2014-03-25 22:27:10.000000000 +0100 @@ -1,3 +1,27 @@ +2014-03-25 + * fix: bugs related to AcroForm and OCProperties catalog entries; + documenation + +2014-03-12 + * Fix: incompatibility with pgf-3.0 + +2014-03-06 + * Fix: animation widgets were blank in some viewers + +2014-02-11 + * Change: Dependency of controls on OCGs removed; better LuaLaTeX support + +2014-02-06 + * New: JavaScript API for animation control + * Fix: broken PDF-XChange Viewer support due to [2013-07-19] changes + +2013-09-24 + * Fix: Adobe Reader prompting for "save changes" for documents without + animations + +2013-07-19 + * minor, non-vital change of /AcroForm contents + 2013-04-23 * Fix: spaces in file names possible (at least with pdflatex) @@ -20,7 +44,7 @@ * minor, non-vital fix 2012-05-11 - * new: optional fourth field in timeline files for calling JavaScript; + * New: optional fourth field in timeline files for calling JavaScript; ticking PSTricks metronome example by Manuel Luque added to docs 2011-12-21 @@ -96,7 +120,7 @@ * New: the transparency stack can now be cleared using `c' in the timeline file * improved documentation of the timeline option - * new animateinline example (Lorenz Attractor) + * New animateinline example (Lorenz Attractor) * Fix: animfp.sty: trailing zeros are now removed from the fractional part of the result of the addition of two reals diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/animate/README new/doc/latex/animate/README --- old/doc/latex/animate/README 2010-01-25 01:21:41.000000000 +0100 +++ new/doc/latex/animate/README 2014-03-06 23:10:03.000000000 +0100 @@ -93,6 +93,6 @@ This material is subject to the LaTeX Project Public License. See - http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html + http://mirrors.ctan.org/help/Catalogue/licenses.lppl.html for the details of that license. Files old/doc/latex/animate/animate.pdf and new/doc/latex/animate/animate.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/animate/animate.tex new/doc/latex/animate/animate.tex --- old/doc/latex/animate/animate.tex 2013-04-25 01:02:34.000000000 +0200 +++ new/doc/latex/animate/animate.tex 2014-03-25 22:27:10.000000000 +0100 @@ -1,7 +1,7 @@ % Copyright 2007--2010 Alexander Grahn % % This material is subject to the LaTeX Project Public License. See -% http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html +% http://mirrors.ctan.org/help/Catalogue/licenses.lppl.html % for the details of that license. % \documentclass[a4paper]{article} @@ -29,6 +29,7 @@ \usepackage{breakurl} \usepackage{amsmath} \usepackage{fancyvrb} +\usepackage{tabularx} \usepackage[all]{hypcap} \clubpenalty=10000 \widowpenalty=10000 @@ -47,11 +48,11 @@ \ifpdf \makeatletter - \@latex@error{This document contains PSTricks code.\MessageBreak Please compile it using the following commands:\MessageBreak\MessageBreak latex, dvips, ps2pdf\MessageBreak\MessageBreak Don't use option `-Ppdf` with dvips} + \@latex@error{This document contains PSTricks code.\MessageBreak Please compile it using the following commands:\MessageBreak\MessageBreak latex, dvips, ps2pdf -dNOSAFER\MessageBreak\MessageBreak Don't use option `-Ppdf` with dvips} \makeatother \fi -\def\keywords{include portable PDF animation animated PDF animating embed animated graphics LaTeX pdfLaTeX PSTricks pgf TikZ LaTeX-picture MetaPost inline graphics vector graphics animated GIF LaTeX dvips ps2pdf dvipdfmx XeLaTeX JavaScript Adobe Reader} +\def\keywords{include portable PDF animation animated PDF animating embed animated graphics LaTeX pdfLaTeX LuaLaTeX PSTricks pgf TikZ LaTeX-picture MetaPost inline graphics vector graphics animated GIF LaTeX dvips ps2pdf dvipdfmx XeLaTeX JavaScript Adobe Reader PDF-XChange Viewer} \hypersetup{ pdftitle={The animate Package}, pdfsubject={Documentation}, @@ -75,6 +76,7 @@ \def\day{#3} } +\hyphenation{Ja-va-Script} \begin{document} \title{The {\sffamily animate} Package} \begingroup @@ -82,13 +84,13 @@ \def\@anim@sanitize{}\def\@anim@endsanitize{} \expandafter\parsedate\@anim@version\relax %set current date to package date \makeatother -\author{Alexander Grahn \animategraphics[autoplay,loop,height=1.8ex]{8}{bye_}{0}{3}\protect\footnote{Animated GIF taken from \href{http://www.phpBB.com}{phpBB} forum software and burst into a set of EPS files using \href{http://www.imagemagick.org}{ImageMagick} before embedding. Animations may run slowly if viewed in the Adobe Reader browser plugin.}\\[1ex]\includegraphics[height=2.7ex]{mailto}} +\author{Alexander Grahn \animategraphics[autoplay,loop,height=1.8ex]{8}{bye_}{0}{3}\protect\footnote{Animated GIF taken from \href{http://www.phpBB.com}{phpBB} forum software and burst into a set of EPS files using \href{http://www.imagemagick.org}{ImageMagick} before embedding.} \protect\footnote{Animations may run slowly if viewed in the Adobe Reader browser plugin.} \protect\footnote{In PDF-XChange, animations are rendered upside-down if the document was produced via the {\tt dvips}$\rightarrow${\tt ps2pdf} route.}\\[1ex]\includegraphics[height=2.7ex]{mailto}} \maketitle \endgroup \begin{abstract} \raggedright -\noindent A LaTeX package for creating portable, JavaScript driven PDF animations from sets of vector graphics or rasterized image files or from inline graphics. +\noindent A LaTeX package for creating portable, JavaScript driven PDF animations from sets of vector graphics or raster image files or from inline graphics. \vskip 0.2\baselineskip \emph{Keywords}: \keywords @@ -100,23 +102,23 @@ \section{Introduction} This package provides an interface to create PDFs with animated content from sets of graphics or image files, from inline graphics, such as \LaTeX-picture, PSTricks or pgf/TikZ generated pictures, or just from typeset text. Unlike standard movie/video formats, package `animate' allows for animating vector graphics. The result is roughly similar to the SWF (Flash) format, although not as space-efficient. -Package `animate' supports the usual PDF making workflows, i.\,e. pdf\LaTeX{}, \LaTeX{} $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+/Distiller and \pXepLaTeX{} $\rightarrow$ \verb+(x)dvipdfmx+. +Package `animate' supports the usual PDF making workflows, i.\,e. pdf\LaTeX{}, Lua\LaTeX{}, \LaTeX{} $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+/Distiller and \pXepLaTeX{} $\rightarrow$ \verb+(x)dvipdfmx+. -The final PDF can be viewed in current Adobe Readers on all supported platforms. +The final PDF can be viewed in current Adobe Readers on all supported platforms or in PDF-XChange Viewer. %The `animate' package relies on Optional Content Groups (OCG), also known as PDF layers, which is a feature provided by the PDF-1.5 specification. Each frame of an animation is associated with an OCG that is hidden or made visible in a dynamic fashion by means of Adobe Reader's built-in JavaScript engine. \section{Requirements} \begin{trivlist} \item $\varepsilon$-\TeX -\item pdf\TeX{}, version $\ge1.20$ for direct PDF output +\item pdf\TeX{}, version $\ge1.20$ or Lua\TeX{} for direct PDF output \item Ghostscript, version $\ge8.31$ or Adobe Distiller for PS to PDF conversion \item dvipdfmx, version $\ge20080607$ for DVI to PDF conversion -\item Adobe Reader, version $\ge7$ +\item Adobe Reader, version $\ge7$ or PDF-XChange Viewer \end{trivlist} \section{Installation} -Unzip the file \href{http://tug.ctan.org/tex-archive/install/macros/latex/contrib/animate.tds.zip}{`animate.tds.zip'} into the local TDS root directory which can be found by running `\verb+kpsewhich -var-value TEXMFLOCAL+' on the command line. +Unzip the file \href{http://mirrors.ctan.org/install/macros/latex/contrib/animate.tds.zip}{`animate.tds.zip'} into the local TDS root directory which can be found by running `\verb+kpsewhich -var-value TEXMFLOCAL+' on the command line. After installation, update the filename database by running `\verb+texhash+' on the command line. @@ -150,7 +152,7 @@ \end{verbatim} Except for `\verb+dvipdfmx+' and `\verb+xetex+', the options above are also available (among others) as command options and will be explained shortly. However, if used as package options they have global scope, taking effect on all animations in the document. In turn, command options locally override global settings. Options without an argument are boolean options and can be negated, with the exception of package-only options `\verb+dvipdfmx+' and `\verb+xetex+', by appending `\verb+=false+'. -If PDF is generated via DVI and Postscript by the command sequence \verb+latex+ $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+, the `graphicx' package is required. \begin{animateinline}[autoplay,loop]{1.5}\strut\emph{Important:}\newframe\newframe[5]\end{animateinline} The \verb+dvips+ option `\verb+-Ppdf+' should \emph{not} be set when converting the intermediate DVI into Postscript. If you cannot do without, put `\verb+-D 1200+' \emph{after} `\verb+-Ppdf+' on the command line. Users of \LaTeX-aware text editors with menu-driven toolchain invocation, such as \TeX{}nicCenter, should check the configuration of the \verb+dvips+ call. +If PDF is generated via DVI and Postscript by the command sequence \verb+latex+ $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+, the `graphicx' package is required. \begin{animateinline}[autoplay,loop]{1}\strut\emph{Important:}\newframe[3]\end{animateinline} The \verb+dvips+ option `\verb+-Ppdf+' should \emph{not} be set when converting the intermediate DVI into Postscript. If you cannot do without, put `\verb+-D 1200+' \emph{after} `\verb+-Ppdf+' on the command line. Users of \LaTeX-aware text editors with menu-driven toolchain invocation, such as \TeX{}nicCenter, should check the configuration of the \verb+dvips+ call. Sometimes, if the same animation sequence made from graphics files is to be embedded multiple times into the document, more compact PDF output may be obtained by passing option `\verb+-dMaxInlineImageSize=0+' to \verb+ps2pdf+. @@ -195,7 +197,7 @@ Command \verb+\graphicspath{}+ from the `graphicx' package can be used to specify directories to be browsed for graphics files. -No file name extension may be specified as a parameter. The possible file formats depend on the output driver being used. In the case of \LaTeX{}+\verb+dvips+, files with the `eps' extension are at first searched for, followed by `mps' (\MP-generated Postscript) and `ps'. With pdf\LaTeX{} the searching order is: (1)~`pdf', (2)~`mps', (3)~`png', (4)~`jpg', (5)~`jpeg', (6)~`jbig2', (7)~`jb2', (8)~`jp2'\footnotemark[1], (9)~`j2k'\footnotemark[1], (10)~`jpx'\footnotemark[1]\footnotetext[1]{JPEG2000 is not yet supported by pdf\TeX.} and with \XeLaTeX{} or \LaTeX{}+\verb+dvipdfmx+: (1)~`pdf', (2)~`mps', (3)~`eps', (4)~`ps', (5)~`png', (6)~`jpg', (7)~`jpeg', (8)~`bmp'. That is, files capable of storing vector graphics are found first. Make sure that all file names have \emph{lower case} extensions. +No file name extension may be specified as a parameter. The possible file formats depend on the output driver being used. In the case of \LaTeX{}+\verb+dvips+, files with the `eps' extension are at first searched for, followed by `mps' (\MP-generated Postscript) and `ps'. With pdf\LaTeX{} and Lua\LaTeX{} the searching order is: (1)~`pdf', (2)~`mps', (3)~`png', (4)~`jpg', (5)~`jpeg', (6)~`jbig2', (7)~`jb2', (8)~`jp2'\footnotemark[1], (9)~`j2k'\footnotemark[1], (10)~`jpx'\footnotemark[1]\footnotetext[1]{Only Lua\LaTeX{} currently supports JPEG2000.} and with \XeLaTeX{} or \LaTeX{}+\verb+dvipdfmx+: (1)~`pdf', (2)~`mps', (3)~`eps', (4)~`ps', (5)~`png', (6)~`jpg', (7)~`jpeg', (8)~`bmp'. That is, files capable of storing vector graphics are found first. Make sure that all file names have \emph{lower case} extensions. For example, given the sequence `frame\_5.png' through `frame\_50.png' from a possibly larger set that shall be used to build an animation running at 12 frames per second, the correct inclusion command would read \begin{verbatim} @@ -215,6 +217,10 @@ The following options to \verb+\animategraphics+ and `\verb+animateinline+' have been provided: \subsection{Basic options} \begin{verbatim} +label=<label text> +\end{verbatim} +The animation is given a label, \verb+<label text>+, which should be unique. Labelling an animation enables its JavaScript programming interface by defining \verb+anim['<label text>']+, which is a JavaScript reference to the animation object. The animation object provides a number of properties and methods that can be used for controlling the animation playback from within user defined JavaScript. For details, see Sect.~\ref{sect:api}. +\begin{verbatim} poster[=first | none | last] \end{verbatim} Specifies which frame (first, last or none) to display and print if the animation is not activated. The first frame is shown by default. Thus `\verb+poster+' or `\verb+poster=first+' need not be explicitly set. @@ -312,6 +318,7 @@ end={\end{tikzpicture}} \end{verbatim} +\clearpage \subsection{The `{\tt timeline}' option}\label{sect:timeline} \begin{verbatim} timeline=<timeline file> @@ -327,12 +334,10 @@ \begin{verbatim} [*]:[<frame rate>]:[<transparencies>][:<JavaScript>] \end{verbatim} -While any field may be left blank, the first two colons are mandatory. +While any field may be left blank, the first two colons are mandatory. The \verb+<JavaScript>+ field is explained on p.~\pageref{sect:jsfield}. An asterisk (`\verb+*+') in the leftmost field causes the animation to pause at that frame, very much as a \verb+\newframe*+ would do; a number in the second field changes the frame rate of the animation section that follows. In connection with the `\verb+timeline+' option, the asterisk extension and the optional \verb+<frame rate>+ argument of \verb+\newframe+ cease to make sense and will be tacitly ignored if present. -The optional fourth field takes JavaScript code to be executed at that frame. This could could be used, for instance, to play a sound that was embedded using the media9 \LaTeX{} package \cite{media9}. The backslash `\verb+\+' and percent `\verb+%+' characters retain their special meaning from \LaTeX{} and must be escaped by a backslash `\verb+\+' in the JavaScript code. The same applies to unbalanced braces `\verb+{+' and `\verb+}+'. Thus, a code line such as `\verb+console.println('{}%}{\n');+' would have to look like `\verb+console.println('{}\%\}\{\\n');+' in the timeline file. The first pair of braces are balancing themselves and do not need be escaped. - The third field \verb+<transparencies>+ is a comma-separated \emph{list} of \emph{transparency specifications} that determines the transparencies to be put on the stack. Semicolons (\verb+;+) are used to separate sub-stacks (= layers) from each other. A \emph{single} transparency specification obeys the syntax \begin{verbatim} <transparency ID>[x<number of frames>] @@ -401,6 +406,25 @@ See the second animation, Fig.~\ref{fig:scarab}, in Section~\ref{sect:examples} for a working example that makes use of the timeline and the layer concept. +\myparagraph*{Associate JavaScript actions with animation frames}\label{sect:jsfield} +The optional fourth field \verb+<JavaScript>+ in a frame specification takes JavaScript code to be executed upon display of that frame. This could be used, for instance, to play a sound that was embedded using the `media9' \LaTeX{} package \cite{media9} or to execute JavaScript methods of the animation object. A non-trivial example is looping over a sub-range of frames which can be programmed by setting the `\verb+pageNum+' property of the animation object. See Sect.~\ref{sect:api} for details of the animation programming interface. + +The backslash `\verb+\+' and percent `\verb+%+' characters retain their special meaning from \LaTeX{} and must be escaped by a backslash `\verb+\+' in the JavaScript code. The same applies to unbalanced braces `\verb+{+' and `\verb+}+'. Thus, a code line such as +\begin{verbatim} + console.println('{}%}{\n'); +\end{verbatim} +would have to look like +\begin{verbatim} + console.println('{}\%\}\{\\n'); +\end{verbatim} +in the timeline file. The first pair of braces are balancing themselves and do not need to be escaped. + +Note that JavaScript is executed at the start of displaying the frame. If something is to be executed at the end of a particular frame, the \verb+<JavaScript>+ field should be added to the next frame in the timeline file. However, this is not possible for the last frame in a timeline file. Here, the `\verb+setTimeOut+' method can be used to delay the execution of commands: +\begin{verbatim} + app.setTimeOut('anim.myanim.frameNum=5;', 0.5*anim.myanim.dt) +\end{verbatim} +In this example, the 6th frame will be displayed after half of the current frame's lifetime has elapsed. + \myparagraph*{Other things to note} When designing the timeline, care should be taken not to include a transparency more than once into the \emph{same} animation frame. Besides the useless redundancy, this may slow down the animation speed in the Reader because the graphical objects of a multiply included transparency have to be rendered unnecessarily often at the same time. `animate' is smart enough to detect multiple inclusion and issues a warning message along with the transparency ID and the frame number if it occurs. Here is an example of a poorly designed timeline: \small @@ -416,16 +440,76 @@ \normalsize Also, `animate' finds and warns about transparencies that have never been used in an animation timeline. This may help to avoid dead code in the final PDF. +\section{Programming interface}\label{sect:api} +The package provides a simple JavaScript programming interface which gives access to the animation objects in a PDF file. A particular animation property or method can be accessed by +\begin{verbatim} + anim['<anim label>'].<property or method> +\end{verbatim} +or +\begin{verbatim} + anim.<anim label>.<property or method> +\end{verbatim} +`\verb+anim+' is an array of animation object references. Animations must be labelled using the `\verb+label=...+' command option in order to be present in the `\verb+anim+' array. As usual, properties and methods are accessed via the dot notation. Properties and methods of the animation object are summarized in Tables \ref{tab:props} and \ref{tab:methods}. + +One potential use of the JavaScript interface could be within a timeline file associated with an animation. For example, loops over a sub-range of frames can be programmed by setting the `\verb+pageNum+' property. See Section~\ref{sect:timeline}, p.~\pageref{sect:jsfield} for details. + +Also, the programming interface can be used to create custom buttons for playback control. The command \verb+\mediabutton+ from the `media9' package provides a convenient way for achieving this: +\begin{verbatim} + \usepackage{media9} + \usepackage{animate} + ... + + \animategraphics[label=my_anim]{12}{...}{...}{...} + + \mediabutton[ + jsaction={anim['my_anim'].playFwd();} + ]{\fbox{Play}} + \mediabutton[ + jsaction={anim['my_anim'].frameNum=5;} + ]{\fbox{Goto 6th frame}} +\end{verbatim} + +\begin{table}[hbp] +\centering +\caption{Animation object properties}\label{tab:props} +\begin{tabularx}{\linewidth}[t]{lllX}\hline +name & type & access & description\\\hline\hline +{\tt numFrames} & Integer & read-only & Holds the total number of animation frames.\\ +{\tt frameNum} & Integer & read+write & Gets or sets the current frame being/to\,be displayed. Note that the values are zero-based. Assigning values less than zero or greater than {\tt numFrames-1} results in an error.\\ +{\tt fps} & Number & read+write & Gets or sets the animation frame rate (frames per second). Assigning values less than zero results in an error.\\ +{\tt dt} & Number & read-only & Holds the time span (milliseconds) for display of the current frame.\\ +{\tt isPlaying} & Boolean & read-only & Holds the value {\tt true} if the animation is currently playing, {\tt false} otherwise.\\ +{\tt playsFwd} & Boolean & read-only & Holds the value {\tt true} if the animation is played forward, independently of whether the animation is currently paused or not.\\ +\hline +\end{tabularx} +\end{table} + +\begin{table}[hbp] +\centering +\caption{Animation object methods}\label{tab:methods} +\begin{tabularx}{\linewidth}[t]{lX}\hline +name & description\\\hline\hline +{\tt playFwd()} & Starts playing the animation in the forward direction, setting the properties {\tt isPlaying} and {\tt playsFwd} to {\tt true}.\\ +{\tt playBwd()} & Starts playing the animation in the backward direction, setting {\tt isPlaying} to {\tt true} and {\tt playsFwd} to {\tt false}.\\ +{\tt pause()} & Pauses animation, setting {\tt isPlaying} to {\tt false}.\\ +{\tt stopFirst()} & Stops animation and rewinds to the first frame. {\tt isPlaying} is set to false.\\ +{\tt stopLast()} & Stops animation and goes to the last frame. {\tt isPlaying} is set to false.\\ +\hline +\end{tabularx} +\end{table} + +\clearpage \section{Examples} \subsection[Animations from sets of files, using `animategraphics' command]{Animations from sets of files, using {\tt \string\animategraphics} command}\label{sect:examples} Animations in this section are made from graphics files that were prepared with \MP. Run `\verb+mpost --tex=latex+' on the files ending in `.mp' in the `files' directory to generate the graphics files. Both examples make use of the `\verb+timeline+' option to reduce the resulting PDF file size. -The first example, Fig.~\ref{fig:taylor}, originally written by Jan Hole\v{c}ek~\cite{hol}, shows the exponential function $y=e^x$ and its approximation by Taylor polynomials of different degree. +The first example, Fig.~\ref{fig:taylor}, originally written by Jan Hole\v{c}ek~\cite{hol}, shows the exponential function $y=e^x$ and its approximation by Taylor polynomials of different degree. Below the animation, a custom button was inserted using the JavaScript programming interface and the \verb+\mediabutton+ command from the `media9' package. \small \begin{verbatim} \documentclass{article} \usepackage{animate} +\usepackage{media9} \usepackage{graphicx} \begin{filecontents}{timeline.txt} @@ -444,9 +528,19 @@ \begin{center} \animategraphics[ + label=taylor, controls, loop, timeline=timeline.txt ]{4}{exp_}{0}{8} + + \mediabutton[ + jsaction={ + if(anim['taylor'].isPlaying) + anim['taylor'].pause(); + else + anim['taylor'].playFwd(); + } + ]{\fbox{Play/Pause}} \end{center} \end{document} @@ -465,7 +559,16 @@ ::7 ::8 \end{VerbatimOut} -\animategraphics[controls,loop,timeline=timeline.txt]{4}{exp_}{0}{8} +\animategraphics[label=taylor,controls,loop,timeline=timeline.txt]{4}{exp_}{0}{8} + +\mediabutton[ + jsaction={ + if(anim['taylor'].isPlaying) + anim['taylor'].pause(); + else + anim['taylor'].playFwd(); + } +]{\fbox{Play/Pause}} \caption{}\label{fig:taylor} \end{figure} @@ -765,7 +868,7 @@ \end{verbatim} \normalsize -The last inline example in Fig.~\ref{fig:metronome} is a ticking metronome written by Manuel Luque~\cite{luque12}. The short clicking sound was embedded by means of the media9 package. Whenever the pendulum reaches one of its reversal points, playback of the sound file is started using JavaScript. The JavaScript code was inserted at the corresponding frame specifications in a timeline file. Since the PSTricks macros for drawing the metronome body and the pendulum are quite long they have been moved into an external file, \verb+files/pstmetronome.tex+. Note that the sound can be heard only on Win and Mac platforms. Even then, mileage may vary. A dual core CPU may be necessary for fluent playback. +The last inline example in Fig.~\ref{fig:metronome} is a ticking metronome written by Manuel Luque~\cite{luque12}. The short clicking sound was embedded by means of the `media9' package. Whenever the pendulum reaches one of its reversal points, playback of the sound file is started using JavaScript. The JavaScript code was inserted at the corresponding frame specifications in a timeline file. Since the PSTricks macros for drawing the metronome body and the pendulum are quite long they have been moved into an external file, \verb+files/pstmetronome.tex+. Note that the sound can be heard only on Win and Mac platforms. Even then, mileage may vary. A dual core CPU may be necessary for fluent playback. \begin{figure}[hb] \centering \begin{VerbatimOut}{files/pstmetronome.tex} @@ -1038,8 +1141,8 @@ width=1ex,height=1ex, label=click, addresource=click.mp3, - activate=pageopen, - flashvars={source=click.mp3} + activate=pageopen,transparent,noplaybutton, + flashvars={source=click.mp3&hideBar=true} ]{}{APlayer.swf}}% %animated metronome \begin{animateinline}[ @@ -1108,8 +1211,8 @@ width=1ex,height=1ex, label=click, addresource=click.mp3, - activate=pageopen, - flashvars={source=click.mp3} + activate=pageopen,transparent,noplaybutton, + flashvars={source=click.mp3&hideBar=true} ]{}{APlayer.swf}}% % %animated metronome diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/animate/files/exp.mp new/doc/latex/animate/files/exp.mp --- old/doc/latex/animate/files/exp.mp 2013-04-09 20:36:32.000000000 +0200 +++ new/doc/latex/animate/files/exp.mp 2014-02-08 00:23:32.000000000 +0100 @@ -1,7 +1,15 @@ % Jan Holecek, Alexander Grahn -% 2008/01/03 +% 2013/10/15 filenametemplate "%j_%c.mps"; +verbatimtex +\documentclass{article} +\usepackage[latin1]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{lmodern} +\usepackage{amsmath} +\begin{document} +etex e := 2.718282; N=8; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/animate/files/scarab.mp new/doc/latex/animate/files/scarab.mp --- old/doc/latex/animate/files/scarab.mp 2008-05-13 20:53:06.000000000 +0200 +++ new/doc/latex/animate/files/scarab.mp 2014-02-08 00:23:32.000000000 +0100 @@ -1,11 +1,13 @@ % Maxime Chupin, Alexander Grahn -% 2008/01/03 +% 2013/10/15 filenametemplate "%j_%c.mps"; verbatimtex \documentclass{article} \usepackage[latin1]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{lmodern} \usepackage{amsmath} \begin{document} etex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/animate.doc.tlpobj new/tlpkg/tlpobj/animate.doc.tlpobj --- old/tlpkg/tlpobj/animate.doc.tlpobj 2013-04-25 03:38:39.000000000 +0200 +++ new/tlpkg/tlpobj/animate.doc.tlpobj 2014-03-26 03:26:02.000000000 +0100 @@ -1,9 +1,9 @@ name animate.doc category Package -revision 30092 +revision 33287 shortdesc doc files of animate relocated 1 -docfiles size=934 +docfiles size=949 RELOC/doc/latex/animate/ChangeLog RELOC/doc/latex/animate/README RELOC/doc/latex/animate/animate.pdf ++++++ animate.tar.xz ++++++ ++++ 1836 lines of diff (skipped) ++++++ apa6.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/README new/doc/latex/apa6/README --- old/doc/latex/apa6/README 2012-02-16 01:09:27.000000000 +0100 +++ new/doc/latex/apa6/README 2013-06-27 00:53:03.000000000 +0200 @@ -3,7 +3,7 @@ apa6 - A LaTeX class for formatting documents in compliance with the American Psychological Association's Publication Manual, 6th edition -Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either Files old/doc/latex/apa6/apa6.pdf and new/doc/latex/apa6/apa6.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas new/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas --- old/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas 2013-01-12 01:00:46.000000000 +0100 +++ new/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas 2013-06-27 00:53:03.000000000 +0200 @@ -174,6 +174,21 @@ End With Selection.Find.Execute Replace:=wdReplaceAll + ' remove extra spaces at the end of paragraphs + With Selection.Find + .Text = " ^p" + .Replacement.Text = "^p" + .Forward = True + .Wrap = wdFindContinue + .Format = False + .MatchCase = False + .MatchWholeWord = False + .MatchWildcards = False + .MatchSoundsLike = False + .MatchAllWordForms = False + End With + Selection.Find.Execute Replace:=wdReplaceAll + ' delete the instructions Selection.HomeKey Unit:=wdStory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa6.doc.tlpobj new/tlpkg/tlpobj/apa6.doc.tlpobj --- old/tlpkg/tlpobj/apa6.doc.tlpobj 2013-01-12 04:41:49.000000000 +0100 +++ new/tlpkg/tlpobj/apa6.doc.tlpobj 2013-06-27 03:20:16.000000000 +0200 @@ -1,6 +1,6 @@ name apa6.doc category Package -revision 28802 +revision 30957 shortdesc doc files of apa6 relocated 1 docfiles size=163 ++++++ apa6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/apa6.cls new/tex/latex/apa6/apa6.cls --- old/tex/latex/apa6/apa6.cls 2013-01-12 01:00:46.000000000 +0100 +++ new/tex/latex/apa6/apa6.cls 2013-06-27 00:53:03.000000000 +0200 @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesClass{apa6}[2013/01/10 v2.12 APA formatting (6th edition)] +\ProvidesClass{apa6}[2013/06/26 v2.13 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -674,8 +674,8 @@ {-\z@\relax}% {\normalfont\normalsize\itshape\hspace{\parindent}{#1}\textit{.}}{\relax}} -\AtBeginDocument{\def\st@rtbibsection{\mspart{References}}}% BDB -- this is for apacite -\AtBeginDocument{\def\bibsection{\mspart{References}}}% BDB -- this is for apacite + natbib +\AtBeginDocument{\def\st@rtbibsection{\mspart{\refname}}}% BDB -- this is for apacite +\AtBeginDocument{\def\bibsection{\mspart{\refname}}}% BDB -- this is for apacite + natbib \newcommand{\mspart}{{\ifapamodeman{\clearpage}{}}\@startsection {section}{1}{\z@}% {\b@level@one@skip}{\e@level@one@skip}% {\centering\normalfont\normalsize}} @@ -728,10 +728,6 @@ \def\makelabel##1{\hss\llap{##1}}}} \let\endAPAitemize=\endlist -\let\enumerate=\APAenumerate -\let\endenumerate=\endAPAenumerate -\let\itemize=\APAitemize -\let\enditemize=\endAPAitemize diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa6.tlpobj new/tlpkg/tlpobj/apa6.tlpobj --- old/tlpkg/tlpobj/apa6.tlpobj 2013-01-12 04:41:49.000000000 +0100 +++ new/tlpkg/tlpobj/apa6.tlpobj 2013-06-27 03:20:16.000000000 +0200 @@ -1,6 +1,6 @@ name apa6 category Package -revision 28802 +revision 30957 shortdesc Format documents in APA style (6th edition). relocated 1 longdesc The class formats documents in APA style (6th Edition). It @@ -25,6 +25,6 @@ RELOC/tex/latex/apa6/config/APAgreek.txt RELOC/tex/latex/apa6/config/APAngerman.txt catalogue-ctan /macros/latex/contrib/apa6 -catalogue-date 2013-01-11 11:26:14 +0100 +catalogue-date 2013-06-26 19:53:21 +0200 catalogue-license lppl1.3 -catalogue-version 2.12 +catalogue-version 2.13 ++++++ apacite.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/bibtex/apacite/README new/doc/bibtex/apacite/README --- old/doc/bibtex/apacite/README 2012-02-16 01:09:07.000000000 +0100 +++ new/doc/bibtex/apacite/README 2013-07-08 23:59:50.000000000 +0200 @@ -16,7 +16,7 @@ Copyright and license --------------------- -Copyright (C) 1994-2012 Erik Meijer and any individual authors listed +Copyright (C) 1994-2013 Erik Meijer and any individual authors listed elsewhere in this package. This package may be distributed and/or modified under the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/bibtex/apacite/apa5ex.bib new/doc/bibtex/apacite/apa5ex.bib --- old/doc/bibtex/apacite/apa5ex.bib 2012-02-28 01:33:09.000000000 +0100 +++ new/doc/bibtex/apacite/apa5ex.bib 2013-07-23 00:04:45.000000000 +0200 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% %% apa5ex.bib -%% [2012/02/25 v6.01 bibliography database for examples] +%% [2013/07/21 v6.03 bibliography database for examples] %% %% apa5ex.bib: References from the 5th edition of the Publication Manual %% of the APA, plus a few additional references @@ -2321,10 +2321,179 @@ url = {http://plato.stanford.edu/entries/behaviorism/}, } @incollection{apa6:ch7-ex30, - title = {Heuristic}, -booktitle = {Merriam-{Webster}'s Online Dictionary}, -edition = {11}, - url = {http://www.m-w.com/dictionary/heuristic}, + title = {Heuristic}, + booktitle = {Merriam-{Webster}'s Online Dictionary}, + edition = {11}, + url = {http://www.m-w.com/dictionary/heuristic}, +} +@techreport{apa6:ch7-ex31, + author = {{\bibcorporate{U.S. Department of Health and Human + Services, National Institutes of Health, National Heart, + Lung, and Blood Institute}}}, + firstkey = {{U.S. Department of Health and Human + Services, National Institutes of Health, National Heart, + Lung, and Blood Institute [NHLBI]}}, + key = {{NHLBI}}, + year = {2003}, + title = {Managing Asthma: A Guide for Schools}, + type = {NIH Publication}, + number = {02-2650}, + url = {http://www.nhlbi.nih.gov/health/prof/lung/asthma/asth_sch.pdf}, +} +@techreport{apa6:ch7-ex32, + author = {{\bibcorporate{American Psychological Association, Task + Force on the Sexualization of Girls}}}, + firstkey = {{American Psychological Association, Task + Force on the Sexualization of Girls [APA]}}, + key = {{APA}}, + year = {2007}, + title = {Report of the {APA} {Task} {Force} on the {Sexualization} + of {Girls}}, + type = {\bibnotype}, + url = {http://www.apa.org/pi/wpo/sexualization.html}, +} +@techreport{apa6:ch7-ex33, + author = {Kessy, Severine S. A. and Urio, Fratern M.}, + year = {2006}, + title = {The Contribution of Microfinance Institutions to + Poverty Reduction in {Tanzania}}, + type = {Research Report\APACredefineOnce{BRetrievedFrom} + {Retrieved from Research on Poverty Alleviation + website:\ }}, + number = {06.3}, + url = {http://www.repoa.or.tz/documents_storage/Publications/Reports/06.3_Kessy_and_Urio.pdf}, +} +@techreport{apa6:ch7-ex34, + author = {McDaniel, Julie E. and Miskel, Cecil G.}, + year = {2002}, + title = {The Effect of Groups and Individuals on National + Decisionmaking: Influence and Domination in the + Reading Policymaking Environment}, + type = {CIERA Report\APACredefineOnce{BRetrievedFrom} + {Retrieved from University of Michigan, Center for + Improvement of Early Reading Achievement website:\ }}, + number = {3-025}, + url = {http://www.ciera.org/library/reports/inquiry-3/3-025/3-025.pdf}, +} +@techreport{apa6:ch7-ex35, + author = {{\bibcorporate{Employee Benefit Research Institute}}}, + firstkey = {{Employee Benefit Research Institute [EBRI]}}, + key = {{EBRI}}, + year = {1992}, + month = feb, + title = {Sources of Health Insurance and Characteristics of the + Uninsured, Analysis of the {March} 1991 {Current} + {Population} {Survey}}, + type = {Issue Brief}, + number = {123}, + address = {Washington, DC}, + institution = {{\bibcorporate{Employee Benefit Research Institute}}}, +} +@lecture{apa6:ch7-ex36, + author = {Muellbauer, John}, + year = {2007}, + month = sep, + title = {Housing, Credit and Consumer Expenditure}, + chair = {Ludvigson, Sydney C.}, + symposium = {Housing and Consumer Behavior}, + howpublished = {Symposium conducted at the meeting of the {Federal} + {Reserve} {Bank} of {Kansas} {City}}, + address = {Jackson Hole, WY}, +} +@lecture{apa6:ch7-ex37, + author = {Liu, Shuhua}, + year = {2005}, + month = may, + title = {Defending Against Business Crises with the Help of + Intelligent Agent Based Early Warning Solutions}, + howpublished = {Paper presented at the Seventh International + Conference on Enterprise Information Systems}, + address = {Miami, FL\APACredefineOnce{BRetrievedFrom}{Abstract + retrieved from\ }}, + url = {http://www.iceis.org/iceis2005/abstracts_2005.htm}, +} +@article{apa6:ch7-ex38, + author = {Herculano-Houzel, Suzana and Collins, Christine E. + and Wong, Peiyan and Kaas, Jon H. and Lent, Roberto}, + year = {2008}, + title = {The Basic Nonuniformity of the Cerebral Cortex}, + journal = {Proceedings of the National Academy of Sciences, USA}, + volume = {105}, + pages = {12593--12598}, + doi = {10.1073/pnas.0805417105}, +} +@incollection{apa6:ch7-ex39, + author = {Katz, Itai and Gabayan, Kevin and Aghajan, Hamid}, + year = {2007}, + title = {A Multi-touch Surface Using Multiple Cameras}, + editor = {Blanc-Talon, Jacques and Philips, Wilfried + and Popescu, Dan and Scheunders, Paul}, + booktitle = {{Lecture} {Notes} in {Computer} {Science}: Vol.~4678. + {Advanced} Concepts for Intelligent Vision Systems}, + pages = {97--108}, + doi = {10.1007/978-3-540-74607-2_9}, +} +@mastersthesis{apa6:ch7-ex40, + author = {McNiel, Donita S.}, + year = {2006}, + title = {Meaning Through Narrative: A Personal Narrative + Discussing Growing Up with an Alcoholic Mother}, + howpublished = {Available from ProQuest Dissertations and Theses + database}, + note = {UMI No.\ 1434728}, +} +@phdthesis{apa6:ch7-ex40-2, + author = {Wilfley, Denise E.}, + year = {1989}, + title = {An Analysis of Psychological Distress, Self-concept, + and Patterns of Family Interactions in Two Subgroups + of Bulimia--Normal Weight and Obese}, + school = {University of Missouri}, + address = {Columbia}, +} +@mastersthesis{apa6:ch7-ex40-3, + author = {Almeida, David M.}, + year = {1989}, + title = {Fathers' Participation in Family Work: Consequences + for Fathers' Stress and Father-Child Relations}, + school = {University of Victoria}, + address = {Victoria, British Columbia, Canada}, +} +@phdthesis{apa6:ch7-ex41, + author = {Adams, Ronald Jerry}, + year = {1973}, + title = {Building a Foundation for Evaluation of Instruction in + Higher Education and Continuing Education}, + url = {http://www.ohiolink.edu/etd/}, +} +@phdthesis{apa6:ch7-ex42, + author = {Bruckman, Amy}, + year = {1997}, + title = {{MOOSE} Crossing: Construction, Community, and + Learning in a Networked Virtual World for Kids}, + school = {Massachusetts Institute of Technology}, + url = {http://www-static.cc.gatech.edu/~asb/thesis/}, +} +@phdthesis{apa6:ch7-ex43, + author = {Appelbaum, Lawrence G.}, + year = {2005}, + title = {Three Studies of Human Information Processing: + Texture Amplification, Motion Representation, and + Figure-Ground Segregation}, + journal = {Dissertation Abstracts International: Section B. + Sciences and Engineering}, + volume = {65}, + number = {10}, + pages = {5428}, +} +@phdthesis{apa6:ch7-ex44, + author = {Carlbom, Pelle}, + year = {2000}, + title = {Carbody and Passengers in Rail Vehicle Dynamics}, + type = {Doctoral thesis}, + school = {Royal Institute of Technology}, + address = {Stockholm, Sweden}, + url = {http://urn.kb.se/resolve?urn=urn:nbn:se:kth:diva-3029}, } @book{APAManual3, author = {{\bibcorporate{American Psychological Association}}}, Files old/doc/bibtex/apacite/apacite.pdf and new/doc/bibtex/apacite/apacite.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/bibtex/apacite/apacxmpl.tex new/doc/bibtex/apacite/apacxmpl.tex --- old/doc/bibtex/apacite/apacxmpl.tex 2012-02-28 01:33:09.000000000 +0100 +++ new/doc/bibtex/apacite/apacxmpl.tex 2013-07-23 00:04:45.000000000 +0200 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% %% apacxmpl.tex -%% [2012/02/25 v6.01 LaTeX file for examples] +%% [2013/07/21 v6.03 LaTeX file for examples] \documentclass{article} \usepackage{url} \usepackage{apacite} @@ -53,12 +53,12 @@ \author{Erik Meijer\\ \textsf{apacite at gmail.com} } -\date{2012/02/25} +\date{2013/07/21} \begin{document} \maketitle \begin{abstract} -This document tests \textsf{apacite} [2012/02/25 v6.01]. See the +This document tests \textsf{apacite} [2013/07/21 v6.03]. See the \textsf{apacite} documentation for more information. \end{abstract} @@ -257,6 +257,86 @@ \cite{apa6:ch7-ex30} \\ \fullciteA{apa6:ch7-ex30} \\ \citeA{apa6:ch7-ex30} +\item +\cite{apa6:ch7-ex31} \\ +\cite{apa6:ch7-ex31} \\ +\fullciteA{apa6:ch7-ex31} \\ +\citeA{apa6:ch7-ex31} +\item +\cite{apa6:ch7-ex32} \\ +\cite{apa6:ch7-ex32} \\ +\fullciteA{apa6:ch7-ex32} \\ +\citeA{apa6:ch7-ex32} +\item +\cite{apa6:ch7-ex33} \\ +\cite{apa6:ch7-ex33} \\ +\fullciteA{apa6:ch7-ex33} \\ +\citeA{apa6:ch7-ex33} +\item +\cite{apa6:ch7-ex34} \\ +\cite{apa6:ch7-ex34} \\ +\fullciteA{apa6:ch7-ex34} \\ +\citeA{apa6:ch7-ex34} +\item +\cite{apa6:ch7-ex35} \\ +\cite{apa6:ch7-ex35} \\ +\fullciteA{apa6:ch7-ex35} \\ +\citeA{apa6:ch7-ex35} +\item +\cite{apa6:ch7-ex36} \\ +\cite{apa6:ch7-ex36} \\ +\fullciteA{apa6:ch7-ex36} \\ +\citeA{apa6:ch7-ex36} +\item +\cite{apa6:ch7-ex37} \\ +\cite{apa6:ch7-ex37} \\ +\fullciteA{apa6:ch7-ex37} \\ +\citeA{apa6:ch7-ex37} +\item +\cite{apa6:ch7-ex38} \\ +\cite{apa6:ch7-ex38} \\ +\fullciteA{apa6:ch7-ex38} \\ +\citeA{apa6:ch7-ex38} +\item +\cite{apa6:ch7-ex39} \\ +\cite{apa6:ch7-ex39} \\ +\fullciteA{apa6:ch7-ex39} \\ +\citeA{apa6:ch7-ex39} +\item +\cite{apa6:ch7-ex40} \\ +\cite{apa6:ch7-ex40} \\ +\fullciteA{apa6:ch7-ex40} \\ +\citeA{apa6:ch7-ex40} \\ +\mbox{}\\ +\cite{apa6:ch7-ex40-2} \\ +\cite{apa6:ch7-ex40-2} \\ +\fullciteA{apa6:ch7-ex40-2} \\ +\citeA{apa6:ch7-ex40-2} \\ +\mbox{}\\ +\cite{apa6:ch7-ex40-3} \\ +\cite{apa6:ch7-ex40-3} \\ +\fullciteA{apa6:ch7-ex40-3} \\ +\citeA{apa6:ch7-ex40-3} +\item +\cite{apa6:ch7-ex41} \\ +\cite{apa6:ch7-ex41} \\ +\fullciteA{apa6:ch7-ex41} \\ +\citeA{apa6:ch7-ex41} +\item +\cite{apa6:ch7-ex42} \\ +\cite{apa6:ch7-ex42} \\ +\fullciteA{apa6:ch7-ex42} \\ +\citeA{apa6:ch7-ex42} +\item +\cite{apa6:ch7-ex43} \\ +\cite{apa6:ch7-ex43} \\ +\fullciteA{apa6:ch7-ex43} \\ +\citeA{apa6:ch7-ex43} +\item +\cite{apa6:ch7-ex44} \\ +\cite{apa6:ch7-ex44} \\ +\fullciteA{apa6:ch7-ex44} \\ +\citeA{apa6:ch7-ex44} \end{enumerate} \bibliographystyle{apacite} \bibliography{apa5ex} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apacite.doc.tlpobj new/tlpkg/tlpobj/apacite.doc.tlpobj --- old/tlpkg/tlpobj/apacite.doc.tlpobj 2012-02-28 04:32:00.000000000 +0100 +++ new/tlpkg/tlpobj/apacite.doc.tlpobj 2013-07-23 03:19:34.000000000 +0200 @@ -1,6 +1,6 @@ name apacite.doc category Package -revision 25515 +revision 31264 shortdesc doc files of apacite relocated 1 docfiles size=177 ++++++ apacite.tar.xz ++++++ ++++ 3763 lines of diff (skipped) ++++++ texlive-specs-a-rpmlintrc ++++++ addFilter(".*dangling-symlink.*/fonts/.*") addFilter(".*dangling-symlink.*/zypper\.py.*") addFilter(".*description-shorter-than-summary.*") addFilter(".*devel-file-in-non-devel-package.*/doc/.*") addFilter(".*files-duplicate.*") addFilter(".*E:.*files-duplicated-waste.*") addFilter(".*spelling-error.*") addFilter(".*zero-length.*") addFilter(".*E:.*summary-too-long.*") addFilter(".*incorrect-fsf-address.*") addFilter(".*hidden-file-or-dir.*/\.tex.*") addFilter(".*wrong-script-end-of-line-encoding.*") addFilter(".*script-without-shebang.*/doc/.*") addFilter(".*wrong-script-interpreter.*/doc/.*") addFilter(".*non-executable-script.*/doc/.*")
