musicxml 0.1 → 0.1.1

raw patch · 9 files changed

+73/−22 lines, 9 filesdep ~HaXmldep ~basedep ~containersPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: HaXml, base, containers, directory, old-time, pretty

API changes (from Hackage documentation)

Files

• CHANGELOG +26/−12
• TODO +10/−3
• doc/Tutorial-musicxml.lt.pdf binary
• examples/Read.lhs +4/−0
• examples/ReadPartwise.lhs +4/−0
• examples/ReadWrite.lhs +9/−0
• examples/Update.lhs +12/−0
• musicxml.cabal +6/−2
• src/Text/XML/MusicXML/Util.lhs +2/−5

@@ -3,24 +3,38 @@ =====================================================================
 
 =====================================================================
-=> Build 626
-	2008-06-26 Samuel Silva <silva.samuel@alumni.uminho.pt>
-		* begin development
+Build 626
+2008-06-26 Samuel Silva <silva.samuel@alumni.uminho.pt>
+	* begin development
 
 =====================================================================
-=> Build 729
-	2008-07-29 Samuel Silva <silva.samuel@alumni.uminho.pt>
-		* beta stage
+Build 729
+2008-07-29 Samuel Silva <silva.samuel@alumni.uminho.pt>
+	* beta stage
 
 =====================================================================
-=> Build 826
-	2008-08-26 Samuel Silva <silva.samuel@alumni.uminho.pt>
-		* add Opus and Container modules
+Build 826
+2008-08-26 Samuel Silva <silva.samuel@alumni.uminho.pt>
+	* add Opus and Container modules
 
 =====================================================================
-=> Build 927
-	2008-09-27 Samuel Silva <silva.samuel@alumni.uminho.pt>
-		* new API
+Build 927
+2008-09-27 Samuel Silva <silva.samuel@alumni.uminho.pt>
+	* new API
 
 =====================================================================
+Version 0.1
+2008-11-04 Samuel Silva <silva.samuel@alumni.uminho.pt>
+	* publish musicxml on hackage
+
+=====================================================================
+Build 101
+2009-01-01 Samuel Silva <silva.samuel@alumni.uminho.pt>
+	* fix bug on Util.lhs: "throw . ErrorCall" => error
+
+=====================================================================
+Version 0.1.1
+2009-01-09 Samuel Silva <silva.samuel@alumni.uminho.pt>
+	* add examples
+	* publish musicxml on hackage
 

@@ -5,9 +5,16 @@ =====================================================================
 == Features
 
-    => Extends encodings: only supports latin1
+    => Update library using XML schemas specification.
+    => Encodings: add suport to utf-8 and utf16.
+    => Compress/decompress *.mxl files.
 
-    => Compress/decompress *.mxl files
+====================================================================
+== More features
 
 
-=====================================================================
+====================================================================
+    => Please send suggestions and comments to
+        Samuel Silva <silva.samuel@alumni.uminho.pt>
+
+====================================================================

binary file changed (928664 → 927981 bytes)

@@ -0,0 +1,4 @@+> module Main where
+> import Text.XML.MusicXML
+> file = "Recordare/partwise/elite.xml"
+> main = read_FILE read_MusicXMLDoc file

@@ -0,0 +1,4 @@+> module Main where
+> import Text.XML.MusicXML
+> file = "Recordare/partwise/elite.xml"
+> main = read_FILE read_MusicXML_Partwise file

@@ -0,0 +1,9 @@+> module Main where
+> import Text.XML.MusicXML
+> filein = "Recordare/partwise/elite.xml"
+> fileout = "out.xml"
+> main = do 
+>       x <- read_FILE read_MusicXMLDoc filein
+>       case isOK x of
+>           True -> show_FILE show_MusicXMLDoc fileout (fromOK x)
+>           False -> return ()

@@ -0,0 +1,12 @@+> module Main where
+> import Text.XML.MusicXML
+> filein = "Recordare/partwise/elite.xml"
+> fileout = "out.xml"
+> main = do 
+>   x <- read_FILE read_MusicXMLDoc filein
+>   case isOK x of
+>       True -> do 
+>           time <- getTime
+>           let y = update_MusicXMLDoc (["My Software"], time) (fromOK x)
+>           show_FILE show_MusicXMLDoc fileout y
+>       False -> return ()

@@ -1,5 +1,5 @@ name:           musicxml
-version:        0.1
+version:        0.1.1
 author:         Samuel Silva <silva.samuel@alumni.uminho.pt>
 maintainer:     Samuel Silva <silva.samuel@alumni.uminho.pt>
 copyright:      Copyright (c) 2008 Samuel Silva
@@ -18,7 +18,7 @@ homepage:       https://troglodita.di.uminho.pt/svn/musica/work/MusicXML
 license:        BSD3
 license-file:   LICENSE
-category:       Text, XML
+category:       Text, XML, Music
 tested-with:    GHC ==6.8.2, GHC ==6.8.3
 build-type:     Simple
 cabal-version:  >= 1.2
@@ -29,6 +29,10 @@     TODO
     src/Makefile
     doc/Tutorial-musicxml.lt.pdf
+    examples/Update.lhs
+    examples/ReadPartwise.lhs
+    examples/Read.lhs
+    examples/ReadWrite.lhs
     script/haskellpp.pl
     script/id.xsl
 flag splitBase

@@ -6,14 +6,11 @@ -- 
 module Text.XML.MusicXML.Util where
 import Text.XML.HaXml.Types 
--- (Attribute,AttValue(..),
---    Element(..), Content(..))
-import Control.Exception(throw, Exception(..))
 import Control.Monad (MonadPlus(..))
 import Data.Char (isSpace)
 import Prelude (String, Maybe(..), Either(..), Bool(..),
     Monad(..), Show(..), Int, Functor(..), Eq(..), 
-    (.), (++), (&&),
+    (.), (++), (&&), error,
     id, map, concat, either, maybe, and,
     const, lookup, unwords)
 \end{code}
@@ -50,7 +47,7 @@ -- | 
 fromOK :: Result a -> a
 fromOK (Ok a)      = a
-fromOK (Error msg) = throw (ErrorCall msg)
+fromOK (Error msg) = error msg
 -- | 
 fromError :: Result a -> String
 fromError (Ok _)      = []