X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fdb_stdcharstyles.inc;h=51dc6df8392a21753ec3170aad5b79df5dab7bbe;hb=9c97021623b6db5239715eb543d65a5e779084b6;hp=865540cad38310c8e932354c6ff0cfbde2d9ffab;hpb=1bd92eb2f1e84eabcc176c818a0c293025824730;p=lyx.git

diff --git a/lib/layouts/db_stdcharstyles.inc b/lib/layouts/db_stdcharstyles.inc
index 865540cad3..51dc6df839 100644
--- a/lib/layouts/db_stdcharstyles.inc
+++ b/lib/layouts/db_stdcharstyles.inc
@@ -2,9 +2,9 @@
 # Author : José Abílio Oliveira Matos <jamatos@lyx.org>
 # Character Styles definition
 
-Format 5
-InsetLayout CharStyle:Filename
-	LyXType charstyle
+Format 80
+InsetLayout Flex:Filename
+	LyXType element
 	LabelString Filename
 	LatexType             Command
 	LatexName             filename
@@ -15,10 +15,11 @@ InsetLayout CharStyle:Filename
 	  Family              Roman
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:Directory
-	LyXType charstyle
+InsetLayout Flex:Directory
+	LyXType element
 	LabelString Directory
 	LatexType             Command
 	LatexName             filename
@@ -30,10 +31,11 @@ InsetLayout CharStyle:Directory
 	  Family              Roman
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:Firstname
-	LyXType charstyle
+InsetLayout Flex:Firstname
+	LyXType element
 	LabelString Firstname
 	LatexType             Command
 	LatexName             firstname
@@ -41,10 +43,11 @@ InsetLayout CharStyle:Firstname
 	  Shape               Up
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:Surname
-	LyXType charstyle
+InsetLayout Flex:Surname
+	LyXType element
 	LabelString Surname
 	LatexType             Command
 	LatexName             surname
@@ -52,10 +55,11 @@ InsetLayout CharStyle:Surname
 	  Shape               Up
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:Literal
-	LyXType charstyle
+InsetLayout Flex:Literal
+	LyXType element
 	LabelString Literal
 	LatexType             Command
 	LatexName             literal
@@ -66,10 +70,11 @@ InsetLayout CharStyle:Literal
 	  Family              Roman
 	  Color               blue
 	EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:Email
-	LyXType charstyle
+InsetLayout Flex:Email
+	LyXType element
 	LabelString Email
         LatexType             Command
         LatexName             email
@@ -80,10 +85,11 @@ InsetLayout CharStyle:Email
           Family              Roman
           Color               blue
         EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:KeyCombo
-	LyXType charstyle
+InsetLayout Flex:KeyCombo
+	LyXType element
 	LabelString KeyCombo
         LatexType             Command
         LatexName             keycombo
@@ -94,10 +100,11 @@ InsetLayout CharStyle:KeyCombo
           Family              Roman
           Color               blue
         EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:KeyCap
-	LyXType charstyle
+InsetLayout Flex:KeyCap
+	LyXType element
 	LabelString KeyCap
         LatexType             Command
         LatexName             keycap
@@ -108,10 +115,11 @@ InsetLayout CharStyle:KeyCap
           Family              Roman
           Color               blue
         EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:GuiMenu
-	LyXType charstyle
+InsetLayout Flex:GuiMenu
+	LyXType element
 	LabelString GuiMenu
         LatexType             Command
         LatexName             guimenu
@@ -122,10 +130,11 @@ InsetLayout CharStyle:GuiMenu
           Family              Roman
           Color               blue
         EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:GuiMenuItem
-	LyXType charstyle
+InsetLayout Flex:GuiMenuItem
+	LyXType element
 	LabelString GuiMenuItem
         LatexType             Command
         LatexName             guimenuitem
@@ -136,10 +145,11 @@ InsetLayout CharStyle:GuiMenuItem
           Family              Roman
           Color               blue
         EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:GuiButton
-	LyXType charstyle
+InsetLayout Flex:GuiButton
+	LyXType element
 	LabelString GuiButton
         LatexType             Command
         LatexName             guibutton
@@ -150,10 +160,11 @@ InsetLayout CharStyle:GuiButton
           Family              Roman
           Color               blue
         EndFont
+	ResetsFont true
 End
 
-InsetLayout CharStyle:MenuChoice
-	LyXType charstyle
+InsetLayout Flex:MenuChoice
+	LyXType element
 	LabelString MenuChoice
         LatexType             Command
         LatexName             menuchoice
@@ -164,4 +175,5 @@ InsetLayout CharStyle:MenuChoice
           Family              Roman
           Color               blue
         EndFont
+	ResetsFont true
 End