From 22be8df5c1589ca54bf5ae2ea920d96fd3ec22ba Mon Sep 17 00:00:00 2001
From: "Silas S. Brown" <ssb22@cam.ac.uk>
Date: Wed, 4 Apr 2012 07:57:56 +0000
Subject: [PATCH] Gradint update
git-svn-id: http://svn.code.sf.net/p/e-guidedog/code/ssb22/gradint@1326 29193198-4895-4776-b068-10539e920549
---
gradint-build/Makefile | 2 +-
gradint-build/src/filescan.py | 4 ++--
gradint-build/vocab.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gradint-build/Makefile b/gradint-build/Makefile
index bb52ef4..8f92779 100644
--- a/gradint-build/Makefile
+++ b/gradint-build/Makefile
@@ -226,7 +226,7 @@ publish0: $(All_Versions) gradint.py
grep ^program_name < src/top.py|head -1|sed -e 's/.*radint v/v/' -e 's/ .*/./' > ~/public_html/gradint/latest-version.txt
make clean
~/homepage/update
- ssh -i ~/.srcf/keyfile st0rage.org "cd eGuidedog/ssb22/gradint; screen -d -m /bin/bash -c '. build-sync.sh'"
+ ssh -i ~/.srcf/keyfile ssh.st0rage.org "cd eGuidedog/ssb22/gradint; screen -d -m /bin/bash -c '. build-sync.sh'"
publish:
# do it from /tmp so as to avoid confusing HomeSync if ssh'ing in from a PWF Mac
diff --git a/gradint-build/src/filescan.py b/gradint-build/src/filescan.py
index 72bde93..3ba701d 100644
--- a/gradint-build/src/filescan.py
+++ b/gradint-build/src/filescan.py
@@ -266,7 +266,7 @@ def parseSynthVocab(fname,forGUI=0):
elif l2.startswith("limit off"): doLimit = 0
elif l2.startswith("begin poetry"): doPoetry,lastPromptAndWord,disablePoem = True,None,False
elif l2.startswith("end poetry"): doPoetry = lastPromptAndWord = None
- elif l2.startswith("poetry vocab line:"): doPoetry,lastPromptAndWord = 0,cond(lastPromptAndWord,lastPromptAndWord,0) # not None, in case we're at the very start of a poem (see "just processed"... at end)
+ elif l2.startswith("poetry vocab line"): doPoetry,lastPromptAndWord = 0,cond(lastPromptAndWord,lastPromptAndWord,0) # not None, in case we're at the very start of a poem (see "just processed"... at end)
else: canProcess=1
if not canProcess: continue
elif "#" in l and l.strip(wsp)[0]=='#': continue # guard condition '"#" in l' improves speed
@@ -324,7 +324,7 @@ def parseSynthVocab(fname,forGUI=0):
if doLimit: limitedFiles[f]="synth:"+str(limitNo)
if doPoetry: lastPromptAndWord = [prompt_L1only,f]
elif doPoetry: disablePoem=1 # if one of the lines can't be synth'd, disable the rest of the poem (otherwise get wrongly connected lines, disconnected lines, or re-introduction of isolated lines that were previously part of a poem but can't be synth'd on this platform)
- if not lastPromptAndWord==None: doPoetry = 1 # just processed a "poetry vocab line:" (lastPromptAndWord is either the real last prompt and word, or 0 if we were at the start)
+ if not lastPromptAndWord==None: doPoetry = 1 # just processed a "poetry vocab line" (lastPromptAndWord is either the real last prompt and word, or 0 if we were at the start)
return ret
def sanitise_otherLanguages():
diff --git a/gradint-build/vocab.txt b/gradint-build/vocab.txt
index c2c5a8e..6f0fff0 100644
--- a/gradint-build/vocab.txt
+++ b/gradint-build/vocab.txt
@@ -45,7 +45,7 @@
# quotes) on a line by itself, and the line immediately under it will be
# interpreted normally without being linked into the poem. This is useful
# for setting relevant vocabulary to be introduced part-way through learning
-# the poem.
+# the poem. (In recent versions of Gradint the colon can be omitted.)
#
# If you have recordings in one language and you want the
# equivalents in another language to be synthesized, you can
--
GitLab