[gcompris: 90/90] braille activities: merged with gcomprisbraille.



commit 706dd654b2b8f74f567afd23432cdaf0df7e9941
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sat Sep 3 03:41:59 2011 +0200

    braille activities: merged with gcomprisbraille.

 .../braille_alphabets.py                           |   21 +---
 .../resources/braille_alphabets/Makefile.am        |   12 +--
 src/braille_fun-activity/braille_fun.py            |    6 +-
 .../resources/braille_fun/Makefile.am              |    8 --
 src/braille_lotto-activity/braille_lotto.py        |    8 --
 src/braille_lotto-activity/braille_lotto.xml.in    |   16 +---
 .../resources/braille_lotto/Makefile.am            |    7 --
 src/louis_braille-activity/Makefile.am             |    1 -
 src/louis_braille-activity/louis_braille.py        |  107 +-------------------
 src/louis_braille-activity/louis_braille.xml.in    |   13 ---
 .../resources/louis_braille/Makefile.am            |   16 ---
 .../resources/louis_braille/activity.desktop       |   49 +---------
 .../resources/louis_braille/activity.desktop.in    |   80 +--------------
 13 files changed, 12 insertions(+), 332 deletions(-)
---
diff --git a/src/braille_alphabets-activity/braille_alphabets.py b/src/braille_alphabets-activity/braille_alphabets.py
index ba823e3..0bb2e8a 100644
--- a/src/braille_alphabets-activity/braille_alphabets.py
+++ b/src/braille_alphabets-activity/braille_alphabets.py
@@ -1,10 +1,6 @@
 #  gcompris - braille_alphabets.py
 #
-<<<<<<< HEAD
 # Copyright (C) 2011 Bruno Coudoin and Srishti Sethi
-=======
-# Copyright (C) 2011 Bruno Coudoin | Srishti Sethi
->>>>>>> gcomprisbraille
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -43,14 +39,6 @@ CIRCLE_STROKE = "black"
 MAP_STROKE = "black"
 MAP_FILL = "light blue"
 
-<<<<<<< HEAD
-braille_intro = _("The Braille system is a method that is used by blind people to read and write.")
-braille_desc = _("Each Braille character, or cell, is made up of six dot positions, arranged in "
-                 "a rectangle containing two columns of three dots each. As seen on the left, each dot "
-                 "is referenced by a number from 1 to 6.")
-=======
->>>>>>> gcomprisbraille
-
 #Array Declaration
 letter_arr_one = ['A','B','C','D','E','F','G']
 random.shuffle(letter_arr_one)
@@ -183,8 +171,7 @@ class Gcompris_braille_alphabets:
                                  anchor = gtk.ANCHOR_CENTER,
                                  text = _("Braille : Unlocking the Code"))
         # Braille Intro
-        text = _("A system of writing for the blinds that uses characters made "
-                 "of raised dots.")
+        text = _("The Braille system is a method that is used by blind people to read and write.")
         goocanvas.Text(parent=self.rootitem,
                                  x = 520,
                                  y = 200,
@@ -194,9 +181,9 @@ class Gcompris_braille_alphabets:
                                  anchor = gtk.ANCHOR_CENTER,
                                  text = text)
         # Braille Description
-        text = _("The braille cell is composed of 6 dot cells organized in form "
-                 "of two vertical columns with 3 dots {1,2,3} side by side on "
-                 "left and 3 dots side by side on right {4,5,6}")
+        text = _("Each Braille character, or cell, is made up of six dot positions, arranged in "
+                 "a rectangle containing two columns of three dots each. As seen on the left, each dot "
+                 "is referenced by a number from 1 to 6.")
         goocanvas.Text(parent=self.rootitem,
                                  x=520,
                                  y=300,
diff --git a/src/braille_alphabets-activity/resources/braille_alphabets/Makefile.am b/src/braille_alphabets-activity/resources/braille_alphabets/Makefile.am
index 089b899..ce0a94c 100644
--- a/src/braille_alphabets-activity/resources/braille_alphabets/Makefile.am
+++ b/src/braille_alphabets-activity/resources/braille_alphabets/Makefile.am
@@ -1,7 +1,6 @@
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/braille_alphabets
 img_DATA = \
-<<<<<<< HEAD
-	back.png \
+	back.svg \
 	braille_tux.svgz \
 	mosaic.svgz \
 	target.svg
@@ -11,12 +10,3 @@ EXTRA_DIST = $(img_DATA)
 
 CLEANFILES =
 
-
-=======
-	back.svg \
-	braille_tux.svgz \
-	mosaic.svgz \
-	target.svg 
-
-EXTRA_DIST = $(img_DATA)
->>>>>>> gcomprisbraille
diff --git a/src/braille_fun-activity/braille_fun.py b/src/braille_fun-activity/braille_fun.py
index 95513b9..56cddcd 100644
--- a/src/braille_fun-activity/braille_fun.py
+++ b/src/braille_fun-activity/braille_fun.py
@@ -1,10 +1,6 @@
 #  gcompris - braille_fun.py
 #
-<<<<<<< HEAD
 # Copyright (C) 2011 Srishti Sethi
-=======
-# Copyright (C) 2003, 2008 Bruno Coudoin | Srishti Sethi
->>>>>>> gcomprisbraille
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -144,7 +140,7 @@ class Gcompris_braille_fun:
            	letter = random.choice(string.letters[random.randint(19,25)])
            else :
            	letter = random.choice(string.letters[random.randint(0,25)])
-           	
+
            self.letter_array.append(letter.upper())
            self.animateString = "".join(self.letter_array)
 
diff --git a/src/braille_fun-activity/resources/braille_fun/Makefile.am b/src/braille_fun-activity/resources/braille_fun/Makefile.am
index cfb248b..4dd0f00 100644
--- a/src/braille_fun-activity/resources/braille_fun/Makefile.am
+++ b/src/braille_fun-activity/resources/braille_fun/Makefile.am
@@ -1,6 +1,5 @@
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/braille_fun
 img_DATA = \
-<<<<<<< HEAD
 	hillside.svg \
 	plane.svg
 
@@ -9,10 +8,3 @@ EXTRA_DIST = $(img_DATA)
 
 CLEANFILES =
 
-
-=======
-	hillside.svg
-	plane.svg 
-
-EXTRA_DIST = $(img_DATA)
->>>>>>> gcomprisbraille
diff --git a/src/braille_lotto-activity/braille_lotto.py b/src/braille_lotto-activity/braille_lotto.py
index 17992ed..c919395 100644
--- a/src/braille_lotto-activity/braille_lotto.py
+++ b/src/braille_lotto-activity/braille_lotto.py
@@ -1,10 +1,6 @@
 #  gcompris - braille_lotto.py
 #
-<<<<<<< HEAD
 # Copyright (C) 2011 Bruno Coudoin and Srishti Sethi
-=======
-# Copyright (C) 2011 Bruno Coudoin | Srishti Sethi
->>>>>>> gcomprisbraille
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -505,8 +501,4 @@ class Gcompris_braille_lotto:
           self.start()
 
   def set_level(self, level):
-<<<<<<< HEAD
-    print("braille_lotto set level. %i" % level)
-=======
     pass
->>>>>>> gcomprisbraille
diff --git a/src/braille_lotto-activity/braille_lotto.xml.in b/src/braille_lotto-activity/braille_lotto.xml.in
index ec0e259..1d2f6a9 100644
--- a/src/braille_lotto-activity/braille_lotto.xml.in
+++ b/src/braille_lotto-activity/braille_lotto.xml.in
@@ -5,25 +5,15 @@
         type="python:braille_lotto"
         section="/discovery/braille"
         icon="braille_lotto.svg"
-<<<<<<< HEAD
         difficulty="5"
-=======
-        difficulty="1"
->>>>>>> gcomprisbraille
         author="Srishti Sethi (srishakatux gmail com)"
         boarddir=""
         demo="1">
         <_title>Braille Lotto</_title>
-        <_description>Fun with Braille</_description>
-<<<<<<< HEAD
+        <_description>Discover the Braille system for numbers.</_description>
         <_prerequisite></_prerequisite>
-        <_goal>Discover the Braille system for numbers.</_goal>
-        <_manual>Check the Braille system for the number on the button in the ticket.If you find the code in the ticket, click on it in order to cross it.As soon you click the code it will be crossed.The player who is able to cross all the braille codes correctly first, wins the game.Check the braille chart by clicking on the toggle button for help.</_manual>
-=======
-        <_prerequisite>Braille number codes</_prerequisite>
-        <_goal>To match the braille code for all ticket numbers with that on the button correctly.</_goal>
-        <_manual>Check the braille code for the number on the button in the ticket.If you find the code in the ticket, click on it in order to mark its presence.If you mark the number correctly a check mark will be displayed on the ticket number otherwise a cross mark will be indicated.In case you mark it wrong, again click on the ticket number to hide the cross mark.The player who is able to identify all the braille codes correctly first, wins the game.Check the braille chart by clicking on the toggle button for help.</_manual>
->>>>>>> gcomprisbraille
+        <_goal> </_goal>
+        <_manual>Each player must find if the proposed number is in their board. If the code in the board, just click on it in order to validate it. The player who crosses all the Braille numbers correctly wins the game. Check the Braille table by clicking on the toggle button in the control bar.</_manual>
         <_credit></_credit>
   </Board>
   <Data directory=""/>
diff --git a/src/braille_lotto-activity/resources/braille_lotto/Makefile.am b/src/braille_lotto-activity/resources/braille_lotto/Makefile.am
index f4af164..8d39d6c 100644
--- a/src/braille_lotto-activity/resources/braille_lotto/Makefile.am
+++ b/src/braille_lotto-activity/resources/braille_lotto/Makefile.am
@@ -6,16 +6,9 @@ img_DATA = \
 	callout2.svg \
 	cross_button.png \
 	game.svg \
-<<<<<<< HEAD
 	tux.svg
 
 EXTRA_DIST = $(img_DATA)
 
 CLEANFILES =
 
-
-=======
-	tux.svg 
-
-EXTRA_DIST = $(img_DATA)
->>>>>>> gcomprisbraille
diff --git a/src/louis_braille-activity/Makefile.am b/src/louis_braille-activity/Makefile.am
index 2c9600f..ed72448 100644
--- a/src/louis_braille-activity/Makefile.am
+++ b/src/louis_braille-activity/Makefile.am
@@ -27,7 +27,6 @@ $(xml_DATA): %.xml: %.xml.in
 
 icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 icon_DATA = louis_braille.svg
-SUBDIRS = resources
 
 EXTRA_DIST = $(icon_DATA) ${xml_in_files} init_path.sh
 CLEANFILES = $(xml_DATA)
diff --git a/src/louis_braille-activity/louis_braille.py b/src/louis_braille-activity/louis_braille.py
index 807fb7c..cdbdc76 100644
--- a/src/louis_braille-activity/louis_braille.py
+++ b/src/louis_braille-activity/louis_braille.py
@@ -1,6 +1,6 @@
 #  gcompris - louis_braille.py
 #
-# Copyright (C) 2011 Srishti Sethi
+# Copyright (C) 2011 Bruno Coudoin | Srishti Sethi
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -120,88 +120,6 @@ class Gcompris_louis_braille:
           ok.connect("button_press_event", self.ok_event)
           gcompris.utils.item_focus_init(ok, None)
 
-<<<<<<< HEAD
-          for index in range(11,22):
-              #Rectangle for STORY
-              goocanvas.Rect(parent=self.rootitem,
-                          x=50,
-                          y=(index - 9) * 35,
-                          width=600,
-                          height=45,
-                          stroke_color="orange",
-                          fill_color="white",
-                          line_width=2.0)
-
-              #Rectangle for SEQUENCE
-              goocanvas.Rect(parent=self.rootitem,
-                          x=20,
-                          y=(index - 9) * 35,
-                          width=30,
-                          height=45,
-                          stroke_color="orange",
-                          fill_color="white",
-                          line_width=2.0)
-
-              #Displaying the STORY
-              goocanvas.Text(parent = self.rootitem,
-                   x=350.0,
-                   y=(index - 9) * 37.8,
-                   text=str(self.dataset.get(str(NUMBER_SEQUENCE[index - 11][0]),"story")),
-                   fill_color="black",
-                   anchor = gtk.ANCHOR_CENTER,
-                   alignment = pango.ALIGN_CENTER,
-                   font = 'SANS 8'
-                   )
-              #Displaying the SEQUENCE
-              goocanvas.Text(parent = self.rootitem,
-                   x=28.0,
-                   y=(index - 9) * 37,
-                   text= str(SEQUENCE[index - 11]),
-                   fill_color="black",
-                   anchor = gtk.ANCHOR_CENTER,
-                   alignment = pango.ALIGN_CENTER,
-                   font = 'SANS 8'
-                   )
-              #Answer area to the right
-              #Rectangle for numbering
-              goocanvas.Rect(parent=self.rootitem,
-                          x=690,
-                          y=(index - 9) * 35,
-                          width=30,
-                          height=45,
-                          stroke_color="orange",
-                          fill_color="white",
-                          line_width=2.0)
-              #Displaying the numbering
-              goocanvas.Text(parent = self.rootitem,
-                   x=710.0,
-                   y=(index - 9) * 37,
-                   text= str(index - 10),
-                   fill_color="black",
-                   anchor = gtk.ANCHOR_CENTER,
-                   alignment = pango.ALIGN_CENTER,
-                   font = 'SANS 8'
-                   )
-          self.widget_array = []
-
-          for index in range(11):
-              # the answer area
-              self.entry = gtk.Entry()
-
-              goocanvas.Widget(
-                       parent = self.rootitem,
-                       widget=self.entry,
-                       x = 740,
-                       y = (index + 2) * 36,
-                       width = 50,
-                       height= 25,
-                       anchor=gtk.ANCHOR_NW)
-
-              self.widget_array.append(self.entry)
-              self.widget_array[index].connect("activate", self.enter_callback,
-                                               self.widget_array[index], index)
-=======
->>>>>>> gcomprisbraille
       else :
           gcompris.bar_location(gcompris.BOARD_WIDTH - 140, 350, 0.8)
 
@@ -247,25 +165,6 @@ class Gcompris_louis_braille:
                              20, 50, LOUIS_BRAILLE_NAME[index] ,COLOR_ON, COLOR_OFF,
                              CIRCLE_FILL, CIRCLE_FILL,True,False ,False, None)
 
-<<<<<<< HEAD
-          story = self.dataset.get(str(level),"story")
-
-          #Rectangle for YEAR
-          goocanvas.Rect(parent=self.rootitem,
-                          x=330,
-                          y=382,
-                          width=180,
-                          height=25,
-                          stroke_color="orange",
-                          fill_color="white",
-                          line_width=2.0)
-
-          #Displaying the YEAR
-          goocanvas.Text(parent = self.rootitem,
-                   x=420.0,
-                   y=395.0,
-                   text=str(self.dataset.get(str(level),"year")),
-=======
           story = self.dataset.get(str(level), _("story"))
 
           # Displaying the YEAR
@@ -273,7 +172,6 @@ class Gcompris_louis_braille:
                    x = 420.0,
                    y = 400.0,
                    text=str(self.dataset.get(str(level) , "year")),
->>>>>>> gcomprisbraille
                    fill_color="black",
                    anchor = gtk.ANCHOR_CENTER,
                    alignment = pango.ALIGN_CENTER,
@@ -378,8 +276,6 @@ class Gcompris_louis_braille:
 
   def set_level(self, level):
     print("louis_braille set level. %i" % level)
-<<<<<<< HEAD
-=======
 
 class Reordering:
   """This class manages the reordering activity"""
@@ -506,4 +402,3 @@ class Reordering:
         groupitem.set_properties(x = to_x, y = to_y)
 
       return True
->>>>>>> gcomprisbraille
diff --git a/src/louis_braille-activity/louis_braille.xml.in b/src/louis_braille-activity/louis_braille.xml.in
index f2e8b72..581f5b8 100644
--- a/src/louis_braille-activity/louis_braille.xml.in
+++ b/src/louis_braille-activity/louis_braille.xml.in
@@ -5,7 +5,6 @@
         type="python:louis_braille"
         section="/discovery/braille"
         icon="louis_braille.svg"
-<<<<<<< HEAD
         difficulty="5"
         author="Srishti Sethi (srishakatux gmail com)"
         boarddir=""
@@ -16,18 +15,6 @@
         <goal></goal>
         <manual>Read the history of Louis Braille, his biography and discovery of the Braille system. Click on the previous and next buttons to move to the respective story page. At the end, arrange the sequence in the chronological order.</manual>
         <credit>Louis Braille Video: &lt; http://www.youtube.com/watch?v=9bdfC2j_4x4 &gt; </credit>
-=======
-        difficulty="4"
-        author="Srishti Sethi (srishakatux gmail com)"
-        boarddir=""
-        demo="1">
-        <_title>Louis Braille</_title>
-        <_description>The Story Of Louis Braille</_description>
-        <_prerequisite>Reading</_prerequisite>
-        <_goal></_goal>
-        <_manual>Read the story of Louis Braille, his biography and discovery of braille code. Click on the previous and next buttons to move to the respective story page. At the end of story, arrange the sequence of story by draging the events. Click on OK button to confirm the sequence. Each correctly arranged line will me marked in green and in red otherwise.</_manual>
-        <_credit>Louis Braille Video &lt; http://www.youtube.com/watch?v=9bdfC2j_4x4&gt; </_credit>
->>>>>>> gcomprisbraille
   </Board>
   <Data directory=""/>
 </GCompris>
diff --git a/src/louis_braille-activity/resources/louis_braille/Makefile.am b/src/louis_braille-activity/resources/louis_braille/Makefile.am
index 93493fb..d9e186f 100644
--- a/src/louis_braille-activity/resources/louis_braille/Makefile.am
+++ b/src/louis_braille-activity/resources/louis_braille/Makefile.am
@@ -1,24 +1,14 @@
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/louis_braille
 img_DATA = \
 	activity.desktop \
-<<<<<<< HEAD
-	back.png \
-=======
 	background.svgz \
->>>>>>> gcomprisbraille
 	braile.jpg \
 	braille_ball.jpg \
 	chart.png \
 	fireplace.jpg \
-<<<<<<< HEAD
-	louis.jpg \
-	night_printing.jpg \
-	piano.jpg \
-=======
 	louis.png \
 	night_printing.jpg \
 	piano.svg \
->>>>>>> gcomprisbraille
 	rnib.jpg \
 	statue.jpg \
 	teach.jpg \
@@ -31,11 +21,5 @@ activity.desktop: activity.desktop.in
 	sed -e "s/^_//g" $< > $@
 
 EXTRA_DIST = $(img_DATA) activity.desktop.in
-<<<<<<< HEAD
-
-CLEANFILES = activity.desktop
-
 
-=======
 CLEANFILES = activity.desktop
->>>>>>> gcomprisbraille
diff --git a/src/louis_braille-activity/resources/louis_braille/activity.desktop b/src/louis_braille-activity/resources/louis_braille/activity.desktop
index 6aebfc3..9134e0f 100755
--- a/src/louis_braille-activity/resources/louis_braille/activity.desktop
+++ b/src/louis_braille-activity/resources/louis_braille/activity.desktop
@@ -1,11 +1,7 @@
 [1]
 year = 1809
 story = Born January 4th at Coupvary near Paris in France.
-<<<<<<< HEAD
-image = louis_braille/louis.jpg
-=======
 image = louis_braille/louis.png
->>>>>>> gcomprisbraille
 
 [2]
 year = 1812
@@ -25,19 +21,11 @@ image = louis_braille/rnib.jpg
 [5]
 year = 1820
 story = He began to impress his classmates and began to play piano and the organ.
-<<<<<<< HEAD
-image = louis_braille/piano.jpg
-
-[6]
-year = 1821
-story = Charles Barbier, a french soldier visited school and shared invention of night writing ,a code of 12 raised dots that let soldiers share secret information on battlefield.
-=======
 image = louis_braille/piano.svg
 
 [6]
 year = 1821
 story = Charles Barbier, a french soldier visited school and shared invention of night writing ,a code of 12 raised dots to share information on battlefield.
->>>>>>> gcomprisbraille
 image = louis_braille/night_printing.jpg
 
 [7]
@@ -56,6 +44,7 @@ story = He revised and extended braille to include mathematics, symbols, punctua
 image = louis_braille/chart.png
 
 [10]
+
 year = 1852
 story = He died of tuberculosis.He is burried in the Pantheon in Paris.A monument is erected to honor him.
 image = louis_braille/statue.jpg
@@ -64,39 +53,3 @@ image = louis_braille/statue.jpg
 year = After his Death
 story = Braille got accepted as a world wide standard.Louis proved if you have motivation you can do incredible things.
 image = louis_braille/braille_ball.jpg
-<<<<<<< HEAD
-
-[12]
-story = Born January 4th at Coupvary near Paris in France.
-
-[13]
-story =  Louis Braille injured his left eye with a stitching awl from  his fathers workshop.
-
-[14]
-story = At the age of three Louis became blind due to sympathetic ophthalmia.
-
-[15]
-story = At the age of 10 he was sent to Paris to study at the Royal Institute for Blind Youth.
-
-[16]
-story = He began to impress his classmates and began to play piano and the organ.
-
-[17]
-story = Charles Barbier, a french soldier visited school and shared invention of night writing.
-
-[18]
-story = Louis trimmed Barbier's 12 dots into 6 and invented Braille.
-
-[19]
-story = He became a professor after graduating and secretly taught his method.
-
-[20]
-story = He revised and extended braille to include mathematics,symbols, punctuations and music notations.
-
-[21]
-story = He died of tuberculosis.He is burried in the Pantheon in Paris.A monument is erected to honor him.
-
-[22]
-story = Braille got accepted as a world wide standard.Louis proved if you have motivation you can do incredible things.
-=======
->>>>>>> gcomprisbraille
diff --git a/src/louis_braille-activity/resources/louis_braille/activity.desktop.in b/src/louis_braille-activity/resources/louis_braille/activity.desktop.in
index 6c4e74a..95cbbed 100644
--- a/src/louis_braille-activity/resources/louis_braille/activity.desktop.in
+++ b/src/louis_braille-activity/resources/louis_braille/activity.desktop.in
@@ -1,54 +1,24 @@
 [1]
-<<<<<<< HEAD
-_year = 1809
-_story = Born January 4th at Coupvary near Paris in France.
-image = louis_braille/louis.jpg
-
-[2]
-_year = 1812
-=======
 year = 1809
 _story = Born January 4th at Coupvary near Paris in France.
 image = louis_braille/louis.png
 
 [2]
 year = 1812
->>>>>>> gcomprisbraille
 _story = Louis Braille injured his left eye with a stitching awl from his fathers workshop.
 image = louis_braille/workshop.jpg
 
 [3]
-<<<<<<< HEAD
-_year = 1812
-=======
 year = 1812
->>>>>>> gcomprisbraille
 _story = At the age of three Louis became blind due to sympathetic ophthalmia.
 image = louis_braille/fireplace.jpg
 
 [4]
-<<<<<<< HEAD
-_year = 1819
-=======
 year = 1819
->>>>>>> gcomprisbraille
 _story = At the age of 10 he was sent to Paris to study at the Royal Institute for Blind Youth.
 image = louis_braille/rnib.jpg
 
 [5]
-<<<<<<< HEAD
-_year = 1820
-_story = He began to impress his classmates and began to play piano and the organ.
-image = louis_braille/piano.jpg
-
-[6]
-_year = 1821
-_story = Charles Barbier, a french soldier visited school and shared invention of night writing ,a code of 12 raised dots that let soldiers share secret information on battlefield.
-image = louis_braille/night_printing.jpg
-
-[7]
-_year = 1824
-=======
 year = 1820
 _story = He began to impress his classmates and began to play piano and the organ.
 image = louis_braille/piano.svg
@@ -60,34 +30,22 @@ image = louis_braille/night_printing.jpg
 
 [7]
 year = 1824
->>>>>>> gcomprisbraille
 _story = Louis trimmed Barbier's 12 dots into 6 and invented Braille.
 image = louis_braille/braile.jpg
 
 [8]
-<<<<<<< HEAD
-_year = 1828
-=======
 year = 1828
->>>>>>> gcomprisbraille
 _story = He became a professor after graduating and secretly taught his method.
 image = louis_braille/teach.jpg
 
 [9]
-<<<<<<< HEAD
-_year = 1837
-=======
 year = 1837
->>>>>>> gcomprisbraille
 _story = He revised and extended braille to include mathematics, symbols, punctuations and music notations.
 image = louis_braille/chart.png
 
 [10]
-<<<<<<< HEAD
-_year = 1852
-=======
+
 year = 1852
->>>>>>> gcomprisbraille
 _story = He died of tuberculosis.He is burried in the Pantheon in Paris.A monument is erected to honor him.
 image = louis_braille/statue.jpg
 
@@ -95,39 +53,3 @@ image = louis_braille/statue.jpg
 _year = After his Death
 _story = Braille got accepted as a world wide standard.Louis proved if you have motivation you can do incredible things.
 image = louis_braille/braille_ball.jpg
-<<<<<<< HEAD
-
-[12]
-_story = Born January 4th at Coupvary near Paris in France.
-
-[13]
-_story =  Louis Braille injured his left eye with a stitching awl from  his fathers workshop.
-
-[14]
-_story = At the age of three Louis became blind due to sympathetic ophthalmia.
-
-[15]
-_story = At the age of 10 he was sent to Paris to study at the Royal Institute for Blind Youth.
-
-[16]
-_story = He began to impress his classmates and began to play piano and the organ.
-
-[17]
-_story = Charles Barbier, a french soldier visited school and shared invention of night writing.
-
-[18]
-_story = Louis trimmed Barbier's 12 dots into 6 and invented Braille.
-
-[19]
-_story = He became a professor after graduating and secretly taught his method.
-
-[20]
-_story = He revised and extended braille to include mathematics,symbols, punctuations and music notations.
-
-[21]
-_story = He died of tuberculosis.He is burried in the Pantheon in Paris.A monument is erected to honor him.
-
-[22]
-_story = Braille got accepted as a world wide standard.Louis proved if you have motivation you can do incredible things.
-=======
->>>>>>> gcomprisbraille



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]