diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 2f56db95ad..3b1d969ea7 100644
--- a/development/scons/scons_manifest.py
+++ b/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
''')
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5c7df06edd..a3ba6e2596 100644
--- a/lib/Makefile.am
+++ b/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.
diff --git a/lib/examples/biblioExample.bib b/lib/examples/biblioExample.bib
index ab9dc473a0..3c5a743b59 100644
--- a/lib/examples/biblioExample.bib
+++ b/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},
diff --git a/lib/examples/tufte-book.lyx b/lib/examples/tufte-book.lyx
index 6655eb3f34..79d3e2cfe9 100644
--- a/lib/examples/tufte-book.lyx
+++ b/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
- class.
- In the first chapter, I outline their use.
- In the second chapter, I demonstrate their use through a handout I created
- in my Calculus class.
- 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
-
-
+In this document, it was endeavored to show some of the features of the
+ Tufte-book class.
+ In the first chapter, their use is outlined.
+ In the second chapter, their use through a handout thjat was created in
+ a calculus class is demonstrated.
\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.
- For a full demonstration, visit the webpage.
+In this sample document, some of these features are demonstrated.
+ 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.
- The first is the extensive use of margin notes.
-\begin_inset Flex Sidenote
+One of the most prominent and distinctive features of this style is the
+ extensive use of sidenotes.
+ 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
- benefit of reference by a superscript.
- Ordinary margin notes do not have this.
- Both types are shown.
-\begin_inset Marginal
+ Alternatively, you can also use directly the sidenote inset.
+\begin_inset Flex Sidenote
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.
- This spreads it from margin to margin.
- I believe this might be useful for quoting a text.
+The Tufte document classes includes two new character styles and some improvemen
+ts on existing commands for letterspacing.
\end_layout
\begin_layout Standard
-Another available style is
-\begin_inset Flex Allcaps
+When setting strings of
+\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
diff --git a/lib/examples/tufte-handout.lyx b/lib/examples/tufte-handout.lyx
new file mode 100644
index 0000000000..4a4cfce202
--- /dev/null
+++ b/lib/examples/tufte-handout.lyx
@@ -0,0 +1,1765 @@
+#LyX 1.6.5svn created this file. For more info see http://www.lyx.org/
+\lyxformat 345
+\begin_document
+\begin_header
+\textclass tufte-handout
+\use_default_options false
+\language english
+\inputencoding auto
+\font_roman default
+\font_sans helvet
+\font_typewriter default
+\font_default_family default
+\font_sc false
+\font_osf false
+\font_sf_scale 100
+\font_tt_scale 100
+
+\graphics default
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize default
+\use_geometry true
+\use_amsmath 1
+\use_esint 0
+\cite_engine basic
+\use_bibtopic false
+\paperorientation portrait
+\secnumdepth 2
+\tocdepth 2
+\paragraph_separation indent
+\defskip medskip
+\quotes_language english
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\author ""
+\author ""
+\end_header
+
+\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
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+If the
+\emph on
+Date
+\emph default
+ is left out, the current date will be used.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Title
+An Example of the Usage of the Tufte-Handout Style
+\end_layout
+
+\begin_layout Author
+Tufte-LaT
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+{}
+\end_layout
+
+\end_inset
+
+eX Developers and The Ly
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+{}
+\end_layout
+
+\end_inset
+
+X Team
+\end_layout
+
+\begin_layout Abstract
+\noindent
+This document describes the
+\emph on
+Tufte handout
+\emph default
+ LaTeX document style.
+ It also provides examples and comments on the style's use.
+ It is based on the example file shiped with
+\emph on
+tufte-handout.cls
+\emph default
+, but adapted for the use with LyX.
+\end_layout
+
+\begin_layout Standard
+The
+\family sans
+tufte-handout
+\family default
+ document class
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Cf.
+
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://ctan.org/tex-archive/macros/latex/contrib/tufte-latex
+\end_layout
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+ defines a style similar to the style
+\noun on
+Edward Tufte
+\noun default
+ uses in his books and handouts.
+ Tufte's style is known for its extensive use of sidenotes, tight integration
+ of graphics with text, and well-set typography.
+ This document aims to be at once a demonstration of the features of the
+
+\family sans
+tufte-handout
+\family default
+ document class and a style guide to its use.
+\end_layout
+
+\begin_layout Section
+Page Layout
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:page-layout"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Subsection
+Headings and paragraph design
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:headings"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+This style provides
+\shape smallcaps
+a
+\shape default
+- and
+\shape smallcaps
+b
+\shape default
+-heads (that is,
+\emph on
+section
+\emph default
+ and
+\emph on
+subsection
+\emph default
+) demonstrated above.
+\end_layout
+
+\begin_layout Standard
+If you need more than two levels of section headings, you'll have to define
+ them yourself at the moment;
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+See see
+\begin_inset Quotes eld
+\end_inset
+
+Defining new sections
+\begin_inset Quotes erd
+\end_inset
+
+ on page
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand pageref
+reference "sec:defining-sections"
+
+\end_inset
+
+ for help with defining more heading levels.
+\end_layout
+
+\end_inset
+
+ there are no pre-defined styles for anything below a
+\emph on
+subsection
+\emph default
+.
+ As
+\noun on
+Bringhurst
+\noun default
+ points out in
+\shape italic
+The Elements of Typographic Style
+\shape default
+,
+\begin_inset CommandInset citation
+LatexCommand cite
+key "Bringhurst2005"
+
+\end_inset
+
+ you should
+\begin_inset Quotes eld
+\end_inset
+
+use as many levels of headings as you need: no more, and no fewer.
+\begin_inset Quotes erd
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset Flex NewThought
+status open
+
+\begin_layout Plain Layout
+In his later books
+\end_layout
+
+\end_inset
+
+,
+\begin_inset CommandInset citation
+LatexCommand cite
+key "Tufte2006"
+
+\end_inset
+
+ Tufte starts each section with a bit of vertical space, a non-indented
+ paragraph, and sets the first few words of the sentence in
+\shape smallcaps
+small caps
+\shape default
+.
+ 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 Subsection
+Sidenotes
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:sidenotes"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+One of the most prominent and distinctive features of this style is the
+ extensive use of sidenotes.
+ 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 a sidenote that was entered using a
+\family typewriter
+footnote
+\family default
+.
+\end_layout
+
+\end_inset
+
+ Alternatively, you can also use directly the sidenote inset.
+\begin_inset Flex Sidenote
+status open
+
+\begin_layout Plain Layout
+This is a sidenote that was entered using a
+\family typewriter
+sidenote
+\family default
+.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+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 Subsection
+References
+\end_layout
+
+\begin_layout Standard
+References are placed alongside their citations as sidenotes, as well.
+ This can be accomplished using the normal citation command.
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+The first paragraph of this document includes a citation.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+The complete list of references may also be printed automatically by using
+
+\family sans
+Insert\SpecialChar \menuseparator
+Lists/TOC\SpecialChar \menuseparator
+BibTeX
+\begin_inset space ~
+\end_inset
+
+Bibliography
+\family default
+ (see the end of this document for an example.) If you do not want to print
+ a bibliography at the end of your document, use the LaTeX command
+\family typewriter
+
+\backslash
+nobibliography
+\family default
+ in its place.
+\end_layout
+
+\begin_layout Section
+Figures and Tables
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:figures-and-tables"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Images and graphics play an integral role in Tufte's work.
+ In addition to the standard
+\emph on
+figure
+\emph default
+ and
+\emph on
+tabular
+\emph default
+ floats, this class provides special figure and table environments for full-widt
+h floats.
+\end_layout
+
+\begin_layout Standard
+Full page width figures and tables can be produced by using figure or table
+ floats and clicking
+\emph on
+Span Columns
+\emph default
+ in the float dialog.
+ To place figures or tables in the margin, use the
+\emph on
+MarginFigure
+\emph default
+ or
+\emph on
+MarginTable
+\emph default
+ floats (see figure
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "fig:marginfig"
+
+\end_inset
+
+).
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Note: unfortunately, the counting inside the LyX view is wrong.
+ Margin floats and normal floats are counted differently, whereas the use
+ the same counter in the output.
+\end_layout
+
+\end_inset
+
+
+\begin_inset Float marginfigure
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+width "100line%"
+special "none"
+height "1in"
+height_special "totalheight"
+status open
+
+\begin_layout Plain Layout
+\align center
+replace the box by your figure!
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset Caption
+
+\begin_layout Plain Layout
+This is a margin figure.
+ The figure will be put in the margin.
+\begin_inset CommandInset label
+LatexCommand label
+name "fig:marginfig"
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Figure
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "fig:fullfig"
+
+\end_inset
+
+ is an example of the wide figure float and figure
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "fig:textfig"
+
+\end_inset
+
+ is an example of the normal figure float.
+
+\begin_inset Float figure
+wide true
+sideways false
+status open
+
+\begin_layout Plain Layout
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+width "100line%"
+special "none"
+height "1in"
+height_special "totalheight"
+status open
+
+\begin_layout Plain Layout
+\align center
+replace the box by your figure!
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset Caption
+
+\begin_layout Plain Layout
+This is a wide figure (
+\emph on
+span columns
+\emph default
+).
+
+\emph on
+Notice that this figure takes up the full page width.
+\emph default
+
+\begin_inset CommandInset label
+LatexCommand label
+name "fig:fullfig"
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset Float figure
+placement h
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+\begin_inset Box Boxed
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+width "100line%"
+special "none"
+height "1in"
+height_special "totalheight"
+status open
+
+\begin_layout Plain Layout
+\align center
+replace the box by your figure!
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset Caption
+
+\begin_layout Plain Layout
+This is a normal figure.
+
+\emph on
+Notice that this figure only takes up the main textblock width.
+\emph default
+
+\begin_inset CommandInset label
+LatexCommand label
+name "fig:textfig"
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Table
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "tab:normaltab"
+
+\end_inset
+
+ shows a table created with the
+\family typewriter
+booktabs
+\family default
+ package (this is border style
+\begin_inset Quotes eld
+\end_inset
+
+formal
+\begin_inset Quotes erd
+\end_inset
+
+ in the tabular dialog).
+ Notice the lack of vertical rules---they serve only to clutter the table's
+ data.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Float table
+placement ht
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+centering
+\end_layout
+
+\end_inset
+
+
+\begin_inset Tabular
+
+
+
+
+
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+Margin
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+Length
+\end_layout
+
+\end_inset
+ |
+
+
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+Paper width
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+unit
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+[
+\end_layout
+
+\end_inset
+
+8
+\begin_inset Formula $\nicefrac{1}{2}$
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+]
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+{
+\end_layout
+
+\end_inset
+
+inches
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+Paper height
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+unit
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+[
+\end_layout
+
+\end_inset
+
+11
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+]
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+{
+\end_layout
+
+\end_inset
+
+inches
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+Textblock width
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+unit
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+[
+\end_layout
+
+\end_inset
+
+6
+\begin_inset Formula $\nicefrac{1}{2}$
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+]
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+{
+\end_layout
+
+\end_inset
+
+inches
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+Textblock/sidenote gutter
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+unit
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+[
+\end_layout
+
+\end_inset
+
+
+\begin_inset Formula $\nicefrac{3}{8}$
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+]
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+{
+\end_layout
+
+\end_inset
+
+inches
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+Sidenote width
+\end_layout
+
+\end_inset
+ |
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+unit
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+[
+\end_layout
+
+\end_inset
+
+2
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+]
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+{
+\end_layout
+
+\end_inset
+
+inches
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+ |
+
+
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset Caption
+
+\begin_layout Plain Layout
+Here are the dimensions of the various margins used in the
+\emph on
+Tufte-handout
+\emph default
+ class.
+\begin_inset CommandInset label
+LatexCommand label
+name "tab:normaltab"
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Section
+Full-width text blocks
+\end_layout
+
+\begin_layout Standard
+In addition to the new float types, there is a
+\emph on
+Full Width
+\emph default
+ environment that stretches across the main text block and the sidenotes
+ area and ragged left:
+\end_layout
+
+\begin_layout Full Width
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+ Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis.
+ Curabitur dictum gravida mauris.
+ Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna.
+ Donec vehicula augue eu neque.
+ Pellentesque habitant morbi tristique senectus et netus et malesuada fames
+ ac turpis egestas.
+ Mauris ut leo.
+ Cras viverra metus rhoncus sem.
+ Nulla et lectus vestibulum urna fringilla ultrices.
+ Phasellus eu tellus sit amet tortor gravida placerat.
+ Integer sapien est, iaculis in, pretium quis, viverra ac, nunc.
+ Praesent eget sem vel leo ultrices bibendum.
+ Aenean faucibus.
+ Morbi dolor nulla, malesuada eu, pulvinar at, mollis ac, nulla.
+ Curabitur auctor semper nulla.
+ Donec varius orci eget risus.
+ Duis nibh mi, congue eu, accumsan eleifend, sagittis quis, diam.
+ Duis eget orci sit amet orci dignissim rutrum.
+
+\end_layout
+
+\begin_layout Section
+Typography
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:typography"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Subsection
+Typefaces
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:typefaces"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+If the
+\emph on
+Palatino
+\emph default
+ and
+\emph on
+Bera Mono
+\emph default
+ typefaces are installed, this style will use them automatically.
+ Otherwise, we'll fall back on the
+\emph on
+Computer Modern
+\emph default
+ typefaces.
+\end_layout
+
+\begin_layout Subsection
+Letterspacing
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:letterspacing"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+This document class includes two new character styles and some improvements
+ on existing commands for letterspacing.
+\end_layout
+
+\begin_layout Standard
+When setting strings of
+\begin_inset Flex AllCaps
+status open
+
+\begin_layout Plain Layout
+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 Section
+Customization
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:customization"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Subsection
+Document class options
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:options"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+The
+\family sans
+tufte-handout
+\family default
+ class is based on the
+\family sans
+article
+\family default
+ document class.
+ Therefore, you can pass any of the typical article options.
+ There are a few options that are specific to the
+\family sans
+tufte-handout
+\family default
+ document class, however.
+\end_layout
+
+\begin_layout Itemize
+The
+\emph on
+a4paper
+\emph default
+ option will set the paper size to A4 instead of the default US letter size.
+\end_layout
+
+\begin_layout Itemize
+The
+\emph on
+sfsidenotes
+\emph default
+ option will set the sidenotes in a
+\family sans
+sans serif
+\family default
+ typeface instead of the default roman.
+\end_layout
+
+\begin_layout Itemize
+The
+\emph on
+twoside
+\emph default
+ option will modify the running heads so that the page number is printed
+ on the outside edge (as opposed to always printing the page number on the
+ right-side edge in
+\emph on
+oneside
+\emph default
+ mode).
+\end_layout
+
+\begin_layout Itemize
+The
+\emph on
+symmetric
+\emph default
+ option typesets the sidenotes on the outside edge of the page.
+ This is how books are traditionally printed, but is contrary to Tufte's
+ book design which sets the sidenotes on the right side of the page.
+ This option implicitly sets the
+\emph on
+twoside
+\emph default
+ option.
+\end_layout
+
+\begin_layout Itemize
+The
+\emph on
+justified
+\emph default
+ option sets all the text fully justified (flush left and right).
+ The default is to set the text ragged right.
+ The body text of Tufte's books are set ragged right.
+ This prevents needless hyphenation and makes it easier to read the text
+ in the slightly narrower column.
+\end_layout
+
+\begin_layout Subsection
+Defining new sections
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:defining-sections"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+As mentioned on page
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand pageref
+reference "sec:headings"
+
+\end_inset
+
+, the
+\family sans
+tufte-handout
+\family default
+ document class only defines
+\emph on
+section
+\emph default
+ and
+\emph on
+subsection
+\emph default
+ headings.
+\end_layout
+
+\begin_layout Standard
+If you wanted to define, say, a
+\emph on
+paragraph
+\emph default
+ heading, you could do it as follows:
+\end_layout
+
+\begin_layout LyX-Code
+
+\backslash
+makeatletter
+\end_layout
+
+\begin_layout LyX-Code
+
+\backslash
+renewcommand
+\backslash
+paragraph{%
+\end_layout
+
+\begin_layout LyX-Code
+
+\backslash
+@startsection{paragraph}% the name of the new section
+\end_layout
+
+\begin_layout LyX-Code
+{4}% the section level number
+\end_layout
+
+\begin_layout LyX-Code
+{0em}% indentation amount
+\end_layout
+
+\begin_layout LyX-Code
+{
+\backslash
+baselineskip}% amount of space to leave before heading
+\end_layout
+
+\begin_layout LyX-Code
+{-1.5em}% amount of space to leave after heading
+\end_layout
+
+\begin_layout LyX-Code
+{
+\backslash
+normalfont
+\backslash
+itshape}% style
+\end_layout
+
+\begin_layout LyX-Code
+}
+\end_layout
+
+\begin_layout LyX-Code
+
+\backslash
+makeatother
+\end_layout
+
+\begin_layout Standard
+Place that code in
+\family sans
+Document\SpecialChar \menuseparator
+Settings\SpecialChar \menuseparator
+Preamble
+\family default
+ and you'll now be able to use
+\family typewriter
+
+\backslash
+paragraph
+\family default
+ in LaTeX mode.
+\end_layout
+
+\begin_layout Standard
+For more details on defining section levels, see
+\shape italic
+The LaTeX
+\begin_inset space \space{}
+\end_inset
+
+Companion
+\shape default
+,
+\begin_inset CommandInset citation
+LatexCommand cite
+key "Mittelbach2004"
+
+\end_inset
+
+ or use the
+\emph on
+titlesec
+\emph default
+ package.
+\end_layout
+
+\begin_layout Section
+Support
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:support"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Subsection
+Package Dependencies
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:dependencies"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+The following is a list of packages that the
+\family sans
+tufte-handout
+\family default
+ document class relies upon.
+ Packages marked with an asterisk are optional.
+\end_layout
+
+\begin_layout Itemize
+geometry
+\end_layout
+
+\begin_layout Itemize
+ragged2e
+\end_layout
+
+\begin_layout Itemize
+chngpage
+\end_layout
+
+\begin_layout Itemize
+paralist
+\end_layout
+
+\begin_layout Itemize
+textcase
+\end_layout
+
+\begin_layout Itemize
+footmisc
+\end_layout
+
+\begin_layout Itemize
+natbib and bibentry
+\end_layout
+
+\begin_layout Itemize
+placeins
+\end_layout
+
+\begin_layout Itemize
+caption
+\end_layout
+
+\begin_layout Itemize
+fancyhdr
+\end_layout
+
+\begin_layout Itemize
+microtype*
+\end_layout
+
+\begin_layout Itemize
+soul*
+\end_layout
+
+\begin_layout Itemize
+palatino*
+\end_layout
+
+\begin_layout Itemize
+beramono*
+\end_layout
+
+\begin_layout Subsection
+Tufte-LaTeX
+\begin_inset space \space{}
+\end_inset
+
+Website
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:website"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+The website for the Tufte-LaTeX
+\begin_inset space \space{}
+\end_inset
+
+packages is located at
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://code.google.com/p/tufte-latex/
+\end_layout
+
+\end_inset
+
+.
+ On our website, you'll find links to our
+\begin_inset Flex SmallCaps
+status open
+
+\begin_layout Plain Layout
+svn
+\end_layout
+
+\end_inset
+
+ repository, mailing lists, bug tracker, and documentation.
+\end_layout
+
+\begin_layout Standard
+\begin_inset CommandInset bibtex
+LatexCommand bibtex
+bibfiles "biblioExample"
+options "plainnat"
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout
index 59059f2cf7..5be0fc6f1b 100644
--- a/lib/layouts/tufte-book.layout
+++ b/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
- CopyStyle Sidenote
- Decoration Conglomerate
- LatexName newthought
- LabelString "new thought"
- Font
- Shape SmallCaps
- EndFont
+InsetLayout SmallCaps
+ CopyStyle NewThought
+ LatexName smallcaps
+ LabelString "smallcaps"
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
diff --git a/lib/layouts/tufte-handout.layout b/lib/layouts/tufte-handout.layout
new file mode 100644
index 0000000000..879a31b740
--- /dev/null
+++ b/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 , 2008/10/22
+# Modified by Uwe Stöhr , 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
\ No newline at end of file