summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Robertson <wspr81@gmail.com>2010-05-20 09:13:33 +0930
committerWill Robertson <wspr81@gmail.com>2010-05-20 09:13:33 +0930
commitef220e625c6741cc15f29a77e457c7094fc79541 (patch)
tree25bad74d5ebe1a7a3bdd03ca069269648dbec7a2
parenta55a85ab84d5fd784c7d0f043d4a80f0286f1def (diff)
downloadluaotfload-ef220e625c6741cc15f29a77e457c7094fc79541.tar.gz
Remove all mention of the CC0 licence; use GPL for all
Related question: do Manuel and I have to add our names to the copyright?
-rw-r--r--README16
-rw-r--r--luaotfload.dtx16
-rwxr-xr-xmkluatexfontdb.lua4
3 files changed, 12 insertions, 24 deletions
diff --git a/README b/README
index 9409648..cc9d184 100644
--- a/README
+++ b/README
@@ -79,7 +79,7 @@ starts by:
Copyright 2008 PRAGMA ADE / ConTeXt Development Team
"
-for otf-*.lua files except otfl-font-clr.lua and otfl-luat-ovr.lua, and
+for otf-*.lua files except those below, and
"
Copyright 2010 Luaotfload Development Team
@@ -103,17 +103,3 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
"
-
-The file luaotfload.dtx and the derived files
- luaotfload.pdf
- luaotfload.sty
- luaotfload.lua
-
-as well as the file mkluatexfontdb.lua are under the CC0 license. You can find
-the CC0 license full text at
-
-http://creativecommons.org/publicdomain/zero/1.0/legalcode
-
-and a FAQ at
-
-http://wiki.creativecommons.org/CC0
diff --git a/luaotfload.dtx b/luaotfload.dtx
index 4f83091..4ca3dc8 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -3,10 +3,11 @@
% Copyright (C) 2009-2010 by Elie Roux <elie.roux@telecom-bretagne.eu>
% and Khaled Hosny <khaledhosny@eglug.org>
%
-% This work is under the CC0 license.
+% This work is distributed under the GNU General Public License v3.
+% This work consists of this source file luaotfload.dtx and other
+% files listed in the README.
%
-% This work consists of the main source file luaotfload.dtx
-% and the derived files
+% This file is used the source for the derived files
% luaotfload.sty, luaotfload.lua
%
% Unpacking:
@@ -49,10 +50,11 @@ This is a generated file.
Copyright (C) 2009-2010 by by Elie Roux <elie.roux@telecom-bretagne.eu>
and Khaled Hosny <khaledhosny@eglug.org>
-This work is under the CC0 license.
+This work is distributed under the GNU General Public License v3.
+This work consists of this source file luaotfload.dtx and other
+files listed in the README.
-This work consists of the main source file luaotfload.dtx
-and the derived files
+This file luaotfload.dtx was to generate the derived files
luaotfload.sty, luaotfload.lua
\endpreamble
@@ -389,7 +391,7 @@ luaotfload.module = {
description = "ConTeXt font loading system.",
author = "Elie Roux & Hans Hagen",
copyright = "Elie Roux",
- license = "CC0"
+ license = "GNU GPL v3"
}
luatexbase.provides_module(luaotfload.module)
diff --git a/mkluatexfontdb.lua b/mkluatexfontdb.lua
index 5eac9ae..01fca8a 100755
--- a/mkluatexfontdb.lua
+++ b/mkluatexfontdb.lua
@@ -1,7 +1,7 @@
#!/usr/bin/env texlua
--[[
-This file is copyright 2010 Elie Roux and Khaled Hosny and is under CC0
-license (see http://creativecommons.org/publicdomain/zero/1.0/legalcode).
+This file is copyright 2010 Elie Roux and Khaled Hosny and is distributed
+under the GNU General Public License v3: http://www.gnu.org/licenses/gpl.html
This file is a wrapper for the luaotfload's font names module. It is part of the
luaotfload bundle, please see the luaotfload documentation for more info.