Merge pull request #190 from phi-gamma/master

[*] bump version, update copyright date

4 files changed, 19 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index b8f380d..0195835 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 Change History
 --------------
 
+2014/02/05, luaotfload v2.4-3
+    * Add contact info to --version output of luaotfload-tool (backport from
+      2.5).
+    * Fix bug with broken font names (backport from 2.5).
+
 2013/12/31, luaotfload v2.4
     * Additional self-tests, now in separate file (luaotfload-diagnostics.lua)
     * Better path and directory handling, especially on Windows
diff --git a/luaotfload-tool.lua b/luaotfload-tool.lua
index 341d197..67ab2e7 100755
--- a/luaotfload-tool.lua
+++ b/luaotfload-tool.lua
@@ -2,14 +2,14 @@
 -----------------------------------------------------------------------
 --         FILE:  luaotfload-tool.lua
 --  DESCRIPTION:  database functionality
--- REQUIREMENTS:  luaotfload 2.2
+-- REQUIREMENTS:  luaotfload 2.4
 --       AUTHOR:  Khaled Hosny, Élie Roux, Philipp Gesang
---      VERSION:  2.4
+--      VERSION:  2.4-3
 --      LICENSE:  GPL v2
 --     MODIFIED:  2013-07-28 13:12:04+0200
 -----------------------------------------------------------------------
 
-local version = "2.4" --- <int: major>.<int: minor><alpha: fixes>
+local version = "2.4-3" --- <int: major>.<int: minor><alpha: fixes>
 
 --[[doc--
 
diff --git a/luaotfload-tool.rst b/luaotfload-tool.rst
index 957ec85..b5629b7 100644
--- a/luaotfload-tool.rst
+++ b/luaotfload-tool.rst
@@ -6,9 +6,9 @@
          generate and query the Luaotfload font names database
 -----------------------------------------------------------------------
 
-:Date:      2013-07-31
+:Date:      2014-02-05
 :Copyright: GPL v2.0
-:Version:   2.4
+:Version:   2.4-3
 :Manual section: 1
 :Manual group: text processing
 
@@ -197,7 +197,7 @@ miscellaneous
                            directory (the name will be chosen
                            automatically (**experimental!**).
 
---version, -V           Show version number and exit.
+--version, -V           Show version info of components and exit.
 --help, -h              Show help message and exit.
 
 --diagnose=CHECK        Run the diagnostic procedure *CHECK*. Available
diff --git a/luaotfload.dtx b/luaotfload.dtx
index f27b5e0..40b5df9 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2009-2013
+% Copyright (C) 2009-2014
 %      by  Elie Roux      <elie.roux@telecom-bretagne.eu>
 %      and Khaled Hosny   <khaledhosny@eglug.org>
 %      and Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de>
@@ -40,7 +40,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: luaotfload v2.4 OpenType layout system}
+\Msg{* Package: luaotfload v2.4-3 OpenType layout system}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -51,7 +51,7 @@
 \preamble
 This is a generated file.
 
-Copyright (C) 2009-2013
+Copyright (C) 2009-2014
      by  Elie Roux      <elie.roux@telecom-bretagne.eu>
      and Khaled Hosny   <khaledhosny@eglug.org>
      and Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de>
@@ -111,7 +111,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{luaotfload.drv}%
-  [2013/12/28 v2.4 OpenType layout system]%
+  [2014/02/05 v2.4-3 OpenType layout system]%
 \documentclass{ltxdoc}
 \usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace}
 \usepackage[x11names]{xcolor}
@@ -231,7 +231,7 @@ and the derived files
 % \GetFileInfo{luaotfload.drv}
 %
 % \title{The \identifier{luaotfload} package}
-% \date{2013/12/28 v2.4}
+% \date{2014/02/05 v2.4-3}
 % \author{Elie Roux · Khaled Hosny · Philipp Gesang\\
 %         Home:      \url{https://github.com/lualatex/luaotfload}\\
 %         Support:   \email{lualatex-dev@tug.org}}
@@ -1608,8 +1608,8 @@ end
 
 luaotfload.module = {
     name          = "luaotfload",
-    version       = 2.40003,
-    date          = "2013/12/28",
+    version       = 2.40004, --- 2.4-3
+    date          = "2014/02/05",
     description   = "OpenType layout system.",
     author        = "Elie Roux & Hans Hagen",
     copyright     = "Elie Roux",
@@ -2233,7 +2233,7 @@ luaotfload.aux.start_rewrite_fontname () --- to be migrated to fontspec
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luaotfload}%
-    [2013/12/28 v2.4 OpenType layout system]
+    [2014/02/05 v2.4-3 OpenType layout system]
   \RequirePackage{luatexbase}
 \fi
 \ifnum\luatexversion<76