This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository tyxml.

commit 46e862933ccabc40b278c2eab816248538ba8fd6
Author: Stephane Glondu <st...@glondu.net>
Date:   Fri Jul 21 17:51:08 2017 +0200

    New upstream version 4.1.0
---
 .merlin          |  2 +-
 CHANGES          |  4 ++++
 _oasis           |  4 ++--
 _tags            | 15 +++++++++++++-
 implem/META      | 20 +++++++++---------
 lib/xml_print.ml | 63 +++++++++++++++++++++++++++++---------------------------
 myocamlbuild.ml  |  9 +++++---
 setup.ml         | 27 +++++++++++++-----------
 tyxml-ppx.opam   |  2 +-
 tyxml.install    |  6 ++++++
 tyxml.opam       |  5 +++--
 11 files changed, 95 insertions(+), 62 deletions(-)

diff --git a/.merlin b/.merlin
index 4b45eab..1adec30 100644
--- a/.merlin
+++ b/.merlin
@@ -9,5 +9,5 @@ FLG -w +A-4-9-40-42-44-48
 FLG -w -32-34-37
 FLG -strict_sequence -safe_string
 
-PKG uutf re
+PKG uchar uutf re
 PKG compiler-libs.common ppx_tools.metaquot markup
diff --git a/CHANGES b/CHANGES
index 768dcdb..fdd61bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+===== 4.1.0 ====
+
+* Uses uutf 1.0 (contribution by Daniel Bunzli)
+
 ===== 4.0.1 ====
 
 * Fix handling of comments in the ppx.
diff --git a/_oasis b/_oasis
index 407994a..d2043d9 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name: tyxml
-Version: 4.0.1
+Version: 4.1.0
 Homepage: http://ocsigen.org/tyxml/
 Authors:
   Thorsten Ohl,
@@ -56,7 +56,7 @@ Library tyxml_f
     Html_sigs,
     Html_types,
     Html_f
-  BuildDepends: uutf, re
+  BuildDepends: uchar, uutf, re
 
 Library tyxml_top
   FindlibName: top
diff --git a/_tags b/_tags
index 8aa6394..0479094 100644
--- a/_tags
+++ b/_tags
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: d07a4f5df8ed9187d90150fece42e278)
+# DO NOT EDIT (digest: 08f84ccdfdae22f07b05e65caebf94cb)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -17,10 +17,12 @@ true: annot, bin_annot
 # Library tyxml_f
 "lib/tyxml_f.cmxs": use_tyxml_f
 <lib/*.ml{,i,y}>: package(re)
+<lib/*.ml{,i,y}>: package(uchar)
 <lib/*.ml{,i,y}>: package(uutf)
 # Library tyxml
 "implem/tyxml.cmxs": use_tyxml
 <implem/*.ml{,i,y}>: package(re)
+<implem/*.ml{,i,y}>: package(uchar)
 <implem/*.ml{,i,y}>: package(uutf)
 <implem/*.ml{,i,y}>: use_tyxml_f
 # Library tyxml_top
@@ -63,6 +65,7 @@ true: annot, bin_annot
 <ppx/*.ml{,i,y}>: use_tyxml_tools
 # Executable emit_big
 <test/emitbig.{native,byte}>: package(re)
+<test/emitbig.{native,byte}>: package(uchar)
 <test/emitbig.{native,byte}>: package(unix)
 <test/emitbig.{native,byte}>: package(uutf)
 <test/emitbig.{native,byte}>: use_tyxml
@@ -71,47 +74,57 @@ true: annot, bin_annot
 # Executable main_test
 "test/main_test.byte": package(alcotest)
 "test/main_test.byte": package(re)
+"test/main_test.byte": package(uchar)
 "test/main_test.byte": package(uutf)
 "test/main_test.byte": use_tyxml
 "test/main_test.byte": use_tyxml_f
 <test/*.ml{,i,y}>: package(alcotest)
 <test/*.ml{,i,y}>: package(re)
+<test/*.ml{,i,y}>: package(uchar)
 <test/*.ml{,i,y}>: package(uutf)
 <test/*.ml{,i,y}>: use_tyxml
 <test/*.ml{,i,y}>: use_tyxml_f
 # Executable basic_website
 <examples/basic_website/site_html.{native,byte}>: package(re)
+<examples/basic_website/site_html.{native,byte}>: package(uchar)
 <examples/basic_website/site_html.{native,byte}>: package(uutf)
 <examples/basic_website/site_html.{native,byte}>: use_tyxml
 <examples/basic_website/site_html.{native,byte}>: use_tyxml_f
 <examples/basic_website/*.ml{,i,y}>: package(re)
+<examples/basic_website/*.ml{,i,y}>: package(uchar)
 <examples/basic_website/*.ml{,i,y}>: package(uutf)
 <examples/basic_website/*.ml{,i,y}>: use_tyxml
 <examples/basic_website/*.ml{,i,y}>: use_tyxml_f
 # Executable basic_website_ppx
 <examples/basic_website_ppx/site_html.{native,byte}>: package(re)
+<examples/basic_website_ppx/site_html.{native,byte}>: package(uchar)
 <examples/basic_website_ppx/site_html.{native,byte}>: package(uutf)
 <examples/basic_website_ppx/site_html.{native,byte}>: use_tyxml
 <examples/basic_website_ppx/site_html.{native,byte}>: use_tyxml_f
 <examples/basic_website_ppx/*.ml{,i,y}>: package(re)
+<examples/basic_website_ppx/*.ml{,i,y}>: package(uchar)
 <examples/basic_website_ppx/*.ml{,i,y}>: package(uutf)
 <examples/basic_website_ppx/*.ml{,i,y}>: use_tyxml
 <examples/basic_website_ppx/*.ml{,i,y}>: use_tyxml_f
 # Executable mini_website
 <examples/mini_website/minihtml.{native,byte}>: package(re)
+<examples/mini_website/minihtml.{native,byte}>: package(uchar)
 <examples/mini_website/minihtml.{native,byte}>: package(uutf)
 <examples/mini_website/minihtml.{native,byte}>: use_tyxml
 <examples/mini_website/minihtml.{native,byte}>: use_tyxml_f
 <examples/mini_website/*.ml{,i,y}>: package(re)
+<examples/mini_website/*.ml{,i,y}>: package(uchar)
 <examples/mini_website/*.ml{,i,y}>: package(uutf)
 <examples/mini_website/*.ml{,i,y}>: use_tyxml
 <examples/mini_website/*.ml{,i,y}>: use_tyxml_f
 # Executable mini_website_ppx
 <examples/mini_website_ppx/minihtml.{native,byte}>: package(re)
+<examples/mini_website_ppx/minihtml.{native,byte}>: package(uchar)
 <examples/mini_website_ppx/minihtml.{native,byte}>: package(uutf)
 <examples/mini_website_ppx/minihtml.{native,byte}>: use_tyxml
 <examples/mini_website_ppx/minihtml.{native,byte}>: use_tyxml_f
 <examples/mini_website_ppx/*.ml{,i,y}>: package(re)
+<examples/mini_website_ppx/*.ml{,i,y}>: package(uchar)
 <examples/mini_website_ppx/*.ml{,i,y}>: package(uutf)
 <examples/mini_website_ppx/*.ml{,i,y}>: use_tyxml
 <examples/mini_website_ppx/*.ml{,i,y}>: use_tyxml_f
diff --git a/implem/META b/implem/META
index 626b70e..6085c00 100644
--- a/implem/META
+++ b/implem/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: c6ec0eb7c6ec4d2ff7716e168d21e65a)
-version = "4.0.1"
+# DO NOT EDIT (digest: 8bf3e741d5984dad87597458dc9ca5aa)
+version = "4.1.0"
 description = "Statically correct HTML and SVG documents"
 requires = "tyxml.functor re uutf"
 archive(byte) = "tyxml.cma"
@@ -10,7 +10,7 @@ archive(native, plugin) = "tyxml.cmxs"
 archive(byte,toploop) += "tyxml_top.cma"
 exists_if = "tyxml.cma"
 package "top" (
- version = "4.0.1"
+ version = "4.1.0"
  description = "Toplevel printers for HTML, SVG and XML"
  requires = "tyxml"
  archive(byte) = "tyxml_top.cma"
@@ -21,7 +21,7 @@ package "top" (
 )
 
 package "tools" (
- version = "4.0.1"
+ version = "4.1.0"
  description = "Statically correct HTML and SVG documents"
  requires = "bytes"
  archive(byte) = "tyxml_tools.cma"
@@ -32,7 +32,7 @@ package "tools" (
 )
 
 package "syntax" (
- version = "4.0.1"
+ version = "4.1.0"
  description = "HTML and SVG syntax extension"
  requires = "bytes camlp4"
  archive(syntax, preprocessor) = "pa_tyxml.cma"
@@ -44,7 +44,7 @@ package "syntax" (
 )
 
 package "ppx" (
- version = "4.0.1"
+ version = "4.1.0"
  description = "HTML and SVG syntax extension (ppx)"
  requires = "tyxml"
  archive(byte) = "ppx.cma"
@@ -54,7 +54,7 @@ package "ppx" (
  ppx = "ppx_tyxml"
  exists_if = "ppx.cma"
  package "internal" (
-  version = "4.0.1"
+  version = "4.1.0"
   description = "HTML and SVG ppx library"
   requires = "re.str ppx_tools.metaquot markup tyxml.tools"
   archive(byte) = "ppx_internal.cma"
@@ -66,7 +66,7 @@ package "ppx" (
 )
 
 package "parser" (
- version = "4.0.1"
+ version = "4.1.0"
  description = "Simple XML parser"
  requires = "bytes camlp4.lib"
  archive(byte) = "tymlx_p.cma"
@@ -77,9 +77,9 @@ package "parser" (
 )
 
 package "functor" (
- version = "4.0.1"
+ version = "4.1.0"
  description = "Statically correct HTML and SVG documents (Functor version)"
- requires = "uutf re"
+ requires = "uchar uutf re"
  archive(byte) = "tyxml_f.cma"
  archive(byte, plugin) = "tyxml_f.cma"
  archive(native) = "tyxml_f.cmxa"
diff --git a/lib/xml_print.ml b/lib/xml_print.ml
index a8cb9b2..762606d 100644
--- a/lib/xml_print.ml
+++ b/lib/xml_print.ml
@@ -154,36 +154,39 @@ module Utf8 = struct
       Uutf.String.fold_utf_8
         (fun _ _ d ->
            match d with
-           | `Uchar 34 ->
-               Buffer.add_string buffer "&quot;"
-           | `Uchar 38 ->
-               Buffer.add_string buffer "&amp;"
-           | `Uchar 60 ->
-               Buffer.add_string buffer "&lt;"
-           | `Uchar 62 ->
-               Buffer.add_string buffer "&gt;"
-           | `Uchar code ->
-               let u =
-                 (* Illegal characters in html
-                  http://en.wikipedia.org/wiki/Character_encodings_in_HTML
-                  http://www.w3.org/TR/html5/syntax.html *)
-                 if (* A. control C0 *)
-                   (code <= 31 && code <> 9 && code <> 10 && code <> 13)
-                   (* B. DEL + control C1
-                    - invalid in html
-                    - discouraged in xml;
-                      except 0x85 see http://www.w3.org/TR/newline
-                      but let's discard it anyway *)
-                   || (code >= 127 && code <= 159)
-                   (* C. UTF-16 surrogate halves : already discarded by uutf *)
-                   (* || (code >= 0xD800 && code <= 0xDFFF) *)
-                   (* D. BOOM related *)
-                   || code land 0xFFFF = 0xFFFE
-                   || code land 0xFFFF = 0xFFFF
-                 then (warn:=true; Uutf.u_rep)
-                 else code
-               in
-               Uutf.Buffer.add_utf_8 buffer u
+           | `Uchar u ->
+               begin match Uchar.to_int u with
+               | 34 ->
+                   Buffer.add_string buffer "&quot;"
+               | 38 ->
+                   Buffer.add_string buffer "&amp;"
+               | 60 ->
+                   Buffer.add_string buffer "&lt;"
+               | 62 ->
+                   Buffer.add_string buffer "&gt;"
+               | code ->
+                   let u =
+                     (* Illegal characters in html
+                        
http://en.wikipedia.org/wiki/Character_encodings_in_HTML
+                        http://www.w3.org/TR/html5/syntax.html *)
+                     if (* A. control C0 *)
+                       (code <= 31 && code <> 9 && code <> 10 && code <> 13)
+                       (* B. DEL + control C1
+                          - invalid in html
+                          - discouraged in xml;
+                          except 0x85 see http://www.w3.org/TR/newline
+                          but let's discard it anyway *)
+                       || (code >= 127 && code <= 159)
+                       (* C. UTF-16 surrogate halves : already discarded
+                          by uutf || (code >= 0xD800 && code <= 0xDFFF) *)
+                       (* D. BOM related *)
+                       || code land 0xFFFF = 0xFFFE
+                       || code land 0xFFFF = 0xFFFF
+                     then (warn:=true; Uutf.u_rep)
+                     else u
+                   in
+                   Uutf.Buffer.add_utf_8 buffer u
+               end
            | `Malformed _ ->
                Uutf.Buffer.add_utf_8 buffer Uutf.u_rep;
                warn:=true)
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index e659563..2910ef2 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -21,7 +21,7 @@
 *)
 [@@@ocaml.warning "-3"]
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 02a483b5c2573d48557cede907fdb51c) *)
+(* DO NOT EDIT (digest: 9011746f9578807777d03b786d851aa4) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -768,6 +768,9 @@ module MyOCamlbuildBase = struct
 (* # 110 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
 
 
+  let env_filename = Pathname.basename BaseEnvLight.default_filename
+
+
   let dispatch_combine lst =
     fun e ->
       List.iter
@@ -900,7 +903,7 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 881 "myocamlbuild.ml"
+# 884 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -936,7 +939,7 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
 
-# 918 "myocamlbuild.ml"
+# 921 "myocamlbuild.ml"
 (* OASIS_STOP *)
 # 26 "myocamlbuild.ml"
 
diff --git a/setup.ml b/setup.ml
index a593c1e..03924f8 100644
--- a/setup.ml
+++ b/setup.ml
@@ -2,9 +2,9 @@
 
 [@@@ocaml.warning "-3"]
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 7083959774db46f9e23173d5ea65f242) *)
+(* DO NOT EDIT (digest: 341be352b891faa443d1c552cf82a9fb) *)
 (*
-   Regenerated by OASIS v0.4.7
+   Regenerated by OASIS v0.4.8
    Visit http://oasis.forge.ocamlcore.org for more information and
    documentation about functions used in this file.
 *)
@@ -659,6 +659,7 @@ module OASISContext = struct
       ignore_unknown_fields: bool;
       printf:                level -> string -> unit;
       srcfs:                 source OASISFileSystem.fs;
+      load_oasis_plugin:     string -> bool;
     }
 
 
@@ -683,6 +684,7 @@ module OASISContext = struct
         ignore_unknown_fields = false;
         printf                = printf;
         srcfs                 = new OASISFileSystem.host_fs(Sys.getcwd ());
+        load_oasis_plugin     = (fun _ -> false);
       }
 
 
@@ -3161,7 +3163,7 @@ module OASISFileUtil = struct
 end
 
 
-# 3163 "setup.ml"
+# 3165 "setup.ml"
 module BaseEnvLight = struct
 (* # 22 "src/base/BaseEnvLight.ml" *)
 
@@ -3241,7 +3243,7 @@ module BaseEnvLight = struct
 end
 
 
-# 3243 "setup.ml"
+# 3245 "setup.ml"
 module BaseContext = struct
 (* # 22 "src/base/BaseContext.ml" *)
 
@@ -5664,7 +5666,7 @@ module BaseCompat = struct
 end
 
 
-# 5666 "setup.ml"
+# 5668 "setup.ml"
 module InternalConfigurePlugin = struct
 (* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *)
 
@@ -6470,7 +6472,7 @@ module InternalInstallPlugin = struct
 end
 
 
-# 6472 "setup.ml"
+# 6474 "setup.ml"
 module OCamlbuildCommon = struct
 (* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
 
@@ -6843,7 +6845,7 @@ module OCamlbuildDocPlugin = struct
 end
 
 
-# 6845 "setup.ml"
+# 6847 "setup.ml"
 module CustomPlugin = struct
 (* # 22 "src/plugins/custom/CustomPlugin.ml" *)
 
@@ -6975,7 +6977,7 @@ module CustomPlugin = struct
 end
 
 
-# 6977 "setup.ml"
+# 6979 "setup.ml"
 open OASISTypes;;
 
 let setup_t =
@@ -7138,7 +7140,7 @@ let setup_t =
        {
           oasis_version = "0.4";
           ocaml_version = Some (OASISVersion.VGreaterEqual "4.02.0");
-          version = "4.0.1";
+          version = "4.1.0";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7209,6 +7211,7 @@ let setup_t =
                       bs_compiled_object = Best;
                       bs_build_depends =
                         [
+                           FindlibPackage ("uchar", None);
                            FindlibPackage ("uutf", None);
                            FindlibPackage ("re", None)
                         ];
@@ -9910,8 +9913,8 @@ let setup_t =
           plugin_data = []
        };
      oasis_fn = Some "_oasis";
-     oasis_version = "0.4.7";
-     oasis_digest = Some "q`\2286\007\191\182\127\245\168|\216[H\175D";
+     oasis_version = "0.4.8";
+     oasis_digest = Some "\1443`\169S\132[\175\188\241\150\164Tcu%";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
@@ -9919,7 +9922,7 @@ let setup_t =
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 9922 "setup.ml"
+# 9925 "setup.ml"
 let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
 open BaseCompat.Compat_0_4
 (* OASIS_STOP *)
diff --git a/tyxml-ppx.opam b/tyxml-ppx.opam
index 2346247..cd6977d 100644
--- a/tyxml-ppx.opam
+++ b/tyxml-ppx.opam
@@ -1,6 +1,6 @@
 opam-version: "1.2"
 
-version: "4.0.1"
+version: "4.1.0"
 
 maintainer: "d...@ocsigen.org"
 author: "The ocsigen team"
diff --git a/tyxml.install b/tyxml.install
new file mode 100644
index 0000000..de8d452
--- /dev/null
+++ b/tyxml.install
@@ -0,0 +1,6 @@
+lib: "tyxml.opam" { "opam" }
+doc: [
+  "README.md"
+  "CHANGES"
+  "COPYING" { "LICENSE" }
+]
diff --git a/tyxml.opam b/tyxml.opam
index 71e0ee8..f19c78f 100644
--- a/tyxml.opam
+++ b/tyxml.opam
@@ -1,6 +1,6 @@
 opam-version: "1.2"
 
-version: "4.0.1"
+version: "4.1.0"
 
 maintainer: "d...@ocsigen.org"
 author: "The ocsigen team"
@@ -30,7 +30,8 @@ remove: ["ocamlfind" "remove" "tyxml"]
 depends: [
   "ocamlfind" {build}
   "ocamlbuild" {build}
-  "uutf"
+  "uchar"
+  "uutf" {>= "1.0.0"}
   "base-bytes"
   "re" {>= "1.5.0"}
   "alcotest" {test}

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/tyxml.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to