Fix line count off-by-one for single-par verbatims

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21293 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 8532b403fa7559736a7de6885869cf03059391fd..de5718eae80384ecb18a198651434c5e3d1840b4 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 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;
        }