- theorems-without-preamble.inc: new file to provide theorem environments without any preamble code or required packages

- ijmpc.layout, ijmpd.layout, svcommon.inc: use the new file
- svcommon.inc: enable theorem numbering and some other bug fixes
- svjour3.lyx: adapt example file
- svglobal3.layout: adapt file
- theorems.inc: update list

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39126 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-06-17 04:10:49 +00:00
parent 57d216dc7e
commit dade2afba9
9 changed files with 656 additions and 376 deletions

View File

@ -2942,6 +2942,7 @@ lib_layouts_inc_files = Split('''
theorems-refprefix.inc
theorems-starred.inc
theorems-starred-equivalents.inc
theorems-without-preamble.inc
''')

View File

@ -1481,6 +1481,7 @@ dist_layouts_DATA =\
layouts/theorems-starred.inc \
layouts/theorems-starred.module \
layouts/theorems-std.module \
layouts/theorems-without-preamble.inc \
layouts/treport.layout \
layouts/tufte-book.layout \
layouts/tufte-handout.layout

View File

@ -39,6 +39,17 @@ Input stdlayouts.inc
Input lyxmacros.inc
ProvidesModule theorems-std
Input theorems-without-preamble.inc
NoStyle Fact
NoStyle Note
NoStyle Problem
NoStyle Solution
NoStyle Prob
NoStyle Exercise
NoStyle Example
NoStyle Definition
NoStyle Case
NoStyle Property
NoStyle Chapter
NoCounter chapter
@ -301,30 +312,6 @@ Style RomanList
RefPrefix enu
End
Counter theorem
End
Style Theorem
LatexType Environment
LatexName theorem
Category Theorem
Margin First_Dynamic
TopSep 0.6
BottomSep 0.6
Align Block
NextNoIndent 1
LabelType Counter
LabelCounter theorem
LabelString "Theorem \thetheorem."
LabelSep M
Font
Shape Italic
EndFont
LabelFont
Series Bold
Shape Up
EndFont
End
Style Proof
LatexType Environment
LatexName proof
@ -334,75 +321,86 @@ Style Proof
BottomSep 0.6
Align Block
LabelType Static
LabelString "Proof."
LabelString "Proof:"
LabelSep M
LabelFont
Series Bold
EndFont
LabelFont
Series Bold
EndFont
EndLabelType Box
End
Counter corollary
Style Theorem
OptionalArgs 0
LabelString "Theorem \thetheorem."
#Font
#Shape Up
#EndFont
#LabelFont
#Series Bold
#EndFont
End
Style Remark
LabelString "Remark \theremark."
LabelFont
Series Bold
Shape Up
EndFont
End
Style Corollary
CopyStyle Theorem
LatexName corollary
LabelCounter corollary
LabelString "Corollary \thecorollary."
End
Counter lemma
End
Style Lemma
CopyStyle Theorem
LatexName lemma
LabelCounter lemma
LabelString "Lemma \thelemma."
End
Counter proposition
End
Style Proposition
CopyStyle Theorem
LatexName proposition
LabelCounter proposition
LabelString "Proposition \theproposition."
End
Counter prop
End
Style Prop
CopyStyle Theorem
LatexName prop
LabelCounter prop
LabelString "Prop \theprop."
End
Counter question
End
Style Question
CopyStyle Theorem
LatexName question
LabelCounter question
LabelString "Question \thequestion."
LabelFont
Series Bold
Shape Up
EndFont
End
Counter claim
Within section
End
Style Claim
CopyStyle Theorem
LatexName claim
LabelCounter claim
LabelString "Claim \theclaim."
Font
Shape Italic
EndFont
LabelFont
Series Bold
Shape Up
EndFont
End
Counter conjecture
End
Style Conjecture
CopyStyle Theorem
LatexName conjecture
LabelCounter conjecture
LabelString "Conjecture \theconjecture."
Font
Shape Italic
EndFont
LabelFont
Series Bold
Shape Up
EndFont
End
Style Prop
LabelFont
Series Bold
EndFont
End
Counter appendix

View File

@ -44,6 +44,17 @@ Input stdlayouts.inc
Input lyxmacros.inc
ProvidesModule theorems-std
Input theorems-without-preamble.inc
NoStyle Fact
NoStyle Note
NoStyle Problem
NoStyle Solution
NoStyle Prob
NoStyle Exercise
NoStyle Example
NoStyle Definition
NoStyle Case
NoStyle Property
NoStyle Chapter
NoCounter chapter
@ -304,48 +315,6 @@ Style RomanList
RefPrefix enu
End
Counter remark
Within section
End
Style Remark
LatexName remark
Category Theorem
LabelCounter remark
LabelString "Remark \theremark."
LatexType Environment
Margin First_Dynamic
TopSep 0.6
BottomSep 0.6
Align Block
LabelType Counter
LabelSep M
NextNoIndent 1
LabelFont
Series Bold
EndFont
End
Counter theorem
Within section
End
Style Theorem
LatexType Environment
LatexName theorem
Category Theorem
Margin First_Dynamic
TopSep 0.6
BottomSep 0.6
Align Block
NextNoIndent 1
LabelType Counter
LabelCounter theorem
LabelString "Theorem \thetheorem."
LabelSep M
LabelFont
Series Bold
EndFont
End
Style Proof
LatexType Environment
LatexName proof
@ -366,67 +335,85 @@ Style Proof
EndLabelType Box
End
Counter theorem
Within section
End
Style Theorem
OptionalArgs 0
LabelString "Theorem \thetheorem."
Font
Shape Up
EndFont
LabelFont
Series Bold
EndFont
End
Counter remark
Within section
End
Style Remark
LabelString "Remark \theremark."
LabelFont
Series Bold
Shape Up
EndFont
End
Counter corollary
Within section
End
Style Corollary
CopyStyle Theorem
LatexName corollary
LabelCounter corollary
LabelString "Corollary \thecorollary."
End
Counter lemma
Within section
End
Style Lemma
CopyStyle Theorem
LatexName lemma
LabelCounter lemma
LabelString "Lemma \thelemma."
End
Counter proposition
Within section
End
Style Proposition
CopyStyle Theorem
LatexName proposition
LabelCounter proposition
LabelString "Proposition \theproposition."
End
Counter prop
End
Style Prop
CopyStyle Theorem
LatexName prop
LabelCounter prop
LabelString "Prop \theprop."
End
Counter question
Within section
End
Style Question
CopyStyle Theorem
LatexName question
LabelCounter question
LabelString "Question \thequestion."
LabelFont
Shape Up
EndFont
End
Counter claim
Within section
End
Style Claim
CopyStyle Theorem
LatexName claim
LabelCounter claim
LabelString "Claim \theclaim."
LabelFont
Shape Up
EndFont
End
Counter conjecture
Within section
End
Style Conjecture
CopyStyle Theorem
LatexName conjecture
LabelCounter conjecture
LabelString "Conjecture \theconjecture."
LabelFont
Shape Up
EndFont
End
Counter prop
Within section
End
Counter appendix

View File

@ -20,8 +20,6 @@
Format 35
Columns 2
Sides 1
PageStyle Plain
@ -36,20 +34,21 @@ Style Standard
LabelType No_Label
End
Input stdcounters.inc
Input stdfloats.inc
Input stdlists.inc
Input stdinsets.inc
Input stdsections.inc
Input stdstarsections.inc
Input stdlayouts.inc
Input stdlists.inc
Input stdfloats.inc
Input stdcounters.inc
Input stdtitle.inc
Input numreport.inc
ProvidesModule theorems-std
Input theorems-without-preamble.inc
NoStyle Fact
NoStyle Prop
NoStyle Subparagraph
NoCounter subparagraph
@ -107,8 +106,6 @@ Style Back_Matter
LabelString "--- Back Matter ---"
End
Style Part
Margin Static
Align Right
@ -148,7 +145,6 @@ Style PartBacktext
HTMLTag h1
End
Style Chapter
Align Left
End
@ -231,18 +227,15 @@ Style Paragraph
TocLevel 4
End
Style Part*
Margin Static
Align Right
End
Style Chapter*
Align Left
End
Style Section*
Font
Series Bold
@ -251,7 +244,6 @@ Style Section*
EndFont
End
Style Subsection*
Font
Series Bold
@ -303,7 +295,6 @@ Style Sub-run-in_headings
LatexName subruninhead
End
Style Extrachap
CopyStyle Chapter*
LatexName Extrachap
@ -314,7 +305,6 @@ Style extrachap
LatexName extrachap
End
Style Title
Align Left
AlignPossible Block, Center, Left, Right, Center
@ -324,7 +314,6 @@ Style Title
EndFont
End
Style Subtitle
CopyStyle Title
LatexName subtitle
@ -336,7 +325,6 @@ Style Subtitle
EndFont
End
Style Author
NextNoIndent 1
Align Left
@ -346,7 +334,6 @@ Style Author
EndFont
End
Style Institute
Category FrontMatter
LatexType Command
@ -377,11 +364,11 @@ Style TOC_Title
Align Left
LatexType Command
LatexName toctitle
LeftMargin "TOC title:xxx"
LeftMargin xxx
TopSep 0.4
BottomSep 0.4
LabelType Static
LabelSep xxx
LabelSep x
LabelString "TOC Title:"
LabelFont
Family Typewriter
@ -392,14 +379,13 @@ End
Style TOC_Author
CopyStyle TOC_Title
LatexName tocauthor
LeftMargin "TOC Author:xxx"
LabelString "TOC Author:"
End
Style Running_Title
CopyStyle TOC_Title
LatexName titlerunning
LeftMargin "Running Title:xxx"
InTitle 1
LabelString "Running Title:"
End
@ -410,7 +396,6 @@ End
Style Running_Author
CopyStyle Running_Title
LatexName authorrunning
LeftMargin "Running Author:xxx"
LabelString "Running Author:"
End
Style Author_Running
@ -418,8 +403,9 @@ Style Author_Running
End
Style Abstract
Category FrontMatter
Margin First_Dynamic
LatexType Command
LatexType Environment
LatexName abstract
LabelType Static
LabelString "Abstract."
@ -449,7 +435,6 @@ Style Abstract*
EndFont
End
Style Keywords
Margin First_Dynamic
LatexType Command
@ -470,8 +455,6 @@ Style Keywords
EndFont
End
Style Dedication
Category FrontMatter
Margin Static
@ -549,6 +532,7 @@ End
Style Acknowledgement
Category BackMatter
Margin First_Dynamic
LatexType Environment
LatexName acknowledgement
@ -636,96 +620,10 @@ Style Svgraybox
EndFont
End
Style Case
LatexType Environment
Margin First_Dynamic
LatexName case
LabelString "Case #."
Category MainText
NextNoIndent 1
ParIndent MM
LabelSep xx
ItemSep 0
TopSep 0.5
BottomSep 0.5
ParSep 0
Align Block
AlignPossible Block, Left
LabelType Static
LabelFont
Shape Italic
EndFont
RefPrefix cas
End
Style Claim
CopyStyle Case
LabelString "Claim."
LatexName claim
End
Style Conjecture
CopyStyle Claim
LatexName conjecture
LabelString "Conjecture #."
RefPrefix con
End
Style Corollary
CopyStyle Claim
LatexName corollary
LabelString "Corollary #."
Font
Shape Italic
EndFont
LabelFont
Shape Up
Series Bold
EndFont
End
Style Definition
CopyStyle Claim
LatexName definition
LabelString "Definition #."
LabelFont
Shape Up
Series Bold
EndFont
RefPrefix def
End
Style Example
CopyStyle Claim
LatexName example
LabelString "Example #."
RefPrefix exa
End
Style Lemma
CopyStyle Corollary
LatexName lemma
LabelString "Lemma #."
End
Style Note
CopyStyle Claim
LatexName note
LabelString "Note #."
RefPrefix note
End
Style Proof
CopyStyle Claim
LatexName proof
LabelString "Proof."
LabelString "Proof"
End
Style Proof(QED)
@ -747,105 +645,11 @@ Style Proof(smartQED)
End
Style Property
CopyStyle Claim
LatexName property
LabelString "Property #."
End
Style Proposition
CopyStyle Corollary
LatexName proposition
LabelString "Proposition #."
End
Style Question
CopyStyle Claim
LatexName question
LabelString "Question #."
RefPrefix que
End
Style Remark
CopyStyle Claim
LatexName remark
LabelString "Remark #."
RefPrefix rem
End
Style Theorem
CopyStyle Corollary
LatexName theorem
LabelString "Theorem #."
End
Style Exercise
CopyStyle Definition
Category Exercise
LatexName exercise
LabelString "Exercise #."
RefPrefix exerc
End
Style Prob
CopyStyle Claim
Category Exercise
LatexName prob
LabelString "#"
LabelFont
Series Bold
Shape Up
EndFont
RefPrefix prob
End
# Current implementation of the Style Preface for backwards compatibility
# In future versions the directive "Reqyired Args 1" should be uncommented
# so that a required argument is used rather than ERT.
Style Sol
CopyStyle Prob
LatexName sol
LabelString "#={label}"
# RequiredArgs 1
NextNoIndent 0
RefPrefix sol
End
Style Problem_(theorem-like)
CopyStyle Claim
LabelFont
Series Bold
Shape Up
EndFont
Category Exercise
LatexName problem
LabelString "Problem #."
RefPrefix prob
End
Style Solution_(theorem-like)
CopyStyle Problem_(theorem-like)
LatexName solution
LabelString "Solution #."
RefPrefix sol
OptionalArgs 1
End
Style Description
OptionalArgs 1
End
InsetLayout Flex:Email
Decoration Conglomerate
LyxType custom
@ -888,9 +692,3 @@ End
# EndFont
# KeepEmpty 1
# End
Input theorems-refprefix.inc

View File

@ -45,6 +45,7 @@ NoStyle Sol
NoStyle Abstract*
NoStyle TOC_Title
NoStyle TOC_Author
NoStyle Proof(smartQED)
NoStyle Acknowledgement

View File

@ -0,0 +1,378 @@
# This file provides theorem environments without adding preamble code or
# requiring packages. THis is useful for classes that define their own theorems
# like svjour3 or ijmpc.
# Author: Uwe Stöhr <uwestoehr@web.de>
# The environnements defined are :
# - Theorem
# - Corollary
# - Lemma
# - Proposition
# - Prop
# - Conjecture
# - Fact
# - Definition
# - Example
# - Problem
# - Solution
# - Exercise
# - Remark
# - Claim
# - Case (defined without a counter)
# - Property
# - Question
# - Note
# - Prob
Format 35
Counter theorem
End
Style Theorem
Category Theorem
Margin First_Dynamic
LatexType Environment
LatexName theorem
NextNoIndent 1
OptionalArgs 1
LabelSep xx
ParIndent MMM
ParSkip 0.4
ItemSep 0.2
TopSep 0.7
BottomSep 0.7
ParSep 0.3
Align Block
AlignPossible Left
LabelType Counter
LabelCounter theorem
LabelString "Theorem \thetheorem"
Font
Shape Italic
Size Normal
EndFont
LabelFont
Shape Up
Series Bold
EndFont
LangPreamble
\providecommand{\theoremname}{_(Theorem)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
EndBabelPreamble
End
Counter corollary
End
Style Corollary
CopyStyle Theorem
LabelCounter corollary
LatexName corollary
LabelString "Corollary \thecorollary"
LangPreamble
\providecommand{\corollaryname}{_(Corollary)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
EndBabelPreamble
End
Counter lemma
End
Style Lemma
CopyStyle Theorem
LabelCounter lemma
LatexName lemma
LabelString "Lemma \thelemma"
LangPreamble
\providecommand{\lemmaname}{_(Lemma)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
EndBabelPreamble
End
Counter proposition
End
Style Proposition
CopyStyle Theorem
LabelCounter proposition
LatexName proposition
LabelString "Proposition \theproposition"
LangPreamble
\providecommand{\propositionname}{_(Proposition)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
EndBabelPreamble
End
Counter prop
End
Style Prop
CopyStyle Theorem
LabelCounter prop
LatexName prop
LabelString "Prop \theprop."
Font
Shape Up
EndFont
LabelFont
Series Medium
EndFont
LangPreamble
\providecommand{\propname}{_(Prop)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\propname}{_(Prop)}}
EndBabelPreamble
End
Counter conjecture
End
Style Conjecture
CopyStyle Theorem
LabelCounter conjecture
LatexName conjecture
LabelString "Conjecture \theconjecture"
Font
Shape Up
EndFont
LabelFont
Series Medium
Shape Italic
EndFont
LangPreamble
\providecommand{\conjecturename}{_(Conjecture)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
EndBabelPreamble
End
Counter fact
End
Style Fact
CopyStyle Theorem
LabelCounter fact
LatexName fact
LabelString "Fact \thefact."
LangPreamble
\providecommand{\factname}{_(Fact)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
EndBabelPreamble
End
Counter definition
End
Style Definition
CopyStyle Theorem
LabelCounter definition
LatexName definition
LabelString "Definition \thedefinition"
RefPrefix def
Font
Shape Up
EndFont
LabelFont
Shape Up
Series Bold
EndFont
LangPreamble
\providecommand{\definitionname}{_(Definition)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
EndBabelPreamble
End
Counter example
End
Style Example
CopyStyle Conjecture
LabelCounter example
LatexName example
LabelString "Example \theexample"
RefPrefix exa
LangPreamble
\providecommand{\examplename}{_(Example)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
EndBabelPreamble
End
Counter problem
End
Style Problem
CopyStyle Definition
Category Exercise
LabelCounter problem
LatexName problem
LabelString "Problem \theproblem"
RefPrefix prob
OptionalArgs 1
RequiredArgs 1
LangPreamble
\providecommand{\problemname}{_(Problem)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
EndBabelPreamble
End
Counter solution
End
Style Solution
CopyStyle Problem
LabelCounter solution
LatexName solution
LabelString "Solution \thesolution"
RefPrefix sol
LangPreamble
\providecommand{\solutionname}{_(Solution)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
EndBabelPreamble
End
Counter exercise
End
Style Exercise
CopyStyle Definition
LabelCounter exercise
LatexName exercise
LabelString "Exercise \theexercise"
RefPrefix exer
LangPreamble
\providecommand{\exercisename}{_(Exercise)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
EndBabelPreamble
End
Counter remark
End
Style Remark
CopyStyle Conjecture
LabelCounter remark
LatexName remark
LabelString "Remark \theremark"
RefPrefix rem
LangPreamble
\providecommand{\remarkname}{_(Remark)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
EndBabelPreamble
End
Style Claim
CopyStyle Remark
LatexName claim
LabelString "Claim "
LangPreamble
\providecommand{\claimname}{_(Claim)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
EndBabelPreamble
End
Counter case
End
Style Case
CopyStyle Remark
LabelCounter case
LatexName case
LabelString "Case \thecase"
RefPrefix case
LangPreamble
\providecommand{\casename}{_(Case)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\casename}{_(Case)}}
EndBabelPreamble
End
Counter property
End
Style Property
CopyStyle Claim
LabelCounter property
LatexName property
LabelString "Property \theproperty"
RefPrefix prop
LangPreamble
\providecommand{\propertyname}{_(Property)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\propertyname}{_(Property)}}
EndBabelPreamble
End
Counter question
End
Style Question
CopyStyle Claim
LabelCounter question
LatexName question
LabelString "Question \thequestion"
RefPrefix que
LangPreamble
\providecommand{\questionname}{_(Question)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\questionname}{_(Question)}}
EndBabelPreamble
End
Counter note
End
Style Note
CopyStyle Claim
LabelCounter note
LatexName note
LabelString "Note \thenote"
RefPrefix note
LangPreamble
\providecommand{\notename}{_(Note)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\notename}{_(Note)}}
EndBabelPreamble
End
Counter prob
End
Style Prob
CopyStyle Claim
LabelCounter prob
LatexName prob
LabelString "\theprob"
End

View File

@ -10,13 +10,13 @@
# - Lemma
# - Proposition
# - Conjecture
# - Fact
# - Definition
# - Example
# - Problem
# - Exercise
# - Remark
# - Claim
# - Proof
# - Case (regular only -- defined as an enumeration)
Format 35

View File

@ -3,6 +3,11 @@
\begin_document
\begin_header
\textclass svglobal3
\begin_preamble
\RequirePackage{fix-cm}
\smartqed % flush right qed marks, e.g. at end of proof
\end_preamble
\use_default_options true
\maintain_unincluded_children false
\language english
@ -85,6 +90,55 @@ http://wiki.lyx.org/Examples/Springer
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Note Note
status open
\begin_layout Plain Layout
possible document class options are:
\end_layout
\begin_layout Plain Layout
-
\begin_inset Quotes eld
\end_inset
\family sans
smallextended
\family default
\begin_inset Quotes erd
\end_inset
-> gives the second posible format
\end_layout
\begin_layout Plain Layout
-
\begin_inset Quotes eld
\end_inset
\family sans
twocolumn
\family default
\begin_inset Quotes erd
\end_inset
-> the two column formatting
\end_layout
\begin_layout Plain Layout
- if no option is given you get the standard/default format
\end_layout
\end_inset
\end_layout
\begin_layout Title
@ -111,6 +165,20 @@ Do you have a subtitle?
If so, write it here
\end_layout
\begin_layout Running Title
Short form of title
\begin_inset Note Note
status open
\begin_layout Plain Layout
optional
\end_layout
\end_inset
\end_layout
\begin_layout Author
First Author
\begin_inset ERT
@ -128,6 +196,20 @@ and
Second Author
\end_layout
\begin_layout Running Author
Short form of author list
\begin_inset Note Note
status open
\begin_layout Plain Layout
optional
\end_layout
\end_inset
\end_layout
\begin_layout Institute
F.
Author
@ -359,6 +441,40 @@ Your text comes here.
Separate text sections with
\end_layout
\begin_layout Theorem
a theorem
\end_layout
\begin_layout Problem
\begin_inset Argument
status open
\begin_layout Plain Layout
Problem title
\end_layout
\end_inset
The problem
\end_layout
\begin_layout Solution
\begin_inset Argument
status open
\begin_layout Plain Layout
Solution title
\end_layout
\end_inset
The solution
\end_layout
\begin_layout Problem (theorem-like)
\end_layout
\begin_layout Section
Section title
\begin_inset CommandInset label