X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams-chap-bytype.inc;h=a8ea0be05d151ef8252e68646331b9f2869bac72;hb=9ca91b25664221978c336527002e66a7d18c95ef;hp=efebe939ac50f664221b27bff3993f6473655d26;hpb=0f5ba65eae1b3e069be0be279904c911fe02907c;p=features.git

diff --git a/lib/layouts/theorems-ams-chap-bytype.inc b/lib/layouts/theorems-ams-chap-bytype.inc
index efebe939ac..a8ea0be05d 100644
--- a/lib/layouts/theorems-ams-chap-bytype.inc
+++ b/lib/layouts/theorems-ams-chap-bytype.inc
@@ -2,7 +2,7 @@
 # Probably broken by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
 # modified and modularized by Emmanuel GUREGHIAN <gureghia@boston.bertin.fr>
 # Tinkered with Sep. '07 by Paul Rubin <rubin@msu.edu>
-# Modularized Jan 08 by Richard Heck <rgheck@comcast.net>
+# Modularized Jan 08 by Richard Kimberly Heck <rikiheck@lyx.org>
 # Hacked June '09 by Paul Rubin <rubin@msu.edu> to use separate counters
 # Chapter dependence added Oct '16 by Andrew Parsloe <aparsloe@clear.net.nz>
 
@@ -23,33 +23,48 @@
 # - Case (by inclusion)
 
 
-# We need separate counters for each theorem-like style.
-Format 60
+Format 95
+
+Input theorems-counters-bytype.inc
+
 Counter theorem
+	Within chapter
 End
 Counter corollary
+	Within chapter
 End
 Counter lemma
+	Within chapter
 End
 Counter proposition
+	Within chapter
 End
 Counter conjecture
+	Within chapter
 End
 Counter fact
+	Within chapter
 End
 Counter definition
+	Within chapter
 End
 Counter example
+	Within chapter
 End
 Counter problem
+	Within chapter
 End
 Counter exercise
+	Within chapter
 End
 Counter solution
+	Within chapter
 End
 Counter remark
+	Within chapter
 End
 Counter claim
+	Within chapter
 End
 
 OutlinerName thm "Definitions & Theorems"
@@ -79,7 +94,7 @@ Style Theorem
 	AlignPossible         Left
 	LabelType             Static
 	LabelCounter          theorem
-	LabelString           "Theorem \thechapter.\thetheorem."
+	LabelString           "Theorem \thetheorem."
 	Font
 	  Shape               Italic
 	  Size                Normal
@@ -103,13 +118,15 @@ Style Theorem
 		\addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
 	EndBabelPreamble
 	Requires              amsthm
+	DocBookTag            para
+	DocBookAttr           role='theorem'
 End
 
 
 Style Corollary
 	CopyStyle             Theorem
 	LatexName             cor
-	LabelString           "Corollary \thechapter.\thecorollary."
+	LabelString           "Corollary \thecorollary."
 	Preamble
 	  \theoremstyle{plain}
     \ifx\thechapter\undefined
@@ -125,13 +142,15 @@ Style Corollary
 	BabelPreamble
 		\addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
 	EndBabelPreamble
+	DocBookTag            para
+	DocBookAttr           role='corollary'
 End
 
 
 Style Lemma
 	CopyStyle             Theorem
 	LatexName             lem
-	LabelString           "Lemma \thechapter.\thelemma."
+	LabelString           "Lemma \thelemma."
 	Preamble
 	  \theoremstyle{plain}
     \ifx\thechapter\undefined
@@ -147,13 +166,15 @@ Style Lemma
 	  \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
 	EndBabelPreamble
 	LabelCounter          lemma
+	DocBookTag            para
+	DocBookAttr           role='lemma'
 End
 
 
 Style Proposition
 	CopyStyle             Theorem
 	LatexName             prop
-	LabelString           "Proposition \thechapter.\theproposition."
+	LabelString           "Proposition \theproposition."
 	Preamble
 	  \theoremstyle{plain}
     \ifx\thechapter\undefined
@@ -169,13 +190,15 @@ Style Proposition
 	  \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
 	EndBabelPreamble
 	LabelCounter          proposition
+	DocBookTag            para
+	DocBookAttr           role='proposition'
 End
 
 
 Style Conjecture
 	CopyStyle             Theorem
 	LatexName             conjecture
-	LabelString           "Conjecture \thechapter.\theconjecture."
+	LabelString           "Conjecture \theconjecture."
 	Preamble
 	  \theoremstyle{plain}
     \ifx\thechapter\undefined
@@ -191,13 +214,15 @@ Style Conjecture
 	  \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
 	EndBabelPreamble
 	LabelCounter          conjecture
+	DocBookTag            para
+	DocBookAttr           role='conjecture'
 End
 
 
 Style Fact
 	CopyStyle             Theorem
 	LatexName             fact
-	LabelString           "Fact \thechapter.\thefact."
+	LabelString           "Fact \thefact."
 	Preamble
 	  \theoremstyle{plain}
     \ifx\thechapter\undefined
@@ -213,13 +238,15 @@ Style Fact
 	  \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
 	EndBabelPreamble
 	LabelCounter          fact
+	DocBookTag            para
+	DocBookAttr           role='fact'
 End
 
 
 Style Definition
 	CopyStyle             Theorem
 	LatexName             defn
-	LabelString           "Definition \thechapter.\thedefinition."
+	LabelString           "Definition \thedefinition."
 	Font
 	  Shape               Up
 	EndFont
@@ -242,13 +269,15 @@ Style Definition
 	  \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
 	EndBabelPreamble
 	LabelCounter          definition
+	DocBookTag            para
+	DocBookAttr           role='definition'
 End
 
 
 Style Example
 	CopyStyle             Definition
 	LatexName             example
-	LabelString           "Example \thechapter.\theexample."
+	LabelString           "Example \theexample."
 	Preamble
 	  \theoremstyle{definition}
     \ifx\thechapter\undefined
@@ -265,13 +294,16 @@ Style Example
 	  \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
 	EndBabelPreamble
 	LabelCounter          example
+	DocBookWrapperTag     informalexample
+	DocBookTag            para
+	DocBookAttr        ""
 End
 
 
 Style Problem
 	CopyStyle             Definition
 	LatexName             problem
-	LabelString           "Problem \thechapter.\theproblem."
+	LabelString           "Problem \theproblem."
 	Preamble
 	  \theoremstyle{definition}
     \ifx\thechapter\undefined
@@ -288,13 +320,15 @@ Style Problem
 	  \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
 	EndBabelPreamble
 	LabelCounter          problem
+	DocBookTag            para
+	DocBookAttr           role='problem'
 End
 
 
 Style Exercise
 	CopyStyle             Definition
 	LatexName             xca
-	LabelString           "Exercise \thechapter.\theexercise."
+	LabelString           "Exercise \theexercise."
 	Preamble
 	  \theoremstyle{definition}
     \ifx\thechapter\undefined
@@ -311,13 +345,15 @@ Style Exercise
 	  \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
 	EndBabelPreamble
 	LabelCounter          exercise
+	DocBookTag            para
+	DocBookAttr           role='exercise'
 End
 
 
 Style Solution
 	CopyStyle             Definition
 	LatexName             sol
-	LabelString           "Solution \thechapter.\thesolution."
+	LabelString           "Solution \thesolution."
 	Preamble
 	  \theoremstyle{definition}
     \ifx\thechapter\undefined
@@ -334,13 +370,15 @@ Style Solution
 		\addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
 	EndBabelPreamble
 	LabelCounter          solution
+	DocBookTag            para
+	DocBookAttr           role='solution'
 End
 
 
 Style Remark
 	CopyStyle             Theorem
 	LatexName             rem
-	LabelString           "Remark \thechapter.\theremark."
+	LabelString           "Remark \theremark."
 	Font
 	  Shape               Up
 	  Size                Normal
@@ -364,13 +402,15 @@ Style Remark
 	  \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
 	EndBabelPreamble
 	LabelCounter          remark
+	DocBookTag            note
+	DocBookItemTag        para
 End
 
 
 Style Claim
 	CopyStyle             Remark
 	LatexName             claim
-	LabelString           "Claim \thechapter.\theclaim."
+	LabelString           "Claim \theclaim."
 	Preamble
 	  \theoremstyle{remark}
     \ifx\thechapter\undefined
@@ -387,6 +427,9 @@ Style Claim
 	  \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
 	EndBabelPreamble
 	LabelCounter          claim
+	DocBookTag            para
+	DocBookAttr           role='claim'
+	DocBookItemTag        ""
 End