From 08627691402a42859c7f9f555582d79570442ce9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 15 May 2016 22:08:28 +0000 Subject: abc (15may16) git-svn-id: svn://tug.org/texlive/trunk@41157 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/abc/README | 6 ++-- Master/texmf-dist/doc/latex/abc/abc.pdf | Bin 278241 -> 279861 bytes Master/texmf-dist/doc/latex/abc/jacky.abc | 10 +++++++ Master/texmf-dist/source/latex/abc/abc.dtx | 45 ++++++++++++++++++++++------- Master/texmf-dist/source/latex/abc/abc.ins | 4 +-- Master/texmf-dist/tex/latex/abc/abc.sty | 28 +++++++++++++----- 6 files changed, 70 insertions(+), 23 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/abc/jacky.abc (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/abc/README b/Master/texmf-dist/doc/latex/abc/README index d85e6f6614e..d2847d71a16 100644 --- a/Master/texmf-dist/doc/latex/abc/README +++ b/Master/texmf-dist/doc/latex/abc/README @@ -1,9 +1,9 @@ The abc package lets you include lines of music written in the ABC Plus language (http://abcplus.sourceforge.net). -This is version 2.0a of the package (a maintenance release) +This is version 2.0b of the package (a maintenance release) - Copyright 2005-2015 Enrico Gregorio + Copyright 2005-2016 Enrico Gregorio This program is provided under the terms of the LaTeX Project Public License distributed from CTAN @@ -54,5 +54,5 @@ your distribution's documentation. However, this is not strictly necessary in order to use the package, see the documentation. -2015/09/09 +2016/05/15 Enrico Gregorio diff --git a/Master/texmf-dist/doc/latex/abc/abc.pdf b/Master/texmf-dist/doc/latex/abc/abc.pdf index 6a3bf2a7132..a24052d015f 100644 Binary files a/Master/texmf-dist/doc/latex/abc/abc.pdf and b/Master/texmf-dist/doc/latex/abc/abc.pdf differ diff --git a/Master/texmf-dist/doc/latex/abc/jacky.abc b/Master/texmf-dist/doc/latex/abc/jacky.abc new file mode 100644 index 00000000000..ccdab65d1f3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/abc/jacky.abc @@ -0,0 +1,10 @@ +X:9 +T:Jacky Tar +R:hornpipe +M:4/4 +L:1/8 +K:Edor +(Bd) | "Em" e2 ed efge | "G" d2 B2 B2 (dB) | "D" ABde faef | d2 A2 A2 (Bd) | + "Em" e2 ef g2 fe | "G" dB GB d2 (cB) | "D" AGFE DEFA | "Em" G2 E2 E2 :| +(GA) | "Em" BGEG BGEG | BAGF E2 (FG) | "D" BGEG BGEG | AGFE D2 (EF) | + "G" GFGB g2 (fe) | dBGB d2 (cB) | "D" AGFE DEFA | "Em" G2 E2 E2 :| diff --git a/Master/texmf-dist/source/latex/abc/abc.dtx b/Master/texmf-dist/source/latex/abc/abc.dtx index 0ce7aff91ac..25fb129fb16 100644 --- a/Master/texmf-dist/source/latex/abc/abc.dtx +++ b/Master/texmf-dist/source/latex/abc/abc.dtx @@ -23,7 +23,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{abc} %<*package> - [2015/09/09 v2.0a Enrico Gregorio] + [2016/05/15 v2.0b Enrico Gregorio] % %<*driver> \documentclass{ltxdoc} @@ -38,7 +38,7 @@ % % \fi % -% \CheckSum{399} +% \CheckSum{416} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -56,6 +56,8 @@ % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % +% \changes{v2.0b}{2016/05/15}{Use shellesc} +% % \changes{v2.0a}{2015/09/09}{Fixed gobbling of leading lines that % start with \%} % @@ -130,7 +132,9 @@ % their documents small excerpts of music written directly in % ABC (Plus). It exploits the \verb|\write18| technique available with % the Web2C implementation of the \TeX{} system and free utilities -% like \texttt{ps2eps}, \texttt{ps2epsi} and \texttt{epstopdf}. +% like \texttt{ps2eps}, \texttt{ps2epsi} and \texttt{epstopdf}. From +% version 2.0b we check the existence of the \textsf{shellesc} package +% in order to be compatible with Lua\TeX. % % This package can be used both with \LaTeX{} and % \textsc{pdf}\LaTeX{}, without any change in the user's source file. @@ -269,7 +273,9 @@ % along with \texttt{generate} will not overwrite the output from % unnamed environment. It is possible that, during the document's % preparation, the numbers added to the default file name are out of -% synch, the process should converge. +% synch, the process should converge. Note that with Lua\TeX{} the +% \texttt{nosaveall} option can produce errors, so \texttt{saveall} is +% enabled by default, with this engine. % % % \section{Compiling documents} @@ -506,6 +512,7 @@ repeatend % The first options are boolean. % \begin{macrocode} %<*package> +\RequirePackage{ifluatex} \newif\ifabc@shellescape \newif\ifabc@generate \newif\ifabc@warning @@ -527,9 +534,15 @@ repeatend \DeclareOption{ps2epsi}{\def\abc@pscmd{ps2epsi}\def\abc@epsext{epsi}} \DeclareOption{ps2epsidos}{\def\abc@pscmd{ps2epsi}\def\abc@epsext{epi}} % \end{macrocode} -% Now we declare the default options and call the user specified ones. +% Now we declare the default options and call the user specified +% ones. Since Lua\TeX{} doesn't accept loading different PDF files +% with the same name, when this engine is used, the \texttt{saveall} +% option is enabled by default. % \begin{macrocode} \ExecuteOptions{generate,shellescape,nosaveall,ps2eps} +\ifluatex + \ExecuteOptions{saveall} +\fi \ProcessOptions\relax % \end{macrocode} % @@ -634,8 +647,15 @@ repeatend % interface. Then we check the options again and define the commands % that really do the job. % \begin{macrocode} +\ifluatex + \IfFileExists{shellesc.sty} + {\RequirePackage{shellesc}\let\abc@shell\ShellEscape} + {\def\abc@shell{\immediate\write18}} +\else + \def\abc@shell{\immediate\write18} +\fi \def\abc@doshellcommand{% - \immediate\write18{% + \abc@shell{% \ifabc@mup \abc@cmd\space \abc@opt\space @@ -648,12 +668,15 @@ repeatend \abc@tempfile\abc@ext\space \fi \ifx\abc@postopt\@empty - \else\space\abc@postopt\fi}% - \immediate\write18{% - \abc@pscmd\space\abc@tempfile.ps}% + \else\space\abc@postopt\fi + }% + \abc@shell{% + \abc@pscmd\space\abc@tempfile.ps + }% \ifpdf - \immediate\write18{% - \abc@epstopdfcmd\space\abc@tempfile.\abc@epsext}% + \abc@shell{% + \abc@epstopdfcmd\space\abc@tempfile.\abc@epsext + }% \fi } \def\abc@nodoshellcommand{% diff --git a/Master/texmf-dist/source/latex/abc/abc.ins b/Master/texmf-dist/source/latex/abc/abc.ins index e35f358c2fa..085dc5923da 100644 --- a/Master/texmf-dist/source/latex/abc/abc.ins +++ b/Master/texmf-dist/source/latex/abc/abc.ins @@ -1,6 +1,6 @@ %% %% abc.ins -%% Copyright 2006 Enrico Gregorio +%% Copyright 2006-2016 Enrico Gregorio %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN @@ -20,7 +20,7 @@ \input docstrip \preamble - Copyright 2006, 2008 Enrico Gregorio + Copyright 2006-2016 Enrico Gregorio This program is provided under the terms of the LaTeX Project Public License distributed from CTAN diff --git a/Master/texmf-dist/tex/latex/abc/abc.sty b/Master/texmf-dist/tex/latex/abc/abc.sty index 1833e9a3634..29fd83da7c1 100644 --- a/Master/texmf-dist/tex/latex/abc/abc.sty +++ b/Master/texmf-dist/tex/latex/abc/abc.sty @@ -19,8 +19,9 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{abc} - [2015/09/09 v2.0a Enrico Gregorio] + [2016/05/15 v2.0b Enrico Gregorio] +\RequirePackage{ifluatex} \newif\ifabc@shellescape \newif\ifabc@generate \newif\ifabc@warning @@ -39,6 +40,9 @@ \DeclareOption{ps2epsi}{\def\abc@pscmd{ps2epsi}\def\abc@epsext{epsi}} \DeclareOption{ps2epsidos}{\def\abc@pscmd{ps2epsi}\def\abc@epsext{epi}} \ExecuteOptions{generate,shellescape,nosaveall,ps2eps} +\ifluatex + \ExecuteOptions{saveall} +\fi \ProcessOptions\relax \RequirePackage{verbatim} \RequirePackage{keyval} @@ -94,8 +98,15 @@ \@esphack \abc@process } +\ifluatex + \IfFileExists{shellesc.sty} + {\RequirePackage{shellesc}\let\abc@shell\ShellEscape} + {\def\abc@shell{\immediate\write18}} +\else + \def\abc@shell{\immediate\write18} +\fi \def\abc@doshellcommand{% - \immediate\write18{% + \abc@shell{% \ifabc@mup \abc@cmd\space \abc@opt\space @@ -108,12 +119,15 @@ \abc@tempfile\abc@ext\space \fi \ifx\abc@postopt\@empty - \else\space\abc@postopt\fi}% - \immediate\write18{% - \abc@pscmd\space\abc@tempfile.ps}% + \else\space\abc@postopt\fi + }% + \abc@shell{% + \abc@pscmd\space\abc@tempfile.ps + }% \ifpdf - \immediate\write18{% - \abc@epstopdfcmd\space\abc@tempfile.\abc@epsext}% + \abc@shell{% + \abc@epstopdfcmd\space\abc@tempfile.\abc@epsext + }% \fi } \def\abc@nodoshellcommand{% -- cgit v1.2.3