Changeset 5047

Timestamp:

06/26/09 11:54:21 (14 months ago)

Author:

pmoura

Message:

The "lgt2*.sh" documentation shell scripts have been updated to ignore XML files that are not XML documenting files generated by the Logtalk compiler.

Location:

trunk

Files:

• compiler/logtalk.pl (modified) (2 diffs)
• RELEASE_NOTES.txt (modified) (1 diff)
• xml/lgt2html.sh (modified) (2 diffs)
• xml/lgt2pdf.sh (modified) (1 diff)
• xml/lgt2txt.sh (modified) (1 diff)
• xml/lgt2xml.sh (modified) (1 diff)
• xml/lgtpdf.xsl (modified) (1 diff)
• xml/lgttxt.xsl (modified) (2 diffs)

trunk/compiler/logtalk.pl

@@ -14791 +14791 @@
 '$lgt_write_xml_relations'(Stream) :-
     '$lgt_pp_rclause_'('$lgt_implements_protocol_'(Entity, Ptc, Scope)),
-    '$lgt_write_xml_relation'(Stream, Entity, Ptc, implements, Scope),
+        '$lgt_write_xml_relation'(Stream, Entity, Ptc, implements, Scope),
     fail.
 
 '$lgt_write_xml_relations'(Stream) :-
     '$lgt_pp_rclause_'('$lgt_imports_category_'(Entity, Ctg, Scope)),
-    '$lgt_write_xml_relation'(Stream, Entity, Ctg, imports, Scope),
+        '$lgt_write_xml_relation'(Stream, Entity, Ctg, imports, Scope),
     fail.
 
 '$lgt_write_xml_relations'(Stream) :-
     '$lgt_pp_rclause_'('$lgt_extends_object_'(Entity, Parent, Scope)),
-    '$lgt_write_xml_relation'(Stream, Entity, Parent, extends, Scope),
+        '$lgt_write_xml_relation'(Stream, Entity, Parent, extends, Scope),
     fail.
 
 '$lgt_write_xml_relations'(Stream) :-
     '$lgt_pp_rclause_'('$lgt_instantiates_class_'(Entity, Class, Scope)),
-    '$lgt_write_xml_relation'(Stream, Entity, Class, instantiates, Scope),
+        '$lgt_write_xml_relation'(Stream, Entity, Class, instantiates, Scope),
     fail.
 
 '$lgt_write_xml_relations'(Stream) :-
     '$lgt_pp_rclause_'('$lgt_specializes_class_'(Entity, Superclass, Scope)),
-    '$lgt_write_xml_relation'(Stream, Entity, Superclass, specializes, Scope),
+        '$lgt_write_xml_relation'(Stream, Entity, Superclass, specializes, Scope),
     fail.
 
 '$lgt_write_xml_relations'(Stream) :-
     '$lgt_pp_rclause_'('$lgt_extends_protocol_'(Entity, Ptc, Scope)),
-    '$lgt_write_xml_relation'(Stream, Entity, Ptc, extends, Scope),
+        '$lgt_write_xml_relation'(Stream, Entity, Ptc, extends, Scope),
     fail.
 
 '$lgt_write_xml_relations'(Stream) :-
     '$lgt_pp_rclause_'('$lgt_extends_category_'(Entity, Ctg, Scope)),
-    '$lgt_write_xml_relation'(Stream, Entity, Ctg, extends, Scope),
+        '$lgt_write_xml_relation'(Stream, Entity, Ctg, extends, Scope),
     fail.
 
@@ -14838 +14838 @@
 '$lgt_write_xml_relations'(Stream) :-
     '$lgt_pp_alias_'(Entity, Pred, Alias),
-    functor(Pred, PFunctor, PArity),
-    functor(Alias, AFunctor, AArity),
-    '$lgt_write_xml_open_tag'(Stream, alias, []),
-    '$lgt_write_xml_cdata_element'(Stream, name, [], Entity),
-    '$lgt_write_xml_cdata_element'(Stream, original, [], PFunctor/PArity),
-    '$lgt_write_xml_cdata_element'(Stream, alternative, [], AFunctor/AArity),
-    '$lgt_write_xml_close_tag'(Stream, alias),
+        Entity =.. [_| Args],               % take care of parametric entities
+        '$lgt_vars_to_underscore'(Args),
+        functor(Pred, PFunctor, PArity),
+        functor(Alias, AFunctor, AArity),
+        '$lgt_write_xml_open_tag'(Stream, alias, []),
+        '$lgt_write_xml_cdata_element'(Stream, name, [], Entity),
+        '$lgt_write_xml_cdata_element'(Stream, original, [], PFunctor/PArity),
+        '$lgt_write_xml_cdata_element'(Stream, alternative, [], AFunctor/AArity),
+        '$lgt_write_xml_close_tag'(Stream, alias),
     fail.
 

trunk/RELEASE_NOTES.txt

@@ -85 +85 @@
     Improved documentation and examples of using the term and goal expansion
     mechanisms.
+
+    The "lgt2*.sh" documentation shell scripts have been updated to ignore
+    XML files that are not XML documenting files generated by the Logtalk
+    compiler.
 
 

trunk/xml/lgt2html.sh

@@ -122 +122 @@
     echo "<ul>" >> "$index_file"
 
-    for file in *.xml; do
+    for file in `grep -l "<logtalk>" *.xml`; do
         name="`expr "$file" : '\(.*\)\.[^./]*$' \| "$file"`"
         entity=${name%_*}
@@ -211 +211 @@
 fi
 
-if [ `(ls *.xml | wc -l) 2> /dev/null` -gt 0 ] ; then
+if [ `(grep -l "<logtalk>" *.xml | wc -l) 2> /dev/null` -gt 0 ] ; then
     echo
     echo "converting XML files..."
-    for file in *.xml; do
+    for file in `grep -l "<logtalk>" *.xml`; do
         echo "  converting $file"
         name="`expr "$file" : '\(.*\)\.[^./]*$' \| "$file"`"

trunk/xml/lgt2pdf.sh

@@ -146 +146 @@
 fi
 
-if [ `(ls *.xml | wc -l) 2> /dev/null` -gt 0 ] ; then
+if [ `(grep -l "<logtalk>" *.xml | wc -l) 2> /dev/null` -gt 0 ] ; then
     echo
     echo "converting XML files to PDF..."
-    for file in *.xml; do
+    for file in `grep -l "<logtalk>" *.xml`; do
         echo "  converting $file"
         name="`expr "$file" : '\(.*\)\.[^./]*$' \| "$file"`"

trunk/xml/lgt2txt.sh

@@ -125 +125 @@
 fi
 
-if [ `(ls *.xml | wc -l) 2> /dev/null` -gt 0 ] ; then
+if [ `(grep -l "<logtalk>" *.xml | wc -l) 2> /dev/null` -gt 0 ] ; then
     echo
     echo "converting XML files to text files..."
-    for file in *.xml; do
+    for file in `grep -l "<logtalk>" *.xml`; do
         echo "  converting $file"
         name="`expr "$file" : '\(.*\)\.[^./]*$' \| "$file"`"

trunk/xml/lgt2xml.sh

@@ -110 +110 @@
     echo "<ul>" >> "$index_file"
 
-    for file in *.xml; do
+    for file in `grep -l "<logtalk>" *.xml`; do
         name="`expr "$file" : '\(.*\)\.[^./]*$' \| "$file"`"
         entity=${name%_*}

trunk/xml/lgtpdf.xsl

@@ -371 +371 @@
             font-size="9pt"
             margin-left="10mm">
-        <fo:inline ><xsl:value-of select="name" /><xsl:text> </xsl:text><xsl:value-of select="original" /></fo:inline>
+        <fo:inline font-family="monospace"><xsl:value-of select="name" /><xsl:text> </xsl:text><xsl:value-of select="original" /></fo:inline>
         <fo:inline font-family="serif" font-style="italic"> aka </fo:inline>
         <fo:inline font-family="monospace"><xsl:value-of select="alternative" /></fo:inline>

trunk/xml/lgttxt.xsl

@@ -103 +103 @@
             <xsl:if test="imports">
                 <xsl:text>imports:</xsl:text><xsl:value-of select="$nl" />
-                    <xsl:apply-templates select="imports" />
+                <xsl:apply-templates select="imports" />
             </xsl:if>
             <xsl:if test="extends">
@@ -110 +110 @@
             </xsl:if>
             <xsl:if test="instantiates">
-            <xsl:text>instantiates:</xsl:text><xsl:value-of select="$nl" />
+                <xsl:text>instantiates:</xsl:text><xsl:value-of select="$nl" />
                 <xsl:apply-templates select="instantiates" />
             </xsl:if>
             <xsl:if test="specializes">
-            <xsl:text>specializes:</xsl:text><xsl:value-of select="$nl" />
+                <xsl:text>specializes:</xsl:text><xsl:value-of select="$nl" />
                 <xsl:apply-templates select="specializes" />
             </xsl:if>
             <xsl:if test="uses">
-            <xsl:text>uses:</xsl:text><xsl:value-of select="$nl" />
+                <xsl:text>uses:</xsl:text><xsl:value-of select="$nl" />
                 <xsl:apply-templates select="uses" />
             </xsl:if>
             <xsl:if test="calls">
-            <xsl:text>calls:</xsl:text><xsl:value-of select="$nl" />
+                <xsl:text>calls:</xsl:text><xsl:value-of select="$nl" />
                 <xsl:apply-templates select="calls" />
             </xsl:if>
             <xsl:if test="alias">
-            <dt class ="key">aliases:</dt>
+                <xsl:text>aliases:</xsl:text><xsl:value-of select="$nl" />
                 <xsl:apply-templates select="alias" />
             </xsl:if>