arara (6may22)

git-svn-id: svn://tug.org/texlive/trunk@63254 c570f23f-e606-0410-a88d-b1316a301751

60 files changed, 75 insertions, 75 deletions

diff --git a/Master/texmf-dist/scripts/arara/arara.jar b/Master/texmf-dist/scripts/arara/arara.jar
index ac10e3f7741..b9a5e4cb69a 100644
--- a/Master/texmf-dist/scripts/arara/arara.jar
+++ b/Master/texmf-dist/scripts/arara/arara.jar
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-animate.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-animate.yaml
index 1d87ddcf4e1..07c80b474d8 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-animate.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-animate.yaml
@@ -13,8 +13,8 @@ commands:
 - name: The Convert program
   command: >
     @{
-        input = getBasename(reference.getName()).concat('.pdf');
-        output = getBasename(reference.getName()).concat('.gif');
+        input = getBasename(reference.fileName).concat('.pdf');
+        output = getBasename(reference.fileName).concat('.gif');
         return getCommand(program, '-delay', delay, '-loop',
                loop, '-density', density, options, input, output);
     }
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-asymptote.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-asymptote.yaml
index 4bc82f5b2bb..db28f310f72 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-asymptote.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-asymptote.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('asy', color, engine, twice,
-               format, output, options, reference.getName());
+               format, output, options, reference.fileName);
     }
 arguments:
 - identifier: color
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-authorindex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-authorindex.yaml
index 166bf518013..1ce7f45a71a 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-authorindex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-authorindex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('authorindex', draft, index, keep, print,
-                          recurse, options, getBasename(reference.getName()));
+                          recurse, options, getBasename(reference.fileName));
     }
 arguments:
 - identifier: draft
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-bib2gls.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-bib2gls.yaml
index b27309d2461..87cf9196f31 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-bib2gls.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-bib2gls.yaml
@@ -63,7 +63,7 @@ commands:
                  breakspace, trimfields, recordcount, recordcountunit,
                  cite, verbose, merge, locale, uniscript, packages,
                  ignore, custom, mapformats, options,
-                 getBasename(reference.getName()));
+                 getBasename(reference.fileName));
        }
     }
 arguments:
@@ -80,7 +80,7 @@ arguments:
           throwError('Forbidden transcript extension');
        }
 
-       return ['--log-file', getBasename(reference.getName())+"."+parameters.trans]
+       return ['--log-file', getBasename(reference.fileName)+"."+parameters.trans]
     }
 - identifier: locale
   flag: >
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-biber.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-biber.yaml
index 41a102fa09b..dbb58912363 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-biber.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-biber.yaml
@@ -17,7 +17,7 @@ commands:
         }
         else {
             return getCommand('biber', options,
-                              getBasename(reference.getName()));
+                              getBasename(reference.fileName));
         }
     }
 arguments:
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtex.yaml
index 39b251a6bfc..9fc044d5206 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtex.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The BibTeX reference management software
   command: >
     @{
-        return getCommand('bibtex', options, getBasename(reference.getName()))
+        return getCommand('bibtex', options, getBasename(reference.fileName))
     }
 arguments:
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtex8.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtex8.yaml
index c57bac13961..9c4b0e170cb 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtex8.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtex8.yaml
@@ -12,7 +12,7 @@ commands:
 - name: An 8-bit implementation of BibTeX 0.99 with a very large capacity
   command: >
     @{
-        return getCommand('bibtex8', options, getBasename(reference.getName()));
+        return getCommand('bibtex8', options, getBasename(reference.fileName));
     }
 arguments:
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtexu.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtexu.yaml
index 202759b352f..f3eeb8322ad 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtexu.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-bibtexu.yaml
@@ -12,7 +12,7 @@ commands:
 - name: An 8-bit implementation of BibTeX 0.99 with a very large capacity
   command: >
     @{
-        return getCommand('bibtexu', options, getBasename(reference.getName()));
+        return getCommand('bibtexu', options, getBasename(reference.fileName));
     }
 arguments:
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-context.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-context.yaml
index 7795a264c1f..63ca05981f8 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-context.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-context.yaml
@@ -15,7 +15,7 @@ commands:
         return getCommand('context', make, ctx, interface, autopdf, purge,
                           modules, environments, mode, path, arguments,
                           trackers, directives, silent, errors, interaction,
-                          synctex, options, reference.getName());
+                          synctex, options, reference.fileName);
     }
 arguments:
 - identifier: make
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-copy.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-copy.yaml
index 101a92932b5..4d67014b062 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-copy.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-copy.yaml
@@ -20,7 +20,7 @@ commands:
             prefix = [ 'cmd', '/c', 'copy', '/Y' ];
         }
         t = isList(target) ? target[0] : target;
-        f = toFile(t).getCanonicalFile();
+        f = toFile(t).normalize();
         if (getOriginalReference().equals(f)) {
             throwError('I cannot overwrite the main file reference.');
         }
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-csplain.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-csplain.yaml
index 58f30991192..72c98b00196 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-csplain.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-csplain.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('csplain', interaction, draft,
-               shell, synctex, options, reference.getName());
+               shell, synctex, options, reference.fileName);
     }
 arguments:
 - identifier: interaction
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-detex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-detex.yaml
index 924e89b8a9b..827789ef76d 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-detex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-detex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         c = getCommand('detex', references, mode, follow, math, spaces,
-                       words, environments, reference.getName());
+                       words, environments, reference.fileName);
         if (output.isEmpty()) {
           return c;
         }
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipdfm.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipdfm.yaml
index fa98bb4ba58..554b0f8942d 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipdfm.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipdfm.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The DVIPDFM program
   command: >
     @{
-        base = getBasename(reference.getName()).concat('.dvi');
+        base = getBasename(reference.fileName).concat('.dvi');
         out = getBasename(output[0]).concat('.pdf');
         return getCommand('dvipdfm', base, '-o', out, options);
     }
@@ -20,7 +20,7 @@ arguments:
 - identifier: output
   flag: >
     @{
-        isEmpty(parameters.output, reference.getName(), parameters.output)
+        isEmpty(parameters.output, reference.fileName, parameters.output)
     }
   default: ''
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipdfmx.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipdfmx.yaml
index 612b8464f60..9c3d6b8cdb6 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipdfmx.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipdfmx.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The DVIPDFMX program
   command: >
     @{
-        base = getBasename(reference.getName()).concat('.dvi');
+        base = getBasename(reference.fileName).concat('.dvi');
         out = getBasename(output[0]).concat('.pdf');
         return getCommand('dvipdfmx', base, '-o', out, options);
     }
@@ -20,7 +20,7 @@ arguments:
 - identifier: output
   flag: >
     @{
-        isEmpty(parameters.output, reference.getName(), parameters.output)
+        isEmpty(parameters.output, reference.fileName, parameters.output)
     }
   default: ''
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-dvips.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-dvips.yaml
index 3cd0771fbf2..af0ad658986 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-dvips.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-dvips.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The DVIPS program
   command: >
     @{
-        base = getBasename(reference.getName()).concat('.dvi');
+        base = getBasename(reference.fileName).concat('.dvi');
         out = getBasename(output[0]).concat('.ps');
         return getCommand('dvips', base, '-o', out, options);
     }
@@ -20,7 +20,7 @@ arguments:
 - identifier: output
   flag: >
     @{
-        isEmpty(parameters.output, reference.getName(), parameters.output)
+        isEmpty(parameters.output, reference.fileName, parameters.output)
     }
   default: ''
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipspdf.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipspdf.yaml
index ed82fd037f2..dd4e918107a 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipspdf.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-dvipspdf.yaml
@@ -12,14 +12,14 @@ commands:
 - name: The DVIPS program
   command: >
     @{
-        base = getBasename(reference.getName()).concat('.dvi');
-        out = getBasename(reference.getName()).concat('.ps');
+        base = getBasename(reference.fileName).concat('.dvi');
+        out = getBasename(reference.fileName).concat('.ps');
         return getCommand('dvips', base, '-o', out, options1);
     }
 - name: The PS2PDF program
   command: >
     @{
-        base = getBasename(reference.getName()).concat('.ps');
+        base = getBasename(reference.fileName).concat('.ps');
         out = getBasename(output[0]).concat('.pdf');
         return getCommand('ps2pdf', options2, base, '-o', out);
     }
@@ -27,7 +27,7 @@ arguments:
 - identifier: output
   flag: >
     @{
-        isEmpty(parameters.output, reference.getName(), parameters.output)
+        isEmpty(parameters.output, reference.fileName, parameters.output)
     }
   default: ''
 - identifier: options1
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-dvisvgm.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-dvisvgm.yaml
index 3ae1ecb7566..8dbc005a984 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-dvisvgm.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-dvisvgm.yaml
@@ -13,7 +13,7 @@ commands:
 - name: The dvisvgm program
   command: >
     @{
-        base = getBasename(reference.getName()).
+        base = getBasename(reference.fileName).
                concat('.').concat(entry[0]);
         return getCommand('dvisvgm', getOrNull(entry, 1), pages,
                options, base);
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-etex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-etex.yaml
index 48d7d7978da..aafb597a926 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-etex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-etex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('etex', interaction, shell, options,
-                          reference.getName());
+                          reference.fileName);
     }
 arguments:
 - identifier: interaction
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-fig2dev.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-fig2dev.yaml
index fff0d71977d..3d6e542750b 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-fig2dev.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-fig2dev.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The fig2dev program
   command: >
     @{
-        input = getBasename(reference.getName()).concat('.fig');
+        input = getBasename(reference.fileName).concat('.fig');
         return getCommand('fig2dev', language, magnification, font, size,
                           options, input, output);
     }
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-frontespizio.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-frontespizio.yaml
index 05f8d00175d..721d80eabf7 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-frontespizio.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-frontespizio.yaml
@@ -15,18 +15,18 @@ commands:
   command: >
     @{
         return getCommand(engine, interaction, shell, options,
-                          reference.getName())
+                          reference.fileName)
     }
 - name: The frontispiece
   command: >
     @{
-        base = getBasename(reference.getName()).concat('-frn');
+        base = getBasename(reference.fileName).concat('-frn');
         return getCommand(engine, interaction, shell, base);
     }
 - name: The DVIPS program
   command: >
     @{
-        base = getBasename(reference.getName()).concat('-frn');
+        base = getBasename(reference.fileName).concat('-frn');
         eps = base.concat('.eps');
         return isTrue(engine == 'latex', getCommand('dvips', '-o',
                eps, base), '');
@@ -35,7 +35,7 @@ commands:
   command: >
     @{
         return getCommand(engine, interaction, shell, options,
-                          reference.getName());
+                          reference.fileName);
     }
 arguments:
 - identifier: engine
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-knitr.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-knitr.yaml
index 25bfe9f5018..3f17e54c7fa 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-knitr.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-knitr.yaml
@@ -20,7 +20,7 @@ commands:
         elements.add('envir = ' + envir[0]);
         elements.add('encoding = ' + encoding[0]);
         return getCommand('Rscript', '-e',
-               'library(knitr); knit("' + reference.getName() + '", ' +
+               'library(knitr); knit("' + reference.fileName + '", ' +
                'output = ' + out + ', ' + String.join(', ', elements) + ')');
     }
 arguments:
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-latex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-latex.yaml
index 33cef012030..dd63c28a6f7 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-latex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-latex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand(branch, interaction, draft, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: branch
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-latexmk.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-latexmk.yaml
index d8770da1b4b..afd2ca96218 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-latexmk.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-latexmk.yaml
@@ -17,7 +17,7 @@ commands:
         }
         else {
             return getCommand('latexmk', isTrue(program.isEmpty(),
-                   engine, program), options, reference.getName());
+                   engine, program), options, reference.fileName);
         }
     }
 arguments:
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-llmk.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-llmk.yaml
index 965616b5012..ec760546236 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-llmk.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-llmk.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('llmk', clean, debug, dry,
-                          mode, reference.getName());
+                          mode, reference.fileName);
     }
 arguments:
 - identifier: clean
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-ltx2any.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-ltx2any.yaml
index 4b07d08080c..30e974ca32a 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-ltx2any.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-ltx2any.yaml
@@ -15,7 +15,7 @@ commands:
         return getCommand('ltx2any', clean, engine, parameters,
                           tikzimages, jobname, logname, logformat,
                           loglevel, frequency, directory, synctex,
-                          options, reference.getName());
+                          options, reference.fileName);
     }
 arguments:
 - identifier: clean
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-luahbtex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-luahbtex.yaml
index 6bed4227b84..0c7c9200730 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-luahbtex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-luahbtex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('luahbtex', interaction, draft, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: interaction
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-lualatex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-lualatex.yaml
index a0601bc969f..8e454571fec 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-lualatex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-lualatex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand(branch, interaction, draft, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: branch
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-luatex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-luatex.yaml
index 4ab4883c7d4..aa1b982fc50 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-luatex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-luatex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('luatex', interaction, draft, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: interaction
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-makeglossaries.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-makeglossaries.yaml
index 8d775bd1fbe..12f5ca78af8 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-makeglossaries.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-makeglossaries.yaml
@@ -15,7 +15,7 @@ commands:
         if (clean.isEmpty())
         {
            return getCommand('makeglossaries', options,
-                             getBasename(reference.getName()));
+                             getBasename(reference.fileName));
         }
         else {
            prefix = [];
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-makeglossarieslite.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-makeglossarieslite.yaml
index 66a1781e3b6..11f8ae14e5d 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-makeglossarieslite.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-makeglossarieslite.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
        return  getCommand('makeglossaries-lite', options,
-                          getBasename(reference.getName()));
+                          getBasename(reference.fileName));
     }
 arguments:
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-makeindex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-makeindex.yaml
index a4df50d3965..37f3430a688 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-makeindex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-makeindex.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The MakeIndex software
   command: >
     @{
-        base = getBasename(reference.getName());
+        base = getBasename(reference.fileName);
         infile = base.concat('.').concat(input[0]);
         outfile = [ '-o', base.concat('.').concat(output[0]) ];
         logfile = [ '-t', base.concat('.').concat(log[0]) ];
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-metapost.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-metapost.yaml
index 993bea48c58..59a8681bc1d 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-metapost.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-metapost.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('mpost', interaction, numbersystem,
-               options, reference.getName());
+               options, reference.fileName);
     }
 arguments:
 - identifier: interaction
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-move.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-move.yaml
index 82620518845..df9bf69e646 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-move.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-move.yaml
@@ -23,7 +23,7 @@ commands:
             throwError('I cannot move the main file reference.');
         }
         t = isList(target) ? target[0] : target;
-        f = toFile(t).getCanonicalFile();
+        f = toFile(t).normalize();
         if (getOriginalReference().equals(f)) {
             throwError('I cannot overwrite the main file reference.');
         }
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-nomencl.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-nomencl.yaml
index dea6f465a32..9de922f3877 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-nomencl.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-nomencl.yaml
@@ -12,8 +12,8 @@ commands:
 - name: The Nomenclature software
   command: >
     @{
-        nlo = getBasename(reference.getName()).concat('.nlo');
-        nls = getBasename(reference.getName()).concat('.nls');
+        nlo = getBasename(reference.fileName).concat('.nlo');
+        nls = getBasename(reference.fileName).concat('.nls');
         return getCommand('makeindex', options, nlo, style, '-o', nls);
     }
 arguments:
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-pbibtex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-pbibtex.yaml
index 7c32708d3d2..615d1ca3ddb 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-pbibtex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-pbibtex.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The pBibTeX reference management software
   command: >
     @{
-        return getCommand('pbibtex', options, getBasename(reference.getName()))
+        return getCommand('pbibtex', options, getBasename(reference.fileName))
     }
 arguments:
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-pdfcrop.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-pdfcrop.yaml
index b8b0950196a..041fc99bede 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-pdfcrop.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-pdfcrop.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The cropping tool
   command: >
     @{
-        base = getBasename(reference.getName());
+        base = getBasename(reference.fileName);
         input = base.concat('.pdf');
         return getCommand('pdfcrop', verbose, debug, engine,
                margins, clip, hires, ini, restricted, papersize,
@@ -23,7 +23,7 @@ arguments:
   flag: >
     @{
         return isEmpty(parameters.output,
-               getBasename(reference.getName()).
+               getBasename(reference.fileName).
                concat('-crop.pdf'),
                parameters.output);
     }
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-pdfcsplain.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-pdfcsplain.yaml
index 43fd939facd..287d5ce4296 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-pdfcsplain.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-pdfcsplain.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('pdfcsplain', interaction, draft, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: interaction
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-pdflatex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-pdflatex.yaml
index 663fd85ec41..56e681642d3 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-pdflatex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-pdflatex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand(branch, interaction, draft, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: branch
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-pdftex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-pdftex.yaml
index a17049c51e2..235c561151b 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-pdftex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-pdftex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('pdftex', interaction, draft, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: interaction
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-pdftk.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-pdftk.yaml
index dc6c72338ae..5bdee16f59b 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-pdftk.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-pdftk.yaml
@@ -12,7 +12,7 @@ commands:
 - name: PDFtk
   command: >
    @{
-      input = getBasename(reference.getName()).concat('.pdf');
+      input = getBasename(reference.fileName).concat('.pdf');
       return getCommand('pdftk', input, options);
     }
 arguments:
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-perltex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-perltex.yaml
index 2642ea4d96c..b3e37ef61ec 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-perltex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-perltex.yaml
@@ -14,7 +14,7 @@ commands:
     @{
         return getCommand('perltex', engine, safe, permit, standalone,
                           interaction, shell, synctex, options,
-                          reference.getName());
+                          reference.fileName);
     }
 arguments:
 - identifier: engine
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-platex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-platex.yaml
index e98e509efc2..7e5a7c54377 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-platex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-platex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand(branch, interaction, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: branch
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-ps2pdf.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-ps2pdf.yaml
index e084450d764..4cd7cc5a22a 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-ps2pdf.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-ps2pdf.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The PS2PDF program
   command: >
     @{
-        infile = getBasename(reference.getName()).concat('.ps');
+        infile = getBasename(reference.fileName).concat('.ps');
         outfile = getBasename(output[0]).concat('.pdf');
         return getCommand('ps2pdf', options, infile, outfile);
     }
@@ -20,7 +20,7 @@ arguments:
 - identifier: output
   flag: >
     @{
-        isEmpty(parameters.output, reference.getName(), parameters.output)
+        isEmpty(parameters.output, reference.fileName, parameters.output)
     }
   default: ''
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-ptex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-ptex.yaml
index e54d83ee928..c9867ab249d 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-ptex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-ptex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('ptex', interaction, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: interaction
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-pythontex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-pythontex.yaml
index 19de0e52f3e..cd2de9fbdb2 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-pythontex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-pythontex.yaml
@@ -14,7 +14,7 @@ commands:
     @{
         return getCommand('pythontex', encoding, errorcode, runall, rerun,
                           hashdependencies, jobs, verbose, options,
-                          reference.getName());
+                          reference.fileName);
     }
 arguments:
 - identifier: encoding
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-sage.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-sage.yaml
index a150f8b0ef6..a79bad56d55 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-sage.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-sage.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The command line tool
   command: >
     @{
-        base = getBasename(reference.getName());
+        base = getBasename(reference.fileName);
         e = isList(extension) ? extension[0] : extension;
         input = base.concat('.').concat(e);
         return getCommand(program, command, dotsage,
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-sketch.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-sketch.yaml
index 98397d33798..9c1309648ae 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-sketch.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-sketch.yaml
@@ -13,8 +13,8 @@ commands:
 - name: The Sketch software
   command: >
     @{
-        output = getBasename(reference.getName()).concat('.tex');
-        return getCommand('sketch', options, reference.getName(),
+        output = getBasename(reference.fileName).concat('.tex');
+        return getCommand('sketch', options, reference.fileName,
                           '-o', output);
     }
 arguments:
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-spix.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-spix.yaml
index cc5106d52a0..b0fb9b45c24 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-spix.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-spix.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The automation tool
   command: >
     @{
-        return getCommand('spix', dry, options, reference.getName());
+        return getCommand('spix', dry, options, reference.fileName);
     }
 arguments:
 - identifier: dry
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-tex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-tex.yaml
index e67f5117c2f..1b9e4972737 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-tex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-tex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('tex', interaction, shell, options,
-                          reference.getName());
+                          reference.fileName);
     }
 arguments:
 - identifier: interaction
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-texcount.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-texcount.yaml
index d459de1673b..fabe4f0e02d 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-texcount.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-texcount.yaml
@@ -14,7 +14,7 @@ commands:
     @{
         return getCommand('texcount', rules, verbosity, strict, html,
                           total, unicode, options, output,
-                          reference.getName());
+                          reference.fileName);
     }
 arguments:
 - identifier: rules
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-texindy.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-texindy.yaml
index 73d2299bf75..5ee51c2ef63 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-texindy.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-texindy.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The TeXindy software
   command: >
     @{
-        base = getBasename(reference.getName());
+        base = getBasename(reference.fileName);
         infile = base.concat('.').concat(input[0]);
         outfile = [ '-o', base.concat('.').concat(output[0]) ];
         logfile = [ '-t', base.concat('.').concat(log[0]) ];
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-tikzmake.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-tikzmake.yaml
index 7a693f2fa30..b940f3a4177 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-tikzmake.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-tikzmake.yaml
@@ -13,7 +13,7 @@ commands:
 - name: TikZ list-and-make engine
   command: >
     @{
-        makefile = getBasename(reference.getName()).concat('.makefile');
+        makefile = getBasename(reference.fileName).concat('.makefile');
         return getCommand('make', force, jobs, options, '-f', makefile);
     }
 arguments:
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-upbibtex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-upbibtex.yaml
index 52d66d4825a..17ed779f199 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-upbibtex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-upbibtex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('upbibtex', options,
-                          getBasename(reference.getName()))
+                          getBasename(reference.fileName))
     }
 arguments:
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-uplatex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-uplatex.yaml
index 037d41660f8..c615ce761cc 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-uplatex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-uplatex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand(branch, interaction, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: branch
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-uptex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-uptex.yaml
index 7fdb6425d3d..c1e52b7ba08 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-uptex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-uptex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand('uptex', interaction, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: interaction
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-xdvipdfmx.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-xdvipdfmx.yaml
index c80f5d8d971..85310ff548b 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-xdvipdfmx.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-xdvipdfmx.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The XDVIPDFMX program
   command: >
     @{
-        infile = getBasename(reference.getName()).
+        infile = getBasename(reference.fileName).
                  concat('.').concat(entry[0]);
         outfile = getBasename(output[0]).concat('.pdf');
         return getCommand('xdvipdfmx', infile, '-o', outfile, options);
@@ -32,7 +32,7 @@ arguments:
 - identifier: output
   flag: >
     @{
-        isEmpty(parameters.output, reference.getName(), parameters.output)
+        isEmpty(parameters.output, reference.fileName, parameters.output)
     }
   default: ''
 - identifier: options
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-xelatex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-xelatex.yaml
index 95292cc2c2e..c2c7a51214f 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-xelatex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-xelatex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand(branch, interaction, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: branch
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-xetex.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-xetex.yaml
index f3547d556c8..c470b0a898b 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-xetex.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-xetex.yaml
@@ -13,7 +13,7 @@ commands:
   command: >
     @{
         return getCommand(branch, interaction, shell,
-               synctex, options, reference.getName());
+               synctex, options, reference.fileName);
     }
 arguments:
 - identifier: branch
diff --git a/Master/texmf-dist/scripts/arara/rules/arara-rule-xindy.yaml b/Master/texmf-dist/scripts/arara/rules/arara-rule-xindy.yaml
index 3eb75ac2f87..e41b086bafe 100644
--- a/Master/texmf-dist/scripts/arara/rules/arara-rule-xindy.yaml
+++ b/Master/texmf-dist/scripts/arara/rules/arara-rule-xindy.yaml
@@ -12,7 +12,7 @@ commands:
 - name: The Xindy software
   command: >
     @{
-        base = getBasename(reference.getName());
+        base = getBasename(reference.fileName);
         infile = base.concat('.').concat(input[0]);
         outfile = [ '-o', base.concat('.').concat(output[0]) ];
         logfile = [ '-t', base.concat('.').concat(log[0]) ];