r37065 - lyx-devel/trunk/src/tex2lyx

[baum]

Author: baum
Date: Sun Jan  2 17:54:58 2011
New Revision: 37065
URL: http://www.lyx.org/trac/changeset/37065

Log:
tex2lyx: Do not swallow a user defined \parindent

Modified:
   lyx-devel/trunk/src/tex2lyx/preamble.cpp

Modified: lyx-devel/trunk/src/tex2lyx/preamble.cpp
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/preamble.cpp    Sun Jan  2 16:39:48 2011        
(r37064)
+++ lyx-devel/trunk/src/tex2lyx/preamble.cpp    Sun Jan  2 17:54:58 2011        
(r37065)
@@ -179,6 +179,7 @@
 string h_tocdepth                = "3";
 string h_paragraph_separation    = "indent";
 string h_defskip                 = "medskip";
+string h_paragraph_indentation   = "default";
 string h_quotes_language         = "english";
 string h_papercolumns            = "1";
 string h_papersides              = string();
@@ -604,9 +605,12 @@
           << h_margins
           << "\\secnumdepth " << h_secnumdepth << "\n"
           << "\\tocdepth " << h_tocdepth << "\n"
-          << "\\paragraph_separation " << h_paragraph_separation << "\n"
-          << "\\defskip " << h_defskip << "\n"
-          << "\\quotes_language " << h_quotes_language << "\n"
+          << "\\paragraph_separation " << h_paragraph_separation << "\n";
+       if (LYX_FORMAT < 365 || h_paragraph_separation == "skip")
+               os << "\\defskip " << h_defskip << "\n";
+       else
+               os << "\\paragraph_indentation " << h_paragraph_indentation << 
"\n";
+       os << "\\quotes_language " << h_quotes_language << "\n"
           << "\\papercolumns " << h_papercolumns << "\n"
           << "\\papersides " << h_papersides << "\n"
           << "\\paperpagestyle " << h_paperpagestyle << "\n";
@@ -883,6 +887,11 @@
                        if (name == "\\parindent" && content != "") {
                                if (content[0] == '0')
                                        h_paragraph_separation = "skip";
+                               else if (LYX_FORMAT >= 365)
+                                       h_paragraph_indentation = 
translate_len(content);
+                               else
+                                       h_preamble << "\\setlength{" << name
+                                                  << "}{" << content << "}";
                        } else if (name == "\\parskip") {
                                if (content == "\\smallskipamount")
                                        h_defskip = "smallskip";