Merge branch 'upstream' into development

This commit is contained in:
Reece H. Dunn
2014-02-02 15:14:03 +00:00
2 changed files with 5 additions and 2 deletions
+4 -1
View File
@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (C) 2005 to 2013 by Jonathan Duddington *
* Copyright (C) 2005 to 2014 by Jonathan Duddington *
* email: jonsd@users.sourceforge.net *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -1167,6 +1167,9 @@ int TranslateRoman(Translator *tr, char *word, char *ph_out, WORD_TAB *wtab)
if(((tr->langopts.numbers & NUM_ROMAN_CAPITALS) && !(wtab[0].flags & FLAG_ALL_UPPER)) || IsDigit09(word[-2]))
return(0); // not '2xx'
if(word[1] == ' ')
return(0); // only one letter, don't speak as a Roman Number
word_start = word;
while((c = *word++) != ' ')
{
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.48.01 01.Feb.14";
const char *version_string = "1.48.02 02.Feb.14";
const int version_phdata = 0x014801;
int option_device_number = -1;