[sword-svn] r82 - in trunk: app/src/org/crosswire/flashcards
lessons/HebrewWegner utils/bwheb
Apache
apache at crosswire.org
Sun Nov 14 15:00:35 MST 2004
Author:
Date: 2004-11-14 15:00:35 -0700 (Sun, 14 Nov 2004)
New Revision: 82
Added:
trunk/lessons/HebrewWegner/501_10.flash
trunk/lessons/HebrewWegner/501_11.flash
trunk/lessons/HebrewWegner/501_12.flash
trunk/lessons/HebrewWegner/501_8.flash
trunk/lessons/HebrewWegner/501_9.flash
Modified:
trunk/app/src/org/crosswire/flashcards/LessonManager.java
trunk/utils/bwheb/csv.c
Log:
Removed debug dialog box from LessonManager
Added new character handling to csv
Added new lessons
Modified: trunk/app/src/org/crosswire/flashcards/LessonManager.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/LessonManager.java 2004-11-09 07:22:55 UTC (rev 81)
+++ trunk/app/src/org/crosswire/flashcards/LessonManager.java 2004-11-14 22:00:35 UTC (rev 82)
@@ -134,8 +134,8 @@
if ((uri.startsWith("file:")) && (!uri.startsWith("file:/"))) {
uri = "file:/" + uri.substring(5);
}
- int value = JOptionPane.showConfirmDialog(null, uri,
- "Text Edit", JOptionPane.OK_OPTION) ;
+// int value = JOptionPane.showConfirmDialog(null, uri,
+// "Text Edit", JOptionPane.OK_OPTION) ;
loadJarLessonSets(new File(new java.net.URI(uri)));
}
Added: trunk/lessons/HebrewWegner/501_10.flash
===================================================================
--- trunk/lessons/HebrewWegner/501_10.flash 2004-11-09 07:22:55 UTC (rev 81)
+++ trunk/lessons/HebrewWegner/501_10.flash 2004-11-14 22:00:35 UTC (rev 82)
@@ -0,0 +1,46 @@
+lessonTitle=Hebrew 501 Lesson 10
+word0=\u05D0\u05B1\u05D3\u05D5\u05B9\u05DD
+answers0=Edom
+word1=\u05D0\u05B2\u05E8\u05D5\u05B9\u05DF
+answers1=ark
+word2=\u05D1\u05BC\u05B0\u05E8\u05B4\u05D9\u05EA
+answers2=covenant
+word3=\u05D6\u05B8\u05B8\u05D4\u05B8\u05D1
+answers3=gold
+word4=\u05D7\u05B7\u05D9\u05B4\u05DC
+answers4=strength, wealth, army
+word5=\u05DB\u05BC\u05B8\u05DC\u05B8\u05D4
+answers5=complete destruction
+word6=\u05DB\u05BC\u05B6\u05E1\u05B6\u05E3\u0020
+answers6=silver
+word7=\u05DC\u05B5\u05D1
+answers7=heart
+word8=\u05DC\u05B5\u05D1\u05B8\u05D1
+answers8=heart
+word9=\u05DE\u05B8\u05DC\u05B5\u05D0
+answers9=to be full, full, fill up
+word10=\u05DE\u05B0\u05DC\u05B5\u05D0\u05B8\u05D4
+answers10=full
+word11=\u05DE\u05B7\u05DE\u05B0\u05DC\u05B8\u05DB\u05B8\u05D4
+answers11=kingdom
+word12=\u05DE\u05B8\u05DC\u05B7\u05DA\u05B0
+answers12=to reign, to be king
+word13=\u05DE\u05B7\u05DC\u05B0\u05DB\u05BC\u05D5\u05BC\u05EA
+answers13=kingdom
+word14=\u05E0\u05B6\u05E4\u05B6\u05E9\u05C1
+answers14=soul, self, life
+word15=\u05E2\u05B8\u05D1\u05B7\u05D3
+answers15=to serve
+word16=\u05E2\u05B6\u05D1\u05B6\u05D3
+answers16=servant
+word17=\u05E2\u05B2\u05E0\u05D5\u05B9\u05D3\u05B8\u05D4
+answers17=service
+word18=\u05E2\u05B7\u05D9\u05B4\u05DF
+answers18=eye, fountain
+word19=\u05E8\u05B8\u05D1\u05B8\u05D4
+answers19=to be numerous, to be great
+word20=\u05E9\u05C1\u05B8\u05DB\u05B7\u05D1
+answers20=to lie down
+word21=\u05E9\u05C1\u05B8\u05EA\u05B8\u05D4
+answers21=to drink
+wordCount=22
Added: trunk/lessons/HebrewWegner/501_11.flash
===================================================================
--- trunk/lessons/HebrewWegner/501_11.flash 2004-11-09 07:22:55 UTC (rev 81)
+++ trunk/lessons/HebrewWegner/501_11.flash 2004-11-14 22:00:35 UTC (rev 82)
@@ -0,0 +1,46 @@
+lessonTitle=Hebrew 501 Lesson 11
+word0=\u05D0\u05B1\u05E0\u05D5\u05B9\u05E9\u05C1
+answers0=man, mankind
+word1=\u05D1\u05BC\u05B9\u05E7\u05B6\u05E8
+answers1=morning
+word2=\u05D1\u05BC\u05B8\u05E7\u05B8\u05E8
+answers2=cow, cattle
+word3=\u05D6\u05B7\u05E8
+answers3=strange, different
+word4=\u05D9\u05B7\u05E2\u05B7\u05DF
+answers4=on account of, because of
+word5=\u05D9\u05B7\u05E2\u05B2\u05E7\u05B9\u05D1
+answers5=Jacob
+word6=\u05DE\u05B7\u05D8\u05BC\u05B6\u05D4
+answers6=rod, staff, tribe
+word7=\u05DE\u05B7\u05E2\u05B7\u05DF
+answers7=for the sake of, on account of
+word8=\u05DC\u05B0\u05DE\u05B7\u05E2\u05B7\u05DF
+answers8=for the sake of, on account of
+word9=\u05DE\u05B4\u05E9\u05C1\u05B0\u05E4\u05BC\u05B8\u05D8
+answers9=justice, judgment
+word10=\u05E0\u05B8\u05B8\u05D2\u05B7\u05D3
+answers10=to make known, report, tell
+word11=\u05E0\u05B6\u05D2\u05B6\u05D3
+answers11=before
+word12=\u05E0\u05B8\u05B8\u05D8\u05B8\u05D4
+answers12=to turn, stretch out
+word13=\u05E0\u05B8\u05B8\u05E4\u05B7\u05DC
+answers13=to fall
+word14=\u05E2\u05B8\u05E9\u05C2\u05B8\u05E8
+answers14=ten
+word15=\u05E2\u05B6\u05E9\u05C2\u05B6\u05E8
+answers15=ten
+word16=\u05E2\u05B6\u05E9\u05C2\u05B0\u05E8\u05B4\u05D9\u05DD
+answers16=twenty
+word17=\u05E2\u05B6\u05E8\u05B6\u05D1
+answers17=evening
+word18=\u05E2\u05B5\u05EA
+answers18=time
+word19=\u05E4\u05BC\u05B8\u05E7\u05B7\u05D3
+answers19=to visit, number,appoint, miss
+word20=\u05E9\u05C1\u05B8\u05DC\u05B7\u05D7
+answers20=to send, stretch out
+word21=\u05E9\u05C1\u05B8\u05E4\u05B7\u05D8
+answers21=to judge
+wordCount=22
Added: trunk/lessons/HebrewWegner/501_12.flash
===================================================================
--- trunk/lessons/HebrewWegner/501_12.flash 2004-11-09 07:22:55 UTC (rev 81)
+++ trunk/lessons/HebrewWegner/501_12.flash 2004-11-14 22:00:35 UTC (rev 82)
@@ -0,0 +1,46 @@
+lessonTitle=Hebrew 501 Lesson 12
+word0=\u05D0\u05B6\u05DC\u05B6\u05E3\u0020
+answers0=thousand, tribe
+word1=\u05D0\u05B7\u05DC\u05D5\u05BC\u05E3\u0020
+answers1=chief, leader
+word2=\u05D0\u05D5\u05B9\u05E6\u05B8\u05E8
+answers2=supply, storehouse, treaure
+word3=\u05D2\u05BC\u05B0\u05D1\u05D5\u05BC\u05DC
+answers3=boundry, territory
+word4=\u05D3\u05BC\u05B6\u05D1\u05B6\u05E8
+answers4=plague
+word5=\u05D3\u05BC\u05D5\u05B9\u05E8
+answers5=generation, lifetime
+word6=\u05DC\u05B0\u05D1\u05B7\u05D3
+answers6=alone
+word7=\u05DE\u05B4\u05D3\u05B0\u05D1\u05BC\u05B8\u05E8
+answers7=pasturage, wilderness, steppe
+word8=\u05DE\u05B4\u05D9
+answers8=who
+word9=\u05E0\u05B7\u05E2\u05B7\u05E8
+answers9=young man
+word10=\u05E0\u05B7\u05E2\u05B2\u05E8\u05B8\u05D4
+answers10=young girl
+word11=\u05E0\u05B8\u05B8\u05E6\u05B7\u05DC
+answers11=to deliver
+word12=\u05E1\u05D5\u05BC\u05E8
+answers12=to turn aside
+word13=\u05E2\u05B7\u05D3
+answers13=unto, until, while
+word14=\u05E2\u05B4\u05DD
+answers14=with
+word15=\u05E2\u05B8\u05E0\u05B8\u05B8\u05D4
+answers15=to answer
+word16=\u05E8\u05B5\u05E2\u05B7
+answers16=companion, friend
+word17=\u05E9\u05C2\u05B7\u05E8
+answers17=official, leader
+word18=\u05E9\u05C1\u05B8\u05DC\u05B5\u05E9\u05C1
+answers18=three
+word19=\u05E9\u05C1\u05B0\u05DC\u05E9\u05C1\u05B8\u05D4
+answers19=three
+word20=\u05E9\u05C1\u05B0\u05DC\u05B4\u05D9\u05E9\u05C1\u05B4\u05D9
+answers20=third
+word21=\u05E9\u05C1\u05B0\u05DC\u05E9\u05C1\u05B4\u05D9\u05DD
+answers21=thirty
+wordCount=22
Added: trunk/lessons/HebrewWegner/501_8.flash
===================================================================
--- trunk/lessons/HebrewWegner/501_8.flash 2004-11-09 07:22:55 UTC (rev 81)
+++ trunk/lessons/HebrewWegner/501_8.flash 2004-11-14 22:00:35 UTC (rev 82)
@@ -0,0 +1,44 @@
+lessonTitle=Hebrew 501 Lesson 8
+word0=\u05D0\u05B8\u05D4\u05B5\u05D1
+answers0=to love, like
+word1=\u05D0\u05B8\u05D9\u05B7\u05D1
+answers1=to be hostile towards
+word2=\u05D0\u05B9\u05D9\u05B5\u05D1
+answers2=enemy
+word3=\u05D1\u05BC\u05B8\u05E0\u05B8\u05B8\u05D4
+answers3=to build
+word4=\u05D1\u05E7\u05E9\u05C1
+answers4=to seek
+word5=\u05D1\u05BC\u05D5\u05B9\u05E9\u05C1
+answers5=to be ashamed
+word6=\u05D5\u05B8\u05B8\u05DB\u05B7\u05E8
+answers6=to remember
+word7=\u05D7\u05B7\u05D9\u05BC\u05B4\u05D9\u05DD
+answers7=life, lifetime
+word8=\u05D4\u05B8\u05D9\u05B8\u05B8\u05D4
+answers8=to live
+word9=\u05D7\u05B7\u05D9
+answers9=living, life
+word10=\u05D7\u05B7\u05D9\u05BC\u05B8\u05B8\u05D4
+answers10=beast, wild animal
+word11=\u05D9\u05B8\u05B8\u05E8\u05B5\u05D0
+answers11=to fear, fearful, afraid of
+word12=\u05DC\u05B5\u05D5\u05B4\u05D9
+answers12=Levi
+word13=\u05DC\u05B8\u05B8\u05DB\u05B5\u05DF
+answers13=therefore
+word14=\u05DE\u05B4\u05E6\u05B0\u05D5\u05B8\u05B8\u05D4
+answers14=commandment
+word15=\u05E2\u05B8\u05DE\u05B7\u05D3
+answers15=to stand
+word16=\u05E2\u05B7\u05DE\u05BC\u05D5\u05BC\u05D3
+answers16=pillar, column
+word17=\u05E6\u05B8\u05D5\u05B8\u05B8\u05D4
+answers17=to command
+word18=\u05E7\u05D5\u05BC\u05DD
+answers18=to rise, stand
+word19=\u05E7\u05B8\u05E8\u05B8\u05D0
+answers19=to call, meet
+word20=\u05E9\u05C1\u05B8\u05EA\u05B8\u05D4
+answers20=to drink
+wordCount=21
Added: trunk/lessons/HebrewWegner/501_9.flash
===================================================================
--- trunk/lessons/HebrewWegner/501_9.flash 2004-11-09 07:22:55 UTC (rev 81)
+++ trunk/lessons/HebrewWegner/501_9.flash 2004-11-14 22:00:35 UTC (rev 82)
@@ -0,0 +1,46 @@
+lessonTitle=Hebrew 501 Lesson 9
+word0=\u05D0\u05B8\u05E1\u05B7\u05E3\u0020
+answers0=to gather
+word1=\u05D0\u05B5\u05EA
+answers1=with, beside
+word2=\u05D1\u05E8\u05DA
+answers2=to bless
+word3=\u05D1\u05BC\u05B0\u05E8\u05B8\u05DB\u05B8\u05D4
+answers3=blessing
+word4=\u05D1\u05B8\u05E0\u05B8\u05B8\u05E3\u0020
+answers4=wing, skirt
+word5=\u05D7\u05B8\u05D6\u05B8\u05B8\u05E7
+answers5=firm, strong
+word6=\u05D7\u05B8\u05D6\u05B7\u05E7
+answers6=to be strong, seize
+word7=\u05D9\u05B8\u05B8\u05E1\u05B7\u05E3\u0020
+answers7=to add
+word8=\u05D9\u05D5\u05B9\u05E1\u05B5\u05E3\u0020
+answers8=Joseph
+word9=\u05D9\u05B8\u05B8\u05E8\u05B7\u05E9\u05C1
+answers9=to subdue, possess, disposssess
+word10=\u05D9\u05B8\u05B8\u05E9\u05C1\u05B7\u05E2
+answers10=to save, deliver
+word11=\u05D9\u05B0\u05E9\u05C1\u05D5\u05BC\u05E2\u05B8\u05D4
+answers11=deliverance, salvation
+word12=\u05DB\u05BC\u05D5\u05BC\u05DF
+answers12=to be firm, established
+word13=\u05DB\u05BC\u05B5\u05DF
+answers13=thus, so, firm, upright
+word14=\u05DE\u05B7\u05E2\u05B2\u05E9\u05C2\u05B6\u05D4
+answers14=work
+word15=\u05DE\u05B7\u05E8\u05B0\u05D0\u05B8\u05D4
+answers15=vision
+word16=\u05E2\u05B8\u05E9\u05C2\u05B8\u05D4
+answers16=to do, make
+word17=\u05E2\u05B7\u05EA\u05BC\u05B8\u05D4
+answers17=now
+word18=\u05E8\u05B8\u05D0\u05B8\u05D4
+answers18=to see, appear
+word19=\u05E7\u05D5\u05BC\u05DD
+answers19=to rise, stand
+word20=\u05E7\u05B8\u05E8\u05B8\u05D0
+answers20=to call, meet
+word21=\u05E9\u05C1\u05B8\u05EA\u05B8\u05D4
+answers21=to drink
+wordCount=22
Modified: trunk/utils/bwheb/csv.c
===================================================================
--- trunk/utils/bwheb/csv.c 2004-11-09 07:22:55 UTC (rev 81)
+++ trunk/utils/bwheb/csv.c 2004-11-14 22:00:35 UTC (rev 82)
@@ -299,6 +299,13 @@
*puiAccent2 = 0;
switch (ch)
{
+ // SPACE?
+ case 32 :
+ *puiChar = 0X0020;
+ *puiAccent = 0X0000;
+ nChars = 1;
+ break;
+
// HEBREW LETTER FINAL NUN
case 33 :
*puiChar = 0X05DF;
@@ -321,6 +328,13 @@
break;
// HEBREW LETTER FINAL KAF WITH HEBREW POINT SHEVA
+ case 36 :
+ *puiChar = 0X05DA;
+ *puiAccent = 0X0000;
+ nChars = 1;
+ break;
+
+ // HEBREW LETTER FINAL KAF WITH HEBREW POINT SHEVA
case 37 :
*puiChar = 0X05DA;
*puiAccent = 0X05B0;
@@ -396,7 +410,15 @@
*puiAccent = 0X05B0;
nChars = 1;
break;
+
+ // HEBREW LETTER PE
+ case 64 :
+ *puiChar = 0X05E3;
+ *puiAccent = 0X0000;
+ nChars = 1;
+ break;
+
// HEBREW LETTER VAV WITH HOLAM
case 65 :
*puiChar = 0X05D5;
@@ -517,6 +539,13 @@
nChars = 2;
break;
+ // HEBREW LETTER YOD WITH DAGESH
+ case 89 :
+ *puiChar = 0X05D9;
+ *puiAccent = 0X05BC;
+ nChars = 2;
+ break;
+
// HEBREW LETTER AYIN
case 91 :
*puiChar = 0X05E2;
@@ -742,7 +771,7 @@
}
if (nChars < 1)
- fprintf(stderr, "Unhandled character - %u\n", ch);
+ fprintf(stderr, "Unhandled character - %u (0x%x)\n", ch, ch);
return nChars;
}
More information about the sword-cvs
mailing list