X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams-chap-bytype.inc;h=37577235ac9a12a412b7eef3b6c9db668718ee66;hb=e2e74ffb0a72477420bfc2a8be0fcfbafe52e8ae;hp=c5774b37fd898fb04be99070b860fb3736c63622;hpb=a7e26710cbc91353c417fc8ce30c6b1565958b32;p=lyx.git diff --git a/lib/layouts/theorems-ams-chap-bytype.inc b/lib/layouts/theorems-ams-chap-bytype.inc index c5774b37fd..37577235ac 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 # modified and modularized by Emmanuel GUREGHIAN # Tinkered with Sep. '07 by Paul Rubin -# Modularized Jan 08 by Richard Heck +# Modularized Jan 08 by Richard Kimberly Heck # Hacked June '09 by Paul Rubin to use separate counters # Chapter dependence added Oct '16 by Andrew Parsloe @@ -23,46 +23,48 @@ # - Case (by inclusion) -# We need separate counters for each theorem-like style. -Format 80 +Format 104 + +Input theorems-counters-bytype.inc + Counter theorem - GuiName Theorem + Within chapter End Counter corollary - GuiName Corollary + Within chapter End Counter lemma - GuiName Lemma + Within chapter End Counter proposition - GuiName Proposition + Within chapter End Counter conjecture - GuiName Conjecture + Within chapter End Counter fact - GuiName Fact + Within chapter End Counter definition - GuiName Definition + Within chapter End Counter example - GuiName Example + Within chapter End Counter problem - GuiName Problem + Within chapter End Counter exercise - GuiName Exercise + Within chapter End Counter solution - GuiName Solution + Within chapter End Counter remark - GuiName Remark + Within chapter End Counter claim - GuiName Claim + Within chapter End OutlinerName thm "Definitions & Theorems" @@ -92,7 +94,7 @@ Style Theorem AlignPossible Left LabelType Static LabelCounter theorem - LabelString "Theorem \thechapter.\thetheorem." + LabelString "Theorem \thetheorem." Font Shape Italic Size Normal @@ -116,13 +118,18 @@ Style Theorem \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}} EndBabelPreamble Requires amsthm + DocBookWrapperTag figure + DocBookWrapperAttr role='theorem' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Corollary CopyStyle Theorem LatexName cor - LabelString "Corollary \thechapter.\thecorollary." + LabelString "Corollary \thecorollary." Preamble \theoremstyle{plain} \ifx\thechapter\undefined @@ -138,13 +145,18 @@ Style Corollary BabelPreamble \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}} EndBabelPreamble + DocBookWrapperTag figure + DocBookWrapperAttr role='corollary' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Lemma CopyStyle Theorem LatexName lem - LabelString "Lemma \thechapter.\thelemma." + LabelString "Lemma \thelemma." Preamble \theoremstyle{plain} \ifx\thechapter\undefined @@ -160,13 +172,18 @@ Style Lemma \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}} EndBabelPreamble LabelCounter lemma + DocBookWrapperTag figure + DocBookWrapperAttr role='lemma' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Proposition CopyStyle Theorem LatexName prop - LabelString "Proposition \thechapter.\theproposition." + LabelString "Proposition \theproposition." Preamble \theoremstyle{plain} \ifx\thechapter\undefined @@ -182,13 +199,18 @@ Style Proposition \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}} EndBabelPreamble LabelCounter proposition + DocBookWrapperTag figure + DocBookWrapperAttr role='proposition' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Conjecture CopyStyle Theorem LatexName conjecture - LabelString "Conjecture \thechapter.\theconjecture." + LabelString "Conjecture \theconjecture." Preamble \theoremstyle{plain} \ifx\thechapter\undefined @@ -204,13 +226,18 @@ Style Conjecture \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}} EndBabelPreamble LabelCounter conjecture + DocBookWrapperTag figure + DocBookWrapperAttr role='conjecture' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Fact CopyStyle Theorem LatexName fact - LabelString "Fact \thechapter.\thefact." + LabelString "Fact \thefact." Preamble \theoremstyle{plain} \ifx\thechapter\undefined @@ -226,13 +253,18 @@ Style Fact \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}} EndBabelPreamble LabelCounter fact + DocBookWrapperTag figure + DocBookWrapperAttr role='fact' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Definition CopyStyle Theorem LatexName defn - LabelString "Definition \thechapter.\thedefinition." + LabelString "Definition \thedefinition." Font Shape Up EndFont @@ -255,13 +287,18 @@ Style Definition \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}} EndBabelPreamble LabelCounter definition + DocBookWrapperTag figure + DocBookWrapperAttr role='definition' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Example CopyStyle Definition LatexName example - LabelString "Example \thechapter.\theexample." + LabelString "Example \theexample." Preamble \theoremstyle{definition} \ifx\thechapter\undefined @@ -278,13 +315,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 @@ -301,13 +341,18 @@ Style Problem \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}} EndBabelPreamble LabelCounter problem + DocBookWrapperTag figure + DocBookWrapperAttr role='problem' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Exercise CopyStyle Definition LatexName xca - LabelString "Exercise \thechapter.\theexercise." + LabelString "Exercise \theexercise." Preamble \theoremstyle{definition} \ifx\thechapter\undefined @@ -324,13 +369,18 @@ Style Exercise \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}} EndBabelPreamble LabelCounter exercise + DocBookWrapperTag figure + DocBookWrapperAttr role='exercise' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Solution CopyStyle Definition LatexName sol - LabelString "Solution \thechapter.\thesolution." + LabelString "Solution \thesolution." Preamble \theoremstyle{definition} \ifx\thechapter\undefined @@ -347,13 +397,18 @@ Style Solution \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}} EndBabelPreamble LabelCounter solution + DocBookWrapperTag figure + DocBookWrapperAttr role='solution' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Remark CopyStyle Theorem LatexName rem - LabelString "Remark \thechapter.\theremark." + LabelString "Remark \theremark." Font Shape Up Size Normal @@ -377,13 +432,18 @@ Style Remark \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}} EndBabelPreamble LabelCounter remark + DocBookWrapperTag figure + DocBookWrapperAttr role='remark' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End Style Claim CopyStyle Remark LatexName claim - LabelString "Claim \thechapter.\theclaim." + LabelString "Claim \theclaim." Preamble \theoremstyle{remark} \ifx\thechapter\undefined @@ -400,6 +460,11 @@ Style Claim \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}} EndBabelPreamble LabelCounter claim + DocBookWrapperTag figure + DocBookWrapperAttr role='claim' + DocBookTag para + DocBookGenerateTitle true + DocBookWrapperMergeWithPrevious true End