Merge pull request #270 from cmhughes/develop

V3.9.3

LatexIndent/Document.pm

@@ -153,6 +153,19 @@ sub output_indented_text{
         $logger->info("Not outputting to file; see -w and -o switches for more options.");
     }
 
+    # output the log file information
+    $self->output_logfile();
+
+    # output to screen, unless silent mode
+    print ${$self}{body} unless $switches{silentMode};
+
+    return;
+}
+
+sub output_logfile{
+
+    my $self = shift;
+    #
     # put the final line in the logfile
     $logger->info("${$masterSettings{logFilePreferences}}{endLogFileWith}") if ${$masterSettings{logFilePreferences}}{endLogFileWith};
 
@@ -162,19 +175,18 @@ sub output_indented_text{
     # open log file
     my $logfileName = $switches{logFileName}||"indent.log";
     my $logfile;
-    open($logfile,">","${$self}{cruftDirectory}/$logfileName") or die "Can't open $logfileName";
+    my $logfilePossible = 1;
+    open($logfile,">","${$self}{cruftDirectory}/$logfileName") or $logfilePossible =0;
 
-    foreach my $line (@{LatexIndent::Logger::logFileLines}){
-        print $logfile $line,"\n";
-    }
+    if($logfilePossible){ 
+        foreach my $line (@{LatexIndent::Logger::logFileLines}){
+            print $logfile $line,"\n";
+        }
 
-    # close log file
-    close($logfile);
-
-    # output to screen, unless silent mode
-    print ${$self}{body} unless $switches{silentMode};
+        # close log file
+        close($logfile);
+    } 
 
-    return;
 }
 
 sub process_body_of_text{

LatexIndent/FileExtension.pm

@@ -48,8 +48,8 @@ sub file_extension_check{
     if ($fileName ne "-"){
         if (!$ext) {
             $logger->info("*File extension work:");
-            $logger->info("latexindent called to act upon $fileName without a file extension;\nsearching for file with an extension in the following order (see fileExtensionPreference):");
-            $logger->info(join("\n",@fileExtensions));
+            $logger->info("latexindent called to act upon $fileName without a file extension;\nsearching for files in the following order (see fileExtensionPreference):");
+            $logger->info($fileName.join("\n$fileName",@fileExtensions));
 
             my $fileFound = 0;
             # loop through the known file extensions (see @fileExtensions)
@@ -70,13 +70,15 @@ sub file_extension_check{
                 $logger->fatal("I searched for $fileName$_");
               }
               $logger->fatal("but couldn't find any of them.\nConsider updating fileExtensionPreference.\nExiting, no indendation done.");
-              die "I couldn't find a match for $fileName in fileExtensionPreference.\nExiting, no indendation done."; 
+              $self->output_logfile();
+              die "ERROR: I couldn't find any of the following files: ".$fileName.join(", $fileName",@fileExtensions)." (see fileExtensionPreference)\nExiting, no indendation done."; 
             }
           } else {
             # if the file has a recognised extension, check that the file exists
             unless( -e $fileName ){
-              my $message = "I couldn't find $fileName, are you sure it exists?.\nNo indentation done.\nExiting.";
+              my $message = "ERROR: I couldn't find $fileName, are you sure it exists?\nNo indentation done.\nExiting.";
               $logger->fatal("*$message");
+              $self->output_logfile();
               die $message;
             }
           }

LatexIndent/Logger.pm

@@ -49,6 +49,20 @@ sub warn{
     print $logfileline,"\n" if $switches{screenlog};
 }
 
+sub fatal{
+    my $self = shift;
+    my $logfileline = shift;
+    if ($logfileline =~ m/^\*/s){
+        $logfileline =~ s/^\*/FATAL /s;
+        $logfileline =~ s/^/       /mg;
+        $logfileline =~ s/^\h+FATAL/FATAL/s;
+    } else {
+        $logfileline =~ s/^/      /mg;
+    }
+    push(@logFileLines,$logfileline);
+    print $logfileline,"\n" if $switches{screenlog};
+}
+
 sub trace{
     my $self = shift;
     my $logfileline = shift;

LatexIndent/Version.pm

@@ -19,6 +19,6 @@ use warnings;
 use Exporter qw/import/;
 our @EXPORT_OK = qw/$versionNumber $versionDate/;
 
-our $versionNumber = '3.9.2';
-our $versionDate = '2021-04-06';
+our $versionNumber = '3.9.3';
+our $versionDate = '2021-05-07';
 1

defaultSettings.yaml

@@ -1,4 +1,4 @@
-# defaultSettings.yaml for latexindent.pl, version 3.9.2, 2021-04-06
+# defaultSettings.yaml for latexindent.pl, version 3.9.3, 2021-05-07
 #                      a script that aims to
 #                      beautify .tex, .sty, .cls files
 #

documentation/changelog.md

@@ -1,5 +1,8 @@
 # changelog.md
 
+## V3.9.3, April 7, 2021
+minor updates to log file creation https://github.com/cmhughes/latexindent.pl/issues/145
+
 ## V3.9.2, April 6, 2021
 minor update to include noindent block bug fix for https://github.com/cmhughes/latexindent.pl/issues/266
 

documentation/conf.py

@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'3.9.2'
+version = u'3.9.3'
 # The full version, including alpha/beta/rc tags.
-release = u'3.9.2'
+release = u'3.9.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.