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

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

diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout
index 864726415a520ebcce6d7ee9a83bc10060129404..80c01cf3e1fbeacb618e10a0a4f43abf4be8e298 100644 (file)
--- a/lib/layouts/tufte-book.layout
+++ b/lib/layouts/tufte-book.layout
@@ -1,11 +1,11 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[tufte-book,bibentry.sty,changepage.sty,fancyhdr.sty,hardwrap.sty,ifmtarg.sty,ifplatform.sty,letterspace.sty,multicol.sty,natbib.sty,optparams.sty,paralist.sty,placeins.sty,ragged2e.sty,setspace.sty,textcase.sty,titlesec.sty,titletoc.sty,xcolor.sty,xifthen.sty,xkeyval.sty]{Tufte Book}
+#  \DeclareLaTeXClass[tufte-book]{Tufte Book}
 #  \DeclareCategory{Books}
 # tufte-book textclass definition file.
 # Jason Waskiewicz <jason.waskiewicz@sendit.nodak.edu>, 2009/10/18
 # Modified by Uwe Stöhr <uwestoehr@web.de>, 2009/11/15
 
-Format 60
+Format 80
 
 Provides geometry 1
 Provides natbib-internal 1
@@ -17,6 +17,20 @@ ClassOptions
        Other           nohyper
 end
 
+# Tufte uses \cite for margin note citations
+AddToCiteEngine authoryear
+       cite[][]
+End
+
+CiteFormat authoryear
+       _sidenote Sidenote
+       _side sidenote
+       _fullcite bibl. entry
+       _bibentry Full bibliography entry.
+       # "Margin: Full bibliography entry." (dialog) / "Margin: Key (bibliography entry)"
+       cite {%dialog%[[%_sidenote%]][[%_side%]]}: {%dialog%[[%_bibentry%]][[{%label%[[%!fullcite%]][[%key%%!nextkey% (%_fullcite%)]]}]]}
+End
+
 Style Standard
        Margin          Static
        LatexType       Paragraph
@@ -34,14 +48,17 @@ Input stdclass.inc
 
 Style Title
        InPreamble              1
+       NeedProtect             1
 End
 
 Style Author
        InPreamble              1
+       NeedProtect             1
 End
 
 Style Date
        InPreamble              1
+       NeedProtect             1
 End
 
 NoStyle Abstract
@@ -71,15 +88,16 @@ Style Chapter
        NeedProtect             1
        NextNoIndent    1
        ParSkip                 0.4
-       TopSep                  4
+       TopSep                  2
        BottomSep               0.8
        ParSep                  0.8
        Align                   Block
        RefPrefix               chap
        Argument 1
          LabelString   "Short Title|S"
-         Tooltip               "The chapter as it appears in the table of contents/running headers"
+         Tooltip       "The chapter as it appears in the table of contents/running headers"
          InsertCotext  1
+         IsTocCaption  1
        EndArgument
        Font
          Series                Bold
@@ -106,8 +124,9 @@ Style Section
        RefPrefix               sec
        Argument 1
          LabelString   "Short Title|S"
-         Tooltip               "The section as it appears in the table of contents/running headers"
+         Tooltip       "The section as it appears in the table of contents/running headers"
          InsertCotext  1
+         IsTocCaption  1
        EndArgument
        Font
          Series                Bold
@@ -262,4 +281,5 @@ Style Bibliography
          Series                Bold
          Size                  Huge
        EndFont
+       TocLevel                0
 End