From 1323e9a4cf3cbe812214f91842b2295f56c0786b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Tue, 3 Nov 2009 21:12:59 +0000 Subject: [PATCH] - tufte-book.lyx, tufte-handout.lyx: remove unneeded note about hyperref - tufte-book.layout: fix warnings about the counter definition - tufte-handout.lyx: replace ERT by LyX code - German tufte-handout.lyx: set EOL style (please don't forget this when adding new textfiles to SVN) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31856 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/examples/de/tufte-handout.lyx | 304 +-------------------------- lib/examples/tufte-book.lyx | 33 +-- lib/examples/tufte-handout.lyx | 332 +----------------------------- lib/layouts/tufte-book.layout | 7 +- 4 files changed, 18 insertions(+), 658 deletions(-) diff --git a/lib/examples/de/tufte-handout.lyx b/lib/examples/de/tufte-handout.lyx index d3b45fccc6..116beaf0ec 100644 --- a/lib/examples/de/tufte-handout.lyx +++ b/lib/examples/de/tufte-handout.lyx @@ -22,7 +22,7 @@ \papersize default \use_geometry true \use_amsmath 1 -\use_esint 0 +\use_esint 1 \cite_engine basic \use_bibtopic false \paperorientation portrait @@ -737,20 +737,7 @@ sideways false status open \begin_layout Plain Layout - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -centering -\end_layout - -\end_inset - - +\align center \begin_inset Tabular @@ -790,64 +777,7 @@ Papierbreite \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 - +\begin_inset Formula $\unit[8\nicefrac{1}{2}]{inches}$ \end_inset @@ -870,63 +800,10 @@ Paperhöhe \begin_inset Text \begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -unit -\end_layout - +\begin_inset Formula $\unit[11]{inches}$ \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 @@ -946,64 +823,7 @@ Textbreite \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 - +\begin_inset Formula $\unit[6\nicefrac{1}{2}]{inches}$ \end_inset @@ -1026,67 +846,10 @@ Abstand Textblock/Randnotiz \begin_inset Text \begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -unit -\end_layout - +\begin_inset Formula $\unit[\nicefrac{3}{8}]{inches}$ \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 @@ -1106,63 +869,10 @@ Randnotiz \begin_inset Text \begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -unit -\end_layout - +\begin_inset Formula $\unit[2]{inches}$ \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 diff --git a/lib/examples/tufte-book.lyx b/lib/examples/tufte-book.lyx index 5fc7dd1717..ba870f0e83 100644 --- a/lib/examples/tufte-book.lyx +++ b/lib/examples/tufte-book.lyx @@ -42,37 +42,6 @@ \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 Tufte Examples \end_layout @@ -787,7 +756,7 @@ nobibliography \end_layout \begin_layout Chapter -Calculation of Volume: Sections 2.12--2.13 +Calculation of Volume: Sections 2.12–2.13 \end_layout \begin_layout Abstract diff --git a/lib/examples/tufte-handout.lyx b/lib/examples/tufte-handout.lyx index 47dbfd5b3a..aa7e8aa14e 100644 --- a/lib/examples/tufte-handout.lyx +++ b/lib/examples/tufte-handout.lyx @@ -22,7 +22,7 @@ \papersize default \use_geometry true \use_amsmath 1 -\use_esint 0 +\use_esint 1 \cite_engine basic \use_bibtopic false \paperorientation portrait @@ -46,34 +46,6 @@ \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 @@ -754,20 +726,7 @@ sideways false status open \begin_layout Plain Layout - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -centering -\end_layout - -\end_inset - - +\align center \begin_inset Tabular @@ -807,64 +766,7 @@ Paper width \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 - +\begin_inset Formula $\unit[8\nicefrac{1}{2}]{inches}$ \end_inset @@ -887,63 +789,10 @@ Paper height \begin_inset Text \begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -unit -\end_layout - +\begin_inset Formula $\unit[11]{inches}$ \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 @@ -963,64 +812,7 @@ Textblock width \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 - +\begin_inset Formula $\unit[6\nicefrac{1}{2}]{inches}$ \end_inset @@ -1043,67 +835,10 @@ Textblock/sidenote gutter \begin_inset Text \begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -unit -\end_layout - +\begin_inset Formula $\unit[\nicefrac{3}{8}]{inches}$ \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 @@ -1123,63 +858,10 @@ Sidenote width \begin_inset Text \begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -unit -\end_layout - +\begin_inset Formula $\unit[2]{inches}$ \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 diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout index 6947bde9d8..cca4dff993 100644 --- a/lib/layouts/tufte-book.layout +++ b/lib/layouts/tufte-book.layout @@ -117,11 +117,10 @@ Style Full_Width End # this steps the counters -Counter - Name marginfigure +Counter marginfigure End -Counter - Name margintable + +Counter margintable End # define the floats