diff options
| -rw-r--r-- | .authorspellings | 10 | ||||
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | haddock.spec | 81 | ||||
| -rw-r--r-- | haskell.vim | 68 | ||||
| -rw-r--r-- | hcar.tex | 65 | ||||
| -rw-r--r-- | make-sdist.sh | 2 |
6 files changed, 4 insertions, 225 deletions
diff --git a/.authorspellings b/.authorspellings deleted file mode 100644 index 570c548e..00000000 --- a/.authorspellings +++ /dev/null @@ -1,10 +0,0 @@ -Simon Marlow <simonmar@microsoft.com>, marlowsd@gmail.com, simonmar -Simon Hengel <simon.hengel@wiktory.org> -David Waern <david.waern@gmail.com>, davve@dtek.chalmers.se, david.waern@gmail.com, David Waern -Sven Panne <sven.panne@aedion.de>, panne -Neil Mitchell <http://www.cs.york.ac.uk/~ndm/>, Neil Mitchell -Ross Paterson <ross@soi.city.ac.uk>, ross -Simon Peyton-Jones <simonpj@microsoft.com> -Wolfgang Jeltsch <g9ks157k@acme.softbase.org>, wolfgang -Malcolm Wallace <Malcolm.Wallace@cs.york.ac.uk> -Benjamin Franksen <benjamin.franksen@bessy.de> @@ -25,6 +25,9 @@ Changes in version 2.15.0 * Omit unnecessary ‘forall’s (#315 and #86) + * Remove some files which were really old or did not belong in the + repository in the first place. + Changes in version 2.14.3 * Fix parsing of identifiers with ^ or ⋆ in them (#298) diff --git a/haddock.spec b/haddock.spec deleted file mode 100644 index bdf9dcf1..00000000 --- a/haddock.spec +++ /dev/null @@ -1,81 +0,0 @@ -# This is an RPM spec file that specifies how to package -# haddock for Red Hat Linux and, possibly, similar systems. -# It has been tested on Red Hat Linux 7.2 and SuSE Linux 9.1. -# -# If this file is part of a tarball, you can build RPMs directly from -# the tarball by using the following command: -# -# rpm -ta haddock-(VERSION).tar.gz -# -# The resulting package will be placed in the RPMS/(arch) subdirectory -# of your RPM build directory (usually /usr/src/redhat or ~/rpm), with -# the name haddock-(VERSION)-(RELEASE).noarch.rpm. A corresponding -# source RPM package will be in the SRPMS subdirectory. -# -# NOTE TO HADDOCK MAINTAINERS: When you release a new version of -# Haskell mode, update the version definition below to match the -# version label of your release tarball. - -%define name haddock -%define version 2.14.4 -%define release 1 - -Name: %{name} -Version: %{version} -Release: %{release} -License: BSD-like -Group: Development/Languages/Haskell -URL: http://haskell.org/haddock/ -Source: http://haskell.org/haddock/haddock-%{version}.tar.gz -Packager: Sven Panne <sven.panne@aedion.de> -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Prefix: %{_prefix} -BuildRequires: ghc, docbook-dtd, docbook-xsl-stylesheets, libxslt, libxml2, fop, xmltex, dvips -Summary: A documentation tool for annotated Haskell source code - -%description -Haddock is a tool for automatically generating documentation from -annotated Haskell source code. It is primary intended for documenting -libraries, but it should be useful for any kind of Haskell code. - -Haddock lets you write documentation annotations next to the -definitions of functions and types in the source code, in a syntax -that is easy on the eye when writing the source code (no heavyweight -mark-up). The documentation generated by Haddock is fully hyperlinked --- click on a type name in a type signature to go straight to the -definition, and documentation, for that type. - -Haddock can generate documentation in multiple formats; currently HTML -is implemented, and there is partial support for generating DocBook. -The generated HTML uses stylesheets, so you need a fairly up-to-date -browser to view it properly (Mozilla, Konqueror, Opera, and IE 6 -should all be ok). - -%prep -%setup - -%build -runhaskell Setup.lhs configure --prefix=%{_prefix} --docdir=%{_datadir}/doc/packages/%{name} -runhaskell Setup.lhs build -cd doc -test -f configure || autoreconf -./configure -make html - -%install -runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT} - -%clean -rm -rf ${RPM_BUILD_ROOT} - -%files -%defattr(-,root,root) -%doc CHANGES -%doc LICENSE -%doc README -%doc TODO -%doc doc/haddock -%doc examples -%doc haskell.vim -%{prefix}/bin/haddock -%{prefix}/share/haddock-%{version} diff --git a/haskell.vim b/haskell.vim deleted file mode 100644 index cbc41be3..00000000 --- a/haskell.vim +++ /dev/null @@ -1,68 +0,0 @@ -" Attempt to add haddock highlighting for haskell comments -" It should be placed in ~/.vim/after/syntax/haskell.vim -" Brad Bowman <haddock.vim@bereft.net> - -syn match hsHdocChunk "$\i\+" contained -syn match hsHdocMod /"\(\i\|[.]\)\+"/ contained -syn match hsHdocLink "'\(\i\|[.#]\)\+'" contained -syn region hsHdocAnchor start="\\\@<!#" skip="\\#" end="\\\@<!#" contained oneline -" I think emphasis can span multiple lines -syn region hsHdocEm start="\\\@<!/" skip="\\/" end="\\\@!/" contained oneline -syn region hsHdocURL start="\\\@<!<" end="\\\@<!>" contained oneline -syn region hsHdocCode start="\\\@<!@" skip="\\@" end="\\\@<!@" contained oneline -syn region hsHdocBCodeBlock start="^@\(\s\|$\)" end="^@\s*$" contained -syn region hsHdocLCodeBlock start="\(^\s*--\s*\)\@<=@\s*$" end="\(^\s*--\s*\)\@<=@\s*$" contained -syn match hsHdocBHeading "^\s*\*\+" contained -syn match hsHdocLHeading "\(^\s*--\s*\)\@<=\*\+" contained -syn match hsHdocBTracks "^\s*>" contained -" match only the > using a look-behind -syn match hsHdocLTracks "\(^\s*--\s*\)\@<=>" contained - -" todo: numbered lists, mark haddock start separately -"syn match hsHdocStart "\([$^|]\|\*\+\)" contained - -syn cluster hsHdocSpecial - \ contains=hsHdocMod,hsHdocLink,hsHdocEm,hsHdocCode,hsHdocURL, - \ hsHdocAnchor,hsHdocChunk - -syn region hsHdocDef start="^\s*\(--\)\?\s*\[" end="\]" contained contains=hsHdocSpecial - -syn region hsHdocLines start="--\s*\([$\^|]\|\*\+\)" - \ skip="^\s*\(--.*\)$" - \ end="^\s*\(\$\|--\)\@!" - \ contains=@hsHdocSpecial,hsHdocLTracks,hsHdocLHeading,hsHdocLCodeBlock,hsHdocDef -syn region hsHdocBlock start="{-\s*\([$\^|]\|\*\+\)" end="-}" - \ contains=@hsHdocSpecial,hsHdocBTracks,hsHdocBHeading,hsHdocBCodeBlock,hsHdocDef - -syn sync minlines=20 - -if version >= 508 || !exists("did_haddock_syntax_inits") - if version < 508 - let did_haddock_syntax_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - - HiLink hsHdocLines hsHdoc - HiLink hsHdocBlock hsHdoc - HiLink hsHdoc PreProc - HiLink hsHdocAnchor Special - HiLink hsHdocChunk Special - HiLink hsHdocMod Special - HiLink hsHdocLink Special - HiLink hsHdocEm Special - HiLink hsHdocURL Special - HiLink hsHdocCode Special - HiLink hsHdocLHeading Special - HiLink hsHdocBHeading Special - HiLink hsHdocLTracks Special - HiLink hsHdocBTracks Special - HiLink hsHdocBCodeBlock Special - HiLink hsHdocLCodeBlock Special - HiLink hsHdocSpecial Special - - delcommand HiLink -endif - -" Options for vi: sw=2 sts=2 nowrap ft=vim diff --git a/hcar.tex b/hcar.tex deleted file mode 100644 index e5ca8a20..00000000 --- a/hcar.tex +++ /dev/null @@ -1,65 +0,0 @@ -% Haddock-DH.tex -\begin{hcarentry}[updated]{Haddock} -\label{haddock} -\report{David Waern}%11/10 -\status{experimental, maintained} -\makeheader - -Haddock is a widely used documentation-generation tool for Haskell -library code. Haddock generates documentation by parsing and typechecking -Haskell source code directly and including documentation supplied by the -programmer in the form of specially-formatted comments in the source code -itself. Haddock has direct support in Cabal~\cref{cabal}, and is used to -generate the documentation for the hierarchical libraries that come with GHC, -Hugs, and nhc98 -(\url{http://www.haskell.org/ghc/docs/latest/html/libraries}) as well as -the documentation on Hackage. - -The latest release is version 2.8.1, released September 3 2010. - -\Separate -Recent changes: -\begin{itemize} -\item HTML backend completely rewritten to generate semantically rich XHTML - using the xhtml package. -\item New default CSS based on the color scheme chosen for the new Haskell - wiki, with a pull-out tab for the synopsis. -\item Theme engine based on CSS files. Themes can be switched from the - header menu. -\item Markup support for executable examples/unit-tests. -\item Addition of a LaTeX backend. -\item Additions and changes to the Haddock API. -\item Various smaller new features and bug fixes. -\end{itemize} - -\FuturePlans -\begin{itemize} -\item Although Haddock understands many GHC language extensions, we would like it to -understand all of them. Currently there are some constructs you cannot comment, -like GADTs and associated type synonyms. - -\item Error messages is an area with room for improvement. We would like Haddock -to include accurate line numbers in markup syntax errors. - -\item On the HTML rendering side we want to make more use of Javascript in order to make -the viewing experience better. The frames-mode could be improved this way, for -example. - -\item Finally, the long term plan is to split Haddock into one program that creates -data from sources, and separate backend programs that use that data via the -Haddock API. This will scale better, not requiring adding new backends to Haddock -for every tool that needs its own format. -\end{itemize} - -\FurtherReading -\begin{compactitem} -\item Haddock's homepage: -\url{http://www.haskell.org/haddock/} - -\item Haddock's developer Wiki and Trac: -\url{http://trac.haskell.org/haddock} - -\item Haddock's mailing list: -\url{haddock@@projects.haskell.org} -\end{compactitem} -\end{hcarentry} diff --git a/make-sdist.sh b/make-sdist.sh index 27c0ea6f..914bf909 100644 --- a/make-sdist.sh +++ b/make-sdist.sh @@ -13,7 +13,7 @@ cd .. tar cvzf haddock-*.tar.gz haddock-*/ # Steps for doing a release: -# * Update version number in .cabal, doc/haddock.xml, haddock.spec +# * Update version number in .cabal, doc/haddock.xml # * Update CHANGES # * Source: # - do the above |