[Silgraphite-cvs] silgraphite/include GrEngine.h,1.3,1.4 GrResult.h,1.2,1.3 GrSegment.h,1.2,1.3 IGrGraphics.h,1.2,1.3 IGrTextSource.h,1.2,1.3 common.h,1.4,1.5

[<sil...@li...>]

Update of /cvsroot/silgraphite/silgraphite/include
In directory sc8-pr-cvs1:/tmp/cvs-serv14941/include

Modified Files:
	GrEngine.h GrResult.h GrSegment.h IGrGraphics.h 
	IGrTextSource.h common.h 
Log Message:
Synchronized with FW, 20 Dec 2002, changelist #05908


Index: GrEngine.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/GrEngine.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GrEngine.h	12 Nov 2002 23:23:24 -0000	1.3
--- GrEngine.h	2 Jan 2003 21:18:42 -0000	1.4
***************
*** 117,121 ****
  		OLECHAR * prgchwErrMsg, int cchMaxErrMsg);
  
! 	wchar GetGlyphIDFromUnicode(wchar chw);
  	wchar ActualGlyphForOutput(wchar chwGlyphID);
  
--- 117,121 ----
  		OLECHAR * prgchwErrMsg, int cchMaxErrMsg);
  
! 	wchar GetGlyphIDFromUnicode(int nUnicode);
  	wchar ActualGlyphForOutput(wchar chwGlyphID);
  
***************
*** 234,237 ****
--- 234,242 ----
  	}
  
+ 	bool FakeItalic()
+ 	{
+ 		return m_fFakeItalic;
+ 	}
+ 
  	virtual void NewSegment(GrSegment ** ppseg);
  
***************
*** 247,255 ****
  	bool m_fSmartItalic;
  	bool m_fSmartBI;
  	//	control files for styled text; empty means not yet determined
! 	StrAnsi m_staCtrlFileReg;		// regular
! 	StrAnsi m_staCtrlFileBold;		// bold
! 	StrAnsi m_staCtrlFileItalic;	// italic
! 	StrAnsi m_staCtrlFileBI;		// bold-italic
  
  //	StrUni m_stuFontNames;
--- 252,265 ----
  	bool m_fSmartItalic;
  	bool m_fSmartBI;
+ 	//	are the italics faked using a slant?
+ 	bool m_fFakeItalicCache;
+ 	bool m_fFakeBICache;
  	//	control files for styled text; empty means not yet determined
! 	StrApp m_strCtrlFileReg;	// regular
! 	StrApp m_strCtrlFileBold;	// bold
! 	StrApp m_strCtrlFileItalic;	// italic
! 	StrApp m_strCtrlFileBI;		// bold-italic
! 
! 	bool m_fFakeItalic;
  
  //	StrUni m_stuFontNames;

Index: GrResult.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/GrResult.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GrResult.h	5 Nov 2002 23:42:10 -0000	1.2
--- GrResult.h	2 Jan 2003 21:18:42 -0000	1.3
***************
*** 52,60 ****
  #define ReturnResult(res) return res
  
! #ifdef GR_FIELDWORKS
  #define THROW(res) ThrowInternalError(res)
  #else
  #define THROW(res) throw res
! #endif
  
  #define WARN(res) res
--- 52,60 ----
  #define ReturnResult(res) return res
  
! #ifdef GR_FW
  #define THROW(res) ThrowInternalError(res)
  #else
  #define THROW(res) throw res
! #endif // GR_FW
  
  #define WARN(res) res

Index: GrSegment.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/GrSegment.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GrSegment.h	5 Nov 2002 23:42:10 -0000	1.2
--- GrSegment.h	2 Jan 2003 21:18:43 -0000	1.3
***************
*** 269,272 ****
--- 269,277 ----
  	}
  
+ 	// TODO: can probably delete this method when we implement GetWidthOfRange to use the same
+ 	// code as GetCharPlacement.
+ //	GrResult GetWidthOfRange(int ichwBase, IGrGraphics * pgg, int ichwMin, int ichwLim,
+ //		RECT rs, RECT rd, int * pdxd);
+ 
  	//	for transduction logging:
  #ifdef TRACING
***************
*** 530,533 ****
--- 535,543 ----
  
  	void AssertValidClusters(GrSlotStream * psstrm);
+ 
+ 	// TODO: can probably delete this method when we implement GetWidthOfRange to use the same
+ 	// code as GetCharPlacement.
+ //	int EndOfDirectionRange(int ichwBase, IGrGraphics * pgg, int ichwMin, int ichwLim,
+ //		int * pnDirDepth);
  };
  

Index: IGrGraphics.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/IGrGraphics.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IGrGraphics.h	5 Nov 2002 23:42:10 -0000	1.2
--- IGrGraphics.h	2 Jan 2003 21:18:43 -0000	1.3
***************
*** 10,14 ****
  
  Description:
! 	
  -------------------------------------------------------------------------------*//*:End Ignore*/
  #ifdef _MSC_VER
--- 10,14 ----
  
  Description:
! 
  -------------------------------------------------------------------------------*//*:End Ignore*/
  #ifdef _MSC_VER
***************
*** 28,35 ****
  		UINT uOptions, const RECT __RPC_FAR * pRect, int __RPC_FAR * prgdx) = 0;
  	virtual GrResult GetFontEmSquare(int * pxyFontEmSquare) = 0;
! 	virtual GrResult GetGlyphMetrics(int chw, 
  		int * psBoundingWidth, int * pyBoundingHeight,
  		int * pxBoundingX, int * pyBoundingY, int * pxAdvanceX, int * pyAdvanceY) = 0;
! 	virtual GrResult GetFontData(int nTableId, int * pcbTableSz, byte * prgb, int cbMax) = 0;	
  	virtual GrResult XYFromGlyphPoint(int chw, int nPoint, int * pxRet, int * pyRet) = 0;
  	virtual GrResult get_FontAscent(int* pdy) = 0;
--- 28,35 ----
  		UINT uOptions, const RECT __RPC_FAR * pRect, int __RPC_FAR * prgdx) = 0;
  	virtual GrResult GetFontEmSquare(int * pxyFontEmSquare) = 0;
! 	virtual GrResult GetGlyphMetrics(int chw,
  		int * psBoundingWidth, int * pyBoundingHeight,
  		int * pxBoundingX, int * pyBoundingY, int * pxAdvanceX, int * pyAdvanceY) = 0;
! 	virtual GrResult GetFontData(int nTableId, int * pcbTableSz, byte * prgb, int cbMax) = 0;
  	virtual GrResult XYFromGlyphPoint(int chw, int nPoint, int * pxRet, int * pyRet) = 0;
  	virtual GrResult get_FontAscent(int* pdy) = 0;

Index: IGrTextSource.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/IGrTextSource.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IGrTextSource.h	5 Nov 2002 23:42:10 -0000	1.2
--- IGrTextSource.h	2 Jan 2003 21:18:43 -0000	1.3
***************
*** 10,14 ****
  
  Description:
! 	An interface for a text source that is used by the Graphite engine.	
  -------------------------------------------------------------------------------*//*:End Ignore*/
  #ifdef _MSC_VER
--- 10,14 ----
  
  Description:
! 	An interface for a text source that is used by the Graphite engine.
  -------------------------------------------------------------------------------*//*:End Ignore*/
  #ifdef _MSC_VER
***************
*** 22,26 ****
  	This class provides an interface for a text source for the Graphite engine.
  ----------------------------------------------------------------------------------------------*/
! class IGrTextSource 
  {
  public:
--- 22,26 ----
  	This class provides an interface for a text source for the Graphite engine.
  ----------------------------------------------------------------------------------------------*/
! class IGrTextSource
  {
  public:

Index: common.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/common.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** common.h	12 Nov 2002 23:07:09 -0000	1.4
--- common.h	2 Jan 2003 21:18:43 -0000	1.5
***************
*** 64,67 ****
--- 64,68 ----
  //#include <math.h>
  #include <limits.h>
+ #include <tchar.h>
  
  //#include <crtdbg.h>