latexindent (13oct18)

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

9 files changed, 26 insertions, 21 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl b/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl
index 6ff6ea348a6..d55682eadde 100755
--- a/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl
+++ b/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-#   latexindent.pl, version 3.5.2, 2018-10-06
+#   latexindent.pl, version 3.5.3, 2018-10-13
 #
 #	This program is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
diff --git a/Master/bin/win32/latexindent.exe b/Master/bin/win32/latexindent.exe
index 0fc48f0b20b..0031cd39a9d 100755
--- a/Master/bin/win32/latexindent.exe
+++ b/Master/bin/win32/latexindent.exe
diff --git a/Master/texmf-dist/doc/support/latexindent/README b/Master/texmf-dist/doc/support/latexindent/README
index 68818736b74..059ab7a4db7 100644
--- a/Master/texmf-dist/doc/support/latexindent/README
+++ b/Master/texmf-dist/doc/support/latexindent/README
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    latexindent.pl, version 3.5.2, 2018-10-06
+    latexindent.pl, version 3.5.3, 2018-10-13
 
     PERL script to indent code within environments, and align delimited 
     environments in .tex files.
diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
index 5debcbf08bd..89a0cc077e4 100644
--- a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
+++ b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
diff --git a/Master/texmf-dist/doc/support/latexindent/title.tex b/Master/texmf-dist/doc/support/latexindent/title.tex
index 15ff645a534..ab7249bbff6 100644
--- a/Master/texmf-dist/doc/support/latexindent/title.tex
+++ b/Master/texmf-dist/doc/support/latexindent/title.tex
@@ -8,7 +8,7 @@
 			sharp corners,
 			enhanced,
 			overlay={\node[anchor=north east,outer sep=2pt] at ([xshift=3cm,yshift=4mm]frame.north east) {\includegraphics[width=3cm]{logo}}; }]
-		\centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.5.2
+		\centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.5.3
 	\end{tcolorbox}
 }
 \author{Chris Hughes \thanks{and contributors!
diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm
index 84558485951..a190d1e5f8c 100644
--- a/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm
+++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm
@@ -85,24 +85,29 @@ sub yaml_read_settings{
 
   # messages for indentconfig.yaml and/or .indentconfig.yaml
   if ( -e $indentconfig and !$switches{onlyDefault}) {
-        $logger->info("Reading path information from $indentconfig");
-        # if both indentconfig.yaml and .indentconfig.yaml exist
-        if ( -e File::HomeDir->my_home . "/indentconfig.yaml" and  -e File::HomeDir->my_home . "/.indentconfig.yaml") {
-              $logger->info("$homeDir/.indentconfig.yaml has been found, but $indentconfig takes priority");
-        } elsif ( -e File::HomeDir->my_home . "/indentconfig.yaml" ) {
-              $logger->info("(Alternatively $homeDir/.indentconfig.yaml can be used)");
-        } elsif ( -e File::HomeDir->my_home . "/.indentconfig.yaml" ) {
-              $logger->info("(Alternatively $homeDir/indentconfig.yaml can be used)");
-        }
-        
         # read the absolute paths from indentconfig.yaml
         $userSettings = YAML::Tiny->read( "$indentconfig" );
 
-        # output the contents of indentconfig to the log file
-        $logger->info(Dump \%{$userSettings->[0]});
-        
         # update the absolute paths
-        @absPaths = @{$userSettings->[0]->{paths}};
+        if($userSettings and (ref($userSettings->[0]) eq 'HASH') and $userSettings->[0]->{paths}){
+            $logger->info("Reading path information from $indentconfig");
+            # if both indentconfig.yaml and .indentconfig.yaml exist
+            if ( -e File::HomeDir->my_home . "/indentconfig.yaml" and  -e File::HomeDir->my_home . "/.indentconfig.yaml") {
+                  $logger->info("$homeDir/.indentconfig.yaml has been found, but $indentconfig takes priority");
+            } elsif ( -e File::HomeDir->my_home . "/indentconfig.yaml" ) {
+                  $logger->info("(Alternatively $homeDir/.indentconfig.yaml can be used)");
+            } elsif ( -e File::HomeDir->my_home . "/.indentconfig.yaml" ) {
+                  $logger->info("(Alternatively $homeDir/indentconfig.yaml can be used)");
+            }
+            
+            # output the contents of indentconfig to the log file
+            $logger->info(Dump \%{$userSettings->[0]});
+        
+            @absPaths = @{$userSettings->[0]->{paths}};
+        } else {
+            $logger->warn("*The paths field cannot be read from $indentconfig; this means it is either empty or contains invalid YAML");
+            $logger->warn("See https://latexindentpl.readthedocs.io/en/latest/sec-indent-config-and-settings.html for an example");
+        }
   } else {
      if($switches{onlyDefault}) {
         $logger->info("*-d switch active: only default settings requested");
diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
index 14e84d15c6d..4dd9ec1da57 100644
--- a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
+++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
@@ -19,6 +19,6 @@ use warnings;
 use Exporter qw/import/;
 our @EXPORT_OK = qw/$versionNumber $versionDate/;
 
-our $versionNumber = '3.5.2';
-our $versionDate = '2018-10-06';
+our $versionNumber = '3.5.3';
+our $versionDate = '2018-10-13';
 1
diff --git a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
index 69436cd7d8a..ad6a61fed57 100755
--- a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
+++ b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
@@ -1,4 +1,4 @@
-# defaultSettings.yaml for latexindent.pl, version 3.5.2, 2018-10-06
+# defaultSettings.yaml for latexindent.pl, version 3.5.3, 2018-10-13
 #                      a script that aims to
 #                      beautify .tex, .sty, .cls files
 #
diff --git a/Master/texmf-dist/scripts/latexindent/latexindent.pl b/Master/texmf-dist/scripts/latexindent/latexindent.pl
index 6ff6ea348a6..d55682eadde 100755
--- a/Master/texmf-dist/scripts/latexindent/latexindent.pl
+++ b/Master/texmf-dist/scripts/latexindent/latexindent.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-#   latexindent.pl, version 3.5.2, 2018-10-06
+#   latexindent.pl, version 3.5.3, 2018-10-13
 #
 #	This program is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by