Java2Dig
diff --git a/‎en/_sources/conditional_loops.txt‎
Lines changed: 36 additions & 16 deletions b/‎en/_sources/conditional_loops.txt‎
Lines changed: 36 additions & 16 deletions
diff --git a/‎en/_sources/conditionals.txt‎
Lines changed: 15 additions & 5 deletions b/‎en/_sources/conditionals.txt‎
Lines changed: 15 additions & 5 deletions
diff --git a/‎en/_sources/functions.txt‎
Lines changed: 3 additions & 4 deletions b/‎en/_sources/functions.txt‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎en/_sources/getting_started.txt‎
Lines changed: 10 additions & 17 deletions b/‎en/_sources/getting_started.txt‎
Lines changed: 10 additions & 17 deletions
diff --git a/‎en/_sources/logical_operators.txt‎
Lines changed: 15 additions & 20 deletions b/‎en/_sources/logical_operators.txt‎
Lines changed: 15 additions & 20 deletions
diff --git a/‎en/_sources/loops.txt‎
Lines changed: 2 additions & 3 deletions b/‎en/_sources/loops.txt‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎en/_sources/simple_drawing.txt‎
Lines changed: 16 additions & 5 deletions b/‎en/_sources/simple_drawing.txt‎
Lines changed: 16 additions & 5 deletions
@@ -11,32 +11,46 @@ conditional loops are defined with the ``while`` statement::
     counter = 0
     while counter < 10:
         print("in the loop")
-        counter += 1
-        
-The `+=' operator is an inplace increment and it is a short way of saying `counter = counter + 1` in the above statement.
+        counter = counter + 1
 
-Move until condition is met
-===========================
+
+Turtle prison
+=============
 
 Exercise
 --------
 
-Use the ``while`` loop to move the turtle forward until it reaches the end of
-the window. 
+The turtle has been up to its usual tricks again, robbing liqour
+stores and building up huge gambling debts. It's time for turtle to be
+put into a box that it can't get out of.
+
+Let's make a new version of ``forward()``. One that turns the turtle
+around if it tries to go further than 100 from the origin. We'll need
+a ``while`` loop, and some new turtle functions:
+
+* ``turtle.distance(0,0)`` - Distance of the turtle from the origin
+* ``turtle.towards(0,0)`` - The angle to get back to origin
+* ``turtle.setheading(angle)`` - Directly set the turtle direction
+
+Now you will need to implement the prison logic using the API calls
+above, a ``while`` loop and a bit of conditional logic. It's a bit of
+a stretch but keep at it! Don't be afraid to talk it out with a coach
+or another student.
+
 
 Solution
 --------
 
 ::
 
-    def move_to_window_border(distance):
-        while turtle.xcor() + distance < turtle.window_width() / 2:
-            turtle.forward(distance)
+  def forward(distance):
+      while distance > 0:
+          if turtle.distance(0,0) > 100:
+              angle = turtle.towards(0,0)
+              turtle.setheading(angle)
+          turtle.forward(1)
+          distance = distance - 1
 
-Bonus
------
-
-Can you make the turtle move exactly to the window border?
 
 Draw a spiral
 =============
@@ -53,23 +67,29 @@ Interrupt the loop when the turtle reaches a certain distance from the center.
 Use the function ``turtle.distance(x, y)`` to get the turtle's distance to the
 point defined by the coordinates ``x`` and ``y``.
 
+To do this you will need the ``turtle.xcor()`` and ``turtle.ycor()``
+functions, which return the position of the turtle in X and Y axes
+respectively.
+
 .. note::
 
    To draw a spiral, the turtle has to rotate by a constant value and move
-   forward by an increasing value in each repetition.
+   forward by an increasing value.
 
 Solution
 --------
 
 ::
 
     def draw_spiral(radius):
+        original_xcor = turtle.xcor()
+        original_ycor = turtle.ycor()
         speed = 1
         while True:
             turtle.forward(speed)
             turtle.left(10)
             speed += 0.1
-            if turtle.distance(0, 0) > radius:
+            if turtle.distance(original_xcor, original_ycor) > radius:
                 break
 
 Bonus
 
@@ -4,7 +4,13 @@ Conditional statements
 Introduction
 ============
 
-So far we have accomplished predefined tasks, but in all honesty we were accomplishing no better achievements than the 18th century automata, or the music boxes following one set of instruction to the end. What makes programming so much more powerful are conditional statements. This is the ability to *test* a variable against a value and act in one way if the condition is met by the variable or an other way if not. They are also commonly called by programmers *if statements*.
+So far we have accomplished predefined tasks, but in all honesty we
+were accomplishing no better than old-time music boxes following one
+set of instructions to the end. What makes programming so much more
+powerful are conditional statements. This is the ability to *test* a
+variable against a value and act in one way if the condition is met by
+the variable or another way if not. They are also commonly called by
+programmers *if statements*.
 
 To know if a condition is *True* of *False*, we need a new type of data: 
 the booleans. They allow logical operations. 
@@ -20,8 +26,8 @@ The condition can be anything that evaluates as *True* or
 *False*. Comparisons always return *True* or *False*, for example
 ``==`` (equal to), ``>`` (greater than), ``<`` (less than.)
 
-The second **else** part is optional. If you leave it off, nothing
-will happen if the conditional evaluates to 'False'.
+The **else** part is optional. If you leave it off, nothing will
+happen if the conditional evaluates to 'False'.
 
 
 Examples
@@ -48,14 +54,18 @@ Giving Directions
 =================
 
 Python turtles can be very good at following instructions. Let's use
-the ``raw_input()`` function to ask the user for a direction to move
+the ``input()`` function to ask the user for a direction to move
 the turtle. To keep things easy we will only accept two instructions:
 "left" and "right".
 
+.. note::
+
+   Using Python 2? The ``input()`` function is called ``raw_input()``.
+
 It's much easier to define this as a function, like so::
 
   def move():
-      direction = raw_input("Go left or right? ")
+      direction = input("Go left or right? ")
       if direction == "left":
           turtle.left(60)
           turtle.forward(50)
 
@@ -35,14 +35,14 @@ You can access variables in functions as well::
 
 .. important::
 
-   Python uses *identing with whitespace to identify blocks of code*
+   Python uses *identing with whitespace* to identify blocks of code
    that belong together. In Python a block (like the function
    definitions shown above) is introduced with a colon at the end of the
    line and subsequent commands are indented --- usually 4 spaces
    further in. The block ends with the first line that isn't indented.
 
    This is different to many other programming languages, which use
-   special characters (like curly brackets ``{}``) to group blocks of
+   special characters (like curly braces ``{}``) to group blocks of
    code together.
 
    You can indent your blocks with either tabs or spaces, but if you
@@ -66,7 +66,6 @@ Solution
 
     def tilted_square():
       turtle.left(angle)
-
       turtle.forward(50)
       turtle.left(90)
       turtle.forward(50)
@@ -144,4 +143,4 @@ function, but you better not call it ``hexagon`` in that case.  That's
 misleading because it actually draws a hexagon and then advances to a position
 where another hexagon would make sense in order to draw a honeycomb.  If you
 ever wanted to reuse your hexagon function outside of honeycombs, that would be
-confusing at least.
+confusing.
@@ -17,12 +17,7 @@ Python similar to this::
 
 .. note::
 
-   If you're on Windows and instead see something like "command not found," the
-   installer has not set up your *search path* correctly, ie. Windows does not
-   know where to find :program:`python.exe`.  Follow the steps described in the
-   `Python docs`__ and **restart your command line.**
-
-   __ http://docs.python.org/using/windows.html#excursus-setting-environment-variables
+   On Windows you can open Python through the Start Menu.
 
 Those three ``>>>`` in the last line indicate that you are now in the
 interactive shell of Python.  It is waiting for your commands::
@@ -43,14 +38,15 @@ Running Python files
 ====================
 
 But you don't want to type everything into the Python shell every time.
-Instead having a file with commands and handing that to Python to execute would
-be much better.  In order to do that you can just pass a file name to the
-:program:`python` executable and it will execute that file instead of launching
+Instead you can save the commands to a file and pass a file name to the
+:program:`python` executable. It will execute that file instead of launching
 the interactive interpreter.
 
 Let's try that.  Create a file :file:`hello.py` in your current directory with
 your favorite text editor and paste the print command from above.  Now save
-that file, go back the command line and type:
+that file.
+
+On Mac OSX and Linux go back the command line and type:
 
 .. code-block:: bash
 
@@ -67,21 +63,17 @@ that file, go back the command line and type:
 
    This changes to the subdirectory Python_Exercises of the currently active
    directory.  If you don't know which directory your shell is currently
-   running in use :command:`pwd` on Linux or :command:`cd` without parameters
-   on Windows.
+   running in use :command:`pwd`.
 
-   If you need to change your drive on Windows, just type the drive's letter
-   followed by a colon::
-
-     C:
+On Windows you can double-click the Python file to run it.
 
 When pressing :kbd:`<Enter>` now, the file is executed and you see the output
 as before.  But this time, after Python finished executing all commands from
 that file it exits instead of going back to the interactive shell.
 
 .. tip::
 
-   Wordpad, TextEdit, Notepad, and Word are **not** suited text editors.  If
+   Wordpad, TextEdit, Notepad, and Word are **not** suitable text editors.  If
    you are unsure whether you already have a usable editor, you might want to
    download and install `Sublime Text <http://www.sublimetext.com/>`_.
    Sophisticated editors like this also take care of identation and help you
@@ -95,3 +87,4 @@ And now we are all set and can get started with turtle!
    --- rather use more appropriate names such as :file:`square.py` or
    :file:`rectangle.py`.  Otherwise, whenever you refer to ``turtle``, Python
    will pick up *your* file instead of the standard turtle.
+
@@ -13,8 +13,8 @@ them. This can be done with logical operators.
 Negation of a statement
 =======================
 
-We can take the opposite value of a statement to use ``not`` its value.
-It is a logical operator::
+If we want something to be *False* we can use ``not``. It is a logical
+operator::
 
     x = False
     if not x :
@@ -46,8 +46,7 @@ This and that or something else
 ===============================
 
 Two easy to understand operators are ``and`` and ``or``. They do exactly what
-they sound like: combine two statements in a way both have be *True* (``and``)
-or at least one of them has to be *True* (``or``)::
+they sound like:::
 
     if 1 < 2 and 4 > 2:
         print("condition met")
@@ -64,25 +63,21 @@ want.
 Exercise
 --------
 
-Create a function that accepts the argument ``angle`` and moves the turtle
-forward into that direction until either the vertical or horizontal distance to
-the center exceeds 100.
+Earlier we put the turtle in a circular prison. This time let's make
+it a box. If the turtle goes more than 100 in the X *or* Y axis then
+we turn the turtle back around to the center.
 
 Solution
 --------
 
 ::
 
-    def move_to_square_border(angle):
-        turtle.left(angle)
-        x = turtle.xcor()
-        y = turtle.ycor()
-        while x > -100 and x < 100 and y > -100 and y < 100:
-            turtle.forward(10)
-            x = turtle.xcor()
-            y = turtle.ycor()
-
-Bonus
------
-
-Can you use this to draw a star?
+  def forward(distance):
+      while distance > 0:
+          if (turtle.xcor() > 100
+              or turtle.xcor() < -100
+              or turtle.ycor() > 100
+              or turtle.ycor() < -100):
+              turtle.setheading(turtle.towards(0,0))
+          turtle.forward(1)
+          distance = distance - 1
@@ -22,8 +22,7 @@ once.  But it gets better::
 Notice how we write only one line of code using ``i`` but it has 10 different
 values?
 
-You can also loop over elements of your choice (mathematicians call this
-"extensional sets")::
+You can also loop over elements of your choice::
 
     for i in 5, 7, 11, 13:
         print(i)
@@ -67,7 +66,7 @@ Can you make the dashes become larger as the line progresses?
    Feeling lost?  Inspect ``i`` at every run of the loop::
 
        for i in range(10):
-           print i
+           print(i)
            turtle.forward(15)
            turtle.penup()
            turtle.forward(5)
 
@@ -40,6 +40,13 @@ by the given distance. ``turtle.left(...)`` takes a number of degrees which you
 to rotate to the left. (There are ``turtle.backward(...)`` and
 ``turtle.right(...)``, too.)
 
+The standard turtle is just a triangle. That's no fun! Let's make it a turtle
+instead with the ``turtle.shape()`` command::
+
+  turtle.shape("turtle")
+
+So much cuter!
+
 If you put the commands into a file, you might have recognized that the turtle
 window vanishes after the turtle finished its movement.  (That is because
 Python exits when your turtle has finished moving.  Since the turtle window
@@ -49,6 +56,8 @@ until you click on it::
 
     import turtle
 
+    turtle.shape("turtle")
+
     turtle.forward(25)
 
     turtle.exitonclick()
@@ -94,7 +103,9 @@ If you want to get creative, you can modify your shape with the
 use these functions?  Before you can use a function you need to know
 its *signature* (for example the number of parameters and what they
 mean.) To find this out you can type ``help(turtle.color)`` into the
-Python shell. Press the :kbd:`q` key to exit the help again.
+Python shell. If there is a lot of text, Python will put the help text
+into a *pager*, which lets you page up and down. Press the :kbd:`q`
+key to exit the pager.
 
 Alternatively, browse the `online documentation`__.
 
@@ -122,7 +133,7 @@ Drawing a rectangle
 Exercise
 --------
 
-Can you draw a (non-square) rectangle too?
+Can you draw a rectangle too?
 
 .. image:: /images/rectangle.png
 
@@ -143,8 +154,8 @@ Solution
 Bonus
 -----
 
-How about a triangle?  (A triangle with 120 degrees angles will have all sides
-equally sized.)
+How about a triangle? In an equilateral triangle (a triangle with all
+sides of equal length) each corner has an angle of 120 degrees.
 
 
 More squares
@@ -153,7 +164,7 @@ More squares
 Exercise
 --------
 
-Now, draw a tilted square.  And another one, and another one.  You can
+Now, draw a tilted square. And another one, and another one. You can
 experiment with the angles between the individual squares.
 
 .. image:: /images/tiltedsquares.png