Load covington later

This solves a loading order conflict with beamer-article.

(cherry picked from commit 00ee54e694)
This commit is contained in:
Juergen Spitzmueller 2018-10-09 10:42:38 +02:00
parent e323f74b78
commit 53a108e814
4 changed files with 28 additions and 17 deletions

View File

@ -55,9 +55,11 @@ Style Numbered_Example_(multiline)
Preamble
% Backwards compatibility with covington < 1.1
% This code can be removed eventually
\@ifundefined{covexample}{%
\newenvironment{covexample}{\begin{example}}{\end{example}}%
}{}
\AtBeginDocument{%
\@ifundefined{covexample}{%
\newenvironment{covexample}{\begin{example}}{\end{example}}%
}{}
}
EndPreamble
Category Linguistics
End
@ -78,9 +80,11 @@ Style Numbered_Examples_(consecutive)
Preamble
% Backwards compatibility with covington < 1.1
% This code can be removed eventually
\@ifundefined{covexamples}{%
\newenvironment{covexamples}{\begin{examples}}{\end{examples}}%
}{}
\AtBeginDocument{%
\@ifundefined{covexamples}{%
\newenvironment{covexamples}{\begin{examples}}{\end{examples}}%
}{}
}
EndPreamble
End
@ -95,16 +99,18 @@ Style Subexample
Preamble
% Backwards compatibility with covington < 1.6
% This code can be removed eventually
\@ifundefined{covsubexamples}{%
\newenvironment{covsubexamples}{%
\addtolength{\examplenumbersep}{-0.5em}%
\begin{covexample}%
\begin{enumerate}
\renewcommand\theenumi{\alph{enumi}}
\renewcommand\labelenumi{(\theenumi)}
\renewcommand\p@enumi{\theequation\,}}%
{\end{enumerate}\end{covexample}}
}{}
\AtBeginDocument{%
\@ifundefined{covsubexamples}{%
\newenvironment{covsubexamples}{%
\addtolength{\examplenumbersep}{-0.5em}%
\begin{covexample}%
\begin{enumerate}
\renewcommand\theenumi{\alph{enumi}}
\renewcommand\labelenumi{(\theenumi)}
\renewcommand\p@enumi{\theequation\,}}%
{\end{enumerate}\end{covexample}}
}{}
}
EndPreamble
End

View File

@ -2308,6 +2308,10 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
os << "\\usepackage{xunicode}\n";
}
// covington must be loaded after beamerarticle
if (features.isRequired("covington"))
os << "\\usepackage{covington}\n";
// Polyglossia must be loaded last ...
if (use_polyglossia) {
// call the package

View File

@ -964,7 +964,6 @@ char const * simplefeatures[] = {
// "cancel",
"ascii",
"url",
"covington",
"csquotes",
"enumitem",
"endnotes",

View File

@ -136,6 +136,8 @@ What's new
- Add "hyperref-driver=dvips" option to the extra flags of the
latex->dvi converter (bug 11332).
- Fix loading order conflict with beamer-article and covington.
* USER INTERFACE