From 2df6cdd1319db65426bc5b1d645c0fe8d7759528 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 16 Sep 2019 22:06:50 +0000 Subject: arara (16sep19) git-svn-id: svn://tug.org/texlive/trunk@52106 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/support/arara/README.md | 6 +- .../texmf-dist/doc/support/arara/arara-manual.pdf | Bin 1838719 -> 1840860 bytes .../doc/support/arara/chapters/methods.tex | 6 + Master/texmf-dist/scripts/arara/arara.jar | Bin 5119284 -> 5120594 bytes .../main/java/com/github/cereda/arara/Arara.java | 4 +- .../arara/controller/ConfigurationController.java | 2 +- .../arara/controller/LanguageController.java | 2 +- .../cereda/arara/controller/LoggingController.java | 2 +- .../cereda/arara/controller/SessionController.java | 2 +- .../arara/controller/SystemCallController.java | 2 +- .../github/cereda/arara/model/AraraException.java | 2 +- .../com/github/cereda/arara/model/Argument.java | 2 +- .../com/github/cereda/arara/model/Command.java | 9 +- .../com/github/cereda/arara/model/Conditional.java | 2 +- .../github/cereda/arara/model/Configuration.java | 6 +- .../com/github/cereda/arara/model/Database.java | 2 +- .../com/github/cereda/arara/model/Directive.java | 2 +- .../com/github/cereda/arara/model/Evaluator.java | 2 +- .../com/github/cereda/arara/model/Extractor.java | 2 +- .../com/github/cereda/arara/model/FileType.java | 2 +- .../cereda/arara/model/FileTypeResource.java | 2 +- .../com/github/cereda/arara/model/Interpreter.java | 180 ++++++++++++--------- .../com/github/cereda/arara/model/Language.java | 2 +- .../com/github/cereda/arara/model/Messages.java | 5 +- .../java/com/github/cereda/arara/model/Pair.java | 2 +- .../java/com/github/cereda/arara/model/Parser.java | 2 +- .../com/github/cereda/arara/model/Resource.java | 2 +- .../java/com/github/cereda/arara/model/Rule.java | 2 +- .../com/github/cereda/arara/model/RuleCommand.java | 2 +- .../com/github/cereda/arara/model/Session.java | 2 +- .../com/github/cereda/arara/model/StopWatch.java | 2 +- .../com/github/cereda/arara/model/Trigger.java | 2 +- .../cereda/arara/utils/ClassLoadingUtils.java | 2 +- .../com/github/cereda/arara/utils/CommonUtils.java | 27 +++- .../cereda/arara/utils/ConfigurationUtils.java | 2 +- .../github/cereda/arara/utils/DatabaseUtils.java | 2 +- .../cereda/arara/utils/DirectiveAssembler.java | 2 +- .../cereda/arara/utils/DirectiveResolver.java | 2 +- .../github/cereda/arara/utils/DirectiveUtils.java | 2 +- .../github/cereda/arara/utils/DisplayUtils.java | 2 +- .../cereda/arara/utils/FileHandlingUtils.java | 2 +- .../cereda/arara/utils/FileSearchingUtils.java | 2 +- .../cereda/arara/utils/InterpreterUtils.java | 2 +- .../github/cereda/arara/utils/MessageUtils.java | 2 +- .../com/github/cereda/arara/utils/Methods.java | 14 +- .../com/github/cereda/arara/utils/RuleUtils.java | 2 +- .../github/cereda/arara/utils/TeeOutputStream.java | 2 +- .../com/github/cereda/arara/utils/UnsafeUtils.java | 2 +- .../github/cereda/arara/utils/VelocityUtils.java | 2 +- .../cereda/arara/localization/messages.properties | 3 + .../arara/localization/messages_de.properties | 3 + .../arara/localization/messages_en.properties | 3 + .../arara/localization/messages_en_QN.properties | 3 + .../arara/localization/messages_it.properties | 3 + .../arara/localization/messages_nl.properties | 3 + .../arara/localization/messages_pt_BR.properties | 3 + 56 files changed, 227 insertions(+), 127 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/support/arara/README.md b/Master/texmf-dist/doc/support/arara/README.md index d65679d4ba0..dc4cc359eea 100644 --- a/Master/texmf-dist/doc/support/arara/README.md +++ b/Master/texmf-dist/doc/support/arara/README.md @@ -3,11 +3,11 @@ # arara ![Version: 4.0](https://img.shields.io/badge/current_version-4.0-blue.svg?style=flat-square) -![Revision: 1](https://img.shields.io/badge/revision-1-blue.svg?style=flat-square) +![Revision: 2](https://img.shields.io/badge/revision-2-blue.svg?style=flat-square) ![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.6](https://img.shields.io/badge/CTAN_packaging-4.0.6-blue.svg?style=flat-square) +![CTAN packaging: 4.0.7](https://img.shields.io/badge/CTAN_packaging-4.0.7-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. @@ -30,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 CTAN packaging for the current version is 4.0.6 (for internal use). +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.7 (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 ef749492084..bb3f7be9538 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/chapters/methods.tex b/Master/texmf-dist/doc/support/arara/chapters/methods.tex index 4570e01c7fc..b8cca6a5f3f 100644 --- a/Master/texmf-dist/doc/support/arara/chapters/methods.tex +++ b/Master/texmf-dist/doc/support/arara/chapters/methods.tex @@ -1037,6 +1037,12 @@ result = unsafelyExecuteSystemCommand(getCommand('ls')); Please \emph{do not abuse} this method! Keep in mind that this particular feature is included for very specific scenarios in which the command streams are needed ahead of time for proper decision making. \end{messagebox} +\item[\mdbox{R}{isSubdirectory(File directory)}{boolean}] This method checks whether the provided \rbox{File} reference is a valid subdirectory under the project hierarchy, return a corresponding boolean value. This is a check to impose a possible restriction in the rule scope, so that users can change down to subdirectories in their projects but not up, outside of the root directory. + +\begin{codebox}{Example}{teal}{\icnote}{white} +valid = isSubdirectory(toFile('chapters/')); +\end{codebox} + \item[\mdbox{R}{\parbox{0.62\textwidth}{mergeVelocityTemplate(File input, File output,\\\hspace*{1em} Map map)}}{void}] This method, as the name implies, merges the provided \rbox{File} template reference written in the Velocity Template Language 1.7 specification with the \rbox{Map} data object in order to produce a corresponding \rbox{File} output. It is important to observe that this method will raise an exception if the provided input file does not exist or if there is an error with the underlying template language. \begin{ncodebox}{Source file}{teal}{\icnote}{white}{input.txt} diff --git a/Master/texmf-dist/scripts/arara/arara.jar b/Master/texmf-dist/scripts/arara/arara.jar index 46c22ce0aa9..c75f82e5be3 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/source/support/arara/src/main/java/com/github/cereda/arara/Arara.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/Arara.java index c644978c93b..36405b1b478 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/Arara.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/Arara.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -199,7 +199,7 @@ public class Arara { // just happened and might require user intervention. System.exit(CommonUtils.getExitStatus()); - // I owe David Carlisle $10 + // I owe David Carlisle $100 } } diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/ConfigurationController.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/ConfigurationController.java index f3868b488f5..2dbc3a2bff9 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/ConfigurationController.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/ConfigurationController.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/LanguageController.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/LanguageController.java index a0ccc2a9586..85bfc3a43df 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/LanguageController.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/LanguageController.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/LoggingController.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/LoggingController.java index 193726fcc42..958beec291a 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/LoggingController.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/LoggingController.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/SessionController.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/SessionController.java index ac5a45d2b3e..41c627dc988 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/SessionController.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/SessionController.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/SystemCallController.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/SystemCallController.java index 9a592853f69..4d87adc8a85 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/SystemCallController.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/controller/SystemCallController.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/AraraException.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/AraraException.java index f2a340fd01f..5f5d788e0f7 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/AraraException.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/AraraException.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Argument.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Argument.java index 0b15baf9d70..b0e7d2bca6a 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Argument.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Argument.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Command.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Command.java index 30583898327..848f3f3010e 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Command.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Command.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -116,7 +116,12 @@ public class Command { */ @Override public String toString() { - return CommonUtils.getCollectionElements(elements, "[ ", " ]", ", "); + return CommonUtils.getCollectionElements(elements, "[ ", " ]", ", "). + concat( + hasWorkingDirectory() + ? " @ " + workingDirectory.toString() + : "" + ); } } diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Conditional.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Conditional.java index 4c830f0a1b6..d8f05437093 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Conditional.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Conditional.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Configuration.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Configuration.java index 0c2c2949586..70f63823640 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Configuration.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Configuration.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -121,7 +121,7 @@ public class Configuration { mapping.put("execution.timeout.value", 0L); mapping.put("execution.timeout.unit", TimeUnit.MILLISECONDS); mapping.put("application.version", "4.0"); - mapping.put("application.revision", "1"); + mapping.put("application.revision", "2"); mapping.put("directives.linebreak.pattern", "^\\s*-->\\s(.*)$"); String directive = "^\\s*(\\w+)\\s*(:\\s*(\\{.*\\})\\s*)?"; @@ -139,7 +139,7 @@ public class Configuration { mapping.put("execution.logging", false); mapping.put("execution.dryrun", false); mapping.put("execution.status", 0); - mapping.put("application.copyright.year", "2012-2018"); + mapping.put("application.copyright.year", "2012-2019"); mapping.put("execution.filetypes", ConfigurationUtils. getDefaultFileTypes()); mapping.put("execution.rule.paths", diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Database.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Database.java index 66d360fdc08..474209e4050 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Database.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Database.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Directive.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Directive.java index e311477125c..a3831db8b29 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Directive.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Directive.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Evaluator.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Evaluator.java index 41f8d099430..30995ecaf90 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Evaluator.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Evaluator.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Extractor.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Extractor.java index 84edef1eb05..b4a248688a4 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Extractor.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Extractor.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/FileType.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/FileType.java index b9f2a01e032..e7403bee519 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/FileType.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/FileType.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/FileTypeResource.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/FileTypeResource.java index 29340358581..d23b10f9f52 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/FileTypeResource.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/FileTypeResource.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Interpreter.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Interpreter.java index 7c8f6e3928a..30c18a30745 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Interpreter.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Interpreter.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -60,13 +60,13 @@ public class Interpreter { // the application messages obtained from the // language controller - private static final LanguageController messages = - LanguageController.getInstance(); - + private static final LanguageController messages + = LanguageController.getInstance(); + // the class logger obtained from // the logger factory - private static final Logger logger = - LoggerFactory.getLogger(Interpreter.class); + private static final Logger logger + = LoggerFactory.getLogger(Interpreter.class); // list of directives to be // interpreted in here @@ -128,8 +128,8 @@ public class Interpreter { Methods.addRuleMethods(parameters); String name = rule.getName(); - List authors = rule.getAuthors() == null ? - new ArrayList() : rule.getAuthors(); + List authors = rule.getAuthors() == null + ? new ArrayList() : rule.getAuthors(); ConfigurationController.getInstance(). put("execution.rule.arguments", InterpreterUtils.getRuleArguments(rule) @@ -187,11 +187,11 @@ public class Interpreter { String.valueOf(current))) { DisplayUtils.printEntry(name, - command.getName() == null ? - messages.getMessage( - Messages.INFO_LABEL_UNNAMED_TASK - ) - : command.getName() + command.getName() == null + ? messages.getMessage( + Messages.INFO_LABEL_UNNAMED_TASK + ) + : command.getName() ); boolean success = true; @@ -223,72 +223,100 @@ public class Interpreter { Trigger trigger = (Trigger) current; trigger.process(); } else { - Object representation = - CommonUtils.checkClass( - Command.class, - current - ) ? - current - : String.valueOf(current); - logger.info( - messages.getMessage( - Messages.LOG_INFO_SYSTEM_COMMAND, - representation - ) - ); + if (CommonUtils.checkClass( + Boolean.class, current)) { + success = (Boolean) current; + logger.info( + messages.getMessage( + Messages.LOG_INFO_BOOLEAN_MODE, + String.valueOf(success) + ) + ); - if (((Boolean) ConfigurationController. - getInstance(). - get("execution.dryrun")) == false) { - int code = InterpreterUtils. - run(representation); - Object check = null; - try { - Map context = - new HashMap(); - context.put("value", code); - check = TemplateRuntime.eval( - "@{ ".concat( - command.getExit() == null ? - "value == 0" - : command.getExit()).concat(" }"), - context); - } catch (RuntimeException exception) { - throw new AraraException( - CommonUtils.getRuleErrorHeader(). - concat( - messages.getMessage( - Messages.ERROR_INTERPRETER_EXIT_RUNTIME_ERROR - ) - ), - exception - ); - } - if (CommonUtils. - checkClass( - Boolean.class, - check)) { - success = (Boolean) check; - } else { - throw new AraraException( - CommonUtils.getRuleErrorHeader().concat( - messages.getMessage( - Messages.ERROR_INTERPRETER_WRONG_EXIT_CLOSURE_RETURN - ) + if (((Boolean) ConfigurationController. + getInstance(). + get("execution.dryrun")) == true) { + + DisplayUtils.printAuthors(authors); + DisplayUtils.wrapText( + messages.getMessage( + Messages.INFO_INTERPRETER_DRYRUN_MODE_BOOLEAN_MODE, + success ) ); + DisplayUtils.printConditional( + directive.getConditional() + ); } } else { - DisplayUtils.printAuthors(authors); - DisplayUtils.wrapText( + + Object representation + = CommonUtils.checkClass( + Command.class, + current + ) + ? current + : String.valueOf(current); + logger.info( messages.getMessage( - Messages.INFO_INTERPRETER_DRYRUN_MODE_SYSTEM_COMMAND, + Messages.LOG_INFO_SYSTEM_COMMAND, representation ) ); - DisplayUtils.printConditional( - directive.getConditional() - ); + + if (((Boolean) ConfigurationController. + getInstance(). + get("execution.dryrun")) == false) { + int code = InterpreterUtils. + run(representation); + Object check = null; + try { + Map context + = new HashMap(); + context.put("value", code); + check = TemplateRuntime.eval( + "@{ ".concat( + command.getExit() == null + ? "value == 0" + : command.getExit()).concat(" }"), + context); + } catch (RuntimeException exception) { + throw new AraraException( + CommonUtils.getRuleErrorHeader(). + concat( + messages.getMessage( + Messages.ERROR_INTERPRETER_EXIT_RUNTIME_ERROR + ) + ), + exception + ); + } + if (CommonUtils. + checkClass( + Boolean.class, + check)) { + success = (Boolean) check; + } else { + throw new AraraException( + CommonUtils.getRuleErrorHeader().concat( + messages.getMessage( + Messages.ERROR_INTERPRETER_WRONG_EXIT_CLOSURE_RETURN + ) + ) + ); + } + } else { + DisplayUtils.printAuthors(authors); + DisplayUtils.wrapText( + messages.getMessage( + Messages.INFO_INTERPRETER_DRYRUN_MODE_SYSTEM_COMMAND, + representation + ) + ); + DisplayUtils.printConditional( + directive.getConditional() + ); + } } } @@ -397,8 +425,8 @@ public class Interpreter { Methods.addRuleMethods(context); for (Argument argument : arguments) { - if ((argument.isRequired()) && - (!directive.getParameters().containsKey( + if ((argument.isRequired()) + && (!directive.getParameters().containsKey( argument.getIdentifier()))) { throw new AraraException( CommonUtils.getRuleErrorHeader().concat( @@ -421,7 +449,7 @@ public class Interpreter { concat(messages.getMessage( Messages.ERROR_INTERPRETER_DEFAULT_VALUE_RUNTIME_ERROR ) - ), + ), exception ); } @@ -429,8 +457,8 @@ public class Interpreter { mapping.put(argument.getIdentifier(), ""); } - if ((argument.getFlag() != null) && - (directive.getParameters().containsKey( + if ((argument.getFlag() != null) + && (directive.getParameters().containsKey( argument.getIdentifier()))) { try { @@ -451,7 +479,7 @@ public class Interpreter { } } } - + return mapping; } diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Language.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Language.java index 2b0fc8266e8..ff1b16a03f6 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Language.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Language.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Messages.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Messages.java index 9916c3c145b..901e61be6a6 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Messages.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Messages.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,6 +81,7 @@ public enum Messages { ERROR_INTERPRETER_RULE_NOT_FOUND, ERROR_INTERPRETER_UNKNOWN_KEYS, ERROR_INTERPRETER_WRONG_EXIT_CLOSURE_RETURN, + ERROR_ISSUBDIRECTORY_NOT_A_DIRECTORY, ERROR_LANGUAGE_INVALID_CODE, ERROR_LOAD_COULD_NOT_LOAD_XML, ERROR_PARSER_INVALID_PREAMBLE, @@ -128,6 +129,7 @@ public enum Messages { INFO_DISPLAY_EXCEPTION_MORE_DETAILS, INFO_DISPLAY_EXECUTION_TIME, INFO_DISPLAY_FILE_INFORMATION, + INFO_INTERPRETER_DRYRUN_MODE_BOOLEAN_MODE, INFO_INTERPRETER_DRYRUN_MODE_SYSTEM_COMMAND, INFO_INTERPRETER_DRYRUN_MODE_TRIGGER_MODE, INFO_INTERPRETER_VERBOSE_MODE_TRIGGER_MODE, @@ -154,6 +156,7 @@ public enum Messages { INFO_PARSER_VERBOSE_MODE_DESCRIPTION, INFO_PARSER_VERSION_DESCRIPTION, LOG_INFO_BEGIN_BUFFER, + LOG_INFO_BOOLEAN_MODE, LOG_INFO_DIRECTIVES_BLOCK, LOG_INFO_END_BUFFER, LOG_INFO_INTERPRET_RULE, diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Pair.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Pair.java index d8591b6ef75..427a5fca1dd 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Pair.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Pair.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Parser.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Parser.java index 723e24e76e4..681c2f8fef3 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Parser.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Parser.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Resource.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Resource.java index 2994a4d6912..58eaa0dc40e 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Resource.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Resource.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Rule.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Rule.java index af3ad199506..acf43cdf580 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Rule.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Rule.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/RuleCommand.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/RuleCommand.java index b209d19bcb0..e63430afeb6 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/RuleCommand.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/RuleCommand.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Session.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Session.java index c756ae4550e..4462c5e3691 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Session.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Session.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/StopWatch.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/StopWatch.java index 45e0969d0b7..da7062cf194 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/StopWatch.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/StopWatch.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Trigger.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Trigger.java index 11da04bfcb9..7d8ae6ce79d 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Trigger.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/model/Trigger.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/ClassLoadingUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/ClassLoadingUtils.java index c40536ce08f..fdd642e21d9 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/ClassLoadingUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/ClassLoadingUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/CommonUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/CommonUtils.java index 621634749ef..0263f64eaca 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/CommonUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/CommonUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -925,5 +925,30 @@ public class CommonUtils { return buildPath(path, getBasename(file)); } } + + /** + * Checks whether a directory is under a root directory. + * @param f1 Directory to be inspected. + * @param f2 Root directory. + * @return Logical value indicating whether the directoy is under root. + * @throws AraraException There was a problem with path retrieval. + */ + public static boolean isSubDirectory(File f1, File f2) + throws AraraException { + if (f1.isDirectory()) { + return getCanonicalPath(f1). + startsWith( + getParentCanonicalPath(f2).concat(File.separator) + ); + } + else { + throw new AraraException( + messages.getMessage( + Messages.ERROR_ISSUBDIRECTORY_NOT_A_DIRECTORY, + f1.getName() + ) + ); + } + } } diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/ConfigurationUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/ConfigurationUtils.java index 0b7d3b8a5b4..7336110ebea 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/ConfigurationUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/ConfigurationUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DatabaseUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DatabaseUtils.java index 8861ff7e5ee..3a9b4eeea58 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DatabaseUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DatabaseUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveAssembler.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveAssembler.java index d2dd5889967..6f6f676ab5c 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveAssembler.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveAssembler.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveResolver.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveResolver.java index 6ea18e31ba5..b0a1af850be 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveResolver.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveResolver.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveUtils.java index d4d2a88ac7e..6ea0404f72b 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DirectiveUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DisplayUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DisplayUtils.java index 879119e60e2..75cda6f99a5 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DisplayUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/DisplayUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/FileHandlingUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/FileHandlingUtils.java index 9f56c92f5d9..fdd1ab36c64 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/FileHandlingUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/FileHandlingUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/FileSearchingUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/FileSearchingUtils.java index 473674cbc50..9f0c03c143c 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/FileSearchingUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/FileSearchingUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/InterpreterUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/InterpreterUtils.java index 978cb07374f..d60de0884b0 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/InterpreterUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/InterpreterUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/MessageUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/MessageUtils.java index 52a5d095a8e..b36bda8808e 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/MessageUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/MessageUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/Methods.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/Methods.java index 15c66049342..24982dace9b 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/Methods.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/Methods.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -147,6 +147,7 @@ public class Methods { map.put("writeToFile", Methods.class.getMethod("writeToFile", String.class, List.class, boolean.class)); map.put("readFromFile", Methods.class.getMethod("readFromFile", File.class)); map.put("readFromFile", Methods.class.getMethod("readFromFile", String.class)); + map.put("isSubdirectory", Methods.class.getMethod("isSubdirectory", File.class)); } catch (Exception exception) { // quack, quack, quack } @@ -1353,4 +1354,15 @@ public class Methods { return FileHandlingUtils.readFromFile(new File(path)); } + /** + * Checks whether a directory is under the project directory. + * @param directory The directory to be inspected. + * @return Logical value indicating whether the directoy is under root. + * @throws AraraException There was a problem with path retrieval. + */ + public static boolean isSubdirectory(File directory) + throws AraraException { + return CommonUtils.isSubDirectory(directory, getOriginalReference()); + } + } diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/RuleUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/RuleUtils.java index d855344762d..f2fb1c85705 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/RuleUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/RuleUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/TeeOutputStream.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/TeeOutputStream.java index 65d3d58ffba..58418ea62d8 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/TeeOutputStream.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/TeeOutputStream.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/UnsafeUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/UnsafeUtils.java index b989e074c8f..d5a4058b3e2 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/UnsafeUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/UnsafeUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/VelocityUtils.java b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/VelocityUtils.java index 2040b671b70..3f94adc909a 100644 --- a/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/VelocityUtils.java +++ b/Master/texmf-dist/source/support/arara/src/main/java/com/github/cereda/arara/utils/VelocityUtils.java @@ -1,6 +1,6 @@ /** * Arara, the cool TeX automation tool - * Copyright (c) 2012 -- 2018, Paulo Roberto Massa Cereda + * Copyright (c) 2012 -- 2019, Paulo Roberto Massa Cereda * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages.properties b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages.properties index cdea39f1be1..dd1972fd5ce 100644 --- a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages.properties +++ b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages.properties @@ -63,6 +63,7 @@ ERROR_INTERPRETER_NULL_COMMAND=I am sorry, but apparently one of the provided co ERROR_INTERPRETER_RULE_NOT_FOUND=I could not find a rule named ''{0}'' in the provided rule paths. Perhaps a misspelled word? I was looking for a file named ''{0}.yaml'' in the following paths in order of priority: {1} ERROR_INTERPRETER_UNKNOWN_KEYS=I found these unknown keys in the directive: {0}. This should be an easy fix, just remove them from your map. ERROR_INTERPRETER_WRONG_EXIT_CLOSURE_RETURN=The 'exit' expression must always return a boolean value (even if there is no computation in the closure body). This should be an easy fix: make sure to correct the type return statement and try again. +ERROR_ISSUBDIRECTORY_NOT_A_DIRECTORY=The ''isSubdirectory'' method requires a directory, not a file. It looks like ''{0}'' does not appear to be a directory at all. ERROR_LANGUAGE_INVALID_CODE=The provided language code is invalid. Currently, I know how to speak the following languages: {0} ERROR_LOAD_COULD_NOT_LOAD_XML=I could not load the XML database named ''{0}''. I have no idea why it failed, though. Perhaps the file was moved or deleted before or during the reading operation. Or maybe I do not have the proper permissions to read the file. By the way, make sure the XML file is well-formed. ERROR_PARSER_INVALID_PREAMBLE=I am sorry, but the preamble ''{0}'' could not be found. Please make sure this key exists in the configuration file. @@ -110,6 +111,7 @@ ERROR_VELOCITY_IO_EXCEPTION=The template engine was not able to write the output INFO_DISPLAY_EXCEPTION_MORE_DETAILS=There are more details available on this exception: INFO_DISPLAY_EXECUTION_TIME=Total: {0} seconds INFO_DISPLAY_FILE_INFORMATION=Processing ''{0}'' (size: {1}, last modified: {2}), please wait. +INFO_INTERPRETER_DRYRUN_MODE_BOOLEAN_MODE=Although executing in dry-run mode, this entry might be already processed since it returned a boolean value: {0} INFO_INTERPRETER_DRYRUN_MODE_SYSTEM_COMMAND=About to run: {0} INFO_INTERPRETER_DRYRUN_MODE_TRIGGER_MODE=Although executing in dry-run mode, this entry is always processed since it is a trigger. Note that the effects of a trigger might influence the current execution. INFO_INTERPRETER_VERBOSE_MODE_TRIGGER_MODE=This entry is a trigger originated from the rule scope. Note that the effects of a trigger might influence the current execution. @@ -136,6 +138,7 @@ INFO_PARSER_TIMEOUT_DESCRIPTION=set the execution timeout (in milliseconds) INFO_PARSER_VERBOSE_MODE_DESCRIPTION=print the command output INFO_PARSER_VERSION_DESCRIPTION=print the application version LOG_INFO_BEGIN_BUFFER=BEGIN OUTPUT BUFFER +LOG_INFO_BOOLEAN_MODE=Boolean value: {0} LOG_INFO_DIRECTIVES_BLOCK=DIRECTIVES LOG_INFO_END_BUFFER=END OUTPUT BUFFER LOG_INFO_INTERPRET_RULE=I am ready to interpret rule ''{0}''. diff --git a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_de.properties b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_de.properties index 352259daf6c..eb8bb41fd65 100644 --- a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_de.properties +++ b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_de.properties @@ -63,6 +63,7 @@ ERROR_INTERPRETER_NULL_COMMAND=Es tut mir leid, aber eine der genutzten Anweisun ERROR_INTERPRETER_RULE_NOT_FOUND=Ich konnte keine Regel mit dem Namen ''{0}'' in den hinterlegten Regelverzeichnissen finden. Vielleicht ein falsch geschriebenes Wort? Ich habe nach dem Dateinamen ''{0}.yaml'' in den nachstehenden Verzeichnissen mit entsprechender Priorität gesucht: {1} ERROR_INTERPRETER_UNKNOWN_KEYS=Ich habe folgende unbekannte Keys in der Direktive gefunden: {0}. Das sollte leicht zu beheben sein, entferne sie einfach. ERROR_INTERPRETER_WRONG_EXIT_CLOSURE_RETURN=Der Ausdruck 'exit' muss immer einen logischen Wert (boolean value) zurückgeben (sogar wenn es keine Berechnung in der Prozedur gibt). Das sollte leicht zu beheben sein: Stelle einen korrekten Rückgabewert sicher und versuche es erneut. +ERROR_ISSUBDIRECTORY_NOT_A_DIRECTORY=Die ''isSubdirectory'' Methode erwartet als Argument einen Ordner, nicht eine Datei. ''{0}'' scheint kein Ordner zu sein. ERROR_LANGUAGE_INVALID_CODE=Der bereitgestellte Sprachauswahlcode ist ungültig. Derzeit kann ich folgende Sprachen sprechen: {0} ERROR_LOAD_COULD_NOT_LOAD_XML=Ich konnte die XML-Datenbank mit dem Namen ''{0}'' nicht laden. Ich habe keine Idee für die Fehlerursache, obwohl? Vielleicht wurde die Datei bevor oder während der Leseoperation bewegt oder gelöscht. Möglicherweise habe ich nicht die geeigneten Rechte, um die Datei zu lesen. ERROR_PARSER_INVALID_PREAMBLE=Leider konnte die Präambel ''{0}'' nicht gefunden werden. Bitte stelle sicher, dass dieser Schlüssel in der Konfigurationsdatei existiert. @@ -110,6 +111,7 @@ ERROR_VELOCITY_IO_EXCEPTION=Die Template-Engine konnte die Ausgabe-Datei nicht s INFO_DISPLAY_EXCEPTION_MORE_DETAILS=Es sind mehr Details für diese Ausnahme verfügbar. INFO_DISPLAY_EXECUTION_TIME=Gesamt: {0} Sekunden INFO_DISPLAY_FILE_INFORMATION=Verarbeitung ''{0}'' (Größe: {1}, letzte Modifikation: {2}), bitte warten. +INFO_INTERPRETER_DRYRUN_MODE_BOOLEAN_MODE=Trotz dry-run Modus wurde dieser Eintrag wahrscheinlich bereits verarbeitet, da er den boolschen Wert {0} zurückgegeben hat. INFO_INTERPRETER_DRYRUN_MODE_SYSTEM_COMMAND=Los geht''s: {0} INFO_INTERPRETER_DRYRUN_MODE_TRIGGER_MODE=Obwohl du im 'dry-run-mode' ausführst, wird der Eintrag immer verarbeitet, da es einen Trigger ist. Beachte, dass der Effekt eines Triggers die aktuelle Ausführung beeinflussen kann. INFO_INTERPRETER_VERBOSE_MODE_TRIGGER_MODE=Dieser Eintrag ist ein Trigger, welcher aus dem Regelumfeld entstand. Beachte, dass der Effekt eines Triggers die aktuelle Ausführung beeinflussen kann. @@ -136,6 +138,7 @@ INFO_PARSER_TIMEOUT_DESCRIPTION=Setze die Zeitabschaltung für die Ausführung ( INFO_PARSER_VERBOSE_MODE_DESCRIPTION=Gibt zusätzliche Statusinformationen aus INFO_PARSER_VERSION_DESCRIPTION=Gebe die Anwendungsversion aus LOG_INFO_BEGIN_BUFFER=BEGIN OUTPUT BUFFER +LOG_INFO_BOOLEAN_MODE=Boolscher Wert: {0} LOG_INFO_DIRECTIVES_BLOCK=DIREKTIVEN LOG_INFO_END_BUFFER=END OUTPUT BUFFER LOG_INFO_INTERPRET_RULE=Ich bin bereit, die Regel ''{0}'' zu interpretieren. diff --git a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_en.properties b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_en.properties index cdea39f1be1..dd1972fd5ce 100644 --- a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_en.properties +++ b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_en.properties @@ -63,6 +63,7 @@ ERROR_INTERPRETER_NULL_COMMAND=I am sorry, but apparently one of the provided co ERROR_INTERPRETER_RULE_NOT_FOUND=I could not find a rule named ''{0}'' in the provided rule paths. Perhaps a misspelled word? I was looking for a file named ''{0}.yaml'' in the following paths in order of priority: {1} ERROR_INTERPRETER_UNKNOWN_KEYS=I found these unknown keys in the directive: {0}. This should be an easy fix, just remove them from your map. ERROR_INTERPRETER_WRONG_EXIT_CLOSURE_RETURN=The 'exit' expression must always return a boolean value (even if there is no computation in the closure body). This should be an easy fix: make sure to correct the type return statement and try again. +ERROR_ISSUBDIRECTORY_NOT_A_DIRECTORY=The ''isSubdirectory'' method requires a directory, not a file. It looks like ''{0}'' does not appear to be a directory at all. ERROR_LANGUAGE_INVALID_CODE=The provided language code is invalid. Currently, I know how to speak the following languages: {0} ERROR_LOAD_COULD_NOT_LOAD_XML=I could not load the XML database named ''{0}''. I have no idea why it failed, though. Perhaps the file was moved or deleted before or during the reading operation. Or maybe I do not have the proper permissions to read the file. By the way, make sure the XML file is well-formed. ERROR_PARSER_INVALID_PREAMBLE=I am sorry, but the preamble ''{0}'' could not be found. Please make sure this key exists in the configuration file. @@ -110,6 +111,7 @@ ERROR_VELOCITY_IO_EXCEPTION=The template engine was not able to write the output INFO_DISPLAY_EXCEPTION_MORE_DETAILS=There are more details available on this exception: INFO_DISPLAY_EXECUTION_TIME=Total: {0} seconds INFO_DISPLAY_FILE_INFORMATION=Processing ''{0}'' (size: {1}, last modified: {2}), please wait. +INFO_INTERPRETER_DRYRUN_MODE_BOOLEAN_MODE=Although executing in dry-run mode, this entry might be already processed since it returned a boolean value: {0} INFO_INTERPRETER_DRYRUN_MODE_SYSTEM_COMMAND=About to run: {0} INFO_INTERPRETER_DRYRUN_MODE_TRIGGER_MODE=Although executing in dry-run mode, this entry is always processed since it is a trigger. Note that the effects of a trigger might influence the current execution. INFO_INTERPRETER_VERBOSE_MODE_TRIGGER_MODE=This entry is a trigger originated from the rule scope. Note that the effects of a trigger might influence the current execution. @@ -136,6 +138,7 @@ INFO_PARSER_TIMEOUT_DESCRIPTION=set the execution timeout (in milliseconds) INFO_PARSER_VERBOSE_MODE_DESCRIPTION=print the command output INFO_PARSER_VERSION_DESCRIPTION=print the application version LOG_INFO_BEGIN_BUFFER=BEGIN OUTPUT BUFFER +LOG_INFO_BOOLEAN_MODE=Boolean value: {0} LOG_INFO_DIRECTIVES_BLOCK=DIRECTIVES LOG_INFO_END_BUFFER=END OUTPUT BUFFER LOG_INFO_INTERPRET_RULE=I am ready to interpret rule ''{0}''. diff --git a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_en_QN.properties b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_en_QN.properties index db583d46694..c9a2013d261 100644 --- a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_en_QN.properties +++ b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_en_QN.properties @@ -64,6 +64,7 @@ ERROR_INTERPRETER_NULL_COMMAND=Thass a rum ole dew but one onnem commands have h ERROR_INTERPRETER_RULE_NOT_FOUND=Thass a rum ole dew but there ent no ''{0}'' in any onnem rule paths. Praps you ent spelled that right. I coont find ''{0}.yaml'' in any onner paths: {1} ERROR_INTERPRETER_UNKNOWN_KEYS=Atwin me, yew an'' the geartepost I ent got no idear abowt these keys in the directive: {0}. Howsomever, dunt you git yarself inta a rite ole puckaterry. Do you jist hull them outta yar map. ERROR_INTERPRETER_WRONG_EXIT_CLOSURE_RETURN=Wuh, ole partner, that 'exit' expression ent givin' me a yis or no answer. Thass allus got to dew that even if there ent nuffin else to dew. Howsomever, dunt you git yarself inta a rite ole puckaterry, dew you jist tricolate the return statement and try agin. +ERROR_ISSUBDIRECTORY_NOT_A_DIRECTORY=The ''isSubdirectory'' method requires a directory, not a file. It looks like ''{0}'' does not appear to be a directory at all. ERROR_LANGUAGE_INVALID_CODE=Cor blast me, my bewty, but you hully copped me there wi'' that language code. I can ony mardle in these languages: {0} ERROR_LOAD_COULD_NOT_LOAD_XML=Cor blast me, ole partner, but that XML database ''{0}'' ent half puttin'' on its parts but I ent got no idear wass gone wrong. Praps the file was hulled abowt afore or time the reading operation was doing else maybe I''re gotta he''sum proper permissions to snout abowt the file. Atwin yew, me an'' the geartepost, do yew make sure the XML is in good kelter. ERROR_PARSER_INVALID_PREAMBLE=Thass a rum ole dew, ole partner, but I can''t find the preamble ''{0}''. Do yew make sure that key exist in the configuration file. @@ -111,6 +112,7 @@ ERROR_VELOCITY_IO_EXCEPTION=That ent gorn right, my bewty. The template engine w INFO_DISPLAY_EXCEPTION_MORE_DETAILS=Hear's orl my know on that aggraweartin' exception: INFO_DISPLAY_EXECUTION_TIME=Wuh that took {0} seconds but if thass a slight longer than you expected, dunt yew go mobbing me abowt it cors that ent my fault. My grandf''ar dint have none of these pearks. He had to use a pen and a bit o'' pearper, but thass bin nice mardling wi'' yew. Dew yew keep a troshin''! INFO_DISPLAY_FILE_INFORMATION=Hold yew hard, ole partner, I''m gornta hev a look at ''{0}'' (thass {1} big, that is, and that was last chearnged on {2} in case yew dunt remember). +INFO_INTERPRETER_DRYRUN_MODE_BOOLEAN_MODE=Although executing in dry-run mode, this entry might be already processed since it returned a boolean value: {0} INFO_INTERPRETER_DRYRUN_MODE_SYSTEM_COMMAND=This is what I''m abowt to dew: {0} INFO_INTERPRETER_DRYRUN_MODE_TRIGGER_MODE=Wuh, ole partner, I know this is a dry-run, but this entry has gorta be done cos thass a trigger. Thass hully important yew should know that might doss things on the huh. INFO_INTERPRETER_VERBOSE_MODE_TRIGGER_MODE=Wuh, ole partner, this entry is one onem triggers what come from the rule scope. Thass hully important yew should know that might put this jarb hully on the huh. @@ -137,6 +139,7 @@ INFO_PARSER_TIMEOUT_DESCRIPTION=wuh, yew dunt want them system commands to run o INFO_PARSER_VERBOSE_MODE_DESCRIPTION=thass dew you want ter system commands to hav' a mardle wi'yew an'orl INFO_PARSER_VERSION_DESCRIPTION=dew yew use this dew you want my know abowt this version LOG_INFO_BEGIN_BUFFER=BEGIN OUTPUT BUFFER +LOG_INFO_BOOLEAN_MODE=Boolean value: {0} LOG_INFO_DIRECTIVES_BLOCK=DIRECTIVES LOG_INFO_END_BUFFER=END OUTPUT BUFFER LOG_INFO_INTERPRET_RULE=I''m orl ready, ole parter, to dew the rule ''{0}''. diff --git a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_it.properties b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_it.properties index 70afb93ec6a..1f32907fbda 100644 --- a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_it.properties +++ b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_it.properties @@ -63,6 +63,7 @@ ERROR_INTERPRETER_NULL_COMMAND=Sono spiacente, ma a quanto pare il risultato di ERROR_INTERPRETER_RULE_NOT_FOUND=Non sono riuscito a trovare una regola chiamata ''{0}'' nei percorsi per le regole impostati. Forse una parola scritta sbagliata? Stavo cercando un file con il nome ''{0}.yaml'' nei seguenti percorsi in ordine di priorità: {1} ERROR_INTERPRETER_UNKNOWN_KEYS=Ho trovato queste chiavi sconosciute nella direttiva: {0}. Dovrebbbe essere facile correggere, toglile dalla mappa. ERROR_INTERPRETER_WRONG_EXIT_CLOSURE_RETURN=L'espressione di 'uscita' deve essere sempre un valore booleano (anche se non c'è alcun calcolo nella parte di chiusura). Dovrebbe essere facile correggere: assicurati che l'asserzione del 'type return' sia giusta e riprova. +ERROR_ISSUBDIRECTORY_NOT_A_DIRECTORY=Il metodo ''isSubdirectory'' richiede una directory, non un file. Sembra proprio che ''{0}'' non sia una directory. ERROR_LANGUAGE_INVALID_CODE=La lingua richiesta non è valida. Al momento, so parlare le seguenti lingue: {0} ERROR_LOAD_COULD_NOT_LOAD_XML=Non ho potuto caricare il database XML di nome ''{0}''. Purtroppo non ho idea del perché sia andata male. Forse il file è stato spostato o cancellato prima o durante l''operazione di lettura. O forse non ho i permessi necessari per leggere il file. Già che ci siamo, assicurati che il file XML sia ben formato. ERROR_PARSER_INVALID_PREAMBLE=Mi dispiace, ma non è stato possibile trovare il preambolo ''{0}''. Assicurati che questa chiave esista nel file di configurazione. @@ -110,6 +111,7 @@ ERROR_VELOCITY_IO_EXCEPTION=Il motore per i 'template' non è riuscito a scriver INFO_DISPLAY_EXCEPTION_MORE_DETAILS=Ci sono altri dettagli riguardo a questa eccezione: INFO_DISPLAY_EXECUTION_TIME=Totale: {0} secondi INFO_DISPLAY_FILE_INFORMATION=Elaborazione ''{0}'' (totale: {1}, modificato il: {2}), attendere. +INFO_INTERPRETER_DRYRUN_MODE_BOOLEAN_MODE=Sebbene stia eseguendo in modo ''dry-run'', questo elemento potrebbe essere già stato elaborato, perché ha restituito un valore booleano: {0} INFO_INTERPRETER_DRYRUN_MODE_SYSTEM_COMMAND=Sto per lanciare: {0} INFO_INTERPRETER_DRYRUN_MODE_TRIGGER_MODE=Sebbene stia eseguendo in modo 'dry-run', questo elemento è sempre elaborato perché è un 'trigger'. Nota che gli effetti di un 'trigger' possono influenzare l'esecuzione. INFO_INTERPRETER_VERBOSE_MODE_TRIGGER_MODE=Questo elemento è un 'trigger' generato nell'ambito della regola. Nota che gli effetti di un 'trigger' possono influenzare l'esecuzione. @@ -136,6 +138,7 @@ INFO_PARSER_TIMEOUT_DESCRIPTION=imposta il timeout di esecuzione (in millisecond INFO_PARSER_VERBOSE_MODE_DESCRIPTION=mostra l'outout del comando INFO_PARSER_VERSION_DESCRIPTION=mostra la versione dell'applicazione LOG_INFO_BEGIN_BUFFER=BEGIN OUTPUT BUFFER +LOG_INFO_BOOLEAN_MODE=Valore booleano: {0} LOG_INFO_DIRECTIVES_BLOCK=DIRECTIVES LOG_INFO_END_BUFFER=END OUTPUT BUFFER LOG_INFO_INTERPRET_RULE=Sono pronto a interpretare la regola ''{0}''. diff --git a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_nl.properties b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_nl.properties index 9403078b981..6aa6afa6c66 100644 --- a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_nl.properties +++ b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_nl.properties @@ -63,6 +63,7 @@ ERROR_INTERPRETER_NULL_COMMAND=Het spijt me, maar een van de opgegeven opdrachte ERROR_INTERPRETER_RULE_NOT_FOUND=Ik kon de regel met de naam ''{0}'' niet vinden in de opgegeven regelpaden. Misschien een spelfout? Ik heb geprobeerd het bestand ''{0}.yaml'' te vinden in de volgende paden in volgorde van prioriteit: {1} ERROR_INTERPRETER_UNKNOWN_KEYS=Ik heb de volgende onbekende verwijzingen gevonden in de directive: {0}. Dit zou makkelijk op te lossen moeten zijn: verwijder deze uit de verwijzingstabel. ERROR_INTERPRETER_WRONG_EXIT_CLOSURE_RETURN=De 'exit'-expressie moet altijd een boolean waarde teruggeven (zelfs als er geen berekening heeft plaatsgevonden). Dit zou makkelijk op te lossen moeten zijn: pas het type van de return-regel aan en probeer het opnieuw. +ERROR_ISSUBDIRECTORY_NOT_A_DIRECTORY=De ''isSubdirectory''-methode vereist een mapje, geen bestand. Het lijkt erop dat ''{0}'' geen mapje is. ERROR_LANGUAGE_INVALID_CODE=De opgegeven taalcode is ongeldig. Op het moment accepteer ik de volgende talen: {0} ERROR_LOAD_COULD_NOT_LOAD_XML=Ik kon de XML-database met de naam ''{0}'' niet laden. Ik weet niet waarom het precies fout ging. Misschien was het bestand verplaatst of verwijderd tijdens de leesoperatie. Of misschien heb ik niet de juiste rechten om het bestand te lezen. Overigens: zorg ervoor dat het XML-bestand welgevormd is. ERROR_PARSER_INVALID_PREAMBLE=Het spijt me, maar de preamble ''{0}'' is niet gevonden. Zorg ervoor dat deze verwijzing bestaat in het configuratiebestand. @@ -110,6 +111,7 @@ ERROR_VELOCITY_IO_EXCEPTION=De template-verwerking kon niet naar het uitvoerbest INFO_DISPLAY_EXCEPTION_MORE_DETAILS=Er zijn meer details beschikbaar voor deze exception: INFO_DISPLAY_EXECUTION_TIME=Totaal: {0} seconden INFO_DISPLAY_FILE_INFORMATION=Verwerken van ''{0}'' (grootte: {1}, laatst gewijzigd: {2}), een ogenblik geduld. +INFO_INTERPRETER_DRYRUN_MODE_BOOLEAN_MODE=Ondanks het uitvoeren in dry-runmodus is dit item mogelijk al verwerkt omdat het de booleaanse waarde terug heeft gegeven: {0} INFO_INTERPRETER_DRYRUN_MODE_SYSTEM_COMMAND=Begin met uitvoeren: {0} INFO_INTERPRETER_DRYRUN_MODE_TRIGGER_MODE=Ondanks het uitvoeren in dry-runmodus wordt dit onderdeel altijd uitgevoerd omdat het een trigger is. Merk op dat de effecten van een trigger de huidige uitvoering kunnen beïnvloeden. INFO_INTERPRETER_VERBOSE_MODE_TRIGGER_MODE=Dit onderdeel is een trigger die binnen het bereik van de regel valt. Merk op dat de effecten van een trigger de huidige uitvoering kunnen beïnvloeden. @@ -136,6 +138,7 @@ INFO_PARSER_TIMEOUT_DESCRIPTION=stel de maximale uitvoeringsduur in (in millisec INFO_PARSER_VERBOSE_MODE_DESCRIPTION=toon de opdrachtuitvoer INFO_PARSER_VERSION_DESCRIPTION=toon de applicatieversie LOG_INFO_BEGIN_BUFFER=OPEN UITVOER +LOG_INFO_BOOLEAN_MODE=Booleaanse waarde: {0} LOG_INFO_DIRECTIVES_BLOCK=DIRECTIVES LOG_INFO_END_BUFFER=SLUIT UITVOER LOG_INFO_INTERPRET_RULE=Ik ben klaar om regel ''{0}'' te verwerken. diff --git a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_pt_BR.properties b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_pt_BR.properties index 272a2f3ce9b..3ce8cd2fb69 100644 --- a/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_pt_BR.properties +++ b/Master/texmf-dist/source/support/arara/src/main/resources/com/github/cereda/arara/localization/messages_pt_BR.properties @@ -63,6 +63,7 @@ ERROR_INTERPRETER_NULL_COMMAND=Sinto muito, mas, aparentemente, um dos comandos ERROR_INTERPRETER_RULE_NOT_FOUND=Não consegui encontrar uma regra chamada ''{0}'' nos caminhos de regras especificados. Talvez uma palavra digitada incorretamente? Eu estava procurando por um arquivo chamado ''{0}.yaml'' nos seguintes caminhos, em ordem de prioridade: {1} ERROR_INTERPRETER_UNKNOWN_KEYS=Encontrei as seguintes chaves desconhecidas na diretiva: {0}. Isso é fácil de resolver, apenas remova essas chaves do seu mapa. ERROR_INTERPRETER_WRONG_EXIT_CLOSURE_RETURN=A expressão 'exit' referente ao código de saída deve sempre retornar um valor lógico (mesmo se não há computação propriamente dita). Isso é fácil de resolver: apenas certifique-se de corrigir o tipo de retorno e tente novamente. +ERROR_ISSUBDIRECTORY_NOT_A_DIRECTORY=O método ''isSubdirectory'' requer um diretório, não um arquivo. Observe que ''{0}'' não parece ser um diretório. ERROR_LANGUAGE_INVALID_CODE=O código de idioma especificado é inválido. No momento, eu sei falar os seguintes idiomas: {0} ERROR_LOAD_COULD_NOT_LOAD_XML=Não consegui carregar o banco de dados XML chamado ''{0}''. Não tenho ideia porque não deu certo. Talvez o arquivo tenha sido movido ou removido antes ou durante a operação de leitura. Ou talvez eu não tenha as permissões corretas para leitura do arquivo. A propósito, certifique-se de que o arquivo XML esteja correto. ERROR_PARSER_INVALID_PREAMBLE=Sinto muito, mas o preâmbulo ''{0}'' não foi encontrado. Por favor, certifique-se de que esta chave existe no arquivo de configuração. @@ -110,6 +111,7 @@ ERROR_VELOCITY_IO_EXCEPTION=O motor de modelo não conseguiu escrever no arquivo INFO_DISPLAY_EXCEPTION_MORE_DETAILS=Detalhes adicionais estão disponíveis para esta exceção: INFO_DISPLAY_EXECUTION_TIME=Total: {0} segundos INFO_DISPLAY_FILE_INFORMATION=Processando ''{0}'' (tamanho: {1}, última modificação: {2}), por favor, aguarde. +INFO_INTERPRETER_DRYRUN_MODE_BOOLEAN_MODE=Apesar da execução em modo dry-run, é provável que esta entrada já foi processada, dado que o seguinte valor lógico foi retornado: {0} INFO_INTERPRETER_DRYRUN_MODE_SYSTEM_COMMAND=A executar: {0} INFO_INTERPRETER_DRYRUN_MODE_TRIGGER_MODE=Apesar da execução em modo dry-run, esta entrada é sempre processada por tratar-se de um gatilho. Observe que os efeitos de um gatilho podem influenciar a execução corrente. INFO_INTERPRETER_VERBOSE_MODE_TRIGGER_MODE=Esta entrada é um gatilho originado a partir do escopo da regra. Observe que os efeitos de um gatilho podem influenciar a execução corrente. @@ -136,6 +138,7 @@ INFO_PARSER_TIMEOUT_DESCRIPTION=define o timeout de execução (em milissegundos INFO_PARSER_VERBOSE_MODE_DESCRIPTION=imprime a saída do comando INFO_PARSER_VERSION_DESCRIPTION=imprime a versão da aplicação LOG_INFO_BEGIN_BUFFER=INÍCIO DO BUFFER DE SAÍDA +LOG_INFO_BOOLEAN_MODE=Valor lógico: {0} LOG_INFO_DIRECTIVES_BLOCK=DIRETIVAS LOG_INFO_END_BUFFER=FINAL DO BUFFER DE SAÍDA LOG_INFO_INTERPRET_RULE=Estou pronto para interpretar a regra ''{0}''. -- cgit v1.2.3