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
This commit is contained in:
Jürgen Spitzmüller 2010-12-08 16:24:12 +00:00
parent 089927dd6f
commit 15685fe5cb
11 changed files with 59 additions and 33 deletions

View File

@ -1,5 +1,5 @@
#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 408 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass scrartcl \textclass scrartcl
@ -41,11 +41,13 @@
\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasenglish{ \addto\extrasenglish{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\sectionautorefname}{sec.\negthinspace}
\renewcommand{\subsectionautorefname}{sec.\negthinspace} \renewcommand{\subsectionautorefname}{sec.\negthinspace}
\renewcommand{\subsubsectionautorefname}{sec.\negthinspace}} \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
}
% don't load packages twice % don't load packages twice
% see first footnote in sec. 9.3 % see first footnote in sec. 9.3
@ -153,7 +155,7 @@
\font_sans default \font_sans default
\font_typewriter default \font_typewriter default
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100

View File

@ -1,5 +1,5 @@
#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 408 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass scrartcl \textclass scrartcl
@ -41,11 +41,13 @@
\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasngerman{ \addto\extrasngerman{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{Kap.\negthinspace} \renewcommand{\sectionautorefname}{Kap.\negthinspace}
\renewcommand{\subsectionautorefname}{Kap.\negthinspace} \renewcommand{\subsectionautorefname}{Kap.\negthinspace}
\renewcommand{\subsubsectionautorefname}{Kap.\negthinspace}} \renewcommand{\subsubsectionautorefname}{Kap.\negthinspace}}
}
% Makros damit Pakete nicht doppelt geladen werden. % Makros damit Pakete nicht doppelt geladen werden.
% siehe erste Fußnote in Kap. 9.3 % siehe erste Fußnote in Kap. 9.3
@ -161,7 +163,7 @@
\font_sans default \font_sans default
\font_typewriter default \font_typewriter default
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100

View File

@ -1,5 +1,5 @@
#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 408 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass scrartcl \textclass scrartcl
@ -41,11 +41,13 @@
\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasspanish{ \addto\extrasspanish{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\sectionautorefname}{sec.\negthinspace}
\renewcommand{\subsectionautorefname}{sec.\negthinspace} \renewcommand{\subsectionautorefname}{sec.\negthinspace}
\renewcommand{\subsubsectionautorefname}{sec.\negthinspace}} \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
}
% don't load packages twice % don't load packages twice
% see first footnote in sec. 9.3 % see first footnote in sec. 9.3
@ -153,7 +155,7 @@
\font_sans default \font_sans default
\font_typewriter default \font_typewriter default
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100

View File

@ -1,5 +1,5 @@
#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 408 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass scrartcl \textclass scrartcl
@ -42,11 +42,13 @@
\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasfrench{ \addto\extrasfrench{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\sectionautorefname}{sec.\negthinspace}
\renewcommand{\subsectionautorefname}{sec.\negthinspace} \renewcommand{\subsectionautorefname}{sec.\negthinspace}
\renewcommand{\subsubsectionautorefname}{sec.\negthinspace}} \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
}
% don't load packages twice % don't load packages twice
% see first footnote in sec. 9.3 % see first footnote in sec. 9.3
@ -157,7 +159,7 @@
\font_sans default \font_sans default
\font_typewriter default \font_typewriter default
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100

View File

@ -1,5 +1,5 @@
#LyX 2.0.0beta1 created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 408 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass jarticle \textclass jarticle
@ -44,11 +44,13 @@
%\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} %\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasenglish{ \addto\extrasenglish{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\sectionautorefname}{sec.\negthinspace}
\renewcommand{\subsectionautorefname}{sec.\negthinspace} \renewcommand{\subsectionautorefname}{sec.\negthinspace}
\renewcommand{\subsubsectionautorefname}{sec.\negthinspace}} \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
}
% don't load packages twice % don't load packages twice
% see first footnote in sec. 9.3 % see first footnote in sec. 9.3
@ -150,7 +152,7 @@
\font_sans default \font_sans default
\font_typewriter default \font_typewriter default
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100

View File

@ -1,5 +1,5 @@
#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 407 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass scrartcl \textclass scrartcl
@ -27,11 +27,13 @@
\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasenglish{ \addto\extrasenglish{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\sectionautorefname}{sec.\negthinspace}
\renewcommand{\subsectionautorefname}{sec.\negthinspace} \renewcommand{\subsectionautorefname}{sec.\negthinspace}
\renewcommand{\subsubsectionautorefname}{sec.\negthinspace}} \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
}
% wird benutzt, um Tabellenzellen zu vergrößern % wird benutzt, um Tabellenzellen zu vergrößern
\@ifundefined{extrarowheight} \@ifundefined{extrarowheight}
@ -47,7 +49,7 @@
\font_sans default \font_sans default
\font_typewriter default \font_typewriter default
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100

View File

@ -1,5 +1,5 @@
#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 407 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass scrartcl \textclass scrartcl
@ -27,11 +27,13 @@
\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasenglish{ \addto\extrasenglish{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\sectionautorefname}{sec.\negthinspace}
\renewcommand{\subsectionautorefname}{sec.\negthinspace} \renewcommand{\subsectionautorefname}{sec.\negthinspace}
\renewcommand{\subsubsectionautorefname}{sec.\negthinspace}} \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
}
% wird benutzt, um Tabellenzellen zu vergrößern % wird benutzt, um Tabellenzellen zu vergrößern
\@ifundefined{extrarowheight} \@ifundefined{extrarowheight}
@ -47,7 +49,7 @@
\font_sans default \font_sans default
\font_typewriter default \font_typewriter default
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100

View File

@ -1,5 +1,5 @@
#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 401 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass scrbook \textclass scrbook
@ -8,6 +8,7 @@
\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasngerman{ \addto\extrasngerman{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{Kap.\negthinspace} \renewcommand{\sectionautorefname}{Kap.\negthinspace}
@ -16,6 +17,7 @@
\renewcommand{\figureautorefname}{Abb.\negthinspace} \renewcommand{\figureautorefname}{Abb.\negthinspace}
\renewcommand{\tableautorefname}{Tab.\negthinspace} \renewcommand{\tableautorefname}{Tab.\negthinspace}
} }
}
% für den Fall, dass jemand die Bezeichnung "Gleichung" haben will % für den Fall, dass jemand die Bezeichnung "Gleichung" haben will
%\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})} %\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})}
@ -64,7 +66,7 @@ customHeadersFooters
\font_sans lmss \font_sans lmss
\font_typewriter lmtt \font_typewriter lmtt
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100
@ -102,6 +104,7 @@ customHeadersFooters
\use_indices false \use_indices false
\paperorientation portrait \paperorientation portrait
\suppress_date false \suppress_date false
\use_refstyle 0
\branch NoChildDocument \branch NoChildDocument
\selected 0 \selected 0
\filename_suffix 0 \filename_suffix 0
@ -316,7 +319,7 @@ The next section
\begin_layout Standard \begin_layout Standard
\begin_inset Branch NoChildDocument \begin_inset Branch NoChildDocument
status open status collapsed
\begin_layout Standard \begin_layout Standard
\begin_inset CommandInset bibtex \begin_inset CommandInset bibtex

View File

@ -1,5 +1,5 @@
#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 401 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass scrbook \textclass scrbook
@ -8,6 +8,7 @@
\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasenglish{ \addto\extrasenglish{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\sectionautorefname}{sec.\negthinspace}
@ -16,6 +17,7 @@
\renewcommand{\figureautorefname}{Fig.\negthinspace} \renewcommand{\figureautorefname}{Fig.\negthinspace}
\renewcommand{\tableautorefname}{Tab.\negthinspace} \renewcommand{\tableautorefname}{Tab.\negthinspace}
} }
}
% in case somebody want to have the label "Gleichung" % in case somebody want to have the label "Gleichung"
%\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})} %\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})}
@ -63,7 +65,7 @@ customHeadersFooters
\font_sans lmss \font_sans lmss
\font_typewriter lmtt \font_typewriter lmtt
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100
@ -101,6 +103,7 @@ customHeadersFooters
\use_indices false \use_indices false
\paperorientation portrait \paperorientation portrait
\suppress_date false \suppress_date false
\use_refstyle 0
\branch NoChildDocument \branch NoChildDocument
\selected 0 \selected 0
\filename_suffix 0 \filename_suffix 0
@ -300,7 +303,7 @@ The next section
\begin_layout Standard \begin_layout Standard
\begin_inset Branch NoChildDocument \begin_inset Branch NoChildDocument
status open status collapsed
\begin_layout Standard \begin_layout Standard
\begin_inset CommandInset bibtex \begin_inset CommandInset bibtex

View File

@ -1,5 +1,5 @@
#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 401 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass scrbook \textclass scrbook
@ -8,6 +8,7 @@
\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasenglish{ \addto\extrasenglish{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\sectionautorefname}{sec.\negthinspace}
@ -16,6 +17,7 @@
\renewcommand{\figureautorefname}{Fig.\negthinspace} \renewcommand{\figureautorefname}{Fig.\negthinspace}
\renewcommand{\tableautorefname}{Tab.\negthinspace} \renewcommand{\tableautorefname}{Tab.\negthinspace}
} }
}
% in case somebody want to have the label "Gleichung" % in case somebody want to have the label "Gleichung"
%\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})} %\renewcommand{\eqref}[1]{Gleichung~(\negthinspace\autoref{#1})}
@ -63,7 +65,7 @@ customHeadersFooters
\font_sans lmss \font_sans lmss
\font_typewriter lmtt \font_typewriter lmtt
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100
@ -101,6 +103,7 @@ customHeadersFooters
\use_indices false \use_indices false
\paperorientation portrait \paperorientation portrait
\suppress_date false \suppress_date false
\use_refstyle 0
\branch NoChildDocument \branch NoChildDocument
\selected 0 \selected 0
\filename_suffix 0 \filename_suffix 0
@ -299,7 +302,7 @@ The next section
\begin_layout Standard \begin_layout Standard
\begin_inset Branch NoChildDocument \begin_inset Branch NoChildDocument
status open status collapsed
\begin_layout Standard \begin_layout Standard
\begin_inset CommandInset bibtex \begin_inset CommandInset bibtex

View File

@ -1,5 +1,5 @@
#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/ #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
\lyxformat 401 \lyxformat 410
\begin_document \begin_document
\begin_header \begin_header
\textclass scrbook \textclass scrbook
@ -8,6 +8,7 @@
\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
\newlength{\abc} \newlength{\abc}
\settowidth{\abc}{\space} \settowidth{\abc}{\space}
\AtBeginDocument{%
\addto\extrasenglish{ \addto\extrasenglish{
\renewcommand{\equationautorefname}{\hspace{-\abc}} \renewcommand{\equationautorefname}{\hspace{-\abc}}
\renewcommand{\sectionautorefname}{sec.\negthinspace} \renewcommand{\sectionautorefname}{sec.\negthinspace}
@ -16,6 +17,7 @@
\renewcommand{\figureautorefname}{Fig.\negthinspace} \renewcommand{\figureautorefname}{Fig.\negthinspace}
\renewcommand{\tableautorefname}{Tab.\negthinspace} \renewcommand{\tableautorefname}{Tab.\negthinspace}
} }
}
% in case somebody want to have the label "equation" % in case somebody want to have the label "equation"
%\renewcommand{\eqref}[1]{equation~(\negthinspace\autoref{#1})} %\renewcommand{\eqref}[1]{equation~(\negthinspace\autoref{#1})}
@ -59,11 +61,11 @@ customHeadersFooters
\language english \language english
\inputencoding auto \inputencoding auto
\fontencoding global \fontencoding global
\font_roman lmodern \font_roman default
\font_sans lmss \font_sans default
\font_typewriter lmtt \font_typewriter default
\font_default_family default \font_default_family default
\use_xetex false \use_non_tex_fonts false
\font_sc false \font_sc false
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100
@ -99,6 +101,7 @@ customHeadersFooters
\use_indices false \use_indices false
\paperorientation portrait \paperorientation portrait
\suppress_date true \suppress_date true
\use_refstyle 0
\branch chapter-1 \branch chapter-1
\selected 1 \selected 1
\filename_suffix 0 \filename_suffix 0