From 4d0678b4a07ca3d3756381787c77a695680cea00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Wed, 11 Nov 2009 03:09:54 +0000 Subject: [PATCH] tufte layout files: - correct appearance of section environments in LyX: also non-starred sections don't have a number in tufte - use the new nohyper document class option, this way the user has full access to the PDF appearance via our PDF properties settings (thanks to the tufte developer for implementing this) This can first go to branch when the new tufte version will be released - this release will definitively happen before LyX 1.7 therefore I think it's safe to commit to trunk. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31942 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/examples/tufte-book.lyx | 11 +++++- lib/examples/tufte-handout.lyx | 55 +++++++++++++++----------- lib/layouts/tufte-book.layout | 66 +++++++++++++++++++++++++++++++- lib/layouts/tufte-handout.layout | 55 +++++++++++++++++++++++++- 4 files changed, 161 insertions(+), 26 deletions(-) diff --git a/lib/examples/tufte-book.lyx b/lib/examples/tufte-book.lyx index ba870f0e83..4efa1db69d 100644 --- a/lib/examples/tufte-book.lyx +++ b/lib/examples/tufte-book.lyx @@ -18,7 +18,16 @@ \graphics default \paperfontsize default \spacing single -\use_hyperref false +\use_hyperref true +\pdf_bookmarks true +\pdf_bookmarksnumbered false +\pdf_bookmarksopen true +\pdf_bookmarksopenlevel 1 +\pdf_breaklinks false +\pdf_pdfborder true +\pdf_colorlinks false +\pdf_backref false +\pdf_pdfusetitle true \papersize default \use_geometry true \use_amsmath 1 diff --git a/lib/examples/tufte-handout.lyx b/lib/examples/tufte-handout.lyx index aa7e8aa14e..23b1695de3 100644 --- a/lib/examples/tufte-handout.lyx +++ b/lib/examples/tufte-handout.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \textclass tufte-handout -\use_default_options false +\use_default_options true \language english \inputencoding auto \font_roman default @@ -18,7 +18,16 @@ \graphics default \paperfontsize default \spacing single -\use_hyperref false +\use_hyperref true +\pdf_bookmarks true +\pdf_bookmarksnumbered true +\pdf_bookmarksopen true +\pdf_bookmarksopenlevel 1 +\pdf_breaklinks true +\pdf_pdfborder true +\pdf_colorlinks false +\pdf_backref false +\pdf_pdfusetitle true \papersize default \use_geometry true \use_amsmath 1 @@ -146,11 +155,11 @@ tufte-handout document class and a style guide to its use. \end_layout -\begin_layout Part* +\begin_layout Part First part \end_layout -\begin_layout Section* +\begin_layout Section Page Layout \begin_inset CommandInset label LatexCommand label @@ -158,10 +167,10 @@ name "sec:page-layout" \end_inset - + \end_layout -\begin_layout Subsection* +\begin_layout Subsection Headings and paragraph design \begin_inset CommandInset label LatexCommand label @@ -169,7 +178,7 @@ name "sec:headings" \end_inset - + \end_layout \begin_layout Standard @@ -290,7 +299,7 @@ NewThought ). \end_layout -\begin_layout Subsection* +\begin_layout Subsection Sidenotes \begin_inset CommandInset label LatexCommand label @@ -298,7 +307,7 @@ name "sec:sidenotes" \end_inset - + \end_layout \begin_layout Standard @@ -378,7 +387,7 @@ This is a normal margin note. \end_layout -\begin_layout Subsection* +\begin_layout Subsection References \end_layout @@ -427,7 +436,7 @@ nobibliography the text. \end_layout -\begin_layout Section* +\begin_layout Section Figures and Tables \begin_inset CommandInset label LatexCommand label @@ -435,7 +444,7 @@ name "sec:figures-and-tables" \end_inset - + \end_layout \begin_layout Standard @@ -902,7 +911,7 @@ name "tab:normaltab" \end_layout -\begin_layout Section* +\begin_layout Section Full-width text blocks \end_layout @@ -937,11 +946,11 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis eget orci sit amet orci dignissim rutrum. \end_layout -\begin_layout Part* +\begin_layout Part Second part \end_layout -\begin_layout Section* +\begin_layout Section Typography \begin_inset CommandInset label LatexCommand label @@ -952,7 +961,7 @@ name "sec:typography" \end_layout -\begin_layout Subsection* +\begin_layout Subsection Typefaces \begin_inset CommandInset label LatexCommand label @@ -980,7 +989,7 @@ Computer Modern typefaces. \end_layout -\begin_layout Subsection* +\begin_layout Subsection Letterspacing \begin_inset CommandInset label LatexCommand label @@ -1082,7 +1091,7 @@ Small Caps The Initial Letters Of The Words In This Sentence Are Capitalized. \end_layout -\begin_layout Section* +\begin_layout Section Customization \begin_inset CommandInset label LatexCommand label @@ -1093,7 +1102,7 @@ name "sec:customization" \end_layout -\begin_layout Subsection* +\begin_layout Subsection Document class options \begin_inset CommandInset label LatexCommand label @@ -1183,7 +1192,7 @@ justified in the slightly narrower column. \end_layout -\begin_layout Subsection* +\begin_layout Subsection Defining new sections \begin_inset CommandInset label LatexCommand label @@ -1324,7 +1333,7 @@ titlesec package. \end_layout -\begin_layout Section* +\begin_layout Section Support \begin_inset CommandInset label LatexCommand label @@ -1335,7 +1344,7 @@ name "sec:support" \end_layout -\begin_layout Subsection* +\begin_layout Subsection Package Dependencies \begin_inset CommandInset label LatexCommand label @@ -1411,7 +1420,7 @@ palatino* beramono* \end_layout -\begin_layout Subsection* +\begin_layout Subsection Tufte-LaTeX \begin_inset space \space{} \end_inset diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout index cca4dff993..5afd10faeb 100644 --- a/lib/layouts/tufte-book.layout +++ b/lib/layouts/tufte-book.layout @@ -7,9 +7,12 @@ Format 11 Provides geometry 1 -Provides hyperref 1 Provides natbib-internal 1 +ClassOptions + Other nohyper +end + Style Standard Margin Static LatexType Paragraph @@ -25,6 +28,9 @@ End Input stdlayouts.inc Input book.layout +NoStyle Chapter +NoStyle Section +NoStyle Subsection NoStyle Subsubsection NoStyle Subsubsection* NoStyle Paragraph @@ -32,6 +38,64 @@ NoStyle Paragraph* NoStyle Subparagraph NoStyle Subparagraph* +Style Chapter + Margin Static + Category Section + LabelType None + LabelCounter chapter + TocLevel 0 + LatexType Command + LatexName chapter + NeedProtect 1 + NextNoIndent 1 + ParSkip 0.4 + TopSep 4 + BottomSep 0.8 + ParSep 0.8 + Align Block + OptionalArgs 1 + Font + Series Bold + Size Huge + EndFont +End + +Style Section + Category Section + Margin Dynamic + LabelType None + LabelCounter section + TocLevel 1 + LatexType Command + LatexName section + NeedProtect 1 + NextNoIndent 1 + LabelSep xxx + ParSkip 0.4 + TopSep 1.3 + BottomSep 0.7 + ParSep 0.7 + Align Block + OptionalArgs 1 + Font + Series Bold + Size Larger + EndFont +End + +Style Subsection + CopyStyle Section + TocLevel 2 + LatexName subsection + TopSep 0.9 + BottomSep 0.5 + ParSep 0.5 + Font + Series Bold + Size Large + EndFont +End + InsetLayout Sidenote LyxType custom LatexType command diff --git a/lib/layouts/tufte-handout.layout b/lib/layouts/tufte-handout.layout index 7ba8d347c7..d21f8dc23b 100644 --- a/lib/layouts/tufte-handout.layout +++ b/lib/layouts/tufte-handout.layout @@ -8,5 +8,58 @@ Format 11 # import other layouts Input stdlayouts.inc -Input tufte-book.layout Input article.layout +Input tufte-book.layout + +NoStyle Part +NoStyle Chapter +NoStyle Chapter* + +Style Part + Category Section + Margin Dynamic + LabelType None + TocLevel 0 + LabelCounter part + LatexType Command + LatexName part + NeedProtect 1 + NextNoIndent 1 + Labelsep xxx + ParSkip 0.4 + TopSep 4 + BottomSep 4 + ParSep 0.8 + Align Center + Alignpossible Center + Font + Series Bold + Size Huge + EndFont +End + +Style Abstract + Margin Static + LatexType Environment + LatexName abstract + Category FrontMatter + NextNoIndent 1 + LeftMargin MMM + RightMargin MMM + ParIndent MM + ItemSep 0 + TopSep 0.7 + BottomSep 0.7 + ParSep 0 + Align Block + LabelType Centered_Top_Environment + LabelString "Abstract" + LabelBottomSep 0.5 + Font + Size Small + EndFont + LabelFont + Series Bold + Size Large + EndFont +End