From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 19 Nov 2017 07:59:48 +0000 (+0100)
Subject: Fix footnote output in description item
X-Git-Tag: 2.3.0rc2~241
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3561caa3a171a5984ee7a10b7ea82f7f4b7226e8;p=features.git

Fix footnote output in description item

Fixes: #9387
(cherry picked from commit aaa61500896ef00087b146fd41ee88ea16dd0f1d)
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 6f514863de..291881911b 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1490,6 +1490,16 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const
 	for (; icit != iend; ++icit) {
 		if (icit->inset) {
 			features.inDeletedInset(owner_->isDeleted(icit->pos));
+			if (icit->inset->lyxCode() == FOOT_CODE) {
+				// FIXME: an item inset would make things much easier.
+				if ((layout_->latextype == LATEX_LIST_ENVIRONMENT
+				     || (layout_->latextype == LATEX_ITEM_ENVIRONMENT
+					 && layout_->margintype == MARGIN_FIRST_DYNAMIC))
+				    && (icit->pos < begin_of_body_
+					|| (icit->pos == begin_of_body_
+					    && (icit->pos == 0 || text_[icit->pos - 1] != ' '))))
+					features.saveNoteEnv("description");
+			}
 			icit->inset->validate(features);
 			features.inDeletedInset(false);
 			if (layout_->needprotect &&