graphite: Update from SIL SVN repository

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

6 files changed, 161 insertions, 6 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index fc0cb5f7638..29779b7053e 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -19,10 +19,10 @@ gd 2.0.35 - unchecked 25apr11, site down
   http://www.boutell.com/gd/
   https://bitbucket.org/pierrejoye/gd-libgd/overview
 
-graphite 2.4 - checked 27apr12
+graphite 2.4 - checked 2may12
   the directory silgraphite/engine/ from
   http://scripts.sil.org/svn-public/graphite/graphite/trunk
-  (svn r1306 2012-04-26 13:45:28 UTC).
+  (svn r1312 2012-05-01 20:27:08 UTC).
 
 icu 49.1 (49.1 release) - http://download.icu-project.org/files/icu4c/
   with modifications required for xetex, also used by bibtexu
@@ -42,7 +42,7 @@ t1lib 5.1.2 - checked 25apr11
 
 teckit 2.5.3 - checked 17mar12
   http://scripts.sil.org/svn-public/teckit/TRUNK
-  (svn r1250 2012-03-1419:45:41 UTC).
+  (svn r1250 2012-03-14 19:45:41 UTC).
 
 xpdf 3.03 - ftp://ftp.foolabs.com/pub/xpdf/
   with modifications for pdftex
diff --git a/Build/source/libs/graphite/engine-2.4-PATCHES/ChangeLog b/Build/source/libs/graphite/engine-2.4-PATCHES/ChangeLog
index c62b7c5a433..002fb3feea1 100644
--- a/Build/source/libs/graphite/engine-2.4-PATCHES/ChangeLog
+++ b/Build/source/libs/graphite/engine-2.4-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-11-svn_r1308_1312 (new): Update from SVN r1306 -> 1312.
+	(svn r1312 2012-05-01 20:27:08 UTC).
+
 2012-04-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-10-svn_r1250_1308 (new): Update from SVN r1250 -> 1306.
diff --git a/Build/source/libs/graphite/engine-2.4-PATCHES/patch-11-svn_r1308_1312 b/Build/source/libs/graphite/engine-2.4-PATCHES/patch-11-svn_r1308_1312
new file mode 100644
index 00000000000..ba19bf052c8
--- /dev/null
+++ b/Build/source/libs/graphite/engine-2.4-PATCHES/patch-11-svn_r1308_1312
@@ -0,0 +1,101 @@
+diff -ur engine-2.4.orig/src/segment/GrTableManager.h engine-2.4/src/segment/GrTableManager.h
+--- engine-2.4.orig/src/segment/GrTableManager.h	2010-05-21 17:41:28.000000000 +0200
++++ engine-2.4/src/segment/GrTableManager.h	2012-05-02 15:41:41.000000000 +0200
+@@ -489,6 +489,7 @@
+ 	void LogInTable(std::ostream & strmOut, int n);
+ 	void LogInTable(std::ostream & strmOut, float n);
+ 	void LogHexInTable(std::ostream & strmOut, gid16 chw, bool fPlus = false);
++	void LogDecimalInTable(std::ostream & strmOut, utf16 chw);
+ 	void LogDirCodeInTable(std::ostream & strmOut, int dirc);
+ 	void LogBreakWeightInTable(std::ostream & strmOut, int lb);
+ #endif // TRACING
+diff -ur engine-2.4.orig/src/segment/TransductionLog.cpp engine-2.4/src/segment/TransductionLog.cpp
+--- engine-2.4.orig/src/segment/TransductionLog.cpp	2012-03-14 20:45:41.000000000 +0100
++++ engine-2.4/src/segment/TransductionLog.cpp	2012-05-02 15:41:41.000000000 +0200
+@@ -1221,7 +1221,8 @@
+ 
+ 	int ccomp = 0;
+ 
+-	strmOut << "Glyph IDs:     ";
++	strmOut << "Glyph IDs      ";
++	strmOut << "      - hex    ";
+ 	int islout;
+ 	for (islout = 0; islout < m_cslout; islout++)
+ 	{
+@@ -1233,6 +1234,23 @@
+ 		}
+ 		else
+ 		{
++			ptman->LogDecimalInTable(strmOut, psloutTmp->GlyphID());
++			ccomp = max(ccomp, psloutTmp->NumberOfComponents());
++		}
++	}
++	strmOut << "\n";
++
++	strmOut << "        hex   ";
++	for (islout = 0; islout < m_cslout; islout++)
++	{
++		GrSlotOutput * psloutTmp = m_prgslout + islout;
++		if (psloutTmp->SpecialSlotFlag() == kspslLbInitial ||
++			psloutTmp->SpecialSlotFlag() == kspslLbFinal)
++		{
++			strmOut << ".      ";
++		}
++		else
++		{
+ 			ptman->LogHexInTable(strmOut, psloutTmp->GlyphID());
+ 			ccomp = max(ccomp, psloutTmp->NumberOfComponents());
+ 		}
+@@ -1459,7 +1477,7 @@
+ ----------------------------------------------------------------------------------------------*/
+ void GrTableManager::LogSlotGlyphs(std::ostream & strmOut, GrSlotStream * psstrm)
+ {
+-	strmOut << "Glyph IDs:     ";
++	strmOut << "Glyph IDs      ";
+ 	int islot;
+ 	for (islot = 0; islot < psstrm->WritePos(); islot++)
+ 	{
+@@ -1467,6 +1485,17 @@
+ 		if (pslotTmp->IsLineBreak(LBGlyphID()))
+ 			strmOut << "#      ";
+ 		else
++			LogDecimalInTable(strmOut, pslotTmp->GlyphID());
++	}
++	strmOut << "\n";
++
++	strmOut << "      - hex    ";
++	for (islot = 0; islot < psstrm->WritePos(); islot++)
++	{
++		GrSlotState * pslotTmp = psstrm->SlotAt(islot);
++		if (pslotTmp->IsLineBreak(LBGlyphID()))
++			strmOut << ".      ";
++		else
+ 			LogHexInTable(strmOut, pslotTmp->GlyphID());
+ 	}
+ 	strmOut << "\n";
+@@ -2117,6 +2146,25 @@
+ }
+ 
+ /*----------------------------------------------------------------------------------------------
++	Write a decimal value (a glyphID or Unicode codepoint) into the table.
++----------------------------------------------------------------------------------------------*/
++void GrTableManager::LogDecimalInTable(std::ostream & strmOut, utf16 chw)
++{
++	//char rgch[20];
++	int nSp = SP_PER_SLOT - 6;
++	if (chw < 100000) nSp++;
++	if (chw < 10000) nSp++;
++	if (chw < 1000) nSp++;
++	if (chw < 100) nSp++;
++	if (chw < 10) nSp++;
++    
++	strmOut << std::dec << chw;
++
++	for (int i = 0; i < nSp; i++)
++		strmOut << " ";
++}
++
++/*----------------------------------------------------------------------------------------------
+ 	Write a directionality code to the table.
+ ----------------------------------------------------------------------------------------------*/
+ void GrTableManager::LogDirCodeInTable(std::ostream & strmOut, int dirc)
diff --git a/Build/source/libs/graphite/engine-2.4/src/segment/GrTableManager.h b/Build/source/libs/graphite/engine-2.4/src/segment/GrTableManager.h
index 7cc697539d8..dae86151c50 100644
--- a/Build/source/libs/graphite/engine-2.4/src/segment/GrTableManager.h
+++ b/Build/source/libs/graphite/engine-2.4/src/segment/GrTableManager.h
@@ -489,6 +489,7 @@ public:
 	void LogInTable(std::ostream & strmOut, int n);
 	void LogInTable(std::ostream & strmOut, float n);
 	void LogHexInTable(std::ostream & strmOut, gid16 chw, bool fPlus = false);
+	void LogDecimalInTable(std::ostream & strmOut, utf16 chw);
 	void LogDirCodeInTable(std::ostream & strmOut, int dirc);
 	void LogBreakWeightInTable(std::ostream & strmOut, int lb);
 #endif // TRACING
diff --git a/Build/source/libs/graphite/engine-2.4/src/segment/TransductionLog.cpp b/Build/source/libs/graphite/engine-2.4/src/segment/TransductionLog.cpp
index 7876083c5a0..273fbb12b55 100644
--- a/Build/source/libs/graphite/engine-2.4/src/segment/TransductionLog.cpp
+++ b/Build/source/libs/graphite/engine-2.4/src/segment/TransductionLog.cpp
@@ -1221,7 +1221,8 @@ void Segment::LogSurfaceToUnderlying(GrTableManager *, std::ostream &)
 
 	int ccomp = 0;
 
-	strmOut << "Glyph IDs:     ";
+	strmOut << "Glyph IDs      ";
+	strmOut << "      - hex    ";
 	int islout;
 	for (islout = 0; islout < m_cslout; islout++)
 	{
@@ -1233,6 +1234,23 @@ void Segment::LogSurfaceToUnderlying(GrTableManager *, std::ostream &)
 		}
 		else
 		{
+			ptman->LogDecimalInTable(strmOut, psloutTmp->GlyphID());
+			ccomp = max(ccomp, psloutTmp->NumberOfComponents());
+		}
+	}
+	strmOut << "\n";
+
+	strmOut << "        hex   ";
+	for (islout = 0; islout < m_cslout; islout++)
+	{
+		GrSlotOutput * psloutTmp = m_prgslout + islout;
+		if (psloutTmp->SpecialSlotFlag() == kspslLbInitial ||
+			psloutTmp->SpecialSlotFlag() == kspslLbFinal)
+		{
+			strmOut << ".      ";
+		}
+		else
+		{
 			ptman->LogHexInTable(strmOut, psloutTmp->GlyphID());
 			ccomp = max(ccomp, psloutTmp->NumberOfComponents());
 		}
@@ -1459,7 +1477,7 @@ void GrTableManager::LogSlotHeader(std::ostream & strmOut, int islotLim,
 ----------------------------------------------------------------------------------------------*/
 void GrTableManager::LogSlotGlyphs(std::ostream & strmOut, GrSlotStream * psstrm)
 {
-	strmOut << "Glyph IDs:     ";
+	strmOut << "Glyph IDs      ";
 	int islot;
 	for (islot = 0; islot < psstrm->WritePos(); islot++)
 	{
@@ -1467,6 +1485,17 @@ void GrTableManager::LogSlotGlyphs(std::ostream & strmOut, GrSlotStream * psstrm
 		if (pslotTmp->IsLineBreak(LBGlyphID()))
 			strmOut << "#      ";
 		else
+			LogDecimalInTable(strmOut, pslotTmp->GlyphID());
+	}
+	strmOut << "\n";
+
+	strmOut << "      - hex    ";
+	for (islot = 0; islot < psstrm->WritePos(); islot++)
+	{
+		GrSlotState * pslotTmp = psstrm->SlotAt(islot);
+		if (pslotTmp->IsLineBreak(LBGlyphID()))
+			strmOut << ".      ";
+		else
 			LogHexInTable(strmOut, pslotTmp->GlyphID());
 	}
 	strmOut << "\n";
@@ -2117,6 +2146,25 @@ void GrTableManager::LogHexInTable(std::ostream & strmOut, utf16 chw, bool fPlus
 }
 
 /*----------------------------------------------------------------------------------------------
+	Write a decimal value (a glyphID or Unicode codepoint) into the table.
+----------------------------------------------------------------------------------------------*/
+void GrTableManager::LogDecimalInTable(std::ostream & strmOut, utf16 chw)
+{
+	//char rgch[20];
+	int nSp = SP_PER_SLOT - 6;
+	if (chw < 100000) nSp++;
+	if (chw < 10000) nSp++;
+	if (chw < 1000) nSp++;
+	if (chw < 100) nSp++;
+	if (chw < 10) nSp++;
+    
+	strmOut << std::dec << chw;
+
+	for (int i = 0; i < nSp; i++)
+		strmOut << " ";
+}
+
+/*----------------------------------------------------------------------------------------------
 	Write a directionality code to the table.
 ----------------------------------------------------------------------------------------------*/
 void GrTableManager::LogDirCodeInTable(std::ostream & strmOut, int dirc)
diff --git a/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog
index 24b9b95fcab..ed0afbeae9a 100644
--- a/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog
+++ b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog
@@ -2,7 +2,7 @@
 
 	Imported TECkit-2.5.3 source tree (teckit) from
 	http://scripts.sil.org/svn-public/teckit/TRUNK
-	(svn r1250 2012-03-1419:45:41 UTC).
+	(svn r1250 2012-03-14 19:45:41 UTC).
 
 	* patch-01-debian-505693, patch-04-case-sensitive (removed):
 	Now in source tree.