Merge branch 'feature/docbook' into master

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

diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc
index d4b099c526a909d8820b2447ce9ddd27ceaafd5d..e550518a60fb46b00214cb86ef70f791da4da1da 100644 (file)
--- a/lib/layouts/stdlayouts.inc
+++ b/lib/layouts/stdlayouts.inc
@@ -7,13 +7,15 @@
 # quotations and such.
 
 
-Format 11
+Format 84
+
 Style Quotation
        Category              MainText
        Margin                Static
        LatexType             Environment
        LatexName             quotation
        NextNoIndent          1
+       ToggleIndent          Always
        LeftMargin            MMM
        RightMargin           MMM
        ParIndent             MM
@@ -25,8 +27,10 @@ Style Quotation
        Align                 Block
        AlignPossible         Block, Left, Right, Center
        HTMLTag               blockquote
-       HTMLAttr              class='quotation'
-       HTMLItem              p
+       HTMLItem              div
+       DocBookWrapperTag     blockquote
+       DocBookWrapperMergeWithPrevious    true
+       DocBookTag            para
 End
 
 
@@ -36,6 +40,7 @@ Style Quote
        LatexType             Environment
        LatexName             quote
        NextNoIndent          1
+       ToggleIndent          Never
        LeftMargin            MMM
        RightMargin           MMM
        TopSep                0.5
@@ -45,8 +50,10 @@ Style Quote
        AlignPossible         Block, Left, Right, Center
        LabelType             No_Label
        HTMLTag               blockquote
-       HTMLAttr              class='quote'
-       HTMLItem              p
+       HTMLItem              div
+       DocBookWrapperTag     blockquote
+       DocBookWrapperMergeWithPrevious    true
+       DocBookTag            para
 End
 
 
@@ -68,25 +75,38 @@ Style Verse
        AlignPossible         Block, Left
        LabelType             No_Label
        HTMLTag               blockquote
-       HTMLAttr              class='verse'
        HTMLItem              p
+       DocBookTag            literallayout
+       DocBookItemTag        para
 End
 
 
-Style --Separator--
+Style Verbatim
        Category              MainText
+       LatexType             Environment
+       LatexName             verbatim
+       NextNoIndent          1
+       ParbreakIsNewline     1
+       FreeSpacing           1
+       PassThru              1
+       NeedCProtect          1
        KeepEmpty             1
-       Margin                Dynamic
-       LatexType             Paragraph
-       LatexName             dummy
-       ParIndent             MM
+       NewLine               0
+       TopSep                0.7
+       BottomSep             0.7
        Align                 Block
-       LabelType             Static
-       LabelString           "--- Separate Environment ---"
-       LabelFont
-         Family              Roman
-         Series              Medium
-         Size                Normal
-         Color               Blue
+       AlignPossible         Block
+       LabelType             No_Label
+       Font
+         Family              Typewriter
        EndFont
+       HTMLTag               pre
+       HTMLItem              p
+       DocBookTag            programlisting
+End
+
+
+Style Verbatim*
+       CopyStyle             Verbatim
+       LatexName             verbatim*
 End