Author: greg.ercolano Date: 2009-03-13 15:43:43 -0700 (Fri, 13 Mar 2009) New Revision: 6675 Log: LGPL headers and svn footers compliance (STR#2085) todo: FLTK style indent + code compliance.
Modified: branches/branch-1.3/src/xutf8/COPYING branches/branch-1.3/src/xutf8/case.c branches/branch-1.3/src/xutf8/imKStoUCS.c branches/branch-1.3/src/xutf8/is_right2left.c branches/branch-1.3/src/xutf8/is_spacing.c branches/branch-1.3/src/xutf8/keysym2Ucs.c branches/branch-1.3/src/xutf8/test.c branches/branch-1.3/src/xutf8/test2.c branches/branch-1.3/src/xutf8/ucs2fontmap.c branches/branch-1.3/src/xutf8/ucs2fontmap.c.mini branches/branch-1.3/src/xutf8/utf8Input.c branches/branch-1.3/src/xutf8/utf8Utils.c branches/branch-1.3/src/xutf8/utf8Wrap.c Modified: branches/branch-1.3/src/xutf8/COPYING =================================================================== --- branches/branch-1.3/src/xutf8/COPYING 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/COPYING 2009-03-13 22:43:43 UTC (rev 6675) @@ -1,37 +1,24 @@ - - * X11 UTF-8 text drawing functions. + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Copyright (c) 2000,2001 by O'ksi'D. - * All rights reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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. * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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. * - * 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. + * Please report all bugs and problems on the following page: * - * 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 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 lcUniConv directory: Modified: branches/branch-1.3/src/xutf8/case.c =================================================================== --- branches/branch-1.3/src/xutf8/case.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/case.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -127,3 +127,6 @@ return table[ucs]; } +/* + * End of "$Id$". + */ Modified: branches/branch-1.3/src/xutf8/imKStoUCS.c =================================================================== --- branches/branch-1.3/src/xutf8/imKStoUCS.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/imKStoUCS.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -318,3 +318,7 @@ else return 0; } + +/* + * End of "$Id$". + */ Modified: branches/branch-1.3/src/xutf8/is_right2left.c =================================================================== --- branches/branch-1.3/src/xutf8/is_right2left.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/is_right2left.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -80,3 +80,6 @@ return 0; } +/* + * End of "$Id$". + */ Modified: branches/branch-1.3/src/xutf8/is_spacing.c =================================================================== --- branches/branch-1.3/src/xutf8/is_spacing.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/is_spacing.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -87,3 +87,6 @@ return 0; } +/* + * End of "$Id$". + */ Modified: branches/branch-1.3/src/xutf8/keysym2Ucs.c =================================================================== --- branches/branch-1.3/src/xutf8/keysym2Ucs.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/keysym2Ucs.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -1,39 +1,28 @@ -/****************************************************************************** - 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 #if !defined(WIN32) && !defined(__APPLE__) @@ -49,3 +38,6 @@ #endif // X11 only +/* + * End of "$Id$". + */ Modified: branches/branch-1.3/src/xutf8/test.c =================================================================== --- branches/branch-1.3/src/xutf8/test.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/test.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -1,44 +1,31 @@ -/******************************************************************************* * $Id: $ +/* "$Id: $" * - * UTF-8 X test program (It contains MINIMAL code to support XIM !!!) + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Copyright (c) 2000-2002 O'ksi'D - * All rights reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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. * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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. * - * 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. + * Please report all bugs and problems on the following page: * - * 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 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 + */ /* + * UTF-8 X test program (It contains MINIMAL code to support XIM !!!) + * To test it do : kinput2 -canna @@ -297,3 +284,6 @@ return 0; } +/* + * End of "$Id$". + */ Modified: branches/branch-1.3/src/xutf8/test2.c =================================================================== --- branches/branch-1.3/src/xutf8/test2.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/test2.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -1,44 +1,31 @@ -/******************************************************************************* * $Id: $ +/* "$Id: $" * - * UTF-8 X test program + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Copyright (c) 2002 O'ksi'D - * All rights reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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. * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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. * - * 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. + * Please report all bugs and problems on the following page: * - * 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 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 + */ /* + * UTF-8 X test program + * To test it do : kinput2 -canna @@ -240,3 +227,6 @@ return 0; } +/* + * End of "$Id$". + */ Modified: branches/branch-1.3/src/xutf8/ucs2fontmap.c =================================================================== --- branches/branch-1.3/src/xutf8/ucs2fontmap.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/ucs2fontmap.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -1,40 +1,28 @@ -/****************************************************************************** - 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 + */ - Author: Jean-Marc Lienher ( http://oksid.ch ) - -******************************************************************************/ - #include <stdlib.h> #include <string.h> @@ -380,3 +368,6 @@ return -1; }; +/* + * End of "$Id$". + */ Modified: branches/branch-1.3/src/xutf8/ucs2fontmap.c.mini =================================================================== --- branches/branch-1.3/src/xutf8/ucs2fontmap.c.mini 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/ucs2fontmap.c.mini 2009-03-13 22:43:43 UTC (rev 6675) @@ -1,40 +1,28 @@ -/****************************************************************************** - 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. - * + * http://www.fltk.org/str.php + */ - Author: Jean-Marc Lienher ( http://oksid.ch ) - -******************************************************************************/ - int ucs2fontmap(char *s, unsigned long ucs, int enc) { s[0] = (char) ((ucs & 0xFF00) >> 8); @@ -53,3 +41,6 @@ return "iso10646-1"; }; +/* + * End of "$Id$". + */ Modified: branches/branch-1.3/src/xutf8/utf8Input.c =================================================================== --- branches/branch-1.3/src/xutf8/utf8Input.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/utf8Input.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -1,38 +1,28 @@ -/****************************************************************************** - 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__) #include "config.h" @@ -444,3 +434,6 @@ #endif // X11 only +/* + * End of "$Id$". + */ Modified: branches/branch-1.3/src/xutf8/utf8Utils.c =================================================================== --- branches/branch-1.3/src/xutf8/utf8Utils.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/utf8Utils.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -1,43 +1,32 @@ -/* - * "$Id: $" +/* "$Id: $" * - * Unicode to UTF-8 conversion functions. + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Copyright (c) 2000,2001 by O'ksi'D. - * All rights reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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. * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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. * - * 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. + * Please report all bugs and problems on the following page: * - * 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 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 */ +/* + * Unicode to UTF-8 conversion functions. + */ + #if !defined(WIN32) && !defined(__APPLE__) #include "../../FL/Xutf8.h" @@ -256,4 +245,3 @@ /* * End of "$Id: $". */ - Modified: branches/branch-1.3/src/xutf8/utf8Wrap.c =================================================================== --- branches/branch-1.3/src/xutf8/utf8Wrap.c 2009-03-11 22:15:14 UTC (rev 6674) +++ branches/branch-1.3/src/xutf8/utf8Wrap.c 2009-03-13 22:43:43 UTC (rev 6675) @@ -1,43 +1,31 @@ -/* - * "$Id: $" +/* "$Id: $" * - * X11 UTF-8 text drawing functions. + * Author: Jean-Marc Lienher ( http://oksid.ch ) + * Copyright 2000-2003 by O'ksi'D. * - * Copyright (c) 2000-2002 by O'ksi'D. - * All rights reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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. * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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. * - * 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. + * Please report all bugs and problems on the following page: * - * 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 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 */ +/* + * X11 UTF-8 text drawing functions. + */ #if !defined(WIN32) && !defined(__APPLE__) #include "../../FL/Xutf8.h" @@ -932,4 +920,3 @@ /* * End of "$Id: $". */ - _______________________________________________ fltk-commit mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-commit
