Merge remote-tracking branch 'origin/master' into features/latexargs

[lyx.git] / lib / templates / thesis / thesis.lyx

diff --git a/lib/templates/thesis/thesis.lyx b/lib/templates/thesis/thesis.lyx
index 1727983d17cb1d40a1499fdc55214d551d44243e..82f26ac7990f3d990a2d3c6d9118cfd37f321b08 100644 (file)
--- a/lib/templates/thesis/thesis.lyx
+++ b/lib/templates/thesis/thesis.lyx
@@ -4,23 +4,22 @@
 \begin_header
 \textclass scrbook
 \begin_preamble
-% 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}
-\AtBeginDocument{%
-\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}
  \renewcommand{\figureautorefname}{Fig.\negthinspace}
  \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
@@ -35,21 +34,21 @@
   \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}}
 
-% 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}
 \end_preamble
 \options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage,fleqn
@@ -149,13 +148,51 @@ customHeadersFooters
 
 \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
@@ -407,6 +444,16 @@ thepage
 \end_layout
 
 \begin_layout Right Footer
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+
+
 \begin_inset ERT
 status collapsed
 
@@ -702,6 +749,7 @@ filename "Acknowledgments.lyx"
 status open
 
 \begin_layout Standard
+\start_of_appendix
 \begin_inset CommandInset include
 LatexCommand include
 filename "Appendix.lyx"