better latin3&4 support

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index f16af67f98e2491950c46cefb9252948b21d3a8e..2ede681266d2185e71465f8d1bbf1449cd86704c 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1370,7 +1370,7 @@ void Buffer::insertStringAsLines(Paragraph *& par, Paragraph::size_type & pos,
                                ++pos;
                                space_inserted = true;
                        } else {
-                               const Paragraph::value_type nb = 8 - pos % 8;
+                               const Paragraph::size_type nb = 8 - pos % 8;
                                for (Paragraph::size_type a = 0; 
                                     a < nb ; ++a) {
                                        par->insertChar(pos, ' ', font);
@@ -1697,7 +1697,7 @@ bool Buffer::writeFile(string const & fname, bool flag) const
        // The top of the file should not be written by params.
 
        // write out a comment in the top of the file
-       ofs << '#' << LYX_DOCVERSION 
+       ofs << '#' << lyx_docversion 
            << " created this file. For more info see http://www.lyx.org/\n"
            << "\\lyxformat " << LYX_FORMAT << "\n";
 
@@ -1747,7 +1747,7 @@ string const Buffer::asciiParagraph(Paragraph const * par,
        Paragraph::depth_type depth = 0;
        int ltype = 0;
        Paragraph::depth_type ltype_depth = 0;
-       unsigned int currlinelen = 0;
+       string::size_type currlinelen = 0;
        bool ref_printed = false;
 
        int noparbreak = 0;
@@ -1971,7 +1971,7 @@ void Buffer::makeLaTeXFile(string const & fname,
        texrow.start(paragraph, 0);
 
        if (!only_body && nice) {
-               ofs << "%% " LYX_DOCVERSION " created this file.  "
+               ofs << "%% " << lyx_docversion << " created this file.  "
                        "For more info, see http://www.lyx.org/.\n"
                        "%% Do not edit unless you really know what "
                        "you are doing.\n";
@@ -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();
@@ -2577,7 +2577,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
                }
        }
 
-       ofs << "<!-- "  << LYX_DOCVERSION 
+       ofs << "<!-- "  << lyx_docversion
            << " created this file. For more info see http://www.lyx.org/"
            << " -->\n";
 
@@ -3045,7 +3045,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
        }
        sgmlOpenTag(ofs, 0, top);
 
-       ofs << "<!-- DocBook file was created by " << LYX_DOCVERSION 
+       ofs << "<!-- DocBook file was created by " << lyx_docversion
            << "\n  See http://www.lyx.org/ for more information -->\n";
 
        vector<string> environment_stack(10);
@@ -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;