* src/LyXRC.{cpp,h}:

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 92c1ca77d54d3e087f9bf9a30ea81f0a99f074ed..52348c44cd0648a24770833a8c1ae48cfd6dd4e0 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -254,14 +254,18 @@ TeXOnePar(Buffer const & buf,
        LayoutPtr style;
 
        if (runparams_in.verbatim) {
-               Font const outerfont =
-                       outerFont(std::distance(paragraphs.begin(), pit),
-                                 paragraphs);
-               // FIXME UNICODE
-               bool need_par = pit->latex(buf, bparams, outerfont,
-                                            os, texrow, runparams_in);
-               os << '\n';
-               texrow.newline();
+               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;
        }
 
@@ -473,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)