X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fagu_stdclass.inc;h=dc239f3d233207465c3e35405547af7637e8fc7f;hb=d0379db1aab1aeeefeea8cf31db7ab7d88396fed;hp=c79310f1072c2c6d2b6a58ffbc6fcc6976e56530;hpb=8eb22fd0826b91264d5c7a7c1986d9f92ffdd520;p=lyx.git

diff --git a/lib/layouts/agu_stdclass.inc b/lib/layouts/agu_stdclass.inc
index c79310f107..dc239f3d23 100644
--- a/lib/layouts/agu_stdclass.inc
+++ b/lib/layouts/agu_stdclass.inc
@@ -6,7 +6,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.
 
-Format 5
+Format 80
 OutputType              docbook
 
 Columns                 1
@@ -20,20 +20,20 @@ ClassOptions
 End
 
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             p
 	ParIndent             MM
 	ParSkip               0.4
 	Align                 Block
-	AlignPossible         Block
 	LabelType             No_Label
 	LatexParam            "id=<para#>"
 End
 
 
-InsetLayout CharStyle:Firstname
-	LyXType charstyle
+InsetLayout Flex:Firstname
+	LyXType element
 	LabelString Firstname
 	LatexType             Command
 	LatexName             firstname
@@ -44,10 +44,11 @@ InsetLayout CharStyle:Firstname
 	  Shape               Up
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:Fname
-	LyXType charstyle
+InsetLayout Flex:Fname
+	LyXType element
 	LabelString Fname
 	LatexType             Command
 	LatexName             fname
@@ -58,11 +59,12 @@ InsetLayout CharStyle:Fname
 	  Shape               Up
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Surname
-	LyXType charstyle
+InsetLayout Flex:Surname
+	LyXType element
 	LabelString Surname
 	LatexType             Command
 	LatexName             surname
@@ -73,11 +75,12 @@ InsetLayout CharStyle:Surname
 	  Shape               Up
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Filename
-	LyXType charstyle
+InsetLayout Flex:Filename
+	LyXType element
 	LabelString Filename
 	LatexType             Command
 	LatexName             filename
@@ -88,11 +91,12 @@ InsetLayout CharStyle:Filename
 	  Family              Roman
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Literal
-	LyXType charstyle
+InsetLayout Flex:Literal
+	LyXType element
 	LabelString Literal
 	LatexType             Command
 	LatexName             literal
@@ -103,11 +107,12 @@ InsetLayout CharStyle:Literal
 	  Family              Roman
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Emph
-	LyXType charstyle
+InsetLayout Flex:Emph
+	LyXType element
 	LabelString Emph
 	LatexType             Command
 	LatexName             emph
@@ -119,105 +124,115 @@ InsetLayout CharStyle:Emph
 	  Shape               Up
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Abbrev
-	LyXType charstyle
+InsetLayout Flex:Abbrev
+	LyXType element
 	LabelString Abbrev
 	LatexType             Command
 	LatexName             abbrev
 	LabelFont
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Citation-number
-	LyXType charstyle
+InsetLayout Flex:Citation-number
+	LyXType element
 	LabelString Citation-number
 	LatexType             Command
 	LatexName             citation-number
 	LabelFont
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Volume
-	LyXType charstyle
+InsetLayout Flex:Volume
+	LyXType element
 	LabelString Volume
 	LatexType             Command
 	LatexName             volume
 	LabelFont
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Day
-	LyXType charstyle
+InsetLayout Flex:Day
+	LyXType element
 	LabelString Day
 	LatexType             Command
 	LatexName             day
 	LabelFont
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Month
-	LyXType charstyle
+InsetLayout Flex:Month
+	LyXType element
 	LabelString Month
 	LatexType             Command
 	LatexName             month
 	LabelFont
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Year
-	LyXType charstyle
+InsetLayout Flex:Year
+	LyXType element
 	LabelString Year
 	LatexType             Command
 	LatexName             year
 	LabelFont
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Issue-number
-	LyXType charstyle
+InsetLayout Flex:Issue-number
+	LyXType element
 	LabelString Issue-number
 	LatexType             Command
 	LatexName             issue-number
 	LabelFont
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Issue-day
-	LyXType charstyle
+InsetLayout Flex:Issue-day
+	LyXType element
 	LabelString Issue-day
 	LatexType             Command
 	LatexName             issue-day
 	LabelFont
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Issue-months
-	LyXType charstyle
+InsetLayout Flex:Issue-months
+	LyXType element
 	LabelString Issue-months
 	LatexType             Command
 	LatexName             issue-months
 	LabelFont
 	  Color               blue
 	EndFont
+	ResetsFont true
 End