This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository hevea.
commit e07f5027b38ddd16ae4df32d2823dd367b13ad80 Author: Ralf Treinen <trei...@free.fr> Date: Sun Sep 1 20:00:57 2013 +0200 Imported Upstream version 2.09 --- CHANGES | 8 ++++++++ README | 12 ++++++------ cut.mll | 42 +++++++++++++++++++++++++++--------------- cutOut.ml | 5 ++++- cutOut.mli | 1 + html/color.hva | 2 ++ package.ml | 4 ++-- version.ml | 4 ++-- 8 files changed, 52 insertions(+), 26 deletions(-) diff --git a/CHANGES b/CHANGES index 63dd5a2..d326e3c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +version 2.09 + * Corrected a very unfortunate bug in german babel: + \@german@dquote has to consider the case when '"' is not active.. +version 2.08 + * Added \fcolorbox +version 2.07 + * bug in hacha -tocbis/-tocter when no cut induced by section. + * Do not change (\cutname) the name of toplevel file. version 2.06 * Two bugs reported by Michael Ernst fixed * - Some spaces dissapeared in toc's FIX -> add braces around macro diff --git a/README b/README index cdea20c..c0cb070 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ - This is HEVEA, version 2.06, a fast Latex to HTML translator. + This is HEVEA, version 2.09, a fast Latex to HTML translator. ADVERTISEMENT @@ -68,16 +68,16 @@ REQUIREMENTS INSTALLATION FROM THE SOURCE DISTRIBUTION Download the source distribution - http://hevea.inria.fr/distri/hevea-2.06.tar.gz + http://hevea.inria.fr/distri/hevea-2.09.tar.gz Unzip, - gunzip hevea-2.06.tar.gz + gunzip hevea-2.09.tar.gz Untar, - tar xf hevea-2.06.tar + tar xf hevea-2.09.tar Go to the source directory - cd hevea-2.06 + cd hevea-2.09 CONFIGURATION There are a few configuration variables at the beginning of @@ -127,5 +127,5 @@ MAKE IN CASE OF TROUBLE. - You do need version 3.12 (or newer) of the Objective Caml System. - Older versions of OCaml cannot compile hevea 2.06. + Older versions of OCaml cannot compile hevea 2.09. diff --git a/cut.mll b/cut.mll index 74c3db4..61426c5 100644 --- a/cut.mll +++ b/cut.mll @@ -148,10 +148,12 @@ and otherout = ref !out let close_loc _ctx _name out = Out.close out +let dont_change = ref "" + let change_name oldname name = - if !phase <= 0 then begin + if !phase <= 0 && oldname <> !dont_change then begin if verbose > 0 then - prerr_endline ("Change "^oldname^" into "^name) ; + eprintf "Change '%s' into '%s'\n" oldname name ; record_changed oldname name ; end @@ -160,6 +162,7 @@ let start_phase () = if verbose > 0 then prerr_endline ("Starting phase number: "^string_of_int !phase); let base_out = Filename.basename name_out in + dont_change := base_out ; outname := base_out ; tocname := base_out ; otheroutname := "" ; @@ -388,19 +391,28 @@ let close_chapter () = if verbose > 0 then prerr_endline ("Close chapter out="^ !outname^" toc="^ !tocname) ; if !phase > 0 then begin - if !outname <> !tocname then closehtml std_file_opt !outname !out ; - begin match toc_style with - | Both|Special -> - let real_out = real_open_out !outname in + if !outname <> !tocname then begin + closehtml std_file_opt !outname !out ; + let doout out what = + if false then begin + eprintf "DEBUG:\n" ; + Out.debug stderr what ; + eprintf "\n" + end ; + Out.to_chan out what in + begin match toc_style with + | Both|Special -> + let real_out = real_open_out !outname in (* Those hacking try with avoid failure for cuttingsection = document *) - begin try - Out.to_chan real_out !out_prefix - with Misc.Fatal _ -> () end ; - begin try - Out.to_chan real_out !out ; - with Misc.Fatal _ -> () end ; - close_out real_out - | Normal -> () + begin try + doout real_out !out_prefix + with Misc.Fatal _ -> () end ; + begin try + doout real_out !out ; + with Misc.Fatal _ -> () end ; + close_out real_out + | Normal -> () + end ; end ; out := !toc end else begin @@ -783,7 +795,7 @@ and save_html = parse | "<!--END" ' '* ['A'-'Z']+ ' '* "-->" '\n'? {let s = Out.to_string html_buff in if verbose > 0 then - prerr_endline ("save_html -> ``"^s^"''"); + eprintf "save_html -> '%s'\n" s; s} | _ {let lxm = lexeme_char lexbuf 0 in diff --git a/cutOut.ml b/cutOut.ml index 17e369a..98c3394 100644 --- a/cutOut.ml +++ b/cutOut.ml @@ -36,5 +36,8 @@ and to_string { out = out } = Out.to_string out and to_chan chan { out = out } = Out.to_chan chan out and copy { out = out1 } { out = out2 } = Out.copy out1 out2 and flush { out = out } = Out.flush out - +let debug chan { out; name; } = + Printf.fprintf chan "Out=%s\n" name ; + Out.debug chan out ; + () end diff --git a/cutOut.mli b/cutOut.mli index 0bd6776..e8ac7d2 100644 --- a/cutOut.mli +++ b/cutOut.mli @@ -30,4 +30,5 @@ type t val to_chan : out_channel -> t -> unit val copy : t -> t -> unit val flush : t -> unit + val debug : out_channel -> t -> unit end diff --git a/html/color.hva b/html/color.hva index de102ce..2a1e597 100644 --- a/html/color.hva +++ b/html/color.hva @@ -3,6 +3,8 @@ \newcommand{\textcolor}[3][!*!]{{\color[#1]{#2}#3}} \newcommand{\colorbox}[3][!*!] {{\@span{style="background-color:\@getstylecolor[#1]{#2}"}#3}} +\newcommand{\fcolorbox}[4][!*!] +{{\@span{style="background-color:\@getstylecolor[#1]{#3};border:solid \@getstylecolor[#1]{#2}"}#4}} \newenvironment{bgcolor}[2][style="padding:1em"] {\@open{table}{}\@open{tr}{}% \@open{td}{\@addstyle{background-color:\@getcolor{#2}}{#1}}} diff --git a/package.ml b/package.ml index c9574ad..ea92561 100644 --- a/package.ml +++ b/package.ml @@ -1078,8 +1078,8 @@ register_init "german" (fun () -> def_code "\\@german@dquote" (fun lexbuf -> - if effective !alltt then - Dest.put_char '"' + if effective !alltt || not (is_plain '"') then (* '"' *) + Dest.put_char '"' (* '"' *) else try let c = Save.peek_next_char lexbuf in match c with diff --git a/version.ml b/version.ml index ed7ff49..f00bb3f 100644 --- a/version.ml +++ b/version.ml @@ -9,8 +9,8 @@ (* *) (***********************************************************************) -let real_version = "2.06" -let release_date = "2013-03-29" +let real_version = "2.09" +let release_date = "2013-08-20" let version = -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/hevea.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