Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

src/dictionary.cpp

@@ -1495,21 +1495,24 @@ void SetWordStress(Translator *tr, char *output, unsigned int *dictionary_flags,
 		stress = 3;
 
 
-	if((stressflags & 0x1000) && (vowel_count == 2))
+	if(unstressed_word == 0)
 	{
-		// Two syllable word, if one syllable has primary stress, then give the other secondary stress
-		if(vowel_stress[1] == 4)
-			vowel_stress[2] = 3;
-		if(vowel_stress[2] == 4)
-			vowel_stress[1] = 3;
-	}
-
-	if((stressflags & 0x2000) && (vowel_stress[1] < 0))
-	{
-		// If there is only one syllable before the primary stress, give it a secondary stress
-		if((vowel_count > 2) && (vowel_stress[2] >= 4))
+		if((stressflags & 0x1000) && (vowel_count == 3))
 		{
-			vowel_stress[1] = 3;
+			// Two syllable word, if one syllable has primary stress, then give the other secondary stress
+			if(vowel_stress[1] == 4)
+				vowel_stress[2] = 3;
+			if(vowel_stress[2] == 4)
+				vowel_stress[1] = 3;
+		}
+
+		if((stressflags & 0x2000) && (vowel_stress[1] < 0))
+		{
+			// If there is only one syllable before the primary stress, give it a secondary stress
+			if((vowel_count > 3) && (vowel_stress[2] >= 4))
+			{
+				vowel_stress[1] = 3;
+			}
 		}
 	}
 
@@ -2873,13 +2876,15 @@ int TransposeAlphabet(Translator *tr, char *text)
 	int max;
 	const char *map;
 	char *p = text;
-	char *p2 = text;
+	char *p2;
 	int all_alpha=1;
 	int bits;
 	int acc;
 	int pairs_start;
 	const short *pairs_list;
+	char buf[N_WORD_BYTES];
 
+    p2 = buf;
 	offset = tr->transpose_min - 1;
 	min = tr->transpose_min;
 	max = tr->transpose_max;
@@ -2926,8 +2931,8 @@ int TransposeAlphabet(Translator *tr, char *text)
 		acc=0;
 		bits=0;
 
-		p = text;
-		p2 = text;
+		p = buf;
+		p2 = buf;
 		while((c = *p++) != 0)
 		{
 			if((pairs_list = tr->frequent_pairs) != NULL)
@@ -2958,9 +2963,13 @@ int TransposeAlphabet(Translator *tr, char *text)
 			*p2++ = (acc << (8-bits));
 		}
 		*p2 = 0;
-		return((p2 - text) | 0x40);  // bit 6 indicates compressed characters
+		strcpy(text, buf);
+		return((p2 - buf) | 0x40);  // bit 6 indicates compressed characters
+	}
+	else
+	{
+	    return(strlen(text));
 	}
-	return(p2 - text);
 }  // end of TransposeAlphabet
 
 

src/readclause.cpp

@@ -85,8 +85,9 @@ static const unsigned short punct_chars[] = {',','.','?','!',':',';',
   0x055e,  // Armenian question
   0x055b,  // Armenian emphasis mark
 
-  0x0b1b,  // Arabic ;
+  0x061b,  // Arabic ;
   0x061f,  // Arabic ?
+  0x06d4,  // Arabic .
 
   0x0f0d,  // Tibet Shad
   0x0f0e,
@@ -133,6 +134,7 @@ static const unsigned int punct_attributes [] = { 0,
 
   CLAUSE_SEMICOLON,  // Arabic ;
   CLAUSE_QUESTION,   // Arabic question mark
+  CLAUSE_PERIOD,     // Arabic full stop
 
   CLAUSE_PERIOD+0x8000,     // Tibet period
   CLAUSE_PARAGRAPH,

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.46.32  30.Jan.13";
+const char *version_string = "1.46.33  08.Feb.13";
 const int version_phdata  = 0x014631;
 
 int option_device_number = -1;