From 3a8755f2d6f2ce60525594e78d2bdd5c32e1ac32 Mon Sep 17 00:00:00 2001
From: Kornel Benko <kornel@lyx.org>
Date: Tue, 9 Jun 2020 14:49:26 +0200
Subject: [PATCH] Amend cb26ecbb: Added apa7 layout

The command addORCIDlink{}{} can be used in the preamble (like title{} or author{})
or in the body of document. For this a Flex-inset-layout seems appropriate.
---
 lib/layouts/apa6.layout |  1 +
 lib/layouts/apax.inc    | 37 +++++++++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/lib/layouts/apa6.layout b/lib/layouts/apa6.layout
index 00a0420c5d..8534db099b 100644
--- a/lib/layouts/apa6.layout
+++ b/lib/layouts/apa6.layout
@@ -9,4 +9,5 @@ Input apax.inc
 
 NoStyle Course
 NoStyle addORCIDlink
+NoInsetLayout Flex:addORCIDlink
 
diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc
index 4080e12f0b..7c7031cc4b 100644
--- a/lib/layouts/apax.inc
+++ b/lib/layouts/apax.inc
@@ -578,6 +578,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 +589,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
 
-- 
2.39.5