diff --git a/components/fpvectorial/fpvectorial.pas b/components/fpvectorial/fpvectorial.pas index 240d538aa2..7759c4d8ad 100644 --- a/components/fpvectorial/fpvectorial.pas +++ b/components/fpvectorial/fpvectorial.pas @@ -637,7 +637,7 @@ type protected FElements: TFPList; // of TvEntity public - SetPenBrushAndFontElements: TvSetPenBrushAndFontElements; + SetPenBrushAndFontElements: TvSetPenBrushAndFontElements;// This is not currently implemented! constructor Create; override; destructor Destroy; override; // @@ -1827,7 +1827,16 @@ function TvText.GenerateDebugTree(ADestRoutine: TvDebugAddItemProc; var lStr: string; begin - lStr := Format('[%s] Name=%s X=%f Y=%f Text=%s', [Self.ClassName, Name, X, Y, Value.Text]); + lStr := Format('[%s] Name=%s X=%f Y=%f Text="%s" Color=%s Size=%d Name=%s Orientation=%f Bold=%s Italic=%s Underline=%s StrikeThrough=%s', + [ + Self.ClassName, Name, X, Y, Value.Text, + GenerateDebugStrForFPColor(Font.Color), + Font.Size, Font.Name, Font.Orientation, + BoolToStr(Font.Bold), + BoolToStr(Font.Italic), + BoolToStr(Font.Underline), + BoolToStr(Font.StrikeThrough) + ]); Result := ADestRoutine(lStr, APageItem); end; diff --git a/components/fpvectorial/svgvectorialreader.pas b/components/fpvectorial/svgvectorialreader.pas index ac0a6db8a7..69c3265e2d 100644 --- a/components/fpvectorial/svgvectorialreader.pas +++ b/components/fpvectorial/svgvectorialreader.pas @@ -773,6 +773,12 @@ begin ADestEntity.Font.Color := ReadSVGColor(AValue); Result := Result + [spbfFontColor]; end + // But sometimes SVG also uses stroke! Oh no... + else if AKey = 'stroke' then + begin + ADestEntity.Font.Color := ReadSVGColor(AValue); + Result := Result + [spbfFontColor]; + end else if AKey = 'fill-opacity' then ADestEntity.Font.Color.Alpha := StrToInt(AValue)*$101 else if AKey = 'font-size' then