The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 2f99aabf6d5d5285bf02e2920c908566264a47d4 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun Nov 18 16:02:43 2012 +0100 thesis template: add check for babel (as discussed in bug #8423) diff --git a/lib/templates/thesis/Appendix.lyx b/lib/templates/thesis/Appendix.lyx index 6016557..7e535e0 100644 --- a/lib/templates/thesis/Appendix.lyx +++ b/lib/templates/thesis/Appendix.lyx @@ -5,7 +5,10 @@ \textclass scrbook \begin_preamble % 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{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} diff --git a/lib/templates/thesis/chapter-1.lyx b/lib/templates/thesis/chapter-1.lyx index 52248f9..5421e22 100644 --- a/lib/templates/thesis/chapter-1.lyx +++ b/lib/templates/thesis/chapter-1.lyx @@ -5,7 +5,10 @@ \textclass scrbook \begin_preamble % 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{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} diff --git a/lib/templates/thesis/chapter-2.lyx b/lib/templates/thesis/chapter-2.lyx index b52f714..c810a15 100644 --- a/lib/templates/thesis/chapter-2.lyx +++ b/lib/templates/thesis/chapter-2.lyx @@ -5,7 +5,10 @@ \textclass scrbook \begin_preamble % 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{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} diff --git a/lib/templates/thesis/thesis.lyx b/lib/templates/thesis/thesis.lyx index 580f94e..82f26ac 100644 --- a/lib/templates/thesis/thesis.lyx +++ b/lib/templates/thesis/thesis.lyx @@ -5,7 +5,10 @@ \textclass scrbook \begin_preamble % 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{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} diff --git a/status.20x b/status.20x index b828918..745904d 100644 --- a/status.20x +++ b/status.20x @@ -71,6 +71,9 @@ What's new * DOCUMENTATION AND LOCALIZATION +- Make the thesis template compilable again. (The reason for this bug + was that LyX no longer loads the babel package if the document + language is English and no other languages are used in the file.) * LYXHTML ----------------------------------------------------------------------- Summary of changes: lib/templates/thesis/Appendix.lyx | 3 +++ lib/templates/thesis/chapter-1.lyx | 3 +++ lib/templates/thesis/chapter-2.lyx | 3 +++ lib/templates/thesis/thesis.lyx | 3 +++ status.20x | 3 +++ 5 files changed, 15 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository