From b2a785ee8f3d7bc6fa9f34883baa585f486c1a74 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Apr 2020 21:09:01 +0000 Subject: arara (14apr20) git-svn-id: svn://tug.org/texlive/trunk@54742 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/support/arara/README.md | 2 +- .../texmf-dist/doc/support/arara/arara-manual.pdf | Bin 1862533 -> 1865024 bytes .../texmf-dist/doc/support/arara/arara-manual.tex | 2 +- .../doc/support/arara/chapters/concepts.tex | 6 +++++- Master/texmf-dist/scripts/arara/arara.jar | Bin 16028276 -> 16028278 bytes Master/texmf-dist/scripts/arara/rules/animate.yaml | 4 ++-- .../texmf-dist/scripts/arara/rules/asymptote.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/bib2gls.yaml | 5 +++-- Master/texmf-dist/scripts/arara/rules/biber.yaml | 3 ++- Master/texmf-dist/scripts/arara/rules/bibtex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/bibtex8.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/bibtexu.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/context.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/csplain.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/detex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/dvipdfm.yaml | 4 ++-- .../texmf-dist/scripts/arara/rules/dvipdfmx.yaml | 4 ++-- Master/texmf-dist/scripts/arara/rules/dvips.yaml | 4 ++-- .../texmf-dist/scripts/arara/rules/dvipspdf.yaml | 8 ++++---- Master/texmf-dist/scripts/arara/rules/dvisvgm.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/etex.yaml | 3 ++- Master/texmf-dist/scripts/arara/rules/fig2dev.yaml | 2 +- .../scripts/arara/rules/frontespizio.yaml | 10 ++++++---- Master/texmf-dist/scripts/arara/rules/indent.yaml | 4 ++-- Master/texmf-dist/scripts/arara/rules/knitr.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/latex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/latexmk.yaml | 2 +- .../texmf-dist/scripts/arara/rules/luahbtex.yaml | 2 +- .../texmf-dist/scripts/arara/rules/lualatex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/luatex.yaml | 2 +- .../scripts/arara/rules/makeglossaries.yaml | 3 ++- .../scripts/arara/rules/makeglossarieslite.yaml | 3 ++- .../texmf-dist/scripts/arara/rules/makeindex.yaml | 2 +- .../texmf-dist/scripts/arara/rules/metapost.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/nomencl.yaml | 4 ++-- Master/texmf-dist/scripts/arara/rules/pbibtex.yaml | 2 +- .../texmf-dist/scripts/arara/rules/pdfcsplain.yaml | 2 +- .../texmf-dist/scripts/arara/rules/pdflatex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/pdftex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/pdftk.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/platex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/ps2pdf.yaml | 4 ++-- Master/texmf-dist/scripts/arara/rules/ptex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/sketch.yaml | 5 +++-- Master/texmf-dist/scripts/arara/rules/tex.yaml | 3 ++- .../texmf-dist/scripts/arara/rules/texcount.yaml | 3 ++- Master/texmf-dist/scripts/arara/rules/texindy.yaml | 2 +- .../texmf-dist/scripts/arara/rules/tikzmake.yaml | 2 +- .../texmf-dist/scripts/arara/rules/upbibtex.yaml | 3 ++- Master/texmf-dist/scripts/arara/rules/uplatex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/uptex.yaml | 2 +- .../texmf-dist/scripts/arara/rules/xdvipdfmx.yaml | 4 ++-- Master/texmf-dist/scripts/arara/rules/xelatex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/xetex.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/xindy.yaml | 2 +- .../source/support/arara/arara-5.1.0-src.zip | Bin 129837 -> 0 bytes .../source/support/arara/arara-5.1.1-src.zip | Bin 0 -> 129837 bytes 57 files changed, 84 insertions(+), 69 deletions(-) delete mode 100644 Master/texmf-dist/source/support/arara/arara-5.1.0-src.zip create mode 100644 Master/texmf-dist/source/support/arara/arara-5.1.1-src.zip (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/support/arara/README.md b/Master/texmf-dist/doc/support/arara/README.md index d5417174ca3..603096728fa 100644 --- a/Master/texmf-dist/doc/support/arara/README.md +++ b/Master/texmf-dist/doc/support/arara/README.md @@ -1,6 +1,6 @@ ![arara](https://i.stack.imgur.com/hjUsN.png) -# arara v5.1.0 +# arara v5.1.1 ![Language: Kotlin](https://img.shields.io/badge/Language-Kotlin-blue.svg?style=flat-square) ![Minimum JRE: 8.0](https://img.shields.io/badge/Minimum_JRE-8-blue.svg?style=flat-square) diff --git a/Master/texmf-dist/doc/support/arara/arara-manual.pdf b/Master/texmf-dist/doc/support/arara/arara-manual.pdf index 3a45d4a5196..210a51de4e7 100644 Binary files a/Master/texmf-dist/doc/support/arara/arara-manual.pdf and b/Master/texmf-dist/doc/support/arara/arara-manual.pdf differ diff --git a/Master/texmf-dist/doc/support/arara/arara-manual.tex b/Master/texmf-dist/doc/support/arara/arara-manual.tex index 3f245802fc7..4b15732eec8 100644 --- a/Master/texmf-dist/doc/support/arara/arara-manual.tex +++ b/Master/texmf-dist/doc/support/arara/arara-manual.tex @@ -42,7 +42,7 @@ \usepackage[margin=2.5cm]{geometry} \usepackage{arara} -\newcommand{\araraversion}{5.1} +\newcommand{\araraversion}{5.1.1} \begin{document} diff --git a/Master/texmf-dist/doc/support/arara/chapters/concepts.tex b/Master/texmf-dist/doc/support/arara/chapters/concepts.tex index ef71eb10ab9..87fac0469fc 100644 --- a/Master/texmf-dist/doc/support/arara/chapters/concepts.tex +++ b/Master/texmf-dist/doc/support/arara/chapters/concepts.tex @@ -375,7 +375,7 @@ It is important to observe that, in this case, \rbox{doc3.tex} is a plain \TeX\ Even when a directive is interpreted with a file other than the one being processed by \arara\ (through the magic of the \abox{files} parameter), it is possible to use helper methods in the rule context to get access to the original file and reference. Such methods are detailed later on, in Section~\ref{sec:files}, on page~\pageref{sec:files}. -\section{Important changes in version 5.0} +\section{Important changes in the 5.x series} \label{sec:migrationguide} \begin{messagebox}{A note to users}{araracolour}{\icattention}{white} @@ -473,4 +473,8 @@ From version 5.0 on, \arara\ is able to compile multiple files at once by provid A common problem when compiling \TeX\ files are specialties of \TeX\ engines looking for files. Usually, you should call an engine from the directory where the target file is located. \arara\ had the same restriction in that case. Now you can instruct \arara\ to operate from another directory lifting that constraint. See \autoref{chap:commandline} for details. \end{messagebox} +\begin{messagebox}{Relative paths for \TeX\ engines and tools}{araracolour}{\icinfo}{white} +It is worth mentioning that, although \arara\ provides the absolute, canonical path of the provided files in the rule context through the \abox{reference} variable, \TeX-related tools rely on the file name as a relative path with \mtbox{reference.getName()}. This decision was made due to path constraints in these tools, as well as to ensure auxiliary files are written in their correct locations. If you need to run \arara\ on a file located in another directory, refer to \autoref{chap:commandline}, as there is an specific command line option for that purpose. +\end{messagebox} + This section pretty much covered the basics of the changes to this version. Of course, it is highly advisable to make use of the new features available in \arara\ 5.0 for achieving better results. If you need any help, please do not hesitate to contact us. See Section~\ref{sec:support}, on page~\pageref{sec:support}, for more details on how to get help. diff --git a/Master/texmf-dist/scripts/arara/arara.jar b/Master/texmf-dist/scripts/arara/arara.jar index 3a08d2ea12d..3571ec7aaf0 100644 Binary files a/Master/texmf-dist/scripts/arara/arara.jar and b/Master/texmf-dist/scripts/arara/arara.jar differ diff --git a/Master/texmf-dist/scripts/arara/rules/animate.yaml b/Master/texmf-dist/scripts/arara/rules/animate.yaml index c2c3c3fcdcf..769ceaecee1 100644 --- a/Master/texmf-dist/scripts/arara/rules/animate.yaml +++ b/Master/texmf-dist/scripts/arara/rules/animate.yaml @@ -14,8 +14,8 @@ commands: command: > @{ prefix = []; - input = getBasename(reference).concat('.pdf'); - output = getBasename(reference).concat('.gif'); + input = getBasename(reference.getName()).concat('.pdf'); + output = getBasename(reference.getName()).concat('.gif'); return getCommand(program, '-delay', delay, '-loop', loop, '-density', density, options, input, output); } diff --git a/Master/texmf-dist/scripts/arara/rules/asymptote.yaml b/Master/texmf-dist/scripts/arara/rules/asymptote.yaml index 8ebf68eeda9..232213f73d4 100644 --- a/Master/texmf-dist/scripts/arara/rules/asymptote.yaml +++ b/Master/texmf-dist/scripts/arara/rules/asymptote.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand('asy', color, engine, twice, - format, output, options, reference); + format, output, options, reference.getName()); } arguments: - identifier: color diff --git a/Master/texmf-dist/scripts/arara/rules/bib2gls.yaml b/Master/texmf-dist/scripts/arara/rules/bib2gls.yaml index 0fa6f4d1a25..513a7207f76 100644 --- a/Master/texmf-dist/scripts/arara/rules/bib2gls.yaml +++ b/Master/texmf-dist/scripts/arara/rules/bib2gls.yaml @@ -62,7 +62,8 @@ commands: return getCommand('bib2gls', dir, trans, group, interpret, breakspace, trimfields, recordcount, recordcountunit, cite, verbose, merge, locale, uniscript, packages, - ignore, custom, mapformats, options, getBasename(reference)); + ignore, custom, mapformats, options, + getBasename(reference.getName())); } } arguments: @@ -79,7 +80,7 @@ arguments: throwError('Forbidden transcript extension'); } - return ['--log-file', getBasename(reference)+"."+parameters.trans] + return ['--log-file', getBasename(reference.getName())+"."+parameters.trans] } - identifier: locale flag: > diff --git a/Master/texmf-dist/scripts/arara/rules/biber.yaml b/Master/texmf-dist/scripts/arara/rules/biber.yaml index 1edafe1e969..6399df64fbb 100644 --- a/Master/texmf-dist/scripts/arara/rules/biber.yaml +++ b/Master/texmf-dist/scripts/arara/rules/biber.yaml @@ -16,7 +16,8 @@ commands: return getCommand('biber', '--tool', options); } else { - return getCommand('biber', options, getBasename(reference)); + return getCommand('biber', options, + getBasename(reference.getName())); } } arguments: diff --git a/Master/texmf-dist/scripts/arara/rules/bibtex.yaml b/Master/texmf-dist/scripts/arara/rules/bibtex.yaml index 73016ff43e9..a8457584406 100644 --- a/Master/texmf-dist/scripts/arara/rules/bibtex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/bibtex.yaml @@ -12,7 +12,7 @@ commands: - name: The BibTeX reference management software command: > @{ - return getCommand('bibtex', options, getBasename(reference)) + return getCommand('bibtex', options, getBasename(reference.getName())) } arguments: - identifier: options diff --git a/Master/texmf-dist/scripts/arara/rules/bibtex8.yaml b/Master/texmf-dist/scripts/arara/rules/bibtex8.yaml index 310cd96c2c2..2526c82b5a4 100644 --- a/Master/texmf-dist/scripts/arara/rules/bibtex8.yaml +++ b/Master/texmf-dist/scripts/arara/rules/bibtex8.yaml @@ -12,7 +12,7 @@ commands: - name: An 8-bit implementation of BibTeX 0.99 with a very large capacity command: > @{ - return getCommand('bibtex8', options, getBasename(reference)); + return getCommand('bibtex8', options, getBasename(reference.getName())); } arguments: - identifier: options diff --git a/Master/texmf-dist/scripts/arara/rules/bibtexu.yaml b/Master/texmf-dist/scripts/arara/rules/bibtexu.yaml index fa29aac8d2a..708a3ebfb6d 100644 --- a/Master/texmf-dist/scripts/arara/rules/bibtexu.yaml +++ b/Master/texmf-dist/scripts/arara/rules/bibtexu.yaml @@ -12,7 +12,7 @@ commands: - name: An 8-bit implementation of BibTeX 0.99 with a very large capacity command: > @{ - return getCommand('bibtexu', options, getBasename(reference)); + return getCommand('bibtexu', options, getBasename(reference.getName())); } arguments: - identifier: options diff --git a/Master/texmf-dist/scripts/arara/rules/context.yaml b/Master/texmf-dist/scripts/arara/rules/context.yaml index 5b8546486ed..bf5b1c5b041 100644 --- a/Master/texmf-dist/scripts/arara/rules/context.yaml +++ b/Master/texmf-dist/scripts/arara/rules/context.yaml @@ -15,7 +15,7 @@ commands: return getCommand('context', make, ctx, interface, autopdf, purge, modules, environments, mode, path, arguments, trackers, directives, silent, errors, interaction, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: make diff --git a/Master/texmf-dist/scripts/arara/rules/csplain.yaml b/Master/texmf-dist/scripts/arara/rules/csplain.yaml index f5447599ca0..720cd0cc8fe 100644 --- a/Master/texmf-dist/scripts/arara/rules/csplain.yaml +++ b/Master/texmf-dist/scripts/arara/rules/csplain.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand('csplain', interaction, draft, - shell, synctex, options, reference); + shell, synctex, options, reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/detex.yaml b/Master/texmf-dist/scripts/arara/rules/detex.yaml index d90d779d6a9..f94c7a274e8 100644 --- a/Master/texmf-dist/scripts/arara/rules/detex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/detex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ c = getCommand('detex', references, mode, follow, math, spaces, - words, environments, reference); + words, environments, reference.getName()); if (isEmpty(output)) { return c; } diff --git a/Master/texmf-dist/scripts/arara/rules/dvipdfm.yaml b/Master/texmf-dist/scripts/arara/rules/dvipdfm.yaml index bbd5be92c7d..c4f44309b86 100644 --- a/Master/texmf-dist/scripts/arara/rules/dvipdfm.yaml +++ b/Master/texmf-dist/scripts/arara/rules/dvipdfm.yaml @@ -12,7 +12,7 @@ commands: - name: The DVIPDFM program command: > @{ - base = getBasename(reference).concat('.dvi'); + base = getBasename(reference.getName()).concat('.dvi'); out = getBasename(output).concat('.pdf'); return getCommand('dvipdfm', base, '-o', out, options); } @@ -24,7 +24,7 @@ arguments: } default: > @{ - reference + reference.getName() } - identifier: options flag: > diff --git a/Master/texmf-dist/scripts/arara/rules/dvipdfmx.yaml b/Master/texmf-dist/scripts/arara/rules/dvipdfmx.yaml index d62f89968d4..b9b73319e3f 100644 --- a/Master/texmf-dist/scripts/arara/rules/dvipdfmx.yaml +++ b/Master/texmf-dist/scripts/arara/rules/dvipdfmx.yaml @@ -12,7 +12,7 @@ commands: - name: The DVIPDFMX program command: > @{ - base = getBasename(reference).concat('.dvi'); + base = getBasename(reference.getName()).concat('.dvi'); out = getBasename(output).concat('.pdf'); return getCommand('dvipdfmx', base, '-o', out, options); } @@ -24,7 +24,7 @@ arguments: } default: > @{ - reference + reference.getName() } - identifier: options flag: > diff --git a/Master/texmf-dist/scripts/arara/rules/dvips.yaml b/Master/texmf-dist/scripts/arara/rules/dvips.yaml index 68196e09dda..78a2cff58dd 100644 --- a/Master/texmf-dist/scripts/arara/rules/dvips.yaml +++ b/Master/texmf-dist/scripts/arara/rules/dvips.yaml @@ -12,7 +12,7 @@ commands: - name: The DVIPS program command: > @{ - base = getBasename(reference).concat('.dvi'); + base = getBasename(reference.getName()).concat('.dvi'); out = getBasename(output).concat('.ps'); return getCommand('dvips', base, '-o', out, options); } @@ -24,7 +24,7 @@ arguments: } default: > @{ - reference + reference.getName() } - identifier: options flag: > diff --git a/Master/texmf-dist/scripts/arara/rules/dvipspdf.yaml b/Master/texmf-dist/scripts/arara/rules/dvipspdf.yaml index a4888325e62..68c12dde345 100644 --- a/Master/texmf-dist/scripts/arara/rules/dvipspdf.yaml +++ b/Master/texmf-dist/scripts/arara/rules/dvipspdf.yaml @@ -12,14 +12,14 @@ commands: - name: The DVIPS program command: > @{ - base = getBasename(reference).concat('.dvi'); - out = getBasename(reference).concat('.ps'); + base = getBasename(reference.getName()).concat('.dvi'); + out = getBasename(reference.getName()).concat('.ps'); return getCommand('dvips', base, '-o', out, options1); } - name: The PS2PDF program command: > @{ - base = getBasename(reference).concat('.ps'); + base = getBasename(reference.getName()).concat('.ps'); out = getBasename(output).concat('.pdf'); return getCommand('ps2pdf', options2, base, '-o', out); } @@ -31,7 +31,7 @@ arguments: } default: > @{ - reference + reference.getName() } - identifier: options1 flag: > diff --git a/Master/texmf-dist/scripts/arara/rules/dvisvgm.yaml b/Master/texmf-dist/scripts/arara/rules/dvisvgm.yaml index d9d094ac3e4..d0bae984de0 100644 --- a/Master/texmf-dist/scripts/arara/rules/dvisvgm.yaml +++ b/Master/texmf-dist/scripts/arara/rules/dvisvgm.yaml @@ -12,7 +12,7 @@ commands: - name: The dvisvgm program command: > @{ - base = getBasename(reference).concat('.dvi'); + base = getBasename(reference.getName()).concat('.dvi'); return getCommand('dvisvgm', base, options); } arguments: diff --git a/Master/texmf-dist/scripts/arara/rules/etex.yaml b/Master/texmf-dist/scripts/arara/rules/etex.yaml index 0411915ef76..e039b143dad 100644 --- a/Master/texmf-dist/scripts/arara/rules/etex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/etex.yaml @@ -12,7 +12,8 @@ commands: - name: Extended TeX engine command: > @{ - return getCommand('etex', interaction, shell, options, reference); + return getCommand('etex', interaction, shell, options, + reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/fig2dev.yaml b/Master/texmf-dist/scripts/arara/rules/fig2dev.yaml index fd36069205c..4e796e5c4d6 100644 --- a/Master/texmf-dist/scripts/arara/rules/fig2dev.yaml +++ b/Master/texmf-dist/scripts/arara/rules/fig2dev.yaml @@ -12,7 +12,7 @@ commands: - name: The fig2dev program command: > @{ - input = getBasename(reference).concat('.fig'); + input = getBasename(reference.getName()).concat('.fig'); return getCommand('fig2dev', language, magnification, font, size, options, input, output); } diff --git a/Master/texmf-dist/scripts/arara/rules/frontespizio.yaml b/Master/texmf-dist/scripts/arara/rules/frontespizio.yaml index 3b0ab0a853d..2cabec38a0d 100644 --- a/Master/texmf-dist/scripts/arara/rules/frontespizio.yaml +++ b/Master/texmf-dist/scripts/arara/rules/frontespizio.yaml @@ -14,18 +14,19 @@ commands: - name: The engine command: > @{ - return getCommand(engine, interaction, shell, options, reference) + return getCommand(engine, interaction, shell, options, + reference.getName()) } - name: The frontispiece command: > @{ - base = getBasename(reference).concat('-frn'); + base = getBasename(reference.getName()).concat('-frn'); return getCommand(engine, interaction, shell, base); } - name: The DVIPS program command: > @{ - base = getBasename(reference).concat('-frn'); + base = getBasename(reference.getName()).concat('-frn'); eps = base.concat('.eps'); return isTrue(engine == 'latex', getCommand('dvips', '-o', eps, base), ''); @@ -33,7 +34,8 @@ commands: - name: The engine command: > @{ - return getCommand(engine, interaction, shell, options, reference); + return getCommand(engine, interaction, shell, options, + reference.getName()); } arguments: - identifier: engine diff --git a/Master/texmf-dist/scripts/arara/rules/indent.yaml b/Master/texmf-dist/scripts/arara/rules/indent.yaml index 4471d3728c9..b6dce8b2d53 100644 --- a/Master/texmf-dist/scripts/arara/rules/indent.yaml +++ b/Master/texmf-dist/scripts/arara/rules/indent.yaml @@ -14,8 +14,8 @@ commands: command: > @{ return getCommand('latexindent', silent, trace, screenlog, - settings, cruft, overwrite, output, reference, modifylinebreaks, - replacement, options, logfile); + settings, cruft, overwrite, output, reference.getName(), + modifylinebreaks, replacement, options, logfile); } arguments: - identifier: silent diff --git a/Master/texmf-dist/scripts/arara/rules/knitr.yaml b/Master/texmf-dist/scripts/arara/rules/knitr.yaml index 3a3d5dfead1..a2e5fcd7bf5 100644 --- a/Master/texmf-dist/scripts/arara/rules/knitr.yaml +++ b/Master/texmf-dist/scripts/arara/rules/knitr.yaml @@ -19,7 +19,7 @@ commands: elements.add('envir = ' + envir); elements.add('encoding = ' + encoding); return getCommand('Rscript', '-e', - 'library(knitr); knit("' + reference + '", ' + + 'library(knitr); knit("' + reference.getName() + '", ' + 'output = ' + isEmpty(output, 'NULL', '"' + output + '"') + ', ' + String.join(', ', elements) + ')'); } diff --git a/Master/texmf-dist/scripts/arara/rules/latex.yaml b/Master/texmf-dist/scripts/arara/rules/latex.yaml index 268ff1f7076..fc96395c233 100644 --- a/Master/texmf-dist/scripts/arara/rules/latex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/latex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand(branch, interaction, draft, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: branch diff --git a/Master/texmf-dist/scripts/arara/rules/latexmk.yaml b/Master/texmf-dist/scripts/arara/rules/latexmk.yaml index 0f39e9d7098..455f942fdb1 100644 --- a/Master/texmf-dist/scripts/arara/rules/latexmk.yaml +++ b/Master/texmf-dist/scripts/arara/rules/latexmk.yaml @@ -17,7 +17,7 @@ commands: } else { return getCommand('latexmk', isEmpty(program, engine, - program), options, reference); + program), options, reference.getName()); } } arguments: diff --git a/Master/texmf-dist/scripts/arara/rules/luahbtex.yaml b/Master/texmf-dist/scripts/arara/rules/luahbtex.yaml index 1557fa06145..cf4fde56e4e 100644 --- a/Master/texmf-dist/scripts/arara/rules/luahbtex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/luahbtex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand('luahbtex', interaction, draft, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/lualatex.yaml b/Master/texmf-dist/scripts/arara/rules/lualatex.yaml index 68f14d78e9e..de68a48b8ff 100644 --- a/Master/texmf-dist/scripts/arara/rules/lualatex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/lualatex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand(branch, interaction, draft, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: branch diff --git a/Master/texmf-dist/scripts/arara/rules/luatex.yaml b/Master/texmf-dist/scripts/arara/rules/luatex.yaml index 91099219f64..03a726fa643 100644 --- a/Master/texmf-dist/scripts/arara/rules/luatex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/luatex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand('luatex', interaction, draft, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/makeglossaries.yaml b/Master/texmf-dist/scripts/arara/rules/makeglossaries.yaml index 861330045e8..7cb47cc5df8 100644 --- a/Master/texmf-dist/scripts/arara/rules/makeglossaries.yaml +++ b/Master/texmf-dist/scripts/arara/rules/makeglossaries.yaml @@ -14,7 +14,8 @@ commands: @{ if (isEmpty(clean)) { - return getCommand('makeglossaries', options, getBasename(reference)); + return getCommand('makeglossaries', options, + getBasename(reference.getName())); } else { prefix = []; diff --git a/Master/texmf-dist/scripts/arara/rules/makeglossarieslite.yaml b/Master/texmf-dist/scripts/arara/rules/makeglossarieslite.yaml index 177ba6971fb..c384179f44f 100644 --- a/Master/texmf-dist/scripts/arara/rules/makeglossarieslite.yaml +++ b/Master/texmf-dist/scripts/arara/rules/makeglossarieslite.yaml @@ -12,7 +12,8 @@ commands: - name: The MakeGlossariesLite software command: > @{ - return getCommand('makeglossaries-lite', options, getBasename(reference)); + return getCommand('makeglossaries-lite', options, + getBasename(reference.getName())); } arguments: - identifier: options diff --git a/Master/texmf-dist/scripts/arara/rules/makeindex.yaml b/Master/texmf-dist/scripts/arara/rules/makeindex.yaml index 319ef71438b..25b9e44c902 100644 --- a/Master/texmf-dist/scripts/arara/rules/makeindex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/makeindex.yaml @@ -12,7 +12,7 @@ commands: - name: The MakeIndex software command: > @{ - base = getBasename(reference); + base = getBasename(reference.getName()); infile = base.concat('.').concat(input); outfile = [ '-o', base.concat('.').concat(output) ]; logfile = [ '-t', base.concat('.').concat(log) ]; diff --git a/Master/texmf-dist/scripts/arara/rules/metapost.yaml b/Master/texmf-dist/scripts/arara/rules/metapost.yaml index b3a58645ddd..e334210ce5e 100644 --- a/Master/texmf-dist/scripts/arara/rules/metapost.yaml +++ b/Master/texmf-dist/scripts/arara/rules/metapost.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand('mpost', interaction, numbersystem, - options, reference); + options, reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/nomencl.yaml b/Master/texmf-dist/scripts/arara/rules/nomencl.yaml index f859f728813..4672cb4ea98 100644 --- a/Master/texmf-dist/scripts/arara/rules/nomencl.yaml +++ b/Master/texmf-dist/scripts/arara/rules/nomencl.yaml @@ -12,8 +12,8 @@ commands: - name: The Nomenclature software command: > @{ - nlo = getBasename(reference).concat('.nlo'); - nls = getBasename(reference).concat('.nls'); + nlo = getBasename(reference.getName()).concat('.nlo'); + nls = getBasename(reference.getName()).concat('.nls'); return getCommand('makeindex', options, nlo, style, '-o', nls); } arguments: diff --git a/Master/texmf-dist/scripts/arara/rules/pbibtex.yaml b/Master/texmf-dist/scripts/arara/rules/pbibtex.yaml index 1a0347da760..a313b7fe922 100644 --- a/Master/texmf-dist/scripts/arara/rules/pbibtex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/pbibtex.yaml @@ -12,7 +12,7 @@ commands: - name: The pBibTeX reference management software command: > @{ - return getCommand('pbibtex', options, getBasename(reference)) + return getCommand('pbibtex', options, getBasename(reference.getName())) } arguments: - identifier: options diff --git a/Master/texmf-dist/scripts/arara/rules/pdfcsplain.yaml b/Master/texmf-dist/scripts/arara/rules/pdfcsplain.yaml index 88d2f7b31e7..079440628a3 100644 --- a/Master/texmf-dist/scripts/arara/rules/pdfcsplain.yaml +++ b/Master/texmf-dist/scripts/arara/rules/pdfcsplain.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand('pdfcsplain', interaction, draft, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/pdflatex.yaml b/Master/texmf-dist/scripts/arara/rules/pdflatex.yaml index 385e99b9972..c1ee2f90773 100644 --- a/Master/texmf-dist/scripts/arara/rules/pdflatex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/pdflatex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand(branch, interaction, draft, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: branch diff --git a/Master/texmf-dist/scripts/arara/rules/pdftex.yaml b/Master/texmf-dist/scripts/arara/rules/pdftex.yaml index 45a7e32f244..c6699b7dca4 100644 --- a/Master/texmf-dist/scripts/arara/rules/pdftex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/pdftex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand('pdftex', interaction, draft, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/pdftk.yaml b/Master/texmf-dist/scripts/arara/rules/pdftk.yaml index 73ee784417d..a457d67d531 100644 --- a/Master/texmf-dist/scripts/arara/rules/pdftk.yaml +++ b/Master/texmf-dist/scripts/arara/rules/pdftk.yaml @@ -12,7 +12,7 @@ commands: - name: PDFtk command: > @{ - input = getBasename(reference).concat('.pdf'); + input = getBasename(reference.getName()).concat('.pdf'); return getCommand('pdftk', input, options); } arguments: diff --git a/Master/texmf-dist/scripts/arara/rules/platex.yaml b/Master/texmf-dist/scripts/arara/rules/platex.yaml index 0c1d62cacd3..edf5d4864ba 100644 --- a/Master/texmf-dist/scripts/arara/rules/platex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/platex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand(branch, interaction, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: branch diff --git a/Master/texmf-dist/scripts/arara/rules/ps2pdf.yaml b/Master/texmf-dist/scripts/arara/rules/ps2pdf.yaml index db220f30376..dcc49f87b9d 100644 --- a/Master/texmf-dist/scripts/arara/rules/ps2pdf.yaml +++ b/Master/texmf-dist/scripts/arara/rules/ps2pdf.yaml @@ -12,7 +12,7 @@ commands: - name: The PS2PDF program command: > @{ - infile = getBasename(reference).concat('.ps'); + infile = getBasename(reference.getName()).concat('.ps'); outfile = getBasename(output).concat('.pdf'); return getCommand('ps2pdf', options, infile, outfile); } @@ -24,7 +24,7 @@ arguments: } default: > @{ - reference + reference.getName() } - identifier: options flag: > diff --git a/Master/texmf-dist/scripts/arara/rules/ptex.yaml b/Master/texmf-dist/scripts/arara/rules/ptex.yaml index cb5103fa365..9367704cb9e 100644 --- a/Master/texmf-dist/scripts/arara/rules/ptex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/ptex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand('ptex', interaction, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/sketch.yaml b/Master/texmf-dist/scripts/arara/rules/sketch.yaml index 0970d2e5b8f..e7bae9b329b 100644 --- a/Master/texmf-dist/scripts/arara/rules/sketch.yaml +++ b/Master/texmf-dist/scripts/arara/rules/sketch.yaml @@ -13,8 +13,9 @@ commands: - name: The Sketch software command: > @{ - output = getBasename(reference).concat('.tex'); - return getCommand('sketch', options, reference, '-o', output); + output = getBasename(reference.getName()).concat('.tex'); + return getCommand('sketch', options, reference.getName(), + '-o', output); } arguments: - identifier: options diff --git a/Master/texmf-dist/scripts/arara/rules/tex.yaml b/Master/texmf-dist/scripts/arara/rules/tex.yaml index c682ea6b919..d036e5cb0dc 100644 --- a/Master/texmf-dist/scripts/arara/rules/tex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/tex.yaml @@ -12,7 +12,8 @@ commands: - name: TeX engine command: > @{ - return getCommand('tex', interaction, shell, options, reference); + return getCommand('tex', interaction, shell, options, + reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/texcount.yaml b/Master/texmf-dist/scripts/arara/rules/texcount.yaml index 79506c806c9..694ac6d481b 100644 --- a/Master/texmf-dist/scripts/arara/rules/texcount.yaml +++ b/Master/texmf-dist/scripts/arara/rules/texcount.yaml @@ -13,7 +13,8 @@ commands: command: > @{ return getCommand('texcount', rules, verbosity, strict, html, - total, unicode, options, output, reference); + total, unicode, options, output, + reference.getName()); } arguments: - identifier: rules diff --git a/Master/texmf-dist/scripts/arara/rules/texindy.yaml b/Master/texmf-dist/scripts/arara/rules/texindy.yaml index 6d747f7217c..45c4637889c 100644 --- a/Master/texmf-dist/scripts/arara/rules/texindy.yaml +++ b/Master/texmf-dist/scripts/arara/rules/texindy.yaml @@ -12,7 +12,7 @@ commands: - name: The TeXindy software command: > @{ - base = getBasename(reference); + base = getBasename(reference.getName()); infile = base.concat('.').concat(input); outfile = [ '-o', base.concat('.').concat(output) ]; logfile = [ '-t', base.concat('.').concat(log) ]; diff --git a/Master/texmf-dist/scripts/arara/rules/tikzmake.yaml b/Master/texmf-dist/scripts/arara/rules/tikzmake.yaml index 0569ba9a650..69e72c48852 100644 --- a/Master/texmf-dist/scripts/arara/rules/tikzmake.yaml +++ b/Master/texmf-dist/scripts/arara/rules/tikzmake.yaml @@ -13,7 +13,7 @@ commands: - name: TikZ list-and-make engine command: > @{ - makefile = getBasename(reference).concat('.makefile'); + makefile = getBasename(reference.getName()).concat('.makefile'); return getCommand('make', force, jobs, options, '-f', makefile); } arguments: diff --git a/Master/texmf-dist/scripts/arara/rules/upbibtex.yaml b/Master/texmf-dist/scripts/arara/rules/upbibtex.yaml index d6593dea57f..bb32250c6c6 100644 --- a/Master/texmf-dist/scripts/arara/rules/upbibtex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/upbibtex.yaml @@ -12,7 +12,8 @@ commands: - name: The upBibTeX reference management software command: > @{ - return getCommand('upbibtex', options, getBasename(reference)) + return getCommand('upbibtex', options, + getBasename(reference.getName())) } arguments: - identifier: options diff --git a/Master/texmf-dist/scripts/arara/rules/uplatex.yaml b/Master/texmf-dist/scripts/arara/rules/uplatex.yaml index c0f2cdf3cd0..c2690d11052 100644 --- a/Master/texmf-dist/scripts/arara/rules/uplatex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/uplatex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand(branch, interaction, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: branch diff --git a/Master/texmf-dist/scripts/arara/rules/uptex.yaml b/Master/texmf-dist/scripts/arara/rules/uptex.yaml index 6163e0ae699..fb7a2282fdb 100644 --- a/Master/texmf-dist/scripts/arara/rules/uptex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/uptex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand('uptex', interaction, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/xdvipdfmx.yaml b/Master/texmf-dist/scripts/arara/rules/xdvipdfmx.yaml index 75bf182a4df..6c569ef31c5 100644 --- a/Master/texmf-dist/scripts/arara/rules/xdvipdfmx.yaml +++ b/Master/texmf-dist/scripts/arara/rules/xdvipdfmx.yaml @@ -12,7 +12,7 @@ commands: - name: The XDVIPDFMX program command: > @{ - infile = getBasename(reference).concat('.dvi'); + infile = getBasename(reference.getName()).concat('.dvi'); outfile = getBasename(output).concat('.pdf'); return getCommand('xdvipdfmx', infile, '-o', outfile, options); } @@ -24,7 +24,7 @@ arguments: } default: > @{ - reference + reference.getName() } - identifier: options flag: > diff --git a/Master/texmf-dist/scripts/arara/rules/xelatex.yaml b/Master/texmf-dist/scripts/arara/rules/xelatex.yaml index b94e35f7970..021f4cea6fd 100644 --- a/Master/texmf-dist/scripts/arara/rules/xelatex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/xelatex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand(branch, interaction, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: branch diff --git a/Master/texmf-dist/scripts/arara/rules/xetex.yaml b/Master/texmf-dist/scripts/arara/rules/xetex.yaml index faefd9ca173..687b08f200e 100644 --- a/Master/texmf-dist/scripts/arara/rules/xetex.yaml +++ b/Master/texmf-dist/scripts/arara/rules/xetex.yaml @@ -13,7 +13,7 @@ commands: command: > @{ return getCommand('xetex', interaction, shell, - synctex, options, reference); + synctex, options, reference.getName()); } arguments: - identifier: interaction diff --git a/Master/texmf-dist/scripts/arara/rules/xindy.yaml b/Master/texmf-dist/scripts/arara/rules/xindy.yaml index f1c12f0c1d6..161ae60158f 100644 --- a/Master/texmf-dist/scripts/arara/rules/xindy.yaml +++ b/Master/texmf-dist/scripts/arara/rules/xindy.yaml @@ -12,7 +12,7 @@ commands: - name: The Xindy software command: > @{ - base = getBasename(reference); + base = getBasename(reference.getName()); infile = base.concat('.').concat(input); outfile = [ '-o', base.concat('.').concat(output) ]; logfile = [ '-t', base.concat('.').concat(log) ]; diff --git a/Master/texmf-dist/source/support/arara/arara-5.1.0-src.zip b/Master/texmf-dist/source/support/arara/arara-5.1.0-src.zip deleted file mode 100644 index ec051291b6e..00000000000 Binary files a/Master/texmf-dist/source/support/arara/arara-5.1.0-src.zip and /dev/null differ diff --git a/Master/texmf-dist/source/support/arara/arara-5.1.1-src.zip b/Master/texmf-dist/source/support/arara/arara-5.1.1-src.zip new file mode 100644 index 00000000000..a17febf320e Binary files /dev/null and b/Master/texmf-dist/source/support/arara/arara-5.1.1-src.zip differ -- cgit v1.2.3