Cairo renderer

.merlin

@@ -1,3 +1,3 @@
 EXT js
-PKG gg js_of_ocaml
+PKG gg js_of_ocaml cairo2
 B _build/**

README.md

@@ -7,18 +7,20 @@ images are values that denote functions mapping points of the
 cartesian plane to colors. The module provides combinators to define
 and compose these values.
 
-Renderers for PDF, SVG and the HTML canvas are distributed with the
+Renderers for PDF, SVG, Cairo and the HTML canvas are distributed with the
 module. An API allows to implement new renderers.
 
 Vg depends only on [Gg][1]. The SVG renderer has no dependency, the
 PDF renderer depends on [Uutf][2] and [Otfm][3], the HTML canvas
-renderer depends on [js_of_ocaml][4]. Vg and its renderers are
-distributed under the BSD3 license.
+renderer depends on [js_of_ocaml][4], the Cairo renderer depends on
+[cairo2][5]. Vg and its renderers are distributed under the BSD3
+license.
 
 [1]: http://erratique.ch/software/gg
 [2]: http://erratique.ch/software/uutf
 [3]: http://erratique.ch/software/otfm
 [4]: http://ocsigen.org/js_of_ocaml/ 
+[5]: https://forge.ocamlcore.org/projects/cairo/
 
 Home page: http://erratique.ch/software/vg  
 Contact: Daniel Bünzli `<daniel.buenzl i@erratique.ch>`
@@ -28,8 +30,8 @@ Contact: Daniel Bünzli `<daniel.buenzl i@erratique.ch>`
 
 Vg can be installed with `opam`:
 
-    opam install vg                        # SVG renderer only
-    opam install uutf otfm js_of_ocaml vg  # all renderers
+    opam install vg                               # SVG renderer only
+    opam install uutf otfm js_of_ocaml cairo2 vg  # all renderers
 
 If you don't use `opam` consult the [`opam`](opam) file for
 build instructions and a complete specification of the dependencies.
@@ -64,6 +66,8 @@ The resulting binaries are in `_build/test` :
 - `min_htmlc.byte`, minimal example to render with the HTML canvas.
 - `rsvg.native`, renders images of the Vg image database to SVG files.
 - `rpdf.native`, renders images of the Vg image database to PDF files.
+- `rcairo.native`, renders images of the Vg image database with Cairo
+   to PDF, PNG, PS or SVG files.
 - `rhtmlc.html` and `rhtmlc.byte` can be processed with `js_of_ocaml`,
    the resulting webapp renders images of the Vg image database with
    the HTML canvas, PDF and SVG renderers.   

_tags

@@ -12,6 +12,8 @@
 
 <src/vgr_pdf.{mli,ml}> : package(gg), package(uutf), package(otfm)
 
+<src/vgr_cairo.{mli,ml}>: package(gg), package(cairo2)
+
 <db/*.{mli,ml}> : package(gg)
 <db/glyphs_pdf.{mli,ml}> : package(uutf)
 
@@ -25,6 +27,9 @@
 
 <test/rsvg.{mli,ml,byte,native}> : package(gg), package(uutf), package(unix)
 
+<test/rcairo.{mli,ml,byte,native}> : package(gg), package(uutf), \
+                                     package(unix), package(cairo2)
+
 <test/rhtmlc.{mli,ml,byte}> : package(gg), package(otfm), package(uutf), \
                               package(js_of_ocaml), \
                               package(js_of_ocaml.syntax), syntax(camlp4o)
@@ -33,6 +38,8 @@
 
 <test/min_svg.{ml,byte,native}> : package(gg)
 
+<test/min_cairo.{ml,byte,native}> : package(gg), package(cairo2)
+
 <test/min_htmlc.{ml,byte}> : package(gg), package(js_of_ocaml), \
                              package(js_of_ocaml.syntax), syntax(camlp4o)
 
@@ -42,4 +49,4 @@
 <test/examples.{ml,byte,native}> : package(gg)
 
 <test/vecho.{ml,byte,native}> : package(gg), package(uutf), package(otfm)
-<test/fglyphs.{ml,byte,native}> : package(gg), package(uutf), package(otfm)
+<test/fglyphs.{ml,byte,native}> : package(gg), package(uutf), package(otfm)

build

@@ -11,7 +11,7 @@ OCAMLBUILD=${OCAMLBUILD:="ocamlbuild -tag debug -classic-display \
 action () 
 {
     case $1 in
-      default)      $OCAMLBUILD vg.cmx vgr_pdf.cmx vgr_svg.cmx vgr_htmlc.cmx ;;
+      default)      $OCAMLBUILD vg.cmx vgr_pdf.cmx vgr_svg.cmx vgr_htmlc.cmx vgr_cairo.cmx ;;
       tests)        $OCAMLBUILD rpdf.native rsvg.native; action rhtmlc ;;
       rhtmlc)       shift; 
                     pkg/db-locs

doc/api.odocl

@@ -2,3 +2,4 @@ Vg
 Vgr_htmlc
 Vgr_pdf
 Vgr_svg
+Vgr_cairo

doc/dev-api.odocl

@@ -2,5 +2,6 @@ Vg
 Vgr_htmlc
 Vgr_pdf
 Vgr_svg
+Vgr_cairo
 Mui
-Db
+Db

opam

@@ -9,13 +9,14 @@ tags: [ "pdf" "svg" "html-canvas" "declarative" "graphics" "org:erratique" ]
 license: "BSD3"
 ocaml-version: [>= "4.01.0"]
 depends: [ "ocamlfind" "gg" {>= "0.9.0"} ]
-depopts: [ "uutf" "otfm" "js_of_ocaml"  ]
+depopts: [ "uutf" "otfm" "js_of_ocaml" "cairo2" ]
 build: 
 [
   [ "ocaml" "pkg/git.ml" ] 
   [ "ocaml" "pkg/build.ml" "native=%{ocaml-native}%"
                            "native-dynlink=%{ocaml-native-dynlink}%"
                            "uutf=%{uutf:installed}%" 
                            "otfm=%{otfm:installed}%" 
+                           "cairo2=%{cairo2:installed}%"
                            "jsoo=%{js_of_ocaml:installed}%" ]
 ]

pkg/META

@@ -39,3 +39,14 @@ package "htmlc" (
   archive(native, plugin) = "vgr_htmlc.cmxs"
   exists_if = "vgr_htmlc.cma"
 )
+
+package "cairo" (
+  version = "%%VERSION%%"
+  description = "Vg's Cairo renderer"
+  requires = "vg cairo2"
+  archive(byte) = "vgr_cairo.cma"
+  archive(byte, plugin) = "vgr_cairo.cma"
+  archive(native) = "vgr_cairo.cmxa"
+  archive(native, plugin) = "vgr_cairo.cmxs"
+  exists_if = "vgr_cairo.cma"
+)

pkg/build.ml

@@ -6,6 +6,7 @@ let uutf = Env.bool "uutf"
 let otfm = Env.bool "otfm"
 let jsoo = Env.bool "jsoo"
 let vgr_pdf = uutf && otfm
+let cairo2 = Env.bool "cairo2"
 
 let () = Pkg.describe "vg" ~builder:`OCamlbuild [
     Pkg.lib "pkg/META";
@@ -14,11 +15,13 @@ let () = Pkg.describe "vg" ~builder:`OCamlbuild [
     Pkg.lib ~cond:vgr_pdf ~exts:Exts.module_library "src/vgr_pdf";
     Pkg.bin ~cond:vgr_pdf ~auto:true "test/vecho";
     Pkg.lib ~cond:jsoo ~exts:Exts.module_library "src/vgr_htmlc";
+    Pkg.lib ~cond:cairo2 ~exts:Exts.module_library "src/vgr_cairo";
     Pkg.doc "README.md";
     Pkg.doc "CHANGES.md";
     Pkg.doc "test/min_htmlc.html";
     Pkg.doc "test/min_htmlc.ml";
     Pkg.doc "test/min_pdf.ml";
     Pkg.doc "test/min_svg.ml";
+    Pkg.doc "test/min_cairo.ml";
     Pkg.doc "test/fglyphs.ml";
 ]