summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2008-03-18 11:29:11 +0000
committerJonathan Kew <jfkthame@googlemail.com>2008-03-18 11:29:11 +0000
commite6ec1b262f620654ab18ec493473866194080079 (patch)
tree96f1c79655f09feefe012388149d670ed3c2cf42 /Build/source/libs
parentbe6594e3fde462123c2cb1d146b471e5df1ea019 (diff)
more graphite updates
git-svn-id: svn://tug.org/texlive/trunk@7011 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/graphite-engine/aclocal.m416
-rwxr-xr-xBuild/source/libs/graphite-engine/configure80
-rw-r--r--Build/source/libs/graphite-engine/include/graphite/Segment.h4
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrCharStream.h2
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrEngine.cpp10
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrFSM.cpp2
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrFeature.cpp1
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrPass.h5
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrSlotState.h7
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp38
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrTableManager.h20
-rw-r--r--Build/source/libs/graphite-engine/src/segment/Segment.cpp4
-rw-r--r--Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp14
-rw-r--r--Build/source/libs/graphite-engine/src/segment/XmlTransductionLog.cpp632
-rw-r--r--Build/source/libs/graphite-engine/test/RegressionTest/RegressionTest.cpp3
-rw-r--r--Build/source/libs/graphite-engine/test/RegressionTest/TestCase.cpp17
16 files changed, 376 insertions, 479 deletions
diff --git a/Build/source/libs/graphite-engine/aclocal.m4 b/Build/source/libs/graphite-engine/aclocal.m4
index 6dec2e352f7..c592786cc3e 100644
--- a/Build/source/libs/graphite-engine/aclocal.m4
+++ b/Build/source/libs/graphite-engine/aclocal.m4
@@ -1895,16 +1895,12 @@ esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- AC_MSG_NOTICE([overriding sys_lib_search_path_spec with])
- AC_MSG_NOTICE([ predefined value: $sys_lib_search_path_spec])
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
- AC_MSG_NOTICE([overriding sys_lib_dlsearch_path_spec with])
- AC_MSG_NOTICE([ predefined value: $sys_lib_dlsearch_path_spec])
-fi
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
diff --git a/Build/source/libs/graphite-engine/configure b/Build/source/libs/graphite-engine/configure
index aaf534eab16..211f3f36dea 100755
--- a/Build/source/libs/graphite-engine/configure
+++ b/Build/source/libs/graphite-engine/configure
@@ -9844,20 +9844,20 @@ echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- { echo "$as_me:$LINENO: overriding sys_lib_search_path_spec with" >&5
-echo "$as_me: overriding sys_lib_search_path_spec with" >&6;}
- { echo "$as_me:$LINENO: predefined value: $sys_lib_search_path_spec" >&5
-echo "$as_me: predefined value: $sys_lib_search_path_spec" >&6;}
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
- { echo "$as_me:$LINENO: overriding sys_lib_dlsearch_path_spec with" >&5
-echo "$as_me: overriding sys_lib_dlsearch_path_spec with" >&6;}
- { echo "$as_me:$LINENO: predefined value: $sys_lib_dlsearch_path_spec" >&5
-echo "$as_me: predefined value: $sys_lib_dlsearch_path_spec" >&6;}
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -13807,20 +13807,20 @@ echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- { echo "$as_me:$LINENO: overriding sys_lib_search_path_spec with" >&5
-echo "$as_me: overriding sys_lib_search_path_spec with" >&6;}
- { echo "$as_me:$LINENO: predefined value: $sys_lib_search_path_spec" >&5
-echo "$as_me: predefined value: $sys_lib_search_path_spec" >&6;}
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
- { echo "$as_me:$LINENO: overriding sys_lib_dlsearch_path_spec with" >&5
-echo "$as_me: overriding sys_lib_dlsearch_path_spec with" >&6;}
- { echo "$as_me:$LINENO: predefined value: $sys_lib_dlsearch_path_spec" >&5
-echo "$as_me: predefined value: $sys_lib_dlsearch_path_spec" >&6;}
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -16428,20 +16428,20 @@ echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- { echo "$as_me:$LINENO: overriding sys_lib_search_path_spec with" >&5
-echo "$as_me: overriding sys_lib_search_path_spec with" >&6;}
- { echo "$as_me:$LINENO: predefined value: $sys_lib_search_path_spec" >&5
-echo "$as_me: predefined value: $sys_lib_search_path_spec" >&6;}
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
- { echo "$as_me:$LINENO: overriding sys_lib_dlsearch_path_spec with" >&5
-echo "$as_me: overriding sys_lib_dlsearch_path_spec with" >&6;}
- { echo "$as_me:$LINENO: predefined value: $sys_lib_dlsearch_path_spec" >&5
-echo "$as_me: predefined value: $sys_lib_dlsearch_path_spec" >&6;}
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -19049,20 +19049,20 @@ echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- { echo "$as_me:$LINENO: overriding sys_lib_search_path_spec with" >&5
-echo "$as_me: overriding sys_lib_search_path_spec with" >&6;}
- { echo "$as_me:$LINENO: predefined value: $sys_lib_search_path_spec" >&5
-echo "$as_me: predefined value: $sys_lib_search_path_spec" >&6;}
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
- { echo "$as_me:$LINENO: overriding sys_lib_dlsearch_path_spec with" >&5
-echo "$as_me: overriding sys_lib_dlsearch_path_spec with" >&6;}
- { echo "$as_me:$LINENO: predefined value: $sys_lib_dlsearch_path_spec" >&5
-echo "$as_me: predefined value: $sys_lib_dlsearch_path_spec" >&6;}
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
diff --git a/Build/source/libs/graphite-engine/include/graphite/Segment.h b/Build/source/libs/graphite-engine/include/graphite/Segment.h
index 04c510e3488..41443c27f53 100644
--- a/Build/source/libs/graphite-engine/include/graphite/Segment.h
+++ b/Build/source/libs/graphite-engine/include/graphite/Segment.h
@@ -323,6 +323,10 @@ public:
void LogUnderlyingToSurface(GrTableManager * ptman, std::ostream & strmOut,
GrCharStream * pchstrm);
void LogSurfaceToUnderlying(GrTableManager * ptman, std::ostream & strmOut);
+ void LogXmlUnderlyingToSurface(std::ostream & strmOut, GrTableManager * ptman,
+ GrCharStream * pchstrm, int nIndent);
+ void LogXmlSurfaceToUnderlying(std::ostream & strmOut, GrTableManager * ptman,
+ GrCharStream * pchstrm, int nIndent);
// calculate memory usage
void calculateMemoryUsage(SegmentMemoryUsage & smu);
diff --git a/Build/source/libs/graphite-engine/src/segment/GrCharStream.h b/Build/source/libs/graphite-engine/src/segment/GrCharStream.h
index bb91cf54eba..892435d376e 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrCharStream.h
+++ b/Build/source/libs/graphite-engine/src/segment/GrCharStream.h
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------*//*:Ignore this sentence.
-Copyright (C) 1999, 2001 SIL International. All rights reserved.
+Copyright (C) 1999 - 2008 SIL International. All rights reserved.
Distributable under the terms of either the Common Public License or the
GNU Lesser General Public License, as specified in the LICENSING.txt file.
diff --git a/Build/source/libs/graphite-engine/src/segment/GrEngine.cpp b/Build/source/libs/graphite-engine/src/segment/GrEngine.cpp
index 1f1e51eaf23..0fda68df880 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrEngine.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/GrEngine.cpp
@@ -606,32 +606,26 @@ void GrEngine::MakeSegment(
// Find the end of the range to render with the current font.
int nDirDepth = 0;
- int ichFontLim;
+ int ichFontLim = FindFontLim(pgts, ichMin, &nDirDepth);
int ichStrmLim = 0;
int ichSegLim = 0;
switch (segmode)
{
case ksegmodeBreak: // find break point
- // Find the end of the range to render with the current font. Here ichLim should be
- // the end of the text-source, unless we're backtracking.
- ichFontLim = FindFontLim(pgts, ichMin, &nDirDepth);
+ // Here ichLim should be the end of the text-source, unless we're backtracking.
ichStrmLim = min(ichFontLim, ichLim);
ichSegLim = -1; // unknown
break;
case ksegmodeJust: // stretching an existing segment to achieve justification
- ichFontLim = FindFontLim(pgts, ichMin, &nDirDepth);
ichStrmLim = ichFontLim;
ichSegLim = ichLim;
break;
//case ksegmodeMms: // MakeMeasuredSegment
- // ichFontLim = FindFontLim(pgts, ichMin, ichLim, &nDirDepth);
// ichLim = ichFontLim;
// ichStrmLim = ichFontLim;
// ichSegLim = -1; // process to the end of the stream
// break;
case ksegmodeRange: // segment from range
- // Find the end of the range to render with the current font.
- ichFontLim = FindFontLim(pgts, ichMin, &nDirDepth);
ichLim = min(ichLim, ichFontLim);
ichStrmLim = ichFontLim;
ichSegLim = (ichLim == kPosInfinity) ? -1 : ichLim;
diff --git a/Build/source/libs/graphite-engine/src/segment/GrFSM.cpp b/Build/source/libs/graphite-engine/src/segment/GrFSM.cpp
index 7421cc037cc..53182edab0d 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrFSM.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/GrFSM.cpp
@@ -16,9 +16,7 @@ Description:
//:> Include files
//:>********************************************************************************************
#include "Main.h"
-
#include <cstring>
-
#ifdef _MSC_VER
#pragma hdrstop
#endif
diff --git a/Build/source/libs/graphite-engine/src/segment/GrFeature.cpp b/Build/source/libs/graphite-engine/src/segment/GrFeature.cpp
index c018ebf50b1..61970d56949 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrFeature.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/GrFeature.cpp
@@ -16,7 +16,6 @@ Description:
//:> Include files
//:>********************************************************************************************
#include "Main.h"
-
#include <cstring>
#ifdef _MSC_VER
diff --git a/Build/source/libs/graphite-engine/src/segment/GrPass.h b/Build/source/libs/graphite-engine/src/segment/GrPass.h
index 9ae4465cedf..d4d6a16a9dc 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrPass.h
+++ b/Build/source/libs/graphite-engine/src/segment/GrPass.h
@@ -87,7 +87,8 @@ public:
void LogInsertionsAndDeletions(std::ostream & strmOut, GrSlotStream * psstrmOut);
void LogXmlRules(std::ostream & strmOut, GrTableManager *, GrSlotStream * psstrmIn, int nIndent);
void LogXmlGlyphs(std::ostream & strmOut, GrTableManager * ptman, GrSlotStream * psstrmOut,
- int ipassJust1, bool fPreJust, bool fPostJust, bool fBidi, int nIndent);
+ int ipassJust1, bool fPreJust, bool fPostJust, bool fBidi, bool fBidiNext, int cslotsSkipped,
+ int nIndent);
#endif // TRACING
protected:
@@ -370,7 +371,7 @@ public:
void LogXmlRules(std::ostream & strmOut, GrTableManager * ptman,
GrSlotStream * psstrmIn, int nIndent);
void LogXmlGlyphs(std::ostream & strmOut, GrTableManager * ptman, GrSlotStream * psstrmOut,
- int ipassJust1, bool fPreJust, bool fPostJust, int nIndent);
+ int ipassJust1, bool fPreJust, bool fPostJust, int cslotsSkipped, int nIndent);
#endif // TRACING
protected:
diff --git a/Build/source/libs/graphite-engine/src/segment/GrSlotState.h b/Build/source/libs/graphite-engine/src/segment/GrSlotState.h
index 3b304c46540..d000927d1a4 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrSlotState.h
+++ b/Build/source/libs/graphite-engine/src/segment/GrSlotState.h
@@ -349,7 +349,7 @@ public:
{
if (i < 0)
return NULL;
- if (i > signed(m_vpslotAssoc.size()))
+ if (i >= signed(m_vpslotAssoc.size()))
return NULL;
GrSlotState * pslotAssoc = m_vpslotAssoc[i];
@@ -868,8 +868,9 @@ public:
bool fPreJust, bool fPostJust);
void LogAssociation(GrTableManager * ptman,
std::ostream & strmOut, int ipass, int iassoc, bool fBoth, bool fAfter);
- void LogXmlAttributes(std::ostream & strmOut, GrTableManager * ptman, int ipass, int islot,
- bool fPreJust, bool fPostJust, bool fBidi, int nIndent);
+ void LogXmlAttributes(std::ostream & strmOut, GrTableManager * ptman, GrSlotStream * psstrmOut,
+ int ipass, int islot,
+ bool fPreJust, bool fPostJust, bool fBidi, bool fBidiNext, int nIndent);
int GetSlotAttrValue(std::ostream & strmOut, GrTableManager * ptman,
int ipass, int slat, int iIndex, bool fPreJust, bool fPostJust);
int m_islotTmpIn; // for use by transduction log; index of slot in input stream
diff --git a/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp b/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp
index 78095bdc189..fde364e7e2e 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp
@@ -23,10 +23,10 @@ Description:
#endif
#undef THIS_FILE
DEFINE_THIS_FILE
-#ifndef _WIN32
+//#ifndef _WIN32
#include <stdlib.h>
#include <math.h>
-#endif
+//#endif
//:>********************************************************************************************
//:> Forward declarations
@@ -634,13 +634,16 @@ void GrTableManager::Run(Segment * psegNew, Font * pfont,
psegNew->FixTermination(est);
}
- // Do this before fixing up the associations below.
+ SetFinalPositions(psegNew, fWidthIsCharCount);
+
+ // Do this before fixing up the associations below, so we can see the raw ones produced by the
+ // rules themselves.
//if (m_pgreng->LoggingTransduction())
// WriteTransductionLog(pchstrm, *ppsegRet,
// cbPrev, pbPrevSegDat, pbNextSegDat, pcbNextSegDat);
WriteTransductionLog(pstrmLog, pchstrm, psegNew, cbPrev, pbPrevSegDat);
- RecordAssocsAndOutput(pfont, psegNew, fWidthIsCharCount, twsh, fParaRtl, nDirDepth);
+ RecordAssocsAndOutput(pfont, psegNew, twsh, fParaRtl, nDirDepth);
// Do this after fixing up the associations.
//if (m_pgreng->LoggingTransduction())
@@ -1331,21 +1334,11 @@ LBackupPC:
pseg->RecordInitializationForNextSeg(*pcbNextSegDat, pbNextSegDat);
}
-
/*----------------------------------------------------------------------------------------------
- Calculate the associations, and record the output slots in the segment.
+ Make sure the final positions are set for every glyph.
----------------------------------------------------------------------------------------------*/
-void GrTableManager::RecordAssocsAndOutput(Font * pfont,
- Segment * pseg, bool fWidthIsCharCount,
- TrWsHandling twsh, bool fParaRtl, int nDirDepth)
+void GrTableManager::SetFinalPositions(Segment * pseg, bool fWidthIsCharCount)
{
- int cchwUnderlying = pseg->stopCharacter() - pseg->startCharacter();
-
- GrSlotStream * psstrmFinal = OutputStream(m_cpass-1);
- int csloutSurface = psstrmFinal->WritePos() - psstrmFinal->IndexOffset(); // # of output slots
-
- psstrmFinal->SetNeutralAssociations(LBGlyphID());
-
float xsTotalWidth, xsVisWidth;
#ifdef OLD_TEST_STUFF
@@ -1358,6 +1351,19 @@ void GrTableManager::RecordAssocsAndOutput(Font * pfont,
CalcPositionsUpTo(m_cpass-1, reinterpret_cast<GrSlotState *>(NULL),
&xsTotalWidth, &xsVisWidth);
pseg->SetWidths(xsVisWidth, xsTotalWidth);
+}
+
+/*----------------------------------------------------------------------------------------------
+ Calculate the associations, and record the output slots in the segment.
+----------------------------------------------------------------------------------------------*/
+void GrTableManager::RecordAssocsAndOutput(Font * pfont, Segment * pseg,
+ TrWsHandling twsh, bool fParaRtl, int nDirDepth)
+{
+ int cchwUnderlying = pseg->stopCharacter() - pseg->startCharacter();
+ GrSlotStream * psstrmFinal = OutputStream(m_cpass-1);
+ int csloutSurface = psstrmFinal->WritePos() - psstrmFinal->IndexOffset(); // # of output slots
+
+ psstrmFinal->SetNeutralAssociations(LBGlyphID());
pseg->SetUpOutputArrays(pfont, this, psstrmFinal, cchwUnderlying, csloutSurface, LBGlyphID(),
twsh, fParaRtl, nDirDepth);
diff --git a/Build/source/libs/graphite-engine/src/segment/GrTableManager.h b/Build/source/libs/graphite-engine/src/segment/GrTableManager.h
index 4dd02bd021d..e0306c832c7 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrTableManager.h
+++ b/Build/source/libs/graphite-engine/src/segment/GrTableManager.h
@@ -453,17 +453,14 @@ public:
bool IsWhiteSpace(GrSlotState * pslot);
// For transduction logging:
- //bool WriteTransductionLog(GrCharStream * pchstrm, Segment * psegRet,
- // int cbPrev, byte * pbPrevSegDat, byte * pbNextSegDat, int * pcbNextSegDat);
- //bool WriteAssociationLog(GrCharStream * pchstrm, Segment * psegRet);
bool WriteTransductionLog(std::ostream * pstrmLog,
GrCharStream * pchstrm, Segment * psegRet, int cbPrevSetDat, byte * pbPrevSegDat);
bool WriteAssociationLog(std::ostream * pstrmLog,
GrCharStream * pchstrm, Segment * psegRet);
bool WriteXmlLog(std::ostream * pstrmLog,
GrCharStream * pchstrm, Segment * psegRet, int cbPrevSegDat, byte * pbPrevSegDat);
- //bool WriteXmlAssocLog(std::ostream * pstrmLog,
- // GrCharStream * pchstrm, Segment * psegRet);
+ bool WriteXmlAssocLog(std::ostream * pstrmLog,
+ GrCharStream * pchstrm, Segment * psegRet);
#ifdef TRACING
void WriteXductnLog(std::ostream & strmOut, GrCharStream * pchstrm, Segment * psegRet,
@@ -488,8 +485,10 @@ public:
void WriteXmlLogAux(std::ostream & strmOut,
GrCharStream * pchstrm, Segment * psegRet, int cbPrevSegDat, byte * pbPrevSegDat);
- void LogXmlUnderlying(std::ostream & strmOut, GrCharStream * pchstrm,
- int cchwBackup, size_t nIndent);
+ void LogXmlUnderlying(std::ostream & strmOut, GrCharStream * pchstrm, int cchwBackup, size_t nIndent);
+ void LogXmlUnderlyingAux(std::ostream & strmOut, GrCharStream * pchstrm,
+ int cch32Backup, int cch32Lim, size_t nIndent,
+ bool fLogText, bool fLogFeatures, bool fLogColor, bool fLogStrOff, bool fLogLig, bool fLogGlyphs);
void LogXmlPass(std::ostream & strmOut, int ipass, int cslotSkipped, int nIndent);
void LogXmlTagOpen(std::ostream & strmOut, std::string strTag, size_t nIndent, bool fContent);
@@ -502,6 +501,9 @@ public:
std::string HexString(std::vector<int>);
void LogXmlTagColor(std::ostream & strmOut, std::string strAttr, int clrValue, bool fBack,
size_t nIndent = 0);
+ void LogXmlDirCode(std::ostream & strmOut, std::string strAttr, int dircValue, size_t nIndent = 0);
+ void LogXmlBreakWeight(std::ostream & strmOut, std::string strAttr, int dircValue,
+ size_t nIndent = 0);
void LogXmlComment(std::ostream & strmOut, std::string strComment, size_t nIndent = 0);
#endif // TRACING
@@ -528,8 +530,8 @@ protected:
int islotStream0Break, int islotSurfaceBreak, LineBrk lbEnd,
bool fNextSegNeedsContext, GrCharStream * pchstrm);
- void RecordAssocsAndOutput(Font * pfont,
- Segment * pseg, bool fWidthIsCharCount,
+ void SetFinalPositions(Segment * pseg, bool fWidthIsCharCount);
+ void RecordAssocsAndOutput(Font * pfont, Segment * pseg,
TrWsHandling twsh, bool fParaRtl, int nDirDepth);
void CalculateAssociations(Segment * pseg, int csloutSurface);
diff --git a/Build/source/libs/graphite-engine/src/segment/Segment.cpp b/Build/source/libs/graphite-engine/src/segment/Segment.cpp
index db8f2bc8849..b936b037a64 100644
--- a/Build/source/libs/graphite-engine/src/segment/Segment.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/Segment.cpp
@@ -2969,6 +2969,10 @@ GrResult Segment::getUniscribeClusters(
return kresOk;
}
+
+// suppress GCC 4.3 warning for optimized min()/max() when called with (ich, ich+1) or similar
+#pragma GCC diagnostic ignored "-Wstrict-overflow"
+
/*----------------------------------------------------------------------------------------------
Merge the given characters into the same Uniscribe cluster. This means merging any
intervening characters as well.
diff --git a/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp b/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp
index 78e46b9b5fd..73273ae3feb 100644
--- a/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp
@@ -132,9 +132,6 @@ bool GrTableManager::WriteAssociationLog(std::ostream * pstrmLog,
return false;
std::ostream & strmOut = *pstrmLog;
- LogFinalPositions(strmOut);
-
- strmOut << "\n\n- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n\n";
psegRet->LogUnderlyingToSurface(this, strmOut, pchstrm);
psegRet->LogSurfaceToUnderlying(this, strmOut);
@@ -196,8 +193,9 @@ void GrTableManager::WriteXductnLog(std::ostream & strmOut,
LogPassOutput(strmOut, ipass, *(pbPrevSegDat + 4 + ipass));
}
- // Do this later, after outputting final positions:
- //strmOut << "\n\n- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n\n";
+ LogFinalPositions(strmOut);
+
+ strmOut << "\n\n- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n\n";
}
/*----------------------------------------------------------------------------------------------
@@ -733,8 +731,8 @@ void GrTableManager::LogAttributes(std::ostream & strmOut, int ipass,
// Figure out which slot attributes were modified for some slot during the pass.
bool * prgfMods = new bool[kslatMax + NumUserDefn() - 1];
- bool fPreJust = (!fJustWidths && ipass == m_ipassJust1 - 1 && ShouldLogJustification());
- bool fPostJust = ((fJustWidths || ipass == m_ipassJust1) && ShouldLogJustification());
+ bool fPreJust = (!fJustWidths && ipass == m_ipassJust1 - 1 && ShouldLogJustification());
+ bool fPostJust = ((fJustWidths || ipass == m_ipassJust1) && ShouldLogJustification());
int ccomp; // max number of components per slot
int cassoc; // max number of associations per slot
@@ -957,7 +955,7 @@ void GrTableManager::LogFinalPositions(std::ostream & strmOut)
}
strmOut << "\n";
}
-#endif
+#endif // TRACING
/*----------------------------------------------------------------------------------------------
Write out the final underlying-to-surface associations.
diff --git a/Build/source/libs/graphite-engine/src/segment/XmlTransductionLog.cpp b/Build/source/libs/graphite-engine/src/segment/XmlTransductionLog.cpp
index f29cfb6bcc6..d0dfcaafbe8 100644
--- a/Build/source/libs/graphite-engine/src/segment/XmlTransductionLog.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/XmlTransductionLog.cpp
@@ -50,31 +50,6 @@ namespace gr
/*----------------------------------------------------------------------------------------------
Output a file showing a log of the transduction process and the resulting segment.
----------------------------------------------------------------------------------------------*/
-//bool GrTableManager::WriteTransductionLog(GrCharStream * pchstrm, Segment * psegRet,
-// int cbPrevSegDat, byte * pbPrevSegDat, byte * pbNextSegDat, int * pcbNextSegDat)
-//{
-//#ifdef TRACING
-// std::string staFile;
-// if (!LogFileName(staFile))
-// return false;
-//
-// std::ofstream strmOut;
-// if (cbPrevSegDat > 0)
-// strmOut.open(staFile.c_str(), std::ios::app); // append
-// else
-// strmOut.open(staFile.c_str());
-// if (strmOut.fail())
-// return false;
-//
-// WriteXductnLog(strmOut, pchstrm, psegRet, cbPrevSegDat, pbPrevSegDat);
-//
-// strmOut.close();
-// return true;
-//#else
-// return false;
-//#endif // TRACING
-//}
-
bool GrTableManager::WriteXmlLog(std::ostream * pstrmLog,
GrCharStream * pchstrm, Segment * psegRet, int cbPrevSegDat, byte * pbPrevSegDat)
{
@@ -89,42 +64,8 @@ bool GrTableManager::WriteXmlLog(std::ostream * pstrmLog,
#endif // TRACING
}
-/*----------------------------------------------------------------------------------------------
- Append to the file, showing the surface/underlying mappings. This must be done after
- figuring out all the associations.
-
- Also write the final glyph positions, since they are now determined.
-----------------------------------------------------------------------------------------------*/
-//bool GrTableManager::WriteAssociationLog(GrCharStream * pchstrm, Segment * psegRet)
-//{
-//#ifdef TRACING
-// std::string staFile;
-// if (!LogFileName(staFile))
-// return false;
-//
-// std::ofstream strmOut;
-// strmOut.open(staFile.c_str(), std::ios::app); // append
-// if (strmOut.fail())
-// return false;
-//
-// LogFinalPositions(strmOut);
-//
-// strmOut << "\n\n- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n\n";
-//
-// psegRet->LogUnderlyingToSurface(this, strmOut, pchstrm);
-// psegRet->LogSurfaceToUnderlying(this, strmOut);
-//
-// strmOut << "\n\n=======================================================================\n\n";
-//
-// strmOut.close();
-// return true;
-//#else
-// return false;
-//#endif // TRACING
-//}
-#ifdef XMLOMIT
-bool GrTableManager::WriteAssociationLog(std::ostream * pstrmLog,
+bool GrTableManager::WriteXmlAssocLog(std::ostream * pstrmLog,
GrCharStream * pchstrm, Segment * psegRet)
{
#ifdef TRACING
@@ -134,19 +75,22 @@ bool GrTableManager::WriteAssociationLog(std::ostream * pstrmLog,
std::ostream & strmOut = *pstrmLog;
LogFinalPositions(strmOut);
- strmOut << "\n\n- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n\n";
+ LogXmlTagOpen(strmOut, "Mappings", 1, true);
+ LogXmlTagPostAttrs(strmOut, true);
- psegRet->LogUnderlyingToSurface(this, strmOut, pchstrm);
- psegRet->LogSurfaceToUnderlying(this, strmOut);
+ //psegRet->LogXmlUnderlyingToSurface(strmOut, this, pchstrm, 2);
+ //psegRet->LogXmlSurfaceToUnderlying(strmOut, this, 2);
- strmOut << "\n\n=======================================================================\n\n";
+ LogXmlTagClose(strmOut, "Mappings", 1, true);
+
+ strmOut << "\n";
+ LogXmlTagClose(strmOut, "GraphiteTraceLog", 0, true);
return true;
#else
return false;
#endif // TRACING
}
-#endif // XMLOMIT
#ifdef TRACING
@@ -190,7 +134,9 @@ void GrTableManager::WriteXmlLogAux(std::ostream & strmOut,
LogXmlTagClose(strmOut, "SegmentRun", 1, true);
strmOut << "\n";
- LogXmlTagClose(strmOut, "GraphiteTraceLog", 0, true);
+
+ // Don't do this until after we've logged the associations.
+ //LogXmlTagClose(strmOut, "GraphiteTraceLog", 0, true);
}
/*----------------------------------------------------------------------------------------------
@@ -202,15 +148,32 @@ void GrTableManager::LogXmlUnderlying(std::ostream & strmOut, GrCharStream * pch
LogXmlTagOpen(strmOut, "Input", nIndent, true);
LogXmlTagPostAttrs(strmOut, true);
+ LogXmlUnderlyingAux(strmOut, pchstrm, cchwBackup, -1, nIndent,
+ true, // text
+ true, // features
+ true, // color
+ false, // string offset
+ false, // ligature components
+ false); // glyph associations
+
+ LogXmlTagClose(strmOut, "Input", nIndent, true);
+}
+
+void GrTableManager::LogXmlUnderlyingAux(std::ostream & strmOut, GrCharStream * pchstrm,
+ int cch32Backup, int cch32Lim, size_t nIndent,
+ bool fLogText, bool fLogFeatures, bool fLogColor, bool fLogStrOff, bool fLogLig, bool fLogGlyphs)
+{
int rgnChars[MAX_SLOTS];
bool rgfNewRun[MAX_SLOTS];
std::fill_n(rgfNewRun, MAX_SLOTS, false);
GrFeatureValues rgfval[MAX_SLOTS];
int cchwMaxRawChars;
- int cnUtf32 = pchstrm->GetLogData(this, rgnChars, rgfNewRun, rgfval,
- cchwBackup, &cchwMaxRawChars);
- cnUtf32 = min(cnUtf32, MAX_SLOTS);
+ int cch32 = pchstrm->GetLogData(this, rgnChars, rgfNewRun, rgfval,
+ cch32Backup, &cchwMaxRawChars);
+ cch32 = min(cch32, MAX_SLOTS);
+ if (cch32Lim > -1)
+ cch32 = min(cch32Lim, cch32);
int ichw;
@@ -221,20 +184,20 @@ void GrTableManager::LogXmlUnderlying(std::ostream & strmOut, GrCharStream * pch
utf16 rgchwChars4[MAX_SLOTS];
utf16 rgchwChars5[MAX_SLOTS];
utf16 rgchwChars6[MAX_SLOTS];
- utf16 rgiRawString[MAX_SLOTS];
+ utf16 rgiRawString[MAX_SLOTS]; // indices from underlying slots to text-source chars (0-based)
int rgichwRaw[MAX_SLOTS]; // index of input char with in the given UTF32, 1-based
if (cchwMaxRawChars > 1)
{
cchwMaxRawChars = min(cchwMaxRawChars, 6); // max of 6 raw (UTF-8 or UTF-16) chars per slot
- pchstrm->GetLogDataRaw(this, cnUtf32, cchwBackup, cchwMaxRawChars,
+ pchstrm->GetLogDataRaw(this, cch32, cch32Backup, cchwMaxRawChars,
rgchwChars1, rgchwChars2, rgchwChars3, rgchwChars4, rgchwChars5, rgchwChars6,
rgichwRaw);
}
else
{
- for (ichw = 0; ichw < cnUtf32; ichw++)
+ for (ichw = 0; ichw < cch32; ichw++)
{
rgichwRaw[ichw] = 1;
rgchwChars1[ichw] = rgnChars[ichw];
@@ -248,7 +211,7 @@ void GrTableManager::LogXmlUnderlying(std::ostream & strmOut, GrCharStream * pch
int ichUtf32 = 0;
ichw = 0;
- while (ichUtf32 < cnUtf32)
+ while (ichUtf32 < cch32)
{
if (rgichwRaw[ichw] == 1)
{
@@ -258,7 +221,7 @@ void GrTableManager::LogXmlUnderlying(std::ostream & strmOut, GrCharStream * pch
}
int ichwFeat = 0;
- for (ichw = 0; ichw < cnUtf32; ichw++)
+ for (ichw = 0; ichw < cch32; ichw++)
{
if (rgfNewRun[ichw])
ichwFeat = ichw; // because rgfval only saves features for first of run
@@ -266,7 +229,7 @@ void GrTableManager::LogXmlUnderlying(std::ostream & strmOut, GrCharStream * pch
// See if there are any features.
bool fFeatures = false;
size_t ifeat;
- for (ifeat = 0; ifeat < kMaxFeatures; ifeat++)
+ for (ifeat = 0; fLogFeatures && ifeat < kMaxFeatures; ifeat++)
{
if (rgfval[ichwFeat].FeatureValue(ifeat) != 0)
{
@@ -274,30 +237,39 @@ void GrTableManager::LogXmlUnderlying(std::ostream & strmOut, GrCharStream * pch
break;
}
}
- LogXmlTagOpen(strmOut, "Char", nIndent+1, fFeatures);
- LogXmlTagAttr(strmOut, "index", rgiRawString[ichw], 0);
+ bool fContent = fFeatures;
+
+ LogXmlTagOpen(strmOut, "Char", nIndent+1, fContent);
+
+ LogXmlTagAttr(strmOut, "index", rgiRawString[ichw] - cch32Backup, 0);
LogXmlTagAttrHex(strmOut, "usv", rgnChars[ichw], 0);
- char rgch[20];
- rgch[0] = (char)rgnChars[ichw];
- rgch[1] = 0;
- if (rgnChars[ichw] < 0x0100 && rgchwChars2[ichw] == 0) // ANSI
- LogXmlTagAttr(strmOut, "text", rgch);
- else if (rgnChars[ichw] == knLRM)
- LogXmlTagAttr(strmOut, "text", "<LRM>");
- else if (rgnChars[ichw] == knRLM)
- LogXmlTagAttr(strmOut, "text", "<RLM>");
- else if (rgnChars[ichw] == knLRO)
- LogXmlTagAttr(strmOut, "text", "<LRO>");
- else if (rgnChars[ichw] == knRLO)
- LogXmlTagAttr(strmOut, "text", "<RLO>");
- else if (rgnChars[ichw] == knLRE)
- LogXmlTagAttr(strmOut, "text", "<LRE>");
- else if (rgnChars[ichw] == knRLE)
- LogXmlTagAttr(strmOut, "text", "<RLE>");
- else if (rgnChars[ichw] == knPDF)
- LogXmlTagAttr(strmOut, "text", "<PDF>");
+ if (fLogText)
+ {
+ char rgch[20];
+ rgch[0] = (char)rgnChars[ichw];
+ rgch[1] = 0;
+ if (rgnChars[ichw] < 0x0100 && rgchwChars2[ichw] == 0) // ANSI
+ LogXmlTagAttr(strmOut, "text", rgch);
+ else if (rgnChars[ichw] == knLRM)
+ LogXmlTagAttr(strmOut, "text", "<LRM>");
+ else if (rgnChars[ichw] == knRLM)
+ LogXmlTagAttr(strmOut, "text", "<RLM>");
+ else if (rgnChars[ichw] == knLRO)
+ LogXmlTagAttr(strmOut, "text", "<LRO>");
+ else if (rgnChars[ichw] == knRLO)
+ LogXmlTagAttr(strmOut, "text", "<RLO>");
+ else if (rgnChars[ichw] == knLRE)
+ LogXmlTagAttr(strmOut, "text", "<LRE>");
+ else if (rgnChars[ichw] == knRLE)
+ LogXmlTagAttr(strmOut, "text", "<RLE>");
+ else if (rgnChars[ichw] == knPDF)
+ LogXmlTagAttr(strmOut, "text", "<PDF>");
+ }
+
+ if (fLogStrOff)
+ LogXmlTagAttr(strmOut, "stringOffset", pchstrm->Min() + rgiRawString[ichw] - cch32Backup, 0);
if (rgchwChars2[ichw] != 0)
{
@@ -309,54 +281,65 @@ void GrTableManager::LogXmlUnderlying(std::ostream & strmOut, GrCharStream * pch
LogXmlTagAttr(strmOut, "textSourceUtf16", strHex.c_str());
}
- IColorTextSource * tscolor = dynamic_cast<IColorTextSource *>(pchstrm->TextSrc());
- if (tscolor)
+ if (fLogColor)
+ {
+ IColorTextSource * tscolor = dynamic_cast<IColorTextSource *>(pchstrm->TextSrc());
+ if (tscolor)
+ {
+ int clrFore, clrBack;
+ tscolor->getColors(ichw, &clrFore, &clrBack);
+ LogXmlTagColor(strmOut, "color", clrFore, false);
+ LogXmlTagColor(strmOut, "background", clrBack, true);
+ }
+ }
+
+ if (fLogLig)
{
- int clrFore, clrBack;
- tscolor->getColors(ichw, &clrFore, &clrBack);
- LogXmlTagColor(strmOut, "color", clrFore, false);
- LogXmlTagColor(strmOut, "background", clrBack, true);
+
}
- LogXmlTagPostAttrs(strmOut, fFeatures);
+//if (fLogLig || fLogGlyphs)
+//{
+// size_t cassocs = 0;
+// int fLigs = false;
+// int ichw;
+// for (ichw = 0; ichw < (m_ichwAssocsLim - m_ichwAssocsMin); ichw++)
+// {
+// if (m_prgpvisloutAssocs[ichw])
+// cassocs = max(cassocs, m_prgpvisloutAssocs[ichw]->size());
+// if (m_prgisloutLigature[ichw] != kNegInfinity)
+// fLigs = true;
+// }
+//}
+
+ LogXmlTagPostAttrs(strmOut, fContent);
- for (ifeat = 0; ifeat < kMaxFeatures; ifeat++)
+ if (fLogFeatures)
{
- if (rgfval[ichwFeat].FeatureValue(ifeat) != 0)
+ for (ifeat = 0; ifeat < kMaxFeatures; ifeat++)
{
- GrFeature * pfeat = Feature(ifeat);
+ if (rgfval[ichwFeat].FeatureValue(ifeat) != 0)
+ {
+ GrFeature * pfeat = Feature(ifeat);
- LogXmlTagOpen(strmOut, "Feature", nIndent+2, false);
- LogXmlTagAttr(strmOut, "id", pfeat->ID());
- LogXmlTagAttr(strmOut, "value", rgfval[ichwFeat].FeatureValue(ifeat));
- //LogXmlTagPostAttrs(strmOut, false);
- LogXmlTagClose(strmOut, "Feature", nIndent+1, false);
+ LogXmlTagOpen(strmOut, "Feature", nIndent+2, false);
+ LogXmlTagAttr(strmOut, "id", pfeat->ID());
+ LogXmlTagAttr(strmOut, "value", rgfval[ichwFeat].FeatureValue(ifeat));
+ //LogXmlTagPostAttrs(strmOut, false);
+ LogXmlTagClose(strmOut, "Feature", nIndent+1, false);
+ }
}
}
- LogXmlTagClose(strmOut, "Char", nIndent+1, fFeatures);
- }
+ if (fLogGlyphs)
+ {
+ }
- LogXmlTagClose(strmOut, "Input", nIndent, true);
+ LogXmlTagClose(strmOut, "Char", nIndent+1, fContent);
+ }
}
/*----------------------------------------------------------------------------------------------
- Output the glyph IDs generated by the glyph generation pass (pass 0).
-----------------------------------------------------------------------------------------------*/
-//void GrTableManager::LogXmlPass0(std::ostream & strmOut)
-//{
-// strmOut << "INPUT TO PASS 1\n\n";
-//
-// GrSlotStream * psstrm = OutputStream(0);
-//
-// LogSlotHeader(strmOut, psstrm->WritePos(), SP_PER_SLOT, LEADING_SP);
-//
-// LogSlotGlyphs(strmOut, psstrm);
-//
-// strmOut << "\n";
-//}
-
-/*----------------------------------------------------------------------------------------------
Output the the results of pass.
----------------------------------------------------------------------------------------------*/
void GrTableManager::LogXmlPass(std::ostream & strmOut, int ipass, int cslotSkipped, int nIndent)
@@ -417,25 +400,13 @@ void GrTableManager::LogXmlPass(std::ostream & strmOut, int ipass, int cslotSkip
LogXmlTagPostAttrs(strmOut, true);
bool fPreJust = (!fJustWidths && ipass == m_ipassJust1 - 1 && ShouldLogJustification());
bool fPostJust = (fJustWidths || ipass == m_ipassJust1 && ShouldLogJustification());
- ppass->LogXmlGlyphs(strmOut, this, psstrmOut, m_ipassJust1, fPreJust, fPostJust, nIndent+2);
+ ppass->LogXmlGlyphs(strmOut, this, psstrmOut, m_ipassJust1, fPreJust, fPostJust, cslotSkipped, nIndent+2);
LogXmlTagClose(strmOut, "Output", nIndent+1, true);
LogXmlTagClose(strmOut, "Pass", nIndent, true);
#ifdef XMLOMIT
- // Do this later, after we're sure the positions have been set:
- //if (ipass == m_cpass - 1)
- // LogFinalPositions(strmOut);
-
- if (cslotSkipped > 0)
- {
- strmOut << "\n ";
- for (islot = 0; islot < cslotSkipped; islot++)
- strmOut << "SKIP ";
- strmOut << "\n";
- }
-
// If this was the pass just before the justification routines get run, output a
// special line that just shows the results, ie, the values of justify.width.
// TODO: adjust this when measure mode get functioning.
@@ -497,15 +468,19 @@ void PassState::LogXmlRules(std::ostream & strmOut, GrTableManager * ptman,
}
void GrPass::LogXmlGlyphs(std::ostream & strmOut, GrTableManager * ptman, GrSlotStream * psstrmOut,
- int ipassJust1, bool fPreJust, bool fPostJust, int nIndent)
+ int ipassJust1, bool fPreJust, bool fPostJust, int cslotSkipped, int nIndent)
{
GrBidiPass * ppassBidi = dynamic_cast<GrBidiPass *>(this);
+ GrBidiPass * ppassBidiNext = (m_ipass + 1 >= ptman->NumberOfPasses()) ?
+ NULL :
+ dynamic_cast<GrBidiPass *>(ptman->Pass(m_ipass + 1));
m_pzpst->LogXmlGlyphs(strmOut, ptman, psstrmOut, ipassJust1, fPreJust, fPostJust,
- (ppassBidi != NULL), nIndent);
+ (ppassBidi != NULL), (ppassBidiNext != NULL), cslotSkipped, nIndent);
}
void PassState::LogXmlGlyphs(std::ostream & strmOut, GrTableManager * ptman, GrSlotStream * psstrmOut,
- int ipassJust1, bool fPreJust, bool fPostJust, bool fBidi, int nIndent)
+ int ipassJust1, bool fPreJust, bool fPostJust, bool fBidi, bool fBidiNext, int cslotSkipped,
+ int nIndent)
{
ptman->LogXmlTagOpen(strmOut, "Output", nIndent, true);
ptman->LogXmlTagPostAttrs(strmOut, true);
@@ -528,6 +503,8 @@ void PassState::LogXmlGlyphs(std::ostream & strmOut, GrTableManager * ptman, GrS
GrSlotState * pslot = psstrmOut->SlotAt(islot);
bool fMod = (pslot->PassModified() >= m_ipass && m_ipass > 0);
+ if (fBidi || fBidiNext)
+ fMod = true;
ptman->LogXmlTagOpen(strmOut, "Glyph", nIndent+1, fMod);
@@ -540,13 +517,15 @@ void PassState::LogXmlGlyphs(std::ostream & strmOut, GrTableManager * ptman, GrS
ptman->LogXmlTagAttr(strmOut, "actual", pslot->ActualGlyphForOutput(ptman));
if (m_rgfInsertion[islot])
ptman->LogXmlTagAttr(strmOut, "inserted", "true");
+ if (islot < cslotSkipped)
+ ptman->LogXmlTagAttr(strmOut, "nextPassSkips", "true");
ptman->LogXmlTagPostAttrs(strmOut, fMod);
if (fMod)
{
- pslot->LogXmlAttributes(strmOut, ptman, m_ipass, islot,
- fPreJust, fPostJust, fBidi, nIndent+2);
+ pslot->LogXmlAttributes(strmOut, ptman, psstrmOut, m_ipass, islot,
+ fPreJust, fPostJust, fBidi, fBidiNext, nIndent+2);
}
ptman->LogXmlTagClose(strmOut, "Glyph", nIndent+1, fMod);
@@ -558,8 +537,9 @@ void PassState::LogXmlGlyphs(std::ostream & strmOut, GrTableManager * ptman, GrS
/*----------------------------------------------------------------------------------------------
Write out the attributes that have changes.
----------------------------------------------------------------------------------------------*/
-void GrSlotState::LogXmlAttributes(std::ostream & strmOut, GrTableManager * ptman, int ipass,
- int islot, bool fPreJust, bool fPostJust, bool fBidi, int nIndent)
+void GrSlotState::LogXmlAttributes(std::ostream & strmOut, GrTableManager * ptman,
+ GrSlotStream * psstrmOut, int ipass,
+ int islot, bool fPreJust, bool fPostJust, bool fBidi, bool fBidiNext, int nIndent)
{
// To handle reprocessing, in which case there may be a chain of slots modified
// in the same pass:
@@ -580,19 +560,12 @@ void GrSlotState::LogXmlAttributes(std::ostream & strmOut, GrTableManager * ptma
//if (fJustWidths)
//{}
- //else if (fBidi)
- //{
- // // Special stuff for Bidi pass
- //}
- //else if (fBidiNext)
- //{
- //}
bool fLogAssocs = false;
for (int slat = 0; slat < kslatMax + ptman->NumUserDefn() - 1; slat++)
{
- if (!prgfMods[slat])
+ if (!prgfMods[slat] && (slat != kslatDir || (!fBidi && !fBidiNext)))
continue;
if (slat == kslatPosX)
@@ -651,7 +624,7 @@ void GrSlotState::LogXmlAttributes(std::ostream & strmOut, GrTableManager * ptma
}
}
- fLogAssocs = true;
+ fLogAssocs = (fLogAssocs || prgfMods[slat]);
if (slat == kslatCompRef)
{
@@ -668,22 +641,41 @@ void GrSlotState::LogXmlAttributes(std::ostream & strmOut, GrTableManager * ptma
}
else
{
+ std::string strValue = "newValue";
+ if ((!prgfMods[slat] && fBidiNext) || fBidi)
+ strValue = "value";
+
ptman->LogXmlTagOpen(strmOut, "Attribute", nIndent, false);
ptman->LogXmlTagAttr(strmOut, "name", strAttrName.c_str());
int nValue = GetSlotAttrValue(strmOut, ptman, ipass, slat, 0, fPreJust, fPostJust);
- ptman->LogXmlTagAttr(strmOut, "newValue", nValue);
+ switch (slat)
+ {
+ case kslatDir: ptman->LogXmlDirCode(strmOut, strValue.c_str(), nValue);break;
+ case kslatBreak: ptman->LogXmlBreakWeight(strmOut, "newValue", nValue); break;
+ default: ptman->LogXmlTagAttr(strmOut, "newValue", nValue); break;
+ }
ptman->LogXmlTagPostAttrs(strmOut, false);
ptman->LogXmlTagClose(strmOut, "Attribute", nIndent, false);
}
}
+ if (fBidi)
+ {
+ // Output final directionality level
+ ptman->LogXmlTagOpen(strmOut, "Attribute", nIndent, false);
+ ptman->LogXmlTagAttr(strmOut, "name", "directionLevel");
+ ptman->LogXmlTagAttr(strmOut, "value", DirLevel());
+ ptman->LogXmlTagPostAttrs(strmOut, false);
+ ptman->LogXmlTagClose(strmOut, "Attribute", nIndent, false);
+ }
+
if (m_vpslotAssoc.size() > 1)
fLogAssocs = true; // multiple associations
else if (m_vpslotAssoc.size() == 1)
{
// association change from previous stream
GrSlotState * pslotAssoc = AssocSlot(0);
- if (pslotAssoc->m_islotTmpIn != islot)
+ if (pslotAssoc == NULL || pslotAssoc->m_islotTmpIn != islot)
fLogAssocs = true;
}
if (fLogAssocs)
@@ -703,6 +695,8 @@ void GrSlotState::LogXmlAttributes(std::ostream & strmOut, GrTableManager * ptma
strAssocs.append(rgch);
}
}
+ if (strAssocs.length() == 0)
+ strAssocs.assign("??");
ptman->LogXmlTagOpen(strmOut, "Associations", nIndent, false);
ptman->LogXmlTagAttr(strmOut, "slots", strAssocs.c_str());
//ptman->LogXmlTagPostAttrs(strmOut, false);
@@ -714,209 +708,6 @@ void GrSlotState::LogXmlAttributes(std::ostream & strmOut, GrTableManager * ptma
#if XMLOMIT
/*----------------------------------------------------------------------------------------------
- Write out a line for each slot attribute that changed during the pass.
-
- @param fJustWidths - a special pass that writes out just the effects of the justification
- routines, ie, the values of justify.width
-----------------------------------------------------------------------------------------------*/
-void GrTableManager::LogAttributes(std::ostream & strmOut, int ipass,
- bool fJustWidths)
-{
- // Figure out which slot attributes were modified for some slot during the pass.
- bool * prgfMods = new bool[kslatMax + NumUserDefn() - 1];
-
- bool fPreJust = (!fJustWidths && ipass == m_ipassJust1 - 1 && ShouldLogJustification());
- bool fPostJust = (fJustWidths || ipass == m_ipassJust1 && ShouldLogJustification());
-
- int ccomp; // max number of components per slot
- int cassoc; // max number of associations per slot
- SlotAttrsModified(ipass, prgfMods, fPreJust, &ccomp, &cassoc);
-
- if (fPreJust)
- {
- // prgfMods[kslatJStretch] = true;
- // prgfMods[kslatJShrink] = true;
- // prgfMods[kslatJStep] = true;
- // prgfMods[kslatWeight] = true;
- prgfMods[kslatJWidth] = false; // output j.width in its own line (we call this
- // method with fJustWidths == true)
- }
- else if (fPostJust)
- prgfMods[kslatJWidth] = true;
-
- GrPass * ppass = Pass(ipass);
- GrPass * ppassNext = (ipass < m_cpass - 1) ? Pass(ipass + 1) : NULL;
- GrSlotStream * psstrm = OutputStream(ipass);
-
- if (fJustWidths)
- {}
- else if (dynamic_cast<GrBidiPass *>(ppass))
- {
- // Special stuff for Bidi pass:
- // Log value of directionality attribute.
- strmOut << "directionality ";
- int islot;
- for (islot = 0; islot < psstrm->WritePos(); islot++)
- {
- GrSlotState * pslot = psstrm->SlotAt(islot);
- LogDirCodeInTable(strmOut, pslot->DirProcessed());
- }
- strmOut << "\n";
-
- // Log final direction level for bidi pass.
- strmOut << "dir level ";
- for (islot = 0; islot < psstrm->WritePos(); islot++)
- {
- GrSlotState * pslot = psstrm->SlotAt(islot);
- LogInTable(strmOut, pslot->DirLevel());
- }
- strmOut << "\n";
- }
- else if (ppassNext && dynamic_cast<GrBidiPass *>(ppassNext))
- {
- // Next pass is Bidi: log input values of directionality attribute that are input for it.
- strmOut << "directionality ";
- for (int islot = 0; islot < psstrm->WritePos(); islot++)
- {
- GrSlotState * pslot = psstrm->SlotAt(islot);
- LogDirCodeInTable(strmOut, pslot->Directionality());
- }
- strmOut << "\n";
- }
-
- for (int slat = 0; slat < kslatMax + NumUserDefn() - 1; slat++)
- {
- int cIndexLim = 1;
- if (slat == kslatCompRef)
- cIndexLim = ccomp;
- else if (slat == kslatUserDefn)
- cIndexLim = 1; // kMaxUserDefinedSlotAttributes;
-
- if (fJustWidths && slat != kslatJWidth)
- continue;
-
- bool fValidAttr = true;
- for (int iIndex = 0; iIndex < cIndexLim; iIndex++)
- {
- if (prgfMods[slat])
- {
- switch(slat)
- {
- case kslatAdvX: strmOut << "advance.x "; break;
- case kslatAdvY: strmOut << "advance.y "; break;
- case kslatAttTo: strmOut << "att.to "; break;
- case kslatAttAtX: strmOut << "att.at.x "; break;
- case kslatAttAtY: strmOut << "att.at.y "; break;
- case kslatAttAtGpt: strmOut << "att.at.gpt "; break;
- case kslatAttAtXoff: strmOut << "att.at.xoff "; break;
- case kslatAttAtYoff: strmOut << "att.at.yoff "; break;
- case kslatAttWithX: strmOut << "att.with.x "; break;
- case kslatAttWithY: strmOut << "att.with.y "; break;
- case kslatAttWithGpt: strmOut << "att.with.gpt "; break;
- case kslatAttWithXoff: strmOut << "att.with.xoff "; break;
- case kslatAttWithYoff: strmOut << "att.with.yoff "; break;
- case kslatAttLevel: strmOut << "att.level "; break;
- case kslatBreak: strmOut << "breakweight "; break;
- case kslatCompRef: strmOut << "component " << iIndex + 1 // 1-based
- << " "; break;
- case kslatDir: strmOut << "dir "; break;
- case kslatInsert: strmOut << "insert "; break;
- case kslatMeasureSol: strmOut << "measure.sol "; break;
- case kslatMeasureEol: strmOut << "measure.eol "; break;
- case kslatJStretch: strmOut << "j.stretch "; break;
- case kslatJShrink: strmOut << "j.shrink "; break;
- case kslatJStep: strmOut << "j.step "; break;
- case kslatJWeight: strmOut << "j.weight "; break;
- case kslatJWidth: strmOut << "j.width "; break;
- case kslatPosX:
- case kslatPosY:
- Assert(false);
- break;
- case kslatShiftX: strmOut << "shift.x "; break;
- case kslatShiftY: strmOut << "shift.y "; break;
- default:
- if (kslatUserDefn <= slat &&
- slat < kslatUserDefn + NumUserDefn())
- {
- strmOut << "user" << (slat - kslatUserDefn + 1) // 1-based
- << ((iIndex >= 9) ? " " : " ");
- }
- else
- {
- // Invalid attribute:
- Warn("bad slot attribute");
- fValidAttr = false;
- break;
- }
- }
-
- if (!fValidAttr)
- break; // out of iIndex loop
-
- for (int islot = 0; islot < psstrm->WritePos(); islot++)
- {
- GrSlotState * pslot = psstrm->SlotAt(islot);
- pslot->LogSlotAttribute(this, strmOut, ipass, slat, iIndex,
- fPreJust, fPostJust);
- }
-
- strmOut << "\n";
- }
- }
- }
-
- if (fJustWidths)
- goto LDone;
-
- for (int iassoc = 0; iassoc < cassoc; iassoc++)
- {
- // Log associations. Put them on one line it that will work; otherwise use several.
- bool fBoth = (cassoc <= 2);
- bool fAfter = (iassoc == (cassoc - 1));
- if (fBoth)
- strmOut << "assocs ";
- else if (iassoc == 0)
- strmOut << "assocs-before ";
- else if (fAfter)
- strmOut << " -after ";
- else
- strmOut << " -other ";
-
- for (int islot = 0; islot < psstrm->WritePos(); islot++)
- {
- GrSlotState * pslot = psstrm->SlotAt(islot);
- pslot->LogAssociation(this, strmOut, ipass, iassoc, fBoth, fAfter);
- }
-
- strmOut << "\n";
-
- if (fBoth)
- break;
- }
-
- if (cassoc == 0 && dynamic_cast<GrBidiPass *>(ppass))
- {
- strmOut << "assocs ";
-
- // Log associations for all slots moved during the Bidi pass.
- for (int islot = 0; islot < psstrm->WritePos(); islot++)
- {
- GrSlotState * pslot = psstrm->SlotAt(islot);
- if (pslot->m_islotTmpIn != pslot->m_islotTmpOut)
- LogInTable(strmOut, pslot->m_islotTmpIn);
- else
- strmOut << " ";
- }
-
- strmOut << "\n";
- }
-
-LDone:
-
- delete[] prgfMods;
-}
-
-/*----------------------------------------------------------------------------------------------
Write out the final positions.
----------------------------------------------------------------------------------------------*/
void GrTableManager::LogFinalPositions(std::ostream & strmOut)
@@ -1045,16 +836,33 @@ int GrSlotState::GetSlotAttrValue(std::ostream & strmOut, GrTableManager * ptman
#endif // TRACING
-#ifdef XMLOMIT
/*----------------------------------------------------------------------------------------------
Write out the final underlying-to-surface associations.
----------------------------------------------------------------------------------------------*/
-void Segment::LogUnderlyingToSurface(GrTableManager * ptman, std::ostream & strmOut,
- GrCharStream * pchstrm)
+void Segment::LogXmlUnderlyingToSurface(std::ostream & strmOut, GrTableManager * ptman,
+ GrCharStream * pchstrm, int nIndent)
{
#ifdef TRACING
- strmOut << "\n\nUNDERLYING TO SURFACE MAPPINGS\n\n";
+
+ ptman->LogXmlTagOpen(strmOut, "UnderlyingToSurface", nIndent, true);
+ ptman->LogXmlTagPostAttrs(strmOut, true);
+
+ ptman->LogXmlUnderlyingAux(strmOut, pchstrm, -m_ichwAssocsMin, (m_ichwAssocsLim - m_ichwAssocsMin),
+ nIndent+1,
+ true, // text
+ false, // features
+ false, // color
+ true, // string offset
+ true, // ligature components
+ true // glyph associations
+ );
+
+ ptman->LogXmlTagClose(strmOut, "UnderlyingToSurface", nIndent, true);
+
+
+#ifdef XMLOMIT
+ ptman->LogXmlTagOpen(strmOut, "UnderlyingToSurface", nIndent, true);
size_t cassocs = 0;
int fLigs = false;
@@ -1067,7 +875,6 @@ void Segment::LogUnderlyingToSurface(GrTableManager * ptman, std::ostream & strm
fLigs = true;
}
-// ptman->LogSlotHeader(strmOut, m_ichwAssocsLim, SP_PER_SLOT, LEADING_SP, m_ichwAssocsMin);
ptman->LogUnderlyingHeader(strmOut, pchstrm->Min(), (pchstrm->Min() + m_ichwAssocsLim),
-m_ichwAssocsMin, NULL);
@@ -1235,9 +1042,13 @@ void Segment::LogUnderlyingToSurface(GrTableManager * ptman, std::ostream & strm
}
strmOut << "\n";
+#endif // XMLOMIT
#endif // TRACING
+
}
+#ifdef XMLOMIT
+
/*----------------------------------------------------------------------------------------------
Write out the final surface-to-underlying associations.
----------------------------------------------------------------------------------------------*/
@@ -1672,6 +1483,89 @@ void GrTableManager::LogXmlTagColor(std::ostream & strmOut, std::string strAttr,
}
/*----------------------------------------------------------------------------------------------
+ Write a directionality code to the table.
+----------------------------------------------------------------------------------------------*/
+void GrTableManager::LogXmlDirCode(std::ostream & strmOut, std::string strAttr, int dircValue,
+ size_t nIndent)
+{
+ std::string strValue;
+ char rgch[20];
+ switch (dircValue)
+ {
+ case kdircUnknown: strValue = "unknown"; break;
+ case kdircNeutral: strValue = "ON"; break;
+ case kdircL: strValue = "L"; break;
+ case kdircR: strValue = "R"; break;
+ case kdircRArab: strValue = "AR"; break;
+ case kdircEuroNum: strValue = "EN"; break;
+ case kdircEuroSep: strValue = "ES"; break;
+ case kdircEuroTerm: strValue = "ET"; break;
+ case kdircArabNum: strValue = "AN"; break;
+ case kdircComSep: strValue = "CS"; break;
+ case kdircWhiteSpace: strValue = "WS"; break;
+ case kdircBndNeutral: strValue = "BN"; break;
+ case kdircNSM: strValue = "NSM"; break;
+ case kdircLRO: strValue = "LRO"; break;
+ case kdircRLO: strValue = "RLO"; break;
+ case kdircLRE: strValue = "LRE"; break;
+ case kdircRLE: strValue = "RLE"; break;
+ case kdircPDF: strValue = "PDF"; break;
+ case kdircPdfL: strValue = "PDF-L"; break;
+ case kdircPdfR: strValue = "PDF-R"; break;
+ case kdircLlb: strValue = "L"; break;
+ case kdircRlb: strValue = "R"; break;
+ default:
+ itoa(dircValue, rgch, 10);
+ strValue.assign(rgch);
+ break;
+ }
+ LogXmlTagAttr(strmOut, strAttr, strValue.c_str(), nIndent);
+}
+
+/*----------------------------------------------------------------------------------------------
+ Write a breakweight code to the table.
+----------------------------------------------------------------------------------------------*/
+void GrTableManager::LogXmlBreakWeight(std::ostream & strmOut, std::string strAttr, int lbValue,
+ size_t nIndent)
+{
+ std::string strValue;
+ char rgch[20];
+ if (lbValue < 0)
+ {
+ lbValue = lbValue * -1;
+ switch (lbValue)
+ {
+ case klbWsBreak: strValue = "-ws"; break;
+ case klbWordBreak: strValue = "-word"; break;
+ case klbHyphenBreak: strValue = "-intra"; break;
+ case klbLetterBreak: strValue = "-letter"; break;
+ case klbClipBreak: strValue = "-clip"; break;
+ default:
+ itoa(lbValue * -1, rgch, 10);
+ strValue.assign(rgch);
+ break;
+ }
+ }
+ else
+ {
+ switch (lbValue)
+ {
+ case klbNoBreak: strValue = "none"; break;
+ case klbWsBreak: strValue = "ws"; break;
+ case klbWordBreak: strValue = "word"; break;
+ case klbHyphenBreak: strValue = "intra"; break;
+ case klbLetterBreak: strValue = "letter"; break;
+ case klbClipBreak: strValue = "clip"; break;
+ default:
+ itoa(lbValue, rgch, 10);
+ strValue.assign(rgch);
+ break;
+ }
+ }
+ LogXmlTagAttr(strmOut, strAttr, strValue.c_str(), nIndent);
+}
+
+/*----------------------------------------------------------------------------------------------
Add a comment to the log file.
----------------------------------------------------------------------------------------------*/
void GrTableManager::LogXmlComment(std::ostream & strmOut, std::string strComment,
diff --git a/Build/source/libs/graphite-engine/test/RegressionTest/RegressionTest.cpp b/Build/source/libs/graphite-engine/test/RegressionTest/RegressionTest.cpp
index 1545a173e93..1d361a4f3cd 100644
--- a/Build/source/libs/graphite-engine/test/RegressionTest/RegressionTest.cpp
+++ b/Build/source/libs/graphite-engine/test/RegressionTest/RegressionTest.cpp
@@ -14,7 +14,6 @@ Description:
#include "main.h"
#include "MemoryUsage.h"
-
#include <cstring>
//:>********************************************************************************************
@@ -416,7 +415,7 @@ int RunOneTestCase(TestCase * ptcase, Segment * psegPrev, Segment ** ppsegRet, R
for (int ichar = 0; ichar < segLim; ichar++)
{
LgIpValidResult ipvr = ppainter->isValidInsertionPoint(ichar);
- if (((ipvr == kipvrOK && !ptcase->InsPtFlag(ichar))) // TODO: handle kipvrUnknown
+ if ((ipvr == kipvrOK && !ptcase->InsPtFlag(ichar)) // TODO: handle kipvrUnknown
|| (ipvr != kipvrOK && ptcase->InsPtFlag(ichar)))
{
OutputErrorWithValues(ptcase, "ERROR: valid insertion point ", ichar,
diff --git a/Build/source/libs/graphite-engine/test/RegressionTest/TestCase.cpp b/Build/source/libs/graphite-engine/test/RegressionTest/TestCase.cpp
index e259ce66ffb..c9696141c95 100644
--- a/Build/source/libs/graphite-engine/test/RegressionTest/TestCase.cpp
+++ b/Build/source/libs/graphite-engine/test/RegressionTest/TestCase.cpp
@@ -25,7 +25,6 @@ Things that still need testing:
-------------------------------------------------------------------------------*//*:End Ignore*/
#include "main.h"
-
#include <cstring>
//:>********************************************************************************************
@@ -301,7 +300,7 @@ void TestCase::SetupBurmese1()
{
m_testName = "Burmese 1";
m_debug = false;
- m_traceLog = true;
+ //m_traceLog = true;
//m_skip = true;
// Input:
@@ -936,6 +935,7 @@ void TestCase::SetupOnlyWhiteSpace()
void TestCase::SetupCrossLine1()
{
m_testName = "Cross-line 1";
+ //m_traceLog = true;
//m_skip = true;
// Input:
@@ -1072,6 +1072,7 @@ void TestCase::SetupCrossLine2()
void TestCase::SetupCrossLine3()
{
m_testName = "Cross-line 3";
+ m_traceLog = true;
//m_skip = true;
// Input:
@@ -1224,7 +1225,7 @@ void TestCase::SetupArabic1()
{
m_testName = "Arabic 1";
//m_debug = true;
- m_traceLog = false;
+ //m_traceLog = true;
//m_skip = true;
// Input:
@@ -1273,7 +1274,7 @@ void TestCase::SetupArabic2()
{
m_testName = "Arabic 2";
m_debug = false;
- m_traceLog = false;
+ //m_traceLog = false;
//m_skip = true;
// Input:
@@ -1556,7 +1557,7 @@ void TestCase::SetupDumbFallback1()
{
m_testName = "Dumb Fallback 1";
//m_debug = true;
- m_traceLog = false;
+ //m_traceLog = true;
//m_skip = true;
// Input:
@@ -1616,7 +1617,7 @@ void TestCase::SetupDumbFallback2()
{
m_testName = "Dumb Fallback 2";
//m_debug = true;
- m_traceLog = false;
+ //m_traceLog = true;
//m_skip = true;
// Input:
@@ -1653,8 +1654,8 @@ void TestCase::SetupBadFont()
{
m_testName = "Bad Font";
//m_debug = true;
- m_traceLog = false;
- //m_skip = true;
+ //m_traceLog = true;
+ m_skip = true;
// Input:
// The font has been corrupted so that the size of the cmap in the directory is invalid.