The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit c9a22552442e9816b5ecdd300c540a5236674253
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sat Dec 8 20:04:13 2012 +0100
update argument labels for Springer classes
- svcommon.inc, theorems-without-preamble.inc : correct labels and argument
names and some whitespace fixes
- svmono, svmult: update/add some notes
diff --git a/lib/layouts/svcommon.inc b/lib/layouts/svcommon.inc
index adf73a7..30f4650 100644
--- a/lib/layouts/svcommon.inc
+++ b/lib/layouts/svcommon.inc
@@ -136,9 +136,9 @@ Style PartBacktext
Size normal
EndFont
Argument 1
- Mandatory 1
- LabelString "Part Title"
- Tooltip "The title of this part"
+ Mandatory 1
+ LabelString "Part Title"
+ Tooltip "Title of this part"
EndArgument
Preamble
\newenvironment{svmultpartbacktext}[1]{\begin{partbacktext}
@@ -515,8 +515,8 @@ Style Foreword
ParSep 0.8
Align Block
Argument 1
- LabelString "Alternative Foreword Heading"
- Tooltip "Alternative foreword heading"
+ LabelString "Alternative Name"
+ Tooltip "Alternative name"
EndArgument
Font
Series Bold
@@ -594,8 +594,8 @@ End
Style Description
Argument 1
- LabelString "Longest Description Label"
- Tooltip "Longest description label"
+ LabelString "Longest Description Label"
+ Tooltip "Longest description label"
EndArgument
LabelFont
Series Medium
@@ -632,6 +632,36 @@ Style Svgraybox
EndFont
End
+# overwrite the label for the optional argument defined in
+# theorems-without-preamble.inc
+Style Theorem
+ Argument 1
+ LabelString "Name/Title"
+ Tooltip "Name/Title"
+ EndArgument
+End
+
+Style Definition
+ Argument 1
+ LabelString "Name/Title"
+ Tooltip "Name/Title"
+ EndArgument
+End
+
+Style Problem
+ Argument 1
+ LabelString "Name/Title"
+ Tooltip "Name/Title"
+ EndArgument
+End
+
+Style Solution
+ Argument 1
+ LabelString "Name/Title"
+ Tooltip "Name/Title"
+ EndArgument
+End
+
Style Proof
Category Theorem
LatexType Environment
@@ -647,7 +677,7 @@ Style Proof
Shape Italic
EndFont
LangPreamble
- \providecommand{\proofname}{_(Proof)}
+ \providecommand{\proofname}{_(Proof)}
EndLangPreamble
BabelPreamble
\addto\captions$$lang{\renewcommand{\proofname}{_(Proof)}}
@@ -659,7 +689,7 @@ Style Proof(QED)
LatexName svmultproof
EndLabelType Box
Preamble
- \newenvironment{svmultproof}{\begin{proof}}{\qed\end{proof}}
+ \newenvironment{svmultproof}{\begin{proof}}{\qed\end{proof}}
EndPreamble
End
@@ -668,7 +698,7 @@ Style Proof(smartQED)
LatexName svmultproof2
EndLabelType Box
Preamble
-
\newenvironment{svmultproof2}{\begin{proof}}{\smartqed\qed\end{proof}}
+ \newenvironment{svmultproof2}{\begin{proof}}{\smartqed\qed\end{proof}}
EndPreamble
End
diff --git a/lib/layouts/theorems-without-preamble.inc
b/lib/layouts/theorems-without-preamble.inc
index 31cb999..347d2ea 100644
--- a/lib/layouts/theorems-without-preamble.inc
+++ b/lib/layouts/theorems-without-preamble.inc
@@ -38,8 +38,8 @@ Style Theorem
LatexName theorem
NextNoIndent 1
Argument 1
- LabelString "Alternative Theorem String"
- Tooltip "Alternative theorem string"
+ LabelString "Alternative Theorem String"
+ Tooltip "Alternative theorem string"
EndArgument
LabelSep xx
ParIndent MMM
@@ -62,10 +62,10 @@ Style Theorem
Series Bold
EndFont
LangPreamble
- \providecommand{\theoremname}{_(Theorem)}
+ \providecommand{\theoremname}{_(Theorem)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
+ \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
EndBabelPreamble
End
@@ -78,10 +78,10 @@ Style Corollary
LatexName corollary
LabelString "Corollary \thecorollary."
LangPreamble
- \providecommand{\corollaryname}{_(Corollary)}
+ \providecommand{\corollaryname}{_(Corollary)}
EndLangPreamble
BabelPreamble
-
\addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
+ \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
EndBabelPreamble
End
@@ -94,10 +94,10 @@ Style Lemma
LatexName lemma
LabelString "Lemma \thelemma."
LangPreamble
- \providecommand{\lemmaname}{_(Lemma)}
+ \providecommand{\lemmaname}{_(Lemma)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
+ \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
EndBabelPreamble
End
@@ -110,10 +110,10 @@ Style Proposition
LatexName proposition
LabelString "Proposition \theproposition."
LangPreamble
- \providecommand{\propositionname}{_(Proposition)}
+ \providecommand{\propositionname}{_(Proposition)}
EndLangPreamble
BabelPreamble
-
\addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
+ \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
EndBabelPreamble
End
@@ -149,10 +149,10 @@ Style Conjecture
Shape Italic
EndFont
LangPreamble
- \providecommand{\conjecturename}{_(Conjecture)}
+ \providecommand{\conjecturename}{_(Conjecture)}
EndLangPreamble
BabelPreamble
-
\addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
+ \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
EndBabelPreamble
End
@@ -165,10 +165,10 @@ Style Fact
LatexName fact
LabelString "Fact \thefact."
LangPreamble
- \providecommand{\factname}{_(Fact)}
+ \providecommand{\factname}{_(Fact)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
+ \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
EndBabelPreamble
End
@@ -189,10 +189,10 @@ Style Definition
Series Bold
EndFont
LangPreamble
- \providecommand{\definitionname}{_(Definition)}
+ \providecommand{\definitionname}{_(Definition)}
EndLangPreamble
BabelPreamble
-
\addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
+ \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
EndBabelPreamble
End
@@ -206,10 +206,10 @@ Style Example
LabelString "Example \theexample."
RefPrefix exa
LangPreamble
- \providecommand{\examplename}{_(Example)}
+ \providecommand{\examplename}{_(Example)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
+ \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
EndBabelPreamble
End
@@ -224,10 +224,10 @@ Style Problem
LabelString "Problem \theproblem."
RefPrefix prob
LangPreamble
- \providecommand{\problemname}{_(Problem)}
+ \providecommand{\problemname}{_(Problem)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
+ \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
EndBabelPreamble
End
@@ -271,10 +271,10 @@ Style Solution
LabelString "Solution \thesolution."
RefPrefix solu
LangPreamble
- \providecommand{\solutionname}{_(Solution)}
+ \providecommand{\solutionname}{_(Solution)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
+ \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
EndBabelPreamble
End
@@ -285,9 +285,9 @@ Style Sol
LabelType Static
LabelString "# [number of Prob]"
Argument 1
- Mandatory 1
- LabelString "Solution"
- Tooltip "Mandatory argument to the sol environment"
+ Mandatory 1
+ LabelString "Label of Problem"
+ Tooltip "Label of the corresponding problem"
EndArgument
End
@@ -301,10 +301,10 @@ Style Exercise
LabelString "Exercise \theexercise."
RefPrefix exer
LangPreamble
- \providecommand{\exercisename}{_(Exercise)}
+ \providecommand{\exercisename}{_(Exercise)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
+ \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
EndBabelPreamble
End
@@ -318,10 +318,10 @@ Style Remark
LabelString "Remark \theremark."
RefPrefix rem
LangPreamble
- \providecommand{\remarkname}{_(Remark)}
+ \providecommand{\remarkname}{_(Remark)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
+ \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
EndBabelPreamble
End
@@ -331,10 +331,10 @@ Style Claim
LatexName claim
LabelString "Claim"
LangPreamble
- \providecommand{\claimname}{_(Claim)}
+ \providecommand{\claimname}{_(Claim)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
+ \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
EndBabelPreamble
End
@@ -348,10 +348,10 @@ Style Case
LabelString "Case \thecase."
RefPrefix case
LangPreamble
- \providecommand{\casename}{_(Case)}
+ \providecommand{\casename}{_(Case)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\casename}{_(Case)}}
+ \addto\captions$$lang{\renewcommand{\casename}{_(Case)}}
EndBabelPreamble
End
@@ -365,10 +365,10 @@ Style Property
LabelString "Property \theproperty."
RefPrefix prop
LangPreamble
- \providecommand{\propertyname}{_(Property)}
+ \providecommand{\propertyname}{_(Property)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\propertyname}{_(Property)}}
+ \addto\captions$$lang{\renewcommand{\propertyname}{_(Property)}}
EndBabelPreamble
End
@@ -382,10 +382,10 @@ Style Question
LabelString "Question \thequestion."
RefPrefix que
LangPreamble
- \providecommand{\questionname}{_(Question)}
+ \providecommand{\questionname}{_(Question)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\questionname}{_(Question)}}
+ \addto\captions$$lang{\renewcommand{\questionname}{_(Question)}}
EndBabelPreamble
End
@@ -399,10 +399,10 @@ Style Note
LabelString "Note \thenote."
RefPrefix note
LangPreamble
- \providecommand{\notename}{_(Note)}
+ \providecommand{\notename}{_(Note)}
EndLangPreamble
BabelPreamble
- \addto\captions$$lang{\renewcommand{\notename}{_(Note)}}
+ \addto\captions$$lang{\renewcommand{\notename}{_(Note)}}
EndBabelPreamble
End
diff --git a/lib/templates/springer/svmono_acronym.lyx
b/lib/templates/springer/svmono_acronym.lyx
index 35a6f09..89f8f1a 100644
--- a/lib/templates/springer/svmono_acronym.lyx
+++ b/lib/templates/springer/svmono_acronym.lyx
@@ -109,6 +109,17 @@ CABR
\end_inset
ABC Spelled-out abbreviation and definition
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+The optional longest description label ca be used to set the space that
+ is necessary to contain all description labels.
+\end_layout
+
+\end_inset
+
+
\end_layout
\begin_layout Description
diff --git a/lib/templates/springer/svmono_chapter.lyx
b/lib/templates/springer/svmono_chapter.lyx
index 8cf2595..c27115c 100644
--- a/lib/templates/springer/svmono_chapter.lyx
+++ b/lib/templates/springer/svmono_chapter.lyx
@@ -1043,16 +1043,6 @@ description
\end_layout
\begin_layout Description
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-optional argument for the description:
-\end_layout
-
-\end_inset
-
-
\begin_inset Argument
status open
@@ -1080,6 +1070,17 @@ reference "sec:Section-Heading"
, Wilson discusses the role of human migration in infectious disease
distributio
ns and patterns.
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+The optional longest description label ca be used to set the space that
+ is necessary to contain all description labels.
+\end_layout
+
+\end_inset
+
+
\end_layout
\begin_layout Description
@@ -1290,6 +1291,16 @@ status collapsed
\end_inset
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+adds an entry to the table of contents
+\end_layout
+
+\end_inset
+
When placed at the end of a chapter or contribution (as opposed to at the
end of the book), the numbering of tables, figures, and equations in the
appendix section continues on from that in the main text.
@@ -1380,6 +1391,16 @@ status collapsed
\end_inset
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+adds an entry to the table of contents
+\end_layout
+
+\end_inset
+
+
\end_layout
\begin_layout Standard
diff --git a/lib/templates/springer/svmono_part.lyx
b/lib/templates/springer/svmono_part.lyx
index 61efcc1..dabefbe 100644
--- a/lib/templates/springer/svmono_part.lyx
+++ b/lib/templates/springer/svmono_part.lyx
@@ -78,8 +78,7 @@ Part Title
status open
\begin_layout Plain Layout
-the argument is mandatory and contains the part title; the further text
- for the backpart is optional
+The part title is mandatory; the further text for the backpart is optional.
\end_layout
\end_inset
diff --git a/lib/templates/springer/svmono_referenc.lyx
b/lib/templates/springer/svmono_referenc.lyx
index 8468938..bbef98b 100644
--- a/lib/templates/springer/svmono_referenc.lyx
+++ b/lib/templates/springer/svmono_referenc.lyx
@@ -318,10 +318,14 @@ status collapsed
\begin_inset Note Note
-status collapsed
+status open
\begin_layout Plain Layout
-end of biblstarthook
+end of
+\series bold
+
+\backslash
+biblstarthook
\end_layout
\end_inset
diff --git a/lib/templates/springer/svmono_solutions.lyx
b/lib/templates/springer/svmono_solutions.lyx
index efe09e3..4d816b8 100644
--- a/lib/templates/springer/svmono_solutions.lyx
+++ b/lib/templates/springer/svmono_solutions.lyx
@@ -124,7 +124,7 @@ The solution of the corresponding problem.
status open
\begin_layout Plain Layout
-the argument is the label of the corresponding problem and is
+The label of the corresponding (referenced) problem is
\emph on
mandatory
\emph default
diff --git a/lib/templates/springer/svmult_acronym.lyx
b/lib/templates/springer/svmult_acronym.lyx
index 5c5b07a..98bc017 100644
--- a/lib/templates/springer/svmult_acronym.lyx
+++ b/lib/templates/springer/svmult_acronym.lyx
@@ -109,6 +109,17 @@ CABR
\end_inset
ABC Spelled-out abbreviation and definition
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+The optional longest description label ca be used to set the space that
+ is necessary to contain all description labels.
+\end_layout
+
+\end_inset
+
+
\end_layout
\begin_layout Description
diff --git a/lib/templates/springer/svmult_author.lyx
b/lib/templates/springer/svmult_author.lyx
index 309aebc..8b5b424 100644
--- a/lib/templates/springer/svmult_author.lyx
+++ b/lib/templates/springer/svmult_author.lyx
@@ -1197,16 +1197,6 @@ description
\end_layout
\begin_layout Description
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-optional argument for the description:
-\end_layout
-
-\end_inset
-
-
\begin_inset Argument
status open
@@ -1234,6 +1224,17 @@ reference "sec:1"
, Wilson discusses the role of human migration in infectious disease
distributio
ns and patterns.
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+The optional longest description label ca be used to set the space that
+ is necessary to contain all description labels.
+\end_layout
+
+\end_inset
+
+
\end_layout
\begin_layout Description
diff --git a/lib/templates/springer/svmult_part.lyx
b/lib/templates/springer/svmult_part.lyx
index e47db12..841b739 100644
--- a/lib/templates/springer/svmult_part.lyx
+++ b/lib/templates/springer/svmult_part.lyx
@@ -78,8 +78,7 @@ Part Title
status open
\begin_layout Plain Layout
-the argument is mandatory and contains the part title; the further text
- for the backpart is optional
+The part title is mandatory; the further text for the backpart is optional.
\end_layout
\end_inset
-----------------------------------------------------------------------
Summary of changes:
lib/layouts/svcommon.inc | 50 ++++++++++++++----
lib/layouts/theorems-without-preamble.inc | 78 +++++++++++++-------------
lib/templates/springer/svmono_acronym.lyx | 11 ++++
lib/templates/springer/svmono_chapter.lyx | 41 +++++++++++----
lib/templates/springer/svmono_part.lyx | 3 +-
lib/templates/springer/svmono_referenc.lyx | 8 ++-
lib/templates/springer/svmono_solutions.lyx | 2 +-
lib/templates/springer/svmult_acronym.lyx | 11 ++++
lib/templates/springer/svmult_author.lyx | 21 ++++----
lib/templates/springer/svmult_part.lyx | 3 +-
10 files changed, 152 insertions(+), 76 deletions(-)
hooks/post-receive
--
The LyX Source Repository
