From 6a8f711261fd26ef877c36313e84e29f6b63ac49 Mon Sep 17 00:00:00 2001 From: adrianp Date: Fri, 4 Feb 2005 22:23:23 +0000 Subject: - Update of hevea from 1.06 to 1.07 > version 1.07 > - Release, to follow ocaml evolution. > > version 1.06+1 > - Added \lstnewenvironment in package listings > - Pb pour les delims de hauteur 1 : -> rescanner le delimiteur ! Pas le tps. > - Bug in text manager : incorrect behavior \centering-like declarations. > Solution make the align flags systematically stacked > - Add a command-line flag to hacha > -nolinks -> suppress Previous/Up/Next links > - Small hacha bug : replicate \htmlfoot argument in index.html file > even when hevea generated footer is absent. > - New \@charset command and xxcharset.exe script, to control > output document character set. > - firstnumber=auto|last|nnn in listings.hva > - started adding an example for listings (exlst.tex) > - proper (?) implementation of emph classes in listings > (some debug print left) > - key label in listings + ignore empty fst argument of env > listing + patch on initial line numbers > - An attempt to follow << listings >> pace of developement > all '*label*' keys are now '*numbers*' keys, snif. > - Added bgcolor definition in hevea.sty, not very good > (some debug print left) > - key label in listings + ignore empty fst argument of env > listing + patch on initial line numbers > - An attempt to follow << listings >> pace of developement > all '*label*' keys are now '*numbers*' keys, snif. > - Added bgcolor definition in hevea.sty, not very good > - Spaces are irrelevant everywhere in array/tabular format > - A new warning for \right and \left in non-display mode. > - Special parsing (\@verbimagearg) for ``\DeclareGraphicsRule'' last > argument. > - Allow multiples > and < in package array. > - Better error message for undefined defaults in keyval. > - Do not check comments before Save.arg_verbatim. > - Added a new primitive \@styleattr > - Almost complete multibib package. > - Small bit of xypic (-> all \xymatrix are images). > version 1.06 > version 1.06-7 > - \ifmagen indroduced, \imagentrue at beginning of .image.tex, > \imagenfalse in hevea.sty, if \ifimagen undefined. > - Bug -> stopimage in lstinline. > - Throw away index when some key field is empty (i.e. mimic makeindex) > - Introduced \htmprefix > - Bug in ``\@displayint'' (introduced by the new ``\@getprint'') > - compatibility with ocaml 3.03 (do not close a file twice) > - Table of contents a` la LaTeX. > - new ``-hrf'' option for hacha > - PNG managment in hevea/imagen > - Added a ``-quant'' option to imagen > - Changed ``\@getprint'' to interpret characters Cleaned a few bad usages of ` > `\@getprint'' > - Added ``\hyperref'' with optional argument. > - Added underscore package > - Bug htmlfoot, MUST appear last in hevea output > - small stuff in listings (showlines and continued line numbering) > version 1.06-6 > - Added esponja > - Better error diagnostic for bad usage of \begin{document}... \end{document} > - Added a \tocnomber command to include section numbers in table of > contents > - Better amstmath package > version 1.06-5 > - \index allowed in section titles (@norefs extension) > - Big dynamic scoping bug in packages.hva > - Two easy misfeature disappear > . trailing -exec prog brougth back one step > . blanks allowed in array formats > - Option -version > - Bug in image.ml, finalize -> active := false, to make module restartable > - Bug moreverb, protect get_line by save_lexstate/restore_lexstate. > - Bug paragraphe (remettre Save.seen_par a` false dans make_stack). > - Bug \iftest -> modifs locales (par fun_register) > - Bug argument csname de \newcommand dans toimage -> save_arg > - Licence du manuel. > - Bug par, Dest.par None doit e^tre un nop (cf. appel dans expand_command, > avec name = \par). > - insertion d'un @verbarg pour les clefs de labels et de citations > - Hot oubliait les notes de bas de page. > - Simplification Misc.copy_hashtbl, > ne marche plus pour les liaisans multiples. > - small simplification fancyvrb > - \sbox lrbox finally ok ? > - New \@getprintnostyle primitive > - Leading spaces in \usepackage{pkg1, pgk2} > - New optimized mode for styles. > - Plein de bugs corrige's (arguments a` , notamment), listings et fancyverb > > version 1.06-4 > version 1.06-3 > - Bug hacha, all output now goes into current directory > - Paragraphs not ok, quick fix (in \\begin and \\end) > - All document was typeset inside a Latexmacros group ! > -> change \document \enddocument commands > - Corrected a bugs in argument parsing/scanning (save_sup/sub and > arg scanning with ``may_cont'' > - alltt flags ignored when the alltt package is not loaded > - A little more for fancyvrb > > version 1.06-2 > - Started implementing the fancyvrb package > > version 1.06-1 > - A la TeX \mathop > - patched bugs in info genearation > - alltt implementation revised. Efficency concern > - listings package implementation > - \def and \let now have TeX semantics *IMPORTANT* > - \toplinks, for prev,up, next links on the root file. > - Bug for paragraphs inside \@stopoutput.. \@restoreoutput. > - Bug CamlCode in get.mll lexer. Correction is patchy. > version 1.05 > - Paragraphs not ok, quick fix (in \\begin and \\end) > - All document was typeset inside a Latexmacros group ! > -> change \document \enddocument commands > - Corrected a bugs in argument parsing/scanning (save_sup/sub and > arg scanning with ``may_cont'' > - alltt flags ignored when the alltt package is not loaded > - A little more for fancyvrb > > version 1.06-2 > - Started implementing the fancyvrb package > > version 1.06-1 > - A la TeX \mathop > - patched bugs in info genearation > - alltt implementation revised. Efficency concern > - listings package implementation > - \def and \let now have TeX semantics *IMPORTANT* > - \toplinks, for prev,up, next links on the root file. > - Bug for paragraphs inside \@stopoutput.. \@restoreoutput. > - Bug CamlCode in get.mll lexer. Correction is patchy. --- textproc/hevea/Makefile | 7 +++-- textproc/hevea/PLIST | 7 ++++- textproc/hevea/distinfo | 8 +++--- textproc/hevea/patches/patch-aa | 58 +++++++++++++++-------------------------- 4 files changed, 34 insertions(+), 46 deletions(-) (limited to 'textproc/hevea') diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile index 8cbbab63156..c532e3b9977 100644 --- a/textproc/hevea/Makefile +++ b/textproc/hevea/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2004/05/03 23:45:56 danw Exp $ +# $NetBSD: Makefile,v 1.9 2005/02/04 22:23:23 adrianp Exp $ -DISTNAME= hevea-1.06 -PKGREVISION= 1 +DISTNAME= hevea-1.07 CATEGORIES= textproc MASTER_SITES= http://para.inria.fr/~maranget/hevea/distri/ @@ -9,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://para.inria.fr/~maranget/hevea/ COMMENT= LaTeX to HTML translator -BUILD_DEPENDS+= ocaml>=3.00:../../lang/ocaml +BUILD_DEPENDS+= ocaml>=3.07:../../lang/ocaml MAKE_ENV+= M4="${M4}" diff --git a/textproc/hevea/PLIST b/textproc/hevea/PLIST index 5d13c6d039e..9882c920da4 100644 --- a/textproc/hevea/PLIST +++ b/textproc/hevea/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2003/06/29 22:57:14 jtb Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/02/04 22:23:23 adrianp Exp $ bin/hacha bin/hevea bin/esponja @@ -15,6 +15,9 @@ share/hevea/cutfoot-eng.html share/hevea/cutfoot-fra.html share/hevea/footer.tex share/hevea/hevea.sty +share/hevea/multibib.hva +share/hevea/natbib-common.hva +share/hevea/xxcharset.exe share/hevea/html/article.hva share/hevea/html/book.hva share/hevea/html/color.hva @@ -25,6 +28,7 @@ share/hevea/html/fancyvrb.hva share/hevea/html/graphics.hva share/hevea/html/graphicx.hva share/hevea/html/hevea.hva +share/hevea/html/natbib.hva share/hevea/html/png.hva share/hevea/html/report.hva share/hevea/html/seminar.hva @@ -36,6 +40,7 @@ share/hevea/html/symb-mathml.hva share/hevea/html/symb-text.hva share/hevea/html/symb.hva share/hevea/html/urlhref.hva +share/hevea/html/xypic.hva share/hevea/hyperref.hva share/hevea/ifthen.hva share/hevea/index.hva diff --git a/textproc/hevea/distinfo b/textproc/hevea/distinfo index 55a5a2bb59a..5ad5c462a27 100644 --- a/textproc/hevea/distinfo +++ b/textproc/hevea/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2004/05/03 23:45:56 danw Exp $ +$NetBSD: distinfo,v 1.6 2005/02/04 22:23:23 adrianp Exp $ -SHA1 (hevea-1.06.tar.gz) = e973ed329287adbf64703c578401ad0287c895f7 -Size (hevea-1.06.tar.gz) = 231094 bytes -SHA1 (patch-aa) = 2bbd2a20767e9c15b54ddfd61077a38cf85649d4 +SHA1 (hevea-1.07.tar.gz) = 04cbd526e8458f8535c166e367e1ee5856f1815e +Size (hevea-1.07.tar.gz) = 234342 bytes +SHA1 (patch-aa) = fbfd42da2d372fe2fa44821811aaa0cc179b49b5 diff --git a/textproc/hevea/patches/patch-aa b/textproc/hevea/patches/patch-aa index 235f89f10f0..4d045d45956 100644 --- a/textproc/hevea/patches/patch-aa +++ b/textproc/hevea/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2004/05/03 23:45:56 danw Exp $ +$NetBSD: patch-aa,v 1.6 2005/02/04 22:23:23 adrianp Exp $ ---- Makefile.orig Fri Feb 15 10:47:09 2002 -+++ Makefile +--- Makefile.orig 2005-01-13 20:27:38.000000000 +0000 ++++ Makefile 2005-01-13 20:39:04.000000000 +0000 @@ -1,12 +1,12 @@ ################## Configuration parameters # Compile using ocamlopt, to use ocamlc set TARGET=byte @@ -13,42 +13,44 @@ $NetBSD: patch-aa,v 1.5 2004/05/03 23:45:56 danw Exp $ # Where to install programms -BINDIR=/usr/local/bin +BINDIR=${PREFIX}/bin - # A replacement for /lib/cpp --CPP=gcc -E -P -x c + # C preprocessor with proper options (don't ask) +-CPP=cpp -E -P +CPP=${M4} - ############### End of configuration parameters - SUF= - #DIR=/usr/bin/ -@@ -18,7 +18,7 @@ OCAMLFLAGS= - OCAMLCI=${DIR}ocamlc$(SUF) + #Some alternatives... + #CPP=/lib/cpp -E -P (Old fashioned Unix) + #CPP=gcc -E -P -x c (If you have gcc) +@@ -21,8 +21,8 @@ + OCAMLCI=$(OCAMLC) OCAMLOPT=${DIR}ocamlopt$(SUF) OCAMLLEX=${DIR}ocamllex$(SUF) -INSTALL=cp +-MKDIR=mkdir -p +INSTALL=${BSD_INSTALL_DATA} ++MKDIR=${MKDIR} ONLYESPONJA=emisc.cmo buff.cmo htmllex.cmo htmlparse.cmo htmltext.cmo pp.cmo util.cmo explode.cmo ultra.cmo esponja.cmo -@@ -46,30 +46,30 @@ byte: +@@ -50,30 +50,30 @@ $(MAKE) $(MFLAGS) TARGET=byte hevea.byte hacha.byte esponja.byte cutfoot-fra.html cutfoot-eng.html install-lib: -- -mkdir $(LIBDIR) +- - $(MKDIR) $(LIBDIR) - $(INSTALL) hevea.sty cutfoot-fra.html cutfoot-eng.html footer.tex ${LIBDIR} - $(INSTALL) contents_motif.gif next_motif.gif previous_motif.gif ${LIBDIR} - $(INSTALL) $(ALLLIB) $(LIBDIR) -- -mkdir $(LIBDIR)/html +- - $(MKDIR) $(LIBDIR)/html - cd html ; $(INSTALL) $(HTMLLIB) $(LIBDIR)/html -- -mkdir $(LIBDIR)/text +- - $(MKDIR) $(LIBDIR)/text - cd text ; $(INSTALL) $(TEXTLIB) $(LIBDIR)/text -- -mkdir $(LIBDIR)/info +- - $(MKDIR) $(LIBDIR)/info - cd info ; $(INSTALL) $(INFOLIB) $(LIBDIR)/info + $(BSD_INSTALL_DATA_DIR) $(LIBDIR) -+ $(BSD_INSTALL_DATA) hevea.sty cutfoot-fra.html cutfoot-eng.html footer.tex $(LIBDIR) -+ $(BSD_INSTALL_DATA) contents_motif.gif next_motif.gif previous_motif.gif $(LIBDIR) ++ $(BSD_INSTALL_DATA) hevea.sty cutfoot-fra.html cutfoot-eng.html footer.tex ${LIBDIR} ++ $(BSD_INSTALL_DATA) contents_motif.gif next_motif.gif previous_motif.gif ${LIBDIR} + $(BSD_INSTALL_DATA) $(ALLLIB) $(LIBDIR) -+ $(BSD_INSTALL_DATA_DIR) $(LIBDIR)/html ++ $(BSD_INSTALL_DATA_DIR) $(LIBDIR)/html + cd html ; $(BSD_INSTALL_DATA) $(HTMLLIB) $(LIBDIR)/html -+ $(BSD_INSTALL_DATA_DIR) $(LIBDIR)/text ++ $(BSD_INSTALL_DATA_DIR) $(LIBDIR)/text + cd text ; $(BSD_INSTALL_DATA) $(TEXTLIB) $(LIBDIR)/text + $(BSD_INSTALL_DATA_DIR) $(LIBDIR)/info + cd info ; $(BSD_INSTALL_DATA) $(INFOLIB) $(LIBDIR)/info @@ -77,21 +79,3 @@ $NetBSD: patch-aa,v 1.5 2004/05/03 23:45:56 danw Exp $ hevea.byte: ${OBJS} -@@ -103,7 +103,7 @@ cutfoot-eng.html: cutfoot.tex html/hevea - HEVEADIR=. ; export HEVEADIR ; ${HEVEA} < cutfoot.tex | ${ESPONJA}> $@ - - .SUFFIXES: --.SUFFIXES: .ml .cmo .mli .cmi .c .mll .cmx -+.SUFFIXES: .ml .cmo .mli .cmi .c .mll .cmx - - .mll.ml: - ${OCAMLLEX} $< -@@ -128,7 +128,7 @@ clean: cleanbyte - rm -f *.byte *.opt - rm -f $(GENSRC) - rm -f *.o *.cmi *.cmo *.cmx *.o *.ppo *.ppi -- rm -f *~ #*# html/*~ html/#*# text/*~ text/#*# info/*~ info/#*# -+ rm -f *~ #*# html/*~ html/#*# text/*~ text/#*# info/*~ info/#*# - rm -f cutfoot-fra.html cutfoot-eng.html - - depend: $(GENSRC) -- cgit v1.2.3