From 4df078c262eabfaf0b9632a76f3160220591d3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Sun, 28 Aug 2011 16:53:56 +0000
Subject: [PATCH] - tufte-book.layout: fix a lyX warning about uninitialized
 counter - tufte example files: add important notes that float placements
 options are not allowed and remove unreferenced labels

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39551 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/examples/tufte-book.lyx    |  34 ++++++++++
 lib/examples/tufte-handout.lyx | 111 ++++++++++-----------------------
 lib/layouts/tufte-book.layout  |   1 -
 status.20x                     |   3 +
 4 files changed, 71 insertions(+), 78 deletions(-)

diff --git a/lib/examples/tufte-book.lyx b/lib/examples/tufte-book.lyx
index a818029314..a009b4c724 100644
--- a/lib/examples/tufte-book.lyx
+++ b/lib/examples/tufte-book.lyx
@@ -48,6 +48,7 @@
 \paperorientation portrait
 \suppress_date false
 \use_refstyle 0
+\notefontcolor #0000ff
 \index Index
 \shortcut idx
 \color #008000
@@ -378,6 +379,13 @@ reference "fig:margin-figure"
 .
 \end_layout
 
+\begin_layout Standard
+\begin_inset VSpace 5theight%
+\end_inset
+
+
+\end_layout
+
 \begin_layout Standard
 \begin_inset Float marginfigure
 wide false
@@ -427,6 +435,32 @@ name "fig:margin-figure"
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ If you are using margin figures or tables you must use the default float
+ placement option in the document settings under 
+\family sans
+Float
+\begin_inset space ~
+\end_inset
+
+Placement
+\family default
+.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/examples/tufte-handout.lyx b/lib/examples/tufte-handout.lyx
index e8ef1a5a08..5e412ec08b 100644
--- a/lib/examples/tufte-handout.lyx
+++ b/lib/examples/tufte-handout.lyx
@@ -48,6 +48,7 @@
 \paperorientation portrait
 \suppress_date false
 \use_refstyle 0
+\notefontcolor #0000ff
 \index Index
 \shortcut idx
 \color #008000
@@ -203,13 +204,6 @@ First part
 
 \begin_layout Section
 Page Layout
-\begin_inset CommandInset label
-LatexCommand label
-name "sec:page-layout"
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Subsection
@@ -343,13 +337,6 @@ NewThought
 
 \begin_layout Subsection
 Sidenotes
-\begin_inset CommandInset label
-LatexCommand label
-name "sec:sidenotes"
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -480,13 +467,6 @@ nobibliography
 
 \begin_layout Section
 Figures and Tables
-\begin_inset CommandInset label
-LatexCommand label
-name "sec:figures-and-tables"
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -594,6 +574,32 @@ name "fig:marginfig"
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ If you are using margin figures or tables you must use the default float
+ placement option in the document settings under 
+\family sans
+Float
+\begin_inset space ~
+\end_inset
+
+Placement
+\family default
+.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -681,6 +687,13 @@ name "fig:fullfig"
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+\begin_inset VSpace 6theight%
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -997,24 +1010,10 @@ Second part
 
 \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
@@ -1036,13 +1035,6 @@ Computer Modern
 
 \begin_layout Subsection
 Letterspacing
-\begin_inset CommandInset label
-LatexCommand label
-name "sec:letterspacing"
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -1138,24 +1130,10 @@ The Initial Letters Of The Words In This Sentence Are Capitalized.
 
 \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
@@ -1380,24 +1358,10 @@ titlesec
 
 \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
@@ -1471,13 +1435,6 @@ Tufte-LaTeX
 \end_inset
 
 Website
-\begin_inset CommandInset label
-LatexCommand label
-name "sec:website"
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout
index 2e3f7a83b0..8df0b13944 100644
--- a/lib/layouts/tufte-book.layout
+++ b/lib/layouts/tufte-book.layout
@@ -47,7 +47,6 @@ NoStyle Abstract
 NoStyle Chapter
 NoCounter chapter
 NoStyle Section
-NoCounter section
 NoStyle Subsection
 NoCounter subsection
 NoStyle Subsubsection
diff --git a/status.20x b/status.20x
index 1e3e73283e..4088daedfd 100644
--- a/status.20x
+++ b/status.20x
@@ -311,6 +311,9 @@ What's new
 
 - Corrected links in the bibliography of the UserGuide.
 
+- Modified tufte example files so that the floats don't overlap each other;
+  added note that float placement options are not allowed for margin floats.
+
 
 * BUILD/INSTALLATION