X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftufte-book.layout;h=c0430709ea4d034deea2e2c1cbcb0189ed28967e;hb=e2e74ffb0a72477420bfc2a8be0fcfbafe52e8ae;hp=0bf5fd896e47cb28dc37bd0c6d04c7a8a0739b75;hpb=bbf287a3c603b40e41007be54872e939b996319d;p=lyx.git

diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout
index 0bf5fd896e..c0430709ea 100644
--- a/lib/layouts/tufte-book.layout
+++ b/lib/layouts/tufte-book.layout
@@ -5,18 +5,33 @@
 # Jason Waskiewicz <jason.waskiewicz@sendit.nodak.edu>, 2009/10/18
 # Modified by Uwe Stöhr <uwestoehr@web.de>, 2009/11/15
 
-Format 68
+Format 104
 
 Provides geometry 1
 Provides natbib-internal 1
 
 Sides		2
 PageStyle	Headings
+DocBookRoot	book
 
 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
@@ -89,6 +104,10 @@ Style Chapter
 	  Series		Bold
 	  Size			Huge
 	EndFont
+    # h1 is used for the document title.
+    HTMLTag               h2
+	DocBookTag            title
+	DocBookSectionTag     chapter
 End
 
 Style Section
@@ -118,6 +137,9 @@ Style Section
 	  Series		Bold
 	  Size			Larger
 	EndFont
+    HTMLTag               h3
+	DocBookTag            title
+	DocBookSectionTag     section
 End
 
 Style Subsection
@@ -140,6 +162,8 @@ InsetLayout Flex:Sidenote
 	LatexName		sidenote
 	Decoration		classic
 	LabelString		"sidenote"
+	ResetsFont		true
+	InheritFont		false
 	Font
 	  Color			foreground
 	  Size			Small
@@ -151,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
@@ -159,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
 
@@ -172,14 +195,17 @@ InsetLayout Flex:NewThought
 	LatexType		Command
 	LatexName		newthought
 	LabelString		"new thought"
+	ResetsFont		true
 	Font
 	  Shape			SmallCaps
 	EndFont
 	LabelFont
 	  Family		Roman
-	  Color			red
+	  Color			textlabel3
 	EndFont
-	ResetsFont		true
+	DocBookTag      emphasis
+	DocBookAttr     role='newthought'
+    DocBookTagType  inline
 End
 
 InsetLayout Flex:AllCaps
@@ -191,8 +217,10 @@ InsetLayout Flex:AllCaps
 	  Misc			Noun
 	EndFont
 	LabelFont
-	  Color			blue
+	  Color			textlabel1
 	EndFont
+	DocBookTag      emphasis
+	DocBookAttr     role='allcaps'
 End
 
 InsetLayout Flex:SmallCaps
@@ -200,8 +228,10 @@ InsetLayout Flex:SmallCaps
 	LatexName		smallcaps
 	LabelString		"smallcaps"
 	LabelFont
-	  Color			green
+	  Color			textlabel2
 	EndFont
+	DocBookTag      emphasis
+	DocBookAttr     role='smallcaps'
 End
 
 Style Full_Width
@@ -218,13 +248,19 @@ Style Full_Width
 	Align			Block
 	AlignPossible	Block, Left, Right, Center
 	LabelType		No_Label
+	DocBookTag      para
+	DocBookAttr     role='fullwidth'
 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