Merge branch 'feature/docbook' into master

[lyx.git] / lib / layouts / apax.inc

diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc
index 4080e12f0b880f70364aeb74704ab1df41179bb4..d5fc7ff27f3daed84008997bc1b77dd1a4df0c84 100644 (file)
--- a/lib/layouts/apax.inc
+++ b/lib/layouts/apax.inc
@@ -2,7 +2,7 @@
 # Author: Jacob Bishop <bishop.jacob@gmail.com> based on the apa 
 # layout written by Randy Gobbel.
 
-Format 81
+Format 82
 Columns                 1
 Sides                   1
 PageStyle               Headers
@@ -484,6 +484,9 @@ Style Itemize
                        Color latex
                EndFont
        EndArgument
+       DocBookTag            itemizedlist
+       DocBookItemTag        listitem
+       DocBookItemInnerTag   para
 End
 
 
@@ -519,6 +522,9 @@ Style Enumerate
                        Color latex
                EndFont
        EndArgument
+       DocBookTag            orderedlist
+       DocBookItemTag        listitem
+       DocBookItemInnerTag   para
 End
 
 
@@ -578,6 +584,9 @@ Style Course
        EndFont
 End
 
+
+# The addORCIDlink{}{} latex command can be used in the preamble,
+# but also inside some other style like note, paragraph etc
 Style addORCIDlink
        Category              FrontMatter
        InTitle               1
@@ -586,13 +595,35 @@ Style addORCIDlink
        LatexName             addORCIDlink
        LatexType             Command
        Margin                Dynamic
-       LeftMargin MMN
-       RightMargin MMN
+       LeftMargin            MMN
+       RightMargin           MMN
        Align Block
-       Argument        1
-         LabelString "Author-name"
-         Tooltip ORCID
-         Mandatory     1
+       Argument              1
+         LabelString         "Author-name"
+         Tooltip             ORCID
+         Mandatory           1
+       EndArgument
+End
+
+
+# To be used inside the document body
+InsetLayout Flex:addORCIDlink
+       LabelString           "ORCID-link: "
+       LatexName             addORCIDlink
+       Decoration            none
+       LatexType             Command
+       LyxType               custom
+       Argument              1
+         LabelString         "Author-name"
+         Mandatory           1
+       AutoInsert            1
+       Decoration            none
+       EndArgument
+       Argument              2
+         LabelString         ORCID
+         AutoInsert          1
+         Mandatory           1
+         Decoration          none
        EndArgument
 End