From dc072067d34f630b6ad24b60fd64d2e11e3a3fa0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 14 Jul 2018 21:27:24 +0000 Subject: (13jul18) git-svn-id: svn://tug.org/texlive/trunk@48201 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/arara/arara.sh | 8 +++++++- Master/texmf-dist/doc/support/arara/README.md | 3 ++- .../texmf-dist/doc/support/arara/arara-manual.pdf | Bin 1802891 -> 1825371 bytes .../texmf-dist/doc/support/arara/arara-manual.tex | 6 +++++- Master/texmf-dist/doc/support/arara/arara.sty | 6 +++--- .../doc/support/arara/chapters/license.tex | 2 +- Master/texmf-dist/doc/support/arara/logos/bird.pdf | Bin 0 -> 3026 bytes .../texmf-dist/doc/support/arara/logos/logo1.pdf | Bin 0 -> 14215 bytes .../texmf-dist/doc/support/arara/logos/logo2.pdf | Bin 0 -> 14166 bytes Master/texmf-dist/scripts/arara/arara.jar | Bin 5119284 -> 5119284 bytes Master/texmf-dist/scripts/arara/arara.sh | 8 +++++++- Master/texmf-dist/scripts/arara/rules/indent.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/texindy.yaml | 2 +- Master/texmf-dist/scripts/arara/rules/xindy.yaml | 2 +- 14 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 Master/texmf-dist/doc/support/arara/logos/bird.pdf create mode 100644 Master/texmf-dist/doc/support/arara/logos/logo1.pdf create mode 100644 Master/texmf-dist/doc/support/arara/logos/logo2.pdf diff --git a/Build/source/texk/texlive/linked_scripts/arara/arara.sh b/Build/source/texk/texlive/linked_scripts/arara/arara.sh index e9a59c90b97..8f97643a72e 100755 --- a/Build/source/texk/texlive/linked_scripts/arara/arara.sh +++ b/Build/source/texk/texlive/linked_scripts/arara/arara.sh @@ -1,3 +1,9 @@ #!/bin/bash -jarpath=`kpsewhich --progname=arara --format=texmfscripts arara.jar` +kernel=`uname -s` +if test "${kernel#*CYGWIN}" != "$kernel" +then + jarpath=`cygpath -w $(kpsewhich --progname=arara --format=texmfscripts arara.jar)` +else + jarpath=`kpsewhich --progname=arara --format=texmfscripts arara.jar` +fi java -jar "$jarpath" "$@" diff --git a/Master/texmf-dist/doc/support/arara/README.md b/Master/texmf-dist/doc/support/arara/README.md index 0ba4f59b3c2..95dbb673eb1 100644 --- a/Master/texmf-dist/doc/support/arara/README.md +++ b/Master/texmf-dist/doc/support/arara/README.md @@ -7,6 +7,7 @@ ![Language: Java](https://img.shields.io/badge/language-Java-blue.svg?style=flat-square) ![Minimum JRE: 5.0](https://img.shields.io/badge/minimum_JRE-5.0-blue.svg?style=flat-square) [![License: New BSD](https://img.shields.io/badge/license-New_BSD-blue.svg?style=flat-square)](https://opensource.org/licenses/bsd-license) +![CTAN packaging: 4.0.3](https://img.shields.io/badge/CTAN_packaging-4.0.3-blue.svg?style=flat-square) `arara` is a TeX automation tool based on rules and directives. It gives you a way to enhance your TeX experience. The tool is an effort to provide a concise way to automate the daily TeX workflow for users and also package writers. Users might write their own rules when the provided ones do not suffice. @@ -29,7 +30,7 @@ Now when you run `arara myfile`, that directive (`% arara: ...`) will be seen an ![Current version: 4.0](https://img.shields.io/badge/current_version-4.0-blue.svg?style=flat-square) ![Development version: 5.0](https://img.shields.io/badge/development_version-5.0-red.svg?style=flat-square) -The stable major version of `arara` is the 4.0 series (note that revision numbers may vary). Please refer to the development branch for more information on the upcoming 5.0 series release. The master branch always refers to the stable version (including potential revisions). +The stable major version of `arara` is the 4.0 series (note that revision numbers may vary). Please refer to the development branch for more information on the upcoming 5.0 series release. The master branch always refers to the stable version (including potential revisions). The CTAN packaging for the current version is 4.0.3 (for internal use). For historical purposes, the source code for older versions of `arara` is available in the [releases](https://github.com/cereda/arara/releases) section of our repository. However, be mindful that these versions are unsupported. diff --git a/Master/texmf-dist/doc/support/arara/arara-manual.pdf b/Master/texmf-dist/doc/support/arara/arara-manual.pdf index 80b70a56564..99d9df9f2d8 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 c46b529f0fc..5045c97cb6a 100644 --- a/Master/texmf-dist/doc/support/arara/arara-manual.tex +++ b/Master/texmf-dist/doc/support/arara/arara-manual.tex @@ -31,6 +31,10 @@ % LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY % WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE % POSSIBILITY OF SUCH DAMAGE. + +\pdfobjcompresslevel=1 +\pdfpageattr {/Group << /S /Transparency /I true /CS /DeviceRGB>>} + \documentclass[a4paper,oneside,12pt]{memoir} \usepackage[T1]{fontenc} @@ -101,7 +105,7 @@ files but also used for data storage or transmission}, \vspace*{2em} \begin{center} -\includegraphics[scale=0.7]{../logos/logo2.pdf} +\includegraphics[scale=0.7]{logos/logo2.pdf} \vspace{4em} diff --git a/Master/texmf-dist/doc/support/arara/arara.sty b/Master/texmf-dist/doc/support/arara/arara.sty index 14576d7acae..573d12f270c 100644 --- a/Master/texmf-dist/doc/support/arara/arara.sty +++ b/Master/texmf-dist/doc/support/arara/arara.sty @@ -436,7 +436,7 @@ \renewcommand{\booktitlefont}{\huge\normalfont\em} \renewcommand{\booknamefont}{\huge\normalfont\em} \renewcommand{\booknumfont}{\huge\normalfont\em} -\renewcommand{\printpartname}{\centering\includegraphics[scale=.3]{../logos/bird.pdf}\par\partnamefont \textcolor{araracolour}{part}} +\renewcommand{\printpartname}{\centering\includegraphics[scale=.3]{logos/bird.pdf}\par\partnamefont \textcolor{araracolour}{part}} \renewcommand{\printpartnum}{\partnumfont\textcolor{araracolour}{\numtoname{\c@part}}} \cftpagenumbersoff{part} \renewcommand\partnumberline[1]{\hfil\hspace\@tocrmarg {\normalfont\normalsize\adforn{16}}\quad#1\hspace{0.5em}---\hspace{0.5em}} @@ -453,13 +453,13 @@ \@minus 0.167\onelineskip}% \renewcommand*{\chapnamefont}{\normalfont}% \renewcommand*{\printchaptername}{% - \centering\includegraphics[scale=.15]{../logos/bird.pdf}\par}% + \centering\includegraphics[scale=.15]{logos/bird.pdf}\par}% \renewcommand*{\chapnumfont}{\fontfamily{fco}\selectfont\bfseries}% \renewcommand*{\printchapternum}{\centering \chapnumfont \ifanappendix \thechapter \else \textcolor{araracolour}{\numtoname{\c@chapter}}\fi}% \renewcommand*{\chaptitlefont}{\normalfont\itshape\huge\centering}% \renewcommand*{\printchapternonum}{% - \centering\includegraphics[scale=.15]{../logos/bird.pdf}\par% + \centering\includegraphics[scale=.15]{logos/bird.pdf}\par% \vskip\midchapskip}% } diff --git a/Master/texmf-dist/doc/support/arara/chapters/license.tex b/Master/texmf-dist/doc/support/arara/chapters/license.tex index f562c377d1d..94d8a508193 100644 --- a/Master/texmf-dist/doc/support/arara/chapters/license.tex +++ b/Master/texmf-dist/doc/support/arara/chapters/license.tex @@ -10,7 +10,7 @@ \begin{messagebox}{New BSD License}{araracolour}{\icinfo}{white} \footnotesize -\includegraphics[scale=0.25]{../logos/logo1.pdf} +\includegraphics[scale=0.25]{logos/logo1.pdf} Copyright \textcopyright\ 2012--2018, Paulo Roberto Massa Cereda\\ All rights reserved. diff --git a/Master/texmf-dist/doc/support/arara/logos/bird.pdf b/Master/texmf-dist/doc/support/arara/logos/bird.pdf new file mode 100644 index 00000000000..fe294358499 Binary files /dev/null and b/Master/texmf-dist/doc/support/arara/logos/bird.pdf differ diff --git a/Master/texmf-dist/doc/support/arara/logos/logo1.pdf b/Master/texmf-dist/doc/support/arara/logos/logo1.pdf new file mode 100644 index 00000000000..fd9247fdd24 Binary files /dev/null and b/Master/texmf-dist/doc/support/arara/logos/logo1.pdf differ diff --git a/Master/texmf-dist/doc/support/arara/logos/logo2.pdf b/Master/texmf-dist/doc/support/arara/logos/logo2.pdf new file mode 100644 index 00000000000..97d8047de00 Binary files /dev/null and b/Master/texmf-dist/doc/support/arara/logos/logo2.pdf differ diff --git a/Master/texmf-dist/scripts/arara/arara.jar b/Master/texmf-dist/scripts/arara/arara.jar index 62fc8b58642..03519399de2 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/arara.sh b/Master/texmf-dist/scripts/arara/arara.sh index e9a59c90b97..8f97643a72e 100755 --- a/Master/texmf-dist/scripts/arara/arara.sh +++ b/Master/texmf-dist/scripts/arara/arara.sh @@ -1,3 +1,9 @@ #!/bin/bash -jarpath=`kpsewhich --progname=arara --format=texmfscripts arara.jar` +kernel=`uname -s` +if test "${kernel#*CYGWIN}" != "$kernel" +then + jarpath=`cygpath -w $(kpsewhich --progname=arara --format=texmfscripts arara.jar)` +else + jarpath=`kpsewhich --progname=arara --format=texmfscripts arara.jar` +fi java -jar "$jarpath" "$@" diff --git a/Master/texmf-dist/scripts/arara/rules/indent.yaml b/Master/texmf-dist/scripts/arara/rules/indent.yaml index 8390aa672e8..50aadea0be7 100644 --- a/Master/texmf-dist/scripts/arara/rules/indent.yaml +++ b/Master/texmf-dist/scripts/arara/rules/indent.yaml @@ -13,7 +13,7 @@ commands: - name: The latexindent.pl script command: > @{ - return getCommand('latexindent', silent, trace, ttrace, screenlog, + return getCommand('latexindent', silent, trace, screenlog, settings, cruft, overwrite, output, file, modifylinebreaks, options, logfile); } diff --git a/Master/texmf-dist/scripts/arara/rules/texindy.yaml b/Master/texmf-dist/scripts/arara/rules/texindy.yaml index b0a9c93842e..d527e0292d2 100644 --- a/Master/texmf-dist/scripts/arara/rules/texindy.yaml +++ b/Master/texmf-dist/scripts/arara/rules/texindy.yaml @@ -17,7 +17,7 @@ commands: infile = base.concat('.').concat(input); outfile = [ '-o', base.concat('.').concat(output) ]; logfile = [ '-t', base.concat('.').concat(log) ]; - return getCommand('texindy', quiet, debug, markup, modules, + return getCommand('texindy', quiet, markup, modules, codepage, language, logfile, outfile, options, infile); } arguments: diff --git a/Master/texmf-dist/scripts/arara/rules/xindy.yaml b/Master/texmf-dist/scripts/arara/rules/xindy.yaml index a44dbbfd08c..6daf807cc86 100644 --- a/Master/texmf-dist/scripts/arara/rules/xindy.yaml +++ b/Master/texmf-dist/scripts/arara/rules/xindy.yaml @@ -17,7 +17,7 @@ commands: infile = base.concat('.').concat(input); outfile = [ '-o', base.concat('.').concat(output) ]; logfile = [ '-t', base.concat('.').concat(log) ]; - return getCommand('xindy', quiet, debug, markup, modules, + return getCommand('xindy', quiet, markup, modules, codepage, language, logfile, outfile, options, infile); } arguments: -- cgit v1.2.3