This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository hevea.
commit c258fb42406d998ac272186edd3ee10671f0c0ea Author: Ralf Treinen <trei...@free.fr> Date: Mon Mar 14 19:29:04 2016 +0100 Imported Upstream version 2.28 --- CHANGES | 13 +++++++++++++ README | 2 +- _tags | 2 +- cleveref.hva | 2 +- examples/index.tex | 4 ++-- hevea.ml | 8 +++++++- html/svg.hva | 6 ++++++ imagen | 20 ++++++++++++++++++-- infoRef.mll | 13 +++++++++---- latexcommon.hva | 2 ++ libs.def | 2 +- lstlang1.hva | 2 +- lstlang2.hva | 2 +- lstlang3.hva | 2 +- version.ml | 4 ++-- 15 files changed, 66 insertions(+), 18 deletions(-) diff --git a/CHANGES b/CHANGES index 2dd9b92..0ee2f3f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,16 @@ +version 2.28 + * lstlisting: find files lstlang?.sty in path (as latex does). +version 2.27 + * info: Add initial capitals for some words (workaround against + (reported) info reader v 6.0 bug +version 2.26 + * add a warning in case of missing \end{document} + * cleveref.hva patch (removes extra white space), credit: Tim Bourke. +version 2.25 + * Oups !! Forgot to add svg.hva, corrected. +version 2.24 + * Add svg.hva style file, to produce svg images. + * More robust build. version 2.23 * include examples source in the distribution, as advertisedd on web page. diff --git a/README b/README index 368c2bc..067d01e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This is HEVEA, version 2.23, a fast Latex to HTML translator. +This is HEVEA, version 2.28, a fast Latex to HTML translator. ADVERTISEMENT diff --git a/_tags b/_tags index 118565d..7b01c4c 100644 --- a/_tags +++ b/_tags @@ -1,3 +1,3 @@ true: annot true: safe_string -<mylib.ml> : pp(../expandlib.sh) +<mylib.ml> : pp(/bin/sh ../expandlib.sh) diff --git a/cleveref.hva b/cleveref.hva index 25bdd5c..0b31e5c 100644 --- a/cleveref.hva +++ b/cleveref.hva @@ -109,7 +109,7 @@ \newcommand{\crefdefaultlabelformat}{\@cr@def{\@cr@fmt}{3}} \newcommand{\@@cr@fmt}[5] {\if@cref@nameinlink -\@cr@fmt{\@@cr@secname{#1}{#2}~#3}{#4}{#5} +\@cr@fmt{\@@cr@secname{#1}{#2}~#3}{#4}{#5}% \else\@@cr@secname{#1}{#2}~\@cr@fmt{#3}{#4}{#5}\fi} \newcommand{\@cr@def@fmt}[2] {\@cr@def@withother diff --git a/examples/index.tex b/examples/index.tex index 4d3e6fd..31c1a98 100644 --- a/examples/index.tex +++ b/examples/index.tex @@ -53,8 +53,8 @@ While the text output generated with: \end{verbatim} \item The test suite: \ahrefurl{suite.tex} -(\hevea{} style file \ahref{suite-macros.hva}, \LaTeX{} style file -\ahref{suite-macros.sty}) +(\hevea{} style file \ahrefurl{suite-macros.hva}, \LaTeX{} style file +\ahrefurl{suite-macros.sty}) and \ahrefurl{suite.html} (see also \ahrefurl{suite.dvi} and \ahrefurl{suite.txt}). diff --git a/hevea.ml b/hevea.ml index 1ce9720..4f71c18 100644 --- a/hevea.ml +++ b/hevea.ml @@ -125,7 +125,13 @@ let read_tex name_in = begin try match name_in with | "" -> Lexstate.real_input_file !verbose scan_main "" stdin - | _ -> Lexstate.input_file !verbose scan_main name_in + | _ -> + Lexstate.input_file !verbose scan_main name_in ; + let ok = scan_get_prim "\\@end@document@seen" in + begin match ok with + | "OK" -> () + | _ -> prerr_endline "Warning: \\end{document} is missing" + end with | Misc.EndDocument -> () end diff --git a/html/svg.hva b/html/svg.hva new file mode 100644 index 0000000..1f2996e --- /dev/null +++ b/html/svg.hva @@ -0,0 +1,6 @@ +\@addimagenopt{-svg} +\newcommand{\@svg@src}[1]{\ife\heveaimagedir\else\heveaimagedir/\fi\jobname@base\theimage{}#1} +\newcommand{\@svg@srcset}{\@getprint{srcset=\@print{"}\@svg@src{.svg}, \@svg@src{\heveaimageext}\@print{"}}} +\let\@svg@imageflush\imageflush +\renewcommand{\imageflush}[1][] +{\ife#1\@svg@imageflush[\@svg@srcset]\else\@svg@imageflush[#1 \@svg@srcset]\fi} diff --git a/imagen b/imagen index 496e586..61ac17c 100755 --- a/imagen +++ b/imagen @@ -12,6 +12,7 @@ TOPNG="-interlace Plane -quality 90 png:-" TOEXT=${TOPNG} EXT=png TODIR="." +SVG=false RM="/bin/rm -f" @@ -34,7 +35,10 @@ do -pnm) TOEXT="pnm:-" EXT=pnm - ;; + ;; + -svg) + SVG=true + ;; -quant) shift echo "Warning: option -quant deprecated" 1>&2 @@ -57,7 +61,6 @@ do ;; -pdflatex|-pdf) LATEX=pdflatex - DVIPS=cat ;; -raw) EXTRA='' @@ -117,5 +120,18 @@ else ${DVIPS} ${DVIPSOPTS} -o - ${NAME}.dvi fi |\ ${GS} ${GSOPTS} -sOutputFile="| sh ${COM} > ${FINAL}" - + +if $SVG +then + pdflatex ${NAME}.tex + if [ ${NAMEDIR} != "." ] + then + mv `basename ${NAME}.pdf` ${NAME}.pdf + fi + pdfcrop ${NAME}.pdf ${NAME}.crop.pdf + pdf2svg ${NAME}.crop.pdf "${TODIR}/${BASE}%03d.svg" all + ${RM} ${NAME}.crop.pdf +fi + ${RM} ${COM} ${NAME}.dvi ${NAME}.pdf head.tmp body.tmp ${RM} `basename ${NAME}.log` `basename ${NAME}.aux` diff --git a/infoRef.mll b/infoRef.mll index c170f1e..0baae35 100644 --- a/infoRef.mll +++ b/infoRef.mll @@ -249,12 +249,17 @@ let affiche_menu num = ;; +let put_node n = + put ("Node: "^noeud_name n^""^string_of_int n.pos^"\n") +;; + let do_affiche_tag_table s = - put ("\n\nTag table:\n"^(if s<> "" then s^"\n" else "")) ; + put ("\n\nTag Table:\n"^(if s<> "" then s^"\n" else "")) ; + Hashtbl.iter + (fun _ n -> match n.name with | "Top" -> put_node n | _ -> ()) nodes ; Hashtbl.iter - (fun _ n -> - put ("Node: "^noeud_name n^""^string_of_int n.pos^"\n")) nodes; - put "\nEnd tag table\n"; + (fun _ n -> match n.name with | "Top" -> ()| _ -> put_node n) nodes; + put "\nEnd Tag Table\n"; ;; diff --git a/latexcommon.hva b/latexcommon.hva index d209ca7..450745e 100644 --- a/latexcommon.hva +++ b/latexcommon.hva @@ -332,6 +332,8 @@ \begin{toimage} \end{document} \end{toimage}} +\def\@end@document@seen{NO}% +\AtEndDocument{\gdef\@end@document@seen{OK}} %%% Boxes \newcommand{\textfbox}[1]{\hva@warn{\fbox in text}\mbox{#1}} \def\fbox#1{% diff --git a/libs.def b/libs.def index 45d83d6..cee292d 100644 --- a/libs.def +++ b/libs.def @@ -1,4 +1,4 @@ ALLLIB= alltt.hva amsmath.hva articlecommon.hva babel.hva bookcommon.hva booktabs.hva comment.hva compat.hva hyperref.hva hrlang.hva ifthen.hva index.hva iso-symb.hva keyval.hva latexcommon.hva listings.hva lstlang1.hva lstlang2.hva lstlang3.hva makeidx.hva mathop.hva moreverb.hva multibib.hva multind.hva natbib-common.hva packages.hva plain.hva program.hva spaces.hva supertabular.hva underscore.hva url.hva verbatim.hva french-common.hva german-common.hva english.hva czech.hva portuguese [...] -HTMLLIB= amssymb.hva amsfonts.hva article.hva austrian.hva book.hva color.hva colortbl.hva commongraphic.hva fancysection.hva fancyvrb.hva french.hva german.hva graphics.hva graphicx.hva hevea.hva common-math.hva mathpartir.hva natbib.hva png.hva gif.hva report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva symb-fra.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva undersection.hva +HTMLLIB= amssymb.hva amsfonts.hva article.hva austrian.hva book.hva color.hva colortbl.hva commongraphic.hva fancysection.hva fancyvrb.hva french.hva german.hva graphics.hva graphicx.hva hevea.hva common-math.hva mathpartir.hva natbib.hva png.hva gif.hva svg.hva report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva symb-fra.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva undersection.hva TEXTLIB=article.hva book.hva color.hva colortbl.hva fancysection.hva hevea.hva report.hva seminar.hva french.hva austrian.hva german.hva natbib.hva INFOLIB=article.hva book.hva hevea.hva report.hva seminar.hva diff --git a/lstlang1.hva b/lstlang1.hva index c34e05e..f34b021 100644 --- a/lstlang1.hva +++ b/lstlang1.hva @@ -1 +1 @@ -\input{\@hevealibdir/lstlang1.sty} +\input{lstlang1.sty} diff --git a/lstlang2.hva b/lstlang2.hva index 5911e07..c447092 100644 --- a/lstlang2.hva +++ b/lstlang2.hva @@ -1 +1 @@ -\input{\@hevealibdir/lstlang2.sty} +\input{lstlang2.sty} diff --git a/lstlang3.hva b/lstlang3.hva index fde6977..71d7eda 100644 --- a/lstlang3.hva +++ b/lstlang3.hva @@ -1 +1 @@ -\input{\@hevealibdir/lstlang3.sty} +\input{lstlang3.sty} diff --git a/version.ml b/version.ml index 4d13736..cc5a9c2 100644 --- a/version.ml +++ b/version.ml @@ -9,8 +9,8 @@ (* *) (***********************************************************************) -let real_version = "2.23" -let release_date = "2015-03-08" +let real_version = "2.28" +let release_date = "2015-12-29" 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