The necessary changes to these XML layouts (charstyle new format)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19696 a592a061-630c-0410-9148-cb99ea01b6c8

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 4
+Format 5
 OutputType              docbook
 
 Columns                 1
@@ -32,7 +32,9 @@ Style Standard
 End
 
 
-CharStyle Firstname
+InsetLayout CharStyle:Firstname
+	LyXType charstyle
+	LabelString Firstname
 	LatexType             Command
 	LatexName             firstname
 	Font
@@ -44,7 +46,9 @@ CharStyle Firstname
 	EndFont
 End
 
-CharStyle Fname
+InsetLayout CharStyle:Fname
+	LyXType charstyle
+	LabelString Fname
 	LatexType             Command
 	LatexName             fname
 	Font
@@ -57,7 +61,9 @@ CharStyle Fname
 End
 
 
-CharStyle Surname
+InsetLayout CharStyle:Surname
+	LyXType charstyle
+	LabelString Surname
 	LatexType             Command
 	LatexName             surname
 	Font
@@ -70,7 +76,9 @@ CharStyle Surname
 End
 
 
-CharStyle Filename
+InsetLayout CharStyle:Filename
+	LyXType charstyle
+	LabelString Filename
 	LatexType             Command
 	LatexName             filename
 	Font
@@ -83,7 +91,9 @@ CharStyle Filename
 End
 
 
-CharStyle Literal
+InsetLayout CharStyle:Literal
+	LyXType charstyle
+	LabelString Literal
 	LatexType             Command
 	LatexName             literal
 	Font
@@ -96,7 +106,9 @@ CharStyle Literal
 End
 
 
-CharStyle Emph
+InsetLayout CharStyle:Emph
+	LyXType charstyle
+	LabelString Emph
 	LatexType             Command
 	LatexName             emph
 	LatexParam            "type=<italic>"
@@ -110,7 +122,9 @@ CharStyle Emph
 End
 
 
-CharStyle Abbrev
+InsetLayout CharStyle:Abbrev
+	LyXType charstyle
+	LabelString Abbrev
 	LatexType             Command
 	LatexName             abbrev
 	LabelFont
@@ -119,7 +133,9 @@ CharStyle Abbrev
 End
 
 
-CharStyle Citation-number
+InsetLayout CharStyle:Citation-number
+	LyXType charstyle
+	LabelString Citation-number
 	LatexType             Command
 	LatexName             citation-number
 	LabelFont
@@ -128,7 +144,9 @@ CharStyle Citation-number
 End
 
 
-CharStyle Volume
+InsetLayout CharStyle:Volume
+	LyXType charstyle
+	LabelString Volume
 	LatexType             Command
 	LatexName             volume
 	LabelFont
@@ -137,7 +155,9 @@ CharStyle Volume
 End
 
 
-CharStyle Day
+InsetLayout CharStyle:Day
+	LyXType charstyle
+	LabelString Day
 	LatexType             Command
 	LatexName             day
 	LabelFont
@@ -146,7 +166,9 @@ CharStyle Day
 End
 
 
-CharStyle Month
+InsetLayout CharStyle:Month
+	LyXType charstyle
+	LabelString Month
 	LatexType             Command
 	LatexName             month
 	LabelFont
@@ -155,7 +177,9 @@ CharStyle Month
 End
 
 
-CharStyle Year
+InsetLayout CharStyle:Year
+	LyXType charstyle
+	LabelString Year
 	LatexType             Command
 	LatexName             year
 	LabelFont
@@ -164,7 +188,9 @@ CharStyle Year
 End
 
 
-CharStyle Issue-number
+InsetLayout CharStyle:Issue-number
+	LyXType charstyle
+	LabelString Issue-number
 	LatexType             Command
 	LatexName             issue-number
 	LabelFont
@@ -173,7 +199,9 @@ CharStyle Issue-number
 End
 
 
-CharStyle Issue-day
+InsetLayout CharStyle:Issue-day
+	LyXType charstyle
+	LabelString Issue-day
 	LatexType             Command
 	LatexName             issue-day
 	LabelFont
@@ -182,7 +210,9 @@ CharStyle Issue-day
 End
 
 
-CharStyle Issue-months
+InsetLayout CharStyle:Issue-months
+	LyXType charstyle
+	LabelString Issue-months
 	LatexType             Command
 	LatexName             issue-months
 	LabelFont

lib/layouts/agu_stdtitle.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 4
+Format 5
 Input stdtitle.inc
 
 
@@ -318,7 +318,9 @@ End
 
 # Inside AGU-journal:
 
-CharStyle ISSN
+InsetLayout CharStyle:ISSN
+	LyXType charstyle
+	LabelString ISSN
 	LatexType             Command
 	LatexName             ISSN
 	LabelFont
@@ -327,7 +329,9 @@ CharStyle ISSN
 End
 
 
-CharStyle CODEN
+InsetLayout CharStyle:CODEN
+	LyXType charstyle
+	LabelString CODEN
 	LatexType             Command
 	LatexName             CODEN
 	LabelFont
@@ -337,7 +341,9 @@ End
 
 # Inside Special-section:
 
-CharStyle SS-Code
+InsetLayout CharStyle:SS-Code
+	LyXType charstyle
+	LabelString SS-Code
 	LatexType             Command
 	LatexName             ss-code
 	LabelFont
@@ -346,7 +352,9 @@ CharStyle SS-Code
 End
 
 
-CharStyle SS-Title
+InsetLayout CharStyle:SS-Title
+	LyXType charstyle
+	LabelString SS-Title
 	LatexType             Command
 	LatexName             ss-title
 	LabelFont
@@ -356,7 +364,9 @@ End
 
 # Inside Copyright:
 
-CharStyle CCC-Code
+InsetLayout CharStyle:CCC-Code
+	LyXType charstyle
+	LabelString CCC-Code
 	LatexType             Command
 	LatexName             CCCcode
 	LabelFont
@@ -367,7 +377,9 @@ End
 
 # Inside Index-term:
 
-CharStyle Code
+InsetLayout CharStyle:Code
+	LyXType charstyle
+	LabelString Code
 	LatexType             Command
 	LatexName             code
 	LabelFont
@@ -376,7 +388,9 @@ CharStyle Code
 End
 
 
-CharStyle Dscr
+InsetLayout CharStyle:Dscr
+	LyXType charstyle
+	LabelString Dscr
 	LatexType             Command
 	LatexName             dscr
 	LabelFont
@@ -386,7 +400,9 @@ End
 
 # Inside Keywords:
 
-CharStyle Keyword
+InsetLayout CharStyle:Keyword
+	LyXType charstyle
+	LabelString Keyword
 	LatexType             Command
 	LatexName             keyword
 	LabelFont
@@ -396,7 +412,9 @@ End
 
 #inside Affiliation:
 
-CharStyle Orgdiv
+InsetLayout CharStyle:Orgdiv
+	LyXType charstyle
+	LabelString Orgdiv
 	LatexType             Command
 	LatexName             orgdiv
 	LabelFont
@@ -405,7 +423,9 @@ CharStyle Orgdiv
 End
 
 
-CharStyle Orgname
+InsetLayout CharStyle:Orgname
+	LyXType charstyle
+	LabelString Orgname
 	LatexType             Command
 	LatexName             orgname
 	LabelFont
@@ -414,7 +434,9 @@ CharStyle Orgname
 End
 
 
-CharStyle Street
+InsetLayout CharStyle:Street
+	LyXType charstyle
+	LabelString Street
 	LatexType             Command
 	LatexName             street
 	LabelFont
@@ -423,7 +445,9 @@ CharStyle Street
 End
 
 
-CharStyle City
+InsetLayout CharStyle:City
+	LyXType charstyle
+	LabelString City
 	LatexType             Command
 	LatexName             city
 	LabelFont
@@ -432,7 +456,9 @@ CharStyle City
 End
 
 
-CharStyle State
+InsetLayout CharStyle:State
+	LyXType charstyle
+	LabelString State
 	LatexType             Command
 	LatexName             state
 	LabelFont
@@ -441,7 +467,9 @@ CharStyle State
 End
 
 
-CharStyle Postcode
+InsetLayout CharStyle:Postcode
+	LyXType charstyle
+	LabelString Postcode
 	LatexType             Command
 	LatexName             postcode
 	LabelFont
@@ -450,7 +478,9 @@ CharStyle Postcode
 End
 
 
-CharStyle Country
+InsetLayout CharStyle:Country
+	LyXType charstyle
+	LabelString Country
 	LatexType             Command
 	LatexName             country
 	LabelFont

lib/layouts/db_stdcharstyles.inc

@@ -2,8 +2,10 @@
 # Author : José Abílio Oliveira Matos <jamatos@lyx.org>
 # Character Styles definition
 
-Format 4
+Format 5
-CharStyle Filename
+InsetLayout CharStyle:Filename
+	LyXType charstyle
+	LabelString Filename
 	LatexType             Command
 	LatexName             filename
 	Font
@@ -15,7 +17,9 @@ CharStyle Filename
 	EndFont
 End
 
-CharStyle Directory
+InsetLayout CharStyle:Directory
+	LyXType charstyle
+	LabelString Directory
 	LatexType             Command
 	LatexName             filename
 	LatexParam            "class=<directory>"
@@ -28,7 +32,9 @@ CharStyle Directory
 	EndFont
 End
 
-CharStyle Firstname
+InsetLayout CharStyle:Firstname
+	LyXType charstyle
+	LabelString Firstname
 	LatexType             Command
 	LatexName             firstname
 	LabelFont
@@ -37,7 +43,9 @@ CharStyle Firstname
 	EndFont
 End
 
-CharStyle Surname
+InsetLayout CharStyle:Surname
+	LyXType charstyle
+	LabelString Surname
 	LatexType             Command
 	LatexName             surname
 	LabelFont
@@ -46,7 +54,9 @@ CharStyle Surname
 	EndFont
 End
 
-CharStyle Literal
+InsetLayout CharStyle:Literal
+	LyXType charstyle
+	LabelString Literal
 	LatexType             Command
 	LatexName             literal
 	Font
@@ -58,7 +68,9 @@ CharStyle Literal
 	EndFont
 End
 
-CharStyle Email
+InsetLayout CharStyle:Email
+	LyXType charstyle
+	LabelString Email
         LatexType             Command
         LatexName             email
         Font
@@ -70,7 +82,9 @@ CharStyle Email
         EndFont
 End
 
-CharStyle KeyCombo
+InsetLayout CharStyle:KeyCombo
+	LyXType charstyle
+	LabelString KeyCombo
         LatexType             Command
         LatexName             keycombo
         Font
@@ -82,7 +96,9 @@ CharStyle KeyCombo
         EndFont
 End
 
-CharStyle KeyCap
+InsetLayout CharStyle:KeyCap
+	LyXType charstyle
+	LabelString KeyCap
         LatexType             Command
         LatexName             keycap
         Font
@@ -94,7 +110,9 @@ CharStyle KeyCap
         EndFont
 End
 
-CharStyle GuiMenu
+InsetLayout CharStyle:GuiMenu
+	LyXType charstyle
+	LabelString GuiMenu
         LatexType             Command
         LatexName             guimenu
         Font
@@ -106,7 +124,9 @@ CharStyle GuiMenu
         EndFont
 End
 
-CharStyle GuiMenuItem
+InsetLayout CharStyle:GuiMenuItem
+	LyXType charstyle
+	LabelString GuiMenuItem
         LatexType             Command
         LatexName             guimenuitem
         Font
@@ -118,7 +138,9 @@ CharStyle GuiMenuItem
         EndFont
 End
 
-CharStyle GuiButton
+InsetLayout CharStyle:GuiButton
+	LyXType charstyle
+	LabelString GuiButton
         LatexType             Command
         LatexName             guibutton
         Font
@@ -130,7 +152,9 @@ CharStyle GuiButton
         EndFont
 End
 
-CharStyle MenuChoice
+InsetLayout CharStyle:MenuChoice
+	LyXType charstyle
+	LabelString MenuChoice
         LatexType             Command
         LatexName             menuchoice
         Font