Fun with reLyX.

Add support for babel extra arguments.
Add support for make index.
Clean output.

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 706601aec9640d489947618d51a9210c76fc26f5..065c72105c73d2eca0a2df9259b01333b6797b9d 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-17  José Matos  <jamatos@fep.up.pt>
+
+       * reLyX/MakePreamble.pm: add support for \makeindex, added support
+       for optional arguments to babel, remove fontenc package. Don't
+       print the latex preamble if there isn't none to print.
+
 2001-10-15  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * scripts/TeXFiles.sh: rewrite to use kpsewhich --show-path.

diff --git a/lib/reLyX/MakePreamble.pm b/lib/reLyX/MakePreamble.pm
index a71cb92f6699f444c02b4445dff2ac1a9f6ac9d9..60c68779640a1a1e707cf0ecec22e78a1767706e 100644 (file)
--- a/lib/reLyX/MakePreamble.pm
+++ b/lib/reLyX/MakePreamble.pm
@@ -243,6 +243,7 @@ sub translate_preamble {
     if($Latex_Preamble =~ s/\\usepackage\[(.*)\]\{inputenc\}\s*//) {
        $LyX_Preamble .= "\\inputencoding $1\n";
     }
+    $Latex_Preamble =~ s/\\usepackage\[.*\]\{fontenc\}\s*//;
 
     ## Deal with several \usepackage{} cases
     my %Usepackage_Table = (
@@ -267,9 +268,17 @@ sub translate_preamble {
        "a4"            => "\\paperpackage a4wide",
 
        "graphics"      => "\\graphics default",
-       "rotating"      => ""
+       "rotating"      => "",
+       "makeidx"       => "\\makeindex"
     );
 
+    ## Babel with arguments specifing language
+    if($Latex_Preamble =~ s/\\usepackage\[(.*)\]\{babel\}\s*//) {
+       my @languages = split(',',$1);
+       my $lang = pop @languages;
+       $LyX_Preamble .= "\\language $lang\n";
+    }
+
     my $up;
     foreach $up (keys %Usepackage_Table) {
        $Latex_Preamble =~ s/\\usepackage\{$up\}\s*// && do {
@@ -342,7 +351,9 @@ sub translate_preamble {
     if ($write_preamble) {
        $Latex_Preamble =~ s/^\s*//;
        print "LaTeX preamble, consists of:\n$Latex_Preamble" if $debug_on;
-       $Latex_Preamble = "\\begin_preamble\n$Latex_Preamble\\end_preamble\n";
+       if($Latex_Preamble) {
+           $Latex_Preamble = "\\begin_preamble\n$Latex_Preamble\\end_preamble\n";
+       }
        print "End of LaTeX preamble\n" if $debug_on;
     } else {
         $Latex_Preamble = ""; #just comments, whitespace. Ignore them