From 15685fe5cb663189e342608865e771cd2514cc45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Wed, 8 Dec 2010 16:24:12 +0000
Subject: [PATCH] do \addto\extras \AtBeginDocument, which is after
 polyglossia, if this package is used.

Fixes the \addto conflicts with polyglossia.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36774 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/doc/Math.lyx                    |  8 +++++---
 lib/doc/de/Math.lyx                 |  8 +++++---
 lib/doc/es/Math.lyx                 |  8 +++++---
 lib/doc/fr/Math.lyx                 |  8 +++++---
 lib/doc/ja/Math.lyx                 |  8 +++++---
 lib/examples/FeynmanDiagrams.lyx    |  6 ++++--
 lib/examples/fr/FeynmanDiagrams.lyx |  6 ++++--
 lib/templates/thesis/Appendix.lyx   |  9 ++++++---
 lib/templates/thesis/chapter-1.lyx  |  9 ++++++---
 lib/templates/thesis/chapter-2.lyx  |  9 ++++++---
 lib/templates/thesis/thesis.lyx     | 13 ++++++++-----
 11 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 5e25c87a9d..0be3164b16 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 408
+#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrartcl
@@ -41,11 +41,13 @@
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
 \newlength{\abc}
 \settowidth{\abc}{\space}
+\AtBeginDocument{%
 \addto\extrasenglish{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
+}
 
 % don't load packages twice
 % see first footnote in sec. 9.3
@@ -153,7 +155,7 @@
 \font_sans default
 \font_typewriter default
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index 37f445c327..0d4e31301b 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 408
+#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrartcl
@@ -41,11 +41,13 @@
 \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}}
+}
 
 % Makros damit Pakete nicht doppelt geladen werden.
 % siehe erste Fußnote in Kap. 9.3
@@ -161,7 +163,7 @@
 \font_sans default
 \font_typewriter default
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index d9f9dd5979..8d9aecc393 100644
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 408
+#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrartcl
@@ -41,11 +41,13 @@
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
 \newlength{\abc}
 \settowidth{\abc}{\space}
+\AtBeginDocument{%
 \addto\extrasspanish{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
+}
 
 % don't load packages twice
 % see first footnote in sec. 9.3
@@ -153,7 +155,7 @@
 \font_sans default
 \font_typewriter default
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index 07ed19f531..9d84c5c2d6 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 408
+#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrartcl
@@ -42,11 +42,13 @@
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
 \newlength{\abc}
 \settowidth{\abc}{\space}
+\AtBeginDocument{%
 \addto\extrasfrench{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
+}
 
 % don't load packages twice
 % see first footnote in sec. 9.3
@@ -157,7 +159,7 @@
 \font_sans default
 \font_typewriter default
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index e505a1de0d..a4ee7c8216 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/
-\lyxformat 408
+#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass jarticle
@@ -44,11 +44,13 @@
 %\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
 \newlength{\abc}
 \settowidth{\abc}{\space}
+\AtBeginDocument{%
 \addto\extrasenglish{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
+}
 
 % don't load packages twice
 % see first footnote in sec. 9.3
@@ -150,7 +152,7 @@
 \font_sans default
 \font_typewriter default
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
diff --git a/lib/examples/FeynmanDiagrams.lyx b/lib/examples/FeynmanDiagrams.lyx
index 4052bb308a..4313066679 100644
--- a/lib/examples/FeynmanDiagrams.lyx
+++ b/lib/examples/FeynmanDiagrams.lyx
@@ -1,5 +1,5 @@
 #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 407
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrartcl
@@ -27,11 +27,13 @@
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
 \newlength{\abc}
 \settowidth{\abc}{\space}
+\AtBeginDocument{%
 \addto\extrasenglish{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
+}
 
 % wird benutzt, um Tabellenzellen zu vergrößern
 \@ifundefined{extrarowheight}
@@ -47,7 +49,7 @@
 \font_sans default
 \font_typewriter default
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
diff --git a/lib/examples/fr/FeynmanDiagrams.lyx b/lib/examples/fr/FeynmanDiagrams.lyx
index 88902b2071..d8f50fbd7e 100644
--- a/lib/examples/fr/FeynmanDiagrams.lyx
+++ b/lib/examples/fr/FeynmanDiagrams.lyx
@@ -1,5 +1,5 @@
 #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 407
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrartcl
@@ -27,11 +27,13 @@
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
 \newlength{\abc}
 \settowidth{\abc}{\space}
+\AtBeginDocument{%
 \addto\extrasenglish{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
+}
 
 % wird benutzt, um Tabellenzellen zu vergrößern
 \@ifundefined{extrarowheight}
@@ -47,7 +49,7 @@
 \font_sans default
 \font_typewriter default
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
diff --git a/lib/templates/thesis/Appendix.lyx b/lib/templates/thesis/Appendix.lyx
index 452f55cd72..b127b96df1 100644
--- a/lib/templates/thesis/Appendix.lyx
+++ b/lib/templates/thesis/Appendix.lyx
@@ -1,5 +1,5 @@
 #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 401
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrbook
@@ -8,6 +8,7 @@
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
 \newlength{\abc}
 \settowidth{\abc}{\space}
+\AtBeginDocument{%
 \addto\extrasngerman{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{Kap.\negthinspace}
@@ -16,6 +17,7 @@
  \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})}
@@ -64,7 +66,7 @@ customHeadersFooters
 \font_sans lmss
 \font_typewriter lmtt
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
@@ -102,6 +104,7 @@ customHeadersFooters
 \use_indices false
 \paperorientation portrait
 \suppress_date false
+\use_refstyle 0
 \branch NoChildDocument
 \selected 0
 \filename_suffix 0
@@ -316,7 +319,7 @@ The next section
 
 \begin_layout Standard
 \begin_inset Branch NoChildDocument
-status open
+status collapsed
 
 \begin_layout Standard
 \begin_inset CommandInset bibtex
diff --git a/lib/templates/thesis/chapter-1.lyx b/lib/templates/thesis/chapter-1.lyx
index 4a32056f7a..f9f42e1b50 100644
--- a/lib/templates/thesis/chapter-1.lyx
+++ b/lib/templates/thesis/chapter-1.lyx
@@ -1,5 +1,5 @@
 #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 401
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrbook
@@ -8,6 +8,7 @@
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
 \newlength{\abc}
 \settowidth{\abc}{\space}
+\AtBeginDocument{%
 \addto\extrasenglish{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
@@ -16,6 +17,7 @@
  \renewcommand{\figureautorefname}{Fig.\negthinspace}
  \renewcommand{\tableautorefname}{Tab.\negthinspace}
 }
+}
 
 % in case somebody want to have the label "Gleichung"
 %\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})}
@@ -63,7 +65,7 @@ customHeadersFooters
 \font_sans lmss
 \font_typewriter lmtt
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
@@ -101,6 +103,7 @@ customHeadersFooters
 \use_indices false
 \paperorientation portrait
 \suppress_date false
+\use_refstyle 0
 \branch NoChildDocument
 \selected 0
 \filename_suffix 0
@@ -300,7 +303,7 @@ The next section
 
 \begin_layout Standard
 \begin_inset Branch NoChildDocument
-status open
+status collapsed
 
 \begin_layout Standard
 \begin_inset CommandInset bibtex
diff --git a/lib/templates/thesis/chapter-2.lyx b/lib/templates/thesis/chapter-2.lyx
index 35e34598f4..baf8d530f2 100644
--- a/lib/templates/thesis/chapter-2.lyx
+++ b/lib/templates/thesis/chapter-2.lyx
@@ -1,5 +1,5 @@
 #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 401
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrbook
@@ -8,6 +8,7 @@
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
 \newlength{\abc}
 \settowidth{\abc}{\space}
+\AtBeginDocument{%
 \addto\extrasenglish{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
@@ -16,6 +17,7 @@
  \renewcommand{\figureautorefname}{Fig.\negthinspace}
  \renewcommand{\tableautorefname}{Tab.\negthinspace}
 }
+}
 
 % in case somebody want to have the label "Gleichung"
 %\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})}
@@ -63,7 +65,7 @@ customHeadersFooters
 \font_sans lmss
 \font_typewriter lmtt
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
@@ -101,6 +103,7 @@ customHeadersFooters
 \use_indices false
 \paperorientation portrait
 \suppress_date false
+\use_refstyle 0
 \branch NoChildDocument
 \selected 0
 \filename_suffix 0
@@ -299,7 +302,7 @@ The next section
 
 \begin_layout Standard
 \begin_inset Branch NoChildDocument
-status open
+status collapsed
 
 \begin_layout Standard
 \begin_inset CommandInset bibtex
diff --git a/lib/templates/thesis/thesis.lyx b/lib/templates/thesis/thesis.lyx
index 9916d76d7f..4c010b14d3 100644
--- a/lib/templates/thesis/thesis.lyx
+++ b/lib/templates/thesis/thesis.lyx
@@ -1,5 +1,5 @@
 #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 401
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrbook
@@ -8,6 +8,7 @@
 \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
 \newlength{\abc}
 \settowidth{\abc}{\space}
+\AtBeginDocument{%
 \addto\extrasenglish{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
@@ -16,6 +17,7 @@
  \renewcommand{\figureautorefname}{Fig.\negthinspace}
  \renewcommand{\tableautorefname}{Tab.\negthinspace}
 }
+}
 
 % in case somebody want to have the label "equation"
 %\renewcommand{\eqref}[1]{equation~(\negthinspace\autoref{#1})}
@@ -59,11 +61,11 @@ customHeadersFooters
 \language english
 \inputencoding auto
 \fontencoding global
-\font_roman lmodern
-\font_sans lmss
-\font_typewriter lmtt
+\font_roman default
+\font_sans default
+\font_typewriter default
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
@@ -99,6 +101,7 @@ customHeadersFooters
 \use_indices false
 \paperorientation portrait
 \suppress_date true
+\use_refstyle 0
 \branch chapter-1
 \selected 1
 \filename_suffix 0