The Box patch

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

diff --git a/lib/reLyX/MakePreamble.pm b/lib/reLyX/MakePreamble.pm
index ef06a496d3e4e7b6eacc4cee34ef882d65809ab1..728973f3d996d3a63931958d8ae6bffd0347bd75 100644 (file)
--- a/lib/reLyX/MakePreamble.pm
+++ b/lib/reLyX/MakePreamble.pm
@@ -148,7 +148,8 @@ sub translate_preamble {
 #}
 
     # Write first line of the lyx file
-    $LyX_Preamble .= "\#LyX 1.2 created this file. For more info see http://www.lyx.org/\n";
+    $LyX_Preamble .= "\# The reLyX bundled with LyX 1.3 created this file.\n" .
+       "# For more info see http://www.lyx.org/\n";
 
     # Print \lyxformat.
     $LyX_Preamble .= "\\lyxformat $Format\n";
@@ -294,16 +295,13 @@ sub translate_preamble {
     my $up;
     foreach $up (keys %Usepackage_Table) {
        $Latex_Preamble =~ s/\\usepackage\{$up\}\s*// && do {
-           my $tmp = $Usepackage_Table{$up};
-           $LyX_Preamble .= join($tmp, "\n") unless ($tmp eq '');
-           #$LyX_Preamble .= "$Usepackage_Table{$up}";
-           #$LyX_Preamble .= "\n" unless ($Usepackage_Table{$up} eq "");
+           $LyX_Preamble .= "$Usepackage_Table{$up}";
+           $LyX_Preamble .= "\n" unless ($Usepackage_Table{$up} eq "");
        }
     }
 
     # Natbib is a little more complex than that.
     if ($Latex_Preamble =~ s/\\usepackage(.*)\{natbib\}\s*//) {
-       print "matched it!\n";
        $LyX_Preamble .= "\\use_natbib 1\n\\use_numerical_citations ";
        $LyX_Preamble .= ($1 =~ /numbers/) ? "1\n" : "0\n";
     } else {