anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 05:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #11741.

Browse Source 
Theorems weren't being numbered by chapter.
This commit is contained in:
Daniel Ramoeller 2020-08-09 13:09:41 -04:00 committed by Richard Kimberly Heck
parent c9bb699457
commit e6de6c2b59
4 changed files with 41 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/layouts/theorems-ams-bytype.module
View File

@ -22,47 +22,6 @@ Format 82
Requires amsmath,amsthm Requires amsmath,amsthm
# We need separate counters for each theorem-like style.
Counter theorem
GuiName Theorem
End
Counter corollary
GuiName Corollary
End
Counter lemma
GuiName Lemma
End
Counter proposition
GuiName Proposition
End
Counter conjecture
GuiName Conjecture
End
Counter fact
GuiName Fact
End
Counter definition
GuiName Definition
End
Counter example
GuiName Example
End
Counter solution
GuiName Solution
End
Counter problem
GuiName Problem
End
Counter exercise
GuiName Exercise
End
Counter remark
GuiName Remark
End
Counter claim
GuiName Claim
End
Input theorems-order.inc Input theorems-order.inc
Input theorems-ams-bytype.inc Input theorems-ams-bytype.inc
Input theorems-starred.inc Input theorems-starred.inc

39
lib/layouts/theorems-ams-chap-bytype.inc
View File

@ -27,42 +27,55 @@
Format 82 Format 82
Counter theorem Counter theorem
GuiName Theorem GuiName Theorem
Within chapter
End End
Counter corollary Counter corollary
GuiName Corollary GuiName Corollary
Within chapter
End End
Counter lemma Counter lemma
GuiName Lemma GuiName Lemma
Within chapter
End End
Counter proposition Counter proposition
GuiName Proposition GuiName Proposition
Within chapter
End End
Counter conjecture Counter conjecture
GuiName Conjecture GuiName Conjecture
Within chapter
End End
Counter fact Counter fact
GuiName Fact GuiName Fact
Within chapter
End End
Counter definition Counter definition
GuiName Definition GuiName Definition
Within chapter
End End
Counter example Counter example
GuiName Example GuiName Example
Within chapter
End End
Counter problem Counter problem
GuiName Problem GuiName Problem
Within chapter
End End
Counter exercise Counter exercise
GuiName Exercise GuiName Exercise
Within chapter
End End
Counter solution Counter solution
GuiName Solution GuiName Solution
Within chapter
End End
Counter remark Counter remark
GuiName Remark GuiName Remark
Within chapter
End End
Counter claim Counter claim
GuiName Claim GuiName Claim
Within chapter
End End
OutlinerName thm "Definitions & Theorems" OutlinerName thm "Definitions & Theorems"
@ -92,7 +105,7 @@ Style Theorem
AlignPossible Left AlignPossible Left
LabelType Static LabelType Static
LabelCounter theorem LabelCounter theorem
LabelString "Theorem \thechapter.\thetheorem." LabelString "Theorem \thetheorem."
Font Font
Shape Italic Shape Italic
Size Normal Size Normal
@ -122,7 +135,7 @@ End
Style Corollary Style Corollary
CopyStyle Theorem CopyStyle Theorem
LatexName cor LatexName cor
LabelString "Corollary \thechapter.\thecorollary." LabelString "Corollary \thecorollary."
Preamble Preamble
\theoremstyle{plain} \theoremstyle{plain}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -144,7 +157,7 @@ End
Style Lemma Style Lemma
CopyStyle Theorem CopyStyle Theorem
LatexName lem LatexName lem
LabelString "Lemma \thechapter.\thelemma." LabelString "Lemma \thelemma."
Preamble Preamble
\theoremstyle{plain} \theoremstyle{plain}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -166,7 +179,7 @@ End
Style Proposition Style Proposition
CopyStyle Theorem CopyStyle Theorem
LatexName prop LatexName prop
LabelString "Proposition \thechapter.\theproposition." LabelString "Proposition \theproposition."
Preamble Preamble
\theoremstyle{plain} \theoremstyle{plain}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -188,7 +201,7 @@ End
Style Conjecture Style Conjecture
CopyStyle Theorem CopyStyle Theorem
LatexName conjecture LatexName conjecture
LabelString "Conjecture \thechapter.\theconjecture." LabelString "Conjecture \theconjecture."
Preamble Preamble
\theoremstyle{plain} \theoremstyle{plain}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -210,7 +223,7 @@ End
Style Fact Style Fact
CopyStyle Theorem CopyStyle Theorem
LatexName fact LatexName fact
LabelString "Fact \thechapter.\thefact." LabelString "Fact \thefact."
Preamble Preamble
\theoremstyle{plain} \theoremstyle{plain}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -232,7 +245,7 @@ End
Style Definition Style Definition
CopyStyle Theorem CopyStyle Theorem
LatexName defn LatexName defn
LabelString "Definition \thechapter.\thedefinition." LabelString "Definition \thedefinition."
Font Font
Shape Up Shape Up
EndFont EndFont
@ -261,7 +274,7 @@ End
Style Example Style Example
CopyStyle Definition CopyStyle Definition
LatexName example LatexName example
LabelString "Example \thechapter.\theexample." LabelString "Example \theexample."
Preamble Preamble
\theoremstyle{definition} \theoremstyle{definition}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -284,7 +297,7 @@ End
Style Problem Style Problem
CopyStyle Definition CopyStyle Definition
LatexName problem LatexName problem
LabelString "Problem \thechapter.\theproblem." LabelString "Problem \theproblem."
Preamble Preamble
\theoremstyle{definition} \theoremstyle{definition}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -307,7 +320,7 @@ End
Style Exercise Style Exercise
CopyStyle Definition CopyStyle Definition
LatexName xca LatexName xca
LabelString "Exercise \thechapter.\theexercise." LabelString "Exercise \theexercise."
Preamble Preamble
\theoremstyle{definition} \theoremstyle{definition}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -330,7 +343,7 @@ End
Style Solution Style Solution
CopyStyle Definition CopyStyle Definition
LatexName sol LatexName sol
LabelString "Solution \thechapter.\thesolution." LabelString "Solution \thesolution."
Preamble Preamble
\theoremstyle{definition} \theoremstyle{definition}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -353,7 +366,7 @@ End
Style Remark Style Remark
CopyStyle Theorem CopyStyle Theorem
LatexName rem LatexName rem
LabelString "Remark \thechapter.\theremark." LabelString "Remark \theremark."
Font Font
Shape Up Shape Up
Size Normal Size Normal
@ -385,7 +398,7 @@ End
Style Claim Style Claim
CopyStyle Remark CopyStyle Remark
LatexName claim LatexName claim
LabelString "Claim \thechapter.\theclaim." LabelString "Claim \theclaim."
Preamble Preamble
\theoremstyle{remark} \theoremstyle{remark}
\ifx\thechapter\undefined \ifx\thechapter\undefined

57
lib/layouts/theorems-ams-chap-bytype.module
View File

@ -23,63 +23,6 @@ Format 82
Requires amsmath,amsthm Requires amsmath,amsthm
# The environments defined (regular and starred) are :
# - theorem
# - corollary
# - lemma
# - proposition
# - conjecture
# - fact
# - definition
# - example
# - solution
# - problem
# - exercise
# - remark
# - claim
# We need separate counters for each theorem-like style.
Counter theorem
GuiName Theorem
End
Counter corollary
GuiName Corollary
End
Counter lemma
GuiName Lemma
End
Counter proposition
GuiName Proposition
End
Counter conjecture
GuiName Conjecture
End
Counter fact
GuiName Fact
End
Counter definition
GuiName Definition
End
Counter example
GuiName Example
End
Counter solution
GuiName Solution
End
Counter problem
GuiName Problem
End
Counter exercise
GuiName Exercise
End
Counter remark
GuiName Remark
End
Counter claim
GuiName Claim
End
Input theorems-order.inc Input theorems-order.inc
Input theorems-ams-chap-bytype.inc Input theorems-ams-chap-bytype.inc
Input theorems-starred.inc Input theorems-starred.inc

26
lib/layouts/theorems-ams-extended-chap-bytype.module
View File

@ -40,15 +40,19 @@ Requires amsmath
# We need separate counters for each theorem-like style. # We need separate counters for each theorem-like style.
Counter criterion Counter criterion
GuiName Criterion GuiName Criterion
Within chapter
End End
Counter algorithm Counter algorithm
GuiName Algorithm GuiName Algorithm
Within chapter
End End
Counter axiom Counter axiom
GuiName Axiom GuiName Axiom
Within chapter
End End
Counter condition Counter condition
GuiName Condition GuiName Condition
Within chapter
End End
Counter note Counter note
GuiName Note GuiName Note
@ -78,7 +82,7 @@ End
Style Criterion Style Criterion
CopyStyle Theorem CopyStyle Theorem
LatexName criterion LatexName criterion
LabelString "Criterion \thechapter.\thecriterion." LabelString "Criterion \thecriterion."
Preamble Preamble
\theoremstyle{plain} \theoremstyle{plain}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -117,7 +121,7 @@ End
Style Algorithm Style Algorithm
CopyStyle Theorem CopyStyle Theorem
LatexName lyxalgorithm LatexName lyxalgorithm
LabelString "Algorithm \thechapter.\thealgorithm." LabelString "Algorithm \thealgorithm."
Preamble Preamble
\theoremstyle{plain} \theoremstyle{plain}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -156,7 +160,7 @@ End
Style Axiom Style Axiom
CopyStyle Theorem CopyStyle Theorem
LatexName ax LatexName ax
LabelString "Axiom \thechapter.\theaxiom." LabelString "Axiom \theaxiom."
Preamble Preamble
\theoremstyle{plain} \theoremstyle{plain}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -195,7 +199,7 @@ End
Style Condition Style Condition
CopyStyle Definition CopyStyle Definition
LatexName condition LatexName condition
LabelString "Condition \thechapter.\thecondition." LabelString "Condition \thecondition."
Preamble Preamble
\theoremstyle{definition} \theoremstyle{definition}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -234,7 +238,7 @@ End
Style Note Style Note
CopyStyle Remark CopyStyle Remark
LatexName note LatexName note
LabelString "Note \thechapter.\thenote." LabelString "Note \thenote."
Preamble Preamble
\theoremstyle{remark} \theoremstyle{remark}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -273,7 +277,7 @@ End
Style Notation Style Notation
CopyStyle Remark CopyStyle Remark
LatexName notation LatexName notation
LabelString "Notation \thechapter.\thenotation." LabelString "Notation \thenotation."
Preamble Preamble
\theoremstyle{remark} \theoremstyle{remark}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -312,7 +316,7 @@ End
Style Summary Style Summary
CopyStyle Remark CopyStyle Remark
LatexName summary LatexName summary
LabelString "Summary \thechapter.\thesummary." LabelString "Summary \thesummary."
Preamble Preamble
\theoremstyle{remark} \theoremstyle{remark}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -352,7 +356,7 @@ End
Style Acknowledgement Style Acknowledgement
CopyStyle Remark CopyStyle Remark
LatexName acknowledgement LatexName acknowledgement
LabelString "Acknowledgement \thechapter.\theacknowledgement." LabelString "Acknowledgement \theacknowledgement."
Preamble Preamble
\theoremstyle{remark} \theoremstyle{remark}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -391,7 +395,7 @@ End
Style Conclusion Style Conclusion
CopyStyle Remark CopyStyle Remark
LatexName conclusion LatexName conclusion
LabelString "Conclusion \thechapter.\theconclusion." LabelString "Conclusion \theconclusion."
Preamble Preamble
\theoremstyle{remark} \theoremstyle{remark}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -430,7 +434,7 @@ End
Style Assumption Style Assumption
CopyStyle Theorem CopyStyle Theorem
LatexName assumption LatexName assumption
LabelString "Assumption \thechapter.\theassumption." LabelString "Assumption \theassumption."
Preamble Preamble
\theoremstyle{plain} \theoremstyle{plain}
\ifx\thechapter\undefined \ifx\thechapter\undefined
@ -469,7 +473,7 @@ Style Question
CopyStyle Theorem CopyStyle Theorem
DependsOn Theorem DependsOn Theorem
LatexName question LatexName question
LabelString "Question \thechapter.\thequestion." LabelString "Question \thequestion."
Preamble Preamble
\theoremstyle{plain} \theoremstyle{plain}
\ifx\thechapter\undefined \ifx\thechapter\undefined