X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Faa.layout;h=710d2b6d8a841eaa0440199953825b3d7d35eaff;hb=bbbd1820957f8a3584765eecc8533da6853a979f;hp=9c26978a5cfd2795172cab84186d8e632cc7366c;hpb=ce7eb7734bafaf0aedb080a2adce987800367575;p=lyx.git

diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 9c26978a5c..710d2b6d8a 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -18,7 +18,7 @@
 # 2013-05-26  Updated for aa.cls version 8.2
 
 
-Format 99
+Format 104
 Columns		2
 Sides		2
 SecNumDepth	3
@@ -166,7 +166,7 @@ Style Mail
 End
 
 
-Style Acknowledgments[[credits]]
+Style Acknowledgments
 	Margin		First_Dynamic
 	LatexType	Environment
 	LatexName	acknowledgements
@@ -178,7 +178,7 @@ Style Acknowledgments[[credits]]
 	ParSep		0
 	Align		Block
 	LabelType	Static
-	LabelString	"Acknowledgements[[credits]]."
+	LabelString	"Acknowledgments."
 	LabelSep	M
 	Font
 	  Size		Small
@@ -193,11 +193,6 @@ Style Acknowledgments[[credits]]
 End
 
 
-Style Acknowledgement
-	ObsoletedBy    Acknowledgments[[credits]]
-End
-
-
 Style Section
 	Font
 	  Family	Sans
@@ -294,6 +289,9 @@ InsetLayout "Flex:institutemark"
 	  Size		Small
 	EndFont
 	MultiPar	true
+	AllowedInLayouts
+	    Author
+	EndAllowedInLayouts
 End
 
 
@@ -407,7 +405,10 @@ InsetLayout Flex:Institute
 	Font
 	  Color		textlabel1
 	EndFont
-	ResetsFont true
+	ResetsFont      true
+	AllowedInLayouts
+	    Author
+	EndAllowedInLayouts
 End
 
 
@@ -419,7 +420,10 @@ InsetLayout Flex:E-Mail
 	  Family	Typewriter
 	  Color		textlabel1
 	EndFont
-	ResetsFont true
+	ResetsFont      true
+	AllowedInLayouts
+	    Address
+	EndAllowedInLayouts
 End
 
 
@@ -443,5 +447,8 @@ InsetLayout "Flex:Email"
 	  Size		Small
 	EndFont
 	MultiPar	true
+	AllowedInLayouts
+	    Address
+	EndAllowedInLayouts
 End