clean up french language handling

[lyx.git] / lib / reLyX / LastLyX.pm

diff --git a/lib/reLyX/LastLyX.pm b/lib/reLyX/LastLyX.pm
index 261009f17a0e5729469fd14caf151970b4ac2cd2..900eb1dd4ad84550fe492694da098411d8c7c256 100644 (file)
--- a/lib/reLyX/LastLyX.pm
+++ b/lib/reLyX/LastLyX.pm
@@ -53,7 +53,7 @@ sub last_lyx {
 
        } elsif (/$BasicLyX::bibstyle_insert_string/o) {
            # Replace the "insert bibstyle file here" with the actual file name
-           
+
            my $ins = $BasicLyX::bibstyle_insert_string;
            my $fil = $BasicLyX::bibstyle_file;
            if ($fil) {
@@ -79,8 +79,8 @@ sub last_lyx {
            my $newfile;
            if ($main::opt_o) { # all files go to outputdir; no path nec.
                $newfile = "$basename.lyx";
-           } else { # keep relative path, e.g. Just change suffix
-               ($newfile = $fil) =~ s/$suffix/.lyx/;
+           } else { # keep relative path, e.g. Just change/add suffix
+               ($newfile = $fil) =~ s/$suffix$/.lyx/;
            }
            s/\Q{$fil}\E/{$newfile}/;
        } # end special if for table, bibstyle, include
@@ -114,7 +114,7 @@ sub print_table {
     # know while reading the table that the last row was empty, so we
     # couldn't pop the last row then. So do it now. Yuck.
     if ($thistable->numcols==1) {
-       $to_print =~ s/\\newline(?=\s*$)// && pop @{$thistable->{"rows"}} 
+       $to_print =~ s/\\newline(?=\s*$)// && pop @{$thistable->{"rows"}}
     } elsif ($thistable->{"rows"}[$thistable->numrows -1]->{"bottom_line"}) {
        $to_print =~ s/\\newline(?=\s*$)//;
     }