better latin3&4 support

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index d9dc5782f5df2c0c078f2f6022b433b5bcb77ee9..2ede681266d2185e71465f8d1bbf1449cd86704c 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2263,19 +2263,6 @@ void Buffer::makeLaTeXFile(string const & fname,
                        texrow.newline();
                }
 
-               // We try to load babel late, in case it interferes
-               // with other packages.
-               if (use_babel) {
-                       string tmp = lyxrc.language_package;
-                       if (!lyxrc.language_global_options
-                           && tmp == "\\usepackage{babel}")
-                               tmp = string("\\usepackage[") +
-                                       language_options.str().c_str() +
-                                       "]{babel}";
-                       ofs << tmp << "\n";
-                       texrow.newline();
-               }
-
                if (params.secnumdepth != tclass.secnumdepth()) {
                        ofs << "\\setcounter{secnumdepth}{"
                            << params.secnumdepth
@@ -2390,6 +2377,19 @@ void Buffer::makeLaTeXFile(string const & fname,
 
                ofs << preamble;
 
+               // We try to load babel late, in case it interferes
+               // with other packages.
+               if (use_babel) {
+                       string tmp = lyxrc.language_package;
+                       if (!lyxrc.language_global_options
+                           && tmp == "\\usepackage{babel}")
+                               tmp = string("\\usepackage[") +
+                                       language_options.str().c_str() +
+                                       "]{babel}";
+                       ofs << tmp << "\n";
+                       texrow.newline();
+               }
+
                // make the body.
                ofs << "\\begin{document}\n";
                texrow.newline();
@@ -3361,20 +3361,18 @@ void Buffer::simpleDocBookOnePar(ostream & os, string & extra,
                        }
                } else {
                        string sgml_string;
-                       if (par->linuxDocConvertChar(c, sgml_string)
-                           && !style.free_spacing) { // in freespacing
-                                                    // mode, spaces are
-                                                    // non-breaking characters
-                               // char is ' '
-                               if (desc_on == 1) {
-                                       ++char_line_count;
-                                       os << "\n</term><listitem><para>";
-                                       desc_on = 2;
-                               } else {
-                                       os << c;
-                               }
+                       par->linuxDocConvertChar(c, sgml_string);
+
+                       if (style.pass_thru) {
+                               os << c;
+                       } else if(style.free_spacing || c != ' ') {
+                                       os << sgml_string;
+                       } else if (desc_on ==1) {
+                               ++char_line_count;
+                               os << "\n</term><listitem><para>";
+                               desc_on = 2;
                        } else {
-                               os << sgml_string;
+                               os << ' ';
                        }
                }
                font_old = font;