X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Ftemplates%2Fthesis%2Fthesis.lyx;h=82f26ac7990f3d990a2d3c6d9118cfd37f321b08;hb=99f84aab9515ff7a3da6fdd0ad6e4ac9395b6e8d;hp=4c9d567473b2b7e3ad7a70393ac77018fc33f97f;hpb=4bdd8fef50d9377dcb627c309faf6dad5a1af8e1;p=lyx.git

diff --git a/lib/templates/thesis/thesis.lyx b/lib/templates/thesis/thesis.lyx
index 4c9d567473..82f26ac799 100644
--- a/lib/templates/thesis/thesis.lyx
+++ b/lib/templates/thesis/thesis.lyx
@@ -1,18 +1,16 @@
-#LyX 1.6.6svn created this file. For more info see http://www.lyx.org/
-\lyxformat 345
+#LyX 2.0 created this file. For more info see http://www.lyx.org/
+\lyxformat 413
 \begin_document
 \begin_header
 \textclass scrbook
 \begin_preamble
-% print no date
-\date{}
-
-% increase link area for cross-references and autoname them
+% increases link area for cross-references and autoname them
+% if you change the document language to e.g. French
+% you must change "extrasenglish" to "extrasfrench"
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
-\newlength{\abc}
-\settowidth{\abc}{\space}
-\addto\extrasenglish{
- \renewcommand{\equationautorefname}{\hspace{-\abc}}
+\@ifundefined{extrasenglish}{\usepackage[english]{babel}}{}
+\addto\extrasenglish{%
+ \renewcommand*{\equationautorefname}[1]{}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}
@@ -20,8 +18,8 @@
  \renewcommand{\tableautorefname}{Tab.\negthinspace}
 }
 
-% in case somebody want to have the label "equation"
-%\renewcommand{\eqref}[1]{equation~(\negthinspace\autoref{#1})}
+% in case somebody want to have the label "Equation"
+%\renewcommand{\eqref}[1]{Equation~(\negthinspace\autoref{#1})}
 
 % that links to image floats jumps to the beginning
 % of the float and not to its caption
@@ -36,45 +34,48 @@
   \myTOC
   \mainmatter }
 
-% make caption labels bold
+% makes caption labels bold
 \setkomafont{captionlabel}{\bfseries}
 \setcapindent{1em}
 
-% enable calculations
+% enables calculations
 \usepackage{calc}
 
 % fancy page header/footer settings
 \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}
 \renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}}
-%\lhead[\fancyplain{}{}]{\fancyplain{}{\rightmark}}
-\rhead[\fancyplain{}{\leftmark}]{\fancyplain{}{}}
-\lfoot[\thepage]{}
-\rfoot[]{\thepage}
-\cfoot{}
 
-% increase the bottom float placement fraction
+% increases the bottom float placement fraction
 \renewcommand{\bottomfraction}{0.5}
 
-% avoid that floats are placed above its sections
+% avoids that floats are placed above its sections
 \let\mySection\section\renewcommand{\section}{\suppressfloats[t]\mySection}
-
-% widen the space for the nomenclature entry labels
-\renewcommand{\nomlabelwidth}{2.5cm}
 \end_preamble
-\options intoc,bibtotoc,idxtotoc,BCOR10mm,titlepage,tablecaptionabove,fleqn
+\options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage,fleqn
 \use_default_options true
+\begin_modules
+customHeadersFooters
+\end_modules
+\maintain_unincluded_children false
 \language english
+\language_package default
 \inputencoding auto
+\fontencoding global
 \font_roman lmodern
 \font_sans lmss
 \font_typewriter lmtt
 \font_default_family default
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
 
 \graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
 \float_placement h
 \paperfontsize 12
 \spacing single
@@ -93,25 +94,43 @@
 \use_geometry false
 \use_amsmath 2
 \use_esint 1
+\use_mhchem 1
+\use_mathdots 1
 \cite_engine basic
 \use_bibtopic false
+\use_indices false
 \paperorientation portrait
+\suppress_date true
+\use_refstyle 0
 \branch chapter-1
 \selected 1
+\filename_suffix 0
 \color #ffaa00
 \end_branch
 \branch chapter-2
 \selected 1
+\filename_suffix 0
 \color #55aaff
 \end_branch
 \branch Summary
 \selected 1
+\filename_suffix 0
 \color #7f7f7f
 \end_branch
 \branch Acknowledgments
 \selected 1
+\filename_suffix 0
 \color #ffff00
 \end_branch
+\branch Appendix
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\index Index
+\shortcut idx
+\color #008000
+\end_index
 \secnumdepth 3
 \tocdepth 2
 \paragraph_separation skip
@@ -122,19 +141,58 @@
 \paperpagestyle fancy
 \tracking_changes false
 \output_changes false
-\author "" 
-\author "" 
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
 \end_header
 
 \begin_body
 
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ when renaming this file, you must also rename it in all its subdocuments
+ in the document settings under 
+\family sans
+Document
+\begin_inset space ~
+\end_inset
+
+Class\SpecialChar \menuseparator
+Select
+\begin_inset space ~
+\end_inset
+
+default
+\begin_inset space ~
+\end_inset
+
+master
+\begin_inset space ~
+\end_inset
+
+document
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Subject
 Thesis to get the degree of a doctor of philosophy
 \begin_inset Note Note
 status open
 
 \begin_layout Plain Layout
-Use the official terms and title page layout instead of this one!
+Use the official terms and title page layout of your university instead
+ of this one!
 \end_layout
 
 \end_inset
@@ -146,12 +204,16 @@ Use the official terms and title page layout instead of this one!
 Title of the thesis
 \end_layout
 
+\begin_layout Subtitle
+Subtitle (if you have one)
+\end_layout
+
 \begin_layout Author
 Your name
 \end_layout
 
 \begin_layout Date
-Date
+Date (optional)
 \end_layout
 
 \begin_layout Publishers
@@ -161,6 +223,7 @@ hor_pos "c"
 has_inner_box 1
 inner_pos "t"
 use_parbox 0
+use_makebox 0
 width "40col%"
 special "none"
 height "1in"
@@ -208,7 +271,11 @@ Faculty for leading edge science
 \begin_inset Newline newline
 \end_inset
 
-Institute for nobel price winning research
+Institute for 
+\noun on
+Nobel
+\noun default
+ price winning research
 \begin_inset VSpace -3cm
 \end_inset
 
@@ -296,7 +363,7 @@ Dedication, cite from a famous person, or whatever you like (optional)
 
 \end_layout
 
-\begin_layout Standard
+\begin_layout Left Header
 \begin_inset ERT
 status collapsed
 
@@ -304,23 +371,97 @@ status collapsed
 
 
 \backslash
-lhead[
-\backslash
-fancyplain{}{}]{
+rightmark
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+defines the header line
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Right Header
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
 \backslash
-fancyplain{}{
+leftmark
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Left Footer
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
 \backslash
-rightmark}}
+thepage
 \end_layout
 
 \end_inset
 
 
-\begin_inset Note Note
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Center Footer
+
+\end_layout
+
+\begin_layout Right Footer
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
 status collapsed
 
 \begin_layout Plain Layout
-define a header line
+
+
+\backslash
+thepage
 \end_layout
 
 \end_inset
@@ -410,26 +551,56 @@ pagestyle{fancy}
 \end_inset
 
 
+\end_layout
+
+\begin_layout Left Header
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
 \begin_inset ERT
 status collapsed
 
 \begin_layout Plain Layout
 
 
-\backslash
-lhead[
-\backslash
-fancyplain{}{
 \backslash
 chaptername
+\end_layout
+
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
 \backslash
-;
-\backslash
-thechapter}]{
-\backslash
-fancyplain{}{
+thechapter
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
 \backslash
-rightmark}}
+rightmark
 \end_layout
 
 \end_inset
@@ -492,24 +663,17 @@ filename "chapter-2.lyx"
 
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
+\begin_layout Left Header
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
 
-
-\backslash
-lhead[
-\backslash
-fancyplain{}{}]{
-\backslash
-fancyplain{}{Acknowledgments}}
 \end_layout
 
 \end_inset
 
-
+Acknowledgments
 \begin_inset Note Note
 status collapsed
 
@@ -530,19 +694,12 @@ Acknowledgments
 
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
+\begin_layout Right Header
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-rhead[
-\backslash
-fancyplain{}{Acknowledgments}]{
-\backslash
-fancyplain{}{}}
+Acknowledgments
 \end_layout
 
 \end_inset
@@ -575,7 +732,7 @@ status open
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
-filename "Acknowledgements.lyx"
+filename "Acknowledgments.lyx"
 
 \end_inset
 
@@ -588,13 +745,53 @@ filename "Acknowledgements.lyx"
 \end_layout
 
 \begin_layout Standard
-\begin_inset Newpage cleardoublepage
+\begin_inset Branch Appendix
+status open
+
+\begin_layout Standard
+\start_of_appendix
+\begin_inset CommandInset include
+LatexCommand include
+filename "Appendix.lyx"
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Appendix is of course optional
+\end_layout
+
 \end_inset
 
 
 \end_layout
 
 \begin_layout Standard
+\begin_inset Newpage cleardoublepage
+\end_inset
+
+
+\end_layout
+
+\begin_layout Left Header
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+
+
 \begin_inset ERT
 status collapsed
 
@@ -602,13 +799,7 @@ status collapsed
 
 
 \backslash
-lhead[
-\backslash
-fancyplain{}{}]{
-\backslash
-fancyplain{}{
-\backslash
-rightmark}}
+rightmark
 \end_layout
 
 \end_inset
@@ -626,7 +817,11 @@ remove the chapter from the header line
 
 \end_layout
 
-\begin_layout Standard
+\begin_layout Right Header
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
 \begin_inset ERT
 status collapsed
 
@@ -634,13 +829,12 @@ status collapsed
 
 
 \backslash
-rhead[
-\backslash
-fancyplain{}{
-\backslash
-leftmark}]{
-\backslash
-fancyplain{}{}}
+leftmark
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \end_inset
@@ -676,35 +870,17 @@ options "alpha"
 
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-lhead[
-\backslash
-fancyplain{}{}]{
-\backslash
-fancyplain{}{Nomenclature}}
-\end_layout
+\begin_layout Left Header
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
 
-
-\backslash
-rhead[
-\backslash
-fancyplain{}{Nomenclature}]{
-\backslash
-fancyplain{}{}}
 \end_layout
 
 \end_inset
 
-
+Nomenclature
 \begin_inset Note Note
 status collapsed
 
@@ -723,11 +899,37 @@ Nomenclature
 \end_inset
 
 
+\end_layout
+
+\begin_layout Right Header
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+Nomenclature
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
 \begin_inset CommandInset nomencl_print
 LatexCommand printnomenclature
+set_width "custom"
+width "2.5cm"
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+The width of the nomenclature entries can be changed by clicking on the
+ nomenclature inset.
+\end_layout
 
 \end_inset