thesis files: Fixed preamble code for automatic reference naming

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40735 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/templates/thesis/Appendix.lyx b/lib/templates/thesis/Appendix.lyx
index 7f2d8269e501647dc0cbb671ed7dc8a1161fabf1..770f8be62000624e89d2b394148f7617d794d9f5 100644 (file)
--- a/lib/templates/thesis/Appendix.lyx
+++ b/lib/templates/thesis/Appendix.lyx
@@ -6,18 +6,14 @@
 \begin_preamble
 % Linkfläche für Querverweise vergrößern und automatisch benenne
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
-\newlength{\abc}
-\settowidth{\abc}{\space}
-\AtBeginDocument{%
-\addto\extrasngerman{
- \renewcommand{\equationautorefname}{\hspace{-\abc}}
+\addto\extrasenglish{%
+ \renewcommand*{\equationautorefname}[1]{}
  \renewcommand{\sectionautorefname}{Kap.\negthinspace}
  \renewcommand{\subsectionautorefname}{Kap.\negthinspace}
  \renewcommand{\subsubsectionautorefname}{Kap.\negthinspace}
  \renewcommand{\figureautorefname}{Abb.\negthinspace}
  \renewcommand{\tableautorefname}{Tab.\negthinspace}
 }
-}
 
 % für den Fall, dass jemand die Bezeichnung "Gleichung" haben will
 %\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})}

diff --git a/lib/templates/thesis/chapter-1.lyx b/lib/templates/thesis/chapter-1.lyx
index 9e61f99cfa6c9adbb4ca7bebd6224c22081188bd..ec12714c7cb142ce1a8aaf80cc7fc593ca539da0 100644 (file)
--- a/lib/templates/thesis/chapter-1.lyx
+++ b/lib/templates/thesis/chapter-1.lyx
@@ -6,18 +6,14 @@
 \begin_preamble
 % increase 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})}
@@ -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..3d671160527b45f3cdf4629ca5440f15e0bb5358 100644 (file)
--- a/lib/templates/thesis/chapter-2.lyx
+++ b/lib/templates/thesis/chapter-2.lyx
@@ -6,18 +6,14 @@
 \begin_preamble
 % increase 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})}

diff --git a/lib/templates/thesis/thesis.lyx b/lib/templates/thesis/thesis.lyx
index 168ef0f138b4d8a0c5124bfd7904477c1a346999..3018c2055bf81ce424b21b00bc8e462e678fb4af 100644 (file)
--- a/lib/templates/thesis/thesis.lyx
+++ b/lib/templates/thesis/thesis.lyx
@@ -6,18 +6,14 @@
 \begin_preamble
 % increase 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})}

diff --git a/status.20x b/status.20x
index 6ed74b64390016c8c4583d8d643e719cfd09a150..707e4650fa83526c8e4d0c7f195dd408516fff05 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -234,8 +234,11 @@ What's new
 
 - Fixed description in the example file multicol.lyx (bug 7953).
 
-- Fixed description of Automatic Reference Naming in the Embedded Objects
-  manual.
+- Fixed description of automatic reference naming in sec. 3.4.2 of the
+  Embedded Objects manual.
+
+- Fixed preamble code for automatic reference naming in the thesis template
+  files.
 
 - Fixed example file modernCV.lyx: corrected subsection example, added a
   separator, set the page size to A4 (bug 7991).