test/test2.f90 is now creating a SVG file, and test4.f90 a PDF file

Author: vmagnin

CHANGELOG.md

@@ -9,6 +9,8 @@ All notable changes to the gtk-fortran project are documented in this file. The
 
 ### Changed
 - `src/cairo-auto.f90` and `src/cairo-enums.f90` updated for **Cairo 1.17.8** (generated with the `cfwrapper.py` program under Fedora 38).
+- `test/test2.f90` is now creating a SVG file.
+- `test/test4.f90` is now creating a PDF file.
 
 ## [cairo-fortran 1.0.0]
 

README.md

@@ -55,7 +55,7 @@ $ cd cairo-fortran
 
 ## Testing cairo-fortran
 
-Each test prints nothing in the terminal but is creating a PNG file. You should therefore obtain three PNG files in the main directory of the project:
+Each test prints nothing in the terminal but is creating an output file in the main directory of the project: `test1.f90` a PNG file, `test2.f90` a SVG file and `test4.f90` a PDF file.
 
 ```bash
 $ fpm test
@@ -70,10 +70,12 @@ test4                                  done.
 test1                                  done.
 test2                                  done.
 [100%] Project compiled successfully.
-$ ls *.png
-axis.png  chess.png  F.png
+$ ls *.png *.svg *.pdf
+axis.svg  chess.pdf  F.png
 ```
 
+See https://cairographics.org/manual/cairo-surfaces.html for other available *surfaces* (for example you could use PostScript).
+
 ### Example test1
 ![test1](pictures/F.png)
 ### Example test2

test/test2.f90

@@ -9,7 +9,7 @@
 ! - Draw axis and grid lines
 ! - Plot a function i(t) = I|\cos(\omega t + \phi)|
 ! - Draw a line
-! - Save the image to disk
+! - Save the image to disk in SVG
 
 program test2
     use cairo
@@ -32,10 +32,13 @@ program test2
     type(cairo_matrix_t), target :: m
     integer :: i
 
-    ! Initialize
-    surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, &
-                                       & int(IMAGE_WIDTH), int(IMAGE_HEIGHT))
+    ! Rendering in a SVG file:
+    surface = cairo_svg_surface_create("axis.svg"//c_null_char, &
+                                      & IMAGE_WIDTH, IMAGE_HEIGHT)
     c = cairo_create(surface)
+    call cairo_svg_surface_restrict_to_version(surface, CAIRO_SVG_VERSION_1_2)
+
+    ! Initialize
     call cairo_set_antialias(c, CAIRO_ANTIALIAS_BEST)
 
     ! Set background colour
@@ -93,9 +96,6 @@ program test2
     call cairo_line_to(c, 40.d0, -40.d0)
     call cairo_stroke(c)
 
-    ! Write .png
-    r = cairo_surface_write_to_png(surface, "axis.png"//c_null_char)
-
     ! Destroy
     call cairo_destroy(c)
     call cairo_surface_destroy(surface)

test/test4.f90

@@ -4,7 +4,7 @@
 ! - Create a 480x480 image
 ! - Create an internal workspace 8x8
 ! - Draw board
-! - Save image to disk
+! - Save image to disk in PDF
 
 program test4
     use cairo
@@ -21,10 +21,12 @@ program test4
     type(cairo_matrix_t), target :: m
     integer :: i, j
 
-    ! Initialize
-    surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, &
-                                       & int(IMAGE_WIDTH), int(IMAGE_HEIGHT))
+    ! Rendering in a PDF file:
+    surface = cairo_pdf_surface_create("chess.pdf"//c_null_char, &
+                                     & IMAGE_WIDTH, IMAGE_HEIGHT)
     c = cairo_create(surface)
+
+    ! Initialize
     call cairo_set_antialias(c, CAIRO_ANTIALIAS_BEST)
 
     ! Transform image coordinates (480x480) to my internal workspace (8x8)
@@ -51,9 +53,6 @@ program test4
         end do
     end do
 
-    ! Write .png
-    r = cairo_surface_write_to_png(surface, "chess.png"//c_null_char)
-
     ! Destroy
     call cairo_destroy(c)
     call cairo_surface_destroy(surface)