commit 53a108e814775d0226438f6ddea7da344ad3435c
Author: Juergen Spitzmueller <[email protected]>
Date: Tue Oct 9 10:42:38 2018 +0200
Load covington later
This solves a loading order conflict with beamer-article.
(cherry picked from commit 00ee54e6949505cbda7f6a287d2f69f1a6b37a86)
---
lib/layouts/linguistics.module | 38 ++++++++++++++++++++++----------------
src/BufferParams.cpp | 4 ++++
src/LaTeXFeatures.cpp | 1 -
status.23x | 2 ++
4 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 9e52b95..bf6e042 100644
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -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
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index da35db1..a2ff315 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -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
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index f325d94..7256002 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -964,7 +964,6 @@ char const * simplefeatures[] = {
// "cancel",
"ascii",
"url",
- "covington",
"csquotes",
"enumitem",
"endnotes",
diff --git a/status.23x b/status.23x
index a10b983..dcee947 100644
--- a/status.23x
+++ b/status.23x
@@ -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
