Merge branch 'master' of git.lyx.org:lyx

[features.git] / lib / layouts / tufte-book.layout

diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout
index 2b88ca308f25645a0371a9347cc8da5ee2aae862..bc79f5d6ef14b29cab9d5692b7f624b6d8672b25 100644 (file)
--- a/lib/layouts/tufte-book.layout
+++ b/lib/layouts/tufte-book.layout
@@ -5,7 +5,7 @@
 # Jason Waskiewicz <jason.waskiewicz@sendit.nodak.edu>, 2009/10/18
 # Modified by Uwe Stöhr <uwestoehr@web.de>, 2009/11/15
 
-Format 82
+Format 95
 
 Provides geometry 1
 Provides natbib-internal 1
@@ -170,6 +170,10 @@ InsetLayout Flex:Sidenote
          Color                 marginlabel
          Size                  Small
        EndFont
+    DocBookTag      footnote
+    DocBookAttr     role='sidenote'
+       DocBookItemTag  para
+    DocBookTagType  inline
        ResetsFont              true
 End
 
@@ -183,6 +187,7 @@ InsetLayout Flex:Marginnote
          Shape                 Up
          Series                Medium
        EndFont
+    DocBookAttr     role='marginnote'
        MultiPar                true
 End
 
@@ -196,11 +201,12 @@ InsetLayout Flex:NewThought
        EndFont
        LabelFont
          Family                Roman
-         Color                 red
+         Color                 textlabel3
        EndFont
        ResetsFont              true
        DocBookTag      emphasis
        DocBookAttr     role='newthought'
+    DocBookTagType  inline
 End
 
 InsetLayout Flex:AllCaps
@@ -212,7 +218,7 @@ InsetLayout Flex:AllCaps
          Misc                  Noun
        EndFont
        LabelFont
-         Color                 blue
+         Color                 textlabel1
        EndFont
        DocBookTag      emphasis
        DocBookAttr     role='allcaps'
@@ -223,7 +229,7 @@ InsetLayout Flex:SmallCaps
        LatexName               smallcaps
        LabelString             "smallcaps"
        LabelFont
-         Color                 green
+         Color                 textlabel2
        EndFont
        DocBookTag      emphasis
        DocBookAttr     role='smallcaps'
@@ -243,6 +249,8 @@ Style Full_Width
        Align                   Block
        AlignPossible   Block, Left, Right, Center
        LabelType               No_Label
+       DocBookTag      para
+       DocBookAttr     role='fullwidth'
 End
 
 # this steps the counters