* Patches from Graeme Geldenhuys:

   * Added some primitives:
      DrawPolygon (= Polyline with closing path)
      ClosePathStroke
      FillStrokePath
      FillEvenOddStrokePath
   * Origin by default now at the bottom of the page.
  

git-svn-id: trunk@34778 -

packages/fcl-pdf/examples/testfppdf.lpr

@@ -76,7 +76,7 @@ begin
   Result.Infos.ApplicationName := ApplicationName;
   Result.Infos.CreationDate := Now;
 
-  lOpts := [];
+  lOpts := [poPageOriginAtTop];
   if FNoFontEmbedding then
     Include(lOpts, poNoEmbeddedFonts);
   if FFontCompression then
@@ -439,13 +439,13 @@ begin
   P.DrawLine(100, 205, 140, 205, 5);
 
 
-  // ========== PolyLines ============
-  P.Matrix.SetYTranslation(60);
+  // ========== PolyLines and Polygons ============
+  P.Matrix.SetYTranslation(70);
   P.Matrix.SetXTranslation(20);
 
   P.SetPenStyle(ppsSolid);
   P.SetColor(clBlack, true);
-  P.DrawRect(0, 0, 50, -50, 1, false, true);
+  P.DrawRect(0, 10, 50, -50, 1, false, true);
 
   P.SetColor($c00000, true);
   P.ResetPath;
@@ -453,10 +453,44 @@ begin
   for i := 0 to 9 do
   begin
     lPoints[i].X := Random(50);
-    lPoints[i].Y := Random(50);
+    lPoints[i].Y := Random(50) + 10.5;
   end;
   P.DrawPolyLine(lPoints, 1);
   P.StrokePath;
+
+
+  P.Matrix.SetXTranslation(80);
+  P.SetPenStyle(ppsSolid);
+  P.SetColor(clBlack, true);
+  P.DrawRect(0, 10, 50, -50, 1, false, true);
+
+  P.SetColor($ffff80, false); // pastel yellow
+  P.SetColor(clBlue, true);
+  P.ResetPath;
+  P.DrawPolygon(lPoints, 1);
+  P.FillStrokePath;
+
+  p.SetPenStyle(ppsSolid);
+  P.SetFont(FtTitle, 8);
+  P.SetColor(clBlack, false);
+  P.WriteText(0, 8, 'Fill using the nonzero winding number rule');
+
+
+  P.Matrix.SetXTranslation(140);
+  P.SetPenStyle(ppsSolid);
+  P.SetColor(clBlack, true);
+  P.DrawRect(0, 10, 50, -50, 1, false, true);
+
+  P.SetColor($ffff80, false); // pastel yellow
+  P.SetColor(clBlue, true);
+  P.ResetPath;
+  P.DrawPolygon(lPoints, 1);
+  P.FillEvenOddStrokePath;
+
+  p.SetPenStyle(ppsSolid);
+  P.SetFont(FtTitle, 8);
+  P.SetColor(clBlack, false);
+  P.WriteText(0, 8, 'Fill using the even-odd rule');
 end;
 
 { Each curve uses the exact same four coordinates, just with different CubicCurveToXXX
@@ -689,10 +723,8 @@ end;
 procedure TPDFTestApp.DoRun;
 
   Function BoolFlag(C : Char;ADefault : Boolean) : Boolean;
-
   Var
     V : Integer;
-
   begin
     Result:=ADefault;
     if HasOption(C, '') then
@@ -706,7 +738,6 @@ procedure TPDFTestApp.DoRun;
 
 var
   ErrorMsg: String;
-
 begin
   StopOnException:=True;
   inherited DoRun;
@@ -810,7 +841,6 @@ begin
 end;
 
 
-
 begin
   Randomize;
   Application := TPDFTestApp.Create(nil);

packages/fcl-pdf/src/fppdf.pp

@@ -64,7 +64,7 @@ type
   TPDFPageLayout = (lSingle, lTwo, lContinuous);
   TPDFUnitOfMeasure = (uomInches, uomMillimeters, uomCentimeters, uomPixels);
 
-  TPDFOption = (poOutLine, poCompressText, poCompressFonts, poCompressImages, poUseRawJPEG, poNoEmbeddedFonts);
+  TPDFOption = (poOutLine, poCompressText, poCompressFonts, poCompressImages, poUseRawJPEG, poNoEmbeddedFonts, poPageOriginAtTop);
   TPDFOptions = set of TPDFOption;
 
   EPDF = Class(Exception);
@@ -188,6 +188,22 @@ type
   end;
 
 
+  TPDFPushGraphicsStack = class(TPDFDocumentObject)
+  protected
+    procedure   Write(const AStream: TStream); override;
+  public
+    class function Command: string;
+  end;
+
+
+  TPDFPopGraphicsStack = class(TPDFDocumentObject)
+  protected
+    procedure   Write(const AStream: TStream); override;
+  public
+    class function Command: string;
+  end;
+
+
   TPDFInteger = class(TPDFDocumentObject)
   private
     FInt: integer;
@@ -586,8 +602,8 @@ type
     procedure SetPaperType(AValue: TPDFPaperType);
     procedure AddTextToLookupLists(AText: UTF8String);
     procedure SetUnitOfMeasure(AValue: TPDFUnitOfMeasure);
-    procedure AdjustMatrix;
   protected
+    procedure AdjustMatrix; virtual;
     procedure DoUnitConversion(var APoint: TPDFCoord); virtual;
     procedure CreateStdFontText(X, Y: TPDFFloat; AText: AnsiString; AFontIndex: integer); virtual;
     procedure CreateTTFFontText(X, Y: TPDFFloat; AText: UTF8String; AFontIndex: integer); virtual;
@@ -623,13 +639,19 @@ type
       cause the ellpise to draw to the left of the origin point. }
     Procedure DrawEllipse(const APosX, APosY, AWidth, AHeight, ALineWidth: TPDFFloat; const AFill: Boolean = True; AStroke: Boolean = True); overload;
     Procedure DrawEllipse(const APos: TPDFCoord; const AWidth, AHeight, ALineWidth: TPDFFloat; const AFill: Boolean = True; AStroke: Boolean = True); overload;
+    procedure DrawPolygon(const APoints: array of TPDFCoord; const ALineWidth: TPDFFloat);
     procedure DrawPolyLine(const APoints: array of TPDFCoord; const ALineWidth: TPDFFloat);
     { start a new subpath }
     procedure ResetPath;
     { Close the current subpath by appending a straight line segment from the current point to the starting point of the subpath. }
     procedure ClosePath;
+    procedure ClosePathStroke;
     { render the actual path }
     procedure StrokePath;
+    { Fill using the nonzero winding number rule. }
+    procedure FillStrokePath;
+    { Fill using the Even-Odd rule. }
+    procedure FillEvenOddStrokePath;
     { Move the current drawing position to (x, y) }
     procedure MoveTo(x, y: TPDFFloat); overload;
     procedure MoveTo(APos: TPDFCoord); overload;
@@ -673,6 +695,9 @@ type
   end;
 
 
+  TPDFPageClass = class of TPDFPage;
+
+
   TPDFSection = Class(TCollectionItem)
   private
     FTitle: String;
@@ -776,14 +801,17 @@ type
   TPDFPages = Class(TPDFDocumentObject)
   private
     FList: TFPObjectList;
+    FPageClass: TPDFPageClass;
     function    GetP(AIndex: Integer): TPDFPage;
     function    GetPageCount: integer;
   public
+    constructor Create(const ADocument: TPDFDocument); override; overload;
     destructor  Destroy; override;
     function    AddPage: TPDFPage;
     procedure   Add(APage: TPDFPage);
     property    Count: integer read GetPageCount;
     property    Pages[AIndex: Integer]: TPDFPage read GetP; default;
+    property    PageClass: TPDFPageClass read FPageClass write FPageClass;
   end;
 
 
@@ -1508,6 +1536,29 @@ begin
   Result := 'S' + CRLF;
 end;
 
+{ TPDFPushGraphicsStack }
+
+procedure TPDFPushGraphicsStack.Write(const AStream: TStream);
+begin
+  WriteString(Command, AStream);
+end;
+
+class function TPDFPushGraphicsStack.Command: string;
+begin
+  Result := 'q'+CRLF;
+end;
+
+{ TPDFPopGraphicsStack }
+
+procedure TPDFPopGraphicsStack.Write(const AStream: TStream);
+begin
+  WriteString(Command, AStream);
+end;
+
+class function TPDFPopGraphicsStack.Command: string;
+begin
+  Result := 'Q' + CRLF;
+end;
 
 { TPDFEllipse }
 
@@ -1703,6 +1754,12 @@ begin
   result := FList.Count;
 end;
 
+constructor TPDFPages.Create(const ADocument: TPDFDocument);
+begin
+  inherited Create(ADocument);
+  FPageClass := TPDFPage;
+end;
+
 destructor TPDFPages.Destroy;
 begin
   FreeAndNil(FList);
@@ -1713,7 +1770,7 @@ function TPDFPages.AddPage: TPDFPage;
 begin
   if (FList=Nil) then
     FList:=TFPObjectList.Create;
-  Result:=TPDFPage.Create(Document);
+  Result := PageClass.Create(Document);
   FList.Add(Result);
 end;
 
@@ -1904,7 +1961,16 @@ end;
 
 procedure TPDFPage.AdjustMatrix;
 begin
-  FMatrix._21 := GetPaperHeight;
+  if poPageOriginAtTop in Document.Options then
+  begin
+    FMatrix._11 := -1;
+    FMatrix._21 := GetPaperHeight;
+  end
+  else
+  begin
+    FMatrix._11 := 1;
+    FMatrix._21 := 0;
+  end;
 end;
 
 constructor TPDFPage.Create(const ADocument: TPDFDocument);
@@ -1922,8 +1988,7 @@ begin
 
   FMatrix._00 := 1;
   FMatrix._20 := 0;
-  FMatrix._11 := -1;  // flip coordinates
-  AdjustMatrix;       // sets FMatrix._21 value
+  AdjustMatrix;
 
   FAnnots := CreateAnnotList;
 end;
@@ -2111,12 +2176,19 @@ begin
   DrawEllipse(APos.X, APos.Y, AWidth, AHeight, ALineWidth, AFill, AStroke);
 end;
 
+procedure TPDFPage.DrawPolygon(const APoints: array of TPDFCoord; const ALineWidth: TPDFFloat);
+begin
+  DrawPolyLine(APoints, ALineWidth);
+  ClosePath;
+end;
+
 procedure TPDFPage.DrawPolyLine(const APoints: array of TPDFCoord; const ALineWidth: TPDFFloat);
 var
   i: integer;
 begin
   if Length(APoints) < 2 then
     Exit; { not enough points to draw a line. Should this raise an exception? }
+  MoveTo(APoints[0].X, APoints[0].Y);
   for i := Low(APoints)+1 to High(APoints) do
     DrawLine(APoints[i-1].X, APoints[i-1].Y, APoints[i].X, APoints[i].Y, ALineWidth, False);
 end;
@@ -2131,11 +2203,26 @@ begin
   AddObject(TPDFClosePath.Create(Document));
 end;
 
+procedure TPDFPage.ClosePathStroke;
+begin
+  AddObject(TPDFFreeFormString.Create(Document, 's'+CRLF));
+end;
+
 procedure TPDFPage.StrokePath;
 begin
   AddObject(TPDFStrokePath.Create(Document));
 end;
 
+procedure TPDFPage.FillStrokePath;
+begin
+  AddObject(TPDFFreeFormString.Create(Document, 'B'+CRLF));
+end;
+
+procedure TPDFPage.FillEvenOddStrokePath;
+begin
+  AddObject(TPDFFreeFormString.Create(Document, 'B*'+CRLF));
+end;
+
 procedure TPDFPage.MoveTo(x, y: TPDFFloat);
 var
   p1: TPDFCoord;
@@ -3006,7 +3093,8 @@ procedure TPDFLineSegment.Write(const AStream: TStream);
 
 begin
   SetWidth(FWidth,AStream);
-  WriteString(TPDFMoveTo.Command(P1), AStream);
+  if FStroke then
+    WriteString(TPDFMoveTo.Command(P1), AStream);
   WriteString(Command(P2),AStream);
   if FStroke then
     WriteString('S'+CRLF, AStream);
@@ -3156,10 +3244,10 @@ end;
 
 procedure TPDFImage.Write(const AStream: TStream);
 begin
-  WriteString('q'+CRLF, AStream);   // save graphics state
+  WriteString(TPDFPushGraphicsStack.Command, AStream);   // save graphics state
   WriteString(FloatStr(FSize.X)+' 0 0 '+FloatStr(FSize.Y)+' '+FloatStr( FPos.X)+' '+FloatStr( FPos.Y)+' cm'+CRLF, AStream);
   WriteString('/I'+IntToStr(FNumber)+' Do'+CRLF, AStream);
-  WriteString('Q'+CRLF, AStream);   // restore graphics state
+  WriteString(TPDFPopGraphicsStack.Command, AStream);   // restore graphics state
 end;
 
 constructor TPDFImage.Create(const ADocument: TPDFDocument; const ALeft, ABottom, AWidth, AHeight: TPDFFloat; ANumber: integer);