[Pkg-ocaml-maint-commits] [hevea] 11/13: Imported Upstream version 2.16

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository hevea.

commit 4c425e1f251947fb3c2ea7650a035a80c7758dac
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Jun 19 08:32:33 2014 +0200

    Imported Upstream version 2.16
---
 CHANGES       |  6 ++++++
 README        |  2 +-
 htmlCommon.ml |  2 +-
 iso-symb.hva  |  2 +-
 latexscan.mli |  2 ++
 latexscan.mll | 15 ++++++++++++---
 package.ml    |  5 ++++-
 version.ml    |  4 ++--
 8 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index d02aa22..bda4bff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+version 2.16
+     * Patchy: change fnsymbol from '%' to '$'
+version 2.15
+     * Correct definition of \@addstyle as '%' can now occur
+       in attr -> inline definition of \@printnostyle
+     * Correct bug : define \% as \char037 not as \@print{\char045} !     
 version 2.14
      * Rationalize buffer usage and suppress private buff module.
 version 2.13
diff --git a/README b/README
index d93b945..bd54cf0 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is HEVEA, version 2.13, a fast Latex to HTML translator.
+This is HEVEA, version 2.16, a fast Latex to HTML translator.
 
 
 ADVERTISEMENT
diff --git a/htmlCommon.ml b/htmlCommon.ml
index b61824b..2973067 100644
--- a/htmlCommon.ml
+++ b/htmlCommon.ml
@@ -1496,7 +1496,7 @@ let insert_block tag arg =
         !cur_out.top <- Insert (false,[])
     | ActivateClosed {top_active=active ; top_pending=pending}->
         !cur_out.top <- Insert (false,to_pending pending active)
-    | NotMe -> ()
+    | NotMe
     | Insert _ -> ()
   end ;
   flags.insert <- Some (tag,arg)
diff --git a/iso-symb.hva b/iso-symb.hva
index d7310e7..2d68613 100644
--- a/iso-symb.hva
+++ b/iso-symb.hva
@@ -1,5 +1,5 @@
 %% Escapable special characters
-\def\%{\@print{\char045}}
+\def\%{\char37}
 \def\${\@print{$}}%$
 \def\#{\@print{#}}
 \def\&{\@print{&}}
diff --git a/latexscan.mli b/latexscan.mli
index 97cc9c0..f9b5057 100644
--- a/latexscan.mli
+++ b/latexscan.mli
@@ -32,6 +32,8 @@ module type S =
     val newif_ref : string -> bool ref -> unit
     val top_open_block : string -> string -> unit
     val top_close_block : string -> unit
+    val top_open_group : unit -> unit
+    val top_close_group : unit -> unit
     val check_alltt_skip : Lexing.lexbuf -> unit
     val skip_pop : Lexing.lexbuf -> unit
 (* 'def' functions for initialisation only *)
diff --git a/latexscan.mll b/latexscan.mll
index 242e65b..f0b45ad 100644
--- a/latexscan.mll
+++ b/latexscan.mll
@@ -38,6 +38,8 @@ module type S =
     val newif_ref : string -> bool ref -> unit
     val top_open_block : string -> string -> unit
     val top_close_block : string -> unit
+    val top_open_group : unit -> unit
+    val top_close_group : unit -> unit
     val check_alltt_skip : Lexing.lexbuf -> unit
     val skip_pop : Lexing.lexbuf -> unit
 (* 'def' functions for initialisation only *)
@@ -2386,6 +2388,12 @@ def_code "\\@auxdowrite"
      let s = get_this_arg main what in
      Auxx.swrite s)
 ;;
+(* Idem, with no evaluation *)
+def_code "\\@auxdowritesubst"
+  (fun lexbuf ->
+     let what = subst_arg lexbuf in
+     Auxx.swrite what)
+;;
 
 (* format toc file *)
 def_code "\\@addtocsec"
@@ -3120,13 +3128,13 @@ let fnsymbol_of_int = function
   0 -> " "
 | 1 -> "*"
 | 2 -> "#"
-| 3 -> "\\%"
+| 3 -> "$"
 | 4 -> "\167"
 | 5 -> "\182"
 | 6 -> "||"
 | 7 -> "**"
 | 8 -> "##"
-| 9 -> "%%"
+| 9 -> "$$"
 | i -> alpha_of_int (i-9)
 ;;
 
@@ -3135,7 +3143,8 @@ let def_printcount name f =
     (fun lexbuf ->
       let cname = get_prim_arg lexbuf in
       let cval = Counter.value_counter cname in
-      Dest.put (f cval))
+      let pp = f cval in
+      Dest.put pp)
 ;;
 
 def_printcount "\\arabic" string_of_int ;
diff --git a/package.ml b/package.ml
index bc218ac..533319b 100644
--- a/package.ml
+++ b/package.ml
@@ -343,7 +343,10 @@ def_code
   let add = get_prim_arg lexbuf in
   let attr = get_prim_arg lexbuf in
   let attr = Lexattr.add_style add attr in
-  scan_this main (sprintf "\\@printnostyle{%s}" attr))
+  Scan.top_open_group () ;
+  Dest.nostyle () ;
+  Dest.put attr ;
+  Scan.top_close_group ())
 ;;
 
 (* A few subst definitions, with 2 optional arguments *)
diff --git a/version.ml b/version.ml
index 8d2b103..79827ea 100644
--- a/version.ml
+++ b/version.ml
@@ -9,8 +9,8 @@
 (*                                                                     *)
 (***********************************************************************)
 
-let real_version = "2.14"
-let release_date = "2014-04-16"
+let real_version = "2.16"
+let release_date = "2014-06-09"
 
 
 let version =

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