reLyX: use a saner method to translate \usepackage from the preamble, fix #1584.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8723 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d242fde765c28135e27dcd873904f4c2ba77bddf..350a67b5769f79472ee5553b5282477b1f31cb5f 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-03  José Matos  <jamatos@lyx.org>
+
+       * reLyX/MakePreamble.pm(translate_preamble): use a saner method
+       to translate \usepackage from the preamble, fix #1584.
+
 2004-05-03  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * layouts/scrlttr2.layout: include counters.

diff --git a/lib/reLyX/MakePreamble.pm b/lib/reLyX/MakePreamble.pm
index 728973f3d996d3a63931958d8ae6bffd0347bd75..e5a1d2906b2e4a44ba8af96e1fa22aebc14e3e89 100644 (file)
--- a/lib/reLyX/MakePreamble.pm
+++ b/lib/reLyX/MakePreamble.pm
@@ -294,7 +294,7 @@ sub translate_preamble {
 
     my $up;
     foreach $up (keys %Usepackage_Table) {
-       $Latex_Preamble =~ s/\\usepackage\{$up\}\s*// && do {
+       $Latex_Preamble =~ s/^\s*\\usepackage\{$up\}\s*// && do {
            $LyX_Preamble .= "$Usepackage_Table{$up}";
            $LyX_Preamble .= "\n" unless ($Usepackage_Table{$up} eq "");
        }