From 380a700eacdcb7c7b0a3f9127d438953f6935bb7 Mon Sep 17 00:00:00 2001 From: Joe Date: Sat, 23 Jul 2016 12:52:00 -0700 Subject: [PATCH] Copyrights concerning Issue 2643 and Issue 2732 (#2735) * bezctx_ff.c file based on bezctx_ps.c Debian lint highlighted some copyright questions. bezctx_ps.c from spiro-01 is GPL-2+ Patches and mods below (approx) 10 lines are listed as contributions. * bezctx_ff.h file based on bezctx_ps.h Original bezctx_ps.h file is uncommented but is wrapped in GPL-2+ package. Adding authors is almost 50% of file contents, but it resolves issue 2643. * crctab.c is practically public domain Optimized versions using lookup tables exist in several text books, especially when demonstrating hardware, CPUs, and C/assembler code. * ofl.c and ofl.h created 2007-03-12 George probably didn't want to copyright name to the file, or forgot to add it, but it's basically data files holding text information - which can then be used to make a SIL open source license. This patch resolves issue 2643 about author and file licence missing when run through debian lint. * ArabicForms.c created in 2001 - call it BSD-3-clause - issue #2643 Debian Lint highlighted some copyright questions concerning this file. Since it's a "generated" file (created by another program), adding a copyright notice might appear a little odd and maybe not be worth the extra effort (when you come from a generation of programmers where computers had very little memory or drive storage space, so you had to put "extra" effort to save memory/storage space). Since the project was BSD-3-clause in 2001, seems logical to imply same. Patches and mods below (approx) 10 lines are listed as contributions. * utype.c, utype.h created in 2001 - call it BSD-3-clause - issue #2643 Debian Lint highlighted some copyright questions concerning these files. Since they're "generated" files (created by another program), adding a copyright notice might appear a little odd and maybe not be worth the extra effort (when you come from a generation of programmers where computers had very little memory or drive storage space, so you had to put "extra" effort to save memory/storage space). Since the project was BSD-3-clause in 2001, seems logical to imply same. Patches and mods below (approx) 10 lines are listed as contributions. --- AUTHORS | 15 ++++++++------- Unicode/ArabicForms.c | 6 +++++- Unicode/makeutype.c | 13 +++++++++++-- Unicode/utype.c | 4 ++++ fontforge/bezctx_ff.c | 28 ++++++++++++++++++++++++++-- fontforge/bezctx_ff.h | 6 ++++++ fontforge/crctab.c | 4 ++++ fontforge/ofl.c | 7 +++++-- fontforge/ofl.h | 5 +++++ fontforgeexe/fontinfo.c | 4 ++++ inc/utype.h | 3 +++ 11 files changed, 81 insertions(+), 14 deletions(-) diff --git a/AUTHORS b/AUTHORS index b5e225e680..2a3f348099 100644 --- a/AUTHORS +++ b/AUTHORS @@ -43,7 +43,7 @@ Duane Moody Eddie Yuen Edward Lee Eva Denman -Frank Trampe +Frank Trampe Frédéric Wang Georg A. Duffner Giuseppe Bilotta @@ -66,9 +66,9 @@ Joel Santos Johannes Plass - gv = ANALYZE_MAP.COM Johan Winge Jon Banquer -Jonathan Hanna +Jonathan Hanna Jonathan Hue -Jose Da Silva +Jose Da Silva Joshua Richardson Jouk Jansen Juergen Buntrock @@ -81,7 +81,7 @@ Kelvinsong Kemie Guaida - Tango PixMaps Kengo Ichiki Kevin Fenzi -Khaled Hosny +Khaled Hosny Koki Takahashi Lasse Fister László Károly @@ -99,7 +99,7 @@ Mayank Jha Max Rabkin - excepthook.py Maxim Iorsh Michal Mazurek -Michal Nowakowski - nowakowskittfinstr.c +Michal Nowakowski - nowakowskittfinstr.c midzer Nicolas Kaiser Nicolas Spalinger @@ -115,7 +115,8 @@ R.L. Horn R.P.C. Rodgers - standard man macros Rafael Ferran i Peralta Rajeesh K Nambiar -Reuben Thomas +Raph Levien +Reuben Thomas Richard Hughes Rogier van Dalen Ryusei Yamaguchi @@ -137,7 +138,7 @@ Vadim Belman Valek Filippov Vernon Adams Ville Skytta -Werner Lemberg +Werner Lemberg Woensug Eric Choi 贤哲 Yannis Haralambous diff --git a/Unicode/ArabicForms.c b/Unicode/ArabicForms.c index d167ce1b96..fff14dac47 100644 --- a/Unicode/ArabicForms.c +++ b/Unicode/ArabicForms.c @@ -1,7 +1,11 @@ -#include +/* Copyright: 2001 George Williams */ +/* License: BSD-3-clause */ +/* Contributions: Khaled Hosny, Joe Da Silva */ /* This file was generated using the program 'makeutype' */ +#include + struct arabicforms ArabicForms[] = { /* initial, medial, final, isolated, isletter, joindual, required_lig_with_alef */ { 0x0600, 0x0600, 0x0600, 0x0600, 0, 0, 0 }, /* 0x0600 */ diff --git a/Unicode/makeutype.c b/Unicode/makeutype.c index 011887c8f5..684f593efc 100644 --- a/Unicode/makeutype.c +++ b/Unicode/makeutype.c @@ -608,10 +608,13 @@ static void dumparabicdata(FILE *header) { exit(2); } - fprintf( data, "#include \n" ); - + fprintf( data, "/* Copyright: 2001 George Williams */\n" ); + fprintf( data, "/* License: BSD-3-clause */\n" ); + fprintf( data, "/* Contributions: Khaled Hosny, Joe Da Silva */\n" ); fprintf( data, GeneratedFileMessage ); + fprintf( data, "#include \n\n" ); + fprintf( data, "struct arabicforms ArabicForms[] = {\n" ); fprintf( data, "\t/* initial, medial, final, isolated, isletter, joindual, required_lig_with_alef */\n"); for ( i=0; i<256; ++i ) { @@ -648,6 +651,9 @@ static void dump() { fprintf( header, "#ifndef _UTYPE_H\n" ); fprintf( header, "#define _UTYPE_H\n" ); + fprintf( header, "/* Copyright: 2001 George Williams */\n" ); + fprintf( header, "/* License: BSD-3-clause */\n" ); + fprintf( header, "/* Contributions: Joe Da Silva */\n" ); fprintf( header, GeneratedFileMessage ); fprintf( header, "#include \t\t/* Include here so we can control it. If a system header includes it later bad things happen */\n" ); @@ -786,6 +792,9 @@ static void dump() { fprintf( header, "\n" ); + fprintf( data, "/* Copyright: 2001 George Williams */\n" ); + fprintf( data, "/* License: BSD-3-clause */\n" ); + fprintf( data, "/* Contributions: Werner Lemberg, Khaled Hosny, Joe Da Silva */\n\n" ); fprintf( data, "#include \"utype.h\"\n" ); fprintf( data, GeneratedFileMessage ); fprintf( data, "const unsigned short ____tolower[]= { 0,\n" ); diff --git a/Unicode/utype.c b/Unicode/utype.c index f747606a76..1bdfdac473 100644 --- a/Unicode/utype.c +++ b/Unicode/utype.c @@ -1,3 +1,7 @@ +/* Copyright: 2001 George Williams */ +/* License: BSD-3-clause */ +/* Contributions: Werner Lemberg, Khaled Hosny, Joe Da Silva */ + #include "utype.h" /* This file was generated using the program 'makeutype' */ diff --git a/fontforge/bezctx_ff.c b/fontforge/bezctx_ff.c index 4bba03e04e..f83d3021ba 100644 --- a/fontforge/bezctx_ff.c +++ b/fontforge/bezctx_ff.c @@ -1,5 +1,29 @@ -/* This file written by George Williams to provide a gateway to fontforge */ -/* it it a modification of Raph's bezctx_ps.c */ +/* +Copyright: 2007 Raph Levien +License: GPL-2+ + bezctx_ps.c - ppedit - A pattern plate editor for Spiro splines. +Copyright: 2007 George Williams + bezctx_ff.c - Provide a gateway into FontForge with added modification. +Contributions: Yuri Chornoivan, Jonathan Hanna, Joe Da Silva, Reuben Thomas, + Frank Trampe + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. + +*/ + #include #include diff --git a/fontforge/bezctx_ff.h b/fontforge/bezctx_ff.h index 5af7511cf9..3510ff6a79 100644 --- a/fontforge/bezctx_ff.h +++ b/fontforge/bezctx_ff.h @@ -1,3 +1,9 @@ +/* +Copyright: 2007 Raph Levien +License: GPL-2+ +Modified bezctx_ps.h for FontForge by George Williams - 2007 +*/ + #include #include diff --git a/fontforge/crctab.c b/fontforge/crctab.c index d89cff8c63..3cc216e334 100644 --- a/fontforge/crctab.c +++ b/fontforge/crctab.c @@ -1,6 +1,10 @@ /* GWW: taken from http://www.ctan.org/tex-archive/tools/macutils/crc/ */ /* This is the output (slightly modified) of makecrc for the binhex case */ +/* Computation of Cyclic Redundancy Checks was invented by W. Wesley Peterson */ +/* in 1961. Various examples, including optimizations using lookup tables are */ +/* available in C, assembler (various CPUs), and other programming languages. */ + extern unsigned long binhex_crc(unsigned char *buffer,int size); static const unsigned long binhex_crcinit = 0; diff --git a/fontforge/ofl.c b/fontforge/ofl.c index def23a40c7..eee70b21de 100644 --- a/fontforge/ofl.c +++ b/fontforge/ofl.c @@ -1,3 +1,5 @@ +/* Copyright: 2007 George Williams */ +/* License: BSD-3-clause */ /* This file contains the SIL Open Font License */ /* See http://scripts.sil.org/OFL for all the details */ /* Check the extensive FAQ as well */ @@ -6,8 +8,9 @@ #include "ofl.h" static char *ofl_eng[] = { - "Copyright (c) %1$d, %2$s (),", - "with Reserved Font Name %s.", +/* sil.org license by Authors Nicolas Spalinger & Victor Gaultney, 2007feb26 */ + "Copyright (c) %1$d, %2$s (),", /* */ + "with Reserved Font Name %s.", /* */ "", "This Font Software is licensed under the SIL Open Font License, Version 1.1.", "This license is copied below, and is also available with a FAQ at:", diff --git a/fontforge/ofl.h b/fontforge/ofl.h index bafa27e9e8..bca6bc852f 100644 --- a/fontforge/ofl.h +++ b/fontforge/ofl.h @@ -1,3 +1,8 @@ +/* +Copyright: 2007 George Williams +License: BSD-3-clause +*/ + #include "splinefont.h" extern struct str_lang_data { diff --git a/fontforgeexe/fontinfo.c b/fontforgeexe/fontinfo.c index f1e84232da..60aeacecbe 100644 --- a/fontforgeexe/fontinfo.c +++ b/fontforgeexe/fontinfo.c @@ -3224,6 +3224,7 @@ return( true ); } static int GFI_HelpOFL(GGadget *g, GEvent *e) { +/* F1 Help to open a browser to sil.org Open Source License and FAQ */ if ( e->type==et_controlevent && e->u.control.subtype == et_buttonactivate ) { help("http://scripts.sil.org/OFL"); } @@ -3231,6 +3232,9 @@ return( true ); } static int GFI_AddOFL(GGadget *g, GEvent *e) { +/* Add sil.org Open Source License (see ofl.c), and modify with current date */ +/* Author, and Font Family Name for rows[0,1] of the license. You can access */ +/* this routine from GUI at Element->Font_Info->TTF_Names. info at PS_Names. */ if ( e->type==et_controlevent && e->u.control.subtype == et_buttonactivate ) { struct gfi_data *d = GDrawGetUserData(GGadgetGetWindow(g)); GGadget *tng = GWidgetGetControl(GGadgetGetWindow(g),CID_TNames); diff --git a/inc/utype.h b/inc/utype.h index 38dca8c288..d977213ff2 100644 --- a/inc/utype.h +++ b/inc/utype.h @@ -1,5 +1,8 @@ #ifndef _UTYPE_H #define _UTYPE_H +/* Copyright: 2001 George Williams */ +/* License: BSD-3-clause */ +/* Contributions: Joe Da Silva */ /* This file was generated using the program 'makeutype' */