mflua support files, .base creation (disabled until stable)

git-svn-id: svn://tug.org/texlive/trunk@40475 c570f23f-e606-0410-a88d-b1316a301751

18 files changed, 48 insertions, 15 deletions

diff --git a/Master/texmf-dist/scripts/mflua/begin_program.lua b/Master/texmf-dist/scripts/mflua/begin_program.lua
new file mode 100644
index 00000000000..0711ed9dddb
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/begin_program.lua
@@ -0,0 +1 @@
+-- empty
diff --git a/Master/texmf-dist/scripts/mflua/do_add_to.lua b/Master/texmf-dist/scripts/mflua/do_add_to.lua
new file mode 100644
index 00000000000..98dd9750722
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/do_add_to.lua
@@ -0,0 +1,9 @@
+function PRE_fill_envelope_rhs(rhs)  return 0 end
+function POST_fill_envelope_rhs(rhs) return 0 end
+function PRE_fill_envelope_lhs(rhs)  return 0 end
+function POST_fill_envelope_lhs(rhs) return 0 end
+
+function PRE_fill_spec_rhs(rhs)  return 0 end
+function POST_fill_spec_rhs(rhs) return 0 end
+function PRE_fill_spec_lhs(rhs)  return 0 end
+function POST_fill_spec_lhs(rhs) return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/end_program.lua b/Master/texmf-dist/scripts/mflua/end_program.lua
new file mode 100644
index 00000000000..0711ed9dddb
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/end_program.lua
@@ -0,0 +1 @@
+-- empty
diff --git a/Master/texmf-dist/scripts/mflua/fill_envelope.lua b/Master/texmf-dist/scripts/mflua/fill_envelope.lua
new file mode 100644
index 00000000000..cbd9b2841be
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/fill_envelope.lua
@@ -0,0 +1,2 @@
+function print_transition_line_from(x,y) return 0 end
+function print_transition_line_to(x,y)  return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/fill_spec.lua b/Master/texmf-dist/scripts/mflua/fill_spec.lua
new file mode 100644
index 00000000000..54367f46110
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/fill_spec.lua
@@ -0,0 +1,2 @@
+function PRE_move_to_edges(lhs)  return 0 end
+function POST_move_to_edges(lhs)  return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/final_cleanup.lua b/Master/texmf-dist/scripts/mflua/final_cleanup.lua
new file mode 100644
index 00000000000..627d09c0fec
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/final_cleanup.lua
@@ -0,0 +1 @@
+function POST_final_cleanup() return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/main_control.lua b/Master/texmf-dist/scripts/mflua/main_control.lua
new file mode 100644
index 00000000000..bf6c5784959
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/main_control.lua
@@ -0,0 +1,2 @@
+function PRE_main_control()  return 0 end
+function POST_main_control() return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/make_ellipse.lua b/Master/texmf-dist/scripts/mflua/make_ellipse.lua
new file mode 100644
index 00000000000..7c094499b88
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/make_ellipse.lua
@@ -0,0 +1,2 @@
+function PRE_make_ellipse(major_axis,minor_axis,theta,tx,ty) return 0 end
+function POST_make_ellipse(major_axis,minor_axis,theta,tx,ty) return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/mfluaini.lua b/Master/texmf-dist/scripts/mflua/mfluaini.lua
new file mode 100644
index 00000000000..0711ed9dddb
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/mfluaini.lua
@@ -0,0 +1 @@
+-- empty
diff --git a/Master/texmf-dist/scripts/mflua/offset_prep.lua b/Master/texmf-dist/scripts/mflua/offset_prep.lua
new file mode 100644
index 00000000000..1452e0325cd
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/offset_prep.lua
@@ -0,0 +1,2 @@
+function PRE_offset_prep(c,h) return 0 end
+function POST_offset_prep(c,h) return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/print_edges.lua b/Master/texmf-dist/scripts/mflua/print_edges.lua
new file mode 100644
index 00000000000..ae35ce6585e
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/print_edges.lua
@@ -0,0 +1 @@
+function print_edges(s,nuline,xoff,yoff) return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/print_path.lua b/Master/texmf-dist/scripts/mflua/print_path.lua
new file mode 100644
index 00000000000..1733bc9d2cd
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/print_path.lua
@@ -0,0 +1 @@
+function print_path(h,s,nuline) return 0  end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/scan_direction.lua b/Master/texmf-dist/scripts/mflua/scan_direction.lua
new file mode 100644
index 00000000000..6c896677f6c
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/scan_direction.lua
@@ -0,0 +1,2 @@
+function PRE_make_choices(p) return 0 end
+function POST_make_choices(p) return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/skew_line_edges.lua b/Master/texmf-dist/scripts/mflua/skew_line_edges.lua
new file mode 100644
index 00000000000..2ae9dc20a6a
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/skew_line_edges.lua
@@ -0,0 +1 @@
+function print_retrograde_line(x0,y0,cur_x,cur_y) return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mflua/start_of_mf.lua b/Master/texmf-dist/scripts/mflua/start_of_mf.lua
new file mode 100644
index 00000000000..7c24087ca5d
--- /dev/null
+++ b/Master/texmf-dist/scripts/mflua/start_of_mf.lua
@@ -0,0 +1 @@
+function PRE_start_of_MF() return 0 end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/texlive/fmtutil.pl b/Master/texmf-dist/scripts/texlive/fmtutil.pl
index 1bb4d9948eb..76005cf1211 100755
--- a/Master/texmf-dist/scripts/texlive/fmtutil.pl
+++ b/Master/texmf-dist/scripts/texlive/fmtutil.pl
@@ -502,7 +502,7 @@ sub rebuild_one_format {
   my $addargs = $alldata->{'merged'}{$fmt}{$eng}{'args'};
 
   # running parameters
-  my $texengine;
+  my $enginedir;
   my $jobswitch = "-jobname=$fmt";
   my $prgswitch = "-progname=" ;
   my $recorderswitch = ($opts{'recorder'} ? "-recorder" : "");
@@ -533,15 +533,15 @@ sub rebuild_one_format {
   if ($eng eq "mpost") { 
     $fmtfile .= ".mem" ; 
     $kpsefmt = "mp" ; 
-    $texengine = "metapost"; # the directory, not the executable
-  } elsif ($eng =~ m/^mf(w|-nowin)?$/) {
+    $enginedir = "metapost"; # the directory, not the executable
+  } elsif ($eng =~ m/^mf(lua(jit)?)?(w|-nowin)?$/) {
     $fmtfile .= ".base" ; 
     $kpsefmt = "mf" ; 
-    $texengine = "metafont";
+    $enginedir = "metafont";
   } else {
     $fmtfile .= ".fmt" ; 
     $kpsefmt = "tex" ; 
-    $texengine = $eng;
+    $enginedir = $eng;
   }
   
   # check for existence of ini file before doing anything else
@@ -663,7 +663,7 @@ sub rebuild_one_format {
   if ($opts{'no-engine-subdir'}) {
     $fulldestdir = $opts{'fmtdir'};
   } else {
-    $fulldestdir = "$opts{'fmtdir'}/$texengine";
+    $fulldestdir = "$opts{'fmtdir'}/$enginedir";
   }
   TeXLive::TLUtils::mkdirhier($fulldestdir);
   
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index 27bafd41df5..ee9c0e397e2 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -198,7 +198,7 @@ our %TLPDBSettings = (
 our $WindowsMainMenuName = "TeX Live $ReleaseYear";
 
 # Comma-separated list of engines which do not exist on all platforms.
-our $PartialEngineSupport = "luajittex";
+our $PartialEngineSupport = "luajittex,mfluajit";
 
 # timeout for network connections (wget, LWP) in seconds
 our $NetworkTimeout = 30;
diff --git a/Master/tlpkg/tlpsrc/mflua.tlpsrc b/Master/tlpkg/tlpsrc/mflua.tlpsrc
index 5baa5fbc6fe..ebf0a8cc863 100644
--- a/Master/tlpkg/tlpsrc/mflua.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mflua.tlpsrc
@@ -1,18 +1,22 @@
-# On platforms where there is no luajittex, it will be ignored
-# due to special options in fmtutil and TLConfig.pm.
-#execute AddFormat name=luajittex engine=luajittex options="luatex.ini" \
-#  patterns=language.def,language.dat.lua \
-#  fmttriggers=${fmtdeps},pdftex
+category TLCore
+#
+tlpsetvar fmtdeps luatex,metafont
+#
+# disabled just until rebuilds for start_of_mf.lua are done.
+execute AddFormat name=mflua engine=mflua-nowin options="mf.ini" \
+  fmttriggers=${fmtdeps} mode=disabled
+#
+# (mfluajit not ready)
 
 binpattern f bin/${ARCH}/mflua
 binpattern f bin/${ARCH}/mflua-nowin
 
 # duplicated in luatex.tlpsrc, sigh.
-tlpsetvar no_luajit_platforms \
+tlpsetvar no_jit_platforms \
   alpha-linux,sparc-solaris,x86_64-solaris
 #
-binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit
-binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit-nowin
+binpattern f/!${no_jit_platforms} bin/${ARCH}/mfluajit
+binpattern f/!${no_jit_platforms} bin/${ARCH}/mfluajit-nowin
 
 # need metafont for support files, luatex for dll's, etc.
 depend metafont