[Pkg-ocaml-maint-commits] r1380 - in tags/packages: . hevea hevea/1.08-1 hevea/1.08-1/debian hevea/1.08-1/debian/examples hevea/1.08-1/debian/examples/simple hevea/1.08-1/debian/examples/style_sheets hevea/1.08-1/debian/manpages hevea/1.08-1/debian/patches
Ralf Treinen
treinen@costa.debian.org
Sun, 15 May 2005 19:39:20 +0000
Author: treinen
Date: 2005-05-15 19:39:19 +0000 (Sun, 15 May 2005)
New Revision: 1380
Added:
tags/packages/hevea/
tags/packages/hevea/1.07-6/
tags/packages/hevea/1.08-1/
tags/packages/hevea/1.08-1/debian/
tags/packages/hevea/1.08-1/debian/examples/style_sheets/
tags/packages/hevea/1.08-1/debian/examples/style_sheets/Makefile
tags/packages/hevea/1.08-1/debian/examples/style_sheets/text.tex
Removed:
tags/packages/hevea/1.08-1/debian/patches/01_imagen_typo.dpatch
tags/packages/hevea/1.08-1/debian/patches/04_rawtext.dpatch
tags/packages/hevea/1.08-1/debian/patches/05_license.dpatch
Modified:
tags/packages/hevea/1.08-1/debian/changelog
tags/packages/hevea/1.08-1/debian/control
tags/packages/hevea/1.08-1/debian/examples/Makefile
tags/packages/hevea/1.08-1/debian/examples/index.tex
tags/packages/hevea/1.08-1/debian/examples/simple/text.tex
tags/packages/hevea/1.08-1/debian/manpages/hevea.1
tags/packages/hevea/1.08-1/debian/patches/00list
tags/packages/hevea/1.08-1/debian/patches/02_nogif.dpatch
tags/packages/hevea/1.08-1/debian/patches/03_charset.dpatch
tags/packages/hevea/1.08-1/debian/rules
Log:
hevea 1.08-1
Copied: tags/packages/hevea/1.07-6 (from rev 1377, trunk/packages/hevea/trunk)
Copied: tags/packages/hevea/1.08-1/debian (from rev 1377, trunk/packages/hevea/trunk/debian)
Modified: tags/packages/hevea/1.08-1/debian/changelog
===================================================================
--- trunk/packages/hevea/trunk/debian/changelog 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/changelog 2005-05-15 19:39:19 UTC (rev 1380)
@@ -1,13 +1,20 @@
-hevea (1.07-6) unstable; urgency=medium
+hevea (1.08-1) unstable; urgency=low
- * Bump (build-)dependency on ocaml-* from 3.08 to 3.08.3. (closes: #300951)
- * Stated in manpages that documentation is in non-free (closes: #291955)
- * debian/watch: new upstream url
- * Removed bogus file debian/watch
+ * New upstream release.
+ * Bumped (build-)dependency on ocaml-* to 3.08.3
+ * Stated in manpages that documentation is in non-free
+ * Removed bogus file debian/files.
* Put our own manpages in directory debian/manpages.
* Use dh_installman instead of dh_installmanpages.
+ * Removed patches 01_imagen_typo, 04_rawtext, 05_licence since fixed by
+ upstream.
+ * Adapted patches 02_nogif, 03_charset to new source version
+ * debian/rules: use LATEXLIBDIR variable of Makefile to install hevea.sty
+ * Added example for style sheets and special symbols.
+ * Updated package description for translation of special sysmbols.
+ * Updated manpage to reflect new/removed options.
- -- Ralf Treinen <treinen@debian.org> Wed, 23 Mar 2005 01:42:18 +0100
+ -- Ralf Treinen <treinen@debian.org> Sun, 15 May 2005 21:05:54 +0200
hevea (1.07-5) unstable; urgency=low
Modified: tags/packages/hevea/1.08-1/debian/control
===================================================================
--- trunk/packages/hevea/trunk/debian/control 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/control 2005-05-15 19:39:19 UTC (rev 1380)
@@ -2,7 +2,7 @@
Section: tex
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
-Uploaders: Ralf Treinen <treinen@debian.org>, Sven Luther <luther@debian.org>, Remi Vanicat <vanicat@debian.org>, Stefano Zacchiroli <zack@debian.org>, Samuel Mimram <smimram@debian.org>
+Uploaders: Ralf Treinen <treinen@debian.org>, Sven Luther <luther@debian.org>, Jerome Marant <jerome@debian.org>, Remi Vanicat <vanicat@debian.org>, Stefano Zacchiroli <zack@debian.org>, Samuel Mimram <smimram@debian.org>
Build-Depends-Indep: debhelper (>= 4.0), ocaml-nox-3.08.3, dpatch
Standards-Version: 3.6.1
@@ -12,9 +12,10 @@
Suggests: hevea-doc
Description: translates from LaTeX to HTML, info, or text
Its remarkable features are
- - It produces good output. By default (can be turned off) it uses
- in case of HTML output the symbol face for math symbols. Either way it
- usually avoids generating zillions of picture files.
+ - It produces good output. Special symbols (like mathematical symbols) are
+ translated into Unicode entities which should be rendered by any graphical
+ browser. Picture files are only generated on demand, for instance when
+ translating graphics.
- It is highly configurable through (La)TeX macros. Though aimed at
LaTeX input it understands a fair subset of TeX' macro language.
- It runs fast.
Modified: tags/packages/hevea/1.08-1/debian/examples/Makefile
===================================================================
--- trunk/packages/hevea/trunk/debian/examples/Makefile 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/examples/Makefile 2005-05-15 19:39:19 UTC (rev 1380)
@@ -2,6 +2,7 @@
(cd simple; make)
(cd bibtex; make)
(cd pictures; make)
+ (cd style_sheets; make)
index.html: index.tex
hevea index.tex
@@ -11,3 +12,4 @@
(cd simple; make clean)
(cd bibtex; make clean)
(cd pictures; make clean)
+ (cd style_sheets; make clean)
Modified: tags/packages/hevea/1.08-1/debian/examples/index.tex
===================================================================
--- trunk/packages/hevea/trunk/debian/examples/index.tex 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/examples/index.tex 2005-05-15 19:39:19 UTC (rev 1380)
@@ -1,7 +1,7 @@
\documentclass[11pt]{article}
\usepackage{hevea}
+\title{Some simple test documents for \hevea}
\begin{document}
-\title{Some simple test documents for \hevea}
\maketitle
\begin{enumerate}
@@ -25,6 +25,12 @@
\ahref{pictures/png.html}{[Result with PNG picture (default)]}
\ahref{pictures/gif.html}{[Result with GIF picture (optional)]}
+\item A simple example showing customization through style sheets.
+
+\ahref{style_sheets/text.tex}{[LaTeX{} input]}
+\ahref{style_sheets/Makefile}{[Makefile]}
+\ahref{style_sheets/text.html}{[Result]}
+
\end{enumerate}
\end{document}
Modified: tags/packages/hevea/1.08-1/debian/examples/simple/text.tex
===================================================================
--- trunk/packages/hevea/trunk/debian/examples/simple/text.tex 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/examples/simple/text.tex 2005-05-15 19:39:19 UTC (rev 1380)
@@ -1,9 +1,9 @@
\documentclass[11pt]{article}
\usepackage{hevea}
\usepackage{url}
-\begin{document}
\title{A simple example of the usage of \hevea}
\author{Ralf Treinen\\\url{mailto:treinen@debian.org}}
+\begin{document}
\maketitle
This is a very simple example demonstrating some features of \hevea, a
@@ -14,6 +14,10 @@
\[
e = mc^2
\]
+translate mathematical symbols like
+\[
+\alpha\beta\gamma\omega \mapsto \Sigma\Pi
+\]
and can set tabular material like
\begin{center}
\begin{tabular}{|l|cr|}
Added: tags/packages/hevea/1.08-1/debian/examples/style_sheets/Makefile
===================================================================
--- trunk/packages/hevea/trunk/debian/examples/style_sheets/Makefile 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/examples/style_sheets/Makefile 2005-05-15 19:39:19 UTC (rev 1380)
@@ -0,0 +1,11 @@
+text.html: text.tex
+ hevea text.tex
+
+text.dvi: text.tex
+ latex text.tex
+
+text.ps: text.dvi
+ dvips -o text.ps text.dvi
+
+clean:
+ rm -f *.ps *.dvi *.html *.aux *.haux *log *.htoc
Added: tags/packages/hevea/1.08-1/debian/examples/style_sheets/text.tex
===================================================================
--- trunk/packages/hevea/trunk/debian/examples/style_sheets/text.tex 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/examples/style_sheets/text.tex 2005-05-15 19:39:19 UTC (rev 1380)
@@ -0,0 +1,30 @@
+\documentclass[11pt]{article}
+\usepackage{hevea}
+\usepackage{url}
+\newstyle{.section}{font-size:x-large; color:red; font-variant:small-caps}
+\newstyle{.subsection}{font-size:large; color:blue; background-color:pink}
+\title{Example of customizing \hevea{} through style sheets}
+\author{Ralf Treinen\\\url{mailto:treinen@debian.org}}
+\begin{document}
+\maketitle
+
+Starting with version 1.08, \hevea{} supports customization through
+style sheets. The customization is achieved through \verb|\newstyle|
+commands in the preamble of the docoment.
+
+\section{This is a Section Heading in a customized style}
+
+We have customized section headings to be set in red and small caps,
+using font size \texttt{x-large}.
+
+\subsection{This is a Subsection Heading in a customized style}
+
+We have customized subsection headings to be set in font size
+\texttt{large}, in blue on pink background.
+
+See the documentation, available through the \verb|hevea-doc| package
+from the \emph{non-free} section, or at
+\ahrefurl{http://pauillac.inria.fr/hevea/doc/index.html}, for details.
+
+\end{document}
+
Modified: tags/packages/hevea/1.08-1/debian/manpages/hevea.1
===================================================================
--- trunk/packages/hevea/trunk/debian/manpages/hevea.1 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/manpages/hevea.1 2005-05-15 19:39:19 UTC (rev 1380)
@@ -30,6 +30,9 @@
and then invoke \fIimagen\fR with the \fI-gif\fR option.
.SH OPTIONS
+
+.SS General Options
+.TP
.TP
.B \-version
Show hevea version and exit.
@@ -40,8 +43,15 @@
.B -s
Suppress warnings.
.TP
+.B \-I dirname
+Add \fIdirname\fR to the search path.
+.TP
+.B \-o name
+Make \fIname\fR the output basename. However, if \fIname\fR is
+\fIbase.html\fR, then the output basename is \fIbase\fr.
+.TP
.B -e filename
-Prevent hevea from loading any file whose name is filename. Note that
+Prevent hevea from loading any file whose name is \fIfilename\fR. Note that
this option applies to all files, including hevea.hva and base style
files.
.TP
@@ -60,14 +70,27 @@
.B -francais
Set French mode. This has three consequences: Some words inserted by
LaTeX (such as ``Chapter'', ``Bibliography'', ...) are replaced by
-French words. Text replacement for symbols are in French (see the
--nosymb option below). HeVeA sets the boolean register french to
-true.
+French words. HeVeA sets the boolean register french to true.
.TP
-.B -nosymb
-Avoid symbol font. In this mode, symbols are replaced by text-only
-equivalents. By default, these equivalent are in English.
+.B -help
+Print version number and a short help message.
+
+
+.SS Options controlling the generation of HTML code
.TP
+.B -entities
+Render symbols by using entities. This is the default.
+.TP
+.B -symbols
+Render symbols by using the symbol font. This mode is deprecated and
+is no more maintained.
+.TP
+.B -textsymbols
+Render symbols by English text.
+.TP
+.B -moreenties
+Enable the output of some unfrequent entities. Use this option to
+target browsers with wide entities support.
.B -noiso
Do not output (iso-latin1) characters whose code is above 127
(i.e. output ascii only). These characters are replaced by HTML
@@ -80,23 +103,16 @@
charset=\fIcharset-name\fR. The default is the name of the charset
obtained by executing \fIlocale charmap\fR.
.TP
+.B -mathml
+Produces MathML output for equations, very experimental.
+.TP
.B -pedantic
Be strict in interpreting HTMLdefinition. In particular, this option
disable size and color changes inside <PRE>... </PRE>, which are
otherwise performed.
-.TP
-.B -I dirname
-Add \fIdirname\fR to the search path.
+
+.SS Options for alternative output formats
.TP
-.B -o name
-Make \fIname\fR the output basename. However, if name is base.html, then the
-output basename is base.
-.TP
-.B -help
-Print version number and a short help message.
-.P
-The following options select and control alternative output formats:
-.TP
.B -text
Output plain text. Output file extension is .txt.
.TP
Modified: tags/packages/hevea/1.08-1/debian/patches/00list
===================================================================
--- trunk/packages/hevea/trunk/debian/patches/00list 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/patches/00list 2005-05-15 19:39:19 UTC (rev 1380)
@@ -1,5 +1,2 @@
-01_imagen_typo
02_nogif
03_charset
-04_rawtext
-05_license
Deleted: tags/packages/hevea/1.08-1/debian/patches/01_imagen_typo.dpatch
===================================================================
--- trunk/packages/hevea/trunk/debian/patches/01_imagen_typo.dpatch 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/patches/01_imagen_typo.dpatch 2005-05-15 19:39:19 UTC (rev 1380)
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## 01_imagen_typo.dpatch by Ralf Treinen <treinen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: spurious first line in imagen
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -E -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-@DPATCH@
---- hevea-1.07.orig/imagen
-+++ hevea-1.07/imagen
-@@ -1,4 +1,3 @@
--case
- #! /bin/sh
- LATEX=latex
- DVIPS=dvips
-
-
-
-
-
-
-
Modified: tags/packages/hevea/1.08-1/debian/patches/02_nogif.dpatch
===================================================================
--- trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/patches/02_nogif.dpatch 2005-05-15 19:39:19 UTC (rev 1380)
@@ -1,39 +1,18 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_nogif.dpatch by Ralf Treinen <treinen@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: standard image format png instead of gif
+## DP: No description.
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -E -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
@DPATCH@
---- hevea-1.07.orig/latexcommon.hva
-+++ hevea-1.07/latexcommon.hva
-@@ -412,7 +412,7 @@
- % Images %
- %%%%%%%%%%%%%%
- \newcounter{image}
--\newcommand{\heveaimageext}{.gif}
-+\newcommand{\heveaimageext}{.png}
- \renewcommand{\theimage}{\@arabic{image}}
- \newcommand{\imageflush}[1][]
- {\@imageflush\stepcounter{image}\imgsrc[#1]{\jobname\theimage\heveaimageext}}
---- hevea-1.07.orig/imagen
-+++ hevea-1.07/imagen
+diff -urNad hevea-1.08/html/gif.hva /tmp/dpep.j2ynes/hevea-1.08/html/gif.hva
+--- hevea-1.08/html/gif.hva 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.j2ynes/hevea-1.08/html/gif.hva 2005-05-15 14:40:42.000000000 +0200
+@@ -0,0 +1 @@
++\renewcommand{\heveaimageext}{.gif}
+diff -urNad hevea-1.08/imagen /tmp/dpep.j2ynes/hevea-1.08/imagen
+--- hevea-1.08/imagen 2005-05-15 14:40:10.000000000 +0200
++++ /tmp/dpep.j2ynes/hevea-1.08/imagen 2005-05-15 14:40:10.000000000 +0200
@@ -7,10 +7,10 @@
PNMEXTRA=""
PNMMARGIN="pnmmargin -white 1"
@@ -46,22 +25,27 @@
+EXT=png
+#PPMTOEXT="ppmtogif -transparent '#ffffff'"
+#EXT=gif
+ TODIR="."
RM="/bin/rm -f"
- while true
---- hevea-1.07.orig/html/gif.hva
-+++ hevea-1.07/html/gif.hva
-@@ -0,0 +1 @@
-+\renewcommand{\heveaimageext}{.gif}
---- hevea-1.07.orig/libs.def
-+++ hevea-1.07/libs.def
+diff -urNad hevea-1.08/latexcommon.hva /tmp/dpep.j2ynes/hevea-1.08/latexcommon.hva
+--- hevea-1.08/latexcommon.hva 2005-05-15 14:40:10.000000000 +0200
++++ /tmp/dpep.j2ynes/hevea-1.08/latexcommon.hva 2005-05-15 14:40:10.000000000 +0200
+@@ -488,7 +488,7 @@
+ % Images %
+ %%%%%%%%%%%%%%
+ \newcounter{image}
+-\newcommand{\heveaimageext}{.gif}
++\newcommand{\heveaimageext}{.png}
+ \newcommand{\heveaimagedir}{}
+ \renewcommand{\theimage}{\@arabic{image}}
+ \newcommand{\imageflush}[1][]
+diff -urNad hevea-1.08/libs.def /tmp/dpep.j2ynes/hevea-1.08/libs.def
+--- hevea-1.08/libs.def 2005-05-15 14:40:10.000000000 +0200
++++ /tmp/dpep.j2ynes/hevea-1.08/libs.def 2005-05-15 14:40:10.000000000 +0200
@@ -1,4 +1,4 @@
- ALLLIB=amsmath.hva iso-symb.hva moreverb.hva url.hva compat.hva latexcommon.hva multind.hva verbatim.hva hyperref.hva mathaccents.hva packages.hva ifthen.hva spaces.hva articlecommon.hva bookcommon.hva makeidx.hva index.hva comment.hva xxdate.exe keyval.hva babel.hva listings.hva lstlang1.hva lstlang2.hva lstlang3.hva mathop.hva plain.hva alltt.hva program.hva underscore.hva multibib.hva xxcharset.exe natbib-common.hva
--HTMLLIB=article.hva book.hva color.hva fancysection.hva graphics.hva graphicx.hva hevea.hva report.hva seminar.hva symb-eng.hva symb-ent.hva symb-fra.hva symb-mathml.hva symb-text.hva symb.hva urlhref.hva sword.hva commongraphic.hva fancyvrb.hva colortbl.hva png.hva xypic.hva natbib.hva
-+HTMLLIB=article.hva book.hva color.hva fancysection.hva graphics.hva graphicx.hva hevea.hva report.hva seminar.hva symb-eng.hva symb-ent.hva symb-fra.hva symb-mathml.hva symb-text.hva symb.hva urlhref.hva sword.hva commongraphic.hva fancyvrb.hva colortbl.hva png.hva xypic.hva natbib.hva gif.hva
- TEXTLIB=article.hva book.hva report.hva seminar.hva hevea.hva symb.hva color.hva fancysection.hva colortbl.hva
- INFOLIB=article.hva book.hva report.hva seminar.hva hevea.hva color.hva fancysection.hva colortbl.hva
-
-
-
-
+ ALLLIB= alltt.hva amsmath.hva articlecommon.hva babel.hva bookcommon.hva comment.hva compat.hva hyperref.hva ifthen.hva index.hva iso-symb.hva keyval.hva latexcommon.hva listings.hva lstlang1.hva lstlang2.hva lstlang3.hva makeidx.hva mathaccents.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 english.hva czech.hva ragged2e.hva
+-HTMLLIB= amssymb.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 report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva symb-fra.hva symb.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva
++HTMLLIB= amssymb.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 gif.hva png.hva report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva symb-fra.hva symb.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva
+ TEXTLIB=article.hva book.hva color.hva colortbl.hva fancysection.hva hevea.hva report.hva seminar.hva symb.hva french.hva
+ INFOLIB=article.hva book.hva color.hva colortbl.hva fancysection.hva hevea.hva multind.hva report.hva seminar.hva
Modified: tags/packages/hevea/1.08-1/debian/patches/03_charset.dpatch
===================================================================
--- trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/patches/03_charset.dpatch 2005-05-15 19:39:19 UTC (rev 1380)
@@ -1,104 +1,39 @@
-#! /bin/sh -e
-## 03_charset.dpatch by Ralf Treinen <treinen@debian.org>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03-charset.dpatch by Ralf Treinen <treinen@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: command line switch to determine the HTML charset, if not set
-## DP: use value obtained from "locale charmap", or else default to is8859-1.
+## DP: Get charset from locale or command line option
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -E -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
@DPATCH@
---- hevea-1.06.orig/parse_opts.mli
-+++ hevea-1.06/parse_opts.mli
-@@ -13,6 +13,7 @@
+diff -urNad hevea-1.07.beta.2005.03.07/html/hevea.hva /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/html/hevea.hva
+--- hevea-1.07.beta.2005.03.07/html/hevea.hva 2005-03-09 22:58:03.000000000 +0100
++++ /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/html/hevea.hva 2005-03-09 22:58:04.000000000 +0100
+@@ -220,11 +220,10 @@
+ \newsavebox{\@bibbox}
+ \newcommand{\@biblabel}[1]{\@locname{#1}{\purple[\@bibread{#1}]}}
+ %%% Environment document.
+-\newcommand{\@charset}{ISO-8859-1}
+ \newcommand{\@bodyargs}{}
+ \newcommand{\@meta}
+ {\begin{rawhtml}
+-<META http-equiv="Content-Type" content="text/html; charset=\end{rawhtml}\@charset\begin{rawhtml}">
++<META http-equiv="Content-Type" content="text/html; charset=\end{rawhtml}\usebox{\@charset}\begin{rawhtml}">
+ <META name="GENERATOR" content="hevea \end{rawhtml}\usebox{\@heveaversion}\@print{">
+ }%
+ % style declarations
+diff -urNad hevea-1.07.beta.2005.03.07/Makefile /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/Makefile
+--- hevea-1.07.beta.2005.03.07/Makefile 2005-03-09 22:58:03.000000000 +0100
++++ /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/Makefile 2005-03-09 22:58:04.000000000 +0100
+@@ -79,7 +79,7 @@
- val symbols : bool ref
- val iso : bool ref
-+val charset : string ref
- type language = Francais | English
- val language : language ref
- type destination = Html | Text | Info
-
-
-
---- hevea-1.06.orig/parse_opts.ml
-+++ hevea-1.06/parse_opts.ml
-@@ -33,6 +33,8 @@
- and entities = ref false
- ;;
-+let defaultcharset = "ISO-8859-1";;
-+
- let language = ref English
- and symbols = ref true
- and iso = ref true
-@@ -40,6 +42,16 @@
- and destination = ref Html
- and fixpoint = ref false
- and optimize = ref false
-+and charset =
-+ ref (try
-+ let c = Unix.open_process_in "/usr/bin/locale charmap"
-+ in let s = input_line c
-+ in begin
-+ Unix.close_process_in c;
-+ if s = "" then defaultcharset else s
-+ end
-+ with
-+ _ -> defaultcharset)
- ;;
-
- let width = ref 72
-@@ -81,6 +93,8 @@
- "do not output symbol fonts") ;
- ("-noiso",Arg.Unit (fun () -> iso := false),
- "use HTML entities in place of isolatin1 non-ascii characters") ;
-+ ("-charset",Arg.String (fun s -> charset := s),
-+ "character set, use ``character set'' in the HEAD tag") ;
- ("-pedantic",Arg.Unit (fun () -> pedantic := true),
- "be pedantic in interpreting HTML 4.0 transitional definition") ;
- ("-I", Arg.String (fun s -> path := s :: !path),
-
-
-
---- hevea-1.06.orig/package.ml
-+++ hevea-1.06/package.ml
-@@ -42,6 +42,7 @@
-
- def_print "\\@basein" Parse_opts.base_in ;
- def_print "\\jobname" Parse_opts.base_out ;
-+def_print "\\@charset" !Parse_opts.charset ;
- def_print "\\@heveacomline"
- (Array.fold_right
- (fun arg r -> arg^" "^r)
-
-
---- hevea-1.06.orig/Makefile
-+++ hevea-1.06/Makefile
-@@ -73,7 +74,7 @@
-
-
hevea.byte: ${OBJS}
- ${OCAMLC} ${OCAMLFLAGS} -o $@ ${OBJS}
+ ${OCAMLC} ${OCAMLFLAGS} unix.cma -o $@ ${OBJS}
hacha.byte: ${OBJSCUT}
${OCAMLC} ${OCAMLFLAGS} -o $@ ${OBJSCUT}
-@@ -82,7 +83,7 @@
+@@ -88,7 +88,7 @@
${OCAMLC} ${OCAMLFLAGS} -o $@ ${OBJSESPONJA}
hevea.opt: ${OPTS}
@@ -107,21 +42,57 @@
hacha.opt: ${OPTSCUT}
${OCAMLOPT} -o $@ ${OPTSCUT}
-
-
---- hevea-1.07.orig/html/hevea.hva
-+++ hevea-1.07/html/hevea.hva
-@@ -168,11 +168,10 @@
- \newsavebox{\@bibbox}
- \newcommand{\@biblabel}[1]{\@locname{#1}{\purple[\@bibread{#1}]}}
- %%% Environment document.
--\newcommand{\@charset}{ISO-8859-1}
- \newcommand{\@bodyargs}{}
- \newcommand{\@meta}
- {\begin{rawhtml}
--<META http-equiv="Content-Type" content="text/html; charset=\end{rawhtml}\@charset\begin{rawhtml}">
-+<META http-equiv="Content-Type" content="text/html; charset=\end{rawhtml}\usebox{\@charset}\begin{rawhtml}">
- <META name="GENERATOR" content="hevea \end{rawhtml}\usebox{\@heveaversion}\@print{">
- }}
- \newenvironment{document}{%
-
+diff -urNad hevea-1.07.beta.2005.03.07/package.ml /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/package.ml
+--- hevea-1.07.beta.2005.03.07/package.ml 2005-03-09 22:58:03.000000000 +0100
++++ /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/package.ml 2005-03-09 22:58:04.000000000 +0100
+@@ -42,6 +42,7 @@
+
+ def_print "\\@basein" Parse_opts.base_in ;
+ def_print "\\jobname" Parse_opts.base_out ;
++def_print "\\@charset" !Parse_opts.charset ;
+ def_print "\\@heveacomline"
+ (Array.fold_right
+ (fun arg r -> arg^" "^r)
+diff -urNad hevea-1.07.beta.2005.03.07/parse_opts.ml /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/parse_opts.ml
+--- hevea-1.07.beta.2005.03.07/parse_opts.ml 2005-03-09 22:58:03.000000000 +0100
++++ /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/parse_opts.ml 2005-03-09 22:58:32.000000000 +0100
+@@ -49,6 +49,19 @@
+ and optimize = ref false
+ ;;
+
++let defaultcharset = "ISO-8859-1";;
++let charset =
++ ref (try
++ let c = Unix.open_process_in "/usr/bin/locale charmap"
++ in let s = input_line c
++ in begin
++ Unix.close_process_in c;
++ if s = "" then defaultcharset else s
++ end
++ with
++ _ -> defaultcharset)
++;;
++
+ (* Variables for BibTex and GlossTex support *)
+ let bib = ref false
+ and gloss = ref false
+@@ -107,6 +120,8 @@
+
+ ("-noiso",Arg.Unit (fun () -> iso := false),
+ "use HTML entities in place of isolatin1 non-ascii characters") ;
++ ("-charset",Arg.String (fun s -> charset := s),
++ "character set, use ``character set'' in the HEAD tag") ;
+ ("-pedantic",Arg.Unit (fun () -> pedantic := true),
+ "be pedantic in interpreting HTML 4.0 transitional definition") ;
+ ("-mathml",Arg.Unit (fun() -> mathml := true),
+diff -urNad hevea-1.07.beta.2005.03.07/parse_opts.mli /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/parse_opts.mli
+--- hevea-1.07.beta.2005.03.07/parse_opts.mli 2005-03-09 22:58:03.000000000 +0100
++++ /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/parse_opts.mli 2005-03-09 22:58:04.000000000 +0100
+@@ -18,6 +18,7 @@
+ val destination : destination ref
+
+ val iso : bool ref
++val charset : string ref
+ val moreentities : bool ref
+ val mathml : bool ref
+ val pedantic : bool ref
Deleted: tags/packages/hevea/1.08-1/debian/patches/04_rawtext.dpatch
===================================================================
--- trunk/packages/hevea/trunk/debian/patches/04_rawtext.dpatch 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/patches/04_rawtext.dpatch 2005-05-15 19:39:19 UTC (rev 1380)
@@ -1,117 +0,0 @@
-#! /bin/sh -e
-## 04_rawtext.dpatch by Ralf Treinen <treinen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable rawtext environment. This patch should be obsolete in
-## DP: hevea vesion 1.08
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/hevea.sty hevea-1.07/hevea.sty
---- /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/hevea.sty 2002-09-17 14:17:21.000000000 +0200
-+++ hevea-1.07/hevea.sty 2004-05-10 21:21:43.000000000 +0200
-@@ -1,3 +1,4 @@
-+
- % hevea : hevea.sty
- % This is a very basic style file for latex document to be processed
- % with hevea. It contains definitions of LaTeX environment which are
-@@ -57,6 +58,10 @@
- \excludecomment{rawhtml}
- \newcommand{\rawhtmlinput}[1]{}
- \excludecomment{htmlonly}
-+%%%% Text and Info only
-+\excludecomment{rawtext}
-+\newcommand{\rawtextinput}[1]{}
-+\excludecomment{textonly}
- %%%% Latex only
- \newenvironment{latexonly}{}{}
- \newenvironment{verblatex}{}{}
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/latexcommon.hva hevea-1.07/latexcommon.hva
---- /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/latexcommon.hva 2004-05-10 20:48:09.000000000 +0200
-+++ hevea-1.07/latexcommon.hva 2004-05-10 21:24:31.000000000 +0200
-@@ -492,4 +492,8 @@
- poor}}{}
- %%%%% Extension des environnments hevea en lecture de fichier
- \newcommand{\rawhtmlinput}[1]
--{\@scaninput{\begin{rawhtml}}{#1}{\end{rawhtml}}}
-\ No newline at end of file
-+{\@scaninput{\begin{rawhtml}}{#1}{\end{rawhtml}}}
-+\newcommand{\rawtextinput}[1]
-+{\@scaninput{\begin{rawtext}}{#1}{\end{rawtext}}}
-+\newcommand{\rawinput}[1]
-+{\@scaninput{\begin{raw}}{#1}{\end{raw}}}
-\ No newline at end of file
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/verb.mll hevea-1.07/verb.mll
---- /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/verb.mll 2003-09-29 10:54:54.000000000 +0200
-+++ hevea-1.07/verb.mll 2004-05-10 21:18:19.000000000 +0200
-@@ -735,24 +735,25 @@
- Out.reset line_buff
- ;;
-
--let open_rawhtml lexbuf =
-- begin match !Parse_opts.destination with
-- | Parse_opts.Html -> ()
-- | _ -> Misc.warning "rawhtml detected"
-- end ;
-- process :=
-- (fun () -> put_html () ; Dest.put_char '\n') ;
-- finish := put_html ;
-- noeof scan_byline lexbuf
--
--and close_rawhtml _ = ()
--
- let open_forget lexbuf =
- process := (fun () -> Out.reset line_buff) ;
- finish := (fun () -> Out.reset line_buff) ;
- noeof scan_byline lexbuf
-
--and close_forget _ = ()
-+let open_raw lexbuf =
-+ process := (fun () -> put_html () ; Dest.put_char '\n') ;
-+ finish := put_html ;
-+ noeof scan_byline lexbuf
-+
-+let open_rawhtml lexbuf = match !Parse_opts.destination with
-+ | Parse_opts.Html -> open_raw lexbuf
-+ | _ -> open_forget lexbuf
-+
-+let open_rawtext lexbuf = match !Parse_opts.destination with
-+ | Parse_opts.Text|Parse_opts.Info -> open_raw lexbuf
-+ | _ -> open_forget lexbuf
-+
-+let close_nothing _ = ()
-
- let open_tofile chan lexbuf =
- process :=
-@@ -794,8 +795,13 @@
- noeof scan_byline lexbuf) ;
- def_code "\\endverbatim*" close_verbenv ;
-
-+def_code "\\rawtext" open_rawtext ;
-+def_code "\\endrawtext" close_nothing ;
- def_code "\\rawhtml" open_rawhtml ;
--def_code "\\endrawhtml" close_forget ;
-+def_code "\\endrawhtml" close_nothing ;
-+def_code "\\raw" open_raw ;
-+def_code "\\endraw" close_nothing ;
-+
- def_code "\\verblatex" open_forget ;
- def_code "\\endverblatex" Scan.check_alltt_skip ;
- def_code "\\verbimage" open_verbimage ;
Deleted: tags/packages/hevea/1.08-1/debian/patches/05_license.dpatch
===================================================================
--- trunk/packages/hevea/trunk/debian/patches/05_license.dpatch 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/patches/05_license.dpatch 2005-05-15 19:39:19 UTC (rev 1380)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_license.dpatch by Ralf Treinen <treinen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes to license as received from upstream author Luc Maranget
-## DP: by email on Tue, 18 Jan 2005 15:21:46 +0100
-
-@DPATCH@
-diff -urNad hevea-1.07/LICENSE /tmp/dpep.ihb6hP/hevea-1.07/LICENSE
---- hevea-1.07/LICENSE 1999-12-01 20:04:34.000000000 +0100
-+++ /tmp/dpep.ihb6hP/hevea-1.07/LICENSE 2005-01-20 08:19:14.000000000 +0100
-@@ -13,6 +13,12 @@
-
- ----------------------------------------------------------------------
-
-+ As a special exception to the Q Public Licence, you may develop
-+ application programs, reusable components and other software items
-+ that link with the original or modified versions of the Software
-+ and are not made available to the general public, without any of the
-+ additional requirements listed in clause 6c of the Q Public licence.
-+
- THE Q PUBLIC LICENSE version 1.0
-
- Copyright (C) 1999 Troll Tech AS, Norway.
-@@ -114,8 +120,7 @@
-
- Choice of Law
-
--This license is governed by the Laws of France. Disputes shall be
--settled by the Court of Versailles.
-+This license is governed by the Laws of France.
-
- ----------------------------------------------------------------------
-
Modified: tags/packages/hevea/1.08-1/debian/rules
===================================================================
--- trunk/packages/hevea/trunk/debian/rules 2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/hevea/1.08-1/debian/rules 2005-05-15 19:39:19 UTC (rev 1380)
@@ -25,9 +25,10 @@
dh_installdirs
$(MAKE) install\
TARGET=byte\
- LIBDIR=`pwd`/debian/hevea/usr/share/hevea\
- BINDIR=`pwd`/debian/hevea/usr/bin
- cp hevea.sty `pwd`/debian/hevea/usr/share/texmf/tex/latex/misc
+ DESTDIR=`pwd`/debian/hevea\
+ PREFIX=usr\
+ LIBDIR=usr/share/hevea\
+ LATEXLIBDIR=/usr/share/texmf/tex/latex/misc
binary-arch: build install