From 04beccca4c7170273748e14827b8af62e5726b25 Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Sat, 9 Mar 2024 15:09:45 +0100 Subject: [PATCH] DocBook: add missing mapping for AASTeX 6.3. The result is far from perfect, see the TODOs. The corresponding tests are still inverted. --- development/autotests/invertedTests | 2 ++ lib/layouts/aastex6.layout | 9 ++++++++- lib/layouts/aastex62.layout | 12 +++++++++++- lib/layouts/aastex63.layout | 16 +++++++++++++--- 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index c88e67cda5..ec366b9745 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -412,6 +412,8 @@ export/doc(|/de|/es|/fr|/ja|/ru)/Additional_docbook5 # - AASTeX. export/export/docbook/bibliography_precooked_aastex_docbook5 export/(examples|templates)/Articles/American_Astronomical_Society_%28AASTeX_v._6.2%29_docbook5 +export/(examples|templates)/Articles/American_Astronomical_Society_%28AASTeX_v._6.3%29_docbook5 +export/(examples|templates)/Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29_docbook5 # - Springer. (The svmono_light should still pass.) export/templates/Books/Springer.*/.*_docbook5 !export/export/docbook/svmono_light_docbook5 diff --git a/lib/layouts/aastex6.layout b/lib/layouts/aastex6.layout index c6ab5ea03f..3ae8486cce 100644 --- a/lib/layouts/aastex6.layout +++ b/lib/layouts/aastex6.layout @@ -44,7 +44,14 @@ # # TODO: - support for new commands (see below) # - aastex6.cls loads hyperref (with pre-set options) and url -# -> option clash if "Use Hyerref" is selected in Document>Settings +# -> option clash if "Use Hyperref" is selected in Document>Settings +# - in DocBook, the appendix is not output (not a standard LyX appendix +# separator (needs a layout update) +# - in DocBook, the "Software" part should really be a section on its own, +# but that would require a way to provide the section title within the +# layout (needs a layout update) +# - in DocBook, the table notes are not supported at all (move the remarks +# into the table cells instead of outputting tablenotemark in the cells?) Format 104 diff --git a/lib/layouts/aastex62.layout b/lib/layouts/aastex62.layout index 5080cc06e8..5bfc03111e 100644 --- a/lib/layouts/aastex62.layout +++ b/lib/layouts/aastex62.layout @@ -48,7 +48,14 @@ # # TODO: - support for new commands (see below) # - aastex6.cls loads hyperref (with pre-set options) and url -# -> option clash if "Use Hyerref" is selected in Document>Settings +# -> option clash if "Use Hy^perref" is selected in Document>Settings +# - in DocBook, the appendix is not output (not a standard LyX appendix +# separator (needs a layout update) +# - in DocBook, the "Software" part should really be a section on its own, +# but that would require a way to provide the section title within the +# layout (needs a layout update) +# - in DocBook, the table notes are not supported at all (move the remarks +# into the table cells instead of outputting tablenotemark in the cells?) Format 104 @@ -231,6 +238,9 @@ Style Acknowledgments LabelFont Color textlabel2 EndFont + DocBookTag para + DocBookWrapperTag acknowledgements + DocBookSection true End Counter appendix diff --git a/lib/layouts/aastex63.layout b/lib/layouts/aastex63.layout index e2438986d7..e94d490e91 100644 --- a/lib/layouts/aastex63.layout +++ b/lib/layouts/aastex63.layout @@ -52,9 +52,16 @@ ## # TODO: - support for new commands (see below) # - aastex6.cls loads hyperref (with pre-set options) and url -# -> option clash if "Use Hyerref" is selected in Document>Settings +# -> option clash if "Use Hyperref" is selected in Document>Settings # support for new commands in aastex 6.3 and aastex 6.31 versions # string freeze for lyx-2.4.0, must be done for lyx-2.4.1 +# - in DocBook, the appendix is not output (not a standard LyX appendix +# separator (needs a layout update) +# - in DocBook, the "Software" part should really be a section on its own, +# but that would require a way to provide the section title within the +# layout (needs a layout update) +# - in DocBook, the table notes are not supported at all (move the remarks +# into the table cells instead of outputting tablenotemark in the cells?) Format 104 @@ -232,11 +239,14 @@ Style Acknowledgments Font Shape Up EndFont - LabelType Above - Margin Static + LabelType Above + Margin Static LabelFont Color textlabel2 EndFont + DocBookTag para + DocBookWrapperTag acknowledgements + DocBookSection true End Counter appendix