Permalink
Browse files

Merge pull request #10608 from Christi/cleanup

various cleanup of answer form
fix #9931
  • Loading branch information...
2 parents f5f8476 + 93c6537 commit b9d8e5f71ecb4925718fab71a78d2a4f9c262406 @beneater beneater committed Jan 9, 2012
Showing with 20 additions and 7 deletions.
  1. +16 −5 exercises/counting_1.html
  2. +4 −2 exercises/functions_1.html
View
21 exercises/counting_1.html
@@ -15,9 +15,16 @@
<var id="END">START + ANSWER - 1</var>
<var id="DO, DID, PROBLEMS">spin( "{do,did,problems|read,read,{pages|papers|articles}}" ).split( "," )</var>
</div>
- <p class="spin"><var>person( 1 )</var> {had to <var>DO</var>|was assigned} <var>PROBLEMS</var> <var>START</var> through <var>END</var> for homework {{last {week|night}}|tonight}.
- <p class="question spin">If <var>person( 1 )</var> <var>DID</var> all of the <var>PROBLEMS</var> <var>he( 1 )</var> was assigned, how many <var>PROBLEMS</var> did <var>he( 1 )</var> <var>DO</var>?</p>
- <p class="solution" data-forms="integer"><var>ANSWER</var></p>
+ <p class="spin">
+ <var>person( 1 )</var> {had to <var>DO</var>|was assigned} <var>PROBLEMS</var> <var>START</var> through <var>END</var> for homework {{last {week|night}}|tonight}.
+ </p>
+ <p class="question spin">
+ If <var>person( 1 )</var> <var>DID</var> all of the <var>PROBLEMS</var> <var>he( 1 )</var> was assigned, how many <var>PROBLEMS</var> did <var>he( 1 )</var> <var>DO</var>?
+ </p>
+
+ <div class="solution" data-type="multiple">
+ <p><span class="sol" data-forms="integer"><var>ANSWER</var></span> <var>PROBLEMS</var></p>
+ </div>
<div class="hints">
<p>Instead of counting <var>PROBLEMS</var> <var>START</var> through <var>END</var>, we can subtract <var>START - 1</var> from each number so we instead consider <var>PROBLEMS</var> 1 through <var>ANSWER</var>.</p>
<p>We see that <var>person( 1 )</var> <var>DID</var> <var>ANSWER</var> <var>PROBLEMS</var>.</p>
@@ -30,7 +37,9 @@
</div>
<p class="spin">A baker has a whole {baguette|loaf of bread}.</p>
<p class="question spin">How many cuts must {he|she} make to have exactly <var>NUM</var> even slices?</p>
- <p class="solution" data-forms="integer"><var>NUM - 1</var></p>
+ <div class="solution" data-type="multiple">
+ <p><span class="sol" data-forms="integer"><var>NUM -1</var></span> cuts</p>
+ </div>
<div class="hints">
<p>One cut will make two slices, two cuts will make three slices, and so on.</p>
<p>Therefore, we need <var>NUM - 1</var> cuts to make <var>NUM</var> slices.</p>
@@ -42,7 +51,9 @@
</div>
<p><var>person( 1 )</var> is building a straight fence, with posts one meter apart.</p>
<p class="question">If the fence is <var>LENGTH</var> meters long, how many fence posts does <var>he( 1 )</var> need?</p>
- <p class="solution" data-forms="integer"><var>LENGTH + 1</var></p>
+ <div class="solution" data-type="multiple">
+ <p><span class="sol" data-forms="integer"><var>LENGTH + 1</var></span> fence posts</p>
+ </div>
<div class="hints">
<p>If the fence is one meter long, <var>he( 1 )</var> needs two posts (one for each end).</p>
<p>If the fence is two meters long, then <var>he( 1 )</var> needs three posts, and so on.</p>
View
6 exercises/functions_1.html
@@ -55,8 +55,10 @@
path( FUNCTION_PATH, { stroke: "#6495ed" } );
</div>
-
- <p class="solution"><var>CORRECT_Y</var></p>
+ <div class="solution" data-type="multiple">
+ <p><code>f(<var>CORRECT_X</var>)=</code> <span class="sol"><var>CORRECT_Y</var></span> <var>PROBLEMS</var></p>
+ </div>
+
</div>
</div>

0 comments on commit b9d8e5f

Please sign in to comment.