Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Ruscitti <hugoruscitti@gmail.com>2012-11-05 00:46:32 (GMT)
committer Hugo Ruscitti <hugoruscitti@gmail.com>2012-11-05 00:46:32 (GMT)
commit495532690f5e9b992133cd93145b11adaab8c89b (patch)
treeb200ab603acc931bd59ce8688feecc847b9886f3
parentf202977557303ea04b95be5f29348776752dc6a6 (diff)
Completando analisis de la unidad 10.
-rw-r--r--doc/source/analisis.rst53
-rw-r--r--doc/source/images/u10/l1_1.pngbin0 -> 240330 bytes
-rw-r--r--doc/source/images/u10/l1_2.pngbin0 -> 233026 bytes
-rw-r--r--doc/source/images/u10/l1_3.pngbin0 -> 10730 bytes
-rw-r--r--doc/source/images/u10/l2_1.pngbin0 -> 239481 bytes
-rw-r--r--doc/source/images/u10/l2_2.pngbin0 -> 228068 bytes
-rw-r--r--doc/source/images/u10/l2_3.pngbin0 -> 10573 bytes
-rw-r--r--doc/source/images/u10/l2_4.pngbin0 -> 132911 bytes
-rw-r--r--doc/source/images/u10/lecciones.pngbin0 -> 359450 bytes
9 files changed, 48 insertions, 5 deletions
diff --git a/doc/source/analisis.rst b/doc/source/analisis.rst
index ef85644..e251192 100644
--- a/doc/source/analisis.rst
+++ b/doc/source/analisis.rst
@@ -1086,17 +1086,60 @@ La siguiente página nos pide que realizemos una división:
.. image:: images/u7/l4_2.png
-Programa U7.exe
-===============
+Programa U10.exe
+================
-:Ejecutable: U7.exe
-:Titulo: Multiplicacion y division de fracciones
+:Ejecutable: U10.exe
+:Titulo: El calendario de los mayas
:Para: 6to grado
:Visto por: Hugo
-Este programa consta de 4 lecciones.
+Este programa consta de 2 lecciones.
+
+.. image:: images/u10/lecciones.png
+
+Lección 1
+---------
+
+Es un asistente de dos pasos, la primer pantalla nos explica
+el calendario **Tkolkin**:
+
+.. image:: images/u10/l1_1.png
+
+La segunda pantalla nos pide que representemos una fecha con ese
+sistema de calendario:
+
+.. image:: images/u10/l1_2.png
+
+En la parte de abajo aparece una lámpara que dice "ejemplo". Si se
+pulsa aparece lo siguiente:
+
+.. image:: images/u10/l1_3.png
+
+
+Lección 2
+---------
+
+Comienza mostrando el calendario **Haab**:
+
+.. image:: images/u10/l2_1.png
+
+Luego nos pide que representemos una fecha:
+
+
+.. image:: images/u10/l2_2.png
+
+En la parte de abajo aparece una lámpara, que si la
+pulsamos nos dice:
+
+.. image:: images/u10/l2_3.png
+
+
+La respuesta tiene que involucrar un número y
+un símbolo, así que una posible respuesta puede ser:
+.. image:: images/u10/l2_4.png
=======================
diff --git a/doc/source/images/u10/l1_1.png b/doc/source/images/u10/l1_1.png
new file mode 100644
index 0000000..af22b80
--- /dev/null
+++ b/doc/source/images/u10/l1_1.png
Binary files differ
diff --git a/doc/source/images/u10/l1_2.png b/doc/source/images/u10/l1_2.png
new file mode 100644
index 0000000..7132b7a
--- /dev/null
+++ b/doc/source/images/u10/l1_2.png
Binary files differ
diff --git a/doc/source/images/u10/l1_3.png b/doc/source/images/u10/l1_3.png
new file mode 100644
index 0000000..9aa50ca
--- /dev/null
+++ b/doc/source/images/u10/l1_3.png
Binary files differ
diff --git a/doc/source/images/u10/l2_1.png b/doc/source/images/u10/l2_1.png
new file mode 100644
index 0000000..8591ac3
--- /dev/null
+++ b/doc/source/images/u10/l2_1.png
Binary files differ
diff --git a/doc/source/images/u10/l2_2.png b/doc/source/images/u10/l2_2.png
new file mode 100644
index 0000000..89dcb99
--- /dev/null
+++ b/doc/source/images/u10/l2_2.png
Binary files differ
diff --git a/doc/source/images/u10/l2_3.png b/doc/source/images/u10/l2_3.png
new file mode 100644
index 0000000..2518593
--- /dev/null
+++ b/doc/source/images/u10/l2_3.png
Binary files differ
diff --git a/doc/source/images/u10/l2_4.png b/doc/source/images/u10/l2_4.png
new file mode 100644
index 0000000..cff36d7
--- /dev/null
+++ b/doc/source/images/u10/l2_4.png
Binary files differ
diff --git a/doc/source/images/u10/lecciones.png b/doc/source/images/u10/lecciones.png
new file mode 100644
index 0000000..9395ce7
--- /dev/null
+++ b/doc/source/images/u10/lecciones.png
Binary files differ