diff options
Diffstat (limited to 'src/xutf8')
| -rw-r--r-- | src/xutf8/case.c | 47 | ||||
| -rw-r--r-- | src/xutf8/is_right2left.c | 47 | ||||
| -rw-r--r-- | src/xutf8/is_spacing.c | 47 | ||||
| -rw-r--r-- | src/xutf8/keysym2Ucs.c | 2 | ||||
| -rw-r--r-- | src/xutf8/ucs2fontmap.c | 56 | ||||
| -rw-r--r-- | src/xutf8/utf8Input.c | 4 | ||||
| -rw-r--r-- | src/xutf8/utf8Utils.c | 2 | ||||
| -rw-r--r-- | src/xutf8/utf8Wrap.c | 2 |
8 files changed, 105 insertions, 102 deletions
diff --git a/src/xutf8/case.c b/src/xutf8/case.c index 762c6f92d..aad8afe9b 100644 --- a/src/xutf8/case.c +++ b/src/xutf8/case.c @@ -1,26 +1,27 @@ -// "$Id: $" -// -// Author: Jean-Marc Lienher ( http://oksid.ch ) -// Copyright 2000-2003 by O'ksi'D. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php +/* "$Id: $" + * + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems on the following page: + * + * http://www.fltk.org/str.php + */ /* * This file is required on all platforms for utf8 support diff --git a/src/xutf8/is_right2left.c b/src/xutf8/is_right2left.c index 8f1327955..7ef5af7df 100644 --- a/src/xutf8/is_right2left.c +++ b/src/xutf8/is_right2left.c @@ -1,26 +1,27 @@ -// "$Id: $" -// -// Author: Jean-Marc Lienher ( http://oksid.ch ) -// Copyright 2000-2003 by O'ksi'D. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php +/* "$Id: $" + * + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems on the following page: + * + * http://www.fltk.org/str.php + */ /* * This file is required on all platforms for utf8 support diff --git a/src/xutf8/is_spacing.c b/src/xutf8/is_spacing.c index e48175fd7..548dd84ff 100644 --- a/src/xutf8/is_spacing.c +++ b/src/xutf8/is_spacing.c @@ -1,26 +1,27 @@ -// "$Id: $" -// -// Author: Jean-Marc Lienher ( http://oksid.ch ) -// Copyright 2000-2003 by O'ksi'D. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php +/* "$Id: $" + * + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems on the following page: + * + * http://www.fltk.org/str.php + */ /* * This file is required on all platforms for utf8 support diff --git a/src/xutf8/keysym2Ucs.c b/src/xutf8/keysym2Ucs.c index 57fe15be5..028b6cef6 100644 --- a/src/xutf8/keysym2Ucs.c +++ b/src/xutf8/keysym2Ucs.c @@ -36,7 +36,7 @@ long XKeysymToUcs(KeySym keysym) return (long) KeySymToUcs4(keysym); } -#endif // X11 only +#endif /* X11 only */ /* * End of "$Id$". diff --git a/src/xutf8/ucs2fontmap.c b/src/xutf8/ucs2fontmap.c index 5539a96ef..50535f6ef 100644 --- a/src/xutf8/ucs2fontmap.c +++ b/src/xutf8/ucs2fontmap.c @@ -63,16 +63,16 @@ typedef struct { #include "headers/dingbats_.h" /*************** conv_gen.c ************/ -//const +/*const*/ int ucs2fontmap(char *s, unsigned int ucs, int enc) { switch(enc) { - case 0: //iso10646-1 + case 0: /* iso10646-1 */ s[0] = (char) ((ucs & 0xFF00) >> 8); s[1] = (char) (ucs & 0xFF); return 0; break; - case 1: //iso8859-1 + case 1: /* iso8859-1 */ if (ucs <= 0x00FF) { if (ucs >= 0x0001) { s[0] = 0; @@ -81,7 +81,7 @@ int ucs2fontmap(char *s, unsigned int ucs, int enc) } } break; - case 2: //iso8859-2 + case 2: /* iso8859-2 */ if (ucs <= 0x00a0) { s[0] = 0; s[1] = (char) ucs; @@ -100,102 +100,102 @@ int ucs2fontmap(char *s, unsigned int ucs, int enc) } } break; - case 3: //iso8859-3 + case 3: /* iso8859-3 */ if (iso8859_3_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 3; } break; - case 4: //iso8859-4 + case 4: /* iso8859-4 */ if (iso8859_4_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 4; } break; - case 5: //iso8859-5 + case 5: /* iso8859-5 */ if (iso8859_5_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 5; } break; - case 6: //iso8859-6 + case 6: /* iso8859-6 */ if (iso8859_6_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 6; } break; - case 7: //iso8859-7 + case 7: /* iso8859-7 */ if (iso8859_7_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 7; } break; - case 8: //iso8859-8 + case 8: /* iso8859-8 */ if (iso8859_8_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 8; } break; - case 9: //iso8859-9 + case 9: /* iso8859-9 */ if (iso8859_9_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 9; } break; - case 10: //iso8859-10 + case 10: /* iso8859-10 */ if (iso8859_10_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 10; } break; - case 25: //iso8859-11 + case 25: /* iso8859-11 */ if (iso8859_11_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 25; } break; - case 11: //iso8859-13 + case 11: /* iso8859-13 */ if (iso8859_13_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 11; } break; - case 12: //iso8859-14 + case 12: /* iso8859-14 */ if (iso8859_14_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 12; } break; - case 13: //iso8859-15 + case 13: /* iso8859-15 */ if (iso8859_15_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 13; } break; - case 14: //koi8-r + case 14: /* koi8-r */ if (koi8_r_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 14; } break; - case 15: //big5 + case 15: /* big5 */ if (big5_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 15; } break; - case 16: //ksc5601.1987-0 + case 16: /* ksc5601.1987-0 */ if (ksc5601_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 16; } break; - case 17: //gb2312.1980-0 + case 17: /* gb2312.1980-0 */ if (gb2312_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 17; } break; - case 18: //jisx0201.1976-0 + case 18: /* jisx0201.1976-0 */ if (jisx0201_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 18; } break; - case 19: //jisx0208.1983-0 + case 19: /* jisx0208.1983-0 */ if (jisx0208_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 19; } break; - case 20: //jisx0212.1990-0 + case 20: /* jisx0212.1990-0 */ if (jisx0212_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 20; } break; - case 21: //symbol + case 21: /* symbol */ if (ucs <= 0x00F7) { if (ucs >= 0x0020) { s[0] = 0; @@ -246,7 +246,7 @@ int ucs2fontmap(char *s, unsigned int ucs, int enc) } } break; - case 22: //dingbats + case 22: /* dingbats */ if (ucs <= 0x00A0) { if (ucs >= 0x0020) { s[0] = 0; @@ -285,12 +285,12 @@ int ucs2fontmap(char *s, unsigned int ucs, int enc) } } break; - case 23: //koi8-u + case 23: /* koi8-u */ if (koi8_u_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 23; } break; - case 24: //microsoft-cp1251 + case 24: /* microsoft-cp1251 */ if (cp1251_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { return 24; } @@ -301,7 +301,7 @@ int ucs2fontmap(char *s, unsigned int ucs, int enc) return -1; }; -//const +/*const*/ int encoding_number(const char *enc) { if (!enc || !strncmp(enc, "iso10646-1", 10)) { diff --git a/src/xutf8/utf8Input.c b/src/xutf8/utf8Input.c index b54619184..7fe9ff17e 100644 --- a/src/xutf8/utf8Input.c +++ b/src/xutf8/utf8Input.c @@ -367,7 +367,7 @@ XConvertEucToUtf8( if (strstr(locale, "ja")) { return XConvertEucJpToUtf8(buffer_return, len); - } else if (strstr(locale, "Big5") || strstr(locale, "big5")) { // BIG5 + } else if (strstr(locale, "Big5") || strstr(locale, "big5")) { /* BIG5 */ return XConvertBig5ToUtf8(buffer_return, len); } else if (strstr(locale, "zh") || strstr(locale, "chinese-")) { if (strstr(locale, "TW") || strstr(locale, "chinese-t")) { @@ -432,7 +432,7 @@ XUtf8LookupString( return len; } -#endif // X11 only +#endif /* X11 only */ /* * End of "$Id$". diff --git a/src/xutf8/utf8Utils.c b/src/xutf8/utf8Utils.c index 6c1933678..9ad8e4d81 100644 --- a/src/xutf8/utf8Utils.c +++ b/src/xutf8/utf8Utils.c @@ -240,7 +240,7 @@ XFastConvertUtf8ToUcs( return -1; } -#endif // X11 only +#endif /* X11 only */ /* * End of "$Id: $". diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c index 0ee2980e1..88d9fc5f2 100644 --- a/src/xutf8/utf8Wrap.c +++ b/src/xutf8/utf8Wrap.c @@ -915,7 +915,7 @@ XFreeUtf8FontStruct( free(font_set); } -#endif // X11 only +#endif /* X11 only */ /* * End of "$Id: $". |
