Amend 16a1aa99

With the current settings, a theorem with several paragraphs will have several wrapper tags (i.e. two `<db:figure>`, with one paragraph each, one next to the other when it's the same theorem), while there should be only one (one `<db:figure>` with two paragraphs).

It makes me wonder whether DocBookWrapperMergeWithPrevious should be the default value. I don't see a case where it would be set to `false` with a wrapper tag, but the test suite isn't developed enough to make the change with peace of mind (i.e. remove the parameter `DocBookWrapperMergeWithPrevious` and consider it is always `true` in the code).

For the record, the current code also works with two subsequent theorems with two paragraphs each (see new test case).

autotests/export/docbook/font_overlapping.lyx

@@ -0,0 +1,103 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 609
+\begin_document
+\begin_header
+\save_transient_properties false
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children no
+\language english
+\language_package default
+\inputencoding utf8
+\fontencoding auto
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype true
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment center
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize a4
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date true
+\justification false
+\use_refstyle 1
+\use_minted 0
+\use_lineno 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\change_bars false
+\postpone_fragile_content true
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+norm 
+\emph on
+emph 
+\series bold
+emph-bold
+\emph default
+ bold
+\series default
+ norm
+\end_layout
+
+\end_body
+\end_document

autotests/export/docbook/theorems-multiparagraph.lyx

@@ -0,0 +1,139 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 614
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\begin_modules
+theorems-std
+\end_modules
+\maintain_unincluded_children no
+\language italian
+\language_package default
+\inputencoding utf8
+\fontencoding auto
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\use_lineno 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\change_bars false
+\postpone_fragile_content true
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
+\end_header
+
+\begin_body
+
+\begin_layout Title
+Test
+\end_layout
+
+\begin_layout Theorem
+For electrons in a perfect crystal
+\end_layout
+
+\begin_layout Theorem
+there is a basis of wave functions with the following two properties:
+\end_layout
+
+\begin_layout Standard
+\begin_inset Separator plain
+\end_inset
+
+
+\end_layout
+
+\begin_layout Theorem
+1) each of these wave functions is an energy eigenstate;
+\end_layout
+
+\begin_layout Theorem
+2) each of these wave functions is a Bloch state,
+ meaning that this wave function 
+\begin_inset Formula $\psi$
+\end_inset
+
+ can be written in the form 
+\begin_inset Formula $\psi(r)=u(\boldsymbol{r})e^{i\boldsymbol{k}\cdot\boldsymbol{r}}$
+\end_inset
+
+ where 
+\begin_inset Formula $u$
+\end_inset
+
+ has the same periodicity as the atomic structure of the crystal:
+ 
+\begin_inset Formula $u_{\boldsymbol{k}}(\boldsymbol{r})=u_{\boldsymbol{k}}(\boldsymbol{r}+\boldsymbol{n}\cdot\boldsymbol{a})$
+\end_inset
+
+.
+\end_layout
+
+\end_body
+\end_document

autotests/export/docbook/theorems-multiparagraph.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This DocBook file was created by LyX 2.4.0-beta2
+  See https://www.lyx.org/ for more information -->
+<article xml:lang="it_IT" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.2">
+<title>Test</title>
+<figure role='theorem'>
+<title>Teorema 1.</title>
+<para>For electrons in a perfect crystal</para>
+<para>there is a basis of wave functions with the following two properties:</para>
+</figure>
+<figure role='theorem'>
+<title>Teorema 2.</title>
+<para>1) each of these wave functions is an energy eigenstate;</para>
+<para>2) each of these wave functions is a Bloch state, meaning that this wave function <inlineequation>
+<alt role='tex'>\psi</alt>
+<m:math display="inline">
+ 
+<m:mrow><m:mi>&#x3C8;</m:mi>
+</m:mrow>
+</m:math>
+</inlineequation> can be written in the form <inlineequation>
+<alt role='tex'>\psi(r)=u(\boldsymbol{r})e^{i\boldsymbol{k}\cdot\boldsymbol{r}}</alt>
+<m:math display="inline">
+ 
+<m:mrow>
+ <m:mrow><m:mi>&#x3C8;</m:mi>
+  <m:mrow>
+   <m:mo form='prefix' fence='true' stretchy='true' symmetric='true'>(</m:mo>
+   <m:mi>r</m:mi>
+   <m:mo form='postfix' fence='true' stretchy='true' symmetric='true'>)</m:mo>
+  </m:mrow>
+  <m:mo>=</m:mo>
+  <m:mi>u</m:mi>
+  <m:mrow>
+   <m:mo form='prefix' fence='true' stretchy='true' symmetric='true'>(</m:mo>
+   <m:mstyle mathvariant='bold'>
+   <m:mi>r</m:mi></m:mstyle>
+   <m:mo form='postfix' fence='true' stretchy='true' symmetric='true'>)</m:mo>
+  </m:mrow>
+  <m:msup>
+   <m:mi>e</m:mi>
+   <m:mrow>
+    <m:mi>i</m:mi>
+    <m:mstyle mathvariant='bold'>
+    <m:mi>k</m:mi></m:mstyle><m:mo>&#x22C5;</m:mo>
+    <m:mstyle mathvariant='bold'>
+    <m:mi>r</m:mi></m:mstyle>
+   </m:mrow>
+  </m:msup>
+ </m:mrow>
+</m:mrow>
+</m:math>
+</inlineequation> where <inlineequation>
+<alt role='tex'>u</alt>
+<m:math display="inline">
+ 
+<m:mrow>
+ <m:mi>u</m:mi>
+</m:mrow>
+</m:math>
+</inlineequation> has the same periodicity as the atomic structure of the crystal: <inlineequation>
+<alt role='tex'>u_{\boldsymbol{k}}(\boldsymbol{r})=u_{\boldsymbol{k}}(\boldsymbol{r}+\boldsymbol{n}\cdot\boldsymbol{a})</alt>
+<m:math display="inline">
+ 
+<m:mrow>
+ <m:mrow>
+  <m:msub>
+   <m:mi>u</m:mi>
+   <m:mstyle mathvariant='bold'>
+   <m:mi>k</m:mi></m:mstyle>
+  </m:msub>
+  <m:mrow>
+   <m:mo form='prefix' fence='true' stretchy='true' symmetric='true'>(</m:mo>
+   <m:mstyle mathvariant='bold'>
+   <m:mi>r</m:mi></m:mstyle>
+   <m:mo form='postfix' fence='true' stretchy='true' symmetric='true'>)</m:mo>
+  </m:mrow>
+  <m:mo>=</m:mo>
+  <m:msub>
+   <m:mi>u</m:mi>
+   <m:mstyle mathvariant='bold'>
+   <m:mi>k</m:mi></m:mstyle>
+  </m:msub>
+  <m:mrow>
+   <m:mo form='prefix' fence='true' stretchy='true' symmetric='true'>(</m:mo>
+   <m:mrow>
+    <m:mstyle mathvariant='bold'>
+    <m:mi>r</m:mi></m:mstyle>
+    <m:mo>+</m:mo>
+    <m:mstyle mathvariant='bold'>
+    <m:mi>n</m:mi></m:mstyle><m:mo>&#x22C5;</m:mo>
+    <m:mstyle mathvariant='bold'>
+    <m:mi>a</m:mi></m:mstyle>
+   </m:mrow>
+   <m:mo form='postfix' fence='true' stretchy='true' symmetric='true'>)</m:mo>
+  </m:mrow>
+ </m:mrow>
+</m:mrow>
+</m:math>
+</inlineequation>.</para>
+</figure>
+</article>

lib/layouts/elsart.layout

@@ -337,6 +337,7 @@ Style Theorem
 	DocBookWrapperAttr    role='theorem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -370,6 +371,7 @@ Style Proof
 	DocBookWrapperAttr    role='proof'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -381,6 +383,7 @@ Style Lemma
 	DocBookWrapperAttr    role='lemma'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -392,6 +395,7 @@ Style Corollary
 	DocBookWrapperAttr    role='corollary'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -403,6 +407,7 @@ Style Proposition
 	DocBookWrapperAttr    role='proposition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -414,6 +419,7 @@ Style Criterion
 	DocBookWrapperAttr    role='criterion'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -425,6 +431,7 @@ Style Algorithm
 	DocBookWrapperAttr    role='algorithm'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -443,6 +450,7 @@ Style Definition
 	DocBookWrapperAttr    role='definition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -454,6 +462,7 @@ Style Conjecture
 	DocBookWrapperAttr    role='conjecture'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 

lib/layouts/theorems-ams-bytype.inc

@@ -76,6 +76,7 @@ Style Theorem
 	DocBookWrapperAttr    role='theorem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -98,6 +99,7 @@ Style Corollary
 	DocBookWrapperAttr    role='corollary'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -120,6 +122,7 @@ Style Lemma
 	DocBookWrapperAttr    role='lemma'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -142,6 +145,7 @@ Style Proposition
 	DocBookWrapperAttr    role='proposition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -164,6 +168,7 @@ Style Conjecture
 	DocBookWrapperAttr    role='conjecture'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -186,6 +191,7 @@ Style Fact
 	DocBookWrapperAttr    role='fact'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -215,6 +221,7 @@ Style Definition
 	DocBookWrapperAttr    role='definition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -260,6 +267,7 @@ Style Problem
 	DocBookWrapperAttr    role='problem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -283,6 +291,7 @@ Style Exercise
 	DocBookWrapperAttr    role='exercise'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -306,6 +315,7 @@ Style Solution
 	DocBookWrapperAttr    role='solution'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -336,6 +346,7 @@ Style Remark
 	DocBookWrapperAttr    role='remark'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -359,6 +370,7 @@ Style Claim
 	DocBookWrapperAttr    role='claim'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 Input theorems-case.inc

lib/layouts/theorems-ams-chap-bytype.inc

@@ -122,6 +122,7 @@ Style Theorem
 	DocBookWrapperAttr    role='theorem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -148,6 +149,7 @@ Style Corollary
 	DocBookWrapperAttr    role='corollary'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -174,6 +176,7 @@ Style Lemma
 	DocBookWrapperAttr    role='lemma'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -200,6 +203,7 @@ Style Proposition
 	DocBookWrapperAttr    role='proposition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -226,6 +230,7 @@ Style Conjecture
 	DocBookWrapperAttr    role='conjecture'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -252,6 +257,7 @@ Style Fact
 	DocBookWrapperAttr    role='fact'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -285,6 +291,7 @@ Style Definition
 	DocBookWrapperAttr    role='definition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -338,6 +345,7 @@ Style Problem
 	DocBookWrapperAttr    role='problem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -365,6 +373,7 @@ Style Exercise
 	DocBookWrapperAttr    role='exercise'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -392,6 +401,7 @@ Style Solution
 	DocBookWrapperAttr    role='solution'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -426,6 +436,7 @@ Style Remark
 	DocBookWrapperAttr    role='remark'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -453,6 +464,7 @@ Style Claim
 	DocBookWrapperAttr    role='claim'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 

lib/layouts/theorems-ams.inc

@@ -73,6 +73,7 @@ Style Theorem
 	DocBookWrapperAttr    role='theorem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -95,6 +96,7 @@ Style Corollary
 	DocBookWrapperAttr    role='corollary'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -117,6 +119,7 @@ Style Lemma
 	DocBookWrapperAttr    role='lemma'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -139,6 +142,7 @@ Style Proposition
 	DocBookWrapperAttr    role='proposition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -161,6 +165,7 @@ Style Conjecture
 	DocBookWrapperAttr    role='conjecture'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -183,6 +188,7 @@ Style Fact
 	DocBookWrapperAttr    role='fact'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -212,6 +218,7 @@ Style Definition
 	DocBookWrapperAttr    role='definition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -253,6 +260,7 @@ Style Problem
 	DocBookWrapperAttr    role='problem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -274,6 +282,7 @@ Style Exercise
 	DocBookWrapperAttr    role='exercise'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -295,6 +304,7 @@ Style Solution
 	DocBookWrapperAttr    role='solution'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -325,6 +335,7 @@ Style Remark
 	DocBookWrapperAttr    role='remark'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -346,6 +357,7 @@ Style Claim
 	DocBookWrapperAttr    role='claim'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 Input theorems-case.inc

lib/layouts/theorems-bytype.inc

@@ -70,6 +70,7 @@ Style Theorem
 	DocBookWrapperAttr    role='theorem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -92,6 +93,7 @@ Style Corollary
 	DocBookWrapperAttr    role='corollary'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -114,6 +116,7 @@ Style Lemma
 	DocBookWrapperAttr    role='lemma'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -136,6 +139,7 @@ Style Proposition
 	DocBookWrapperAttr    role='proposition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -158,6 +162,7 @@ Style Conjecture
 	DocBookWrapperAttr    role='conjecture'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -180,6 +185,7 @@ Style Fact
 	DocBookWrapperAttr    role='fact'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -209,6 +215,7 @@ Style Definition
 	DocBookWrapperAttr    role='definition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -254,6 +261,7 @@ Style Problem
 	DocBookWrapperAttr    role='problem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -277,6 +285,7 @@ Style Exercise
 	DocBookWrapperAttr    role='exercise'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -300,6 +309,7 @@ Style Solution
 	DocBookWrapperAttr    role='solution'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -330,6 +340,7 @@ Style Remark
 	DocBookWrapperAttr    role='remark'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -353,6 +364,7 @@ Style Claim
 	DocBookWrapperAttr    role='claim'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 Input theorems-case.inc

lib/layouts/theorems-starred.inc

@@ -74,6 +74,7 @@ Style Theorem*
 	DocBookWrapperAttr    role='theorem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -95,6 +96,7 @@ Style Corollary*
 	DocBookWrapperAttr    role='corollary'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -116,6 +118,7 @@ Style Lemma*
 	DocBookWrapperAttr    role='lemma'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -137,6 +140,7 @@ Style Proposition*
 	DocBookWrapperAttr    role='proposition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -158,6 +162,7 @@ Style Conjecture*
 	DocBookWrapperAttr    role='conjecture'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -179,6 +184,7 @@ Style Fact*
 	DocBookWrapperAttr    role='fact'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -208,6 +214,7 @@ Style Definition*
 	DocBookWrapperAttr    role='definition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -249,6 +256,7 @@ Style Problem*
 	DocBookWrapperAttr    role='problem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -270,6 +278,7 @@ Style Exercise*
 	DocBookWrapperAttr    role='exercise'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -291,6 +300,7 @@ Style Solution*
 	DocBookWrapperAttr    role='solution'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -320,6 +330,7 @@ Style Remark*
 	DocBookWrapperAttr    role='remark'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -341,5 +352,6 @@ Style Claim*
 	DocBookWrapperAttr    role='claim'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 

lib/layouts/theorems-without-preamble.inc

@@ -78,6 +78,7 @@ Style Theorem
 	DocBookWrapperAttr    role='theorem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -99,6 +100,7 @@ Style Corollary
 	DocBookWrapperAttr    role='corollary'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -120,6 +122,7 @@ Style Lemma
 	DocBookWrapperAttr    role='lemma'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -141,6 +144,7 @@ Style Proposition
 	DocBookWrapperAttr    role='proposition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -162,6 +166,7 @@ Style Prop
 	DocBookWrapperAttr    role='proposition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -190,6 +195,7 @@ Style Conjecture
 	DocBookWrapperAttr    role='conjecture'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -211,6 +217,7 @@ Style Fact
 	DocBookWrapperAttr    role='fact'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -240,6 +247,7 @@ Style Definition
 	DocBookWrapperAttr    role='definition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -284,6 +292,7 @@ Style Problem
 	DocBookWrapperAttr    role='problem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -321,6 +330,7 @@ Style Prob
 	DocBookWrapperAttr    role='problem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -343,6 +353,7 @@ Style Solution
 	DocBookWrapperAttr    role='solution'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -361,6 +372,7 @@ Style Sol
 	DocBookWrapperAttr    role='solution'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -383,6 +395,7 @@ Style Exercise
 	DocBookWrapperAttr    role='exercise'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -405,6 +418,7 @@ Style Remark
 	DocBookWrapperAttr    role='remark'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -422,6 +436,7 @@ Style		Claim
 	DocBookWrapperAttr    role='claim'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -444,6 +459,7 @@ Style Case
 	DocBookWrapperAttr    role='case'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -466,6 +482,7 @@ Style Property
 	DocBookWrapperAttr    role='property'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -488,6 +505,7 @@ Style Question
 	DocBookWrapperAttr    role='question'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 

lib/layouts/theorems.inc

@@ -73,6 +73,7 @@ Style Theorem
 	DocBookWrapperAttr    role='theorem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -95,6 +96,7 @@ Style Corollary
 	DocBookWrapperAttr    role='corollary'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -117,6 +119,7 @@ Style Lemma
 	DocBookWrapperAttr    role='lemma'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -139,6 +142,7 @@ Style Proposition
 	DocBookWrapperAttr    role='proposition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -161,6 +165,7 @@ Style Conjecture
 	DocBookWrapperAttr    role='conjecture'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -183,6 +188,7 @@ Style Fact
 	DocBookWrapperAttr    role='fact'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -212,6 +218,7 @@ Style Definition
 	DocBookWrapperAttr    role='definition'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -253,6 +260,7 @@ Style Problem
 	DocBookWrapperAttr    role='problem'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -274,6 +282,7 @@ Style Exercise
 	DocBookWrapperAttr    role='exercise'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -295,6 +304,7 @@ Style Solution
 	DocBookWrapperAttr    role='solution'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -325,6 +335,7 @@ Style Remark
 	DocBookWrapperAttr    role='remark'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -346,6 +357,7 @@ Style Claim
 	DocBookWrapperAttr    role='claim'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 Input theorems-case.inc