[Pkg-ocaml-maint-commits] [hevea] 01/13: Imported Upstream version 2.12

[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 6b46cfe87524a47047e24f63d52606b6659ea6f5
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Feb 13 21:51:18 2014 +0100

    Imported Upstream version 2.12
---
 CHANGES      |  2 ++
 README       |  2 +-
 esponja.ml   |  5 +++--
 htmllex.mll  | 12 ++++++------
 lexstyle.mll |  2 +-
 version.ml   |  2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index bdb89cc..99bb91e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+version 2.12
+     * esponja: allow ':' in attribute names.
 version 2.11
      * hacha: allow ':' in attribute names.
 version 2.10
diff --git a/README b/README
index 8084952..6f29844 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is HEVEA, version 2.11, a fast Latex to HTML translator.
+This is HEVEA, version 2.12, a fast Latex to HTML translator.
 
 
 ADVERTISEMENT
diff --git a/esponja.ml b/esponja.ml
index 78b0f34..f57a916 100644
--- a/esponja.ml
+++ b/esponja.ml
@@ -33,14 +33,15 @@ module E =
 let process name = try E.file name with Esp.Failed -> ()
 
 let main () =
-  try
+(*  try *)
     List.iter process (List.rev !arg) ;
     exit 0
-  with
+(*  with
   | e ->
       Printf.fprintf stderr "Unexpected exception: %s\n"
         (Printexc.to_string e) ;
       exit 2
+*)
 ;;
 
 main ()
diff --git a/htmllex.mll b/htmllex.mll
index 9b64914..408d2ef 100644
--- a/htmllex.mll
+++ b/htmllex.mll
@@ -242,7 +242,7 @@ and read_attrs = parse
   put atxt ;
   (name,v,atxt)::read_attrs lexbuf}
 | '>' {put_char buff '>' ; []}
-| ""  {error "Attribute syntax" lexbuf}
+| ""  {error "Attribute syntax (read_attrs)" lexbuf}
 
 and read_avalue = parse
 | blank* '=' blank*
@@ -260,7 +260,7 @@ and read_aavalue = parse
     {aput lxm ;
     lxm}
 (* '"' *)
-| "" {error "Attribute syntax" lexbuf}
+| "" {error "Attribute syntax (read_aavalue)" lexbuf}
 
 and in_tag = parse
 | '>' {putc '>'}
@@ -311,7 +311,7 @@ and skip_value = parse
 | '"'  [^'"']*  '"'
 | '#'?['a'-'z''A'-'Z''0'-'9''-''+''_'':''.']+
    { () }
-| "" { error "Attribute syntax" lexbuf }
+| "" { error "Attribute syntax (skip_value)" lexbuf }
 (* '"' *)
 
 and extract_value cls = parse
@@ -321,7 +321,7 @@ and extract_value cls = parse
     { extract_values_q cls lexbuf }
 | '"' (* '"' *)
     { extract_values_qq cls lexbuf }
-| "" { error "Attribute syntax" lexbuf }
+| "" { error "Attribute syntax (extract_value)" lexbuf }
 
 and extract_values_q cls = parse
 | blank+ { extract_values_q cls lexbuf }
@@ -344,12 +344,12 @@ and extract_attrs cls = parse
    { let cls = extract_value cls lexbuf in
      extract_attrs cls lexbuf }
 (* Other attributes with a value *)
-| ['a'-'z''A'-'Z''-''0'-'9']+ blank* '=' blank*
+| attr_name blank* '=' blank*
    { skip_value lexbuf ;
      extract_attrs cls lexbuf }
 (* End of tag *)
 | '/'? '>' { cls }
-| ""  { error "Attribute syntax" lexbuf }
+| ""  { error "Attribute syntax (extract_attrs)" lexbuf }
 
 
 {
diff --git a/lexstyle.mll b/lexstyle.mll
index 3c66016..aaf4255 100644
--- a/lexstyle.mll
+++ b/lexstyle.mll
@@ -21,7 +21,7 @@ let error msg _lb =  raise (Emisc.LexError msg)
 let blank = [' ''\t''\n''\r']
 let tag = ['a'-'z''A'-'Z''0'-'9']+
 let class_name = ['a'-'z''A'-'Z''0'-'9''-']+
-let attr_name = ['a'-'z''A'-'Z''-''0'-'9']+ 
+let attr_name = ['a'-'z''A'-'Z''0'-'9']['a'-'z''A'-'Z''-''0'-'9'':']* 
 
 rule extract styles = parse
 (* TOC comments are scanned *)
diff --git a/version.ml b/version.ml
index 90ccfdb..2e7cecf 100644
--- a/version.ml
+++ b/version.ml
@@ -9,7 +9,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-let real_version = "2.11"
+let real_version = "2.12"
 let release_date = "2014-01-14"
 
 

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