X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Flyxmacros.inc;h=cd4b7dca6339273381b806c0642ed2b0a807a3d5;hb=e2e74ffb0a72477420bfc2a8be0fcfbafe52e8ae;hp=5f3587eb6422e3096dbfe84f771c6f24ddac7139;hpb=ff521787b23df486b227de738969645ff91ae3a6;p=lyx.git

diff --git a/lib/layouts/lyxmacros.inc b/lib/layouts/lyxmacros.inc
index 5f3587eb64..cd4b7dca63 100644
--- a/lib/layouts/lyxmacros.inc
+++ b/lib/layouts/lyxmacros.inc
@@ -1,6 +1,6 @@
 # Standard textclass definition file. Taken from initial LyX source code
 # Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
-# Transposed by Pascal André <andre@via.ecp.fr>
+# Transposed by Pascal André <andre@via.ecp.fr>
 # Heavily modifed and enhanced by several developers.
 
 # This file contains some special LyX environments that are used by
@@ -8,8 +8,9 @@
 # be removed later.
 
 
-Format 3
+Format 104
 Style LyX-Code
+	Category              MainText
 	Margin                Static
 	LatexType             Environment
 	LatexName             lyxcode
@@ -24,7 +25,7 @@ Style LyX-Code
 	FreeSpacing           1
 	Preamble
 		\newenvironment{lyxcode}
-			{\begin{list}{}{
+			{\par\begin{list}{}{
 				\setlength{\rightmargin}{\leftmargin}
 				\setlength{\listparindent}{0pt}% needed for AMS classes
 				\raggedright
@@ -37,10 +38,14 @@ Style LyX-Code
 	Font
 	  Family              Typewriter
 	EndFont
+	DocBookTag            programlisting
+    DocBookTagType        paragraph
+	DocBookAttr			  language='lyx'
 End
 
 
 Style Address
+	Category	      FrontMatter
 	Margin                Static
 	LatexType             Command
 	LatexName             lyxaddress
@@ -57,10 +62,13 @@ Style Address
 			\noindent\par}
 		}
 	EndPreamble
+	DocBookTag            address
+	DocBookTagType        paragraph
 End
 
 
 Style Right_Address
+	Category	      FrontMatter
 	Margin                Right_Address_Box
 	LatexType             Command
 	LatexName             lyxrightaddress
@@ -68,7 +76,6 @@ Style Right_Address
 	BottomSep             1.5
 	ParSep                1.5
 	Align                 Left
-	AlignPossible         Left
 	Preamble
 		\newcommand{\lyxrightaddress}[1]{
 			\par {\raggedleft \begin{tabular}{l}\ignorespaces
@@ -78,4 +85,7 @@ Style Right_Address
 			\par}
 		}
 	EndPreamble
+	DocBookTag            address
+	DocBookTagType        paragraph
+	DocBookAttr           role='right-address'
 End