commit 0e4d8a81596ef2fb21d369b4770060564934b3e1
Author: Thibaut Cuvelier <[email protected]>
Date: Fri Nov 27 04:16:48 2020 +0100
DocBook: implement IJMP C/D.
---
development/autotests/invertedTests | 2 +
lib/layouts/ijmpc.layout | 62 ++++++++++++++++++++++++++++++---
lib/layouts/ijmpd.layout | 65 ++++++++++++++++++++++++++++++++---
3 files changed, 119 insertions(+), 10 deletions(-)
diff --git a/development/autotests/invertedTests
b/development/autotests/invertedTests
index 7696822..6d5d4dd 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -510,6 +510,8 @@
export/templates/Articles/Journal_of_the_Acoustical_Society_of_America_%28JASA%2
export/templates/Articles/International_Union_of_Crystallography_%28IUCr%29_docbook5
# - Biographies after bibliography: DocBook does not allow content after a
bibliography.
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
Sublabel: docbook poster
# Posters cannot be properly exported, the LyX documents are too far from
diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout
index e03c4d9..51b1d5b 100644
--- a/lib/layouts/ijmpc.layout
+++ b/lib/layouts/ijmpc.layout
@@ -30,6 +30,7 @@ Style Standard
Align Block
AlignPossible Block, Left, Right, Center
LabelType No_Label
+ DocBookTag para
End
Input stdcounters.inc
@@ -83,6 +84,9 @@ Style MarkBoth
\DeclareRobustCommand{\foreign@language}[1]{%
\lowercase{\oldforeign@language{#1}}}
EndPreamble
+ DocBookTag IGNORE
+ # TODO: a mix of titleabbrev and authorinitials...
+ DocBookInInfo always
End
Style Catchline
@@ -102,6 +106,8 @@ Style Catchline
Series Bold
Color Green
EndFont
+ DocBookTag IGNORE
+ DocBookInInfo always
End
Style Title
@@ -121,6 +127,9 @@ Style Title
Font
Size Largest
EndFont
+ DocBookTag title
+ DocBookTagType paragraph
+ DocBookInInfo maybe
End
Style Author
@@ -139,6 +148,11 @@ Style Author
Font
Size Large
EndFont
+ DocBookTag personname
+ DocBookTagType paragraph
+ DocBookWrapperTag author
+ DocBookWrapperTagType inline
+ DocBookInInfo always
End
Style Address
@@ -154,6 +168,12 @@ Style Address
Shape Italic
Size Normal
EndFont
+ DocBookTag address
+ DocBookTagType paragraph
+ DocBookWrapperTag author
+ DocBookWrapperTagType inline
+ DocBookWrapperMergeWithPrevious true
+ DocBookInInfo always
End
Style History
@@ -168,6 +188,8 @@ Style History
Font
Size Small
EndFont
+ DocBookTag releaseinfo
+ DocBookInInfo always
End
InsetLayout Flex:Received
@@ -185,7 +207,10 @@ InsetLayout Flex:Received
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag date
+ DocBookAttr role='received'
+ DocBookTagType inline
End
InsetLayout Flex:Revised
@@ -203,7 +228,10 @@ InsetLayout Flex:Revised
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag date
+ DocBookAttr role='revised'
+ DocBookTagType inline
End
Style Abstract
@@ -217,6 +245,11 @@ Style Abstract
Font
Size Small
EndFont
+ DocBookAbstract true
+ DocBookInInfo always
+ DocBookWrapperTag abstract
+ DocBookWrapperMergeWithPrevious true
+ DocBookTag para
End
InsetLayout Flex:Keywords
@@ -234,7 +267,11 @@ InsetLayout Flex:Keywords
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag keyword
+ DocBookTagType paragraph
+ DocBookWrapperTag keywordset
+ DocBookInInfo always
End
Style Classification_Codes
@@ -259,7 +296,9 @@ InsetLayout Flex:TableCaption
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag caption
+ DocBookTagType paragraph
End
InsetLayout Flex:Refcite
@@ -277,7 +316,7 @@ InsetLayout Flex:Refcite
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
End
Style ItemList
@@ -309,6 +348,9 @@ Style ItemList
HTMLTag ul
HTMLItem li
HTMLLabel NONE
+ DocBookTag itemizedlist
+ DocBookItemTag listitem
+ DocBookItemInnerTag para
End
Style RomanList
@@ -347,6 +389,9 @@ Style RomanList
HTMLItem li
HTMLLabel NONE
RefPrefix enu
+ DocBookTag orderedlist
+ DocBookItemTag listitem
+ DocBookItemInnerTag para
End
Style Proof
@@ -367,6 +412,8 @@ Style Proof
Series Bold
EndFont
EndLabelType Box
+ DocBookTag para
+ DocBookAttr role='proof'
End
Style Theorem
@@ -378,6 +425,8 @@ Style Theorem
#LabelFont
#Series Bold
#EndFont
+ DocBookTag para
+ DocBookAttr role='theorem'
End
Style Remark
@@ -465,6 +514,9 @@ Style Appendix
Font
Series Bold
EndFont
+ DocBookTag title
+ DocBookTagType paragraph
+ DocBookSection true
End
Style Bibliography
diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout
index cd46ef3..db326cf 100644
--- a/lib/layouts/ijmpd.layout
+++ b/lib/layouts/ijmpd.layout
@@ -35,6 +35,7 @@ Style Standard
Align Block
AlignPossible Block, Left, Right, Center
LabelType No_Label
+ DocBookTag para
End
Input stdcounters.inc
@@ -88,6 +89,9 @@ Style MarkBoth
\DeclareRobustCommand{\foreign@language}[1]{%
\lowercase{\oldforeign@language{#1}}}
EndPreamble
+ DocBookTag IGNORE
+ # TODO: a mix of titleabbrev and authorinitials...
+ DocBookInInfo always
End
Style Catchline
@@ -107,6 +111,8 @@ Style Catchline
Series Bold
Color Green
EndFont
+ DocBookTag IGNORE
+ DocBookInInfo always
End
Style Title
@@ -126,6 +132,9 @@ Style Title
Font
Size Largest
EndFont
+ DocBookTag title
+ DocBookTagType paragraph
+ DocBookInInfo maybe
End
Style Author
@@ -144,6 +153,20 @@ Style Author
Font
Size Large
EndFont
+ DocBookTag personname
+ DocBookTagType paragraph
+ DocBookWrapperTag author
+ DocBookWrapperTagType inline
+ DocBookInInfo always
+End
+
+Style Address
+ DocBookTag address
+ DocBookTagType paragraph
+ DocBookWrapperTag author
+ DocBookWrapperTagType inline
+ DocBookWrapperMergeWithPrevious true
+ DocBookInInfo always
End
Style History
@@ -158,6 +181,8 @@ Style History
Font
Size Small
EndFont
+ DocBookTag releaseinfo
+ DocBookInInfo always
End
InsetLayout Flex:Received
@@ -175,7 +200,10 @@ InsetLayout Flex:Received
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag date
+ DocBookAttr role='received'
+ DocBookTagType inline
End
InsetLayout Flex:Revised
@@ -193,7 +221,10 @@ InsetLayout Flex:Revised
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag date
+ DocBookAttr role='revised'
+ DocBookTagType inline
End
InsetLayout Flex:Comby
@@ -211,7 +242,7 @@ InsetLayout Flex:Comby
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
End
Style Abstract
@@ -225,6 +256,11 @@ Style Abstract
Font
Size Small
EndFont
+ DocBookAbstract true
+ DocBookInInfo always
+ DocBookWrapperTag abstract
+ DocBookWrapperMergeWithPrevious true
+ DocBookTag para
End
Style Keywords
@@ -245,6 +281,10 @@ Style Keywords
Shape Italic
Size Small
EndFont
+ DocBookTag keyword
+ DocBookTagType paragraph
+ DocBookWrapperTag keywordset
+ DocBookInInfo always
End
InsetLayout Flex:TableCaption
@@ -262,7 +302,9 @@ InsetLayout Flex:TableCaption
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag caption
+ DocBookTagType paragraph
End
InsetLayout Flex:Refcite
@@ -280,7 +322,7 @@ InsetLayout Flex:Refcite
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
End
Style ItemList
@@ -312,6 +354,9 @@ Style ItemList
HTMLTag ul
HTMLItem li
HTMLLabel NONE
+ DocBookTag itemizedlist
+ DocBookItemTag listitem
+ DocBookItemInnerTag para
End
Style RomanList
@@ -350,6 +395,9 @@ Style RomanList
HTMLItem li
HTMLLabel NONE
RefPrefix enu
+ DocBookTag orderedlist
+ DocBookItemTag listitem
+ DocBookItemInnerTag para
End
Style Proof
@@ -370,6 +418,8 @@ Style Proof
Series Bold
EndFont
EndLabelType Box
+ DocBookTag para
+ DocBookAttr role='proof'
End
Counter theorem
@@ -385,6 +435,8 @@ Style Theorem
LabelFont
Series Bold
EndFont
+ DocBookTag para
+ DocBookAttr role='theorem'
End
Counter remark
@@ -486,6 +538,9 @@ Style Appendix
Font
Series Bold
EndFont
+ DocBookTag title
+ DocBookTagType paragraph
+ DocBookSection true
End
Style Bibliography
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
