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 04c464a1e3b4ca01541ca73fbb6e00dceb21417a..ab15f774563e3e70ae18f9f86d3203e44758ee99 100644 (file)
--- 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 5d2fb909f291caff80cafa74f1cb84b3d08eaeac..3a5296d0895a925da88525fb9682824cd87df187 100644 (file)
--- 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");
 }