XeTeX 0.9999.0

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

6 files changed, 14 insertions, 7 deletions

diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index b43a3d70e55..501cb7822c2 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-11  Khaled Hosny  <khaledhosny@eglug.org>
+
+	XeTeX 0.9999.0
+
 2013-03-07  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* XeTeXFontInst.cpp: Fix a typo.
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp
index bec099e2f3f..218843c2740 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp
@@ -316,6 +316,7 @@ XeTeXFontInst::initialize(const char* pathname, int index, int &status)
 		fXHeight = unitsToPoints(os2Table->sxHeight);
 	}
 
+	// Set up HarfBuzz font
 	hbFace = hb_face_create_for_tables(_get_table, ftFace, NULL);
 	hb_face_set_index(hbFace, index);
 	hb_face_set_upem(hbFace, fUnitsPerEM);
@@ -326,7 +327,8 @@ XeTeXFontInst::initialize(const char* pathname, int index, int &status)
 	hb_font_set_scale(hbFont,
 		((uint64_t) ftFace->size->metrics.x_scale * (uint64_t) fUnitsPerEM) >> 16,
 		((uint64_t) ftFace->size->metrics.y_scale * (uint64_t) fUnitsPerEM) >> 16);
-	//hb_font_set_ppem(hbFont, ftFace->size->metrics.x_ppem, ftFace->size->metrics.y_ppem);
+	// We don’t want device tables adjustments
+	hb_font_set_ppem(hbFont, 0, 0);
 
     return;
 }
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.h b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.h
index a40c6143b4d..599fbe97d47 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.h
@@ -91,12 +91,11 @@ public:
 	double							getDesignSize(XeTeXFont font);
 
 	char							getReqEngine() const { return sReqEngine; };
-
-	void							setReqEngine(char reqEngine) const { sReqEngine = reqEngine; };
-
 		// return the requested rendering technology for the most recent findFont
 		// or 0 if no specific technology was requested
 
+	void							setReqEngine(char reqEngine) const { sReqEngine = reqEngine; };
+
 protected:
 	static XeTeXFontMgr*			sFontManager;
 	static char						sReqEngine;
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index 0b6644321e6..70b9a3feaf5 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -1025,6 +1025,8 @@ loadOTfont(PlatformFontRef fontRef, XeTeXFont font, Fixed scaled_size, const cha
 				tag = hb_tag_from_string(cp1, cp2 - cp1);
 				features = xrealloc(features, (nFeatures + 1) * sizeof(hb_feature_t));
 				features[nFeatures].tag = tag;
+				features[nFeatures].start = 0;
+				features[nFeatures].end = (unsigned int) -1;
 				features[nFeatures].value = 0;
 				nFeatures++;
 				goto next_option;
diff --git a/Build/source/texk/web2c/xetexdir/xetex.web b/Build/source/texk/web2c/xetexdir/xetex.web
index 4e5ec76c970..c65f33528e3 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.web
+++ b/Build/source/texk/web2c/xetexdir/xetex.web
@@ -318,8 +318,8 @@ known as `\eTeX'.
 @d eTeX_version_string=='-2.5' {current \eTeX\ version}
 @#
 @d XeTeX_version=0 { \.{\\XeTeXversion} }
-@d XeTeX_revision==".9999" { \.{\\XeTeXrevision} }
-@d XeTeX_version_string=='-0.9999' {current \XeTeX\ version}
+@d XeTeX_revision==".9999.0" { \.{\\XeTeXrevision} }
+@d XeTeX_version_string=='-0.9999.0' {current \XeTeX\ version}
 @#
 @d XeTeX_banner=='This is XeTeX, Version 3.1415926',eTeX_version_string,XeTeX_version_string
   {printed when \XeTeX\ starts}
diff --git a/Build/source/texk/web2c/xetexdir/xetex_version.h b/Build/source/texk/web2c/xetexdir/xetex_version.h
index e0bbdd08bc9..4b5964d8633 100644
--- a/Build/source/texk/web2c/xetexdir/xetex_version.h
+++ b/Build/source/texk/web2c/xetexdir/xetex_version.h
@@ -1 +1 @@
-#define XETEX_VERSION "0.9999"
+#define XETEX_VERSION "0.9999.0"