* src/LyXRC.{cpp,h}:

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 4d357131a6d300fc2fdeb3f48eb506b7275a3ff4..52348c44cd0648a24770833a8c1ae48cfd6dd4e0 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -253,6 +253,22 @@ TeXOnePar(Buffer const & buf,
        BufferParams const & bparams = buf.params();
        LayoutPtr style;
 
+       if (runparams_in.verbatim) {
+               int const dist = std::distance(paragraphs.begin(), pit);
+               Font const outerfont = outerFont(dist, paragraphs);
+
+               // No newline if only one paragraph in this lyxtext
+               if (dist > 0) {
+                       os << '\n';
+                       texrow.newline();
+               }
+
+               /*bool need_par = */ pit->latex(buf, bparams, outerfont,
+                       os, texrow, runparams_in);
+
+               return ++pit;
+       }
+
        // In an inset with unlimited length (all in one row),
        // force layout to default
        if (!pit->forceDefaultParagraphs())
@@ -441,7 +457,7 @@ TeXOnePar(Buffer const & buf,
 
        // FIXME UNICODE
        os << from_utf8(everypar);
-       bool need_par = pit->simpleTeXOnePar(buf, bparams, outerfont,
+       bool need_par = pit->latex(buf, bparams, outerfont,
                                             os, texrow, runparams);
 
        // Make sure that \\par is done with the font of the last
@@ -461,7 +477,7 @@ TeXOnePar(Buffer const & buf,
 
        bool is_command = style->isCommand();
 
-       if (style->resfont.size() != font.size()
+       if (style->resfont.size() != font.fontInfo().size()
            && boost::next(pit) != paragraphs.end()
            && !is_command) {
                if (!need_par)