HaXml 1.13.2 → 1.13.3

raw patch · 9 files changed

+52/−20 lines, 9 filesdep +containersdep +prettydep ~basedep ~haskell98new-uploader

Dependencies added: containers, pretty

Dependency ranges changed: base, haskell98

Files

• Build.bat +1/−1
• HaXml.cabal +2/−2
• Makefile +1/−1
• README +16/−7
• docs/changelog.html +6/−0
• docs/index.html +19/−6
• rpm.spec +1/−1
• src/Makefile +1/−1
• src/Text/XML/HaXml/Haskell2Xml.hs +5/−1

@@ -21,7 +21,7 @@ set LD=C:\DEV\ghc\ghc-6.4\gcc-lib\ld.exe
 
 rem    Source directory for HaXml:
-set SRC=C:\DEV\Haskell\lib\HaXml-1.13.2\src
+set SRC=C:\DEV\Haskell\lib\HaXml-1.13.3\src
 
 rem    Two very long lines (500-600 chars) follow here.  
 rem    They should not need changing.

@@ -1,5 +1,5 @@ name:		HaXml-version:	1.13.2+version:	1.13.3 license:	LGPL license-file:	COPYRIGHT author:		Malcolm Wallace <Malcolm.Wallace@cs.york.ac.uk>@@ -34,7 +34,7 @@ 	Text.XML.HaXml.Xtract.Lex, 	Text.XML.HaXml.Xtract.Parse hs-source-dir:	src-build-depends:	base, haskell98+build-depends:	base, haskell98, pretty, containers extensions:	CPP  Executable: Canonicalise

@@ -1,5 +1,5 @@ SOFTWARE = HaXml-VERSION  = 1.13.2+VERSION  = 1.13.3  SRCS = \ 	src/Text/XML/HaXml.hs src/Text/XML/HaXml/Combinators.hs \

@@ -2,17 +2,26 @@         --------------------------------------------  Installation instructions:-We currently support nhc98, ghc, and Hugs.  The automatic configuration-detects which compilers/interpreters you have, and prepares a build-tree for each.  Installation requires write-permission on the system-directories of the compiler/interpreter - the libraries and interfaces-can then be used as "-package HaXml" (for ghc/nhc98 - no extra options-required for Hugs).  The standalone tools are installed to a directory of-your choice. +For newer versions of ghc, use the standard Cabal mechanism:++    runhaskell Setup.hs configure+    runhaskell Setup.hs build+    runhaskell Setup.hs install++For older ghc, and current nhc98 and Hugs, use the following older build+system.+     ./configure     make     make install++The automatic configuration detects which compilers/interpreters you+have, and prepares a build tree for each.  Installation requires+write-permission on the system directories of the compiler/interpreter -+the libraries and interfaces can then be used as "-package HaXml" (for+ghc/nhc98 - no extra options required for Hugs).  The standalone tools+are installed to a directory of your choice.  Options to configure are:     --buildwith=...  e.g. ghc-6.2,        to build for a specific compiler

@@ -13,6 +13,12 @@ </center> <hr> +<h3>Changes for 1.13.3</h3>+<p>+<ul>+<li> Updated to work with ghc-6.6.1 (changes to .cabal file).+</ul>+ <h3>Changes for 1.13.2</h3> <p> <ul>

@@ -110,10 +110,10 @@ <center><h3><a name="downloads">Downloads</a></h3></center> <p> <b>Current version:</b>-HaXml-1.13.2, release date 2006.09.08<br>+HaXml-1.13.3, release date 2007.11.23<br> By HTTP:-<a href="http://www.haskell.org/HaXml/HaXml-1.13.2.tar.gz">.tar.gz</a>,-<a href="http://www.haskell.org/HaXml/HaXml-1.13.2.zip">.zip</a>.+<a href="http://www.haskell.org/HaXml/HaXml-1.13.3.tar.gz">.tar.gz</a>,+<a href="http://www.haskell.org/HaXml/HaXml-1.13.3.zip">.zip</a>. <br> By FTP:  <a href="ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/">@@ -137,10 +137,17 @@  <center><h3><a name="install">Installation</a></h3></center> <p>-To install HaXml, you must have a Haskell compiler: <em>ghc-5.02</em>-or later, and/or <em>nhc98-1.14/hmake-3.06</em> or later, and/or-<em>Hugs98 (Sept 2003)</em> or later.  Use+For recent <em>ghc</em>, use the standard Cabal installation mechanism:+<pre>+    runhaskell Setup.hs configure+    runhaskell Setup.hs build+    runhaskell Setup.hs install+</pre> +For older compilers: <em>ghc-5.02</em> or later, and/or+<em>nhc98-1.14/hmake-3.06</em> or later, and/or <em>Hugs98 (Sept+2003)</em> or later.  Use+ <pre>     ./configure [--prefix=...] [--buildwith=...]     make@@ -172,6 +179,12 @@ version here: <a href="http://www.ninebynine.org/Software/HaskellUtils/"> <tt>http://www.ninebynine.org/Software/HaskellUtils/</tt></a>++<p>+The latest stable version (1.13.3) has the following features and fixes:<br>+<ul>+<li> Updated to work with ghc-6.8.1 (changes to .cabal file).+</ul>  <p> The latest stable version (1.13.2) has the following features and fixes:<br>

@@ -2,7 +2,7 @@  Summary: Haskell utilities for processing XML Name: HaXml-Version: 1.13.2+Version: 1.13.3 Release: 1 License: GPL/LGPL Group: Development/Languages/Haskell

@@ -1,5 +1,5 @@ SOFTWARE = HaXml-VERSION = 1.13.1+VERSION = 1.13.3  LIBSRCS = \ 	Text/XML/HaXml.hs Text/XML/HaXml/Combinators.hs Text/XML/HaXml/Lex.hs \

@@ -75,7 +75,11 @@   attval :: (Read a) => AttValue -> a-attval (AttValue [Left s]) = read s+attval (AttValue v) = read (concatMap decode v)+    where+      decode (Left  v)               = v+      decode (Right (RefEntity ent)) = "&"++ent++";"+      decode (Right (RefChar cref))  = "&"++show cref++";"  mkAttr :: String -> String -> Attribute mkAttr n v = (n, AttValue [Left v])