diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-03-23 14:02:25 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-03-23 14:02:25 +0000 |
| commit | 979740ce91525cc301a9173731d6aaf3004a6c88 (patch) | |
| tree | d312c7f444b758163bf3e1b13a7bf6da28d13b26 /src | |
| parent | 8d89d760fa2d01b7f6e38067793d1b480817ae78 (diff) | |
Enable definition of Unicode conv. options on compiler command line.
Three documented pre-processor variables can now be defined on the
compiler command line to avoid editing the FLTK src code. The default
values still apply unchanged.
Port of branch-1.3, svn r11404.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11406 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/fl_utf.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/fl_utf.c b/src/fl_utf.c index bfb5b4f02..7fd5686e3 100644 --- a/src/fl_utf.c +++ b/src/fl_utf.c @@ -73,7 +73,9 @@ to completely ignore character sets in your code because virtually everything is either ISO-8859-1 or UTF-8. */ -#define ERRORS_TO_ISO8859_1 1 +#ifndef ERRORS_TO_ISO8859_1 +# define ERRORS_TO_ISO8859_1 1 +#endif /*!Set to 1 to turn bad UTF-8 bytes in the 0x80-0x9f range into the Unicode index for Microsoft's CP1252 character set. You should @@ -81,7 +83,9 @@ available text (such as all web pages) are correctly converted to Unicode. */ -#define ERRORS_TO_CP1252 1 +#ifndef ERRORS_TO_CP1252 +# define ERRORS_TO_CP1252 1 +#endif /*!A number of Unicode code points are in fact illegal and should not be produced by a UTF-8 converter. Turn this on will replace the @@ -89,7 +93,9 @@ arbitrary 16-bit data to UTF-8 and then back is not an identity, which will probably break a lot of software. */ -#define STRICT_RFC3629 0 +#ifndef STRICT_RFC3629 +# define STRICT_RFC3629 0 +#endif #if ERRORS_TO_CP1252 /* Codes 0x80..0x9f from the Microsoft CP1252 character set, translated @@ -109,7 +115,7 @@ static unsigned short cp1252[32] = { (adding \e len to \e p will point at the next character). If \p p points at an illegal UTF-8 encoding, including one that - would go past \e end, or where a code is uses more bytes than + would go past \e end, or where a code uses more bytes than necessary, then *(unsigned char*)p is translated as though it is in the Microsoft CP1252 character set and \e len is set to 1. Treating errors this way allows this to decode almost any |