Skip to content

Commit

Permalink
Copyrights concerning Issue 2643 and Issue 2732 (fontforge#2735)
Browse files Browse the repository at this point in the history
* 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 fontforge#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 fontforge#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.
  • Loading branch information
JoesCat committed Jul 23, 2016
1 parent 1fe7b8f commit 380a700
Show file tree
Hide file tree
Showing 11 changed files with 81 additions and 14 deletions.
15 changes: 8 additions & 7 deletions AUTHORS
Expand Up @@ -43,7 +43,7 @@ Duane Moody
Eddie Yuen
Edward Lee
Eva Denman
Frank Trampe
Frank Trampe <frank-trampe>
Frédéric Wang
Georg A. Duffner
Giuseppe Bilotta
Expand All @@ -66,9 +66,9 @@ Joel Santos
Johannes Plass - gv = ANALYZE_MAP.COM
Johan Winge
Jon Banquer
Jonathan Hanna
Jonathan Hanna <jhps>
Jonathan Hue
Jose Da Silva
Jose Da Silva <JoesCat>
Joshua Richardson
Jouk Jansen
Juergen Buntrock
Expand All @@ -81,7 +81,7 @@ Kelvinsong
Kemie Guaida - Tango PixMaps
Kengo Ichiki
Kevin Fenzi
Khaled Hosny
Khaled Hosny <khaledhosny>
Koki Takahashi
Lasse Fister
László Károly
Expand All @@ -99,7 +99,7 @@ Mayank Jha
Max Rabkin - excepthook.py
Maxim Iorsh
Michal Mazurek
Michal Nowakowski - nowakowskittfinstr.c
Michal Nowakowski <michal-n> - nowakowskittfinstr.c
midzer <midzer@gmail.com>
Nicolas Kaiser
Nicolas Spalinger
Expand All @@ -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 <raphlinus>
Reuben Thomas <rrthomas>
Richard Hughes
Rogier van Dalen
Ryusei Yamaguchi
Expand All @@ -137,7 +138,7 @@ Vadim Belman
Valek Filippov
Vernon Adams
Ville Skytta
Werner Lemberg
Werner Lemberg <lemzwerg>
Woensug Eric Choi
贤哲 <xiaozhe.hxz@alibaba-inc.com>
Yannis Haralambous
Expand Down
6 changes: 5 additions & 1 deletion Unicode/ArabicForms.c
@@ -1,7 +1,11 @@
#include <utype.h>
/* Copyright: 2001 George Williams */
/* License: BSD-3-clause */
/* Contributions: Khaled Hosny, Joe Da Silva */

/* This file was generated using the program 'makeutype' */

#include <utype.h>

struct arabicforms ArabicForms[] = {
/* initial, medial, final, isolated, isletter, joindual, required_lig_with_alef */
{ 0x0600, 0x0600, 0x0600, 0x0600, 0, 0, 0 }, /* 0x0600 */
Expand Down
13 changes: 11 additions & 2 deletions Unicode/makeutype.c
Expand Up @@ -608,10 +608,13 @@ static void dumparabicdata(FILE *header) {
exit(2);
}

fprintf( data, "#include <utype.h>\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 <utype.h>\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 ) {
Expand Down Expand Up @@ -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 <ctype.h>\t\t/* Include here so we can control it. If a system header includes it later bad things happen */\n" );
Expand Down Expand Up @@ -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" );
Expand Down
4 changes: 4 additions & 0 deletions 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' */
Expand Down
28 changes: 26 additions & 2 deletions 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 <basics.h>
#include <stdio.h>

Expand Down
6 changes: 6 additions & 0 deletions 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 <spiroentrypoints.h>
#include <bezctx.h>

Expand Down
4 changes: 4 additions & 0 deletions 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;
Expand Down
7 changes: 5 additions & 2 deletions 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 */
Expand All @@ -6,8 +8,9 @@
#include "ofl.h"

static char *ofl_eng[] = {
"Copyright (c) %1$d, %2$s (<URL|email>),",
"with Reserved Font Name %s.",
/* sil.org license by Authors Nicolas Spalinger & Victor Gaultney, 2007feb26 */
"Copyright (c) %1$d, %2$s (<URL|email>),", /* <Date> <Copyright Holder> */
"with Reserved Font Name %s.", /* <Font Family Name> */
"",
"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:",
Expand Down
5 changes: 5 additions & 0 deletions fontforge/ofl.h
@@ -1,3 +1,8 @@
/*
Copyright: 2007 George Williams
License: BSD-3-clause
*/

#include "splinefont.h"

extern struct str_lang_data {
Expand Down
4 changes: 4 additions & 0 deletions fontforgeexe/fontinfo.c
Expand Up @@ -3224,13 +3224,17 @@ 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");
}
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);
Expand Down
3 changes: 3 additions & 0 deletions 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' */

Expand Down

0 comments on commit 380a700

Please sign in to comment.