4 files changed, 16 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 7303ac62ddb..12da222905d 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,17 @@
+2013-04-16  Elie Roux  <elie.roux@telecom-bretagne.eu>
+
+	* font/tfmofm.w: check for .ofm as well as .tfm.
+	* tex/mainbody.w: check for !ini_version before initialize().
+
+2013-04-16  Karl Berry  <karl@tug.org>
+
+	* lua/luainit.w (parse_options): GPLv2+, not just GPLv2 (after
+	discussion with Taco).
+
+2013-04-14  Karl Berry  <karl@tug.org>
+
+	* lua/luainit.w: 2013
+
 2013-04-08  Taco Hoekwater  <taco@luatex.org>
 
 	* luasocket/src/smtp.lua: uncomment require 'coroutine'
diff --git a/Build/source/texk/web2c/luatexdir/font/tfmofm.w b/Build/source/texk/web2c/luatexdir/font/tfmofm.w
index 2e6719b9755..511729570a4 100644
--- a/Build/source/texk/web2c/luatexdir/font/tfmofm.w
+++ b/Build/source/texk/web2c/luatexdir/font/tfmofm.w
@@ -623,7 +623,7 @@ int read_tfm_info(internal_font_number f, const char *cnom, scaled s)
     /* cnom can be an absolute filename, xbasename() fixes that. */
 
     tmpnam = strdup(xbasename(cnom));
-    if (strcmp(tmpnam + strlen(tmpnam) - 4, ".tfm") == 0) {
+    if (strcmp(tmpnam + strlen(tmpnam) - 4, ".tfm") == 0 || strcmp(tmpnam + strlen(tmpnam) - 4, ".ofm") == 0) {
         *(tmpnam + strlen(tmpnam) - 4) = 0;
     }
     set_font_name(f, tmpnam);
diff --git a/Build/source/texk/web2c/luatexdir/tex/mainbody.w b/Build/source/texk/web2c/luatexdir/tex/mainbody.w
index 35d1b4cb313..757d0c907b1 100644
--- a/Build/source/texk/web2c/luatexdir/tex/mainbody.w
+++ b/Build/source/texk/web2c/luatexdir/tex/mainbody.w
@@ -426,7 +426,7 @@ void main_body(void)
         incr(iloc);
     if ((format_ident == 0) || (buffer[iloc] == '&') || dump_line) {
         char *fname = NULL;
-        if (format_ident != 0)
+        if (format_ident != 0 && !ini_version)
             initialize();       /* erase preloaded format */
         if ((fname = open_fmt_file()) == NULL)
             goto FINAL_END;
diff --git a/Master/bin/i386-linux/luatex b/Master/bin/i386-linux/luatex
index 5748267d90d..e84aafebc2c 100755
--- a/Master/bin/i386-linux/luatex
+++ b/Master/bin/i386-linux/luatex