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

diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc
index a51dab0bb3..d1766ca476 100644
--- a/lib/layouts/stdlayouts.inc
+++ b/lib/layouts/stdlayouts.inc
@@ -7,29 +7,7 @@
 # quotations and such.
 
 
-Format 59
-
-Style Quotation
-	Category              MainText
-	Margin                Static
-	LatexType             Environment
-	LatexName             quotation
-	NextNoIndent          1
-	ToggleIndent          Always
-	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
@@ -45,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
 
 
@@ -70,6 +61,8 @@ Style Verse
 	LabelType             No_Label
 	HTMLTag               blockquote
 	HTMLItem              p
+	DocBookTag            literallayout
+	DocBookTagType        paragraph
 End
 
 
@@ -78,9 +71,10 @@ Style Verbatim
 	LatexType             Environment
 	LatexName             verbatim
 	NextNoIndent          1
-	ParbreakIsNewline	  1
+	ParbreakIsNewline     1
 	FreeSpacing           1
 	PassThru              1
+	NeedCProtect          1
 	KeepEmpty             1
 	NewLine               0
 	TopSep                0.7
@@ -91,8 +85,9 @@ Style Verbatim
 	Font
 	  Family              Typewriter
 	EndFont
-	HTMLTag               <pre></pre>
-	HTMLItem              p
+	HTMLTag               pre
+	HTMLItem              NONE
+	DocBookTag            programlisting
 End