X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Flyxmacros.inc;h=8d7c7e1c0eaea0f8091933a6efcf8d83c14ce36d;hb=246b3d79e676481d0b56eb051757763260648c5c;hp=bdd121de51ed133dfb7cec06fc9b045867ad3e80;hpb=e9b3ceae4e27a17e23fc2f3f84b56c746040d829;p=lyx.git

diff --git a/lib/layouts/lyxmacros.inc b/lib/layouts/lyxmacros.inc
index bdd121de51..8d7c7e1c0e 100644
--- a/lib/layouts/lyxmacros.inc
+++ b/lib/layouts/lyxmacros.inc
@@ -1,121 +1,83 @@
 # 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
-Style LyX-Code
-  Margin		Static
-  LatexType		Environment
-  LatexName		lyxcode
-  NextNoIndent		1
-  LeftMargin		MMM
-  RightMargin		MMM
-  TopSep		0.5
-  BottomSep		0.5
-  Align			Left
-  AlignPossible		Block, Left, Right, Center
-  LabelType		No_Label
-  FreeSpacing 	    	1
-
-  # define the environment lyxcode
-  Preamble
-  \newenvironment{lyxcode}
-    {\begin{list}{}{
-      \setlength{\rightmargin}{\leftmargin}
-      \raggedright
-      \setlength{\itemsep}{0pt}
-      \setlength{\parsep}{0pt}
-      \verbatim@font}%
-     \item[]}
-    {\end{list}}
-  EndPreamble
-
-  # standard font definition
-  Font 
-    Family  		Typewriter
-  EndFont
 
+Format 45
+Style LyX-Code
+	Category              MainText
+	Margin                Static
+	LatexType             Environment
+	LatexName             lyxcode
+	NextNoIndent          1
+	LeftMargin            MMM
+	RightMargin           MMM
+	TopSep                0.5
+	BottomSep             0.5
+	Align                 Left
+	AlignPossible         Block, Left, Right, Center
+	LabelType             No_Label
+	FreeSpacing           1
+	Preamble
+		\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
+	Font
+	  Family              Typewriter
+	EndFont
 End
 
-# Comment style definition
-Style Comment
-  Margin		Dynamic
-  LatexType		Environment
-  LatexName		comment
-  NextNoIndent		1
-  LeftMargin		MMM
-  RightMargin           MMM
-  Align			Block
-  AlignPossible		Block, Left, Right, Center
-  LabelType		Static
-  LabelSep		:x
-  Labelstring		"Comment:"
-
-  LabelFont
-	Shape		Italic
-	Series		Bold
-	Color		black
-  EndFont
-
-  TextFont
-	Color		magenta
-	Shape		Italic
-  EndFont
-
-  Preamble
-  \usepackage{verbatim}
-  EndPreamble
 
-End
-
-# Address style definition
 Style Address
-  Margin		Static
-  LatexType		Command
-  LatexName		lyxaddress
-  ParSkip		0.4
-  BottomSep		1.5
-  ParSep		1.5
-  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}
-  }
-  EndPreamble
-
+	Category	      FrontMatter
+	Margin                Static
+	LatexType             Command
+	LatexName             lyxaddress
+	ParSkip               0.4
+	BottomSep             1.5
+	ParSep                1.5
+	Align                 Left
+	AlignPossible         Block, Left, Right, Center
+	LabelType             No_Label
+	Preamble
+		\newcommand{\lyxaddress}[1]{
+			\par {\raggedright #1
+			\vspace{1.4em}
+			\noindent\par}
+		}
+	EndPreamble
 End
 
-# Right Address style
-Style Right_Address
-  Margin		Right_Address_Box
-  LatexType		Command
-  LatexName		lyxrightaddress
-  ParSkip		0.4
-  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}
-  }
-  EndPreamble
-  
+Style Right_Address
+	Category	      FrontMatter
+	Margin                Right_Address_Box
+	LatexType             Command
+	LatexName             lyxrightaddress
+	ParSkip               0.4
+	BottomSep             1.5
+	ParSep                1.5
+	Align                 Left
+	Preamble
+		\newcommand{\lyxrightaddress}[1]{
+			\par {\raggedleft \begin{tabular}{l}\ignorespaces
+			#1
+			\end{tabular}
+			\vspace{1.4em}
+			\par}
+		}
+	EndPreamble
 End