- tufte-handout: new layout

- tufte-book.layout; synchronize with the tufte-handout.layout
- tufte-book.lyx: add important note and improve the documentation according the example file for the similar tufte-handout class
- biblioExample.bib: new entry used by the tufte example files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31760 a592a061-630c-0410-9148-cb99ea01b6c8

development/scons/scons_manifest.py

@@ -2454,6 +2454,7 @@ lib_examples_files = Split('''
     splash.lyx
     sweave.lyx
     tufte-book.lyx
+    tufte-handout.lyx
     xyfigure.png
     xypic.lyx
 ''')
@@ -2740,6 +2741,7 @@ lib_layouts_files = Split('''
     tbook.layout
     treport.layout
     tufte-book.layout
+    tufte-handout.layout
 ''')
 
 

lib/Makefile.am

@@ -254,6 +254,7 @@ dist_examples_DATA = \
 	examples/splash.lyx \
 	examples/sweave.lyx \
 	examples/tufte-book.lyx \
+	examples/tufte-handout.lyx \
 	examples/xyfigure.png \
 	examples/xypic.lyx
 
@@ -1148,7 +1149,8 @@ dist_layouts_DATA =\
 	layouts/theorems-starred.module \
 	layouts/theorems-std.module \
 	layouts/treport.layout \
-	layouts/tufte-book.layout
+	layouts/tufte-book.layout \
+	layouts/tufte-handout.layout
 
 scriptsdir = $(pkgdatadir)/scripts
 # Note that we "chmod 755" manually these files in install-data-hook.

lib/examples/biblioExample.bib

@@ -1,4 +1,4 @@
-% This file was created with JabRef 2.4.2.
+% This file was created with JabRef 2.5.
 % Encoding: Cp1252
 
 @ARTICLE{Mena2000,
@@ -66,6 +66,15 @@
   doi = {10.1021/ja00089a029}
 }
 
+@BOOK{Bringhurst2005,
+  title = {The Elements of Typography},
+  publisher = {Hartley \& Marks},
+  year = {2005},
+  author = {Robert Bringhurst},
+  edition = {3.1},
+  isbn = {0-88179-205-5}
+}
+
 @BOOK{Cotton1999,
   title = {{A}dvanced {I}norganic {C}hemistry},
   publisher = {Wiley},

lib/examples/tufte-book.lyx

@@ -43,12 +43,53 @@
 
 \begin_body
 
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Important note:
+\series default
+ The menu 
+\family sans
+Insert\SpecialChar \menuseparator
+Hyperlinks
+\family default
+ and the 
+\family sans
+PDF properties
+\family default
+ in the 
+\family sans
+Document\SpecialChar \menuseparator
+Settings
+\family default
+ menu cannot be used for tufte document classes!
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Title
 Random Tufte Examples
 \end_layout
 
 \begin_layout Author
 Fake Author
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+author of this example file: Jason Waskiewicz
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -65,23 +106,11 @@ The Features of the Tufte-book Class
 \end_layout
 
 \begin_layout Standard
-In this document, I endeavor to show some of the features of the Tufte-book
+In this document, it was endeavored to show some of the features of the
- class.
+ Tufte-book class.
- In the first chapter, I outline their use.
+ In the first chapter, their use is outlined.
- In the second chapter, I demonstrate their use through a handout I created
+ In the second chapter, their use through a handout thjat was created in
- in my Calculus class.
+ a calculus class is demonstrated.
- For those who are viewing the .lyx file, I had to remove the figures and
- replace them by boxes so that the download would not become overwhelming.
-\begin_inset Flex Sidenote
-status collapsed
-
-\begin_layout Plain Layout
-I created the figures with a combination of RLPlot and Inkscape.
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -90,7 +119,9 @@ Features
 
 \begin_layout Standard
 The Tufte-book class is based on the work of Edward Tufte.
- His documents consist of a column of text beside a wide column of margin
+ It provides the same functionality as the Tufte-handout class with book-specifi
+c additions.
+ Tufte's documents consist of a column of text beside a wide column of margin
  notes and margin figures.
  This is to improve readability.
 \end_layout
@@ -127,8 +158,19 @@ Limited layers of sections and subsections
 \end_layout
 
 \begin_layout Standard
-In this sample document, I will demonstrate some of these features.
+In this sample document, some of these features are demonstrated.
- For a full demonstration, visit the webpage.
+ For a full demonstration, visit the tufte-latex webpage: 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://code.google.com/p/tufte-latex
+\end_layout
+
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Section
@@ -184,6 +226,16 @@ Finally, by default, Tufte does not number his chapters or his sections.
  Since I like to refer to sections by number, I changed this section in
  the Document Settings by moving the slider under the Numbering and TOC
  section.
+\begin_inset Flex Marginnote
+status collapsed
+
+\begin_layout Plain Layout
+marginnote
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Section
@@ -366,26 +418,33 @@ Working with Text
 \end_layout
 
 \begin_layout Standard
-Tufte provides a number of innovations for use with his text.
+One of the most prominent and distinctive features of this style is the
- The first is the extensive use of margin notes.
+ extensive use of sidenotes.
-\begin_inset Flex Sidenote
+ There is a wide margin to provide ample room for sidenotes and small figures.
+ Any footnotes will automatically be converted to sidenotes.
+\begin_inset Foot
 status open
 
 \begin_layout Plain Layout
-This is an example of a Tufte style margin note.
+This is a sidenote that was entered using a 
+\family typewriter
+footnote
+\family default
+.
 \end_layout
 
 \end_inset
 
- Tufte's margin notes use a slightly smaller font and they have the added
+ Alternatively, you can also use directly the sidenote inset.
- benefit of reference by a superscript.
+\begin_inset Flex Sidenote
- Ordinary margin notes do not have this.
- Both types are shown.
-\begin_inset Marginal
 status open
 
 \begin_layout Plain Layout
-This is an ordinary margin note.
+This is a sidenote that was entered using a 
+\family typewriter
+sidenote
+\family default
+.
 \end_layout
 
 \end_inset
@@ -394,7 +453,40 @@ This is an ordinary margin note.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Flex Newthought
+If you like to place ancillary information in the margin without the sidenote
+ mark (the superscript number), you can use the 
+\family typewriter
+Marginnote
+\family default
+ inset.
+ 
+\begin_inset Flex Marginnote
+status open
+
+\begin_layout Plain Layout
+This is Tufte's margin note.
+ Notice that there isn't a number preceding the note, and there is no number
+ in the main text where this note was written.
+\end_layout
+
+\end_inset
+
+ The normal margin note will work as well, but it will look rather odd.
+\begin_inset Marginal
+status open
+
+\begin_layout Plain Layout
+This is a normal margin note.
+ Don't use it.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset Flex NewThought
 status open
 
 \begin_layout Plain Layout
@@ -409,26 +501,108 @@ new thought
 \series default
  command.
  It introduces new thoughts, such as this paragraph, with small capitals.
+ To accomplish this, use the 
+\family typewriter
+NewThought
+\family default
+ character style (
+\family sans
+Edit\SpecialChar \menuseparator
+TextStyle\SpecialChar \menuseparator
+NewThought
+\family default
+).
 \end_layout
 
 \begin_layout Standard
-Finally, Tufte has a setting to print full-width text.
+The Tufte document classes includes two new character styles and some improvemen
- This spreads it from margin to margin.
+ts on existing commands for letterspacing.
- I believe this might be useful for quoting a text.
 \end_layout
 
 \begin_layout Standard
-Another available style is 
+When setting strings of 
-\begin_inset Flex Allcaps
+\begin_inset Flex AllCaps
 status open
 
 \begin_layout Plain Layout
-allcaps
+ALL CAPS
+\end_layout
+
+\end_inset
+
+ or 
+\begin_inset Flex SmallCaps
+status open
+
+\begin_layout Plain Layout
+Small Caps
+\end_layout
+
+\end_inset
+
+, the letterspacing---that is, the spacing between the letters---should
+ be increased slightly.
+\begin_inset CommandInset citation
+LatexCommand cite
+key "Bringhurst2005"
+
+\end_inset
+
+ The 
+\emph on
+AllCaps
+\emph default
+ character style (
+\family sans
+Edit\SpecialChar \menuseparator
+TextStyle\SpecialChar \menuseparator
+AllCaps
+\family default
+) has proper letterspacing for strings of 
+\begin_inset Flex AllCaps
+status open
+
+\begin_layout Plain Layout
+FULL CAPITAL LETTERS
+\end_layout
+
+\end_inset
+
+, and the 
+\emph on
+SmallCaps
+\emph default
+ character style (
+\family sans
+Edit\SpecialChar \menuseparator
+TextStyle\SpecialChar \menuseparator
+SmallCaps
+\family default
+) has letterspacing for 
+\begin_inset Flex SmallCaps
+status open
+
+\begin_layout Plain Layout
+small capital letters
 \end_layout
 
 \end_inset
 
 .
+ These commands will also automatically convert the case of the text to
+ upper- or lowercase, respectively.
+\end_layout
+
+\begin_layout Standard
+The normal 
+\emph on
+Small Caps
+\emph default
+ shape has also been redefined to include letterspacing.
+ Its case is left as is, however.
+ This allows one to use both uppercase and lowercase letters: 
+\shape smallcaps
+The Initial Letters Of The Words In This Sentence Are Capitalized.
 \end_layout
 
 \begin_layout Full Width
@@ -442,10 +616,6 @@ This is full width text.
  
 \end_layout
 
-\begin_layout Standard
-I've honestly not found a use for the fullwidth setting in my own materials.
-\end_layout
-
 \begin_layout Section
 Conclusions
 \end_layout
@@ -782,7 +952,7 @@ In the specific example, over the interval
 \end_layout
 
 \begin_layout Standard
-\begin_inset Flex Newthought
+\begin_inset Flex NewThought
 status open
 
 \begin_layout Plain Layout
@@ -1000,5 +1170,16 @@ Homework
 p114: 1, 4, 5, 6, 8, 10, 12, 15
 \end_layout
 
+\begin_layout Standard
+\begin_inset CommandInset bibtex
+LatexCommand bibtex
+bibfiles "biblioExample"
+options "plainnat"
+
+\end_inset
+
+
+\end_layout
+
 \end_body
 \end_document

lib/layouts/tufte-book.layout

@@ -50,12 +50,39 @@ InsetLayout Sidenote
 	EndFont
 End
 
-InsetLayout Allcaps
+InsetLayout Marginnote
 	CopyStyle	Sidenote
-	Decoration	Conglomerate
+	LatexName	marginnote
+	Decoration	classic
+	LabelString	"marginnote"
+	Font
+	  Family	Roman
+	  Shape		Up
+	  Series	Medium
+	EndFont
+	MultiPar	true
+End
+
+InsetLayout NewThought
+	LyXType		charstyle
+	LatexType	Command
+	LatexName	newthought
+	LabelString	"new thought"
+	Font
+	  Shape		SmallCaps
+	EndFont
+	LabelFont
+	  Family	Roman
+	  Color		red
+	EndFont
+End
+
+InsetLayout AllCaps
+	CopyStyle	NewThought
 	LatexName	allcaps
 	LabelString	"allcaps"
 	Font
+	  Shape		Up
 	  Misc		Noun
 	EndFont
 	LabelFont
@@ -63,16 +90,12 @@ InsetLayout Allcaps
 	EndFont
 End
 
-InsetLayout Newthought
+InsetLayout SmallCaps
-	CopyStyle	Sidenote
+	CopyStyle	NewThought
-	Decoration	Conglomerate
+	LatexName	smallcaps
-	LatexName	newthought
+	LabelString	"smallcaps"
-	LabelString	"new thought"
-	Font
-	  Shape		SmallCaps
-	EndFont
 	LabelFont
-	  Color		red
+	  Color		green
 	EndFont
 End
 
@@ -94,10 +117,10 @@ End
 
 # this steps the counters
 Counter
-  Name          marginfigure
+  Name		marginfigure
 End
 Counter
-  Name          margintable
+  Name		margintable
 End
 
 # define the floats

lib/layouts/tufte-handout.layout

@@ -0,0 +1,136 @@
+#% Do not delete the line below; configure depends on this
+#  \DeclareLaTeXClass[tufte-handout]{handout (Tufte)}
+# tufte-handout textclass definition file.
+# Juergen Spitzmueller <juergen@spitzmueller.org>, 2008/10/22
+# Modified by Uwe Stöhr <uwestoehr@web.de>, 2009/10/27
+
+Format 11
+
+Provides geometry 1
+Provides natbib-internal 1
+
+# import other layouts
+Input stdlayouts.inc
+Input article.layout
+
+NoStyle Subsubsection
+NoStyle Subsubsection*
+NoStyle Paragraph
+NoStyle Paragraph*
+NoStyle Subparagraph
+NoStyle Subparagraph*
+
+InsetLayout Sidenote
+	LyxType		custom
+	LatexType	command
+	LatexName	sidenote
+	Decoration	classic
+	LabelString	"sidenote"
+	Font
+	  Color		foreground
+	  Size		Small
+	  Misc		No_Emph
+	  Misc		No_Noun
+	  Misc		No_Bar
+	EndFont
+	LabelFont
+	  Color		marginlabel
+	  Size		Small
+	EndFont
+End
+
+InsetLayout Marginnote
+	CopyStyle	Sidenote
+	LatexName	marginnote
+	Decoration	classic
+	LabelString	"marginnote"
+	Font
+	  Family	Roman
+	  Shape		Up
+	  Series	Medium
+	EndFont
+	MultiPar	true
+End
+
+InsetLayout NewThought
+	LyXType		charstyle
+	LatexType	Command
+	LatexName	newthought
+	LabelString	"new thought"
+	Font
+	  Shape		SmallCaps
+	EndFont
+	LabelFont
+	  Family	Roman
+	  Color		red
+	EndFont
+End
+
+InsetLayout AllCaps
+	CopyStyle	NewThought
+	LatexName	allcaps
+	LabelString	"allcaps"
+	Font
+	  Shape		Up
+	  Misc		Noun
+	EndFont
+	LabelFont
+	  Color		blue
+	EndFont
+End
+
+InsetLayout SmallCaps
+	CopyStyle	NewThought
+	LatexName	smallcaps
+	LabelString	"smallcaps"
+	LabelFont
+	  Color		green
+	EndFont
+End
+
+Style Full_Width
+	Margin		Static
+	LaTeXType	environment
+	LaTeXName	fullwidth
+	Category	MainText
+	NextNoIndent	1
+	ParSkip		0
+	ItemSep		0
+	TopSep		0.5
+	BottomSep	0.5
+	ParSep		0
+	Align		Block
+	AlignPossible	Block, Left, Right, Center
+	LabelType	No_Label
+End
+
+# this steps the counters
+Counter
+  Name		marginfigure
+End
+Counter
+  Name		margintable
+End
+
+# define the floats
+Float
+	Type		margintable
+	GuiName		MarginTable
+	Placement	tbp
+	Extension	lot
+	NumberWithin	none
+	Style		plain
+	ListName	"List of Tables"
+	LaTeXBuiltin	true
+End
+
+Float
+	Type		marginfigure
+	GuiName		MarginFigure
+	Placement	tbp
+	Extension	lof
+	NumberWithin	none
+	Style		plain
+	ListName	"List of Figures"
+	LaTeXBuiltin	true
+End