From 185a62e69536b0bc20cf3970806981c6977563fa Mon Sep 17 00:00:00 2001
From: Thibaut Cuvelier <tcuvelier@lyx.org>
Date: Fri, 27 Nov 2020 04:52:39 +0100
Subject: [PATCH] DocBook: in aa, fix acknowledgements.

---
 development/autotests/invertedTests | 2 ++
 lib/layouts/aa.layout               | 1 +
 lib/layouts/aapaper.layout          | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 6d5d4dde15..e40d0d85e6 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -512,6 +512,8 @@ export/templates/Articles/International_Union_of_Crystallography_%28IUCr%29_docb
 export/templates/Articles/Mathematical_Monthly_docbook5
 # - Empty figure, very custom table caption (maybe fixable?), strange appendices (not in ToC).
 export/templates/Articles/Int._Journal_of_Modern_Physics_(C|D)_docbook5
+# - Broken references.
+export/templates/Articles/Astronomy_%26_Astrophysics_docbook5
 
 Sublabel: docbook poster
 # Posters cannot be properly exported, the LyX documents are too far from
diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 059b679a19..ec9c3e9fc5 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -189,6 +189,7 @@ Style Acknowledgement
 	EndFont
 	DocBookTag            para
 	DocBookWrapperTag     acknowledgements
+	DocBookSection        true
 End
 
 
diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout
index 0ee99ff0c6..a3936c571d 100644
--- a/lib/layouts/aapaper.layout
+++ b/lib/layouts/aapaper.layout
@@ -224,6 +224,10 @@ Style Abstract
 	  Series              Bold
 	  Size                Normal
 	EndFont
+	DocBookTag         para
+	DocBookWrapperTag  abstract
+	DocBookWrapperMergeWithPrevious  true
+	DocBookInInfo      always
 End