X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Faastex62.layout;h=84fee3e0172fe0a6e6df1bae80e987e9b3cbff0d;hb=c8c1c15631712d458e98b612ba8c049a7ae4d260;hp=3eb7dcc44cc09e2d097b4182e556f9ad82f08694;hpb=8d115413c1165c917337db5d840896d330b5df64;p=lyx.git

diff --git a/lib/layouts/aastex62.layout b/lib/layouts/aastex62.layout
index 3eb7dcc44c..84fee3e017 100644
--- a/lib/layouts/aastex62.layout
+++ b/lib/layouts/aastex62.layout
@@ -50,7 +50,7 @@
 #       - aastex6.cls loads hyperref (with pre-set options) and url
 #         -> option clash if "Use Hyerref" is selected in Document>Settings
 
-Format 82
+Format 98
 
 Provides hyperref 1
 
@@ -78,8 +78,11 @@ Style Software
 	LabelFont
 		Shape           Italic
 	EndFont
-	DocBookWrapperTag   para
-	DocBookTag          application
+	DocBookTag      remark
+	DocBookAttr     role='software'
+	# Override what's taken from Keywords, but not really wanted.
+	DocBookWrapperTag   NONE
+	DocBookInInfo       never
 End
 
 # other new commands are mainly for the user preamble
@@ -142,7 +145,7 @@ Style Email
 	Align           Left
 	Font
 		Shape           Up
-		Color           Blue
+		Color           textlabel1
 		Size            Small
 	EndFont
 End
@@ -152,14 +155,20 @@ Style Author
 	LabelString     "Author:"
 	LabelFont
 		Shape           Italic
-		Color           Green
+		Color           textlabel2
 	EndFont
 	Argument 1
 		LabelString     ORCID
 		ToolTip         "Enter the 16 digit ORCID as xxxx-xxxx-xxxx-xxxx"
+		# TODO: In DocBook, this cannot be in the <personname>, it must be directly within <author>.
 	EndArgument
 	Align           Center
 	Margin          Dynamic
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType inline
+	DocBookInInfo         always
 End
 
 Style Affiliation
@@ -170,7 +179,7 @@ Style Affiliation
 	LabelSep        "x"
 	LabelFont
 		Shape           Italic
-		Color           Green
+		Color           textlabel2
 	EndFont
 	Align           Center
 End
@@ -186,7 +195,7 @@ Style Collaboration
 	LabelSep        "x"
 	LabelFont
 		Shape           Italic
-		Color           Green
+		Color           textlabel2
 	EndFont
 	Align           Center
 End
@@ -203,7 +212,7 @@ Style Nocollaboration
 	LabelSep        "x"
 	LabelFont
 		Shape           Italic
-		Color           Green
+		Color           textlabel2
 	EndFont
 End
 
@@ -220,7 +229,7 @@ Style Acknowledgements
 	LabelType       Above
 	Margin          Static
 	LabelFont
-		Color           Green
+		Color           textlabel2
 	EndFont
 End