From 70531631bb5a1ab956ca1c09f77a64996ad8cccb Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Fri, 13 Mar 2009 22:43:43 +0000 Subject: LGPL headers and svn footers compliance (STR#2085) todo: FLTK style indent + code compliance. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6675 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/xutf8/COPYING | 45 +++++++++++++---------------------- src/xutf8/case.c | 3 +++ src/xutf8/imKStoUCS.c | 4 ++++ src/xutf8/is_right2left.c | 3 +++ src/xutf8/is_spacing.c | 3 +++ src/xutf8/keysym2Ucs.c | 50 +++++++++++++++++---------------------- src/xutf8/test.c | 56 ++++++++++++++++++-------------------------- src/xutf8/test2.c | 56 ++++++++++++++++++-------------------------- src/xutf8/ucs2fontmap.c | 51 +++++++++++++++++----------------------- src/xutf8/ucs2fontmap.c.mini | 51 +++++++++++++++++----------------------- src/xutf8/utf8Input.c | 49 +++++++++++++++++--------------------- src/xutf8/utf8Utils.c | 54 +++++++++++++++++------------------------- src/xutf8/utf8Wrap.c | 53 ++++++++++++++++------------------------- 13 files changed, 200 insertions(+), 278 deletions(-) (limited to 'src') diff --git a/src/xutf8/COPYING b/src/xutf8/COPYING index af5a09f4d..04d4a384a 100644 --- a/src/xutf8/COPYING +++ b/src/xutf8/COPYING @@ -1,37 +1,24 @@ - - * X11 UTF-8 text drawing functions. - * - * Copyright (c) 2000,2001 by O'ksi'D. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 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. * - * Neither the name of O'ksi'D nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 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. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Please report all bugs and problems on the following page: * + * http://www.fltk.org/str.php lcUniConv directory: diff --git a/src/xutf8/case.c b/src/xutf8/case.c index b167fe711..762c6f92d 100644 --- a/src/xutf8/case.c +++ b/src/xutf8/case.c @@ -127,3 +127,6 @@ XUtf8Toupper( return table[ucs]; } +/* + * End of "$Id$". + */ diff --git a/src/xutf8/imKStoUCS.c b/src/xutf8/imKStoUCS.c index 56ec7e2bf..0af9a806c 100644 --- a/src/xutf8/imKStoUCS.c +++ b/src/xutf8/imKStoUCS.c @@ -318,3 +318,7 @@ KeySymToUcs4(KeySym keysym) else return 0; } + +/* + * End of "$Id$". + */ diff --git a/src/xutf8/is_right2left.c b/src/xutf8/is_right2left.c index 21dfc8bd8..8f1327955 100644 --- a/src/xutf8/is_right2left.c +++ b/src/xutf8/is_right2left.c @@ -80,3 +80,6 @@ XUtf8IsRightToLeft( return 0; } +/* + * End of "$Id$". + */ diff --git a/src/xutf8/is_spacing.c b/src/xutf8/is_spacing.c index 06f6e3014..e48175fd7 100644 --- a/src/xutf8/is_spacing.c +++ b/src/xutf8/is_spacing.c @@ -87,3 +87,6 @@ XUtf8IsNonSpacing( return 0; } +/* + * End of "$Id$". + */ diff --git a/src/xutf8/keysym2Ucs.c b/src/xutf8/keysym2Ucs.c index e6cdc950b..57fe15be5 100644 --- a/src/xutf8/keysym2Ucs.c +++ b/src/xutf8/keysym2Ucs.c @@ -1,38 +1,27 @@ -/****************************************************************************** - Copyright (c) 2002 by O'ksi'D - * All rights reserved. +/* "$Id: $" * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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. * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 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. * - * Neither the name of O'ksi'D nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 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: * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - - -******************************************************************************/ + * http://www.fltk.org/str.php + */ #define KEYSYM2UCS_INCLUDED @@ -49,3 +38,6 @@ long XKeysymToUcs(KeySym keysym) #endif // X11 only +/* + * End of "$Id$". + */ diff --git a/src/xutf8/test.c b/src/xutf8/test.c index 60e0b19e0..95a5c342f 100644 --- a/src/xutf8/test.c +++ b/src/xutf8/test.c @@ -1,44 +1,31 @@ -/******************************************************************************* * $Id: $ +/* "$Id: $" * - * UTF-8 X test program (It contains MINIMAL code to support XIM !!!) - * - * Copyright (c) 2000-2002 O'ksi'D - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Neither the name of O'ksi'D nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 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. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * 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: * - * Author : Jean-Marc Lienher ( http://oksid.ch ) - * - ******************************************************************************/ + * http://www.fltk.org/str.php + */ /* + * UTF-8 X test program (It contains MINIMAL code to support XIM !!!) + * To test it do : kinput2 -canna @@ -297,3 +284,6 @@ int main(int argc, char**argv) return 0; } +/* + * End of "$Id$". + */ diff --git a/src/xutf8/test2.c b/src/xutf8/test2.c index 5fc753d6c..8f0407ffa 100644 --- a/src/xutf8/test2.c +++ b/src/xutf8/test2.c @@ -1,44 +1,31 @@ -/******************************************************************************* * $Id: $ +/* "$Id: $" * - * UTF-8 X test program - * - * Copyright (c) 2002 O'ksi'D - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Neither the name of O'ksi'D nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 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. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * 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: * - * Author : Jean-Marc Lienher ( http://oksid.ch ) - * - ******************************************************************************/ + * http://www.fltk.org/str.php + */ /* + * UTF-8 X test program + * To test it do : kinput2 -canna @@ -240,3 +227,6 @@ int main(int argc, char**argv) return 0; } +/* + * End of "$Id$". + */ diff --git a/src/xutf8/ucs2fontmap.c b/src/xutf8/ucs2fontmap.c index 905bc0ba7..5539a96ef 100644 --- a/src/xutf8/ucs2fontmap.c +++ b/src/xutf8/ucs2fontmap.c @@ -1,39 +1,27 @@ -/****************************************************************************** - Copyright (c) 2000-2002 by O'ksi'D - * All rights reserved. +/* "$Id: $" * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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. * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 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. * - * Neither the name of O'ksi'D nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 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: * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - - Author: Jean-Marc Lienher ( http://oksid.ch ) - -******************************************************************************/ + * http://www.fltk.org/str.php + */ #include #include @@ -380,3 +368,6 @@ int encoding_number(const char *enc) return -1; }; +/* + * End of "$Id$". + */ diff --git a/src/xutf8/ucs2fontmap.c.mini b/src/xutf8/ucs2fontmap.c.mini index 3797a5c52..b8e315947 100644 --- a/src/xutf8/ucs2fontmap.c.mini +++ b/src/xutf8/ucs2fontmap.c.mini @@ -1,39 +1,27 @@ -/****************************************************************************** - Copyright 2000 by O'ksi'D - * All rights reserved. +/* "$Id: $" * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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. * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 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. * - * Neither the name of O'ksi'D nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 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: * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - - Author: Jean-Marc Lienher ( http://oksid.ch ) - -******************************************************************************/ + * http://www.fltk.org/str.php + */ int ucs2fontmap(char *s, unsigned long ucs, int enc) { @@ -53,3 +41,6 @@ const char *encoding_name(int num) return "iso10646-1"; }; +/* + * End of "$Id$". + */ diff --git a/src/xutf8/utf8Input.c b/src/xutf8/utf8Input.c index 6e956224d..b54619184 100644 --- a/src/xutf8/utf8Input.c +++ b/src/xutf8/utf8Input.c @@ -1,37 +1,27 @@ -/****************************************************************************** - Copyright (c) 2000-2002 by O'ksi'D - * All rights reserved. +/* "$Id: $" * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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. * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 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. * - * Neither the name of O'ksi'D nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 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: * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - -******************************************************************************/ + * http://www.fltk.org/str.php + */ #if !defined(WIN32) && !defined(__APPLE__) @@ -444,3 +434,6 @@ XUtf8LookupString( #endif // X11 only +/* + * End of "$Id$". + */ diff --git a/src/xutf8/utf8Utils.c b/src/xutf8/utf8Utils.c index 50482baca..6c1933678 100644 --- a/src/xutf8/utf8Utils.c +++ b/src/xutf8/utf8Utils.c @@ -1,41 +1,30 @@ -/* - * "$Id: $" - * - * Unicode to UTF-8 conversion functions. - * - * Copyright (c) 2000,2001 by O'ksi'D. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. +/* "$Id: $" * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Neither the name of O'ksi'D nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 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. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * 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: * - * Author: Jean-Marc Lienher ( http://oksid.ch ) + * http://www.fltk.org/str.php + */ + +/* + * Unicode to UTF-8 conversion functions. */ #if !defined(WIN32) && !defined(__APPLE__) @@ -256,4 +245,3 @@ XFastConvertUtf8ToUcs( /* * End of "$Id: $". */ - diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c index 4744db4d4..0ee2980e1 100644 --- a/src/xutf8/utf8Wrap.c +++ b/src/xutf8/utf8Wrap.c @@ -1,43 +1,31 @@ -/* - * "$Id: $" - * - * X11 UTF-8 text drawing functions. - * - * Copyright (c) 2000-2002 by O'ksi'D. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: +/* "$Id: $" * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 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. * - * Neither the name of O'ksi'D nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 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. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Please report all bugs and problems on the following page: * - * - * Author: Jean-Marc Lienher ( http://oksid.ch ) + * http://www.fltk.org/str.php */ +/* + * X11 UTF-8 text drawing functions. + */ #if !defined(WIN32) && !defined(__APPLE__) #include "../../FL/Xutf8.h" @@ -932,4 +920,3 @@ XFreeUtf8FontStruct( /* * End of "$Id: $". */ - -- cgit v1.2.3