- theorems-without-preamble.inc:

- don't include Sol and Prob to layouttranslations
 - change label type of the style Sol as suggested
- svmono_chapter.lyx: better description of the problem styles
- svmono_solutions.lyx: better description of the solution styles

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39309 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-07-15 16:55:58 +00:00
parent 54f8603a4c
commit f7d0a44da2
3 changed files with 189 additions and 136 deletions

View File

@ -238,12 +238,30 @@ End
Counter prob
Within chapter
End
# Prob does not copy a style to avoid preamble code
Style Prob
CopyStyle Problem
LabelCounter prob
Category Exercise
LatexType Environment
LatexName prob
Margin First_Dynamic
LabelType Counter
LabelCounter prob
LabelString "\theprob."
RefPrefix pro
NextNoIndent 1
OptionalArgs 0
LabelSep xx
ParIndent MMM
ParSkip 0.4
ItemSep 0.2
TopSep 0.7
BottomSep 0.7
ParSep 0.3
Align Block
AlignPossible Left
LabelFont
Series Bold
EndFont
End
@ -254,7 +272,7 @@ Style Solution
LabelCounter solution
LatexName solution
LabelString "Solution \thesolution."
RefPrefix sol
RefPrefix solu
LangPreamble
\providecommand{\solutionname}{_(Solution)}
EndLangPreamble
@ -264,14 +282,11 @@ Style Solution
End
Counter sol
Within chapter
End
Style Sol
CopyStyle Problem
LabelCounter sol
CopyStyle Prob
LatexName sol
LabelString "\thesol"
LabelType Static
LabelString "# [number of Prob]"
RequiredArgs 1
End

View File

@ -1387,6 +1387,10 @@ status collapsed
status open
\begin_layout Plain Layout
\series bold
Note:
\series default
Don't forget to label each problem; the label is needed for the solutions'
environment
\end_layout
@ -1396,16 +1400,45 @@ Don't forget to label each problem; the label is needed for the solutions'
\end_layout
\begin_layout Standard
There are two styles for problems:
\family sans
Prob
\family default
and
\family sans
Problem
\family default
.
The
\family sans
Prob
\family default
style is the preferred because it can be referenced in the solution section.
\end_layout
\begin_layout Standard
Two
\begin_inset space ~
\end_inset
examples of
\family sans
Prob
\family default
:
\end_layout
\begin_layout Prob
\begin_inset CommandInset label
LatexCommand label
name "prob:prob1"
name "prob:given-problem"
\end_inset
A given problem or Excercise is described here.
The problem is described here.
A given problem or excercise is described here.
The problem is described here.
Its label will be referenced in its solution.
\end_layout
\begin_layout --Separator--
@ -1434,6 +1467,37 @@ Problem Heading
(b) The second part of the problem is described here.
\end_layout
\begin_layout Standard
This is the
\family sans
Problem
\family default
style:
\end_layout
\begin_layout Problem
\begin_inset Argument
status open
\begin_layout Plain Layout
Title/Name (optional)
\end_layout
\end_inset
The problem
\begin_inset Index idx
status collapsed
\begin_layout Plain Layout
problems
\end_layout
\end_inset
is revealed here.
\end_layout
\begin_layout Standard
\begin_inset CommandInset include
LatexCommand input

View File

@ -80,27 +80,117 @@ reference "chap:intro"
\end_layout
\begin_layout Problem
\begin_layout Standard
There two styles for solutions:
\family sans
Sol
\family default
and
\family sans
Solution
\family default
.
The
\family sans
Sol
\family default
style is the preferred because it references trhe corresponding
\family sans
Prob
\family default
problem style.
\end_layout
\begin_layout Standard
An examples of
\family sans
Sol
\family default
:
\end_layout
\begin_layout Sol
\begin_inset Argument
status open
\begin_layout Plain Layout
Title/Name (optional)
prob:given-problem
\end_layout
\end_inset
The problem
\begin_inset Index idx
status collapsed
The solution of the corresponding problem.
\begin_inset Note Note
status open
\begin_layout Plain Layout
problems
the argument is the label of the corresponding problem and is
\emph on
mandatory
\emph default
!
\end_layout
\end_inset
is revealed here.
The number of the prob/sol can also be referenced in the text:
\begin_inset Quotes eld
\end_inset
As explained in the description of problem
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "prob:given-problem"
\end_inset
\SpecialChar \ldots{}
\begin_inset Quotes erd
\end_inset
\end_layout
\begin_layout --Separator--
\end_layout
\begin_layout Sol
\begin_inset Argument
status open
\begin_layout Plain Layout
prob:prob2
\end_layout
\end_inset
\series bold
Problem Heading
\series default
\begin_inset Newline newline
\end_inset
(a) The solution of first part is revealed here.
\begin_inset Newline newline
\end_inset
(b) The solution of second part is revealed here.
\end_layout
\begin_layout Standard
An example of
\family sans
Solution
\family default
:
\end_layout
\begin_layout Solution
@ -126,121 +216,5 @@ solutions
is revealed here.
\end_layout
\begin_layout --Separator--
\end_layout
\begin_layout Solution
\series bold
Problem Heading
\series default
\begin_inset Newline newline
\end_inset
(a) The solution of first part is revealed here.
\begin_inset Newline newline
\end_inset
(b) The solution of second part is revealed here.
\end_layout
\begin_layout Subsection*
Problem with its solution
\begin_inset Note Note
status open
\begin_layout Plain Layout
For these method use the layouts
\begin_inset Quotes eld
\end_inset
Prob
\begin_inset Quotes erd
\end_inset
and
\begin_inset Quotes eld
\end_inset
Sol
\begin_inset Quotes erd
\end_inset
.
\end_layout
\end_inset
\end_layout
\begin_layout Standard
Problem:
\end_layout
\begin_layout Prob
\begin_inset CommandInset label
LatexCommand label
name "prob:Area-of-Circle"
\end_inset
Here comes the problem description.
Its label will be referenced in its solution.
\end_layout
\begin_layout Standard
Solution:
\end_layout
\begin_layout Sol
\begin_inset Argument
status open
\begin_layout Plain Layout
prob:Area-of-Circle
\end_layout
\end_inset
The solution of the corresponding problem.
\begin_inset Note Note
status open
\begin_layout Plain Layout
the argument is the label of the corresponding problem and is mandatory!
\end_layout
\end_inset
\end_layout
\begin_layout Standard
The number of the problem/solution can also be referenced in the text:
\begin_inset Quotes eld
\end_inset
As explained in the description of problem
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "prob:Area-of-Circle"
\end_inset
\SpecialChar \ldots{}
\begin_inset Quotes erd
\end_inset
\end_layout
\end_body
\end_document