From: Uwe Stöhr Date: Sun, 2 Dec 2012 19:58:28 +0000 (+0100) Subject: thesis template: port recent changes to master X-Git-Tag: 2.1.0beta1~1157 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=907c26ec0b627497b6e02b20843fe0c051ccd1c4;p=lyx.git thesis template: port recent changes to master --- diff --git a/lib/templates/thesis/Appendix.lyx b/lib/templates/thesis/Appendix.lyx index 7e535e097e..1425b8a606 100644 --- a/lib/templates/thesis/Appendix.lyx +++ b/lib/templates/thesis/Appendix.lyx @@ -7,9 +7,10 @@ % 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}}}} -\@ifundefined{extrasenglish}{\usepackage[english]{babel}}{} -\addto\extrasenglish{% +\AtBeginDocument{% + \renewcommand{\ref}[1]{\mbox{\autoref{#1}}} +} +\def\refnamechanges{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\subsectionautorefname}{sec.\negthinspace} @@ -17,6 +18,7 @@ \renewcommand{\figureautorefname}{Fig.\negthinspace} \renewcommand{\tableautorefname}{Tab.\negthinspace} } +\@ifpackageloaded{babel}{\addto\extrasenglish{\refnamechanges}}{\refnamechanges} % in case somebody want to have the label "Equation" %\renewcommand{\eqref}[1]{Equation~(\negthinspace\autoref{#1})} @@ -35,6 +37,8 @@ \mainmatter } % makes caption labels bold +% for more info about these settings, see +% http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguien.pdf \setkomafont{captionlabel}{\bfseries} \setcapindent{1em} @@ -42,6 +46,8 @@ \usepackage{calc} % fancy page header/footer settings +% for more information see section 9 of +% ftp://www.ctan.org/pub/tex-archive/macros/latex2e/contrib/fancyhdr/fancyhdr.pdf \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}} \renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}} diff --git a/lib/templates/thesis/chapter-1.lyx b/lib/templates/thesis/chapter-1.lyx index 5421e22c5a..323c22f96c 100644 --- a/lib/templates/thesis/chapter-1.lyx +++ b/lib/templates/thesis/chapter-1.lyx @@ -7,9 +7,10 @@ % 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}}}} -\@ifundefined{extrasenglish}{\usepackage[english]{babel}}{} -\addto\extrasenglish{% +\AtBeginDocument{% + \renewcommand{\ref}[1]{\mbox{\autoref{#1}}} +} +\def\refnamechanges{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\subsectionautorefname}{sec.\negthinspace} @@ -17,6 +18,7 @@ \renewcommand{\figureautorefname}{Fig.\negthinspace} \renewcommand{\tableautorefname}{Tab.\negthinspace} } +\@ifpackageloaded{babel}{\addto\extrasenglish{\refnamechanges}}{\refnamechanges} % in case somebody want to have the label "Equation" %\renewcommand{\eqref}[1]{Equation~(\negthinspace\autoref{#1})} @@ -35,6 +37,8 @@ \mainmatter } % makes caption labels bold +% for more info about these settings, see +% http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguien.pdf \setkomafont{captionlabel}{\bfseries} \setcapindent{1em} @@ -42,6 +46,8 @@ \usepackage{calc} % fancy page header/footer settings +% for more information see section 9 of +% ftp://www.ctan.org/pub/tex-archive/macros/latex2e/contrib/fancyhdr/fancyhdr.pdf \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}} \renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}} diff --git a/lib/templates/thesis/chapter-2.lyx b/lib/templates/thesis/chapter-2.lyx index c810a153b7..d681c28508 100644 --- a/lib/templates/thesis/chapter-2.lyx +++ b/lib/templates/thesis/chapter-2.lyx @@ -7,9 +7,10 @@ % 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}}}} -\@ifundefined{extrasenglish}{\usepackage[english]{babel}}{} -\addto\extrasenglish{% +\AtBeginDocument{% + \renewcommand{\ref}[1]{\mbox{\autoref{#1}}} +} +\def\refnamechanges{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\subsectionautorefname}{sec.\negthinspace} @@ -17,6 +18,7 @@ \renewcommand{\figureautorefname}{Fig.\negthinspace} \renewcommand{\tableautorefname}{Tab.\negthinspace} } +\@ifpackageloaded{babel}{\addto\extrasenglish{\refnamechanges}}{\refnamechanges} % in case somebody want to have the label "Equation" %\renewcommand{\eqref}[1]{Equation~(\negthinspace\autoref{#1})} @@ -35,6 +37,8 @@ \mainmatter } % makes caption labels bold +% for more info about these settings, see +% http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguien.pdf \setkomafont{captionlabel}{\bfseries} \setcapindent{1em} @@ -42,6 +46,8 @@ \usepackage{calc} % fancy page header/footer settings +% for more information see section 9 of +% ftp://www.ctan.org/pub/tex-archive/macros/latex2e/contrib/fancyhdr/fancyhdr.pdf \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}} \renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}} diff --git a/lib/templates/thesis/thesis.lyx b/lib/templates/thesis/thesis.lyx index 82f26ac799..7a5fb55bea 100644 --- a/lib/templates/thesis/thesis.lyx +++ b/lib/templates/thesis/thesis.lyx @@ -7,9 +7,10 @@ % 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}}}} -\@ifundefined{extrasenglish}{\usepackage[english]{babel}}{} -\addto\extrasenglish{% +\AtBeginDocument{% + \renewcommand{\ref}[1]{\mbox{\autoref{#1}}} +} +\def\refnamechanges{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\subsectionautorefname}{sec.\negthinspace} @@ -17,6 +18,7 @@ \renewcommand{\figureautorefname}{Fig.\negthinspace} \renewcommand{\tableautorefname}{Tab.\negthinspace} } +\@ifpackageloaded{babel}{\addto\extrasenglish{\refnamechanges}}{\refnamechanges} % in case somebody want to have the label "Equation" %\renewcommand{\eqref}[1]{Equation~(\negthinspace\autoref{#1})} @@ -35,6 +37,8 @@ \mainmatter } % makes caption labels bold +% for more info about these settings, see +% http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguien.pdf \setkomafont{captionlabel}{\bfseries} \setcapindent{1em} @@ -42,6 +46,8 @@ \usepackage{calc} % fancy page header/footer settings +% for more information see section 9 of +% ftp://www.ctan.org/pub/tex-archive/macros/latex2e/contrib/fancyhdr/fancyhdr.pdf \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}} \renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}} @@ -155,11 +161,15 @@ 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 +Notes: +\end_layout + +\begin_layout Itemize +When renaming this file, you must also rename it in all its subdocuments + in the document settings in the menu \family sans +Document\SpecialChar \menuseparator +Settings\SpecialChar \menuseparator Document \begin_inset space ~ \end_inset @@ -180,6 +190,29 @@ master document \end_layout +\begin_layout Itemize +For special settings like the header/footer lines or the font of captions, + see also the document preamble (menu +\family sans +Document\SpecialChar \menuseparator +Settings\SpecialChar \menuseparator +LaTeX Preamble +\family default +). +\end_layout + +\begin_layout Itemize +If you change the document language you also need to check the document + preamble and replace there the English-specific setting. +\end_layout + +\begin_layout Itemize +This file is not designed to change the document class. + You can use it nevertheless as starting point if you have to use a special + docment class provided by your university, but no support can be granted + for this transition. +\end_layout + \end_inset @@ -381,7 +414,97 @@ rightmark status collapsed \begin_layout Plain Layout -defines the header line +Defines the header line. + If your university does not have special rules what must be in the header/foote +r, leave the settings as they are. +\end_layout + +\begin_layout Plain Layout +Quick explanation: +\end_layout + +\begin_layout Itemize +Stuff inside the +\family sans +opt +\family default + inset appears on even pages, stuff outside the +\family sans +opt +\family default + inset appears on uneven pages. +\end_layout + +\begin_layout Itemize + +\series bold + +\backslash +rightmark +\series default + is stuff that usualy appears on the right side. + This is normally the title of the current chapter or section. +\end_layout + +\begin_layout Itemize + +\series bold + +\backslash +leftmark +\series default + is the opposite of +\series bold + +\backslash +rightmark +\series default +. +\end_layout + +\begin_layout Itemize + +\series bold + +\backslash +thepage +\series default + prints the current page number, +\series bold + +\backslash +thechapter +\series default + the current chapter number, +\series bold + +\backslash +thesection +\series default + the current... +\end_layout + +\begin_layout Itemize +Further adjustments can be made in the LaTeX preamble of thios document + in the menu Document\SpecialChar \menuseparator +Settings. + For a brief description how the header/footer lines can be modified, see + the manual of the LaTeX package +\series bold +fancyhdr +\series default +: +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +ftp://www.ctan.org/pub/tex-archive/macros/latex2e/contrib/fancyhdr/fancyhdr.pdf +\end_layout + +\end_inset + + \end_layout \end_inset @@ -503,7 +626,8 @@ pagestyle{plain} status collapsed \begin_layout Plain Layout -The summary should not have page headers. +Usually the summary should not have page headers. + If it should, remove this TeX code. \end_layout \end_inset @@ -551,6 +675,16 @@ pagestyle{fancy} \end_inset +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout +Reset page style to get page headers again. +\end_layout + +\end_inset + + \end_layout \begin_layout Left Header