From: Thibaut Cuvelier <tcuvelier@lyx.org>
Date: Sun, 30 Aug 2020 22:42:32 +0000 (+0200)
Subject: DocBook: fix margin notes.
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~181^2~38
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6d246bba695bdfd414c0359891fbbb4e9a061f99;p=features.git

DocBook: fix margin notes.

They were nested twice in <sidebar>. Also fixes a new line issue.
---

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 04c464a1e3..ab15f77456 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -44,8 +44,7 @@ InsetLayout Marginal
 	EndHTMLStyle
 	AddToToc              marginalnote
 	IsTocCaption          true
-	DocBookTag            sidebar
-	DocBookAttr           role="margin"
+	DocBookTag            para
 End
 
 InsetLayout Foot
diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index 5d2fb909f2..3a5296d089 100644
--- a/src/insets/InsetMarginal.cpp
+++ b/src/insets/InsetMarginal.cpp
@@ -49,6 +49,7 @@ void InsetMarginal::docbook(XMLStream & xs, OutputParams const & runparams) cons
 	xs << xml::StartTag("sidebar", "role=\"margin\"");
 	xs << xml::CR();
 	xs << XMLStream::ESCAPE_NONE << "<?dbfo float-type=\"margin.note\"?>";
+	xs << xml::CR();
 	InsetText::docbook(xs, runparams);
 	xs << xml::EndTag("sidebar");
 }