Merge branch 'feature/docbook' into master

[lyx.git] / lib / layouts / db_stdcharstyles.inc

diff --git a/lib/layouts/db_stdcharstyles.inc b/lib/layouts/db_stdcharstyles.inc
index 3470f2c98e0a23b98cc2be6694254e4fb0dae092..ffa431550b31221cd411cef57803dab36cb8f7f8 100644 (file)
--- a/lib/layouts/db_stdcharstyles.inc
+++ b/lib/layouts/db_stdcharstyles.inc
@@ -2,10 +2,12 @@
 # Author : José Abílio Oliveira Matos <jamatos@lyx.org>
 # Character Styles definition
 
-Format 4
-CharStyle Filename
+Format 82
+
+InsetLayout Flex:Filename
+       LabelString Filename
        LatexType             Command
-       LatexName             filename
+       DocBookTag            filename
        Font
          Family              Typewriter
        EndFont
@@ -13,12 +15,14 @@ CharStyle Filename
          Family              Roman
          Color               blue
        EndFont
+       ResetsFont true
 End
 
-CharStyle Directory
+InsetLayout Flex:Directory
+       LabelString Directory
        LatexType             Command
-       LatexName             filename
-       LatexParam            "class=<directory>"
+       DocBookTag            filename
+       DocBookAttr           "class='directory'"
        Font
          Family              Typewriter
        EndFont
@@ -26,29 +30,35 @@ CharStyle Directory
          Family              Roman
          Color               blue
        EndFont
+       ResetsFont true
 End
 
-CharStyle Firstname
+InsetLayout Flex:Firstname
+       LabelString Firstname
        LatexType             Command
-       LatexName             firstname
+       DocBookTag            firstname
        LabelFont
          Shape               Up
          Color               blue
        EndFont
+       ResetsFont true
 End
 
-CharStyle Surname
+InsetLayout Flex:Surname
+       LabelString Surname
        LatexType             Command
-       LatexName             surname
+       DocBookTag            surname
        LabelFont
          Shape               Up
          Color               blue
        EndFont
+       ResetsFont true
 End
 
-CharStyle Literal
+InsetLayout Flex:Literal
+       LabelString Literal
        LatexType             Command
-       LatexName             literal
+       DocBookTag            literal
        Font
          Family              Typewriter
        EndFont
@@ -56,11 +66,13 @@ CharStyle Literal
          Family              Roman
          Color               blue
        EndFont
+       ResetsFont true
 End
 
-CharStyle Email
+InsetLayout Flex:Email
+       LabelString Email
         LatexType             Command
-        LatexName             email
+        DocBookTag            email
         Font
           Family              Typewriter
         EndFont
@@ -68,11 +80,13 @@ CharStyle Email
           Family              Roman
           Color               blue
         EndFont
+       ResetsFont true
 End
 
-CharStyle KeyCombo
+InsetLayout Flex:KeyCombo
+       LabelString KeyCombo
         LatexType             Command
-        LatexName             keycombo
+        DocBookTag            keycombo
         Font
           Family              Typewriter
         EndFont
@@ -80,11 +94,13 @@ CharStyle KeyCombo
           Family              Roman
           Color               blue
         EndFont
+       ResetsFont true
 End
 
-CharStyle KeyCap
+InsetLayout Flex:KeyCap
+       LabelString KeyCap
         LatexType             Command
-        LatexName             keycap
+        DocBookTag            keycap
         Font
           Family              Typewriter
         EndFont
@@ -92,11 +108,13 @@ CharStyle KeyCap
           Family              Roman
           Color               blue
         EndFont
+       ResetsFont true
 End
 
-CharStyle GuiMenu
+InsetLayout Flex:GuiMenu
+       LabelString GuiMenu
         LatexType             Command
-        LatexName             guimenu
+        DocBookTag            guimenu
         Font
           Family              Sans
         EndFont
@@ -104,11 +122,13 @@ CharStyle GuiMenu
           Family              Roman
           Color               blue
         EndFont
+       ResetsFont true
 End
 
-CharStyle GuiMenuItem
+InsetLayout Flex:GuiMenuItem
+       LabelString GuiMenuItem
         LatexType             Command
-        LatexName             guimenuitem
+        DocBookTag            guimenuitem
         Font
           Family              Sans
         EndFont
@@ -116,11 +136,13 @@ CharStyle GuiMenuItem
           Family              Roman
           Color               blue
         EndFont
+       ResetsFont true
 End
 
-CharStyle GuiButton
+InsetLayout Flex:GuiButton
+       LabelString GuiButton
         LatexType             Command
-        LatexName             guibutton
+        DocBookTag            guibutton
         Font
           Family              Sans
         EndFont
@@ -128,11 +150,13 @@ CharStyle GuiButton
           Family              Roman
           Color               blue
         EndFont
+       ResetsFont true
 End
 
-CharStyle MenuChoice
+InsetLayout Flex:MenuChoice
+       LabelString MenuChoice
         LatexType             Command
-        LatexName             menuchoice
+        DocBookTag            menuchoice
         Font
           Family              Sans
         EndFont
@@ -140,4 +164,5 @@ CharStyle MenuChoice
           Family              Roman
           Color               blue
         EndFont
+       ResetsFont true
 End