thesis files: port fixes from branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40737 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/templates/thesis/Appendix.lyx b/lib/templates/thesis/Appendix.lyx
index 7f2d8269e501647dc0cbb671ed7dc8a1161fabf1..6016557c3348cc7decbbdc17a6d828f5a9ec3a81 100644 (file)
--- a/lib/templates/thesis/Appendix.lyx
+++ b/lib/templates/thesis/Appendix.lyx
@@ -4,30 +4,26 @@
 \begin_header
 \textclass scrbook
 \begin_preamble
-% Linkfläche für Querverweise vergrößern und automatisch benenne
+% increases link area for cross-references and autoname them
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
-\newlength{\abc}
-\settowidth{\abc}{\space}
-\AtBeginDocument{%
-\addto\extrasngerman{
- \renewcommand{\equationautorefname}{\hspace{-\abc}}
- \renewcommand{\sectionautorefname}{Kap.\negthinspace}
- \renewcommand{\subsectionautorefname}{Kap.\negthinspace}
- \renewcommand{\subsubsectionautorefname}{Kap.\negthinspace}
- \renewcommand{\figureautorefname}{Abb.\negthinspace}
+\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}
 }
-}
 
-% für den Fall, dass jemand die Bezeichnung "Gleichung" haben will
-%\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})}
+% in case somebody want to have the label "Equation"
+%\renewcommand{\eqref}[1]{Equation~(\negthinspace\autoref{#1})}
 
-% Setzt den Link für Sprünge zu Gleitabbildungen
-% auf den Anfang des Gelitobjekts und nicht aufs Ende
+% that links to image floats jumps to the beginning
+% of the float and not to its caption
 \usepackage[figure]{hypcap}
 
-% Die Seiten des Inhaltsverzeichnisses werden römisch numeriert,
-% ein PDF-Lesezeichen für das Inhaltsverzeichnis wird hinzugefügt
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
 \let\myTOC\tableofcontents
 \renewcommand\tableofcontents{%
   \frontmatter
@@ -35,22 +31,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}}
 
-%Vergrößert den Teil der Seite, in dem Gleitobjekte
-% unten angeordnet werden dürfen
+% increases the bottom float placement fraction
 \renewcommand{\bottomfraction}{0.5}
 
-% Vermeidet, dass Gleitobjekte vor ihrem Abschnitt gedruckt werden
+% 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

diff --git a/lib/templates/thesis/Summary.lyx b/lib/templates/thesis/Summary.lyx
index 0d912ce1a16d20d7d8046d0613fa23895dbc3ac5..3b6c654f3689c4305c5180d647f5ccc90fa3ca77 100644 (file)
--- a/lib/templates/thesis/Summary.lyx
+++ b/lib/templates/thesis/Summary.lyx
@@ -4,10 +4,10 @@
 \begin_header
 \textclass scrbook
 \begin_preamble
-% enable calculations
+% enables calculations
 \usepackage{calc}
 
-% increase the bottom float placement fraction
+% increases the bottom float placement fraction
 \renewcommand{\bottomfraction}{0.5}
 \end_preamble
 \options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage,fleqn

diff --git a/lib/templates/thesis/chapter-1.lyx b/lib/templates/thesis/chapter-1.lyx
index 9e61f99cfa6c9adbb4ca7bebd6224c22081188bd..52248f95b45152bf9a8e9f345428ed266fe98c46 100644 (file)
--- a/lib/templates/thesis/chapter-1.lyx
+++ b/lib/templates/thesis/chapter-1.lyx
@@ -4,26 +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
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
-\newlength{\abc}
-\settowidth{\abc}{\space}
-\AtBeginDocument{%
-\addto\extrasenglish{
- \renewcommand{\equationautorefname}{\hspace{-\abc}}
+\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 "Gleichung"
-%\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})}
+% in case somebody want to have the label "Equation"
+%\renewcommand{\eqref}[1]{Equation~(\negthinspace\autoref{#1})}
 
-% put the link to figure floats to the beginning
-% of the figure and not to its end
+% that links to image floats jumps to the beginning
+% of the float and not to its caption
 \usepackage[figure]{hypcap}
 
 % the pages of the TOC is numbered roman
@@ -35,21 +31,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
@@ -286,11 +282,18 @@ Overview
 \end_layout
 
 \begin_layout Standard
-bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla
- bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla
+bla bla bla bla bla bla bla bla bla bla bla, see 
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:The-next-section"
+
+\end_inset
+
+.
+ Bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla
  bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla
  bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla
- bla bla bla bla DLC-coatings
+ bla bla bla bla bla bla bla bla bla bla bla DLC-coatings
 \begin_inset CommandInset nomenclature
 LatexCommand nomenclature
 symbol "DLC"
@@ -308,10 +311,33 @@ key "Fowl1928"
 \end_inset
 
 .
+ 
+\begin_inset CommandInset ref
+LatexCommand eqref
+reference "eq:Integral-sine"
+
+\end_inset
+
+ is the definition of the integral sine function.
+\begin_inset Formula 
+\begin{equation}
+\int\frac{\sin(x)}{x}\,\mathrm{d}x=\mathrm{Si}(x)\label{eq:Integral-sine}
+\end{equation}
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Section
 The next section
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:The-next-section"
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard

diff --git a/lib/templates/thesis/chapter-2.lyx b/lib/templates/thesis/chapter-2.lyx
index f267c85576b070b7ffb81aa1c4ab575987898803..b52f7146090a98d9c746e6ba6be2e6d1243ee227 100644 (file)
--- a/lib/templates/thesis/chapter-2.lyx
+++ b/lib/templates/thesis/chapter-2.lyx
@@ -4,26 +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
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
-\newlength{\abc}
-\settowidth{\abc}{\space}
-\AtBeginDocument{%
-\addto\extrasenglish{
- \renewcommand{\equationautorefname}{\hspace{-\abc}}
+\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 "Gleichung"
-%\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})}
+% in case somebody want to have the label "Equation"
+%\renewcommand{\eqref}[1]{Equation~(\negthinspace\autoref{#1})}
 
-% put the link to figure floats to the beginning
-% of the figure and not to its end
+% that links to image floats jumps to the beginning
+% of the float and not to its caption
 \usepackage[figure]{hypcap}
 
 % the pages of the TOC is numbered roman
@@ -35,21 +31,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

diff --git a/lib/templates/thesis/thesis.lyx b/lib/templates/thesis/thesis.lyx
index 168ef0f138b4d8a0c5124bfd7904477c1a346999..580f94e8a1cf073b9a492928621b5e284076cce9 100644 (file)
--- a/lib/templates/thesis/thesis.lyx
+++ b/lib/templates/thesis/thesis.lyx
@@ -4,23 +4,19 @@
 \begin_header
 \textclass scrbook
 \begin_preamble
-% increase link area for cross-references and autoname them
+% increases link area for cross-references and autoname them
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
-\newlength{\abc}
-\settowidth{\abc}{\space}
-\AtBeginDocument{%
-\addto\extrasenglish{
- \renewcommand{\equationautorefname}{\hspace{-\abc}}
+\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 +31,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