Permalink
Browse files

Two doctypes were being output. Only output one.

  • Loading branch information...
1 parent e9807ff commit d53a57cf03ed10f7a4f02e677de6f8cd4a0390b7 @jeresig jeresig committed Apr 16, 2013
Showing 444 changed files with 492 additions and 934 deletions.
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Finding absolute values</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Absolute value equations</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie math-format"><head>
<meta charset="UTF-8">
<title>Absolute value of complex numbers</title>
@@ -32,7 +31,7 @@
of complex numbers can be determined using the distance formula.
</p>
<div>
- <div id="graph" class="graphie">
+ <div class="graphie" id="graph">
graphInit({
range: [[-10, 10], [-10, 10]],
scale: 20,
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format"><head>
<meta charset="UTF-8">
<title>Adding and subtracting complex numbers</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math word-problems spin graphie graphie-helpers-arithmetic"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding and subtracting decimals word problems</title>
@@ -38,7 +37,7 @@
<div class="hints">
<p>To find the total amount <var>person(1)</var> needs to pay, we need to add the price of the <var>plural(fruit(1))</var> and the price of the <var>plural(fruit(2))</var>.</p>
<p>Price of <var>plural(fruit(1))</var> + price of <var>plural(fruit(2))</var> = total price.</p>
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.adder = new DecimalAdder( fruit_1_integer, fruit_1_decimal, fruit_2_integer, fruit_2_decimal );
graph.adder.show();
graph.adder.showDecimals();
@@ -79,7 +78,7 @@
<div class="hints">
<p>To find how much faster <var>person(2)</var> was than <var>person(1)</var>, we need to find the difference between their times in seconds.
</p><p><var>person(1)</var>'s time - <var>person(2)</var>'s time = difference in times.
- </p><div id="numbers" class="graphie">
+ </p><div class="graphie" id="numbers">
graph.subtractor = new DecimalSubtractor( time_1_integer, time_1_decimal, time_2_integer, time_2_decimal );
graph.subtractor.show();
graph.subtractor.showDecimals();
@@ -125,7 +124,7 @@
<div class="hints">
<p>To find the weights of the 2 babies, we need to add their weights together.
</p><p><var>person(2)</var>'s weight + <var>person(3)</var>'s weight = total weight.</p>
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.adder = new DecimalAdder( weight_1_integer, weight_1_decimal, weight_2_integer, weight_2_decimal );
graph.adder.show();
graph.adder.showDecimals();
@@ -170,7 +169,7 @@
<div class="hints">
<p>To find out how much change <var>person(1)</var> received, we can subtract the price of the <var>storeItem(1,1)</var> from the amount of money <var>he(1)</var> paid.
</p><p>The amount <var>person(1)</var> paid - the price of the <var>storeItem(1,1)</var> = the amount of change <var>person(1)</var> received.</p>
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.subtractor = new DecimalSubtractor( amount_paid_integer, amount_paid_decimal, price_1_integer, price_1_decimal );
graph.subtractor.show();
graph.subtractor.showDecimals();
@@ -207,7 +206,7 @@
<div class="hints">
<p>To find the difference in rainfall, we can subtract the amount of rain in <var>person(1)</var>'s town from the amount of rain in <var>person(2)</var>'s town.
</p><p>Rain in <var>person(2)</var>'s town - rain in <var>person(1)</var>'s town = the difference in rain between the two towns.</p>
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.subtractor = new DecimalSubtractor( rain_2_integer, rain_2_decimal, rain_1_integer, rain_1_decimal );
graph.subtractor.show();
graph.subtractor.showDecimals();
@@ -244,7 +243,7 @@
<div class="hints">
<p>To find the total distance <var>person(1)</var> travels, we need to add the two distances together.
</p><p>Distance on <var>vehicle(1)</var> + distance on <var>vehicle(2)</var> = total distance.</p>
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.adder = new DecimalAdder( distance_1_integer, distance_1_decimal, distance_2_integer, distance_2_decimal );
graph.adder.show();
graph.adder.showDecimals();
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding and subtracting fractions</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding and subtracting negative numbers</title>
@@ -22,7 +21,7 @@
<var id="REMOVE">[]</var>
</div>
<div class="question">
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
init({
range: [ [0, 13], [-3, 1] ]
});
@@ -72,7 +71,7 @@
<var id="REMOVE">[]</var>
</div>
<div class="question">
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
init({
range: [ [0, 13], [-3, 1] ]
});
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format polynomials functional"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding and subtracting polynomials</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format expressions"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding and subtracting radicals</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format expressions rational-expressions"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding and subtracting with like denominators</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format expressions rational-expressions"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding and subtracting with like denominators 2</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding decimals</title>
@@ -39,7 +38,7 @@
<div>
<p class="question"><code>\Huge{<var>roundTo( A_DECIMAL, A * pow( 10, -A_DECIMAL ) ).toFixed( A_DECIMAL )</var> + <var>roundTo( B_DECIMAL, B * pow( 10, -B_DECIMAL ) ).toFixed( B_DECIMAL )</var> = {?}}</code></p>
<p data-type="decimal" class="solution"><var>A / pow( 10, A_DECIMAL ) + B / pow( 10, B_DECIMAL )</var></p>
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.adder = new Adder( NEW_A, NEW_B, A_DIGITS, B_DIGITS );
DUMMY = Array( graph.adder.getNumHints() );
</div>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding decimals 0.5</title>
@@ -37,7 +36,7 @@
<div>
<p class="question"><code>\Huge{<var>roundTo( A_DECIMAL, A * pow( 10, -A_DECIMAL ) ).toFixed( A_DECIMAL )</var> + <var>roundTo( B_DECIMAL, B * pow( 10, -B_DECIMAL ) ).toFixed( B_DECIMAL )</var> = {?}}</code></p>
<p data-type="decimal" class="solution"><var>A / pow( 10, A_DECIMAL ) + B / pow( 10, B_DECIMAL )</var></p>
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.adder = new Adder( NEW_A, NEW_B, A_DIGITS, B_DIGITS );
DUMMY = Array( graph.adder.getNumHints() );
</div>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding decimals 2</title>
@@ -37,7 +36,7 @@
<div>
<p class="question"><code>\Huge{<var>roundTo( A_DECIMAL, A * pow( 10, -A_DECIMAL ) ).toFixed( A_DECIMAL )</var> + <var>roundTo( B_DECIMAL, B * pow( 10, -B_DECIMAL ) ).toFixed( B_DECIMAL )</var> = {?}}</code></p>
<div data-type="decimal" class="solution"><var>A / pow( 10, A_DECIMAL ) + B / pow( 10, B_DECIMAL )</var></div>
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.adder = new Adder( NEW_A, NEW_B, A_DIGITS, B_DIGITS );
DUMMY = Array( graph.adder.getNumHints() );
</div>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding fractions</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format graphie graphie-helpers"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding fractions with common denominators</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding negative numbers</title>
@@ -22,7 +21,7 @@
<var id="REMOVE">[]</var>
</div>
<div class="question">
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
init({
range: [ [0, 13], [-4, 1] ]
});
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format"><head>
<title>Adding subtracting mixed numbers 0.5</title>
<script src="../khan-exercise.js"></script>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format"><head>
<title>Adding subtracting mixed numbers 1</title>
<script src="../khan-exercise.js"></script>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format graphie"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Adding vectors</title>
@@ -24,7 +23,7 @@
\vec b &amp;= <var>BX</var> \hat\imath + <var>BY</var> \hat\jmath
\end{align*}</code></p>
- <div class="graphie" id="graph">
+ <div id="graph" class="graphie">
graphInit({
range: 10,
scale: 20,
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic word-problems"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>1-digit addition</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>2-digit addition</title>
@@ -20,7 +19,7 @@
<div class="problems">
<div>
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.adder = new Adder( A, B );
graph.adder.show();
DUMMY = Array( graph.adder.getNumHints() );
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Addition with carrying</title>
@@ -21,7 +20,7 @@
<div class="problems">
<div>
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.adder = new Adder( A, B );
graph.adder.show();
DUMMY = Array( graph.adder.getNumHints() );
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>4-digit addition with carrying</title>
@@ -28,7 +27,7 @@
<div class="problems">
<div id="addition-4">
- <div id="numbers" class="graphie">
+ <div class="graphie" id="numbers">
graph.adder = new Adder(A, B);
graph.adder.show();
NUM_HINTS = graph.adder.getNumHints();
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format word-problems spin"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Age word problems</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math math-format word-problems spin graphie"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Age word problems</title>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers angles"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Alternate exterior angles</title>
@@ -18,7 +17,7 @@
<p>The two horizontal lines are parallel, and there is a third line that intersects them as shown below.</p>
<p class="question">If we know that the <span class="hint_blue">blue angle is <var>MEASURE</var> degrees</span>, what is the <span class="hint_orange">measure of the orange angle</span>?</p>
<p data-forms="integer" class="solution"><var>MEASURE</var></p>
- <div id="parallel-lines" class="graphie">
+ <div class="graphie" id="parallel-lines">
init({
range: [ [ -1, 11 ], [-1, 4] ]
});
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers angles"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Alternate exterior angles 2</title>
@@ -26,7 +25,7 @@
<p>The two horizontal lines are parallel, and there is a third line that intersects them as shown below.</p>
<p class="question">Solve for <code>x</code>:</p>
<p class="solution"><var>SOLUTION</var></p>
- <div id="parallel-lines" class="graphie">
+ <div class="graphie" id="parallel-lines">
var eq1 = A + "x + " + B + "^\\circ";
var eq2 = C + "x + " + D + "^\\circ";
@@ -45,7 +44,7 @@
</div>
<div class="hints">
- <p>Alternate exterior angles are equal to one another. <a href="/video/angles-formed-by-parallel-lines-and-transversals?playlist=Geometry" data-youtube-id="gRKZaojKeP0" class="related-video">Watch this video</a> to understand why.</p>
+ <p>Alternate exterior angles are equal to one another. <a href="/video/angles-formed-by-parallel-lines-and-transversals?playlist=Geometry" class="related-video" data-youtube-id="gRKZaojKeP0">Watch this video</a> to understand why.</p>
<div>
<p>The <code>\color{<var>BLUE</var>}{\text{blue angle}}</code> and the <code>\color{<var>ORANGE</var>}{\text{orange angle}}</code> are alternate exterior angles. Therefore, we can set them equal to one another.</p>
<p><code>\color{<var>BLUE</var>}{<var>A</var>x + <var>B</var>} = \color{<var>ORANGE</var>}{<var>C</var>x + <var>D</var>}</code></p>
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers angles"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Alternate interior angles</title>
@@ -18,7 +17,7 @@
<p>The two horizontal lines are parallel, and there is a third line that intersects them as shown below.</p>
<p class="question">If we know that the <span class="hint_blue">blue angle is <var>MEASURE</var> degrees</span>, what is the <span class="hint_orange">measure of the orange angle</span>?</p>
<p data-forms="integer" class="solution"><var>MEASURE</var></p>
- <div id="parallel-lines" class="graphie">
+ <div class="graphie" id="parallel-lines">
init({
range: [ [ -1, 11 ], [-1, 4] ]
});
@@ -1,5 +1,4 @@
<!DOCTYPE html>
-<!DOCTYPE html>
<html data-require="math graphie graphie-helpers angles"><head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<title>Alternate interior angles 2</title>
@@ -26,7 +25,7 @@
<p>The two horizontal lines are parallel, and there is a third line that intersects them as shown below.</p>
<p class="question">Solve for <code>x</code>:</p>
<p class="solution"><var>SOLUTION</var></p>
- <div id="parallel-lines" class="graphie">
+ <div class="graphie" id="parallel-lines">
var eq1 = A + "x + " + B + "^\\circ";
var eq2 = C + "x + " + D + "^\\circ";
@@ -45,7 +44,7 @@
</div>
<div class="hints">
- <p>Alternate interior angles are equal to one another. <a href="/video/angles-formed-by-parallel-lines-and-transversals?playlist=Geometry" data-youtube-id="gRKZaojKeP0" class="related-video">Watch this video</a> to understand why.</p>
+ <p>Alternate interior angles are equal to one another. <a href="/video/angles-formed-by-parallel-lines-and-transversals?playlist=Geometry" class="related-video" data-youtube-id="gRKZaojKeP0">Watch this video</a> to understand why.</p>
<div>
<p>The <code>\color{<var>BLUE</var>}{\text{blue angle}}</code> and the <code>\color{<var>ORANGE</var>}{\text{orange angle}}</code> are alternate interior angles. Therefore, we can set them equal to one another.</p>
<p><code>\color{<var>BLUE</var>}{<var>A</var>x + <var>B</var>} = \color{<var>ORANGE</var>}{<var>C</var>x + <var>D</var>}</code></p>
Oops, something went wrong.

0 comments on commit d53a57c

Please sign in to comment.