Merge pull request #47 from phi-gamma/master

update readme and licensing

3 files changed, 54 insertions, 40 deletions

diff --git a/README b/README
index 8dc2003..4730e88 100644
--- a/README
+++ b/README
@@ -1,42 +1,46 @@
-                         The luaotfload package
-
-Luaotfload is an adaptation of the ConTeXt font loading system for Plain and
-LaTeX. It allows OpenType fonts to be loaded with OpenType features accessible
-through the XeTeX font syntax.
-
-It may be loaded in Plain LuaTeX with "\input luaotfload.sty" and in LuaLaTeX
-with "\usepackage{luaotfload}". LuaLaTeX users may be interested in the
-fontspec package which provides a high-level interface to the functionality
+*******************************************************************************
+                            The Luaotfload Package
+*******************************************************************************
+
+Luaotfload is an adaptation of the ConTeXt font loading system for the Plain
+and LaTeX formats. It allows OpenType fonts to be loaded with font features
+accessible using an extended font request syntax while providing compatibility
+with XeTeX. By indexing metadata in a database it facilitates loading fonts by
+their proper names instead of file names.
+
+Luaotfload may be loaded in Plain LuaTeX with "\input luaotfload.sty" and in
+LuaLaTeX with "\usepackage{luaotfload}". LuaLaTeX users may be interested in
+the fontspec package which provides a high-level interface to the functionality
 provided by this package.
 
 Please see the documentation luaotfload.pdf for more information.
 
-This package is developed on <http://github.com/khaledhosny/luaotfload>.
-Please report bugs at the Github address above.
+This package is developed by the LuaLaTeX dev team on
+<http://github.com/lualatex/luaotfload>. Please report bugs to the issue
+tracker there.
 
-Discussion of development for LuaLaTeX is held in the lualatex-dev mailing
-list. See <http://www.tug.org/mailman/listinfo/lualatex-dev> to join or to
-view the archives.
+The development for LuaLaTeX is discussed on the lualatex-dev mailing list. See
+<http://www.tug.org/mailman/listinfo/lualatex-dev> for details.
 
 
 Responsible Persons
--------------------
-
+-------------------------------------------------------------------------------
 The following people have contributed to this package.
 
 Khaled Hosny             <khaledhosny@eglug.org>
 Elie Roux                <elie.roux@telecom-bretagne.eu>
 Will Robertson           <will.robertson@latex-project.org>
-
+Philipp Gesang           <philipp.gesang@alumni.uni-heidelberg.de>
 
 
 Installation
-------------
+-------------------------------------------------------------------------------
 
 Here are the recommended installation methods (preferred first).
 
 1. If you are using TeX Live 2008 or later, use 'tlmgr install luaotfload'.
-Alternatively, try your (TeX or Linux) distribution's package management system.
+   Alternatively, try your (TeX or Linux) distribution's package management
+   system.
 
 2. a. Download luaotfload.tds.zip from CTAN.
    b. Unzip it at the root of one or your TDS trees.
@@ -50,22 +54,27 @@ Alternatively, try your (TeX or Linux) distribution's package management system.
 4. Try to figure it out by looking at the Makefile and comments in the sources.
 
 License
--------
+-------------------------------------------------------------------------------
+
+The luaotfload bundle, as a derived work of ConTeXt, is distributed under the
+GNU GPLv2 license:
 
-The luaotfload bundle is distributed under the GNU GPLv2 license:
    <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
-This license requires the license itself to be distributed with the work.
-It may be located within the documentation luaotfload.pdf.
 
-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 license requires the license itself to be distributed with the work. For
+its full text see the documentation in luaotfload.pdf.
+
+
+                                  DISCLAIMER
+
+        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; version 2.
 
-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.
+        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.
 
-See headers of each source file for copyright details.
+        See headers of each source file for copyright details.
 
diff --git a/luaotfload-tool.lua b/luaotfload-tool.lua
index 827ece9..0cd19b1 100755
--- a/luaotfload-tool.lua
+++ b/luaotfload-tool.lua
@@ -5,18 +5,24 @@
 -- REQUIREMENTS:  luaotfload 2.2
 --       AUTHOR:  Khaled Hosny, Élie Roux, Philipp Gesang
 --      VERSION:  2.2
---      CREATED:  2013-05-01 14:40:50+0200
+--      LICENSE:  GPL v2
+--      CREATED:  2013-05-06 13:37:12+0200
 -----------------------------------------------------------------------
 
 --[[doc--
+
 This file was originally written (as \fileent{mkluatexfontdb.lua}) by
-Elie Roux and Khaled Hosny and is under CC0 license (see
-http://creativecommons.org/publicdomain/zero/1.0/legalcode).
+Elie Roux and Khaled Hosny and, as a derived work of ConTeXt, is
+provided under the terms of the GPL v2.0 license as printed in full
+text in the manual (luaotfload.pdf).
+
+    \url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html}.
 
 This file is a wrapper for the luaotfload font names module
 (luaotfload-database.lua). It is part of the luaotfload bundle, please
 see the luaotfload documentation for more info. Report bugs to
-\url{https://github.com/lualatex/luaotfload/issues}.
+
+    \url{https://github.com/lualatex/luaotfload/issues}.
 
 --doc]]--
 
@@ -24,7 +30,6 @@ kpse.set_program_name"luatex"
 
 local stringformat    = string.format
 local texiowrite_nl   = texio.write_nl
-local stringfind      = string.find
 local stringlower     = string.lower
 
 
@@ -102,7 +107,7 @@ require"luaotfload-override.lua"  --- this populates the logs.* namespace
 require"luaotfload-database"
 require"alt_getopt"
 
-local version = "2.2" -- same version number as luaotfload
+local version  = "2.2" -- same version number as luaotfload
 local names    = fonts.names
 
 local db_src_out = names.path.dir.."/"..names.path.basename
diff --git a/luaotfload.dtx b/luaotfload.dtx
index f11f466..ddd0116 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -8,7 +8,7 @@
 %      Home:      https://github.com/lualatex/luaotfload
 %      Support:   <lualatex-dev@tug.org>.
 %
-% This work is under the CC0 license.
+% This work is under the GPL v2.0 license.
 %
 % This work consists of the main source file luaotfload.dtx
 % and the derived files
@@ -59,7 +59,7 @@ Copyright (C) 2009-2013
      Home:      https://github.com/lualatex/luaotfload
      Support:   <lualatex-dev@tug.org>.
 
-This work is under the CC0 license.
+This work is under the GPL v2.0 license.
 
 This work consists of the main source file luaotfload.dtx
 and the derived files