From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 8 Sep 2018 07:50:48 +0000 (+0200)
Subject: Covington now provides subexamples itself
X-Git-Tag: 2.3.2~116
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b8c62838ecf35f1fc242f0bda6057ce8c87db412;p=features.git

Covington now provides subexamples itself

Candidate for stable.

(cherry picked from commit ab16bb7eb98731be25413f9410e61e7d4fe75439)
---

diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 67ea7e4b7d..9e52b95b9c 100644
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -85,20 +85,26 @@ Style Numbered_Examples_(consecutive)
 End
 
 
-# multiple numbered example with covington.sty
+# multiple numbered examples with covington.sty
 Style Subexample
 	CopyStyle	      Numbered_Examples_(consecutive)
-	LatexName             subexample
+	LatexName             covsubexamples
 	LabelCounter          "subexample"
 	StepMasterCounter     true
-	Requires	      covington,enumitem
+	Requires	      covington
 	Preamble
-		\newenvironment{subexample}{%
-			\begin{example}\begin{enumerate}[leftmargin=1.7em]
-			\renewcommand\theenumi{\alph{enumi}}
-			\renewcommand\labelenumi{(\theenumi)}
-			\renewcommand\p@enumi{\theequation\,}}%
-			{\end{enumerate}\end{example}}
+		% 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}}
+		}{}
 	EndPreamble
 End
 
diff --git a/status.23x b/status.23x
index c5b23bfdeb..d33c3d1e4e 100644
--- a/status.23x
+++ b/status.23x
@@ -21,6 +21,8 @@ What's new
 
 - Add support for LyX logo in RTL output (bug 10423).
 
+- Update support for linguistic subexamples.
+
 
 * MISCELLANEOUS
 
@@ -48,7 +50,7 @@ What's new
 
 * DOCUMENTATION AND LOCALIZATION
 
-- Update German user interface localization.
+- Update German ans Slovak user interface localization.
 
 
 * BUILD/INSTALLATION