Fix bug #11410.

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

diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc
index 5f8b320b955710a843d4a0b6deb181b1ed91dac9..597772b411efb33883d3506956ee7e176f166697 100644 (file)
--- a/lib/layouts/stdlayouts.inc
+++ b/lib/layouts/stdlayouts.inc
@@ -7,7 +7,7 @@
 # quotations and such.
 
 
-Format 53
+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,28 +76,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
-       TopSep                  0.7
-       BottomSep               0.7
-       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              p
+       DocBookTag            programlisting
 End
 
+
+Style Verbatim*
+       CopyStyle             Verbatim
+       LatexName             verbatim*
+End