Fix bug #11410.

[lyx.git] / lib / layouts / stdlayouts.inc

diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc
index 8be0d24ee6b9967219f5276a9f9848cdd1b850f8..597772b411efb33883d3506956ee7e176f166697 100644 (file)
--- a/lib/layouts/stdlayouts.inc
+++ b/lib/layouts/stdlayouts.inc
@@ -7,7 +7,7 @@
 # quotations and such.
 
 
-Format 60
+Format 97
 
 Style Quotation
        Category              MainText
@@ -28,6 +28,9 @@ Style Quotation
        AlignPossible         Block, Left, Right, Center
        HTMLTag               blockquote
        HTMLItem              div
+       DocBookWrapperTag     blockquote
+       DocBookWrapperMergeWithPrevious    true
+       DocBookTag            para
 End
 
 
@@ -48,6 +51,9 @@ Style Quote
        LabelType             No_Label
        HTMLTag               blockquote
        HTMLItem              div
+       DocBookWrapperTag     blockquote
+       DocBookWrapperMergeWithPrevious    true
+       DocBookTag            para
 End
 
 
@@ -70,6 +76,8 @@ Style Verse
        LabelType             No_Label
        HTMLTag               blockquote
        HTMLItem              p
+       DocBookTag            literallayout
+       DocBookTagType        paragraph
 End
 
 
@@ -78,9 +86,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 +100,9 @@ Style Verbatim
        Font
          Family              Typewriter
        EndFont
-       HTMLTag               <pre></pre>
+       HTMLTag               pre
        HTMLItem              p
+       DocBookTag            programlisting
 End