9 files changed, 32 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/NEWS b/Master/texmf-dist/doc/luatex/luaotfload/NEWS
index 3780d355a70..7018c95dbd0 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/NEWS
+++ b/Master/texmf-dist/doc/luatex/luaotfload/NEWS
@@ -1,9 +1,14 @@
 Change History
 --------------
+2019-01-14 luaotfload v2.94
+    * imported context files of 2018-12-19
+    * removed luaotfload-characters from init - use the basics-chr instead.
+    * allow custom fontloaders through the mode-key https://github.com/u-fischer/luaotfload/pull/25
+    * resolved issue #29
+
 2018-10-28 luaotfload v2.93
     * reinserted forgotten man files
     * unified and improved version/module info for automatic tagging
-    * 
 
 
 2018-10-21 luaotfload v2.92
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/README.md b/Master/texmf-dist/doc/luatex/luaotfload/README.md
index 9bb69f7ca4b..68fedcff40c 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/README.md
+++ b/Master/texmf-dist/doc/luatex/luaotfload/README.md
@@ -1,8 +1,8 @@
 # The Luaotfload Package
 
-VERSION: 2.93
+VERSION: 2.94
 
-DATE: 2018-10-28
+DATE: 2018-12-19
 
 
 ## Description
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf b/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf
index 1a39b3ca662..b4f3987cd43 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf
+++ b/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-conf.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-conf.pdf
index b1e101ea36d..27f6df12bfe 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-conf.pdf
+++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-conf.pdf
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-latex.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-latex.pdf
index 20b1206be71..c8905497a0c 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-latex.pdf
+++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-latex.pdf
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-main.tex b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-main.tex
index 5d401f86ac3..b15c532083f 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-main.tex
+++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-main.tex
@@ -32,7 +32,7 @@
 \beginfrontmatter
 
   \setdocumenttitle  {The \identifier{luaotfload} package}
-  \setdocumentdate   {2018/10/28 upload2.93}
+  \setdocumentdate   {2018-12-19 v2.94}
   \setdocumentauthor {Elie Roux · Khaled Hosny · Philipp Gesang · Ulrike Fischer\\
                       Home:    \hyperlink {https://github.com/lualatex/luaotfload}\\
                       New Home: \hyperlink {https://github.com/u-fischer/luaotfload}\\
@@ -56,6 +56,17 @@
 \pdfbookmark[1]{\contentsname}{table}
 \typesetcontent
 
+\beginsection {New in version 2.94 (by Ulrike Fischer)}
+\begin{itemize}
+\item 
+This version imports from context the generic fontloader in the version of 2018-12-19. It is the last version that works with luatex 1.07 and texlive 2018. As context has moved to luatex 1.09 newer versions of the fontloader needs now this luatex version too. This means that until the texlive 2018 freeze there will be probably no update of luaotfload.
+
+\item This version changes the handling of the \inlinecode{mode} key. It no longer accepts only the values \inlinecode{base} and \inlinecode{node}, but can be used to load a font with an alternative font loader/renderer. 
+
+
+\end{itemize}
+\endsection
+
 \beginsection {New in version 2.93 (by Ulrike Fischer)}
 Mainly internal clean up of the version info to allow automatic versioning.
 \endsection
@@ -653,12 +664,13 @@ obviously, \inlinecode{random}.
   \font \librmsaltfirst = LatinModernRoman:salt=1
 \endlisting
 
-\beginsubsection {Basic font features}
+\beginsubsection {Basic font features}\label{sec:mode}
 
 \begindescriptions
 
   \beginaltitem {mode}
-         \identifier{luaotfload} has two \OpenType processing
+         Until version 2.94 
+         \identifier{luaotfload} had two \OpenType processing
          \emphasis{modes}:
          \identifier{base} and \identifier{node}.
 
@@ -679,6 +691,11 @@ obviously, \inlinecode{random}.
          By default \identifier{luaotfload} is in \identifier{node}
          mode, and \identifier{base} mode has to be requested where needed,
          e.~g. for math fonts.
+         
+         Since version 2.94 it is possible to call other font renderers with the mode key. A simple example with a plain reader can be found at \hyperlink{https://github.com/u-fischer/luaotfload/pull/26\#issuecomment-437716326}.
+         A more useful example needs the new experimental luahbtex engine (windows binaries can be found at w32tex.org), and the luahbtex-harf renderer (\hyperlink{https://github.com/khaledhosny/luahbtex-harf}). With both it is possible to render a font using the harfbuzz library (used also by xetex).
+         
+         
   \endaltitem
 
   \beginaltitem {script} \label{script-tag}
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.pdf
index e4aa1a24b14..cea4965601b 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.pdf
+++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.pdf
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.rst b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.rst
index ab18e5bcb7c..bb540b6c34f 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.rst
+++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.rst
@@ -6,9 +6,9 @@
          generate and query the Luaotfload font names database
 -----------------------------------------------------------------------
 
-:Date:                  2018-10-28
+:Date:                  2018-12-19
 :Copyright:             GPL v2.0
-:Version:               2.93
+:Version:               2.94
 :Manual section:        1
 :Manual group:          text processing
 
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.rst b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.rst
index 02365397faa..f2917eb3574 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.rst
+++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.rst
@@ -6,9 +6,9 @@
                      Luaotfload configuration file
 -----------------------------------------------------------------------
 
-:Date:                  2018-10-28
+:Date:                  2018-12-19
 :Copyright:             GPL v2.0
-:Version:               2.93
+:Version:               2.94
 :Manual section:        5
 :Manual group:          text processing