CAIRO

From cc487d4de29a48d8e20a9a8492957a5950d5c181 Mon Sep 17 00:00:00 2001 From: scuri Date: Fri, 21 May 2010 04:51:07 +0000 Subject: *** empty log message *** --- html/en/drv/cairo.html | 42 ++++++++++++++++++++++++++++++++++++++++-- html/en/drv/gdiplus.html | 6 ++++-- html/en/drv/pdf.html | 5 ++++- html/en/drv/ps.html | 5 ++++- html/en/drv/svg.html | 3 +++ html/en/drv/win32.html | 3 +++ html/en/drv/xrender.html | 3 ++- html/en/func/color.html | 5 +++-- html/en/func/init.html | 26 +++++++++++++++++--------- html/en/func/marks.html | 3 ++- html/en/func/other.html | 2 +- html/en/func/polygon.html | 30 ++++++++++++++++++++++++++++++ html/en/func/region.html | 2 +- html/en/func/server.html | 3 ++- html/en/func/vectortext.html | 4 ++-- html/en/func/wd.html | 2 +- html/en/history.html | 9 ++++++++- html/en/home.html | 2 +- html/wb/wb_usr.lua | 39 +++++++++++++++++++++++++-------------- html/wb_search.txt | 5 +++-- html/wb_title.html | 2 +- html/wb_tree.html | 31 ++++++++++++++++++------------- 22 files changed, 175 insertions(+), 57 deletions(-) (limited to 'html') diff --git a/html/en/drv/cairo.html b/html/en/drv/cairo.html index 4977258..c0ad80f 100644 --- a/html/en/drv/cairo.html +++ b/html/en/drv/cairo.html @@ -6,6 +6,11 @@ CAIRO + @@ -15,8 +20,9 @@

This driver represents a basic driver for all system-dependent drivers implemented in the X-Windows and MS-Windows systems. The implementation uses the Cairo API - functions and some GTK functions to support Unicode text. This driver can be - compiled and used in all systems Cairo is supported.

+ functions and Pango functions to support Unicode text. This driver can be + compiled and used in all systems Cairo is supported. The drivers Native Window, + Image, Printer and Double Buffer were implemented.

The main motivation for the use of Cairo was transparency for all the primitives. Beyond that we got other features like anti-aliasing, gradient filling, transformations and back-ends (support to rendering: PDF, PS, SVG and @@ -24,6 +30,25 @@ PNG surfaces).

This driver still does not completely replace the X-Windows and GDI Windows base drivers, because Cairo does not have support for bitwise XOR operations and for complex clipping regions.

So we let the programmer to choose what to use. We created the function + cdUseContextPlus that allows to activate or to deactivate the use of + Cairo for the available GDK, Win32 or X-Windows based drivers. + This function affects only the cdCreateCanvas function call, once created + the canvas will be always a Cairo canvas. In fact the function affects primary the definitions + CD_NATIVEWINDOW, + CD_IMAGE and + CD_DBUFFER, because they are + function calls and not static defines.

Using Cairo it is allowed to create more that one canvas at the same time for the same Window. And they can co-exist + with a standard GD, Win32 or X-Windows canvas.

To enable the use of Cairo based drivers you must call the initialization function + cdInitContextPlus() once and link to the libraries "cdcairo" and "cairo". + When using the GDK base driver you do not need to link with the "cdcairo" + library. Also the Cairo library must be installed in your system.

In CDLua it is not necessary any additional initialization, but the + application must still be linked with the cdcontextplus.lib + library or a require"cdluacontextplus" can be used when + using dynamic libraries.

Behavior of Functions

Control

@@ -39,6 +64,13 @@ for complex clipping regions.

UpdateYAxis: the orientation of axis Y is the opposite to its orientation in the CD library. +

Primitives

+ Begin: CD_PATH + is supported.
Floating point primitives are supported.

Attributes

@@ -103,6 +135,12 @@ for complex clipping regions.
background color).

"PATTERNIMAGE": defines + a filled interior style using a server image as pattern. Data must be a server + image handle created with he Cairo base driver.

"POLYHOLE": defines the index of the vertex where there is a hole in a closed polygon. It will affect the next diff --git a/html/en/drv/gdiplus.html b/html/en/drv/gdiplus.html index f5b89f4..41e72dd 100644 --- a/html/en/drv/gdiplus.html +++ b/html/en/drv/gdiplus.html @@ -61,7 +61,8 @@

Primitives

Pixel: +
Floating point primitives are supported.
Pixel: uses GDI. Excepting when the canvas is an image so it is done using GDI+.
Sector: it also draws an arc in the same position to complete the size of the sector.

CD_FILLGRADIENT

GRADIENTCOLOR

cdVertex

cdEnd

CD_PATH

Attributes

Pixel: does not exist in PDF, is simulated using a circle with radius=1.
Floating point primitives are supported.
Filled primitves do not include the line at the edges of the filled area.
Filled primitives do not include the line at the edges of the filled area.
+ Begin: CD_PATH + is supported.

Server Images

Pixel: does not exist in PS, is simulated using a circle with radius=1.
Floating point primitives are supported.
Filled primitves do not include the line at the edges of the filled area.
Filled primitives do not include the line at the edges of the filled area.
+ Begin: CD_PATH + is supported.

Server Images

Pixel

Floating point primitives are supported.
+ Begin: CD_PATH + is supported.

Client Images

diff --git a/html/en/drv/win32.html b/html/en/drv/win32.html index df0d902..86a3f4e 100644 --- a/html/en/drv/win32.html +++ b/html/en/drv/win32.html @@ -37,6 +37,9 @@ using bitmaps.

Line: needs to draw an extra pixel in the final position.

+ Begin: CD_PATH + is supported.

Attributes

Begin: - CD_BEZIER is simulated with lines.

CD_PATH

Rect: simulated using the client's Line.

Arc: diff --git a/html/en/func/color.html b/html/en/func/color.html index 8efd8a4..fbd4b52 100644 --- a/html/en/func/color.html +++ b/html/en/func/color.html @@ -52,8 +52,9 @@ cd.DecodeColor(color: lightuserdata) -> (r, g, b: number) [in Lua] cd.EncodeAlpha(color: lightuserdata, alpha: number) -> (color: lightuserdata) [in Lua]

Returns the given color coded with the alpha information. ATENTION: At the - moment only the Win32 with GDI+, the - XRender and the IMAGERGB + moment only the Cairo, + GDI+, XRender + and IMAGERGB drivers support alpha components in color coding. The internal representation of the component is inverted, because the default value must be 0 and opaque for backward compatibility, so you should use the cdDecodeAlpha diff --git a/html/en/func/init.html b/html/en/func/init.html index 9cdee9e..32a1ab6 100644 --- a/html/en/func/init.html +++ b/html/en/func/init.html @@ -41,7 +41,9 @@ cd.CreateCanvas(ctx: number, data: string or userdata) -> (canvas: cdCanvas)

CD_CLIPBOARD = Clipboard (cdclipbd.h).
CD_PRINTER = Printer (cdprint.h).
CD_PRINTER = Printer (cdprint.h).
+ CD_PICTURE = Picture in + memory (cdpicture.h).

Image-Based Drivers

CD_IMAGERGB = Client-Image Drawing (cdirgb.h).
CD_DBUFFER = Offscreen Drawing + (cddbuf.h).
CD_DBUFFERRGB = Client Offscreen Drawing (cddbuf.h).

File-Based Drivers

CD_CGM = Computer Graphics +
CD_PDF = Adobe Portable Document Format (cdpdf.h).
CD_PS = PostScript File (cdps.h).
CD_SVG = Scalable Vector Graphics (cdsvg.h).
CD_METAFILE = Internal CD Metafile (cdmf.h).
CD_DEBUG = Internal CD Debug Log (cddebug.h).
+
CD_CGM = Computer Graphics Metafile ISO (cdcgm.h).
CD_DGN = MicroStation Design File (cddgn.h).
CD_DXF = AutoCad Drawing - Interchange File (cddxf.h).

cddxf.h

CD_EMF = Microsoft Windows Enhanced Metafile (cdemf.h). Works only in MS Windows systems.
CD_METAFILE = Metafile Canvas - Draw (cdmf.h).
CD_PS = PostScript File (cdps.h).
CD_WMF = Microsoft Windows - Metafile (cdwmf.h).

cdwmf.h

cdCanvas* cdCreateCanvasf(cdContext *ctx, const char* format, ...); [in C]
@@ -115,8 +123,8 @@ cd.UseContextPlus(use: boolean) -> (old_use: boolean) [in Lua]

cd.InitContextPlus() [in Lua]

Initializes the context driver to use another context replacing the standard drivers. This functions is only available when a library containing a "ContextPlus" -context driver is used. See the GDI+ base -driver and the XRender base driver.

+context driver is used. See the Cairo, GDI+ +and XRender base drivers.

In Lua, when using require"cdluacontextplus" this function will be automatically called.

diff --git a/html/en/func/marks.html b/html/en/func/marks.html index b68db35..e467c10 100644 --- a/html/en/func/marks.html +++ b/html/en/func/marks.html @@ -25,7 +25,8 @@ canvas:Pixel(x, y: number, color: lightuserdata) [in Lua] canvas:wPixel(x, y: number, color: lightuserdata) (WC) [in Lua]

Configures the pixel (x,y) with the color defined by color. It is the smallest element of the canvas. It depends only - on global attributes of the canvas.

+ on global attributes of the canvas. It can be very slow on some drivers. + Sometimes it is implemented as a rectangle with size 1x1.

void cdCanvasMark(cdCanvas* canvas, int x, int y); [in C]
 void wdCanvasMark(cdCanvas* canvas, double x, double y); (WC) [in C]
diff --git a/html/en/func/other.html b/html/en/func/other.html
index b493ae5..d334508 100644
--- a/html/en/func/other.html
+++ b/html/en/func/other.html
@@ -48,7 +48,7 @@ cd._VERSION
 cd._VERSION_DATE
 cd._VERSION_NUMBER

Usefull definitions. They have the same value returned by cdVersion* +

Useful definitions. They have the same value returned by cdVersion* functions, except that they do not include the build number.

diff --git a/html/en/func/polygon.html b/html/en/func/polygon.html index 4e18664..4ab5834 100644 --- a/html/en/func/polygon.html +++ b/html/en/func/polygon.html @@ -6,6 +6,11 @@ Polygons + @@ -82,6 +87,31 @@ canvas:End() [in Lua]

Ends the polygon's definition and draws it.

+"PATH": allows to create + a complex path using CD primitives and then fill, stroke or clip using the + new path. Must be used with the following parameters:

"BEGIN" - creates a new empty path, must be the first call
cdCanvasPixel, cdCanvasLine, cdCanvasArc - add elements to the path + instead of drawing to the canvas
"FILL" - closes the path, and fills it with the current fill attributes, + then the path is discarded
"STROKE" - strokes the path with the current line attributes, then the + path is discarded
"CLOSESTROKE" - closes the path, and strokes it with the current line + attributes, then the path is discarded
"FILLSTROKE" - closes the path, and fills it with the current fill + attributes, strokes the path with the current line attributes, then the path + is discarded
"CLIP" - closes the path, and use it as a clipping area to be + intersected with the current clipping area, then the path is discarded
"NULL" - discards the path and ends the process without any output.
ARC - If there is a current point an additional straight line is drawn + from the current point to the starting point of the arc. The endpoint of the + arc becomes the new current point.

+ + diff --git a/html/en/func/region.html b/html/en/func/region.html index 1581180..59874b8 100644 --- a/html/en/func/region.html +++ b/html/en/func/region.html @@ -67,7 +67,7 @@ canvas:wOffsetRegion(dx, dy: number) (WC) [in Lua]

Moves the current region by the given offset. In X-Windows, if the region moves to outside the canvas border, the part moved outside will be lost, the - region will need to be reconstruted.

+ region will need to be reconstructed.

void cdCanvasGetRegionBox(cdCanvas* canvas, int *xmin, int *xmax, int *ymin, int *ymax); [in C]
 void wdCanvasGetRegionBox(cdCanvas* canvas, double *xmin, double *xmax, double *ymin, double *ymax); (WC) [in C]
diff --git a/html/en/func/server.html b/html/en/func/server.html
index 6663de5..2a9142e 100644
--- a/html/en/func/server.html
+++ b/html/en/func/server.html
@@ -21,7 +21,8 @@
   It is called "server" images because the data is stored in a system private 
   format, that the application (or the client) does not have access.
   To create a server image there must be an active canvas of a driver with 
-  server image support.
+  server image support. Only the base drivers Win32, GDI+, X-Windows, XRender 
+	and Cairo, support server images.
 
 
 cdImage* cdCanvasCreateImage(cdCanvas* canvas, int w, int h); [in C]
diff --git a/html/en/func/vectortext.html b/html/en/func/vectortext.html
index 84ca128..ec66aa2 100644
--- a/html/en/func/vectortext.html
+++ b/html/en/func/vectortext.html
@@ -14,8 +14,8 @@
       left to right.
     Vector Text Parameters

       
-    All vector text drawing in all drivers are simulated using other CD 
-      primitives.
+    All vector text drawing in all drivers are simulated with other CD 
+      primitives using polygons only.
     
     void cdCanvasVectorText(cdCanvas* canvas, int x, int y, const char* text); [in C]
 void wdCanvasVectorText(cdCanvas* canvas, double x, double y, const char* text); (WC) [in C]
diff --git a/html/en/func/wd.html b/html/en/func/wd.html
index 938d19d..02fda2e 100644
--- a/html/en/func/wd.html
+++ b/html/en/func/wd.html
@@ -24,7 +24,7 @@
       if the canvas has a small size the picture quality will be poor. To increase 
       picture quality create a canvas with a larger size, if possible.
     All World Coordinate drawing in all drivers are simulated using other CD 
-      primitives.
+	primitives and do NOT depend or use the Transformation matrix.
     
     void wdCanvasWindow(cdCanvas* canvas, double xmin, double xmax, double ymin, double ymax); [in C]
     
diff --git a/html/en/history.html b/html/en/history.html
index 3029b31..7325ce8 100644
--- a/html/en/history.html
+++ b/html/en/history.html
@@ -19,13 +19,19 @@
 
 
 History of Changes
-CVS (12/May/2010)
+Version 5.4 (XX/XX/2010)
 
 	New: context plus driver Cairo.
 	New: "CMD", "OPACITY" and "HATCHBOXSIZE" 
 	attributes in the SVG driver.
+	New: CD_PATH cdCanvasBegin 
+	mode in the SVG, PS, PDF, Cairo, Win32 and GDI+ drivers.
 	Changed:
     CD_DXF now supports solid filled primitives for polygons and rectangles.
+	Changed:
+    GDI+ base driver now supports floating point primitives. ATTENTION: check 
+	for alignment and size problems in the application. Please report if 
+	anything changed.
 	Fixed: PDF driver documentation,
 	CanvasBackOpacity and CanvasBackground are 
 	supported.
@@ -37,6 +43,7 @@
 	CanvasArc and Bezier polygon in the IMAGERGB driver.
 	Fixed: missed implementation for 
 	CD_DEBUG, CD_PICTURE and CD_DBUFFERRGB in Lua.
+	Fixed: Chord in PDF driver.
 
 Version 5.3 (26/Jan/2010)
 
diff --git a/html/en/home.html b/html/en/home.html
index e5c2968..07f79ab 100644
--- a/html/en/home.html
+++ b/html/en/home.html
@@ -11,7 +11,7 @@
 
 CD
 Canvas Draw, A 2D Graphics Library
-Version 5.3
+Version 5.4
     
 
   CD (Canvas Draw) is a platform-independent graphics library. It is implemented in several 
diff --git a/html/wb/wb_usr.lua b/html/wb/wb_usr.lua
index c7b3d4e..dc9ea95 100644
--- a/html/wb/wb_usr.lua
+++ b/html/wb/wb_usr.lua
@@ -12,7 +12,7 @@ wb_usr = {
 
 wb_usr.messages = {
   en = {
-    bar_title = "CD - Version 5.3",
+    bar_title = "CD - Version 5.4",
     title = "CD - Canvas Draw",
   }
 } 
@@ -1007,6 +1007,10 @@ wb_usr.tree =
               name= {nl= "MF"},
               link= "drv/mf.html"
             },
+            {
+              name= {nl= "DEBUG"},
+              link= "drv/debug.html"
+            },
             { link= "", name= {en= "" } },
             {
               name= {nl= "CGM"},
@@ -1029,10 +1033,6 @@ wb_usr.tree =
               name= {nl= "WMF"},
               link= "drv/wmf.html"
             },
-            {
-              name= {nl= "DEBUG"},
-              link= "drv/debug.html"
-            }
           }
         },
         {
@@ -1040,25 +1040,36 @@ wb_usr.tree =
           folder=
           {
             {
-              name= {en= "Simulation"},
-              link= "drv/sim.html"
-            },
-            {
-              name= {en= "GDK/Cairo"},
+              name= {en= "GDK"},
               link= "drv/gdk.html"
             },
             {
               name= {nl= "Win32"},
               link= "drv/win32.html"
             },
-            {
-              name= {nl= "Win32 GDI+"},
-              link= "drv/gdiplus.html"
-            },
             {
               name= {nl= "X-Win"},
               link= "drv/xwin.html"
             },
+            { link= "", name= {en= "" } },
+            {
+              name= {en= "Simulation"},
+              link= "drv/sim.html"
+            },
+          }
+        },
+        {
+          name= {en= "Context Plus"},
+          folder=
+          {
+            {
+              name= {en= "Cairo"},
+              link= "drv/cairo.html"
+            },
+            {
+              name= {nl= "GDI+"},
+              link= "drv/gdiplus.html"
+            },
             {
               name= {nl= "XRender"},
               link= "drv/xrender.html"
diff --git a/html/wb_search.txt b/html/wb_search.txt
index a8b5c89..c5755bf 100644
--- a/html/wb_search.txt
+++ b/html/wb_search.txt
@@ -5,11 +5,12 @@ en/func/wd.html
 en/func/client.html
 en/func/region.html
 en/drv/sim.html
+en/drv/xrender.html
 en/drv/native.html
 en/func/control.html
-en/drv/xrender.html
-en/drv/irgb.html
 en/drv/gdiplus.html
+en/drv/cairo.html
+en/drv/irgb.html
 en/func/vectortext.html
 en/cvs.html
 en/func/init.html
diff --git a/html/wb_title.html b/html/wb_title.html
index 577b087..2c1fec0 100644
--- a/html/wb_title.html
+++ b/html/wb_title.html
@@ -35,7 +35,7 @@ a.contact:hover {
 
-    
+    
diff --git a/html/wb_tree.html b/html/wb_tree.html
index ed2fbb6..8de3575 100644
--- a/html/wb_tree.html
+++ b/html/wb_tree.html
@@ -526,23 +526,28 @@
           PS
SVG
MF
+          DEBUG

-          CGM
-          DGN
-          DXF
+          CGM
+          DGN
+          DXF

-          EMF
-          WMF
-          DEBUG
+          EMF
+          WMF
-          Base Drivers
+          Base Drivers

-          Simulation
-          GDK/Cairo
-          Win32
-          Win32 GDI+
-          X-Win
-          XRender
+          GDK
+          Win32
+          X-Win
+          
+          Simulation
+        
+          Context Plus
+        
+          Cairo
+          GDI+
+          XRender
         
-- 
cgit v1.2.3


   
     CD - Version 5.3 CD - Version 5.4
     
      SimpleSearch