Grammar

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

diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout
index f36f395059ec71a1e83cdca26bd8273204bbea93..c0430709ea4d034deea2e2c1cbcb0189ed28967e 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 95
+Format 104
 
 Provides geometry 1
 Provides natbib-internal 1
@@ -104,6 +104,8 @@ Style Chapter
          Series                Bold
          Size                  Huge
        EndFont
+    # h1 is used for the document title.
+    HTMLTag               h2
        DocBookTag            title
        DocBookSectionTag     chapter
 End
@@ -135,6 +137,7 @@ Style Section
          Series                Bold
          Size                  Larger
        EndFont
+    HTMLTag               h3
        DocBookTag            title
        DocBookSectionTag     section
 End
@@ -159,6 +162,8 @@ InsetLayout Flex:Sidenote
        LatexName               sidenote
        Decoration              classic
        LabelString             "sidenote"
+       ResetsFont              true
+       InheritFont             false
        Font
          Color                 foreground
          Size                  Small
@@ -170,7 +175,10 @@ InsetLayout Flex:Sidenote
          Color                 marginlabel
          Size                  Small
        EndFont
-       ResetsFont              true
+    DocBookTag      footnote
+    DocBookAttr     role='sidenote'
+       DocBookItemTag  para
+    DocBookTagType  inline
 End
 
 InsetLayout Flex:Marginnote
@@ -178,11 +186,7 @@ InsetLayout Flex:Marginnote
        LatexName               marginnote
        Decoration              classic
        LabelString             "marginnote"
-       Font
-         Family                Roman
-         Shape                 Up
-         Series                Medium
-       EndFont
+    DocBookAttr     role='marginnote'
        MultiPar                true
 End
 
@@ -191,6 +195,7 @@ InsetLayout Flex:NewThought
        LatexType               Command
        LatexName               newthought
        LabelString             "new thought"
+       ResetsFont              true
        Font
          Shape                 SmallCaps
        EndFont
@@ -198,9 +203,9 @@ InsetLayout Flex:NewThought
          Family                Roman
          Color                 textlabel3
        EndFont
-       ResetsFont              true
        DocBookTag      emphasis
        DocBookAttr     role='newthought'
+    DocBookTagType  inline
 End
 
 InsetLayout Flex:AllCaps
@@ -250,10 +255,12 @@ End
 # this steps the counters
 Counter                marginfigure
        GuiName "Margin Figure"
+       PrettyFormat "Margin Figure ##"
 End
 
 Counter                margintable
        GuiName "Margin Table"
+       PrettyFormat "Margin Table ##"
 End
 
 # define the floats