Removing numbers and fix code indentation

Author: barbarer

pretext/functions/funcWithStrsAndConds.ptx

@@ -107,26 +107,26 @@
       <program xml:id="fsc_ac_pogil_print_message_v2_ac_editor" interactive="activecode" language="python">
         <input>
 # function definition
-    def test(a, b = 2):
-        print("Welcome")
-        print("Learn the power of functions!")
-        print(a + b)
-        print(a - b)
-        print(a * b)
-        print(a / b)
-        print(a // b)
-        a = 5 % 2
-        return a
+def test(a, b = 2):
+    print("Welcome")
+    print("Learn the power of functions!")
+    print(a + b)
+    print(a - b)
+    print(a * b)
+    print(a / b)
+    print(a // b)
+    a = 5 % 2
+    return a
 
-    # function definition
-    def main():
-        print("Hello!")
-
-        # function call
-        print(test(3))
+# function definition
+def main():
+    print("Hello!")
 
     # function call
-    main()
+    print(test(3))
+
+# function call
+main()
         </input>
       </program>
     </exercise>
@@ -174,7 +174,47 @@
         </var>
       </setup>
     </exercise>
-   
+
+    <exercise label="fsc_pp_print_name_v2" numbered="yes" adaptive="yes" indentation="hide" language="python">
+      <statement>
+        <p>Drag the blocks from the left and put them in the correct order on the right to define a function <c>print_greeting</c> that asks for your name and prints <q>Hello Name</q>. Then define a <c>main</c> function that calls <c>print_greeting</c>.  Be sure to also call the <c>main</c> function. Note that you will have to indent the lines that are in the body of each function.  Click the <em>Check</em> button to check your solution.</p>
+      </statement>
+      <blocks>
+        <block order="5">
+          <choice correct="yes">
+            <cline>def print_greeting():</cline>
+          </choice>
+          <choice>
+            <cline>def print_greeting() </cline>
+          </choice>
+        </block>
+        <block order="8">
+          <cline>    name = input("What is your name?")</cline>
+        </block>
+        <block order="9">
+          <cline>    print("Hello " + name)</cline>
+        </block>
+        <block order="7">
+          <choice correct="yes">
+            <cline>def main():</cline>
+          </choice>
+          <choice>
+            <cline>Def main(): </cline>
+          </choice>
+        </block>
+        <block order="4">
+          <choice correct="yes">
+            <cline>    print_greeting()</cline>
+          </choice>
+          <choice>
+            <cline>    print_greeting </cline>
+          </choice>
+        </block>
+        <block order="3">
+          <cline>main()</cline>
+        </block>
+      </blocks>
+    </exercise>
   </subsection>
 </section>
 </worksheet>

pretext/intro/why-program.ptx

@@ -15,7 +15,7 @@
             the question, <q>What would you like me to do next?</q></p>
   <exercise label="intro-whyprogram-mc-ask">
     <statement>
-      <p>Q-1: Hardware in today's computers is built to continuously ask what?</p>
+      <p>Hardware in today's computers is built to continuously ask what?</p>
     </statement>
     <choices>
       <choice>
@@ -60,7 +60,7 @@
             helpful and capable of helping us do many different things.</p>
   <exercise label="intro-whyprogram-mc-add">
     <statement>
-      <p>Q-2: What does a programmer add to a computer's hardware?</p>
+      <p>What does a programmer add to a computer's hardware?</p>
     </statement>
     <choices>
       <choice correct="yes">
@@ -129,7 +129,7 @@ to 16
             to this partnership.</p>
   <exercise label="intro-whyprogram-mc-common">
     <statement>
-      <p>Q-3: What is the most commonly used word in the first three paragraphs of this page and how many times is it used?</p>
+      <p>What is the most commonly used word in the first three paragraphs of this page and how many times is it used?</p>
     </statement>
     <choices>
       <choice>

pretext/variables/values-and-types.ptx

@@ -43,7 +43,7 @@ print(type(3.2))
             they are in quotation marks like strings.</p>
   <exercise label="var-value-mc-string">
     <statement>
-      <p>csp-10-2-3: The values <q>17</q> and <q>3.2</q> are what type?</p>
+      <p>The values <q>17</q> and <q>3.2</q> are what type?</p>
     </statement>
     <choices>
       <choice>
@@ -103,7 +103,7 @@ print(1,000,000)
             thing.</p>
   <exercise label="var-value-mc-int">
     <statement>
-      <p>csp-10-2-6: How would you print the <em>integer</em> <c>1,000,000</c>?</p>
+      <p>How would you print the <em>integer</em> <c>1,000,000</c>?</p>
     </statement>
     <choices>
       <choice>