Merge from raptor 1.4.20 release SVNr15728 to trunkraptor_1_4_20

4 files changed, 90 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index b7eb7428..a2ebbd3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,65 @@
+2009-11-28  Dave Beckett  <dave@dajobe.org>
+
+	* Snapshotted raptor_1_4_20 for 1.4.20 release (SVN 15727)
+	
+	* tests/rdfa/0172.out, tests/rdfa/0172.xhtml, tests/rdfa/0173.out,
+	tests/rdfa/0173.xhtml, tests/rdfa/0174.out, tests/rdfa/0174.xhtml,
+	tests/rdfa/Makefile.am:
+	Added unapproved RDFa tests from librdfa upstream test suite:
+	 0172: empty datatype attribute
+	 0173: empty xml:lang attribute on plain literal
+	 0174: single character namespace prefixes
+
+	0172 and 0173 test
+	Issue#0000306 http://bugs.librdf.org/mantis/view.php?id=306
+
+	0174 tests
+	Issue#0000310 http://bugs.librdf.org/mantis/view.php?id=310
+
+	* librdfa/rdfa.c:
+	(start_element): For raptor, turn a NULL language to "" which is
+	what librdfa expects.
+
+	* librdfa/curie.c, librdfa/language.c, librdfa/rdfa.c,
+	librdfa/triple.c:
+	Apply librdfa GIT commits up to
+	5823cb8bffe50fb1b46960f237f7274388cb5f93
+
+	commit 5823cb8bffe50fb1b46960f237f7274388cb5f93
+	    Fixed @property CURIE processing unit tests to match code
+	    updates.
+
+	commit a85d8e9e2e3d28452ad03d1ca64fdd98eed1c180
+	    Fixed CURIE processing bug for TC 174.
+
+	    The bug caused single-character prefixed CURIEs to be processed
+	    incorrectly. Also fixed @property processing to not use reserved
+	    words specified in a very early version of the RDFa spec. Fixed
+	    a small bug related to processing CURIEs that have ':' as the
+	    second character in the URI string.
+
+	commit f384b28bf916a2e0c7a7dbc99101a1a44c301965
+	    Fixed plain literal bug uncovered by TC 172.
+
+	    This bug caused plain literals to not be generated when
+	    datatype="" was specified and when the content inside the element
+	    contained XHTML child nodes.
+
+	* librdfa/language.c:
+	Apply librdfa GIT commit
+	9960791ee4beca8e52e5d3a9766aba73d33f0063
+	    Fixed bug that caused unreviewed TC 173 to partially fail.
+
+	    The currently active language, specified via xml:lang, was not
+	    being cleared when xml:lang="" was specified.
+
+	Related to Redland Issue#0000306
+	http://bugs.librdf.org/mantis/view.php?id=306
+
+2009-11-25  Dave Beckett <dave@dajobe.org>
+
+	* librdfa/rdfa.c, src/raptor_abbrev.c: Casts for C++
+
 2009-11-25  Lauri Aalto <laalto@iki.fi>
 
 	* src/raptor_abbrev.c:
@@ -69,8 +131,17 @@
 	* src/turtle_parser.y
 	(main): Terminate parser
 
+<<<<<<< .working
 	* configure.ac: For trunk raptor 1.9.x series update libtool
 	version to 4:0:0 which bumps the soname.
+=======
+	* src/turtle_parser.y
+	(main): Terminate parser
+
+	* src/turtle_lexer.l
+	(main): Init world and namespaces so turtle lexing test does not
+	die.
+>>>>>>> .merge-right.r15728
 
 	* src/raptor_parse.c
 	(raptor_parse_file): Simplify, no need for O_LARGEFILES flag and
diff --git a/NEWS.html b/NEWS.html
index f95fe5e2..286ad4e1 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -17,15 +17,19 @@
 <p>1.9.x series are unsupported preview releases of Raptor 2.
 </p>
 
-<h2 id="D2009-11-25-V1.4.20">2009-11-25 Raptor Version 1.4.20 Released</h2>
+<h2 id="D2009-11-28-V1.4.20">2009-11-28 Raptor Version 1.4.20 Released</h2>
 
 <p>
-Performance improvement for Turtle serializing from Chris Cannam<br />
+Turtle serializing performance improvement by Chris Cannam<br />
+librdfa RDFa parser updates to fix empty <code>datatype</code>, <code>xml:lang</code> and 1-char prefixes by Manu Sporny<br />
 Fix a crash when the GRDDL parser reported errors<br />
 Enable large file support for 32-bit systems<br />
+Several resilience improvements by Lauri Aalto<br />
 Other minor portability and bug fixes<br />
 Fixed reported <a href="http://bugs.librdf.org/">issues</a>:
+<a href="http://bugs.librdf.org/mantis/view.php?id=305">0000306</a>
 <a href="http://bugs.librdf.org/mantis/view.php?id=307">0000307</a>
+<a href="http://bugs.librdf.org/mantis/view.php?id=310">0000310</a>
 and <a href="http://bugs.librdf.org/mantis/view.php?id=312">0000312</a>.
 </p>
 
diff --git a/RELEASE.html b/RELEASE.html
index cc4cf4ac..eda50852 100644
--- a/RELEASE.html
+++ b/RELEASE.html
@@ -27,7 +27,9 @@ numbering.</p>
 
 <p>Fixed Issues:</p>
 <ul>
+  <li><a href="http://bugs.librdf.org/mantis/view.php?id=306">0000306</a>: rapper doesn't handle datatype=""and xml:lang="" properly with RDFa</li>
   <li><a href="http://bugs.librdf.org/mantis/view.php?id=307">0000307</a>: configure fails at vnsprintf test when cross compiling</li>
+  <li><a href="http://bugs.librdf.org/mantis/view.php?id=310">0000310</a>:  Raptor does not like single character namespaces with RDFa</li>
   <li><a href="http://bugs.librdf.org/mantis/view.php?id=312">0000312</a>: Ununitialized pointer in example rdfserialize.c causes crash</li>
 </ul>
 
@@ -41,10 +43,18 @@ parsing.
 </p>
 
 <p>
-librdfa parser: Update to latest librdfa GIT source with head
-b8e3f78a3483a5c8aad4fe220daf60b4d3eee91e <br />
+RDFA parser (via librdfa): Update to latest librdfa GIT sources with head
+a438ce68a40e04b399ec2b2c613d0c867d9315c7 <br />
 now moved to 
 <a href="http://github.com/msporny/librdfa">http://github.com/msporny/librdfa</a>
+to fix handling single character namespaces
+(<a href="http://bugs.librdf.org/mantis/view.php?id=310">Issue#0000310</a>),
+empty datatype attribute and empty xml:lang attributes
+(<a href="http://bugs.librdf.org/mantis/view.php?id=306">Issue#0000306</a>)
+</p>
+
+<p>Added three unapproved RDFa tests 0172, 0173 and 0174 to cover the
+fixes above.
 </p>
 
 <h3>Serializer Changes</h3>
diff --git a/librdfa/rdfa.c b/librdfa/rdfa.c
index a77b17c4..47a9273a 100644
--- a/librdfa/rdfa.c
+++ b/librdfa/rdfa.c
@@ -1190,7 +1190,7 @@ void rdfa_free_context(rdfacontext* context)
       do {
         rval=rdfa_pop_item(context->context_stack);
         if(rval && rval != context)
-          rdfa_free_context(rval);
+          rdfa_free_context((rdfacontext*)rval);
       } while(rval);
       free(context->context_stack->items);
       free(context->context_stack);