X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Flogicalmkup.module;h=b1d80cf281bd8de2897e6e8af2b4e8980a13284e;hb=2841a1c06315edb7dd3a264746c093ee4c1a7c9f;hp=2cc4583506b2a17d5a985e49bc450ea6dc461b28;hpb=de815f594ee4f9fbfd86cb94dd039bbcc6fbdf7c;p=lyx.git

diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module
index 2cc4583506..b1d80cf281 100644
--- a/lib/layouts/logicalmkup.module
+++ b/lib/layouts/logicalmkup.module
@@ -1,14 +1,14 @@
 #\DeclareLyXModule{Logical Markup}
+#\DeclareCategory{Text Markup}
 #DescriptionBegin
 #Defines some character styles for logical markup: noun, emph, strong, and code.
 #DescriptionEnd
-#Category: charstyles
 
 # Author : Martin vermeer <martin.vermeer@hut.fi>
 
-Format 28
+Format 100
 
-InsetLayout CharStyle:Noun
+InsetLayout Flex:Noun
 	LyxType               charstyle
 	LabelString           noun
 	LatexType             command
@@ -19,16 +19,20 @@ InsetLayout CharStyle:Noun
 	Requires              noun
 	InToc                 true
 	HTMLTag               span
-	HTMLAttr              class='noun'
+	HTMLClass             "noun"
 	HTMLStyle
 		span.noun {
 			font-family: sans-serif;
 		}
 	EndHTMLStyle
+	ResetsFont            true
+	CustomPars            false
+	DocBookTag            personname
+	DocBookTagType        inline
 End
 
 
-InsetLayout CharStyle:Emph
+InsetLayout Flex:Emph
 	LyxType               charstyle
 	LabelString           emph
 	LatexType             command
@@ -38,10 +42,14 @@ InsetLayout CharStyle:Emph
 	EndFont
 	InToc                 true
 	HTMLTag               em
+	ResetsFont            true
+	CustomPars            false
+	DocBookTag            emphasis
+	DocBookTagType        inline
 End
 
 
-InsetLayout CharStyle:Strong
+InsetLayout Flex:Strong
 	LyxType               charstyle
 	LabelString           strong
 	LatexType             command
@@ -50,14 +58,19 @@ InsetLayout CharStyle:Strong
 	  Series              Bold
 	EndFont
 	Preamble
-	\newcommand{\strong}[1]{\textbf{#1}}
+	\providecommand*{\strong}[1]{\textbf{#1}}
 	EndPreamble
 	InToc                 true
 	HTMLTag               strong
+	ResetsFont            true
+	CustomPars            false
+	DocBookTag            personname
+	DocBookAttr           role='bold'
+	DocBookTagType        inline
 End
 
 
-InsetLayout CharStyle:Code
+InsetLayout Flex:Code
 	LyxType               charstyle
 	LabelString           code
 	LatexType             command
@@ -66,8 +79,13 @@ InsetLayout CharStyle:Code
 	  Family              Typewriter
 	EndFont
 	Preamble
-	\newcommand{\code}[1]{\texttt{#1}}
+	\providecommand*{\code}[1]{\texttt{#1}}
 	EndPreamble
 	InToc                 true
 	HTMLTag               code
+	ResetsFont            true
+	CustomPars            false
+	Spellcheck            false
+	DocBookTag            code
+	DocBookTagType        inline
 End