From 77079b6394ae3a4db8618c08200cb6724cdd2f23 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Oct 2021 20:49:19 +0000 Subject: arara (17oct21) git-svn-id: svn://tug.org/texlive/trunk@60789 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/man/man1/arara.1 | 2 +- Master/texmf-dist/doc/man/man1/arara.man1.pdf | Bin 20383 -> 20362 bytes Master/texmf-dist/doc/support/arara/README.md | 2 +- .../texmf-dist/doc/support/arara/arara-manual.pdf | Bin 1976977 -> 1971118 bytes .../doc/support/arara/arara-quickstart.pdf | Bin 253135 -> 252983 bytes .../doc/support/arara/chapters/rules.tex | 10 ++++++++++ Master/texmf-dist/doc/support/arara/version.tex | 2 +- Master/texmf-dist/scripts/arara/arara.jar | Bin 11665766 -> 11665766 bytes .../scripts/arara/rules/arara-rule-indent.yaml | 21 ++++++++++++++++++--- .../source/support/arara/arara-6.1.1-src.zip | Bin 131975 -> 0 bytes .../source/support/arara/arara-6.1.2-src.zip | Bin 0 -> 131975 bytes Master/tlpkg/libexec/ctan2tds | 1 + 12 files changed, 32 insertions(+), 6 deletions(-) delete mode 100644 Master/texmf-dist/source/support/arara/arara-6.1.1-src.zip create mode 100644 Master/texmf-dist/source/support/arara/arara-6.1.2-src.zip (limited to 'Master') diff --git a/Master/texmf-dist/doc/man/man1/arara.1 b/Master/texmf-dist/doc/man/man1/arara.1 index ac6c678ec25..f59a8416435 100644 --- a/Master/texmf-dist/doc/man/man1/arara.1 +++ b/Master/texmf-dist/doc/man/man1/arara.1 @@ -1,4 +1,4 @@ -.TH ARARA 1 "26 June 2021" "v6.1.1" +.TH ARARA 1 "17 October 2021" "v6.1.2" .SH NAME arara \- a TeX automation tool based on rules and directives. .SH SYNOPSIS diff --git a/Master/texmf-dist/doc/man/man1/arara.man1.pdf b/Master/texmf-dist/doc/man/man1/arara.man1.pdf index 3ae46820edd..ae8ee6a7976 100644 Binary files a/Master/texmf-dist/doc/man/man1/arara.man1.pdf and b/Master/texmf-dist/doc/man/man1/arara.man1.pdf differ diff --git a/Master/texmf-dist/doc/support/arara/README.md b/Master/texmf-dist/doc/support/arara/README.md index 41675e89a98..3110c15e300 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 v6.1.1 +# arara v6.1.2 ![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 650404820f0..9f762443142 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-quickstart.pdf b/Master/texmf-dist/doc/support/arara/arara-quickstart.pdf index f6ced644cba..9fcfa85863d 100644 Binary files a/Master/texmf-dist/doc/support/arara/arara-quickstart.pdf and b/Master/texmf-dist/doc/support/arara/arara-quickstart.pdf differ diff --git a/Master/texmf-dist/doc/support/arara/chapters/rules.tex b/Master/texmf-dist/doc/support/arara/chapters/rules.tex index ed46c0b2daf..244ecac2b19 100644 --- a/Master/texmf-dist/doc/support/arara/chapters/rules.tex +++ b/Master/texmf-dist/doc/support/arara/chapters/rules.tex @@ -714,6 +714,16 @@ This rule runs \rbox{latexindent}, a Perl script that indents \TeX\ files accord \item[\povalue{noindent}] This value, as the name implies, will not perform indentation, and will perform replacements not respecting verbatim code blocks. \end{description} + +\item[\abox{check}] This option, as the name indicates, checks whether the text after indentation matches that given in the original file. Two possible values are available: + +\begin{description} +\item[\povalue{standard}] This value, as the name indicates, refers to the standard behaviour. Please refer to the documentation for further details. + +\item[\povalue{verbose}] This value, as the name indicates, refers to including more details to the check. The tool will print the result in the standard output, as well as in its own log file. Please refer to the documentation for further details. +\end{description} + +\item[\abox{lines}] This option instructs the tool to operate only on specific line ranges within the file being inspected. Please refer to the documentation for further details. \end{description} \begin{codebox}{Example}{teal}{\icnote}{white} diff --git a/Master/texmf-dist/doc/support/arara/version.tex b/Master/texmf-dist/doc/support/arara/version.tex index 132c6def58c..92f2ea29941 100644 --- a/Master/texmf-dist/doc/support/arara/version.tex +++ b/Master/texmf-dist/doc/support/arara/version.tex @@ -1 +1 @@ -6.1.1 \ No newline at end of file +6.1.2 \ No newline at end of file diff --git a/Master/texmf-dist/scripts/arara/arara.jar b/Master/texmf-dist/scripts/arara/arara.jar index 65f11464d1b..96b206f3214 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/arara-rule-indent.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-indent.yaml index 8425d596ded..accfa3b2d77 100644 --- a/Master/texmf-dist/scripts/arara/rules/arara-rule-indent.yaml +++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-indent.yaml @@ -13,9 +13,9 @@ commands: - name: The latexindent.pl script command: > @{ - return getCommand('latexindent', silent, trace, screenlog, + return getCommand('latexindent', silent, trace, screenlog, lines, settings, cruft, overwrite, output, reference.getName(), - modifylinebreaks, replacement, options, logfile); + modifylinebreaks, check, replacement, options, logfile); } arguments: - identifier: silent @@ -76,6 +76,11 @@ arguments: @{ [ '-o', parameters.output ] } +- identifier: lines + flag: > + @{ + [ '--lines', parameters.lines ] + } - identifier: where flag: > @{ @@ -96,7 +101,17 @@ arguments: throwError('You provided an invalid value for replacement.'); } } - +- identifier: check + flag: > + @{ + opts = [ 'standard' : '--check', 'verbose' : '--checkv' ]; + if (opts.keySet().contains(parameters.check)) { + return opts[parameters.check]; + } + else { + throwError('You provided an invalid value for check.'); + } + } - identifier: options flag: > @{ diff --git a/Master/texmf-dist/source/support/arara/arara-6.1.1-src.zip b/Master/texmf-dist/source/support/arara/arara-6.1.1-src.zip deleted file mode 100644 index 3f53884452e..00000000000 Binary files a/Master/texmf-dist/source/support/arara/arara-6.1.1-src.zip and /dev/null differ diff --git a/Master/texmf-dist/source/support/arara/arara-6.1.2-src.zip b/Master/texmf-dist/source/support/arara/arara-6.1.2-src.zip new file mode 100644 index 00000000000..a61760ad076 Binary files /dev/null and b/Master/texmf-dist/source/support/arara/arara-6.1.2-src.zip differ diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 072af5ac266..75ef248bd33 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1585,6 +1585,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'amsrefs' => '&POSTamsrefs', 'amstex' => '&POSTamstex', 'apalike' => '&POSTapalike', + 'arara' => '&POST_do_man', 'asapsym' => '&POSTasapsym', 'attachfile2' => '&tl_man_to_pdf', 'autosp' => '&POSTautosp', -- cgit v1.2.3