From cc9e748daab58bcd02f629ed23608e8a2164cff7 Mon Sep 17 00:00:00 2001
From: olpc <olpc@xo-11-16-62.localdomain>
Date: Mon, 03 Nov 2008 13:21:18 +0000
Subject: Release 2 Candidate

---
diff --git a/Speak.activity/MANIFEST b/Speak.activity/MANIFEST
index 112c229..8333489 100644
--- a/Speak.activity/MANIFEST
+++ b/Speak.activity/MANIFEST
@@ -1,7 +1,8 @@
-activity/activity-speak.svg
+
 activity/activity.info
 activity.py
 audio.py
+README
 COPYING
 eye.py
 fft_mouth.py
@@ -13,25 +14,7 @@ voice.py
 waveform_mouth.py
 po/activity.pot
 po/voice.pot
-cerebro.brn
-testbrain.py
-savebrain.py
 po/POTFILES.in
-sara/default.aiml
-sara/leeme.txt
-sara/numeros.aiml
-sara/sara_srai.aiml
-sara/sexo.aiml
-sara/nombres.aiml
-sara/sara.aiml
-sara/readme.txt
-PyAIML-0.8.5/setup.cfg
-PyAIML-0.8.5/pkg-info
-PyAIML-0.8.5/README.txt
-PyAIML-0.8.5/CHANGES.txt
-PyAIML-0.8.5/setup.py
-PyAIML-0.8.5/TODO.txt
-PyAIML-0.8.5/SUPPORTED_TAGS.txt
 aiml/Kernel.py
 aiml/WordSub.py
 aiml/DefaultSubs.py
@@ -40,3 +23,12 @@ aiml/__init__.py
 aiml/self-test.aiml
 aiml/PatternMgr.py
 aiml/AimlParser.py
+sara.brn
+test_brain.py
+gen_brains.py
+alice.brn
+brain.py
+po/es.po
+locale/es/activity.linfo
+locale/es/LC_MESSAGES/vu.lux.olpc.HablarConSara.mo
+activity/activity-hablarconsara.svg
diff --git a/Speak.activity/activity/activity-hablarconsara.svg b/Speak.activity/activity/activity-hablarconsara.svg
index 2eca6f4..dcd31cc 100644
--- a/Speak.activity/activity/activity-hablarconsara.svg
+++ b/Speak.activity/activity/activity-hablarconsara.svg
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]>
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -52,8 +56,6 @@
      gridtolerance="10.0"
      objecttolerance="10.0"
      borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
      id="base"
      showgrid="false"
      inkscape:zoom="2.33"
@@ -75,7 +77,7 @@
        sodipodi:cy="12"
        sodipodi:rx="10"
        sodipodi:ry="10"
-       style="fill:#ffffff;stroke:#000000;stroke-width:3.70489636;stroke-miterlimit:4;stroke-dasharray:none" />
+       style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.70489636;stroke-miterlimit:4;stroke-dasharray:none" />
     <ellipse
        transform="matrix(0.6477914,0,0,0.6477914,10.158787,8.6181926)"
        id="ellipse6"
@@ -87,7 +89,7 @@
        sodipodi:cy="12"
        sodipodi:rx="10"
        sodipodi:ry="10"
-       style="fill:#ffffff;stroke:#000000;stroke-width:3.70489636;stroke-miterlimit:4;stroke-dasharray:none" />
+       style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.70489636;stroke-miterlimit:4;stroke-dasharray:none" />
     <circle
        transform="matrix(0.6477914,0,0,0.6477914,9.7794379,8.6181926)"
        id="circle8"
@@ -98,7 +100,7 @@
        sodipodi:cy="10"
        sodipodi:rx="2"
        sodipodi:ry="2"
-       style="fill:#ffffff;stroke:#000000;stroke-width:3.396155;stroke-miterlimit:4;stroke-dasharray:none" />
+       style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.396155;stroke-miterlimit:4;stroke-dasharray:none" />
     <circle
        transform="matrix(0.6477914,0,0,0.6477914,9.8553077,8.6940624)"
        id="circle10"
@@ -109,10 +111,10 @@
        sodipodi:cy="10"
        sodipodi:rx="2"
        sodipodi:ry="2"
-       style="fill:#ffffff;stroke:#000000;stroke-width:3.396155;stroke-miterlimit:4;stroke-dasharray:none" />
+       style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.396155;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
        sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.96432175;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:2.96432175;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="path3304"
        sodipodi:cx="16.309013"
        sodipodi:cy="-42.060085"
@@ -127,6 +129,6 @@
        id="path2468"
        display="inline"
        d="M 7.7871374,45.936639 C 8.4431762,47.180327 13.584711,46.000335 15.719242,44.357198 C 17.741226,42.811224 18.804163,41.55458 19.890186,41.55458 C 20.980057,41.55458 31.952834,42.547803 40.028267,35.384717 C 46.978233,29.223491 49.429243,20.499317 44.376202,12.241526 C 39.324132,3.9891322 31.070741,2.4388396 24.292956,3.0002269 C 15.043003,3.7742937 2.9399537,11.944637 3.3757097,24.255214 C 3.6296602,31.500349 6.604921,34.125914 8.1103471,35.810076 C 9.6128874,37.500715 12.482335,37.500715 10.988453,41.842831 C 10.401673,43.547504 7.2965512,44.993076 7.7871374,45.936639 z"
-       style="fill:none;stroke:#010101;stroke-width:3.28907108;display:inline" />
+       style="fill:none;stroke:&stroke_color;;stroke-width:3.28907108;display:inline" />
   </g>
 </svg>
diff --git a/Speak.activity/activity/activity.info b/Speak.activity/activity/activity.info
index cfae1de..0739e93 100644
--- a/Speak.activity/activity/activity.info
+++ b/Speak.activity/activity/activity.info
@@ -3,7 +3,7 @@ name = HablarConSara
 bundle_id = vu.lux.olpc.HablarConSara
 class = activity.HablarConSaraActivity
 icon = activity-hablarconsara
-activity_version = 1
+activity_version = 2
 show_launcher = yes
 license = GPLv3+
 host_version = 1
diff --git a/Speak.activity/locale/es/activity.linfo b/Speak.activity/locale/es/activity.linfo
index 3dd4494..0a3781e 100644
--- a/Speak.activity/locale/es/activity.linfo
+++ b/Speak.activity/locale/es/activity.linfo
@@ -1,2 +1,2 @@
 [Activity]
-name = HablarConSara 
+name = HablarConSara
diff --git a/Speak.activity/test_brain.py b/Speak.activity/test_brain.py
index bdae924..32dc9b0 100755
--- a/Speak.activity/test_brain.py
+++ b/Speak.activity/test_brain.py
@@ -5,6 +5,6 @@ import aiml
 import os.path
 
 k = aiml.Kernel()
-k.loadBrain("cerebro.brn")
+k.loadBrain("sara.brn")
 
 while True: print k.respond(raw_input("Pregunta > ")) 
--
cgit v0.9.1