checkin of last changes for 2.9, mostly docs
Marc Liyanage [Sun, 7 Sep 2003 14:27:55 +0000 (14:27 +0000)]
git-svn-id: svn+ssh://www.entropy.ch/Users/liyanage/Documents/svnroot/trunk/TestXSLT@60 153f8dbc-cef0-0310-8e0e-ba1d6c9f8c6b

24 files changed:
Distribution/readme.html
Distribution/readme.pdf [new file with mode: 0644]
Distribution/readme.rtf
Distribution/readme.xml
Distribution/readme2fo.xsl [new file with mode: 0644]
English.lproj/Credits.rtf
English.lproj/MyDocument.nib/info.nib
English.lproj/MyDocument.nib/keyedobjects.nib
FOP/jai_codec.jar [new file with mode: 0644]
FOP/jai_core.jar [new file with mode: 0644]
FOP/jimi-1.0.jar [new file with mode: 0755]
FOP/mlibwrapper_jai.jar [new file with mode: 0644]
FOPWrapper.java
JAXPWrapper.java
MyDocument.m
TestXSLT-Icon.png [new file with mode: 0644]
TestXSLT.pbproj/liyanage.pbxuser
TestXSLT.pbproj/project.pbxproj
XSL_FO_Renderer.m
libxml2/python/Makefile
libxml2/python/setup.py
libxml2/python/tests/Makefile
ragel_xmlscanner.h
todo.txt

index 003a2ef..f5c4d4c 100644 (file)
@@ -1,11 +1,11 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title>Readme for TestXSLT v2.8</title>
+    <title>Readme for TestXSLT v2.9</title>
     <META name="Author" content="Written by Marc Liyanage ">
   </head>
   <body>
-<h1>Readme for TestXSLT v2.8</h1>
+<h1>Readme for TestXSLT v2.9</h1>
 
 <p>
       <b>
@@ -39,7 +39,7 @@
 <p> </p>
     <h2>Requirements</h2>
     <p>
-Mac OS X 10.2., Safari 1.0 must be installed on your system.
+Mac OS X 10.2. and Safari 1.0 must be installed on your system.
 </p>
 
 <p> </p>
@@ -52,6 +52,22 @@ Mac OS X 10.2., Safari 1.0 must be installed on your system.
       </tr>
 
 <tr>
+        <td bgcolor="#eeeeee" valign="top" align="right">08-SEP-2003</td>
+        <td bgcolor="#eeeeee" valign="top" align="center">2.9</td>
+        <td bgcolor="#eeeeee" valign="top">
+          <ul>
+            <li>The highlight of this release is a new tag scanner, resulting in much smarter tag completion, and a list of the currently open tags at the top of the editor window. Check it out...</li>
+            <li>Reworked the GUI update code, thus improving the general responsiveness and performance of the application.</li>
+            <li>Major internal cleanup regarding encodings. If a dropped/opened file has an XML declaration with encoding information, that will be used, both when reading and when saving out to the file again. Make sure you activate the corresponding option in BBEdit too. If no such declaration exists, the platform default will be used (i.e. Macintosh encoding). Also, the encoding of the result of the transformation is currently assumed to be what's declared in the declaration of the XSLT code. This means you cannot use a different encoding in the xsl:output element.</li>
+            <li>The fixed encoding issues also mean that xsl:include directives referring to file names with non-ascii characters work now, e.g. &lt;xsl:include href="gähn.xsl"/&gt;.</li>
+            <li>Added a new XSLT example, the first one to produce XSL-FO. It converts the readme.xml file to XSL-FO / PDF, so there are now three output formats for the readme.xml file: HTML, XSL-FO / PDF and RTF. As always, this is intended to get you started with learning XSLT and in this case also XSL-FO. An excellent introduction to the FO part is available at <a href="http://www.ibiblio.org/xml/books/bible2/chapters/ch18.html">http://www.ibiblio.org/xml/books/bible2/chapters/ch18.html</a>
+            </li>
+            <li>Fixed a bug which would prevent XSL-FO / PDF rendering to hang the application if images were used in the document.</li>
+          </ul>
+        </td>
+      </tr>
+
+<tr>
         <td bgcolor="#eeeeee" valign="top" align="right">17-AUG-2003</td>
         <td bgcolor="#eeeeee" valign="top" align="center">2.8</td>
         <td bgcolor="#eeeeee" valign="top">
diff --git a/Distribution/readme.pdf b/Distribution/readme.pdf
new file mode 100644 (file)
index 0000000..d2b309f
Binary files /dev/null and b/Distribution/readme.pdf differ
index d40b737..53d617d 100644 (file)
@@ -61,7 +61,7 @@ The latest version of this software is available at
 
 \f0\b \ Requirements\
 \f1\b0 
-Mac OS X 10.2., Safari 1.0 must be installed on your system.
+Mac OS X 10.2. and Safari 1.0 must be installed on your system.
 \
 \
 
@@ -71,6 +71,25 @@ Mac OS X 10.2., Safari 1.0 must be installed on your system.
 \f1\b0 \
 
 
+08-SEP-2003 Version 2.9\
+
+- The highlight of this release is a new tag scanner, resulting in much smarter tag completion, and a list of the currently open tags at the top of the editor window. Check it out...\
+
+- Reworked the GUI update code, thus improving the general responsiveness and performance of the application.\
+
+- Major internal cleanup regarding encodings. If a dropped/opened file has an XML declaration with encoding information, that will be used, both when reading and when saving out to the file again. Make sure you activate the corresponding option in BBEdit too. If no such declaration exists, the platform default will be used (i.e. Macintosh encoding). Also, the encoding of the result of the transformation is currently assumed to be what's declared in the declaration of the XSLT code. This means you cannot use a different encoding in the xsl:output element.\
+
+- The fixed encoding issues also mean that xsl:include directives referring to file names with non-ascii characters work now, e.g. <xsl:include href="gähn.xsl"/>.\
+
+- Added a new XSLT example, the first one to produce XSL-FO. It converts the readme.xml file to XSL-FO / PDF, so there are now three output formats for the readme.xml file: HTML, XSL-FO / PDF and RTF. As always, this is intended to get you started with learning XSLT and in this case also XSL-FO. An excellent introduction to the FO part is available at 
+\cf2 http://www.ibiblio.org/xml/books/bible2/chapters/ch18.html\cf0 
+\
+
+- Fixed a bug which would prevent XSL-FO / PDF rendering to hang the application if images were used in the document.\
+
+\
+
+
 17-AUG-2003 Version 2.8\
 
 - Embedded the FOP XSL-FO rendering engine from the Apache Project. This means that you can now view the result of a translation which produces XSL-FO instructions directly in the application. You can also save the output as a PDF file. With this addition, TestXSLT is now a useful learning tool for the XSL-FO language.\
index 3b51ece..0fceb05 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- $id$ -->
+<!-- $Id$ -->
 
 <readme>
 <title>Readme for TestXSLT</title>
 </description>
 
 <requirements>
-Mac OS X 10.2., Safari 1.0 must be installed on your system.
+Mac OS X 10.2. and Safari 1.0 must be installed on your system.
 </requirements>
 
 <history>
 
 <entry>
        <version>2.9</version>
-       <date>xx-SEP-2003</date>
-       <item>Added a tag scanner, resulting in much smarter tag completion, and a list of the currently open tags at the top of the editor.</item>
+       <date>08-SEP-2003</date>
+       <item>The highlight of this release is a new tag scanner, resulting in much smarter tag completion, and a list of the currently open tags at the top of the editor window. Check it out...</item>
+       <item>Reworked the GUI update code, thus improving the general responsiveness and performance of the application.</item>
        <item>Major internal cleanup regarding encodings. If a dropped/opened file has an XML declaration with encoding information, that will be used, both when reading and when saving out to the file again. Make sure you activate the corresponding option in BBEdit too. If no such declaration exists, the platform default will be used (i.e. Macintosh encoding). Also, the encoding of the result of the transformation is currently assumed to be what's declared in the declaration of the XSLT code. This means you cannot use a different encoding in the xsl:output element.</item>
+       <item>The fixed encoding issues also mean that xsl:include directives referring to file names with non-ascii characters work now, e.g. &lt;xsl:include href="gähn.xsl"/&gt;.</item>
+       <item>Added a new XSLT example, the first one to produce XSL-FO. It converts the readme.xml file to XSL-FO / PDF, so there are now three output formats for the readme.xml file: HTML, XSL-FO / PDF and RTF. As always, this is intended to get you started with learning XSLT and in this case also XSL-FO. An excellent introduction to the FO part is available at <url>http://www.ibiblio.org/xml/books/bible2/chapters/ch18.html</url></item>
+       <item>Fixed a bug which would prevent XSL-FO / PDF rendering to hang the application if images were used in the document.</item>
 
 </entry>
 
diff --git a/Distribution/readme2fo.xsl b/Distribution/readme2fo.xsl
new file mode 100644 (file)
index 0000000..fb93c8c
--- /dev/null
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>\r<!-- $Id$ -->\r<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">\r<!-- Need to instruct the XSLT processor to use XML output rules.\r     See http://www.w3.org/TR/xslt#output for more details\r-->\r    <xsl:output method="xml" indent="yes" encoding="UTF-8" />\r      <xsl:param name="version" />\r
+
+
+       <!-- This template matches the root element of the readme document and emits the page
+         master definitions -->
+       <xsl:template match='readme'>\r\r         <fo:root>\r
+\r
+                       <!-- We are producing A4 pages -->
+                       <fo:layout-master-set>\r                         <fo:simple-page-master\r                                 master-name="main-a4"\r                                  page-height="297mm" page-width="210mm"\r                                 margin-top="20mm" margin-right="30mm" margin-bottom="10mm" margin-left="20mm"\r                          >\r                                      <fo:region-before extent="20mm"/>\r                                      <fo:region-body margin-top="0mm" margin-bottom="20mm"/>\r                                        <fo:region-after extent="10mm"/>\r                               </fo:simple-page-master>\r\r                              <fo:page-sequence-master master-name="sequence">\r                                       <fo:single-page-master-reference master-reference="main-a4"/>\r                          </fo:page-sequence-master>\r                             \r                       </fo:layout-master-set>\r\r
+                       <!-- define a master page sequence. Our sequence is simple and only has
+                            one kind of page for the entire document. -->
+                       <fo:page-sequence master-reference="main-a4">\r
+                               
+                               <!-- This fo:static-content element which we are putting into the "after" section
+                                    will create a small footer with the document title and the page number at the
+                                    bottom of each page -->\r                           <fo:static-content flow-name="xsl-region-after">\r                               <fo:block font-family="Helvetica" font-style="italic" font-size="9pt" margin-top="10mm" color="#fff" background-color="#000" padding="1mm"><xsl:value-of select="/readme/title"/> v<xsl:value-of select="$version"/> – Page <fo:page-number/></fo:block>\r                             </fo:static-content>\r   \r
+
+                               <!-- This is the main and only flow which produces
+                                    content for the pages -->
+                               <fo:flow flow-name="xsl-region-body">\r                          <xsl:apply-templates/>
+                               <fo:block padding-top="40mm"><fo:external-graphic src="file:///Users/liyanage/cvs/entropy/TestXSLT/TestXSLT-Icon.png"/></fo:block>
+                               </fo:flow>\r\r                    </fo:page-sequence>\r\r           </fo:root>\r\r    </xsl:template>\r\r
+
+
+
+
+
+
+       <!-- Following are all templates which produce XSL-FO layout elements,
+            usually this means fo:block elements with various attributes -->
+
+
+       <!-- The title is in a gray box -->
+       <xsl:template match='title'>\r           <fo:block border="0.5pt" padding-top="2mm" padding-bottom="0mm" padding-left="2mm" background-color="#eeeeee" border-color="#aaaaaa" border-style="solid" margin-top="10mm" margin-left="0mm" font-size="24pt" font-family="Helvetica"  font-weight="bold" line-height="30pt">\r                 <xsl:apply-templates/> v<xsl:value-of select="$version"/>\r              </fo:block>
+       </xsl:template>\r
+
+
+
+
+
+
+       <!-- description, requirements and history all look the same because they
+            are all introduce a top-level section -->
+       <xsl:template match='description'>\r             <fo:block padding-top="8mm" font-family="Helvetica"  font-weight="bold" font-size="18pt">Description</fo:block>\r
+               <xsl:call-template name="sectionrule"/>
+               <fo:block margin-left="15mm"><xsl:apply-templates/></fo:block>\r
+       </xsl:template>\r\r
+       <xsl:template match='requirements'>\r            <fo:block padding-top="8mm" font-family="Helvetica"  font-weight="bold" font-size="18pt">Requirements</fo:block>\r
+               <xsl:call-template name="sectionrule"/>
+               <fo:block margin-left="15mm"><xsl:call-template name="para"/></fo:block>\r
+       </xsl:template>\r\r
+       <xsl:template match='history'>\r         <fo:block padding-top="8mm" font-family="Helvetica"  font-weight="bold" font-size="18pt">History</fo:block>\r
+               <xsl:call-template name="sectionrule"/>
+               <xsl:apply-templates/>
+       </xsl:template>\r
+
+
+
+
+
+
+       <!-- This produces a list-block item for history entries -->
+       <xsl:template match='entry'>\r           <fo:block keep-with-next="always" padding-top="8mm" font-family="Helvetica" font-weight="bold" font-style="italic" font-size="11pt">Version <xsl:value-of select="version"/>, released <xsl:value-of select="date"/></fo:block>\r
+               <xsl:call-template name="entryrule"/>
+               <fo:list-block margin-left="15mm"><xsl:apply-templates select="item"/></fo:list-block>
+       </xsl:template>\r
+
+       <xsl:template match='item'>\r
+               <fo:list-item font-size="12pt" line-height="15pt">
+                       <fo:list-item-label><fo:block padding-top="0.5mm" font-family="ZapfDingbats">➔</fo:block></fo:list-item-label>
+                       <fo:list-item-body start-indent="body-start() - 3mm"><fo:block padding-top="0.5mm" font-family="Times"><xsl:apply-templates/></fo:block></fo:list-item-body>
+               </fo:list-item>
+       </xsl:template>\r
+
+
+
+       <!-- A 1pt-wide horizontal rule for the section headings -->
+       <xsl:template name='sectionrule'>\r              <fo:block padding-top="-3mm"><fo:leader leader-length="100%" leader-pattern="rule" rule-style="solid" rule-thickness="1pt" color="black"/></fo:block>
+       </xsl:template>\r
+
+       <!-- A 1pw-wide dotted horizontal rule for history entry subheadings -->
+       <xsl:template name='entryrule'>\r                <fo:block keep-with-next="always" padding-top="-3mm"><fo:leader leader-length="100%" leader-pattern="rule" rule-style="dotted" rule-thickness="1pt"/></fo:block>
+       </xsl:template>\r
+
+       <!-- Our regular paragraphs in the description section -->
+       <xsl:template match='para' name='para'>\r                <fo:block padding-top="2mm" font-size="12pt" font-family="Times" line-height="15pt"><xsl:apply-templates/></fo:block>\r
+       </xsl:template>\r\r
+       <!-- Make real, clickable URLs out of url elements -->
+       <xsl:template match='url'>\r<fo:basic-link external-destination="{.}"><fo:inline color="blue"><xsl:apply-templates/></fo:inline></fo:basic-link> </xsl:template>\r
+
+       <!-- The same for email, put make them mailto: URLs -->
+       <xsl:template match='email'>\r
+               <fo:basic-link external-destination="mailto:{.}?subject=TestXSLT-Readme-PDF"><fo:inline color="blue"><xsl:apply-templates/></fo:inline></fo:basic-link>
+       </xsl:template>\r
+
+       <!-- Document authorship information -->
+       <xsl:template match='author'>\r
+               <fo:block padding-top="5mm" font-size="12pt" font-family="Times" font-weight="bold" font-style="italic"><xsl:apply-templates/></fo:block>\r
+       </xsl:template>\r
+
+
+
+       <!-- The templates above should catch all content, we do not want
+            anything to fall through. If something still does, we will paint
+            a red border around it here so it stands out and we can fix the problem -->
+       <xsl:template match='*'>\r               <fo:block border-style="solid" border-color="red" border-width="0.5pt" margin-top="10mm" font-size="10pt" font-family="Helvetica" line-height="12pt">\r          <xsl:apply-templates/>\r         </fo:block>\r    </xsl:template>\r\r\r</xsl:stylesheet>\r
\ No newline at end of file
index 83a1a6d..9418309 100644 (file)
@@ -19,7 +19,12 @@ Engineering:
        Marc too\
 \
 
-\f0\b Testing:
+\f0\b Beta-Testing:
+\f1\b0 \
+       Andy Liyanage\
+\
+
+\f0\b Enduser-Testing:
 \f1\b0 \
        You\
 \
index e003636..526ef0a 100644 (file)
                <string>439 467 401 208 0 0 1280 832 </string>
        </dict>
        <key>IBFramework Version</key>
-       <string>347.0</string>
+       <string>348.0</string>
        <key>IBOpenObjects</key>
        <array>
                <integer>154</integer>
                <integer>5</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>7B49</string>
+       <string>7B53</string>
 </dict>
 </plist>
index 32e6c22..25ef43d 100644 (file)
Binary files a/English.lproj/MyDocument.nib/keyedobjects.nib and b/English.lproj/MyDocument.nib/keyedobjects.nib differ
diff --git a/FOP/jai_codec.jar b/FOP/jai_codec.jar
new file mode 100644 (file)
index 0000000..aaecbb2
Binary files /dev/null and b/FOP/jai_codec.jar differ
diff --git a/FOP/jai_core.jar b/FOP/jai_core.jar
new file mode 100644 (file)
index 0000000..f19c3dc
Binary files /dev/null and b/FOP/jai_core.jar differ
diff --git a/FOP/jimi-1.0.jar b/FOP/jimi-1.0.jar
new file mode 100755 (executable)
index 0000000..bfbb9f3
Binary files /dev/null and b/FOP/jimi-1.0.jar differ
diff --git a/FOP/mlibwrapper_jai.jar b/FOP/mlibwrapper_jai.jar
new file mode 100644 (file)
index 0000000..2991152
Binary files /dev/null and b/FOP/mlibwrapper_jai.jar differ
index ffe2e90..aea741a 100644 (file)
@@ -26,8 +26,9 @@ public class FOPWrapper {
        public NSData convert(NSData foData) throws IOException, FOPException {
         
                //Construct driver
+        System.setProperty("java.awt.headless", "true");
                Driver driver = new Driver();
-        
+               
                //Setup logger
                Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
                driver.setLogger(logger);
@@ -59,6 +60,9 @@ public class FOPWrapper {
                        out.close();
                }
                
+               if (errorOccurred) {
+                       return null;
+               }
                return new NSData(out.toByteArray());
                
        }
index 782a17f..fb9de49 100644 (file)
@@ -54,7 +54,7 @@ public class JAXPWrapper {
 
                java.lang.System.setProperty("javax.xml.transform.TransformerFactory", processorClassName);
                
-               System.err.println("java reached: xml: " + xml + " xsl: " + xslt + " param: " + parameters + " baseuri: " + baseUri);
+               //System.err.println("java reached: xml: " + xml + " xsl: " + xslt + " param: " + parameters + " baseuri: " + baseUri);
 
                try {
                        
index 79493c5..893f60b 100644 (file)
@@ -982,30 +982,35 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
 
        NSData *resultData = [xfr render:[workset result]];
 
+       [xfr release];
+
+       if (!resultData) {
+               NSLog(@"Unable to render, NULL result");
+               return;
+       }
+       
        [resultData retain];
        [pdfData release];
        pdfData = resultData;
        
        NSImage *pdfImage = [[[NSImage alloc] initWithData:resultData] autorelease];
        [pdfImage setBackgroundColor:[NSColor whiteColor]];
+       [pdfImage recache];
        [pdfImage setCacheMode:NSImageCacheNever];
        
+       NSClipView *clipView = (NSClipView *)[resultImageView superview];
+       NSScrollView *scrollView = (NSScrollView *)[clipView superview];
+       
        [resultImageView setImage:pdfImage];
        [resultImageView setFrameSize:[pdfImage size]];
+       [resultImageView display];
 
-       //:[[[pdfImage representations] objectAtIndex:0] bounds]
-       //[resultImageView sizeToFit];
-       
-       //[resultImageView setNeedsDisplay:YES];
-
-       //NSLog(@"image reps: -%@-", [pdfImage representations]);
-       //NSLog(@"count: -%d-", [[[pdfImage representations] objectAtIndex:0] pageCount]);
+       [clipView scrollToPoint:NSMakePoint([resultImageView frame].origin.x, [resultImageView frame].size.height - [clipView frame].size.height + [resultImageView frame].origin.y)];
+       [scrollView reflectScrolledClipView:clipView];
        
        pdfPageCount = [[[pdfImage representations] objectAtIndex:0] pageCount];
        pdfCurrentPage = 0;
                
-       [xfr release];
-       
 }
 
 
@@ -1085,13 +1090,11 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
        NSSize errorDrawerSize;
 
        [super windowControllerDidLoadNib:aController];
-               
-       [resultImageView setImageAlignment:NSImageAlignTopLeft];
-       //      [resultImageView setImageFrameStyle:NSImageFrameGroove];
+
+       [resultImageView setImageFrameStyle:NSImageFramePhoto];
        [resultImageView setImageScaling:NSScaleNone];
+       [resultImageView setImageAlignment:NSImageAlignCenter];
        [resultImageView setEditable:NO];
-               
-       
        
        [resultWebView setTextSizeMultiplier:0.9];
        
@@ -1103,8 +1106,8 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
        errorDrawerSize.height = 130;
        [errorDrawer setContentSize:errorDrawerSize];
        
-
-       
+       NSFont *computerFont = [NSFont fontWithName:@"Courier" size:12.0];
+       [resultView setFont:computerFont];
        
        if (findPanelController == nil) {
                findPanelController = [[FindPanelController alloc] initWithWindowNibName:@"FindPanel"];
diff --git a/TestXSLT-Icon.png b/TestXSLT-Icon.png
new file mode 100644 (file)
index 0000000..6e4e7e1
Binary files /dev/null and b/TestXSLT-Icon.png differ
index 7de244d..a7a07d2 100644 (file)
                sourceDirectories = (
                );
        };
+       1B0908B4042BE88C00A8A905 = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {828, 14392}}";
+                       sepNavSelRange = "{0, 0}";
+                       sepNavVisRect = "{{0, 4487}, {828, 405}}";
+               };
+       };
        1B09090F042BE88C00A8A905 = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {871, 153538}}";
                        sepNavVisRect = "{{0, 126282}, {871, 235}}";
                };
        };
+       1B09119C042BE89100A8A905 = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {828, 8092}}";
+                       sepNavSelRange = "{6277, 0}";
+                       sepNavVisRect = "{{0, 3947}, {828, 405}}";
+                       sepNavWindowFrame = "{{61, 227}, {750, 558}}";
+               };
+       };
        1B0911E0042BE89100A8A905 = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {828, 40306}}";
        1B387DB50503FDF50064611D = {
                fileReference = 2A37F4ACFDCFA73011CA2CEA;
                isa = PBXFileBreakpoint;
-               lineNumber = 1084;
+               lineNumber = 1089;
                state = 1;
        };
-       1B387DC60504118D0064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 211";
-               rLen = 0;
-               rLoc = 5946;
-               rType = 0;
-               vrLen = 971;
-               vrLoc = 5373;
-       };
        1B387DC70504118D0064611D = {
                fRef = F786D09302FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 369;
                vrLoc = 149;
        };
-       1B387DCB0504118D0064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 207";
-               rLen = 0;
-               rLoc = 5946;
-               rType = 0;
-               vrLen = 972;
-               vrLoc = 5373;
-       };
        1B387DCC0504118D0064611D = {
                fRef = F786D09402FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 366;
                vrLoc = 152;
        };
-       1B387DCD0504118D0064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 210";
-               rLen = 0;
-               rLoc = 5946;
-               rType = 0;
-               vrLen = 995;
-               vrLoc = 5378;
-       };
        1B387DCE0504118D0064611D = {
                fRef = F786D09402FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 610;
                vrLoc = 149;
        };
-       1B387DD20504118D0064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 1102";
-               rLen = 0;
-               rLoc = 23178;
-               rType = 0;
-               vrLen = 897;
-               vrLoc = 23895;
-       };
        1B387DD40504118D0064611D = {
                fRef = F786D09402FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 418;
                vrLoc = 178;
        };
-       1B387DD50504118D0064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 210";
-               rLen = 0;
-               rLoc = 5946;
-               rType = 0;
-               vrLen = 851;
-               vrLoc = 5256;
-       };
        1B387DD60504118D0064611D = {
                fRef = F786D09402FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 770;
                vrLoc = 3419;
        };
-       1B387DDB0504118D0064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 210";
-               rLen = 0;
-               rLoc = 5946;
-               rType = 0;
-               vrLen = 1021;
-               vrLoc = 5322;
-       };
        1B387DDC0504118D0064611D = {
                fRef = F786D09402FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 617;
                vrLoc = 3290;
        };
-       1B387DEB0504118D0064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 170";
-               rLen = 0;
-               rLoc = 4896;
-               rType = 0;
-               vrLen = 1173;
-               vrLoc = 3419;
-       };
        1B387DEC0504118D0064611D = {
                fRef = F786D09402FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 697;
                vrLoc = 3093;
        };
-       1B387DED0504118D0064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 202";
-               rLen = 0;
-               rLoc = 5946;
-               rType = 0;
-               vrLen = 1328;
-               vrLoc = 3648;
-       };
        1B387DEE0504118D0064611D = {
                fRef = F786D09402FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 696;
                vrLoc = 263;
        };
-       1B387DF20504118D0064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 146";
-               rLen = 0;
-               rLoc = 3732;
-               rType = 0;
-               vrLen = 1312;
-               vrLoc = 2924;
-       };
        1B387DF30504118D0064611D = {
                fRef = F786D09402FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 685;
                vrLoc = 2692;
        };
-       1B387DFF050414590064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 1088";
-               rLen = 0;
-               rLoc = 23100;
-               rType = 0;
-               vrLen = 795;
-               vrLoc = 23132;
-       };
        1B387E5D050415590064611D = {
                fileReference = F786D09402FB227701000103;
                isa = PBXFileBreakpoint;
                vrLen = 614;
                vrLoc = 209;
        };
-       1B387E69050416FA0064611D = {
-               fRef = 2A37F4AEFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.h: 113";
-               rLen = 0;
-               rLoc = 2912;
-               rType = 0;
-               vrLen = 816;
-               vrLoc = 2528;
-       };
        1B387E6A050416FA0064611D = {
                fRef = F786D09402FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 615;
                vrLoc = 209;
        };
-       1B387E6B050416FA0064611D = {
-               fRef = 2A37F4AEFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.h: 113";
-               rLen = 0;
-               rLoc = 2912;
-               rType = 0;
-               vrLen = 817;
-               vrLoc = 2527;
-       };
-       1B387E6C050416FA0064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 136";
-               rLen = 0;
-               rLoc = 2788;
-               rType = 0;
-               vrLen = 1732;
-               vrLoc = 1906;
-       };
        1B387E6D050416FA0064611D = {
                fRef = F786D09402FB227701000103;
                isa = PBXTextBookmark;
                rLen = 5;
                rLoc = 6157;
                rType = 0;
-               vrLen = 519;
+               vrLen = 486;
                vrLoc = 5676;
        };
        1B387E830504B7E80064611D = {
                vrLen = 790;
                vrLoc = 2963;
        };
-       1B387E860504B7E80064611D = {
-               fRef = F739177802FCAAF401000103;
-               isa = PBXTextBookmark;
-               name = "todo.txt: 22";
-               rLen = 0;
-               rLoc = 404;
-               rType = 0;
-               vrLen = 1125;
-               vrLoc = 298;
-       };
-       1B387E880504B7E80064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 1002";
-               rLen = 5;
-               rLoc = 21719;
-               rType = 0;
-               vrLen = 780;
-               vrLoc = 21286;
-       };
        1B387E890504B7E80064611D = {
                fRef = F786D09302FB227701000103;
                isa = PBXTextBookmark;
                vrLen = 790;
                vrLoc = 2963;
        };
-       1B387E8B0504B7E80064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 292";
-               rLen = 0;
-               rLoc = 6863;
-               rType = 0;
-               vrLen = 480;
-               vrLoc = 6741;
-       };
-       1B387E8C0504B7E80064611D = {
-               fRef = 2A37F4AEFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.h: 106";
-               rLen = 0;
-               rLoc = 2760;
-               rType = 0;
-               vrLen = 813;
-               vrLoc = 2527;
-       };
-       1B387E8D0504B7E80064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 265";
-               rLen = 0;
-               rLoc = 6632;
-               rType = 0;
-               vrLen = 337;
-               vrLoc = 6391;
-       };
-       1B387E8E0504B7E80064611D = {
-               fRef = F739177802FCAAF401000103;
-               isa = PBXTextBookmark;
-               name = "todo.txt: 22";
-               rLen = 0;
-               rLoc = 404;
-               rType = 0;
-               vrLen = 1125;
-               vrLoc = 298;
-       };
-       1B387E940504B9E70064611D = {
-               expectedFileType = text.html;
-               isa = PBXFileReference;
-               name = index.html;
-               path = "/Users/liyanage/cvs/entropy/TestXSLT/TestXSLT Help/index.html";
-               refType = 0;
-               sourceTree = "<absolute>";
-       };
-       1B387E9A0504BA770064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 1166";
-               rLen = 5;
-               rLoc = 25673;
-               rType = 0;
-               vrLen = 752;
-               vrLoc = 24926;
-       };
-       1B387E9B0504BA770064611D = {
-               fRef = 2A37F4BAFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "English: 52";
-               rLen = 0;
-               rLoc = 801;
-               rType = 0;
-               vrLen = 487;
-               vrLoc = 0;
-       };
-       1B387E9C0504BA770064611D = {
-               fRef = 2A37F4AEFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.h: 106";
-               rLen = 0;
-               rLoc = 2760;
-               rType = 0;
-               vrLen = 950;
-               vrLoc = 1577;
-       };
-       1B387E9D0504BA770064611D = {
-               fRef = 089C1660FE840EACC02AAC07;
-               isa = PBXTextBookmark;
-               name = "English: 6";
-               rLen = 0;
-               rLoc = 248;
-               rType = 0;
-               vrLen = 312;
-               vrLoc = 0;
-       };
-       1B387E9E0504BA770064611D = {
-               fRef = 1B387E940504B9E70064611D;
-               isa = PBXBookmark;
-       };
-       1B387E9F0504BA770064611D = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 1166";
-               rLen = 5;
-               rLoc = 25673;
-               rType = 0;
-               vrLen = 752;
-               vrLoc = 24926;
-       };
-       1B387EA00504BA770064611D = {
-               fRef = 2A37F4BAFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "English: 52";
-               rLen = 0;
-               rLoc = 801;
-               rType = 0;
-               vrLen = 487;
-               vrLoc = 0;
-       };
-       1B387EA10504BA770064611D = {
-               fRef = 2A37F4AEFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.h: 106";
-               rLen = 0;
-               rLoc = 2760;
-               rType = 0;
-               vrLen = 950;
-               vrLoc = 1577;
-       };
-       1B387EA20504BA770064611D = {
-               fRef = 089C1660FE840EACC02AAC07;
-               isa = PBXTextBookmark;
-               name = "English: 6";
-               rLen = 0;
-               rLoc = 248;
-               rType = 0;
-               vrLen = 312;
-               vrLoc = 0;
-       };
-       1B387EA30504BA770064611D = {
-               fRef = 1B387EA40504BA7A0064611D;
-               isa = PBXTextBookmark;
-               name = "(null): 15";
-               rLen = 0;
-               rLoc = 518;
-               rType = 0;
-               vrLen = 1001;
-               vrLoc = 0;
-       };
-       1B387EA40504BA7A0064611D = {
-               isa = PBXFileReference;
-               name = index.html;
-               path = "/Users/liyanage/cvs/entropy/TestXSLT/TestXSLT Help/index.html";
-               refType = 0;
-               sourceTree = "<absolute>";
-       };
-       1B387EA50504BBD10064611D = {
-               fRef = 1B387EA90504BBD60064611D;
-               isa = PBXTextBookmark;
-               name = "(null): 15";
-               rLen = 0;
-               rLoc = 518;
-               rType = 0;
-               vrLen = 1001;
-               vrLoc = 0;
-       };
-       1B387EA60504BBD10064611D = {
-               fRef = 1B387EAA0504BBD60064611D;
-               isa = PBXTextBookmark;
-               name = "(null): 15";
-               rLen = 0;
-               rLoc = 518;
-               rType = 0;
-               vrLen = 1001;
-               vrLoc = 0;
-       };
-       1B387EA70504BBD10064611D = {
-               fRef = 2A37F4BAFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "English: 52";
-               rLen = 0;
-               rLoc = 801;
-               rType = 0;
-               vrLen = 487;
-               vrLoc = 0;
-       };
-       1B387EA80504BBD10064611D = {
-               fRef = 2A37F4BAFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "English: 52";
-               rLen = 0;
-               rLoc = 801;
-               rType = 0;
-               vrLen = 487;
-               vrLoc = 0;
-       };
-       1B387EA90504BBD60064611D = {
-               isa = PBXFileReference;
-               name = index.html;
-               path = "/Users/liyanage/cvs/entropy/TestXSLT/TestXSLT Help/index.html";
-               refType = 0;
-               sourceTree = "<absolute>";
-       };
-       1B387EAA0504BBD60064611D = {
-               isa = PBXFileReference;
-               name = index.html;
-               path = "/Users/liyanage/cvs/entropy/TestXSLT/TestXSLT Help/index.html";
-               refType = 0;
-               sourceTree = "<absolute>";
-       };
        1B3BC83B0436364A006C8631 = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {740, 431}}";
                vrLen = 266;
                vrLoc = 0;
        };
-       1B7E475805028B5A00A3FD82 = {
-               fRef = 1BB569F404E3010E0099E21C;
-               isa = PBXTextBookmark;
-               name = "FOPWrapper.java: 45";
-               rLen = 0;
-               rLoc = 1191;
-               rType = 0;
-               vrLen = 716;
-               vrLoc = 0;
-       };
-       1B7E475905028B5A00A3FD82 = {
-               fRef = 1BF7F12404F2BE74007723F5;
-               isa = PBXTextBookmark;
-               name = "XSL_FO_Renderer.m: render:";
-               rLen = 38;
-               rLoc = 221;
-               rType = 0;
-               vrLen = 496;
-               vrLoc = 38;
-       };
        1B7E475A05028B5A00A3FD82 = {
                fRef = 1BF7F12304F2BE74007723F5;
                isa = PBXTextBookmark;
                vrLen = 637;
                vrLoc = 538;
        };
-       1B7E47B505028B5A00A3FD82 = {
-               fRef = 1BB569F404E3010E0099E21C;
-               isa = PBXTextBookmark;
-               name = "FOPWrapper.java: convert";
-               rLen = 0;
-               rLoc = 1301;
-               rType = 0;
-               vrLen = 578;
-               vrLoc = 923;
-       };
        1B7E47B605028B5A00A3FD82 = {
                fRef = 1B23468404DEB06C0050A2ED;
                isa = PBXTextBookmark;
                vrLen = 1011;
                vrLoc = 1047;
        };
-       1B7E47B705028B5A00A3FD82 = {
-               fRef = 1BB569F404E3010E0099E21C;
-               isa = PBXTextBookmark;
-               name = "FOPWrapper.java: convert";
-               rLen = 6;
-               rLoc = 604;
-               rType = 0;
-               vrLen = 784;
-               vrLoc = 495;
-       };
        1B7E47B805028B5A00A3FD82 = {
                fRef = 1BF7F12304F2BE74007723F5;
                isa = PBXTextBookmark;
                vrLen = 496;
                vrLoc = 38;
        };
-       1B7E47BA05028B5A00A3FD82 = {
-               fRef = 1BB569F404E3010E0099E21C;
-               isa = PBXTextBookmark;
-               name = "FOPWrapper.java: 45";
-               rLen = 0;
-               rLoc = 1191;
-               rType = 0;
-               vrLen = 716;
-               vrLoc = 0;
-       };
        1B7E47BB05028B5A00A3FD82 = {
                fRef = F7D20D1102F9A9BE01000103;
                isa = PBXTextBookmark;
                vrLen = 548;
                vrLoc = 2749;
        };
-       1B7E485F0502AB1C00A3FD82 = {
-               fRef = 2A37F4AEFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.h: 8";
-               rLen = 0;
-               rLoc = 186;
-               rType = 0;
-               vrLen = 1037;
-               vrLoc = 853;
-       };
-       1B7E48600502AB1C00A3FD82 = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: 210";
-               rLen = 0;
-               rLoc = 5946;
-               rType = 0;
-               vrLen = 865;
-               vrLoc = 5259;
-       };
        1B7E48620502AB1C00A3FD82 = {
                fRef = F56420C102329DDD01000103;
                isa = PBXTextBookmark;
                vrLen = 597;
                vrLoc = 82;
        };
-       1B7E48640502AB1C00A3FD82 = {
-               fRef = 2A37F4ACFDCFA73011CA2CEA;
-               isa = PBXTextBookmark;
-               name = "MyDocument.m: uiUpdateTimerTarget:";
-               rLen = 19;
-               rLoc = 1855;
-               rType = 0;
-               vrLen = 1074;
-               vrLoc = 1741;
-       };
        1B7E48670502AB1C00A3FD82 = {
                fRef = F56420C102329DDD01000103;
                isa = PBXTextBookmark;
                vrLen = 597;
                vrLoc = 82;
        };
+       1B894BA805090AF700D46ABC = {
+               fRef = F739177802FCAAF401000103;
+               isa = PBXTextBookmark;
+               name = "todo.txt: 4";
+               rLen = 0;
+               rLoc = 63;
+               rType = 0;
+               vrLen = 912;
+               vrLoc = 0;
+       };
+       1B894BA905090AF700D46ABC = {
+               fRef = 2A37F4AEFDCFA73011CA2CEA;
+               isa = PBXTextBookmark;
+               name = "MyDocument.h: 106";
+               rLen = 0;
+               rLoc = 2760;
+               rType = 0;
+               vrLen = 950;
+               vrLoc = 1577;
+       };
+       1B894BAD05090AF700D46ABC = {
+               fRef = F739177802FCAAF401000103;
+               isa = PBXTextBookmark;
+               name = "todo.txt: 4";
+               rLen = 0;
+               rLoc = 63;
+               rType = 0;
+               vrLen = 912;
+               vrLoc = 0;
+       };
+       1B894BAE05090AF700D46ABC = {
+               fRef = 2A37F4AEFDCFA73011CA2CEA;
+               isa = PBXTextBookmark;
+               name = "MyDocument.h: 106";
+               rLen = 0;
+               rLoc = 2760;
+               rType = 0;
+               vrLen = 950;
+               vrLoc = 1577;
+       };
+       1B894BB105090AF700D46ABC = {
+               fRef = 1BF7F12404F2BE74007723F5;
+               isa = PBXTextBookmark;
+               name = "XSL_FO_Renderer.m: 23";
+               rLen = 0;
+               rLoc = 385;
+               rType = 0;
+               vrLen = 553;
+               vrLoc = 41;
+       };
+       1B894BB305090AF700D46ABC = {
+               fRef = 1BF7F12404F2BE74007723F5;
+               isa = PBXTextBookmark;
+               name = "XSL_FO_Renderer.m: 29";
+               rLen = 0;
+               rLoc = 463;
+               rType = 0;
+               vrLen = 504;
+               vrLoc = 90;
+       };
+       1B894BD405092F0C00D46ABC = {
+               fRef = 1BF7F12404F2BE74007723F5;
+               isa = PBXTextBookmark;
+               name = "XSL_FO_Renderer.m: 23";
+               rLen = 0;
+               rLoc = 463;
+               rType = 0;
+               vrLen = 492;
+               vrLoc = 3;
+       };
+       1B894BD505092F0C00D46ABC = {
+               fRef = 1BB569F404E3010E0099E21C;
+               isa = PBXTextBookmark;
+               name = "FOPWrapper.java: 30";
+               rLen = 0;
+               rLoc = 753;
+               rType = 0;
+               vrLen = 853;
+               vrLoc = 526;
+       };
+       1B894BD705092F0C00D46ABC = {
+               fRef = 1BF7F12404F2BE74007723F5;
+               isa = PBXTextBookmark;
+               name = "XSL_FO_Renderer.m: 23";
+               rLen = 0;
+               rLoc = 463;
+               rType = 0;
+               vrLen = 492;
+               vrLoc = 3;
+       };
        1B8B40170502692200371325 = {
                fileReference = F786D09402FB227701000103;
                isa = PBXFileBreakpoint;
        };
        1BB569F404E3010E0099E21C = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {828, 1512}}";
-                       sepNavSelRange = "{1191, 0}";
-                       sepNavVisRect = "{{0, 0}, {828, 405}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {828, 1568}}";
+                       sepNavSelRange = "{753, 0}";
+                       sepNavVisRect = "{{0, 320}, {828, 405}}";
                        sepNavWindowFrame = "{{107, 185}, {750, 558}}";
                };
        };
        1BB9C17204C153A8006508EA = {
                activeExec = 0;
        };
+       1BC0D4EE04CD12140079373A = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {828, 742}}";
+                       sepNavSelRange = "{0, 0}";
+                       sepNavVisRect = "{{0, 337}, {828, 405}}";
+               };
+       };
        1BC0D4EF04CD125A0079373A = {
                activeExec = 0;
        };
                        sepNavWindowFrame = "{{249, 53}, {750, 558}}";
                };
        };
+       1BEF77EB050B4959000F103D = {
+               fRef = 2A37F4ACFDCFA73011CA2CEA;
+               isa = PBXTextBookmark;
+               name = "MyDocument.m: 1008";
+               rLen = 176;
+               rLoc = 21860;
+               rType = 0;
+               vrLen = 949;
+               vrLoc = 21489;
+       };
+       1BEF77EC050B4959000F103D = {
+               fRef = 1B0908B4042BE88C00A8A905;
+               isa = PBXTextBookmark;
+               name = "entities.c: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 928;
+               vrLoc = 8417;
+       };
+       1BEF77EE050B4959000F103D = {
+               fRef = 2A37F4ACFDCFA73011CA2CEA;
+               isa = PBXTextBookmark;
+               name = "MyDocument.m: 1008";
+               rLen = 176;
+               rLoc = 21860;
+               rType = 0;
+               vrLen = 949;
+               vrLoc = 21489;
+       };
+       1BEF77EF050B4959000F103D = {
+               fRef = 1B09119C042BE89100A8A905;
+               isa = PBXTextBookmark;
+               name = "threads.c: 536";
+               rLen = 63;
+               rLoc = 11930;
+               rType = 0;
+               vrLen = 646;
+               vrLoc = 11554;
+       };
+       1BEF77F0050B4959000F103D = {
+               fRef = 1B0908B4042BE88C00A8A905;
+               isa = PBXTextBookmark;
+               name = "entities.c: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 928;
+               vrLoc = 8417;
+       };
+       1BEF77F4050B49E2000F103D = {
+               fRef = 1BC0D4EE04CD12140079373A;
+               isa = PBXTextBookmark;
+               name = "libxml2-helper.sh: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 287;
+               vrLoc = 435;
+       };
+       1BEF77F6050B49E2000F103D = {
+               fRef = 1B09119C042BE89100A8A905;
+               isa = PBXTextBookmark;
+               name = "threads.c: 536";
+               rLen = 18;
+               rLoc = 11972;
+               rType = 0;
+               vrLen = 646;
+               vrLoc = 11554;
+       };
+       1BEF77F7050B49E2000F103D = {
+               fRef = 1BC0D4EE04CD12140079373A;
+               isa = PBXTextBookmark;
+               name = "libxml2-helper.sh: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 287;
+               vrLoc = 435;
+       };
+       1BEF7807050B73C3000F103D = {
+               fRef = 1B09119C042BE89100A8A905;
+               isa = PBXTextBookmark;
+               name = "threads.c: 292";
+               rLen = 0;
+               rLoc = 6277;
+               rType = 0;
+               vrLen = 758;
+               vrLoc = 6018;
+       };
+       1BEF7808050B73C3000F103D = {
+               fRef = 2A37F4BAFDCFA73011CA2CEA;
+               isa = PBXBookmark;
+       };
+       1BEF7809050B73C3000F103D = {
+               fRef = 1B09119C042BE89100A8A905;
+               isa = PBXTextBookmark;
+               name = "threads.c: 292";
+               rLen = 0;
+               rLoc = 6277;
+               rType = 0;
+               vrLen = 758;
+               vrLoc = 6018;
+       };
+       1BEF780A050B73C3000F103D = {
+               fRef = 2A37F4BAFDCFA73011CA2CEA;
+               isa = PBXTextBookmark;
+               name = "English: 13";
+               rLen = 0;
+               rLoc = 144;
+               rType = 0;
+               vrLen = 458;
+               vrLoc = 0;
+       };
        1BF7F12304F2BE74007723F5 = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {709, 490}}";
        };
        1BF7F12404F2BE74007723F5 = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {709, 462}}";
-                       sepNavSelRange = "{284, 0}";
-                       sepNavVisRect = "{{0, 0}, {709, 443}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {828, 420}}";
+                       sepNavSelRange = "{463, 0}";
+                       sepNavVisRect = "{{0, 15}, {828, 405}}";
                        sepNavWindowFrame = "{{84, 206}, {750, 558}}";
                };
        };
                                        PBXFileDataSource_Warnings_ColumnID,
                                );
                        };
+                       PBXConfiguration.PBXFileTableDataSource3.PBXErrorsWarningsDataSource = {
+                               PBXFileTableDataSourceColumnSortingDirectionKey = -1;
+                               PBXFileTableDataSourceColumnSortingKey = PBXErrorsWarningsDataSource_LocationID;
+                               PBXFileTableDataSourceColumnWidthsKey = (
+                                       20,
+                                       533.8799,
+                                       288.2085,
+                               );
+                               PBXFileTableDataSourceColumnsKey = (
+                                       PBXErrorsWarningsDataSource_TypeID,
+                                       PBXErrorsWarningsDataSource_MessageID,
+                                       PBXErrorsWarningsDataSource_LocationID,
+                               );
+                       };
                        PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = {
                                PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
                                PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID;
                                        PBXFileDataSource_Warnings_ColumnID,
                                );
                        };
-                       PBXPerProjectTemplateStateSaveDate = 84153457;
+                       PBXPerProjectTemplateStateSaveDate = 84591447;
                        PBXWorkspaceContents = (
                                {
                                        PBXProjectWorkspaceModule_StateKey_Rev36 = {
-                                               PBXProjectWorkspaceModule_BuildResultsWindowVisible = true;
                                                PBXProjectWorkspaceModule_EditorOpen = true;
                                                PBXProjectWorkspaceModule_EmbeddedNavigatorGroup = {
                                                        Split0 = {
-                                                               bookmark = 1B387EA30504BA770064611D;
+                                                               bookmark = 1BEF780A050B73C3000F103D;
                                                                history = (
                                                                        1B8B40180502698E00371325,
                                                                        1B7E474A05028B5A00A3FD82,
                                                                        1B7E475405028B5A00A3FD82,
                                                                        1B7E475505028B5A00A3FD82,
                                                                        1B7E475605028B5A00A3FD82,
-                                                                       1B7E475805028B5A00A3FD82,
-                                                                       1B7E475905028B5A00A3FD82,
                                                                        1B7E475A05028B5A00A3FD82,
                                                                        1B7E475B05028B5A00A3FD82,
                                                                        1B7E475F05028B5A00A3FD82,
                                                                        1B7E48560502AB1C00A3FD82,
                                                                        1B387E830504B7E80064611D,
                                                                        1B387E840504B7E80064611D,
-                                                                       1B387E860504B7E80064611D,
-                                                                       1B387E9A0504BA770064611D,
-                                                                       1B387E9B0504BA770064611D,
-                                                                       1B387E9C0504BA770064611D,
-                                                                       1B387E9D0504BA770064611D,
-                                                                       1B387E9E0504BA770064611D,
+                                                                       1B894BA805090AF700D46ABC,
+                                                                       1B894BA905090AF700D46ABC,
+                                                                       1B894BD405092F0C00D46ABC,
+                                                                       1B894BD505092F0C00D46ABC,
+                                                                       1BEF77EB050B4959000F103D,
+                                                                       1BEF77EC050B4959000F103D,
+                                                                       1BEF77F4050B49E2000F103D,
+                                                                       1BEF7807050B73C3000F103D,
+                                                                       1BEF7808050B73C3000F103D,
                                                                );
                                                                prevStack = (
                                                                        1B8B40190502698E00371325,
                                                                        1B7E47B005028B5A00A3FD82,
                                                                        1B7E47B205028B5A00A3FD82,
                                                                        1B7E47B305028B5A00A3FD82,
-                                                                       1B7E47B505028B5A00A3FD82,
                                                                        1B7E47B605028B5A00A3FD82,
-                                                                       1B7E47B705028B5A00A3FD82,
                                                                        1B7E47B805028B5A00A3FD82,
                                                                        1B7E47B905028B5A00A3FD82,
-                                                                       1B7E47BA05028B5A00A3FD82,
                                                                        1B7E47BB05028B5A00A3FD82,
                                                                        1B7E47BC05028B5A00A3FD82,
                                                                        1B7E47BD05028B5A00A3FD82,
                                                                        1B7E485B0502AB1C00A3FD82,
                                                                        1B7E485C0502AB1C00A3FD82,
                                                                        1B7E485E0502AB1C00A3FD82,
-                                                                       1B7E485F0502AB1C00A3FD82,
-                                                                       1B7E48600502AB1C00A3FD82,
                                                                        1B7E48620502AB1C00A3FD82,
-                                                                       1B7E48640502AB1C00A3FD82,
                                                                        1B7E48670502AB1C00A3FD82,
-                                                                       1B387DC60504118D0064611D,
                                                                        1B387DC70504118D0064611D,
                                                                        1B387DC80504118D0064611D,
                                                                        1B387DC90504118D0064611D,
                                                                        1B387DCA0504118D0064611D,
-                                                                       1B387DCB0504118D0064611D,
                                                                        1B387DCC0504118D0064611D,
-                                                                       1B387DCD0504118D0064611D,
                                                                        1B387DCE0504118D0064611D,
                                                                        1B387DCF0504118D0064611D,
                                                                        1B387DD00504118D0064611D,
                                                                        1B387DD10504118D0064611D,
-                                                                       1B387DD20504118D0064611D,
                                                                        1B387DD40504118D0064611D,
-                                                                       1B387DD50504118D0064611D,
                                                                        1B387DD60504118D0064611D,
                                                                        1B387DD70504118D0064611D,
                                                                        1B387DD80504118D0064611D,
                                                                        1B387DD90504118D0064611D,
                                                                        1B387DDA0504118D0064611D,
-                                                                       1B387DDB0504118D0064611D,
                                                                        1B387DDC0504118D0064611D,
                                                                        1B387DDD0504118D0064611D,
                                                                        1B387DDE0504118D0064611D,
                                                                        1B387DE80504118D0064611D,
                                                                        1B387DE90504118D0064611D,
                                                                        1B387DEA0504118D0064611D,
-                                                                       1B387DEB0504118D0064611D,
                                                                        1B387DEC0504118D0064611D,
-                                                                       1B387DED0504118D0064611D,
                                                                        1B387DEE0504118D0064611D,
                                                                        1B387DEF0504118D0064611D,
                                                                        1B387DF00504118D0064611D,
                                                                        1B387DF10504118D0064611D,
-                                                                       1B387DF20504118D0064611D,
                                                                        1B387DF30504118D0064611D,
                                                                        1B387DF40504118D0064611D,
                                                                        1B387DFE050414590064611D,
-                                                                       1B387DFF050414590064611D,
                                                                        1B387E68050416FA0064611D,
-                                                                       1B387E69050416FA0064611D,
                                                                        1B387E6A050416FA0064611D,
-                                                                       1B387E6B050416FA0064611D,
-                                                                       1B387E6C050416FA0064611D,
                                                                        1B387E6D050416FA0064611D,
                                                                        1B387E6E050416FA0064611D,
                                                                        1B387E6F050416FA0064611D,
                                                                        1B387E75050416FA0064611D,
                                                                        1B387E76050416FA0064611D,
                                                                        1B387E77050416FA0064611D,
-                                                                       1B387E880504B7E80064611D,
                                                                        1B387E890504B7E80064611D,
                                                                        1B387E8A0504B7E80064611D,
-                                                                       1B387E8B0504B7E80064611D,
-                                                                       1B387E8C0504B7E80064611D,
-                                                                       1B387E8D0504B7E80064611D,
-                                                                       1B387E8E0504B7E80064611D,
-                                                                       1B387E9F0504BA770064611D,
-                                                                       1B387EA00504BA770064611D,
-                                                                       1B387EA10504BA770064611D,
-                                                                       1B387EA20504BA770064611D,
+                                                                       1B894BAD05090AF700D46ABC,
+                                                                       1B894BAE05090AF700D46ABC,
+                                                                       1B894BB105090AF700D46ABC,
+                                                                       1B894BB305090AF700D46ABC,
+                                                                       1B894BD705092F0C00D46ABC,
+                                                                       1BEF77EE050B4959000F103D,
+                                                                       1BEF77EF050B4959000F103D,
+                                                                       1BEF77F0050B4959000F103D,
+                                                                       1BEF77F6050B49E2000F103D,
+                                                                       1BEF77F7050B49E2000F103D,
+                                                                       1BEF7809050B73C3000F103D,
                                                                );
                                                        };
                                                        SplitCount = 1;
                        };
                        "PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXNavigatorGroup" = {
                                Split0 = {
-                                       bookmark = 1B387E990504BA5C0064611D;
+                                       bookmark = 1BEF7803050B4B7C000F103D;
                                        history = (
-                                               1B387E970504BA5A0064611D,
+                                               1BEF7800050B4B76000F103D,
                                        );
                                };
                                SplitCount = 1;
                        };
                        "PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXProjectWorkspaceModule" = {
                                PBXProjectWorkspaceModule_StateKey_Rev36 = {
-                                       PBXProjectWorkspaceModule_BuildResultsWindowVisible = true;
                                        PBXProjectWorkspaceModule_EditorOpen = true;
                                        PBXProjectWorkspaceModule_EmbeddedNavigatorGroup = {
                                                Split0 = {
-                                                       bookmark = 1B387EA80504BBD10064611D;
+                                                       bookmark = 1BC7FE6E0507E2CB0095D353;
                                                        history = (
                                                                1B8B40180502698E00371325,
                                                                1B7E474A05028B5A00A3FD82,
                                                                1B7E48560502AB1C00A3FD82,
                                                                1B387E830504B7E80064611D,
                                                                1B387E840504B7E80064611D,
-                                                               1B387E860504B7E80064611D,
-                                                               1B387E9A0504BA770064611D,
-                                                               1B387E9C0504BA770064611D,
-                                                               1B387E9D0504BA770064611D,
-                                                               1B387EA50504BBD10064611D,
-                                                               1B387E9B0504BA770064611D,
+                                                               1BC7FE1C0507E2470095D353,
                                                        );
                                                        prevStack = (
                                                                1B8B40190502698E00371325,
                                                                1B7E485B0502AB1C00A3FD82,
                                                                1B7E485C0502AB1C00A3FD82,
                                                                1B7E485E0502AB1C00A3FD82,
-                                                               1B7E485F0502AB1C00A3FD82,
-                                                               1B7E48600502AB1C00A3FD82,
                                                                1B7E48620502AB1C00A3FD82,
-                                                               1B7E48640502AB1C00A3FD82,
                                                                1B7E48670502AB1C00A3FD82,
-                                                               1B387DC60504118D0064611D,
                                                                1B387DC70504118D0064611D,
                                                                1B387DC80504118D0064611D,
                                                                1B387DC90504118D0064611D,
                                                                1B387DCA0504118D0064611D,
-                                                               1B387DCB0504118D0064611D,
                                                                1B387DCC0504118D0064611D,
-                                                               1B387DCD0504118D0064611D,
                                                                1B387DCE0504118D0064611D,
                                                                1B387DCF0504118D0064611D,
                                                                1B387DD00504118D0064611D,
                                                                1B387DD10504118D0064611D,
-                                                               1B387DD20504118D0064611D,
                                                                1B387DD40504118D0064611D,
-                                                               1B387DD50504118D0064611D,
                                                                1B387DD60504118D0064611D,
                                                                1B387DD70504118D0064611D,
                                                                1B387DD80504118D0064611D,
                                                                1B387DD90504118D0064611D,
                                                                1B387DDA0504118D0064611D,
-                                                               1B387DDB0504118D0064611D,
                                                                1B387DDC0504118D0064611D,
                                                                1B387DDD0504118D0064611D,
                                                                1B387DDE0504118D0064611D,
                                                                1B387DE80504118D0064611D,
                                                                1B387DE90504118D0064611D,
                                                                1B387DEA0504118D0064611D,
-                                                               1B387DEB0504118D0064611D,
                                                                1B387DEC0504118D0064611D,
-                                                               1B387DED0504118D0064611D,
                                                                1B387DEE0504118D0064611D,
                                                                1B387DEF0504118D0064611D,
                                                                1B387DF00504118D0064611D,
                                                                1B387DF10504118D0064611D,
-                                                               1B387DF20504118D0064611D,
                                                                1B387DF30504118D0064611D,
                                                                1B387DF40504118D0064611D,
                                                                1B387DFE050414590064611D,
-                                                               1B387DFF050414590064611D,
                                                                1B387E68050416FA0064611D,
-                                                               1B387E69050416FA0064611D,
                                                                1B387E6A050416FA0064611D,
-                                                               1B387E6B050416FA0064611D,
-                                                               1B387E6C050416FA0064611D,
                                                                1B387E6D050416FA0064611D,
                                                                1B387E6E050416FA0064611D,
                                                                1B387E6F050416FA0064611D,
                                                                1B387E75050416FA0064611D,
                                                                1B387E76050416FA0064611D,
                                                                1B387E77050416FA0064611D,
-                                                               1B387E880504B7E80064611D,
                                                                1B387E890504B7E80064611D,
                                                                1B387E8A0504B7E80064611D,
-                                                               1B387E8B0504B7E80064611D,
-                                                               1B387E8C0504B7E80064611D,
-                                                               1B387E8D0504B7E80064611D,
-                                                               1B387E8E0504B7E80064611D,
-                                                               1B387E9F0504BA770064611D,
-                                                               1B387EA00504BA770064611D,
-                                                               1B387EA10504BA770064611D,
-                                                               1B387EA20504BA770064611D,
-                                                               1B387EA60504BBD10064611D,
                                                        );
                                                };
                                                SplitCount = 1;
                                                        );
                                                };
                                        };
-                                       WindowFrame = "{{33, 142}, {1115, 668}}";
+                                       WindowFrame = "{{114, 149}, {1115, 668}}";
                                },
                        );
                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXBatchFindModule" = {
                        };
                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXBuildResultsModule" = {
                                Frame = "{{0, 0}, {1008, 460}}";
-                               WindowFrame = "{{68, 83}, {1008, 538}}";
+                               WindowFrame = "{{61, 107}, {1008, 538}}";
                        };
                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXCVSModule" = {
                                Frame = "{{0, 0}, {482, 296}}";
                        };
                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXNavigatorGroup" = {
                                Frame = "{{0, 0}, {750, 480}}";
-                               WindowFrame = "{{63, 270}, {750, 558}}";
+                               WindowFrame = "{{62, 220}, {750, 558}}";
                        };
                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXProjectWorkspaceModule" = {
                                Frame = "{{0, 0}, {1115, 606}}";
                                                );
                                        };
                                };
-                               WindowFrame = "{{73, 135}, {1115, 668}}";
+                               WindowFrame = "{{114, 149}, {1115, 668}}";
                        };
                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXRunSessionModule" = {
                                Frame = "{{0, 0}, {904, 293}}";
-                               WindowFrame = "{{303, 93}, {904, 315}}";
+                               WindowFrame = "{{307, 93}, {904, 315}}";
                        };
-                       PBXWorkspaceStateSaveDate = 84153457;
+                       PBXWorkspaceStateSaveDate = 84591447;
                };
                perUserProjectItems = {
-                       1B387DC60504118D0064611D = 1B387DC60504118D0064611D;
                        1B387DC70504118D0064611D = 1B387DC70504118D0064611D;
                        1B387DC80504118D0064611D = 1B387DC80504118D0064611D;
                        1B387DC90504118D0064611D = 1B387DC90504118D0064611D;
                        1B387DCA0504118D0064611D = 1B387DCA0504118D0064611D;
-                       1B387DCB0504118D0064611D = 1B387DCB0504118D0064611D;
                        1B387DCC0504118D0064611D = 1B387DCC0504118D0064611D;
-                       1B387DCD0504118D0064611D = 1B387DCD0504118D0064611D;
                        1B387DCE0504118D0064611D = 1B387DCE0504118D0064611D;
                        1B387DCF0504118D0064611D = 1B387DCF0504118D0064611D;
                        1B387DD00504118D0064611D = 1B387DD00504118D0064611D;
                        1B387DD10504118D0064611D = 1B387DD10504118D0064611D;
-                       1B387DD20504118D0064611D = 1B387DD20504118D0064611D;
                        1B387DD40504118D0064611D = 1B387DD40504118D0064611D;
-                       1B387DD50504118D0064611D = 1B387DD50504118D0064611D;
                        1B387DD60504118D0064611D = 1B387DD60504118D0064611D;
                        1B387DD70504118D0064611D = 1B387DD70504118D0064611D;
                        1B387DD80504118D0064611D = 1B387DD80504118D0064611D;
                        1B387DD90504118D0064611D = 1B387DD90504118D0064611D;
                        1B387DDA0504118D0064611D = 1B387DDA0504118D0064611D;
-                       1B387DDB0504118D0064611D = 1B387DDB0504118D0064611D;
                        1B387DDC0504118D0064611D = 1B387DDC0504118D0064611D;
                        1B387DDD0504118D0064611D = 1B387DDD0504118D0064611D;
                        1B387DDE0504118D0064611D = 1B387DDE0504118D0064611D;
                        1B387DE80504118D0064611D = 1B387DE80504118D0064611D;
                        1B387DE90504118D0064611D = 1B387DE90504118D0064611D;
                        1B387DEA0504118D0064611D = 1B387DEA0504118D0064611D;
-                       1B387DEB0504118D0064611D = 1B387DEB0504118D0064611D;
                        1B387DEC0504118D0064611D = 1B387DEC0504118D0064611D;
-                       1B387DED0504118D0064611D = 1B387DED0504118D0064611D;
                        1B387DEE0504118D0064611D = 1B387DEE0504118D0064611D;
                        1B387DEF0504118D0064611D = 1B387DEF0504118D0064611D;
                        1B387DF00504118D0064611D = 1B387DF00504118D0064611D;
                        1B387DF10504118D0064611D = 1B387DF10504118D0064611D;
-                       1B387DF20504118D0064611D = 1B387DF20504118D0064611D;
                        1B387DF30504118D0064611D = 1B387DF30504118D0064611D;
                        1B387DF40504118D0064611D = 1B387DF40504118D0064611D;
                        1B387DFE050414590064611D = 1B387DFE050414590064611D;
-                       1B387DFF050414590064611D = 1B387DFF050414590064611D;
                        1B387E68050416FA0064611D = 1B387E68050416FA0064611D;
-                       1B387E69050416FA0064611D = 1B387E69050416FA0064611D;
                        1B387E6A050416FA0064611D = 1B387E6A050416FA0064611D;
-                       1B387E6B050416FA0064611D = 1B387E6B050416FA0064611D;
-                       1B387E6C050416FA0064611D = 1B387E6C050416FA0064611D;
                        1B387E6D050416FA0064611D = 1B387E6D050416FA0064611D;
                        1B387E6E050416FA0064611D = 1B387E6E050416FA0064611D;
                        1B387E6F050416FA0064611D = 1B387E6F050416FA0064611D;
                        1B387E77050416FA0064611D = 1B387E77050416FA0064611D;
                        1B387E830504B7E80064611D = 1B387E830504B7E80064611D;
                        1B387E840504B7E80064611D = 1B387E840504B7E80064611D;
-                       1B387E860504B7E80064611D = 1B387E860504B7E80064611D;
-                       1B387E880504B7E80064611D = 1B387E880504B7E80064611D;
                        1B387E890504B7E80064611D = 1B387E890504B7E80064611D;
                        1B387E8A0504B7E80064611D = 1B387E8A0504B7E80064611D;
-                       1B387E8B0504B7E80064611D = 1B387E8B0504B7E80064611D;
-                       1B387E8C0504B7E80064611D = 1B387E8C0504B7E80064611D;
-                       1B387E8D0504B7E80064611D = 1B387E8D0504B7E80064611D;
-                       1B387E8E0504B7E80064611D = 1B387E8E0504B7E80064611D;
-                       1B387E9A0504BA770064611D = 1B387E9A0504BA770064611D;
-                       1B387E9B0504BA770064611D = 1B387E9B0504BA770064611D;
-                       1B387E9C0504BA770064611D = 1B387E9C0504BA770064611D;
-                       1B387E9D0504BA770064611D = 1B387E9D0504BA770064611D;
-                       1B387E9E0504BA770064611D = 1B387E9E0504BA770064611D;
-                       1B387E9F0504BA770064611D = 1B387E9F0504BA770064611D;
-                       1B387EA00504BA770064611D = 1B387EA00504BA770064611D;
-                       1B387EA10504BA770064611D = 1B387EA10504BA770064611D;
-                       1B387EA20504BA770064611D = 1B387EA20504BA770064611D;
-                       1B387EA30504BA770064611D = 1B387EA30504BA770064611D;
-                       1B387EA50504BBD10064611D = 1B387EA50504BBD10064611D;
-                       1B387EA60504BBD10064611D = 1B387EA60504BBD10064611D;
-                       1B387EA70504BBD10064611D = 1B387EA70504BBD10064611D;
-                       1B387EA80504BBD10064611D = 1B387EA80504BBD10064611D;
                        1B7E474A05028B5A00A3FD82 = 1B7E474A05028B5A00A3FD82;
                        1B7E474E05028B5A00A3FD82 = 1B7E474E05028B5A00A3FD82;
                        1B7E474F05028B5A00A3FD82 = 1B7E474F05028B5A00A3FD82;
                        1B7E475405028B5A00A3FD82 = 1B7E475405028B5A00A3FD82;
                        1B7E475505028B5A00A3FD82 = 1B7E475505028B5A00A3FD82;
                        1B7E475605028B5A00A3FD82 = 1B7E475605028B5A00A3FD82;
-                       1B7E475805028B5A00A3FD82 = 1B7E475805028B5A00A3FD82;
-                       1B7E475905028B5A00A3FD82 = 1B7E475905028B5A00A3FD82;
                        1B7E475A05028B5A00A3FD82 = 1B7E475A05028B5A00A3FD82;
                        1B7E475B05028B5A00A3FD82 = 1B7E475B05028B5A00A3FD82;
                        1B7E475F05028B5A00A3FD82 = 1B7E475F05028B5A00A3FD82;
                        1B7E47B005028B5A00A3FD82 = 1B7E47B005028B5A00A3FD82;
                        1B7E47B205028B5A00A3FD82 = 1B7E47B205028B5A00A3FD82;
                        1B7E47B305028B5A00A3FD82 = 1B7E47B305028B5A00A3FD82;
-                       1B7E47B505028B5A00A3FD82 = 1B7E47B505028B5A00A3FD82;
                        1B7E47B605028B5A00A3FD82 = 1B7E47B605028B5A00A3FD82;
-                       1B7E47B705028B5A00A3FD82 = 1B7E47B705028B5A00A3FD82;
                        1B7E47B805028B5A00A3FD82 = 1B7E47B805028B5A00A3FD82;
                        1B7E47B905028B5A00A3FD82 = 1B7E47B905028B5A00A3FD82;
-                       1B7E47BA05028B5A00A3FD82 = 1B7E47BA05028B5A00A3FD82;
                        1B7E47BB05028B5A00A3FD82 = 1B7E47BB05028B5A00A3FD82;
                        1B7E47BC05028B5A00A3FD82 = 1B7E47BC05028B5A00A3FD82;
                        1B7E47BD05028B5A00A3FD82 = 1B7E47BD05028B5A00A3FD82;
                        1B7E485B0502AB1C00A3FD82 = 1B7E485B0502AB1C00A3FD82;
                        1B7E485C0502AB1C00A3FD82 = 1B7E485C0502AB1C00A3FD82;
                        1B7E485E0502AB1C00A3FD82 = 1B7E485E0502AB1C00A3FD82;
-                       1B7E485F0502AB1C00A3FD82 = 1B7E485F0502AB1C00A3FD82;
-                       1B7E48600502AB1C00A3FD82 = 1B7E48600502AB1C00A3FD82;
                        1B7E48620502AB1C00A3FD82 = 1B7E48620502AB1C00A3FD82;
-                       1B7E48640502AB1C00A3FD82 = 1B7E48640502AB1C00A3FD82;
                        1B7E48670502AB1C00A3FD82 = 1B7E48670502AB1C00A3FD82;
+                       1B894BA805090AF700D46ABC = 1B894BA805090AF700D46ABC;
+                       1B894BA905090AF700D46ABC = 1B894BA905090AF700D46ABC;
+                       1B894BAD05090AF700D46ABC = 1B894BAD05090AF700D46ABC;
+                       1B894BAE05090AF700D46ABC = 1B894BAE05090AF700D46ABC;
+                       1B894BB105090AF700D46ABC = 1B894BB105090AF700D46ABC;
+                       1B894BB305090AF700D46ABC = 1B894BB305090AF700D46ABC;
+                       1B894BD405092F0C00D46ABC = 1B894BD405092F0C00D46ABC;
+                       1B894BD505092F0C00D46ABC = 1B894BD505092F0C00D46ABC;
+                       1B894BD705092F0C00D46ABC = 1B894BD705092F0C00D46ABC;
                        1B8B40180502698E00371325 = 1B8B40180502698E00371325;
                        1B8B40190502698E00371325 = 1B8B40190502698E00371325;
+                       1BEF77EB050B4959000F103D = 1BEF77EB050B4959000F103D;
+                       1BEF77EC050B4959000F103D = 1BEF77EC050B4959000F103D;
+                       1BEF77EE050B4959000F103D = 1BEF77EE050B4959000F103D;
+                       1BEF77EF050B4959000F103D = 1BEF77EF050B4959000F103D;
+                       1BEF77F0050B4959000F103D = 1BEF77F0050B4959000F103D;
+                       1BEF77F4050B49E2000F103D = 1BEF77F4050B49E2000F103D;
+                       1BEF77F6050B49E2000F103D = 1BEF77F6050B49E2000F103D;
+                       1BEF77F7050B49E2000F103D = 1BEF77F7050B49E2000F103D;
+                       1BEF7807050B73C3000F103D = 1BEF7807050B73C3000F103D;
+                       1BEF7808050B73C3000F103D = 1BEF7808050B73C3000F103D;
+                       1BEF7809050B73C3000F103D = 1BEF7809050B73C3000F103D;
+                       1BEF780A050B73C3000F103D = 1BEF780A050B73C3000F103D;
                };
                sourceControlManager = 1B7C2A2604AA3BA500B1C44B;
                userBuildSettings = {
        };
        2A37F4ACFDCFA73011CA2CEA = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {871, 16478}}";
-                       sepNavSelRange = "{23524, 0}";
-                       sepNavVisRect = "{{0, 15430}, {871, 235}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {828, 16576}}";
+                       sepNavSelRange = "{21860, 176}";
+                       sepNavVisRect = "{{0, 14070}, {828, 405}}";
                        sepNavWindowFrame = "{{126, 239}, {990, 546}}";
                };
        };
        };
        2A37F4BAFDCFA73011CA2CEA = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {828, 677}}";
-                       sepNavSelRange = "{801, 0}";
+                       sepNavIntBoundsRect = "{{0, 0}, {828, 713}}";
+                       sepNavSelRange = "{144, 0}";
                        sepNavVisRect = "{{0, 0}, {828, 405}}";
                        sepNavWindowFrame = "{{38, 218}, {750, 502}}";
                };
        };
        F739177802FCAAF401000103 = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {828, 1106}}";
-                       sepNavSelRange = "{404, 0}";
-                       sepNavVisRect = "{{0, 184}, {828, 405}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {828, 1176}}";
+                       sepNavSelRange = "{63, 0}";
+                       sepNavVisRect = "{{0, 0}, {828, 405}}";
                };
        };
        F739178302FCB43A01000103 = {
        F786D09402FB227701000103 = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {828, 4746}}";
-                       sepNavSelRange = "{3241, 5}";
-                       sepNavVisRect = "{{0, 2381}, {828, 405}}";
+                       sepNavSelRange = "{534, 98}";
+                       sepNavVisRect = "{{0, 245}, {828, 405}}";
                        sepNavWindowFrame = "{{383, 236}, {750, 558}}";
                };
        };
index 833f0e2..c5755e0 100644 (file)
                                FRAMEWORK_VERSION = A;
                                HEADER_SEARCH_PATHS = libxml2/include;
                                INSTALL_PATH = "@executable_path/../Frameworks";
-                               OTHER_CFLAGS = "";
+                               OTHER_CFLAGS = "-DLIBXML_THREAD_ENABLED";
                                OTHER_LDFLAGS = "-seg1addr 0x12000000";
                                OTHER_LIBTOOL_FLAGS = "";
                                OTHER_REZFLAGS = "";
                        dstPath = "";
                        dstSubfolderSpec = 15;
                        files = (
+                               1BC7FDC50507E1B70095D353,
+                               1BC7FDC40507E1B40095D353,
+                               1BC7FDC20507E1AE0095D353,
+                               1BC7FDC30507E1B00095D353,
                                1B6AEEC60493459C00000102,
                                1B5E2F8304F1093300F043CD,
                                1B5E2F8404F1093300F043CD,
                                1BBE147304F2B1C8004DDAF6,
                                1BBE147404F2B1C8004DDAF6,
                                1BBE147504F2B1C8004DDAF6,
+                               1BD650B50507E01D006A2A12,
+                               1BD650B60507E01D006A2A12,
+                               1BD650B70507E01D006A2A12,
+                               1BD650B80507E01D006A2A12,
                        );
                        isa = PBXGroup;
                        name = FOP;
                        target = 1B6E7B0804C53D79008F4FEC;
                        targetProxy = 1BC0D4FC04CD12C20079373A;
                };
+               1BC7FDC20507E1AE0095D353 = {
+                       fileRef = 1BD650B80507E01D006A2A12;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               1BC7FDC30507E1B00095D353 = {
+                       fileRef = 1BD650B70507E01D006A2A12;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               1BC7FDC40507E1B40095D353 = {
+                       fileRef = 1BD650B60507E01D006A2A12;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               1BC7FDC50507E1B70095D353 = {
+                       fileRef = 1BD650B50507E01D006A2A12;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
                1BD041D30437188E0094B693 = {
                        buildArgumentsString = distclean.sh;
                        buildPhases = (
                        settings = {
                        };
                };
+               1BD650B50507E01D006A2A12 = {
+                       expectedFileType = archive.jar;
+                       isa = PBXFileReference;
+                       name = jai_codec.jar;
+                       path = FOP/jai_codec.jar;
+                       refType = 2;
+                       sourceTree = SOURCE_ROOT;
+               };
+               1BD650B60507E01D006A2A12 = {
+                       expectedFileType = archive.jar;
+                       isa = PBXFileReference;
+                       name = jai_core.jar;
+                       path = FOP/jai_core.jar;
+                       refType = 2;
+                       sourceTree = SOURCE_ROOT;
+               };
+               1BD650B70507E01D006A2A12 = {
+                       expectedFileType = archive.jar;
+                       isa = PBXFileReference;
+                       name = "jimi-1.0.jar";
+                       path = "FOP/jimi-1.0.jar";
+                       refType = 2;
+                       sourceTree = SOURCE_ROOT;
+               };
+               1BD650B80507E01D006A2A12 = {
+                       expectedFileType = archive.jar;
+                       isa = PBXFileReference;
+                       name = mlibwrapper_jai.jar;
+                       path = FOP/mlibwrapper_jai.jar;
+                       refType = 2;
+                       sourceTree = SOURCE_ROOT;
+               };
+               1BD650B90507E01D006A2A12 = {
+                       fileRef = 1BD650B50507E01D006A2A12;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               1BD650BA0507E01D006A2A12 = {
+                       fileRef = 1BD650B60507E01D006A2A12;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               1BD650BB0507E01D006A2A12 = {
+                       fileRef = 1BD650B70507E01D006A2A12;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               1BD650BC0507E01D006A2A12 = {
+                       fileRef = 1BD650B80507E01D006A2A12;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
                1BF7F12304F2BE74007723F5 = {
                        expectedFileType = sourcecode.c.h;
                        fileEncoding = 4;
                                F739177802FCAAF401000103,
                                2A37F4ABFDCFA73011CA2CEA,
                                F5F178320260CC3601267658,
-                               1B23468104DEB03A0050A2ED,
                                1B02A8AB04FFD5B600D27002,
+                               1B23468104DEB03A0050A2ED,
                                1B6E019204272F9300A8A905,
                                1B5E2F3104F1086300F043CD,
                                1B6AEEC2049344C400000102,
        <string>YES</string>
        <key>NSJavaPath</key>
        <array>
+               <string>jai_core.jar</string>
+               <string>mlibwrapper_jai.jar</string>
+               <string>jimi-1.0.jar</string>
                <string>batik.jar</string>
                <string>xalan-2.4.1.jar</string>
                <string>xercesImpl-2.2.1.jar</string>
                <string>xml-apis.jar</string>
                <string>fop.jar</string>
                <string>avalon-framework-cvs-20020806.jar</string>
+               <string>jai_codec.jar</string>
        </array>
        <key>NSJavaRoot</key>
        <string>Contents/Resources/Java</string>
                                1BBE147604F2B1C9004DDAF6,
                                1BBE147704F2B1C9004DDAF6,
                                1BBE147804F2B1C9004DDAF6,
+                               1BD650B90507E01D006A2A12,
+                               1BD650BA0507E01D006A2A12,
+                               1BD650BB0507E01D006A2A12,
+                               1BD650BC0507E01D006A2A12,
                        );
                        isa = PBXFrameworksBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
index d028543..f1daaca 100644 (file)
        FOPWrapper *fw = (FOPWrapper *)[[NSClassFromString(@"FOPWrapper") alloc] init];
 
        NSData *resultData = [fw convert:foData];
-       
        // fixme: autorelease on resultData? creation on Java side?
        
        [fw release];
        
-       //NSLog(@"data: %@", resultData);
-       
        return resultData;
 }
 
index 42b0082..94926fa 100644 (file)
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# python/Makefile.  Generated from Makefile.in by configure.
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,8 +12,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Makefile for libxml2 python library
-
 
 SHELL = /bin/sh
 
@@ -33,26 +33,26 @@ infodir = ${prefix}/info
 mandir = ${prefix}/man
 includedir = ${prefix}/include
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/libxml2
 pkglibdir = $(libdir)/libxml2
 pkgincludedir = $(includedir)/libxml2
-
 top_builddir = ..
 
-ACLOCAL = /Users/liyanage/cvs/entropy/TestXSLT/libxml2/missing aclocal-1.4
+ACLOCAL = aclocal-1.6
 AUTOCONF = autoconf
-AUTOMAKE = /Users/liyanage/cvs/entropy/TestXSLT/libxml2/missing automake-1.4
+AUTOMAKE = automake-1.6
 AUTOHEADER = autoheader
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = s,x,x,
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -60,18 +60,24 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = 
-host_triplet = powerpc-apple-darwin7.0.0b1
+host_triplet = powerpc-apple-darwin7.0.0
+
+EXEEXT = 
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = tar
 AS = @AS@
+AWK = awk
 C14N_OBJ = c14n.c
 CATALOG_OBJ = catalog.o
 CC = gcc
 CFLAGS = -g -O2 -Wall
 CPP = gcc -E
 DEBUG_OBJ = debugXML.o
+DEPDIR = .deps
 DLLTOOL = @DLLTOOL@
 DOCB_OBJ = DOCBparser.o
 ECHO = echo
-EXEEXT = 
 FTP_OBJ = nanoftp.o
 HAVE_ISINF = 
 HAVE_ISNAN = 
@@ -79,20 +85,19 @@ HTML_DIR = $(prefix)/doc
 HTML_OBJ = HTMLparser.o HTMLtree.o
 HTTP_OBJ = nanohttp.o
 ICONV_LIBS = -L/Users/liyanage/cvs/entropy/TestXSLT/build/libiconv-gnustyle/lib -liconv
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIBXML_MAJOR_VERSION = 2
-LIBXML_MICRO_VERSION = 4
+LIBXML_MICRO_VERSION = 10
 LIBXML_MINOR_VERSION = 5
-LIBXML_VERSION = 2.5.4
-LIBXML_VERSION_INFO = 7:4:5
-LIBXML_VERSION_NUMBER = 20504
+LIBXML_VERSION = 2.5.10
+LIBXML_VERSION_INFO = 7:10:5
+LIBXML_VERSION_NUMBER = 20510
 LN_S = ln -s
 MAINT = #
-MAKEINFO = makeinfo
 MV = /bin/mv
 M_LIBS = -lm
 OBJDUMP = @OBJDUMP@
-OBJEXT = o
 PACKAGE = libxml2
 PYTHON = 
 PYTHON_INCLUDES = 
@@ -101,18 +106,20 @@ PYTHON_SUBDIR =
 PYTHON_VERSION = 
 RANLIB = ranlib
 RDL_LIBS = 
-RELDATE = Thu Aug  7 2003
+RELDATE = Sun Sep  7 2003
 RM = /bin/rm
 STATIC_BINARIES = 
 STRIP = strip
 TAR = /usr/bin/tar
 TEST_REGEXPS = Regexptests Automatatests
 TEST_SCHEMAS = Schemastests Relaxtests
-TEST_THREADS = 
-THREAD_CFLAGS = 
-THREAD_LIBS = 
+TEST_THREADS = Threadtests
+THREAD_CFLAGS =  -D_REENTRANT
+THREAD_LIBS = -lpthread
 U = 
-VERSION = 2.5.4
+VERSION = 2.5.10
+WIN32_EXTRA_LDFLAGS = 
+WIN32_EXTRA_LIBADD = 
 WITH_C14N = 1
 WITH_CATALOG = 1
 WITH_DEBUG = 1
@@ -121,10 +128,11 @@ WITH_FTP = 1
 WITH_HTML = 1
 WITH_HTTP = 1
 WITH_ICONV = 1
+WITH_ISO8859X = 1
 WITH_MEM_DEBUG = 0
 WITH_REGEXPS = 1
 WITH_SCHEMAS = 1
-WITH_THREADS = 0
+WITH_THREADS = 1
 WITH_TRIO = 0
 WITH_XINCLUDE = 1
 WITH_XPATH = 1
@@ -133,12 +141,17 @@ XINCLUDE_OBJ = xinclude.o
 XML_CFLAGS = 
 XML_INCLUDEDIR = -I${includedir}/libxml2 -I/Users/liyanage/cvs/entropy/TestXSLT/build/libiconv-gnustyle/include
 XML_LIBDIR = -L${libdir}
-XML_LIBS = -lxml2 -lz  -L/Users/liyanage/cvs/entropy/TestXSLT/build/libiconv-gnustyle/lib -liconv -lm 
+XML_LIBS = -lxml2 -lz -lpthread -L/Users/liyanage/cvs/entropy/TestXSLT/build/libiconv-gnustyle/lib -liconv -lm 
 XPATH_OBJ = xpath.o
 XPTR_OBJ = xpointer.o
 Z_CFLAGS = 
 Z_LIBS = -lz
+am__include = include
+am__quote = 
+install_sh = /Users/liyanage/cvs/entropy/TestXSLT/libxml2/install-sh
+pythondir = 
 
+# Makefile for libxml2 python library
 AUTOMAKE_OPTIONS = 1.4 foreign
 
 SUBDIRS = . tests
@@ -167,119 +180,134 @@ EXTRA_DIST = \
 
 libxml2mod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/.libs
 
-#mylibs = #\
+#mylibs = \
 #      $(top_builddir)/libxml2.la
 
-#pythondir = #$(libdir)/python${PYTHON_VERSION}/site-packages
-#python_LTLIBRARIES = #libxml2mod.la
 
-#libxml2mod_la_SOURCES = #libxml.c types.c libxml2-py.c
-#libxml2mod_la_LIBADD = #$(mylibs)
+#python_LTLIBRARIES = libxml2mod.la
 
-#GENERATE = #generator.py
-#API_DESC = #$(top_srcdir)/doc/libxml2-api.xml $(srcdir)/libxml2-python-api.xml
-#GENERATED = #$(srcdir)/libxml2class.py \
+#libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c
+#libxml2mod_la_LIBADD = $(mylibs)
+
+#GENERATE = generator.py
+#API_DESC = $(top_srcdir)/doc/libxml2-api.xml $(srcdir)/libxml2-python-api.xml
+#GENERATED = $(srcdir)/libxml2class.py \
 #           $(srcdir)/libxml2-export.c \
 #         $(srcdir)/libxml2-py.c \
 #         $(srcdir)/libxml2-py.h
+
+subdir = python
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =  setup.py
-LTLIBRARIES =  $(python_LTLIBRARIES)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = setup.py
+LTLIBRARIES = $(python_LTLIBRARIES)
 
+#libxml2mod_la_DEPENDENCIES = \
+#      $(top_builddir)/libxml2.la
+libxml2mod_la_DEPENDENCIES =
+#am_libxml2mod_la_OBJECTS = libxml.lo types.lo \
+#      libxml2-py.lo
+libxml2mod_la_OBJECTS = $(am_libxml2mod_la_OBJECTS)
 
-DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 CPPFLAGS =  -I/Users/liyanage/cvs/entropy/TestXSLT/build/libiconv-gnustyle/include
 LDFLAGS = 
 LIBS = 
-#libxml2mod_la_DEPENDENCIES =  \
-#$(top_builddir)/libxml2.la
-#libxml2mod_la_OBJECTS =  libxml.lo types.lo \
-#libxml2-py.lo
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/libxml.Plo \
+       ./$(DEPDIR)/libxml2-py.Plo ./$(DEPDIR)/types.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+       $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  README Makefile.am Makefile.in TODO setup.py.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = $(libxml2mod_la_SOURCES)
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+       uninstall-info-recursive all-recursive install-data-recursive \
+       install-exec-recursive installdirs-recursive install-recursive \
+       uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = README Makefile.am Makefile.in TODO setup.py.in
+DIST_SUBDIRS = $(SUBDIRS)
 SOURCES = $(libxml2mod_la_SOURCES)
-OBJECTS = $(libxml2mod_la_OBJECTS)
 
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps python/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-       cd $(top_builddir) \
-         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+all: all-recursive
 
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: # Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --foreign  python/Makefile
+Makefile: # $(srcdir)/Makefile.in  $(top_builddir)/config.status
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 setup.py: $(top_builddir)/config.status setup.py.in
-       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-mostlyclean-pythonLTLIBRARIES:
-
-clean-pythonLTLIBRARIES:
-       -test -z "$(python_LTLIBRARIES)" || rm -f $(python_LTLIBRARIES)
-
-distclean-pythonLTLIBRARIES:
-
-maintainer-clean-pythonLTLIBRARIES:
-
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+pythonLTLIBRARIES_INSTALL = $(INSTALL)
 install-pythonLTLIBRARIES: $(python_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(pythondir)
        @list='$(python_LTLIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-           echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pythondir)/$$p"; \
-           $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pythondir)/$$p; \
+           f="`echo $$p | sed -e 's|^.*/||'`"; \
+           echo " $(LIBTOOL) --mode=install $(pythonLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pythondir)/$$f"; \
+           $(LIBTOOL) --mode=install $(pythonLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pythondir)/$$f; \
          else :; fi; \
        done
 
 uninstall-pythonLTLIBRARIES:
        @$(NORMAL_UNINSTALL)
-       list='$(python_LTLIBRARIES)'; for p in $$list; do \
-         $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pythondir)/$$p; \
+       @list='$(python_LTLIBRARIES)'; for p in $$list; do \
+           p="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(pythondir)/$$p"; \
+         $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(pythondir)/$$p; \
        done
 
-.c.o:
-       $(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-       $(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-       $(COMPILE) -c $<
-
-.S.o:
-       $(COMPILE) -c $<
+clean-pythonLTLIBRARIES:
+       -test -z "$(python_LTLIBRARIES)" || rm -f $(python_LTLIBRARIES)
+       @list='$(python_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test -z "$dir" && dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+libxml2mod.la: $(libxml2mod_la_OBJECTS) $(libxml2mod_la_DEPENDENCIES) 
+       $(LINK) -rpath $(pythondir) $(libxml2mod_la_LDFLAGS) $(libxml2mod_la_OBJECTS) $(libxml2mod_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-       -rm -f *.o core *.core
-       -rm -f *.$(OBJEXT)
-
-clean-compile:
+       -rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
        -rm -f *.tab.c
 
-maintainer-clean-compile:
+include ./$(DEPDIR)/libxml.Plo
+include ./$(DEPDIR)/libxml2-py.Plo
+include ./$(DEPDIR)/types.Plo
 
-.c.lo:
-       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+distclean-depend:
+       -rm -rf ./$(DEPDIR)
+
+.c.o:
+       source='$<' object='$@' libtool=no \
+       depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+       $(CCDEPMODE) $(depcomp) \
+       $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
-.s.lo:
-       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.c.obj:
+       source='$<' object='$@' libtool=no \
+       depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+       $(CCDEPMODE) $(depcomp) \
+       $(COMPILE) -c `cygpath -w $<`
 
-.S.lo:
-       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.c.lo:
+       source='$<' object='$@' libtool=yes \
+       depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
+       $(CCDEPMODE) $(depcomp) \
+       $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+CCDEPMODE = depmode=gcc3
 
 mostlyclean-libtool:
        -rm -f *.lo
@@ -288,11 +316,8 @@ clean-libtool:
        -rm -rf .libs _libs
 
 distclean-libtool:
-
-maintainer-clean-libtool:
-
-libxml2mod.la: $(libxml2mod_la_OBJECTS) $(libxml2mod_la_DEPENDENCIES)
-       $(LINK) -rpath $(pythondir) $(libxml2mod_la_LDFLAGS) $(libxml2mod_la_OBJECTS) $(libxml2mod_la_LIBADD) $(LIBS)
+       -rm -f libtool
+uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -300,13 +325,8 @@ libxml2mod.la: $(libxml2mod_la_OBJECTS) $(libxml2mod_la_DEPENDENCIES)
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-       @set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+       @set fnord $$MAKEFLAGS; amf=$$2; \
        dot_seen=no; \
        target=`echo $@ | sed s/-recursive//`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -326,13 +346,18 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-       @set fnord $(MAKEFLAGS); amf=$$2; \
+       @set fnord $$MAKEFLAGS; amf=$$2; \
        dot_seen=no; \
-       rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-         rev="$$subdir $$rev"; \
-         test "$$subdir" != "." || dot_seen=yes; \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       rev=''; for subdir in $$list; do \
+         if test "$$subdir" = "."; then :; else \
+           rev="$$subdir $$rev"; \
+         fi; \
        done; \
-       test "$$dot_seen" = "no" && rev=". $$rev"; \
+       rev="$$rev ."; \
        target=`echo $@ | sed s/-recursive//`; \
        for subdir in $$rev; do \
          echo "Making $$target in $$subdir"; \
@@ -349,201 +374,174 @@ tags-recursive:
          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
        done
 
+ETAGS = etags
+ETAGSFLAGS =
+
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-       list='$(SOURCES) $(HEADERS)'; \
-       unique=`for i in $$list; do echo $$i; done | \
-         awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       here=`pwd` && cd $(srcdir) \
-         && mkid -f$$here/ID $$unique $(LISP)
+       mkid -fID $$unique
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
+         if test "$$subdir" = .; then :; else \
            test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+         fi; \
        done; \
-       list='$(SOURCES) $(HEADERS)'; \
-       unique=`for i in $$list; do echo $$i; done | \
-         awk '    { files[$$0] = 1; } \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
+       test -z "$(ETAGS_ARGS)$$tags$$unique" \
+         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique
 
-clean-tags:
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-       -rm -f TAGS ID
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = python
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-       @for file in $(DISTFILES); do \
-         d=$(srcdir); \
+       @list='$(DISTFILES)'; for file in $$list; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkinstalldirs) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
          if test -d $$d/$$file; then \
-           cp -pr $$d/$$file $(distdir)/$$file; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
          else \
            test -f $(distdir)/$$file \
-           || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-           || cp -p $$d/$$file $(distdir)/$$file || :; \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
          fi; \
        done
-       for subdir in $(SUBDIRS); do \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test -d $(distdir)/$$subdir \
            || mkdir $(distdir)/$$subdir \
            || exit 1; \
-           chmod 777 $(distdir)/$$subdir; \
-           (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+           (cd $$subdir && \
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$(top_distdir)" \
+               distdir=../$(distdir)/$$subdir \
+               distdir) \
              || exit 1; \
          fi; \
        done
-libxml.lo libxml.o : libxml.c ../include/libxml/xmlmemory.h \
-       ../include/libxml/xmlversion.h ../include/libxml/threads.h \
-       ../include/libxml/globals.h ../include/libxml/parser.h \
-       ../include/libxml/tree.h ../include/libxml/xmlregexp.h \
-       ../include/libxml/valid.h ../include/libxml/list.h \
-       ../include/libxml/xmlautomata.h ../include/libxml/entities.h \
-       ../include/libxml/encoding.h ../include/libxml/xmlIO.h \
-       ../include/libxml/xmlerror.h ../include/libxml/SAX.h \
-       ../include/libxml/xlink.h ../include/libxml/xpath.h \
-       ../include/libxml/hash.h ../include/libxml/xpathInternals.h \
-       libxml_wrap.h ../include/libxml/parserInternals.h \
-       ../include/libxml/HTMLparser.h ../include/libxml/catalog.h \
-       ../include/libxml/nanoftp.h ../include/libxml/nanohttp.h \
-       ../include/libxml/uri.h ../include/libxml/debugXML.h \
-       ../include/libxml/HTMLtree.h ../include/libxml/xinclude.h \
-       ../include/libxml/xpointer.h ../include/libxml/xmlunicode.h \
-       ../include/libxml/xmlreader.h ../include/libxml/relaxng.h \
-       libxml2-py.h libxml2-export.c
-libxml2-py.lo libxml2-py.o : libxml2-py.c ../include/libxml/xmlversion.h \
-       ../include/libxml/tree.h ../include/libxml/xmlregexp.h \
-       ../include/libxml/xmlmemory.h ../include/libxml/threads.h \
-       ../include/libxml/globals.h ../include/libxml/parser.h \
-       ../include/libxml/valid.h ../include/libxml/list.h \
-       ../include/libxml/xmlautomata.h ../include/libxml/entities.h \
-       ../include/libxml/encoding.h ../include/libxml/xmlIO.h \
-       ../include/libxml/xmlerror.h ../include/libxml/SAX.h \
-       ../include/libxml/xlink.h libxml_wrap.h \
-       ../include/libxml/parserInternals.h \
-       ../include/libxml/HTMLparser.h ../include/libxml/catalog.h \
-       ../include/libxml/nanoftp.h ../include/libxml/nanohttp.h \
-       ../include/libxml/uri.h ../include/libxml/xpath.h \
-       ../include/libxml/hash.h ../include/libxml/xpathInternals.h \
-       ../include/libxml/debugXML.h ../include/libxml/HTMLtree.h \
-       ../include/libxml/xinclude.h ../include/libxml/xpointer.h \
-       ../include/libxml/xmlunicode.h ../include/libxml/xmlreader.h \
-       ../include/libxml/relaxng.h libxml2-py.h
-types.lo types.o : types.c libxml_wrap.h ../include/libxml/tree.h \
-       ../include/libxml/xmlversion.h ../include/libxml/xmlregexp.h \
-       ../include/libxml/xmlmemory.h ../include/libxml/threads.h \
-       ../include/libxml/globals.h ../include/libxml/parser.h \
-       ../include/libxml/valid.h ../include/libxml/list.h \
-       ../include/libxml/xmlautomata.h ../include/libxml/entities.h \
-       ../include/libxml/encoding.h ../include/libxml/xmlIO.h \
-       ../include/libxml/xmlerror.h ../include/libxml/SAX.h \
-       ../include/libxml/xlink.h ../include/libxml/parserInternals.h \
-       ../include/libxml/HTMLparser.h ../include/libxml/catalog.h \
-       ../include/libxml/nanoftp.h ../include/libxml/nanohttp.h \
-       ../include/libxml/uri.h ../include/libxml/xpath.h \
-       ../include/libxml/hash.h ../include/libxml/xpathInternals.h \
-       ../include/libxml/debugXML.h ../include/libxml/HTMLtree.h \
-       ../include/libxml/xinclude.h ../include/libxml/xpointer.h \
-       ../include/libxml/xmlunicode.h ../include/libxml/xmlreader.h \
-       ../include/libxml/relaxng.h
-
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
 check-am: all-am
 check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
+all-am: Makefile $(LTLIBRARIES) all-local
+installdirs: installdirs-recursive
+installdirs-am:
+       $(mkinstalldirs) $(DESTDIR)$(pythondir)
 
-install-data-am: install-pythonLTLIBRARIES install-data-local
+install: install-recursive
+install-exec: install-exec-recursive
 install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-pythonLTLIBRARIES
-uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES) all-local
-all-redirect: all-recursive
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-       $(mkinstalldirs)  $(DESTDIR)$(pythondir)
-
 
+installcheck: installcheck-recursive
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
-       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-pythonLTLIBRARIES mostlyclean-compile \
-               mostlyclean-libtool mostlyclean-tags \
-               mostlyclean-generic
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
 
-mostlyclean: mostlyclean-recursive
+clean-am: clean-generic clean-libtool clean-pythonLTLIBRARIES \
+       mostlyclean-am
 
-clean-am:  clean-pythonLTLIBRARIES clean-compile clean-libtool \
-               clean-tags clean-generic mostlyclean-am
+distclean: distclean-recursive
 
-clean: clean-recursive
+distclean-am: clean-am distclean-compile distclean-depend \
+       distclean-generic distclean-libtool distclean-tags
 
-distclean-am:  distclean-pythonLTLIBRARIES distclean-compile \
-               distclean-libtool distclean-tags distclean-generic \
-               clean-am
-       -rm -f libtool
+dvi: dvi-recursive
 
-distclean: distclean-recursive
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-pythonLTLIBRARIES \
-               maintainer-clean-compile maintainer-clean-libtool \
-               maintainer-clean-tags maintainer-clean-generic \
-               distclean-am
-       @echo "This command is intended for maintainers to use;"
-       @echo "it deletes files that may require special tools to rebuild."
+info: info-recursive
+
+info-am:
+
+install-data-am: install-data-local install-pythonLTLIBRARIES
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 
-.PHONY: mostlyclean-pythonLTLIBRARIES distclean-pythonLTLIBRARIES \
-clean-pythonLTLIBRARIES maintainer-clean-pythonLTLIBRARIES \
-uninstall-pythonLTLIBRARIES install-pythonLTLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-local install-data-am install-data install-am \
-install uninstall-am uninstall all-local all-redirect all-am all \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool
+
+uninstall-am: uninstall-info-am uninstall-pythonLTLIBRARIES
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \
+       clean clean-generic clean-libtool clean-pythonLTLIBRARIES \
+       clean-recursive distclean distclean-compile distclean-depend \
+       distclean-generic distclean-libtool distclean-recursive \
+       distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+       info-recursive install install-am install-data install-data-am \
+       install-data-local install-data-recursive install-exec \
+       install-exec-am install-exec-recursive install-info \
+       install-info-am install-info-recursive install-man \
+       install-pythonLTLIBRARIES install-recursive install-strip \
+       installcheck installcheck-am installdirs installdirs-am \
+       installdirs-recursive maintainer-clean maintainer-clean-generic \
+       maintainer-clean-recursive mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+       tags tags-recursive uninstall uninstall-am uninstall-info-am \
+       uninstall-info-recursive uninstall-pythonLTLIBRARIES \
+       uninstall-recursive
 
 
 #all-local:    libxml2.py
@@ -552,9 +550,9 @@ maintainer-clean
 #      cat $(srcdir)/libxml.py $(srcdir)/libxml2class.py > libxml2.py
 
 #install-data-local:
-#      $(mkinstalldirs) $(DESTDIR)$(libdir)/python${PYTHON_VERSION}/site-packages
-#      /usr/bin/install -c -m 0644 libxml2.py $(DESTDIR)$(libdir)/python${PYTHON_VERSION}/site-packages
-#      /usr/bin/install -c -m 0644 drv_libxml2.py $(DESTDIR)$(libdir)/python${PYTHON_VERSION}/site-packages
+#      $(mkinstalldirs) $(DESTDIR)$(pythondir)
+#      /usr/bin/install -c -m 0644 libxml2.py $(DESTDIR)$(pythondir)
+#      /usr/bin/install -c -m 0644 drv_libxml2.py $(DESTDIR)$(pythondir)
 #      $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
 #      @(for doc in $(DOCS) ; \
 #         do /usr/bin/install -c -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
@@ -573,7 +571,6 @@ tests test: all
 
 clean:
        rm -f $(GENERATED) *.o _libxml.so *.pyc libxml2.py gen_prog
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
index 6f6db5b..31f0998 100755 (executable)
@@ -8,7 +8,7 @@ from distutils.core import setup, Extension
 # Below ROOT, we expect to find include, include/libxml2, lib and bin.
 # On *nix, it is not needed (but should not harm), 
 # on Windows, it is set by configure.js.
-ROOT = r'/usr' 
+ROOT = r'/Users/liyanage/cvs/entropy/TestXSLT/build/libxml2-gnustyle' 
 
 # Thread-enabled libxml2
 with_threads = 1
index f6f2b16..06db73f 100644 (file)
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# python/tests/Makefile.  Generated from Makefile.in by configure.
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -31,26 +33,26 @@ infodir = ${prefix}/info
 mandir = ${prefix}/man
 includedir = ${prefix}/include
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/libxml2
 pkglibdir = $(libdir)/libxml2
 pkgincludedir = $(includedir)/libxml2
-
 top_builddir = ../..
 
-ACLOCAL = /Users/liyanage/cvs/entropy/TestXSLT/libxml2/missing aclocal-1.4
+ACLOCAL = aclocal-1.6
 AUTOCONF = autoconf
-AUTOMAKE = /Users/liyanage/cvs/entropy/TestXSLT/libxml2/missing automake-1.4
+AUTOMAKE = automake-1.6
 AUTOHEADER = autoheader
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = s,x,x,
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -58,18 +60,24 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = 
-host_triplet = powerpc-apple-darwin7.0.0b1
+host_triplet = powerpc-apple-darwin7.0.0
+
+EXEEXT = 
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = tar
 AS = @AS@
+AWK = awk
 C14N_OBJ = c14n.c
 CATALOG_OBJ = catalog.o
 CC = gcc
 CFLAGS = -g -O2 -Wall
 CPP = gcc -E
 DEBUG_OBJ = debugXML.o
+DEPDIR = .deps
 DLLTOOL = @DLLTOOL@
 DOCB_OBJ = DOCBparser.o
 ECHO = echo
-EXEEXT = 
 FTP_OBJ = nanoftp.o
 HAVE_ISINF = 
 HAVE_ISNAN = 
@@ -77,20 +85,19 @@ HTML_DIR = $(prefix)/doc
 HTML_OBJ = HTMLparser.o HTMLtree.o
 HTTP_OBJ = nanohttp.o
 ICONV_LIBS = -L/Users/liyanage/cvs/entropy/TestXSLT/build/libiconv-gnustyle/lib -liconv
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIBXML_MAJOR_VERSION = 2
-LIBXML_MICRO_VERSION = 4
+LIBXML_MICRO_VERSION = 10
 LIBXML_MINOR_VERSION = 5
-LIBXML_VERSION = 2.5.4
-LIBXML_VERSION_INFO = 7:4:5
-LIBXML_VERSION_NUMBER = 20504
+LIBXML_VERSION = 2.5.10
+LIBXML_VERSION_INFO = 7:10:5
+LIBXML_VERSION_NUMBER = 20510
 LN_S = ln -s
 MAINT = #
-MAKEINFO = makeinfo
 MV = /bin/mv
 M_LIBS = -lm
 OBJDUMP = @OBJDUMP@
-OBJEXT = o
 PACKAGE = libxml2
 PYTHON = 
 PYTHON_INCLUDES = 
@@ -99,18 +106,20 @@ PYTHON_SUBDIR =
 PYTHON_VERSION = 
 RANLIB = ranlib
 RDL_LIBS = 
-RELDATE = Thu Aug  7 2003
+RELDATE = Sun Sep  7 2003
 RM = /bin/rm
 STATIC_BINARIES = 
 STRIP = strip
 TAR = /usr/bin/tar
 TEST_REGEXPS = Regexptests Automatatests
 TEST_SCHEMAS = Schemastests Relaxtests
-TEST_THREADS = 
-THREAD_CFLAGS = 
-THREAD_LIBS = 
+TEST_THREADS = Threadtests
+THREAD_CFLAGS =  -D_REENTRANT
+THREAD_LIBS = -lpthread
 U = 
-VERSION = 2.5.4
+VERSION = 2.5.10
+WIN32_EXTRA_LDFLAGS = 
+WIN32_EXTRA_LIBADD = 
 WITH_C14N = 1
 WITH_CATALOG = 1
 WITH_DEBUG = 1
@@ -119,10 +128,11 @@ WITH_FTP = 1
 WITH_HTML = 1
 WITH_HTTP = 1
 WITH_ICONV = 1
+WITH_ISO8859X = 1
 WITH_MEM_DEBUG = 0
 WITH_REGEXPS = 1
 WITH_SCHEMAS = 1
-WITH_THREADS = 0
+WITH_THREADS = 1
 WITH_TRIO = 0
 WITH_XINCLUDE = 1
 WITH_XPATH = 1
@@ -131,12 +141,15 @@ XINCLUDE_OBJ = xinclude.o
 XML_CFLAGS = 
 XML_INCLUDEDIR = -I${includedir}/libxml2 -I/Users/liyanage/cvs/entropy/TestXSLT/build/libiconv-gnustyle/include
 XML_LIBDIR = -L${libdir}
-XML_LIBS = -lxml2 -lz  -L/Users/liyanage/cvs/entropy/TestXSLT/build/libiconv-gnustyle/lib -liconv -lm 
+XML_LIBS = -lxml2 -lz -lpthread -L/Users/liyanage/cvs/entropy/TestXSLT/build/libiconv-gnustyle/lib -liconv -lm 
 XPATH