[lyx-cvs] [LyX/master] typo

Jean-Marc Lasgouttes lasgouttes at lyx.org
Mon Oct 7 12:57:34 UTC 2019


commit 3b642cd0edee1d8e954a3e8ef568d13fd15ab3b4
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Mon Oct 7 15:10:52 2019 +0200

    typo
---
 src/frontends/qt/GuiWorkArea.cpp |    2 +-
 src/output_latex.cpp             |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt/GuiWorkArea.cpp b/src/frontends/qt/GuiWorkArea.cpp
index e2772fb..07ad690 100644
--- a/src/frontends/qt/GuiWorkArea.cpp
+++ b/src/frontends/qt/GuiWorkArea.cpp
@@ -133,7 +133,7 @@ public:
 		x_(0), caret_width_(0)
 	{}
 
-	/* Draw he caret. Parameter \c horiz_offset is not 0 when there
+	/* Draw the caret. Parameter \c horiz_offset is not 0 when there
 	 * has been horizontal scrolling in current row
 	 */
 	void draw(QPainter & painter, int horiz_offset)
diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 4124d2d..4fcc49b 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1439,6 +1439,7 @@ void TeXOnePar(Buffer const & buf,
 				&& nextpar->getDepth() > par.getDepth()
 				&& nextpar->getAlign(bparams) == next_layout.align)
 			    || (!style.isEnvironment()
+				&& !tclass.isDefaultLayout(style)
 				&& next_layout.latextype == LATEX_ENVIRONMENT
 				&& nextpar->getDepth() < par.getDepth())
 			    || (style.isCommand()


More information about the lyx-cvs mailing list