Browse Source

Merge branch 'upstream' into development

master
Reece H. Dunn 11 years ago
parent
commit
a6ae45854f
2 changed files with 5 additions and 2 deletions
  1. 4
    1
      src/numbers.cpp
  2. 1
    1
      src/synthdata.cpp

+ 4
- 1
src/numbers.cpp View File

/*************************************************************************** /***************************************************************************
* Copyright (C) 2005 to 2013 by Jonathan Duddington *
* Copyright (C) 2005 to 2014 by Jonathan Duddington *
* email: [email protected] * * email: [email protected] *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
if(((tr->langopts.numbers & NUM_ROMAN_CAPITALS) && !(wtab[0].flags & FLAG_ALL_UPPER)) || IsDigit09(word[-2])) if(((tr->langopts.numbers & NUM_ROMAN_CAPITALS) && !(wtab[0].flags & FLAG_ALL_UPPER)) || IsDigit09(word[-2]))
return(0); // not '2xx' return(0); // not '2xx'


if(word[1] == ' ')
return(0); // only one letter, don't speak as a Roman Number

word_start = word; word_start = word;
while((c = *word++) != ' ') while((c = *word++) != ' ')
{ {

+ 1
- 1
src/synthdata.cpp View File

#include "translate.h" #include "translate.h"
#include "wave.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; const int version_phdata = 0x014801;


int option_device_number = -1; int option_device_number = -1;

Loading…
Cancel
Save