* src/LyXRC.{cpp,h}:

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 93f418b56e98feca2219dc84b7e65ba85eb22b19..52348c44cd0648a24770833a8c1ae48cfd6dd4e0 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -254,15 +254,18 @@ TeXOnePar(Buffer const & buf,
        LayoutPtr style;
 
        if (runparams_in.verbatim) {
-               Font const outerfont =
-                       outerFont(std::distance(paragraphs.begin(), pit),
-                                 paragraphs);
+               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);
 
-               os << '\n';
-               texrow.newline();
                return ++pit;
        }
 
@@ -474,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)