From 5f488ed746ff18c2857b94377dc73d4b7f746a32 Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Fri, 27 Nov 2020 01:56:14 +0100 Subject: [PATCH] DocBook: deploy fix for acknowledgements. --- development/autotests/invertedTests | 4 +--- development/autotests/suspendedTests | 1 - lib/layouts/acmart.layout | 3 +++ lib/layouts/acmsiggraph-0-92.layout | 3 +++ lib/layouts/acmsiggraph.layout | 3 +++ lib/layouts/agutex.layout | 1 + lib/layouts/apa.layout | 1 + lib/layouts/apax.inc | 1 + lib/layouts/iopart.layout | 3 +++ lib/layouts/jasatex.layout | 1 + lib/layouts/revtex4-x.inc | 1 + lib/layouts/revtex4.layout | 1 + lib/layouts/sigplanconf.layout | 3 +++ lib/layouts/spie.layout | 3 +++ 14 files changed, 25 insertions(+), 4 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 36682ea853..71ade13109 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -500,11 +500,9 @@ export/examples/ko/cjk-ko-doc_docbook5 export/templates/Articles/Springers_Global_Journal_Template_%28V._3%29_docbook5 # - Sweave impossible to implement. Document irremediably wrong (no .bib file, still referenced in the text). export/templates/Articles/R_Journal_docbook5 -# - Misplaced acknowledgements (fixable). -export/templates/Articles/REVTeX_%28V._4%29_docbook5 # - Forbidden inlines, equation in formatting, broken references, float in paragraphs, videos. export/templates/Articles/REVTeX_%28V._4.1%29_docbook5 -# - Address at the end of the document (only allowed in abstract), misplaced acknowledgements. +# - Address at the end of the document (only allowed in abstract). export/templates/Articles/Kluwer_docbook5 # - Empty bibliography, broken references, empty figures. export/templates/Articles/Journal_of_the_Acoustical_Society_of_America_%28JASA%29_docbook5 diff --git a/development/autotests/suspendedTests b/development/autotests/suspendedTests index 5fa5d0b7dd..6d6e619eea 100644 --- a/development/autotests/suspendedTests +++ b/development/autotests/suspendedTests @@ -31,4 +31,3 @@ export/export/docbook/Hollywood_docbook5 export/templates/Letters/French_Letter_%28lettre%29_docbook5 export/templates/Letters/Letter_%28Standard_Class%29_docbook5 export/templates/Articles/Springers_Global_Journal_Template_%28V._3%29_docbook5 -export/templates/Articles/REVTeX_%28V._4%29_docbook5 diff --git a/lib/layouts/acmart.layout b/lib/layouts/acmart.layout index 397f6863b1..2dd90df15c 100644 --- a/lib/layouts/acmart.layout +++ b/lib/layouts/acmart.layout @@ -661,6 +661,9 @@ Style Acknowledgments Series Bold Size Large EndFont + DocBookTag para + DocBookWrapperTag acknowledgements + DocBookSection true End InsetLayout Flex:Grant_Sponsor diff --git a/lib/layouts/acmsiggraph-0-92.layout b/lib/layouts/acmsiggraph-0-92.layout index dcac1a5b85..466d6ab8f5 100644 --- a/lib/layouts/acmsiggraph-0-92.layout +++ b/lib/layouts/acmsiggraph-0-92.layout @@ -348,5 +348,8 @@ Style Acknowledgments LabelBottomsep 0 LabelType Above LabelString "Acknowledgments" + DocBookTag para + DocBookWrapperTag acknowledgements + DocBookSection true End diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout index cffcc5ed87..fa0a2d4e74 100644 --- a/lib/layouts/acmsiggraph.layout +++ b/lib/layouts/acmsiggraph.layout @@ -304,5 +304,8 @@ Style Acknowledgments LabelBottomsep 0 LabelType Above LabelString "Acknowledgments" + DocBookTag para + DocBookWrapperTag acknowledgements + DocBookSection true End diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout index 996aae7b5a..af58699357 100644 --- a/lib/layouts/agutex.layout +++ b/lib/layouts/agutex.layout @@ -204,6 +204,7 @@ Style Acknowledgments EndFont DocBookTag para DocBookWrapperTag acknowledgements + DocBookSection true End diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout index ad794e5c59..dcacaee0b5 100644 --- a/lib/layouts/apa.layout +++ b/lib/layouts/apa.layout @@ -253,6 +253,7 @@ Style Acknowledgements EndFont DocBookTag para DocBookWrapperTag acknowledgements + DocBookSection true End diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc index d37cd2bff9..8edc84e3f5 100644 --- a/lib/layouts/apax.inc +++ b/lib/layouts/apax.inc @@ -324,6 +324,7 @@ Style AuthorNote EndFont DocBookTag para DocBookWrapperTag acknowledgements + DocBookSection true End diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout index 981a2d1c0e..75f2764deb 100644 --- a/lib/layouts/iopart.layout +++ b/lib/layouts/iopart.layout @@ -282,6 +282,9 @@ Style Acknowledgments Series Bold Size Normal EndFont + DocBookTag para + DocBookWrapperTag acknowledgements + DocBookSection true End diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout index 174f3926ce..a20d905849 100644 --- a/lib/layouts/jasatex.layout +++ b/lib/layouts/jasatex.layout @@ -296,6 +296,7 @@ Style Acknowledgments EndFont DocBookTag para DocBookWrapperTag acknowledgements + DocBookSection true End diff --git a/lib/layouts/revtex4-x.inc b/lib/layouts/revtex4-x.inc index 7449e5f38d..70c905bc0b 100644 --- a/lib/layouts/revtex4-x.inc +++ b/lib/layouts/revtex4-x.inc @@ -271,6 +271,7 @@ Style Acknowledgments TopSep 0.7 DocBookTag para DocBookWrapperTag acknowledgements + DocBookSection true End diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout index 1c557aed0f..6979139ac9 100644 --- a/lib/layouts/revtex4.layout +++ b/lib/layouts/revtex4.layout @@ -293,6 +293,7 @@ Style Acknowledgments EndFont DocBookTag para DocBookWrapperTag acknowledgements + DocBookSection true End diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout index afa9d6d6ac..363a2611ac 100644 --- a/lib/layouts/sigplanconf.layout +++ b/lib/layouts/sigplanconf.layout @@ -228,5 +228,8 @@ Style Acknowledgments LabelBottomsep 0 LabelType Above LabelString "Acknowledgments" + DocBookTag para + DocBookWrapperTag acknowledgements + DocBookSection true End diff --git a/lib/layouts/spie.layout b/lib/layouts/spie.layout index 1686cc60f3..fe66b2971c 100644 --- a/lib/layouts/spie.layout +++ b/lib/layouts/spie.layout @@ -94,4 +94,7 @@ Style Acknowledgments # LatexType Command LatexName acknowledgments LabelString "ACKNOWLEDGMENTS" + DocBookTag para + DocBookWrapperTag acknowledgements + DocBookSection true End