Permalink
Browse files

Fix malformed and un-wrapped text in exercises to keep graphie blocks…

… from entering in to translations.
  • Loading branch information...
jeresig committed Jan 23, 2013
1 parent dcca838 commit c04bbc9d993881434f6aa4b7dd9845d884a8ca42
@@ -59,13 +59,13 @@
</div>
<div class="problem">
- Given<br />
+ <div>Given<br />
<span data-if="PROBLEM===2"><span><code>\qquad \overrightarrow{<var>O</var><var>A</var>}\perp\overrightarrow{<var>O</var><var>C</var>}</code></span>,<br /> </span>
<span id="given0"><code>\qquad m <var>ANGLE_ONE</var> = <var>COEF_1</var>x + <var>CONST_1</var></code></span>, <span data-if="PROBLEM !== 0">and</span><br/>
<span id="given1"><code>\qquad m <var>ANGLE_TWO</var> = <var>COEF_2</var>x + <var>CONST_2</var></code></span><span data-if="PROBLEM !==0">,<br /></span>
<span data-if="PROBLEM === 0">, and<br />
<span id="givenLarge"><code>\qquad m <var>LARGE_ANGLE</var> = <var>largeAngle</var></code></span>,</span>
- <p class="question">find <code>m<var>ANSWER[0]</var></code>.</p>
+ <p class="question">find <code>m<var>ANSWER[0]</var></code>.</p></div>
<div id="angleGraph" class="graphie">
init({
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -104,11 +104,11 @@
<div class="hints">
<p>
- Remember that the measure of the angles in a triangle sum to 180&deg;.
+ <span>Remember that the measure of the angles in a triangle sum to 180&deg;.
Solve for <code>\color{orange}{\angle{BCA}}</code> by subtracting the
measures of angles <code>\color{purple}{\angle{BAC}}</code> and
<code>\color{green}{\angle{ABC}}</code> from 180&deg;. We find that
- <code>\color{orange}{\angle{BCA}} = <var>Tri_X</var>&deg;</code>.
+ <code>\color{orange}{\angle{BCA}} = <var>Tri_X</var>&deg;</code>.</span>
<span class="graphie" data-update="tri-and-parallel">
// label angle BAC
arc([2.5, 3], .75, 180, 220, { stroke: "orange" });
@@ -117,10 +117,9 @@
</span>
</p>
<p>
- Solve for
<span data-if="RAND_SWITCH2 === 0">
- <code>\color{blue}{\angle{DAF}}</code> by using the fact
- that it is a corresponding angle to
+ <span>Solve for <code>\color{blue}{\angle{DAF}}</code> by using the fact
+ that it is a corresponding angle to <code>\color{orange}{\angle{BCA}}</code>.</span>
<span class="graphie" data-update="tri-and-parallel">
LABEL.remove();
LABEL = label([-3.3, 0],
@@ -129,20 +128,20 @@
</span>
</span>
<span data-else>
- <code>\color{blue}{\angle{CAE}}</code> by using the fact
- that it is an alternate interior angle to
+ <span>Solve for <code>\color{blue}{\angle{CAE}}</code> by using the fact
+ that it is an alternate interior angle to <code>\color{orange}{\angle{BCA}}</code>.</span>
<span class="graphie" data-update="tri-and-parallel">
LABEL.remove();
LABEL = label([1, 0],
"\\color{blue}{&ang;CAE} = " + Tri_X + "&deg;",
"above", { color: "blue"});
</span>
</span>
- <code>\color{orange}{\angle{BCA}}.</code> That means those
+ <span>That means those
angles are equal because they are both created by the same
set of parallel lines <code>\overline{BC}</code>
and <code>\overline{DE}</code>, and transversal line
- <code>\overline{CF}</code>.
+ <code>\overline{CF}</code>.</span>
</p>
</div>
</div>
@@ -249,9 +248,9 @@
parallel lines bisected by a single line.
</p>
<p data-if="RAND_COMBO === 1">
- First solve for <code>\color{orange}{\angle{AGH}}</code>. We know that
+ <span>First solve for <code>\color{orange}{\angle{AGH}}</code>. We know that
<code>\color{orange}{\angle{AGH}} = \color{purple}{\angle{EGB}}</code>
- because opposite angles are equal.
+ because opposite angles are equal.</span>
<span class="graphie" data-update="opposite-parallel">
arc([1,2], .88, 180, 225, {stroke:"orange"});
label([0,2], "\\color{orange}{" + X + "&deg;}", "below left");
@@ -268,11 +267,11 @@
parallel lines bisected by a single line.
</p>
<p data-else-if="RAND_COMBO === 20 || RAND_COMBO === 21">
- First solve for <code>\color{orange}{\angle{AGH}}</code>. We know that
+ <span>First solve for <code>\color{orange}{\angle{AGH}}</code>. We know that
<code>
\color{orange}{\angle{AGH}} = 180&deg; - \color{purple}{\angle{BGH}}
</code>,
- because angles along a line plane add up to 180&deg;.
+ because angles along a line plane add up to 180&deg;.</span>
<span class="graphie" data-update="opposite-parallel">
arc([1,2], .88, 180, 225, {stroke:"orange"});
label([0,2], "\\color{orange}{" + X + "&deg;}", "below left");
@@ -289,23 +288,22 @@
formed by parallel lines, and a single bisecting lines.
</p>
<p>
- Therefore,
<span data-if="RAND_SWITCH2 === 0">
- <code>\angle{GHD} = <var>X</var>&deg;</code>
+ <span>Therefore, <code>\angle{GHD} = <var>X</var>&deg;</code>.</span>
<span class="graphie" data-update="opposite-parallel">
LABEL.remove();
label([-2, -2], "\\color{blue}{\\angle{GHD}}=" + X + "&deg;",
"above right");
</span>
</span>
<span data-else>
- <code>\angle{CHF} = <var>X</var>&deg;</code>
+ <span>Therefore, <code>\angle{CHF} = <var>X</var>&deg;</code>.</span>
<span class="graphie" data-update="opposite-parallel">
LABEL.remove();
label([-4, -2.5], "\\color{blue}{\\angle{CHF}}=" + X + "&deg;",
"below left");
</span>
- </span>.
+ </span>
</p>
</div>
@@ -395,11 +393,11 @@
<div class="hints">
<p>
- <code>
+ <span><code>
\color{purple}{\angle{BHD}} =
180&deg; - \color{green}{\angle{BDC}} - \color{orange}{\angle{DBE}} =
<var>Tri1_Z</var>&deg;.
- </code> This is because the interior angles of a triangle add up to 180&deg;.
+ </code> This is because the interior angles of a triangle add up to 180&deg;.</span>
<span class="graphie" data-update="star1">
// label angle BHD
arc([3.2, 1.3], .75, 118, 220, { stroke: "purple" });
@@ -544,8 +542,8 @@
<div class="hints">
<p data-if="RAND_SWITCH2 === 0">
- <code>\color{purple}{\angle{DIJ}} = 180&deg; - \color{orange}{\angle{AIC}}</code>.
- This is because angles along a line total 180&deg;.
+ <span><code>\color{purple}{\angle{DIJ}} = 180&deg; - \color{orange}{\angle{AIC}}</code>.
+ This is because angles along a line total 180&deg;.</span>
<span class="graphie" data-update="star2">
// label angle JID
arc([0, -1.2], .75, 143, 220, { stroke: "purple" });
@@ -554,8 +552,8 @@
</span>
</p>
<p data-else>
- <code>\color{purple}{\angle{HGC}} = 180&deg; - \color{orange}{\angle{FGH}}</code>.
- This is because angles along a line or flat plane total 180&deg;.
+ <span><code>\color{purple}{\angle{HGC}} = 180&deg; - \color{orange}{\angle{FGH}}</code>.
+ This is because angles along a line or flat plane total 180&deg;.</span>
<span class="graphie" data-update="star2">
// label angle HGC
arc([1.8, 5], 1, 280, 0, { stroke: "purple" });
@@ -565,9 +563,9 @@
</p>
<p data-if="RAND_SWITCH2 === 0">
- <code>\color{teal}{\angle{DJI}} = 180&deg; - \color{green}{\angle{BDC}} -
+ <span><code>\color{teal}{\angle{DJI}} = 180&deg; - \color{green}{\angle{BDC}} -
\color{purple}{\angle{DIJ}}</code>.
- We know this because the sum of angles inside a triangle add up to 180&deg;.
+ We know this because the sum of angles inside a triangle add up to 180&deg;.</span>
<span class="graphie" data-update="star2">
// label angle JID
arc([-3.2, 1.3], .75, 260, 320, { stroke: "teal" });
@@ -576,9 +574,9 @@
</span>
</p>
<p data-else>
- <code>\color{teal}{\angle{CHG}} = 180&deg; - \color{green}{\angle{ACD}} -
+ <span><code>\color{teal}{\angle{CHG}} = 180&deg; - \color{green}{\angle{ACD}} -
\color{purple}{\angle{HGC}}</code>.
- We know this, because the sum of angles inside a triangle add up to 180&deg;.
+ We know this, because the sum of angles inside a triangle add up to 180&deg;.</span>
<span class="graphie" data-update="star2">
// label angle CHG
arc([3.2, 1.3], .75, 38, 120, { stroke: "teal" });
@@ -598,24 +596,23 @@
</p>
<p>
- Therefore,
<span data-if="RAND_SWITCH2 === 0">
- <code>\angle{AJF} = <var>Tri2_X</var>&deg;</code>
+ <span>Therefore, <code>\angle{AJF} = <var>Tri2_X</var>&deg;</code>.</span>
<span class="graphie" data-update="star2">
LABEL.remove();
label([-3.7, 2.5],
"\\color{blue}{\\angle{AJF}}=" + Tri2_X + "&deg;", "above");
</span>
</span>
<span data-else>
- <code>\angle{IHE} = <var>Tri2_X</var>&deg;</code>
+ <span>Therefore, <code>\angle{IHE} = <var>Tri2_X</var>&deg;</code>.</span>
<span class="graphie" data-update="star2">
LABEL.remove();
label([4.0, -0.3],
"\\color{blue}{\\angle{IHE}}=" + Tri2_X + "&deg;",
"below left");
</span>
- </span>.
+ </span>
</p>
</div>
</div>
@@ -29,10 +29,10 @@
<var id="RESPONDENT">randFromArray([ "student", "teacher", "person" ])</var>
</div>
- <code><var>TOTAL</var></code> <var>plural( RESPONDENT, TOTAL )</var> were asked about their favorite <var>SUBJECT</var>.
+ <p><code><var>TOTAL</var></code> <var>plural( RESPONDENT, TOTAL )</var> were asked about their favorite <var>SUBJECT</var>.
<var>toSentence( shuffle( $.map( DATA, function( num, i ) {
return "&lt;code&gt;" + num + "&lt;/code&gt; " + plural( RESPONDENT, num ) + " said " + CATEGORIES[ i ];
- }) ) )</var>.
+ }) ) )</var>.</p>
<p class="question">Create a bar chart showing everyone's favorite <var>plural( SUBJECT )</var>:</p>
@@ -138,7 +138,7 @@
graph.pointB.toFront();
</div>
- Click and drag the points to move the lines.
+ <p>Click and drag the points to move the lines.</p>
</div>
<div class="solution" data-type="multiple">
<p><code>x = </code> <span class="sol"><var>X</var></span></p>
@@ -139,8 +139,8 @@
<div class="hints">
<div data-unwrap data-if="ALL">
<div>
- We know that <code>\blue{<var>SINGLE_PCT</var> \%}</code> of the time, he'll make
- his first shot.
+ <p>We know that <code>\blue{<var>SINGLE_PCT</var> \%}</code> of the time, he'll make
+ his first shot.</p>
<div class="graphie">
init({
range: [[-1, 11], [-1, 1]]
@@ -155,11 +155,10 @@
line([0,0], [PROB*10,0]);
line([PROB*10,-0.2], [PROB*10,0.2]);
</div>
- </br>
- Then <code><var>SINGLE_PCT</var> \%</code> of
+ <p>Then <code><var>SINGLE_PCT</var> \%</code> of
the time he makes his first shot, he will also make his second shot, and
<code><var>((1-PROB)*100).toFixed(0)</var> \%</code> of the time he makes his
- first shot, he will miss his second shot.
+ first shot, he will miss his second shot.</p>
<div class="graphie">
init({
range: [[-1, 11], [-1, 1]]
@@ -191,9 +190,9 @@
<code><var>PROB</var> \cdot <var>PROB</var> = <var>(PROB*PROB).toFixed(3)</var></code>.
</p>
<div>
- We can repeat this process again to get the probability of making <b>three</b> free throws in a row. We simply take
+ <p>We can repeat this process again to get the probability of making <b>three</b> free throws in a row. We simply take
<code><var>SINGLE_PCT</var>\%</code> of probability that he makes two in a row, which we know from the previous step is
- <code><var>(PROB*PROB).toFixed(3)</var> \approx \orange{<var>TWO_PCT</var>\%}</code>.
+ <code><var>(PROB*PROB).toFixed(3)</var> \approx \orange{<var>TWO_PCT</var>\%}</code>.</p>
<div class="graphie">
init({
range: [[-1, 11], [-1, 1]]
@@ -210,10 +209,9 @@
line([0,0], [PROB*PROB*10,0]);
line([PROB*PROB*10,-0.2], [PROB*PROB*10,0.2]);
</div>
- </br>
- <code><var>SINGLE_PCT</var>\%</code> of <code>\orange{<var>TWO_PCT</var>\%}</code> is
+ <p><code><var>SINGLE_PCT</var>\%</code> of <code>\orange{<var>TWO_PCT</var>\%}</code> is
<code><var>PROB</var> \cdot <var>(PROB*PROB).toFixed(3)</var> = <var>Math.pow(PROB,3).toFixed(3)</var></code>, or
- about <code>\green{<var>THREE_PCT</var>\%}</code>:
+ about <code>\green{<var>THREE_PCT</var>\%}</code>:</p>
<div class="graphie">
init({
range: [[-1, 11], [-1, 1]]
@@ -252,9 +250,9 @@
</div>
<div data-unwrap data-else>
<div>
- We know that <code>\blue{<var>SINGLE_PCT</var> \%}</code> of the time, he'll miss
+ <p>We know that <code>\blue{<var>SINGLE_PCT</var> \%}</code> of the time, he'll miss
his first shot
- <code>(100 \% - <var>(PR*100).toFixed(0)</var> \% = <var>SINGLE_PCT</var> \%)</code>.
+ <code>(100 \% - <var>(PR*100).toFixed(0)</var> \% = <var>SINGLE_PCT</var> \%)</code>.</p>
<div class="graphie">
init({
range: [[-1, 11], [-1, 1]]
@@ -269,11 +267,10 @@
line([0,0], [PROB*10,0]);
line([PROB*10,-0.2], [PROB*10,0.2]);
</div>
- </br>
- Then <code><var>SINGLE_PCT</var> \%</code> of
+ <p>Then <code><var>SINGLE_PCT</var> \%</code> of
the time he misses his first shot, he will also miss his second shot, and
<code><var>((1-PROB)*100).toFixed(0)</var> \%</code> of the time he misses his
- first shot, he will make his second shot.
+ first shot, he will make his second shot.</p>
<div class="graphie">
init({
range: [[-1, 11], [-1, 1]]
@@ -305,9 +302,9 @@
<code><var>PROB</var> \cdot <var>PROB</var> = <var>(PROB*PROB).toFixed(3)</var></code>.
</p>
<div>
- We can repeat this process again to get the probability of missing <b>three</b> free throws in a row. We simply take
+ <p>We can repeat this process again to get the probability of missing <b>three</b> free throws in a row. We simply take
<code><var>SINGLE_PCT</var>\%</code> of probability that he misses two in a row, which we know from the previous step is
- <code><var>(PROB*PROB).toFixed(3)</var> \approx \orange{<var>TWO_PCT</var>\%}</code>.
+ <code><var>(PROB*PROB).toFixed(3)</var> \approx \orange{<var>TWO_PCT</var>\%}</code>.</p>
<div class="graphie">
init({
range: [[-1, 11], [-1, 1]]
@@ -324,10 +321,9 @@
line([0,0], [PROB*PROB*10,0]);
line([PROB*PROB*10,-0.2], [PROB*PROB*10,0.2]);
</div>
- </br>
- <code><var>SINGLE_PCT</var>\%</code> of <code>\orange{<var>TWO_PCT</var>\%}</code> is
+ <p><code><var>SINGLE_PCT</var>\%</code> of <code>\orange{<var>TWO_PCT</var>\%}</code> is
<code><var>PROB</var> \cdot <var>(PROB*PROB).toFixed(3)</var> = <var>Math.pow(PROB,3).toFixed(3)</var></code>, or
- about <code>\green{<var>THREE_PCT</var>\%}</code>:
+ about <code>\green{<var>THREE_PCT</var>\%}</code>:</p>
<div class="graphie">
init({
range: [[-1, 11], [-1, 1]]
Oops, something went wrong.

0 comments on commit c04bbc9

Please sign in to comment.