Compilation of the patobook works.

.travis.yml

@@ -39,6 +39,8 @@ install:
   - make
 
 script:
+  - cd patobook
+  - make
   - echo "OK"
 
 notifications:

drivers/Bin/dune

@@ -1,6 +1,6 @@
 (library
-  (name driver_bin)
-  (public_name patoline.driver.bin)
+  (name Bin)
+  (public_name patoline.driver.Bin)
   (modules :standard)
   (wrapped false)
   (libraries patoraw patodb))

drivers/DriverCairo/dune

@@ -1,6 +1,6 @@
 (library
-  (name driver_cairo)
-  (public_name patoline.driver.cairo)
+  (name DriverCairo)
+  (public_name patoline.driver.DriverCairo)
   (modules :standard)
   (wrapped false)
   (optional) ; requires cairo2

drivers/DriverGL/dune

@@ -1,6 +1,6 @@
 (library
-  (name driver_gl)
-  (public_name patoline.driver.gl)
+  (name DriverGl)
+  (public_name patoline.driver.DriverGL)
   (modules DriverGL GlFBO Vec3)
   (c_names FrameBuffer)
   (wrapped false)

drivers/DriverImage/dune

@@ -1,7 +1,7 @@
 (library
-  (name driver_image)
-  (public_name patoline.driver.image)
+  (name DriverImage)
+  (public_name patoline.driver.DriverImage)
   (modules :standard)
   (wrapped false)
   (optional) ; requires lablgl
-  (libraries patoraw driver_gl))
+  (libraries patoraw DriverGL))

drivers/Html/dune

@@ -1,6 +1,6 @@
 (library
-  (name driver_html)
-  (public_name patoline.driver.html)
+  (name Html)
+  (public_name patoline.driver.Html)
   (modules :standard)
   (wrapped false)
-  (libraries patoraw driver_svg))
+  (libraries patoraw SVG))

drivers/Net/dune

@@ -1,6 +1,6 @@
 (library
-  (name driver_net)
-  (public_name patoline.driver.net)
+  (name Net)
+  (public_name patoline.driver.Net)
   (modules :standard)
   (wrapped false)
-  (libraries patoraw driver_svg patconfig))
+  (libraries patoraw SVG patconfig))

drivers/None/dune

@@ -1,6 +1,6 @@
 (library
-  (name driver_none)
-  (public_name patoline.driver.none)
+  (name None)
+  (public_name patoline.driver.None)
   (modules :standard)
   (wrapped false)
   (libraries patoraw))

drivers/Patonet/dune

@@ -1,6 +1,6 @@
 (library
-  (name driver_patonet)
-  (public_name patoline.driver.patonet)
+  (name Patonet)
+  (public_name patoline.driver.Patonet)
   (modules :standard)
   (wrapped false)
   (optional) ; requires cryptokit

drivers/Pdf/dune

@@ -1,6 +1,6 @@
 (library
-  (name driver_pdf)
-  (public_name patoline.driver.pdf)
+  (name Pdf)
+  (public_name patoline.driver.Pdf)
   (modules :standard)
   (wrapped false)
   (libraries camlzip patconfig unicodelib patoraw patfonts))

drivers/SVG/dune

@@ -1,6 +1,6 @@
 (library
-  (name driver_svg)
-  (public_name patoline.driver.svg)
+  (name SVG)
+  (public_name patoline.driver.SVG)
   (modules :standard)
   (wrapped false)
   (libraries patutil patoraw typography))

formats/dune

@@ -1,69 +1,69 @@
 (library
   (name DefaultFormat)
-  (public_name patoline.format.default)
+  (public_name patoline.format.DefaultFormat)
   (modules DefaultFormat)
   (wrapped false)
   (libraries typography patconfig patoraw unicodelib hyphen))
 
 (library
   (name FormatArticle)
-  (public_name patoline.format.article)
+  (public_name patoline.format.FormatArticle)
   (modules FormatArticle)
   (wrapped false)
   (libraries typography DefaultFormat hyphen))
 
 (library
   (name FormatLetter)
-  (public_name patoline.format.letter)
+  (public_name patoline.format.FormatLetter)
   (modules FormatLetter)
   (wrapped false)
   (libraries typography DefaultFormat hyphen))
 
 (library
   (name FormatLivre)
-  (public_name patoline.format.livre)
+  (public_name patoline.format.FormatLivre)
   (modules FormatLivre)
   (wrapped false)
   (libraries typography DefaultFormat hyphen))
 
 (library
   (name FormatThese)
-  (public_name patoline.format.these)
+  (public_name patoline.format.FormatThese)
   (modules FormatThese)
   (wrapped false)
-  (libraries typography DefaultFormat hyphen))
+  (libraries str typography DefaultFormat hyphen))
 
 (library
   (name FormatMemoire)
-  (public_name patoline.format.memoire)
+  (public_name patoline.format.FormatMemoire)
   (modules FormatMemoire)
   (wrapped false)
   (libraries typography DefaultFormat FormatThese hyphen))
 
 (library
   (name FormatSlides)
-  (public_name patoline.format.slides)
+  (public_name patoline.format.FormatSlides)
   (modules FormatSlides)
   (wrapped false)
   (libraries typography DefaultFormat FormatThese hyphen))
 
 (library
   (name SimpleSlides)
-  (public_name patoline.format.simple_slides)
+  (public_name patoline.format.SimpleSlides)
   (modules SimpleSlides)
   (wrapped false)
   (libraries typography DefaultFormat FormatThese hyphen))
 
 (library
   (name LMFormat)
-  (public_name patoline.format.lm)
+  (public_name patoline.format.LMFormat)
   (modules LMFormat)
   (wrapped false)
   (libraries typography DefaultFormat hyphen))
 
 (library
   (name FormatWeb)
-  (public_name patoline.format.web)
+  (public_name patoline.format.FormatWeb)
   (modules FormatWeb)
   (wrapped false)
-  (libraries typography DefaultFormat driver_svg))
+  (libraries typography DefaultFormat SVG))

grammars/dune

@@ -10,7 +10,7 @@
 (executable
   (name DefaultGrammar_)
   (modules :standard)
-  (libraries dynlink typography patoraw DefaultFormat driver_pdf))
+  (libraries dynlink typography patoraw DefaultFormat Pdf))
 
 (rule
   (targets DefaultGrammar.pdf)

patobook/Drawings.txp

@@ -1,5 +1,5 @@
 (* #FORMAT FormatThese *)
-(* #PACKAGES bibi *)
+(* #PACKAGES patoline.bibi *)
 
 \Caml(
   open Bibi

patobook/Editors.txp

@@ -1,5 +1,5 @@
 (* #FORMAT FormatThese *)
-(* #PACKAGES bibi *)
+(* #PACKAGES patoline.bibi *)
 
 \Caml(
   open Bibi

patobook/Extending.txp

@@ -1,5 +1,5 @@
 (* #FORMAT FormatThese *)
-(* #PACKAGES bibi *)
+(* #PACKAGES patoline.bibi *)
 
 \Caml(
   open Bibi

patobook/FirstDocuments.txp

@@ -1,5 +1,5 @@
 (* #FORMAT FormatThese *)
-(* #PACKAGES bibi *)
+(* #PACKAGES patoline.bibi *)
 
 \Caml(
   open Bibi

patobook/PatoMaths.txp

@@ -1,5 +1,5 @@
 (* #FORMAT FormatThese *)
-(* #PACKAGES bibi *)
+(* #PACKAGES patoline.bibi *)
 
 \Caml(
   open Bibi

patobook/Programming.txp

@@ -1,5 +1,5 @@
 (* #FORMAT FormatThese *)
-(* #PACKAGES bibi *)
+(* #PACKAGES patoline.bibi *)
 
 \Caml(
   open Bibi

patobook/Typesetting.txp

@@ -1,5 +1,5 @@
 (* #FORMAT FormatThese *)
-(* #PACKAGE bibi *)
+(* #PACKAGE patoline.bibi *)
 
 \Caml(
   open Bibi

patobook/patobook.txp

@@ -1,5 +1,5 @@
 (* #FORMAT FormatThese *)
-(* #PACKAGE bibi *)
+(* #PACKAGE patoline.bibi *)
 
 (*
 
@@ -36,6 +36,7 @@ Pierre-Etienne Meunier
 
   open Patoline_Output
   open Typography.Box
+  open Patutil
   open Extra
 
   let couverture=

patobook/test.txp

@@ -1,4 +1,4 @@
-(* #PACKAGES bibi *)
+(* #PACKAGES patoline.bibi *)
 
 
 

patobuild/build.ml

@@ -445,7 +445,7 @@ let extend_config config ls =
     if config.pat_format <> None then config else
     let packages =
       if List.mem f patoconfig.formats then
-        ("Typography." ^ f) :: config.packages
+        ("patoline.format." ^ f) :: config.packages
       else config.packages
     in
     { config with packages; pat_format = Some f }
@@ -454,7 +454,7 @@ let extend_config config ls =
     if config.pat_driver <> None then config else
     let packages =
       if List.mem d patoconfig.drivers then
-        ("Typography." ^ d) :: config.packages
+        ("patoline.driver." ^ d) :: config.packages
       else config.packages
     in
     { config with packages; pat_driver = Some d }

patobuild/patoline.ml

@@ -53,7 +53,7 @@ let bin_args   = ref []
 let opt_args   = ref []
 let pp_args    = ref []
 let local_path = ref []
-let packages   = ref ["rawlib"; "Typography"; "earley"; "earley.str"]
+let packages   = ref ["patoline.patoraw"; "patoline.typography"; "earley"; "earley.str"]
 let pat_format = ref None
 let pat_driver = ref None
 let do_clean   = ref false
@@ -156,15 +156,15 @@ let cfg =
   let path = "." :: !local_path in (* FIXME remove duplicates *)
   let driver_packages =
     match !pat_driver with
-    | None                                      -> ["Typography.Pdf"]
-    | Some d when List.mem d patoconfig.drivers -> ["Typography." ^ d]
+    | None                                      -> ["patoline.driver.Pdf"]
+    | Some d when List.mem d patoconfig.drivers -> ["patoline.driver." ^ d]
     | _                                         -> []
   in
   let format_packages =
     match !pat_format with
     | None                                      -> []
     | Some "DefaultFormat"                      -> []
-    | Some f when List.mem f patoconfig.formats -> ["Typography." ^ f]
+    | Some f when List.mem f patoconfig.formats -> ["patoline.format." ^ f]
     | _                                         -> []
   in
   let packages = !packages @ format_packages @ driver_packages in

patoraw/dune

@@ -2,4 +2,4 @@
   (name patoraw)
   (public_name patoline.patoraw)
   (modules :standard)
-  (libraries imagelib patutil patfonts))
+  (libraries dynlink imagelib patutil patfonts))

proof/dune

@@ -3,4 +3,4 @@
   (public_name proof)
   (package patoline)
   (modules proof)
-  (libraries dynlink patutil patfonts typography patoraw driver_pdf))
+  (libraries dynlink patutil patfonts typography patoraw Pdf))