Merge branch 'master' of https://github.com/phi-gamma/luaotfload

3 files changed, 16 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index e4f2ea4..98b5491 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 NAME         = luaotfload
 DOC          = $(NAME).pdf
 DTX          = $(NAME).dtx
-OTFL         = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf
+OTFL         = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf $(GLYPHS)
 SCRIPT       = luaotfload-tool.lua
 
 GLYPHSCRIPT  = mkglyphlist
@@ -18,7 +18,7 @@ GLYPHS      = font-age.lua
 GRAPHED     = $(DOTPDF)
 COMPILED    = $(DOC)
 UNPACKED    = luaotfload.sty luaotfload.lua
-GENERATED   = $(GRAPHED) $(COMPILED) $(UNPACKED) $(GLYPHS)
+GENERATED   = $(GRAPHED) $(UNPACKED) $(COMPILED) $(GLYPHS)
 SOURCE 		= $(DTX) $(OTFL) README Makefile NEWS $(SCRIPT) $(GLYPHSCRIPT)
 
 # test files
@@ -49,8 +49,9 @@ CTAN_ZIP = $(NAME).zip
 TDS_ZIP  = $(NAME).tds.zip
 ZIPS 	 = $(CTAN_ZIP) $(TDS_ZIP)
 
-DO_TEX 			= tex --interaction=batchmode $< >/dev/null
-DO_LATEX 		= latexmk -pdf -pdflatex=lualatex -silent $< >/dev/null
+DO_TEX 		  	= tex --interaction=batchmode $< >/dev/null
+# (with the next version of latexmk: -pdf -pdflatex=lualatex)
+DO_LATEX 	  	= latexmk -pdf -e '$$pdflatex = q(lualatex %O %S)' -silent $< >/dev/null
 DO_GRAPHVIZ 	= dot -Tpdf -o $@ $< > /dev/null
 DO_GLYPHLIST 	= texlua ./mkglyphlist > /dev/null
 
diff --git a/NEWS b/NEWS
index 2cdf365..df205dc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,30 +1,31 @@
 Change History
 --------------
 
-2013/04/xx, luaotfload v2.2:
+2013/05/06, luaotfload v2.2:
     * There is now a central, non-personal dev repo on github:
       https://github.com/lualatex/luaotfload
     * Synchronisation with ConTeXt from TeXLive 2013, inducing
-      backward-incompatible changes in the font structure (fontspec and 
-      unicode-math must be updated)
+      backward-incompatible changes in the font structure. A
+      backward-compatibility layer has been added for the current
+      versions of fontspec, unicode-math and microtype, but it should
+      disapear in a future version.
     * Synchronisation with ConTeXt is now easier and can be done by just
       updating luaotfload-merged.lua (<= luatex-fonts-merged.lua from
       the LuaTeX-Plain format)
     * Improved and extended documentation
     * Font filenames are stored in the database (file: lookups more efficient)
     * Optional caching of name: lookups (uses separate cache file)
-    * Increased fidelity of XeTeX emulation
+    * Rewriting and increased fidelity of XeTeX emulation
     * Renaming mkluatexfontdb into luaotfload-tool (the old behavior is kept if
-      the script is symlinked/ renamed mkluatexfontdb)
+      the script is symlinked or renamed mkluatexfontdb)
     * Added options to luaotfload-tool for simple database queries
     * Logging facilities have been rewritten and allow for more granularity
     * All files have been renamed, abandoning cryptic acronyms; also
-      the new prefix is »luaotfload« (<= »otfl«)
+      the new prefix is "luaotfload" (<= "otfl")
     * The Adobe Glyph List (font-age.lua) is now built via script (mkglyphlist)
     * Hans adapted the font loader to several of our requests (attribute
       allocation, custom merged package name etc.)
     * Auxiliary functions for package authors
-    * Fallbacks for older versions of dependent packages
 
 2013/04/27, luaotfload v1.3:
     *  blacklisting lingoes.ttf (segfaults)
diff --git a/luaotfload.dtx b/luaotfload.dtx
index ddd0116..2f88225 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -135,9 +135,9 @@ and the derived files
 \setmainfont[
   Numbers     = OldStyle,
   Ligatures   = TeX,
-  BoldFont    = {Linux Libertine Bold},
-  ItalicFont  = {Linux Libertine Italic},
-  SlantedFont = {Linux Libertine Italic},
+  BoldFont    = {Linux Libertine O Bold},
+  ItalicFont  = {Linux Libertine O Italic},
+  SlantedFont = {Linux Libertine O Italic},
 ]{Linux Libertine O}
 \setmonofont[Ligatures=TeX,Scale=MatchLowercase]{Liberation Mono}
 %setsansfont[Ligatures=TeX]{Linux Biolinum O}