fix typo that put too many include paths for most people

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

diff --git a/lib/reLyX/BasicLyX.pm b/lib/reLyX/BasicLyX.pm
index 728a0bc1424a47745bfce043233b625d7489200f..c9441415efd9b3cfdb528297e0e8b3a77c3e5011 100644 (file)
--- a/lib/reLyX/BasicLyX.pm
+++ b/lib/reLyX/BasicLyX.pm
@@ -158,12 +158,14 @@ my %TextTokenTransTable = (
     '\LaTeXe' => "LaTeX2e",
     '\TeX'    => "TeX",
     '\LyX'    => "LyX",
+    '\lyxarrow' => "\\SpecialChar \\menuseparator\n",
     '\hfill'  => "\n\\hfill \n",
     '\noindent'        => "\n\\noindent \n",
     '\textbackslash'   => "\n\\backslash \n",
     '\textgreater'     => ">",
     '\textless'        => "<",
     '\textbar'         => "|",
+    '\textasciitilde'  => "~",
 );
 
 # LyX translations of some plain LaTeX text (TeX parser won't recognize it
@@ -212,7 +214,7 @@ my %ExtraArgEnvironments = (
 );
 
 # Math environments are copied verbatim
-my $MathEnvironments = "(math|equation|displaymath|eqnarray(\\*)?)";
+my $MathEnvironments = "(math|displaymath|xxalignat|(equation|eqnarray|align|alignat|xalignat|multline|gather)(\\*)?)";
 # ListLayouts may have standard paragraphs nested inside them.
 my $ListLayouts = "Itemize|Enumerate|Description";
 
@@ -576,7 +578,7 @@ sub basic_lyx {
            # This is to handle cases where _ is used, say, in a filename.
            # When _ is used in math mode, it'll be copied by the math mode
            # copying subs. Here we handle cases where it's used in non-math.
-           # Examples are filenames for & citation labels.
+           # Examples are filenames for \include & citation labels.
            # (It's illegal to use it in regular LaTeX text.)
            if ($name eq "_") {
               print OUTFILE $eaten->exact_print;
@@ -909,13 +911,17 @@ sub basic_lyx {
 
            # Environments lyx translates to floats
            } elsif (exists $FloatEnvTransTable{$env}) {
+               # this really only matters if it's at the very
+               # beginning of the doc.
+               &CheckForNewParagraph;
+
                $tok = $fileobject->eatOptionalArgument;
                if ($tok && defined ($dummy = $tok->print) && $dummy) {
                    print "\nIgnoring float placement '$dummy'" if $debug_on;
                }
                my $command = $FloatEnvTransTable{$env};
 
-               # Open the footnote
+               # Open the table/figure
                print OUTFILE "$command";
 
            # table