forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r392114 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary: resources/schema/glossary-v10.mod resources/stylesheets/glossary-to-document.xsl src/documentation/content/xdocs/glossary.xml status.xml
Date Thu, 06 Apr 2006 23:16:58 GMT
Author: crossley
Date: Thu Apr  6 16:16:55 2006
New Revision: 392114

URL: http://svn.apache.org/viewcvs?rev=392114&view=rev
Log:
Enabled optional notes for each item.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/schema/glossary-v10.mod
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/stylesheets/glossary-to-document.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/src/documentation/content/xdocs/glossary.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/status.xml

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/schema/glossary-v10.mod
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/schema/glossary-v10.mod?rev=392114&r1=392113&r2=392114&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/schema/glossary-v10.mod
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/schema/glossary-v10.mod
Thu Apr  6 16:16:55 2006
@@ -45,7 +45,7 @@
 <!ELEMENT part (title, (item | part)+) >
 <!ATTLIST part %common.att;>
 
-<!ELEMENT item ((term)+, acronym?, see?, definition)>
+<!ELEMENT item ((term)+, acronym?, see?, definition, notes?)>
 <!ATTLIST item %common.att;>
 
 <!ELEMENT term (%content.mix;)*>
@@ -53,6 +53,9 @@
 
 <!ELEMENT definition (%flow;)*>
 <!ATTLIST definition cite IDREF #IMPLIED>
+
+<!ELEMENT notes (note)+>
+<!ELEMENT note (%flow;)*>
 
 <!ELEMENT see (id, text)>
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/stylesheets/glossary-to-document.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/stylesheets/glossary-to-document.xsl?rev=392114&r1=392113&r2=392114&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/stylesheets/glossary-to-document.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/stylesheets/glossary-to-document.xsl
Thu Apr  6 16:16:55 2006
@@ -53,8 +53,8 @@
       <table>
         <tr>
           <th>Term</th>
-          <th>Definition(s)</th>
-          <th>Tutorial(s)</th>
+          <th>Definitions</th>
+          <th>Notes</th>
         </tr>
         <xsl:apply-templates select="item"/>
       </table>
@@ -81,7 +81,9 @@
     </xsl:if>
     </td>
     <td>
-      <xsl:apply-templates select="tutorial"/>
+      <xsl:if test="notes">
+        <xsl:apply-templates select="notes"/>
+      </xsl:if>
     </td>
     </tr>
   </xsl:template>
@@ -111,13 +113,18 @@
     </link>
     <xsl:if test="not(position() = last())">, </xsl:if>
   </xsl:template>
-  
-  <xsl:template match="tutorial">
-    <link><xsl:attribute name="href"><xsl:value-of select="@href"/></xsl:attribute><xsl:value-of
select="."/></link> 
-    <xsl:if test="@level">
-      (<xsl:value-of select="@level"/>)
-    </xsl:if>
-  </xsl:template>  
+
+  <xsl:template match="notes">
+    <ul>
+      <xsl:apply-templates/>
+    </ul>
+  </xsl:template>
+
+  <xsl:template match="note">
+    <li>
+      <xsl:apply-templates/>
+    </li>
+  </xsl:template>
   
   <xsl:template name="generate-id">
     <xsl:choose>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/src/documentation/content/xdocs/glossary.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/src/documentation/content/xdocs/glossary.xml?rev=392114&r1=392113&r2=392114&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/src/documentation/content/xdocs/glossary.xml
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/src/documentation/content/xdocs/glossary.xml
Thu Apr  6 16:16:55 2006
@@ -19,7 +19,7 @@
  "glossary-v10.dtd">
 
 <glossary>
-  <title>Demonstration glossary</title>
+  <title>Sample glossary</title>
   <introduction>
     <p>This is an example for the glossary plugin of the
     <a href="ext:forrest">Apache Forrest</a> project.</p>
@@ -33,6 +33,10 @@
       documents.
       Source: <a href="http://www.w3.org/Style/CSS/">W3C</a>.
       </definition>
+      <notes>
+        <note>See <a href="http://www.w3.org/Style/CSS/">W3C</a></note>
+        <note>See <a href="http://www.csszengarden.com/">css Zen Garden</a></note>
+      </notes>
     </item>
   </part>
 
@@ -42,7 +46,7 @@
       <term>Glossary item</term>
       <term>Glossary entry</term>
       <definition>An item in a glossary.
-      (This is just an example. See the source at xdocs/glossary.xml and the DTD
+       See the source at xdocs/glossary.xml and the DTD
       for examples of elements that can be used.)</definition>
     </item>
   </part>
@@ -55,6 +59,10 @@
       two-dimensional graphics and graphical applications in XML.
       Source: <a href="http://www.w3.org/Graphics/SVG/">W3C</a>.
       </definition>
+      <notes>
+        <note>See <a href="http://www.w3.org/Graphics/SVG/">W3C</a></note>
+        <note>See <a href="http://www.svg.org/">svg.org</a></note>
+      </notes>
     </item>
   </part>
 </glossary>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/status.xml?rev=392114&r1=392113&r2=392114&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/status.xml Thu
Apr  6 16:16:55 2006
@@ -37,6 +37,10 @@
   <changes>
     <!-- Add new releases here -->
     <release version="0.1" date="not-released">
+      <action dev="DC" type="add" context="code">
+        Enabled optional top-level title and introduction.
+        Enabled optional notes for each item.
+      </action>
       <action dev="DC" type="add" context="code" due-to="Ross Gardler, Gavin McDonald"
fix-for="FOR-755">
         Initial plugin code. Thanks to Ross Gardler who contributed the code against
         an early version of Forrest, and to Gavin McDonald who prepared it as a new input
plugin.



Mime
View raw message