linguistics.module: proper example counters

Uses the new counter tags.

lib/layouts/linguistics.module

@@ -7,33 +7,26 @@
 
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 60
+Format 61
 
-# FIXME: It is currently not possible to share a
-# counter in layouts with STATIC and ENUMERATE
-# LabelType. The counters are not stepped properly.
 Counter example
 	Within               chapter
-#	LabelString          "(\arabic{example})"
-	LabelString          "Examples:"
+	LabelString          "(\arabic{example})"
 End
 
 Counter examplei
 	Within               chapter
-#	LabelString          "(\arabic{examplei})"
-	LabelString          "Examples:"
+	LabelString          "(\arabic{examplei})"
 End
 
 Counter subexample
 	Within               examplei
-#	LabelString          "\theexamplei (\alph{subexample})"
-	LabelString          "Subexample:"
+	LabelString          "\theexamplei (\alph{subexample})"
 End
 
 Counter subexamplei
 	Within               examplei
-#	LabelString          "\theexamplei (\alph{subexamplei})"
-	LabelString          "Subexample:"
+	LabelString          "\theexamplei (\alph{subexamplei})"
 End
 
 # single numbered example with covington.sty
@@ -41,7 +34,8 @@ Style Numbered_Example_(multiline)
 	LatexType             Environment
 	LatexName             covexample
 	NextNoIndent          1
-	Margin                Dynamic
+	Margin                First_Dynamic
+	ParIndent             (1)x
 	LabelSep              xx
 	ParSkip               0.0
 	ItemSep               0.2
@@ -51,10 +45,8 @@ Style Numbered_Example_(multiline)
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Static
-#	LabelCounter          "example"
-	LabelString           "Example:"
+	LabelCounter          "examplei"
 	LabelFont
-		Shape         Italic
 		Color         Blue
 	EndFont
 	Requires	      covington
@@ -76,6 +68,7 @@ Style Numbered_Examples_(consecutive)
 	LatexName             covexamples
 	LabelType             Enumerate
 	LabelCounter          "example"
+	ResumeCounter         true
 	Argument item:1
 		LabelString   "Custom Numbering|s"
 		Tooltip       "Customize the numeration"
@@ -95,6 +88,7 @@ Style Subexample
 	CopyStyle	      Numbered_Examples_(consecutive)
 	LatexName             subexample
 	LabelCounter          "subexample"
+	StepMasterCounter     true
 	Requires	      covington,enumitem
 	Preamble
 		\newenvironment{subexample}{%