paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-12 10:19:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazUtils: Add support for the CapHeight to LazFreeType. Issue #23968, patch from Andrey Zubarev

Browse Source 
git-svn-id: trunk@41043 -
This commit is contained in:
juha 2013-05-05 17:56:23 +00:00
parent 40881bb73b
commit 62668a0d48
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/lazutils/easylazfreetype.pas
View File

@ -241,13 +241,14 @@ type
FGlyphTable: TAvgLvlTree;
FCharMap: TT_CharMap;
FCharmapOk: boolean;
FAscentValue, FDescentValue, FLineGapValue, FLargeLineGapValue: single;
FAscentValue, FDescentValue, FLineGapValue, FLargeLineGapValue, FCapHeight: single;
function GetClearType: boolean; override;
procedure SetClearType(const AValue: boolean); override;
function GetLineFullHeight: single; override;
function GetAscent: single; override;
function GetDescent: single; override;
function GetLineSpacing: single; override;
function GetCapHeight: single;
procedure SetHinted(const AValue: boolean); override;
function GetHinted: boolean; override;
procedure OnDestroyFontItem;
@ -272,6 +273,7 @@ type
property DPI: integer read GetDPI write SetDPI;
property SizeInPoints: single read FPointSize write SetPointSize;
property SizeInPixels: single read GetPixelSize write SetPixelSize;
property CapHeight: single read GetCapHeight;
property Glyph[Index: integer]: TFreeTypeGlyph read GetGlyph;
property GlyphCount: integer read GetGlyphCount;
property CharIndex[AChar: integer]: integer read GetCharIndex;
@ -869,6 +871,11 @@ begin
result := FAscentValue*SizeInPixels;
end;
function TFreeTypeFont.GetCapHeight: single;
begin
result := FCapHeight*SizeInPixels;
end;
function TFreeTypeFont.GetClearType: boolean;
begin
Result:= FClearType;
@ -1167,10 +1174,16 @@ begin
FLargeLineGapValue := prop.os2^.sTypoLineGap;
end;
if prop.os2^.version >= 2 then
FCapHeight:=prop.os2^.sCapHeight
else
FCapHeight:=FAscentValue;
FAscentValue /= prop.header^.units_per_EM;
FDescentValue /= -prop.header^.units_per_EM;
FLineGapValue /= prop.header^.units_per_EM;
FLargeLineGapValue /= prop.header^.units_per_EM;
FCapHeight /= prop.header^.units_per_EM;
if FLargeLineGapValue = 0 then
FLargeLineGapValue := (FAscentValue+FDescentValue)*0.1;

12
components/lazutils/ttload.pas
View File

@ -1272,6 +1272,18 @@ uses TTError, TTMemory;
ulCodePageRange2 := 0;
end;
if version >= $0002 then
begin
if AStream.AccessFrame(10) then exit;
sxHeight := AStream.Get_Short;
sCapHeight := AStream.Get_Short;
usDefaultChar := AStream.Get_UShort;
usBreakChar := AStream.Get_UShort;
usMaxContext := AStream.Get_UShort;
AStream.ForgetFrame;
end;
end;
{$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}

7
components/lazutils/tttypes.pas
View File

@ -323,6 +323,13 @@ type
(* only version 1 tables *)
ulCodePageRange1 : TT_ULong;
ulCodePageRange2 : TT_ULong;
(* only version 2 tables *)
sxHeight : TT_Short;
sCapHeight : TT_Short;
usDefaultChar : TT_UShort;
usBreakChar : TT_UShort;
usMaxContext : TT_UShort;
end;
(******************************************************)