X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Flyxmacros.inc;h=8d7c7e1c0eaea0f8091933a6efcf8d83c14ce36d;hb=9c8955ffd9df1a38a617bcbdf011c7b890ea23d1;hp=078120e811cc822fd10db9965a5f35458ab38f8d;hpb=ff66614d1ac67fcfeec297f19d451b997cda5828;p=lyx.git

diff --git a/lib/layouts/lyxmacros.inc b/lib/layouts/lyxmacros.inc
index 078120e811..8d7c7e1c0e 100644
--- a/lib/layouts/lyxmacros.inc
+++ b/lib/layouts/lyxmacros.inc
@@ -1,14 +1,16 @@
 # 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
 # all environment classes. Some of these are a bit peculiar and might
 # be removed later.
 
-# Lyx-Code style definition
+
+Format 45
 Style LyX-Code
+	Category              MainText
 	Margin                Static
 	LatexType             Environment
 	LatexName             lyxcode
@@ -21,30 +23,26 @@ Style LyX-Code
 	AlignPossible         Block, Left, Right, Center
 	LabelType             No_Label
 	FreeSpacing           1
-
-	# define the environment lyxcode
 	Preamble
-	\newenvironment{lyxcode}
-	  {\begin{list}{}{
-	    \setlength{\rightmargin}{\leftmargin}
-	    \setlength{\listparindent}{0pt}% needed for AMS classes
-	    \raggedright
-	    \setlength{\itemsep}{0pt}
-	    \setlength{\parsep}{0pt}
-	    \normalfont\ttfamily}%
-	   \item[]}
-	  {\end{list}}
+		\newenvironment{lyxcode}
+			{\par\begin{list}{}{
+				\setlength{\rightmargin}{\leftmargin}
+				\setlength{\listparindent}{0pt}% needed for AMS classes
+				\raggedright
+				\setlength{\itemsep}{0pt}
+				\setlength{\parsep}{0pt}
+				\normalfont\ttfamily}%
+			 \item[]}
+			{\end{list}}
 	EndPreamble
-
-	# standard font definition
-	Font 
+	Font
 	  Family              Typewriter
 	EndFont
-
 End
 
-# Address style definition
+
 Style Address
+	Category	      FrontMatter
 	Margin                Static
 	LatexType             Command
 	LatexName             lyxaddress
@@ -54,20 +52,18 @@ Style Address
 	Align                 Left
 	AlignPossible         Block, Left, Right, Center
 	LabelType             No_Label
-
-	# define the macro \lyxaddress
 	Preamble
-	\newcommand{\lyxaddress}[1]{
-	  \par {\raggedright #1 
-	  \vspace{1.4em}
-	  \noindent\par}
-	}
+		\newcommand{\lyxaddress}[1]{
+			\par {\raggedright #1
+			\vspace{1.4em}
+			\noindent\par}
+		}
 	EndPreamble
-
 End
 
-# Right Address style
+
 Style Right_Address
+	Category	      FrontMatter
 	Margin                Right_Address_Box
 	LatexType             Command
 	LatexName             lyxrightaddress
@@ -75,17 +71,13 @@ Style Right_Address
 	BottomSep             1.5
 	ParSep                1.5
 	Align                 Left
-	AlignPossible         Left
-
-	# define the macro \lyxrightaddress
 	Preamble
-	\newcommand{\lyxrightaddress}[1]{
-	  \par {\raggedleft \begin{tabular}{l}\ignorespaces
-	  #1
-	  \end{tabular}
-	  \vspace{1.4em}
-	  \par}
-	}
+		\newcommand{\lyxrightaddress}[1]{
+			\par {\raggedleft \begin{tabular}{l}\ignorespaces
+			#1
+			\end{tabular}
+			\vspace{1.4em}
+			\par}
+		}
 	EndPreamble
-	
 End