diff options
-rw-r--r-- | transex3/source/cfglex.l | 4 | ||||
-rw-r--r-- | transex3/source/cfgmerge.cxx | 10 | ||||
-rw-r--r-- | transex3/source/export.cxx | 10 | ||||
-rw-r--r-- | transex3/source/lngex.cxx | 14 | ||||
-rw-r--r-- | transex3/source/srclex.l | 4 |
5 files changed, 27 insertions, 15 deletions
diff --git a/transex3/source/cfglex.l b/transex3/source/cfglex.l index ba54f927d85c..e16dc480bc67 100644 --- a/transex3/source/cfglex.l +++ b/transex3/source/cfglex.l @@ -156,7 +156,7 @@ main( int argc, char* argv[]) pOutput = GetOutputFile( argc, argv ); if ( !pOutput ) { - fprintf( stdout, "Syntax: CFGEX[-p Prj][-r PrjRoot]-i FileIn [-o FileOut][-m DataBase][-e][-b][-u][-d DoneFile][-g[:dtd]][-UTF8][-L l1,l2,...][-ISO99 IsoCode]\n" ); + fprintf( stdout, "Syntax: CFGEX[-p Prj][-r PrjRoot]-i FileIn [-o FileOut][-m DataBase][-e][-b][-u][-d DoneFile][-g[:dtd]][-NOUTF8][-L l1,l2,...][-ISO99 IsoCode]\n" ); fprintf( stdout, " Prj: Project\n" ); fprintf( stdout, " PrjRoot: Path to project root (..\\.. etc.)\n" ); fprintf( stdout, " FileIn: Source files (*.src)\n" ); @@ -167,7 +167,7 @@ main( int argc, char* argv[]) fprintf( stdout, " -u: [english] and [german] are allowed, Id is Taken from DataBase \n" ); fprintf( stdout, " -g[:dtd]: enables generation of properties (dtds if :dtd is set) - in this case FileOut is the output path\n" ); fprintf( stdout, " -d: enables generation of *.don if work is done\n" ); - fprintf( stdout, " -UTF8: enable UTF8 as language independent encoding\n" ); + fprintf( stdout, " -NOUTF8: disable UTF8 as language independent encoding\n" ); fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (01,33,46,49...)\n" ); fprintf( stdout, " A fallback language can be defined like this: l1=f1.\n" ); fprintf( stdout, " f1, f2,... are also elements of (01,33,46,49...)\n" ); diff --git a/transex3/source/cfgmerge.cxx b/transex3/source/cfgmerge.cxx index 52b1dfbb1440..464647687632 100644 --- a/transex3/source/cfgmerge.cxx +++ b/transex3/source/cfgmerge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cfgmerge.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: nf $ $Date: 2001-05-30 12:10:22 $ + * last change: $Author: nf $ $Date: 2001-05-31 09:44:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -107,7 +107,7 @@ extern char *GetOutputFile( int argc, char* argv[]) bEnableExport = FALSE; bMergeMode = FALSE; bErrorLog = TRUE; - bUTF8 = FALSE; + bUTF8 = TRUE; sPrj = ""; sPrjRoot = ""; sInputFileName = ""; @@ -142,6 +142,10 @@ extern char *GetOutputFile( int argc, char* argv[]) nState = STATE_UTF8; bUTF8 = TRUE; } + else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-NOUTF8" ) { + nState = STATE_UTF8; + bUTF8 = FALSE; + } else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-L" ) { nState = STATE_LANGUAGES; } diff --git a/transex3/source/export.cxx b/transex3/source/export.cxx index 4309c594d6c1..67d964847f39 100644 --- a/transex3/source/export.cxx +++ b/transex3/source/export.cxx @@ -2,9 +2,9 @@ * * $RCSfile: export.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: nf $ $Date: 2001-05-30 12:10:22 $ + * last change: $Author: nf $ $Date: 2001-05-31 09:44:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,7 @@ extern char *GetOutputFile( int argc, char* argv[]) bErrorLog = TRUE; bBreakWhenHelpText = FALSE; bUnmerge = FALSE; - bUTF8 = FALSE; + bUTF8 = TRUE; sPrj = ""; sPrjRoot = ""; sActFileName = ""; @@ -156,6 +156,10 @@ extern char *GetOutputFile( int argc, char* argv[]) nState = STATE_UTF8; bUTF8 = TRUE; } + else if ( ByteString( argv[ i ]).ToUpperAscii() == "-NOUTF8" ) { + nState = STATE_UTF8; + bUTF8 = FALSE; + } else if (( ByteString( argv[ i ]) == "-l" ) || ( ByteString( argv[ i ]) == "-L" )) { nState = STATE_LANGUAGES; } diff --git a/transex3/source/lngex.cxx b/transex3/source/lngex.cxx index 56d7393def34..ddfb2b73e547 100644 --- a/transex3/source/lngex.cxx +++ b/transex3/source/lngex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: lngex.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: nf $ $Date: 2001-05-28 08:25:29 $ + * last change: $Author: nf $ $Date: 2001-05-31 09:44:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,7 +94,7 @@ BOOL ParseCommandLine( int argc, char* argv[]) bEnableExport = FALSE; bMergeMode = FALSE; bErrorLog = TRUE; - bUTF8 = FALSE; + bUTF8 = TRUE; sPrj = ""; sPrjRoot = ""; Export::sLanguages = ""; @@ -127,6 +127,10 @@ BOOL ParseCommandLine( int argc, char* argv[]) nState = STATE_UTF8; bUTF8 = TRUE; } + else if ( ByteString( argv[ i ]).ToUpperAscii() == "-NOUTF8" ) { + nState = STATE_UTF8; + bUTF8 = FALSE; + } else if (( ByteString( argv[ i ]) == "-l" ) || ( argv[ i ] == "-L" )) { nState = STATE_LANGUAGES; } @@ -182,7 +186,7 @@ BOOL ParseCommandLine( int argc, char* argv[]) void Help() /*****************************************************************************/ { - fprintf( stdout, "Syntax:LNGEX[-p Prj][-r PrjRoot]-i FileIn -o FileOut[-m DataBase][-e][-b][-u][-UTF8][-L l1,l2,...]\n" ); + fprintf( stdout, "Syntax:LNGEX[-p Prj][-r PrjRoot]-i FileIn -o FileOut[-m DataBase][-e][-b][-u][-NOUTF8][-L l1,l2,...]\n" ); fprintf( stdout, " Prj: Project\n" ); fprintf( stdout, " PrjRoot: Path to project root (..\\.. etc.)\n" ); fprintf( stdout, " FileIn: Source file (*.lng)\n" ); @@ -191,7 +195,7 @@ void Help() fprintf( stdout, " -e: no function\n" ); fprintf( stdout, " -b: no function\n" ); fprintf( stdout, " -u: no function\n" ); - fprintf( stdout, " -UTF8: enable UTF8 as language independent encoding\n" ); + fprintf( stdout, " -NOUTF8: disable UTF8 as language independent encoding\n" ); fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (01,33,46,49...)\n" ); fprintf( stdout, " A fallback language can be defined like this: l1=f1.\n" ); fprintf( stdout, " f1, f2,... are also elements of (01,33,46,49...)\n" ); diff --git a/transex3/source/srclex.l b/transex3/source/srclex.l index b5e28ef33c68..89ecc989978d 100644 --- a/transex3/source/srclex.l +++ b/transex3/source/srclex.l @@ -248,7 +248,7 @@ main( int argc, char* argv[]) pOutput = GetOutputFile( argc, argv ); if ( !pOutput ) { - fprintf( stdout, "Syntax:TRANSEX[-p Prj][-r PrjRoot]-i FileIn...[-o FileOut][-m DataBase][-e][-b][-u][-UTF8][-L l1,l2,...]\n" ); + fprintf( stdout, "Syntax:TRANSEX[-p Prj][-r PrjRoot]-i FileIn...[-o FileOut][-m DataBase][-e][-b][-u][-NOUTF8][-L l1,l2,...]\n" ); fprintf( stdout, " Prj: Project\n" ); fprintf( stdout, " PrjRoot: Path to project root (..\\.. etc.)\n" ); fprintf( stdout, " FileIn: Source files (*.src)\n" ); @@ -257,7 +257,7 @@ main( int argc, char* argv[]) fprintf( stdout, " -e: Disable writing errorlog\n" ); fprintf( stdout, " -b: Break when Token \"HelpText\" found in source\n" ); fprintf( stdout, " -u: [english] and [german] are allowed, Id is Taken from DataBase \n" ); - fprintf( stdout, " -UTF8: enable UTF8 as language independent encoding\n" ); + fprintf( stdout, " -NOUTF8: disable UTF8 as language independent encoding\n" ); fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (01,33,46,49...)\n" ); fprintf( stdout, " A fallback language can be defined like this: l1=f1.\n" ); fprintf( stdout, " f1, f2,... are also elements of (01,33,46,49...)\n" ); |