X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdlayouts.inc;h=d1766ca476c2e3dd9902fdfc71af924d52c1fd74;hb=2841a1c06315edb7dd3a264746c093ee4c1a7c9f;hp=47be8a3cd8c33b80de20ec82b353c8c6ce729d8a;hpb=6b49b6b129af9417fea7ea907a44a46fbbd38340;p=lyx.git

diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc
index 47be8a3cd8..d1766ca476 100644
--- a/lib/layouts/stdlayouts.inc
+++ b/lib/layouts/stdlayouts.inc
@@ -7,28 +7,7 @@
 # quotations and such.
 
 
-Format 49
-
-Style Quotation
-	Category              MainText
-	Margin                Static
-	LatexType             Environment
-	LatexName             quotation
-	NextNoIndent          1
-	LeftMargin            MMM
-	RightMargin           MMM
-	ParIndent             MM
-	ParSkip               0
-	ItemSep               0
-	TopSep                0.5
-	BottomSep             0.5
-	ParSep                0
-	Align                 Block
-	AlignPossible         Block, Left, Right, Center
-	HTMLTag               blockquote
-	HTMLItem              div
-End
-
+Format 100
 
 Style Quote
 	Category              MainText
@@ -36,6 +15,7 @@ Style Quote
 	LatexType             Environment
 	LatexName             quote
 	NextNoIndent          1
+	ToggleIndent          Never
 	LeftMargin            MMM
 	RightMargin           MMM
 	TopSep                0.5
@@ -43,9 +23,22 @@ Style Quote
 	BottomSep             0.5
 	Align                 Block
 	AlignPossible         Block, Left, Right, Center
-	LabelType             No_Label
 	HTMLTag               blockquote
 	HTMLItem              div
+	DocBookWrapperTag     blockquote
+	DocBookWrapperMergeWithPrevious    true
+	DocBookTag            para
+End
+
+
+Style Quotation
+	CopyStyle             Quote
+	LatexName             quotation
+	ToggleIndent          Always
+	ParIndent             MM
+	ParSkip               0
+	ItemSep               0
+	ParSep                0
 End
 
 
@@ -68,49 +61,37 @@ Style Verse
 	LabelType             No_Label
 	HTMLTag               blockquote
 	HTMLItem              p
+	DocBookTag            literallayout
+	DocBookTagType        paragraph
 End
 
 
 Style Verbatim
-	Category		MainText
-	LatexType		Environment
-	LatexName		verbatim
-	NextNoIndent		1
-	ParbreakIsNewline	1
-	FreeSpacing		1
-	PassThru		1
-	KeepEmpty		1
-	NewLine			0
-	ParSkip			0.4
-	TopSep			0.7
-	BottomSep		0.7
-	ParSep			0.5
-	Align			Block
-	AlignPossible		Block
-	LabelType		No_Label
+	Category              MainText
+	LatexType             Environment
+	LatexName             verbatim
+	NextNoIndent          1
+	ParbreakIsNewline     1
+	FreeSpacing           1
+	PassThru              1
+	NeedCProtect          1
+	KeepEmpty             1
+	NewLine               0
+	TopSep                0.7
+	BottomSep             0.7
+	Align                 Block
+	AlignPossible         Block
+	LabelType             No_Label
 	Font
-	  Family		Typewriter
+	  Family              Typewriter
 	EndFont
-	HTMLTag			<pre></pre>
-	HTMLItem		p
+	HTMLTag               pre
+	HTMLItem              NONE
+	DocBookTag            programlisting
 End
 
 
-Style --Separator--
-	Category              MainText
-	KeepEmpty             1
-	Margin                Dynamic
-	LatexType             Paragraph
-	LatexName             dummy
-	ParIndent             MM
-	Align                 Block
-	LabelType             Static
-	LabelString           "--- Separate Environment ---"
-	LabelFont
-	  Family              Roman
-	  Series              Medium
-	  Size                Normal
-	  Color               Blue
-	EndFont
-	HTMLLabel             NONE
+Style Verbatim*
+	CopyStyle             Verbatim
+	LatexName             verbatim*
 End