forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Gav...." <brightoncomput...@brightontown.com.au>
Subject RE: svn commit: r396236 - in /forrest/trunk: site-author/content/xdocs/docs_0_80/ whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/schema/ whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/stylesheets/ whiteboard/p
Date Sun, 23 Apr 2006 07:41:25 GMT


> -----Original Message-----
> From: crossley@apache.org [mailto:crossley@apache.org]
> Sent: Sunday, 23 April 2006 3:16 PM
> To: svn@forrest.apache.org
> Subject: svn commit: r396236 - in /forrest/trunk: site-
> author/content/xdocs/docs_0_80/
> whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/sche
> ma/
> whiteboard/plugins/org.apache.forrest.plugin.input.glossary/resources/styl
> esheets/ whiteboard/pl...
> 
> Author: crossley
> Date: Sun Apr 23 00:15:30 2006
> New Revision: 396236
> 
> URL: http://svn.apache.org/viewcvs?rev=396236&view=rev
> Log:
> Added <definitions> parent element.
> Added @class attribute to help with column width (missing css?).

Yes, sorry, just wondering best place for it.
(re conversation regarding themes or skins)

> Contributed by: Gavin McDonald
> Issue: FOR-639
> 
> Modified:
>     forrest/trunk/site-author/content/xdocs/docs_0_80/glossary.xml
> 
> 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
> 
> Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/glossary.xml
> URL: http://svn.apache.org/viewcvs/forrest/trunk/site-
> author/content/xdocs/docs_0_80/glossary.xml?rev=396236&r1=396235&r2=396236
> &view=diff
> ==========================================================================
> ====
> --- forrest/trunk/site-author/content/xdocs/docs_0_80/glossary.xml
> (original)
> +++ forrest/trunk/site-author/content/xdocs/docs_0_80/glossary.xml Sun Apr
> 23 00:15:30 2006
> @@ -27,8 +27,11 @@
>      <title>A</title>
>      <item id="AddContent">
>        <term>Add content to this Glossary</term>
> -      <definition>This glossary is incomplete, please help where you can
> by adding definitions to
> -      existing items where needed. Also, add new Items to the glossary as
> appropriate.</definition>
> +      <definitions>
> +        <definition>This glossary is incomplete, please help where you
> can by adding definitions to
> +        existing items where needed. Also, add new Items to the glossary
> as
> +        appropriate.</definition>
> +      </definitions>
>        <notes>
>          <item-note>See
>          <link href="http://marc.theaimsgroup.com/?l=forrest-
> dev&amp;m=112596689428172&amp;w=2#1">
> @@ -40,30 +43,38 @@
>      <item id="ASF">
>        <term>The Apache Software Foundation</term>
>        <acronym title="The Apache Software Foundation">ASF</acronym>
> -      <definition>
> -      <link href="http://apache.org/">The Apache Software
> Foundation</link> is the home of
> -      Apache Forrest.</definition>
> +      <definitions>
> +        <definition>
> +        <link href="http://apache.org/">The Apache Software
> Foundation</link> is the home of Apache
> +        Forrest.</definition>
> +      </definitions>
>      </item>
>    </part>
>    <part id="b">
>      <title>B</title>
>      <item>
>        <term></term>
> -      <definition></definition>
> +      <definitions>
> +        <definition></definition>
> +      </definitions>
>      </item>
>    </part>
>    <part id="c">
>      <title>C</title>
>      <item id="Contracts">
>        <term>Contracts</term>
> -      <definition></definition>
> +      <definitions>
> +        <definition></definition>
> +      </definitions>
>      </item>
>      <item id="CSS">
>        <term>Cascading Style Sheets</term>
>        <acronym title="Cascading Style Sheets">CSS</acronym>
> -      <definition>A simple mechanism for adding style (e.g. fonts,
> colors, spacing) to Web
> -      documents. Source:
> -      <link href="http://www.w3.org/Style/CSS/">W3C</link>.</definition>
> +      <definitions>
> +        <definition>A simple mechanism for adding style (e.g. fonts,
> colors, spacing) to Web
> +        documents. Source:
> +        <link
> href="http://www.w3.org/Style/CSS/">W3C</link>.</definition>
> +      </definitions>
>        <notes>
>          <item-note>See
>          <link href="http://www.w3.org/Style/CSS/">W3C</link></item-note>
> @@ -96,32 +107,38 @@
>          <id>Views</id>
>          <text>Views</text>
>        </see>
> -      <definition>The Dispatcher is the codename for the Forrest
> Implementation of the Core J2EE
> -      Dispatcher View.
> -      <link
> href="http://java.sun.com/blueprints/corej2eepatterns/Patterns/DispatcherV
> iew.html">
> -      java.sun.com</link>has more information on its
> origins.</definition>
> -      <definition>What we at 'Forrest' relate the Dispatcher to, is the
> overall technology and
> -      implementation of the replacement 'skins' system. Combining
> 'Views', 'Contracts' , 'Themes'
> -      enables separation of concerns to provide a fast and efficient
> documentation framework.
> -      </definition>
> +      <definitions>
> +        <definition>The Dispatcher is the codename for the Forrest
> Implementation of the Core J2EE
> +        Dispatcher View.
> +        <link
> href="http://java.sun.com/blueprints/corej2eepatterns/Patterns/DispatcherV
> iew.html">
> +        java.sun.com</link> has more information on its
> origins.</definition>
> +        <definition>What we at 'Forrest' relate the Dispatcher to, is the
> overall technology and
> +        implementation of the replacement 'skins' system. Combining
> 'Views', 'Contracts' , 'Themes'
> +        enables separation of concerns to provide a fast and efficient
> documentation
> +        framework.</definition>
> +      </definitions>
>      </item>
>    </part>
>    <part id="e">
>      <title>E</title>
>      <item>
>        <term></term>
> -      <definition></definition>
> +      <definitions>
> +        <definition></definition>
> +      </definitions>
>      </item>
>    </part>
>    <part id="h">
>      <title>H</title>
>      <item id="Hooks">
>        <term>forrest:hooks</term>
> -      <definition>forrest:hooks is a concept of defining format
> independent hooks to structure the
> -      output.</definition>
> -      <definition>Hooks are used to help define the layout of a page.
> Hooks are only used to define
> -      the structure in our output that is required to enable a theme to
> apply its look and
> -      feel.</definition>
> +      <definitions>
> +        <definition>forrest:hooks is a concept of defining format
> independent hooks to structure
> +        the output.</definition>
> +        <definition>Hooks are used to help define the layout of a page.
> Hooks are only used to
> +        define the structure in our output that is required to enable a
> theme to apply its look and
> +        feel.</definition>
> +      </definitions>
>      </item>
>    </part>
>    <part id="s">
> @@ -144,45 +161,61 @@
>          <id>Themes</id>
>          <text>Themes</text>
>        </see>
> -      <definition>The Structurer is ...</definition>
> +      <definitions>
> +        <definition>The Structurer is ...</definition>
> +      </definitions>
>      </item>
>      <item id="SoC">
>        <term>Separation of Concerns</term>
>        <acronym title="Separation of Concerns">SoC</acronym>
> -      <definition>Different people, different skills, different purposes
> different code. Each can
> -      concentrate on their separate, but well-integrated, area of
> concern.</definition>
> +      <definitions>
> +        <definition>Different people, different skills, different
> purposes different code. Each can
> +        concentrate on their separate, but well-integrated, area of
> concern.</definition>
> +      </definitions>
>        <notes>
>          <item-note>
> -          <link
> href="http://cocoon.apache.org/2.1/introduction.html#Separation+of+Concern
> s+(SoC)">Introducing Apache Cocoon</link>
> +          <link
> href="http://cocoon.apache.org/2.1/introduction.html#Separation+of+Concern
> s+(SoC)">
> +          Introducing Apache Cocoon</link>
>          </item-note>
>          <item-note>
> -          <link
> href="http://excalibur.apache.org/developing/introduction.html#Separation_
> of_Concerns">Apache Excalibur Introduction and Overview</link>
> +          <link
> href="http://excalibur.apache.org/developing/introduction.html#Separation_
> of_Concerns">
> +          Apache Excalibur Introduction and Overview</link>
>          </item-note>
>        </notes>
>      </item>
>      <item id="Skins">
>        <term>Skins</term>
> -      <definition></definition>
> +      <definitions>
> +        <definition></definition>
> +      </definitions>
>      </item>
>    </part>
>    <part id="t">
>      <title>T</title>
>      <item id="Themes">
>        <term>Themes</term>
> -      <definition>Theming</definition>
> +      <definitions>
> +        <definition>Theming</definition>
> +      </definitions>
>      </item>
>    </part>
>    <part id="xyz">
>      <title>XYZ</title>
>      <item id="xdoc">
>        <term>xdoc</term>
> -      <definition>"xdoc" is an xml documentation stucture that started
> life at some other ASF
> -      projects. Apache Forrest adopted it and enhanced it to be similar
> to xhtml2. "xdoc" is
> -      currently the internal xml structure of Forrest (someday will be
> xhtml2). "xdocs" can be used
> -      as an input source format.</definition>
> +      <definitions>
> +        <definition>"xdoc" is an xml documentation stucture that started
> life at some other ASF
> +        projects. Apache Forrest adopted it and enhanced it to be similar
> to xhtml2. "xdoc" is
> +        currently the internal xml structure of Forrest (someday will be
> xhtml2). "xdocs" can be
> +        used as an input source format.</definition>
> +      </definitions>
>        <notes>
> -        <item-note><link href="site:dtd-docs">Reference
> docs</link></item-note>
> -        <item-note><link href="site:samples-container/document-
> v20">Sample xdoc</link></item-note>
> +        <item-note>
> +          <link href="site:dtd-docs">Reference docs</link>
> +        </item-note>
> +        <item-note>
> +          <link href="site:samples-container/document-v20">Sample
> xdoc</link>
> +        </item-note>
>        </notes>
>      </item>
>    </part>
> 
> 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=396236&r1=396235&r2=396236&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 Sun Apr 23 00:15:30 2006
> @@ -45,12 +45,13 @@
>  <!ELEMENT part (title, (item | part)+) >
>  <!ATTLIST part %common.att;>
> 
> -<!ELEMENT item ((term)+, acronym?, see*, definition+, notes?)>
> +<!ELEMENT item ((term)+, acronym?, see*, definitions, notes?)>
>  <!ATTLIST item %common.att;>
> 
>  <!ELEMENT term (%content.mix;)*>
>  <!ATTLIST term %common.att;>
> 
> +<!ELEMENT definitions (definition)+>
>  <!ELEMENT definition (%flow;)*>
>  <!ATTLIST definition cite IDREF #IMPLIED>
> 
> 
> 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=396236&r1=396235&r2=396236&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 Sun Apr 23 00:15:30 2006
> @@ -68,19 +68,20 @@
>      <tr>
>      <xsl:choose>
>        <xsl:when test="acronym">
> -        <td width="20%" id="{$id}"><xsl:apply-templates select="term"/>
> (<xsl:apply-templates select="acronym"/>)</td>
> +        <td class="term" id="{$id}"><xsl:apply-templates select="term"/>
> (<xsl:apply-templates select="acronym"/>)</td>
>        </xsl:when>
>        <xsl:otherwise>
> -        <td width="20%" id="{$id}"><xsl:apply-templates
> select="term"/></td>
> +        <td class="term" id="{$id}"><xsl:apply-templates
> select="term"/></td>
>        </xsl:otherwise>
>      </xsl:choose>
> -    <td width="60%">
> -    <xsl:apply-templates select="definition"/>
> +    <td class="definitions">
> +	<xsl:apply-templates select="definitions"/>
> +	<xsl:apply-templates select="definition"/>
>      <xsl:if test="see">
>        <br/>See Also: <xsl:apply-templates select="see"/>
>      </xsl:if>
>      </td>
> -    <td width="20%">
> +    <td class="notes">
>        <xsl:if test="notes">
>          <xsl:apply-templates select="notes"/>
>        </xsl:if>
> @@ -96,24 +97,26 @@
>    <xsl:template match="acronym">
>      <xsl:value-of select="."/>
>    </xsl:template>
> -
> +
> +  <xsl:template match="definitions">
> +	  <p>
> +		<xsl:apply-templates/>
> +	  </p>
> +  </xsl:template>
>    <xsl:template match="definition">
> -    <p>
>        <xsl:number/>. <xsl:apply-templates/>
>        <xsl:if test="@cite">
>          (Source: <link role="citation"><xsl:attribute
> name="href"><xsl:value-of select="@cite"/></xsl:attribute><xsl:value-of
> select="@cite"/></link>)
>        </xsl:if>
> -    </p>
>    </xsl:template>
> 
>    <xsl:template match="see">
> -<!-- FIXME: FOR-858
> +	  <!-- FIXME: FOR-858 -->
>      <link role="glossary">
> -      <xsl:attribute name="href"><xsl:value-of
> select="id"/></xsl:attribute>
> +      <xsl:attribute name="href">#<xsl:value-of
> select="id"/></xsl:attribute>
>        <xsl:value-of select="text"/>
>      </link>
> --->
> -    <xsl:value-of select="text"/>
> +
>      <xsl:if test="not(position() = last())">, </xsl:if>
>    </xsl:template>
> 
> 
> 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=396236&r1=396235&r2=396236&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 Sun Apr 23 00:15:30 2006
> @@ -29,11 +29,13 @@
>      <item id="CSS">
>        <term>Cascading Style Sheets</term>
>        <acronym title="Cascading Style Sheets">CSS</acronym>
> -      <definition>
> -      A simple mechanism for adding style (e.g. fonts, colors, spacing)
> to Web
> -      documents.
> -      Source: <link href="http://www.w3.org/Style/CSS/">W3C</link>.
> -      </definition>
> +      <definitions>
> +        <definition>
> +        A simple mechanism for adding style (e.g. fonts, colors, spacing)
> to Web
> +        documents.
> +        Source: <link href="http://www.w3.org/Style/CSS/">W3C</link>.
> +        </definition>
> +      </definitions>
>        <notes>
>          <item-note>See <link
> href="http://www.w3.org/Style/CSS/">W3C</link></item-note>
>          <item-note>See <link href="http://www.csszengarden.com/">css Zen
> Garden</link></item-note>
> @@ -46,9 +48,11 @@
>      <item id="glossary-item">
>        <term>Glossary item</term>
>        <term>Glossary entry</term>
> -      <definition>An item in a glossary.
> -       See the source at xdocs/glossary.xml and the DTD
> -      for examples of elements that can be used.)</definition>
> +      <definitions>
> +        <definition>An item in a glossary.
> +         See the source at xdocs/glossary.xml and the DTD
> +        for examples of elements that can be used.)</definition>
> +        </definitions>
>      </item>
>    </part>
> 
> @@ -57,10 +61,12 @@
>      <item id="SVG">
>        <term>Scalable Vector Graphics</term>
>        <acronym title="Scalable Vector Graphics">SVG</acronym>
> -      <definition>A language for describing
> -      two-dimensional graphics and graphical applications in XML.
> -      Source: <link href="http://www.w3.org/Graphics/SVG/">W3C</link>.
> -      </definition>
> +      <definitions>
> +        <definition>A language for describing
> +        two-dimensional graphics and graphical applications in XML.
> +        Source: <link href="http://www.w3.org/Graphics/SVG/">W3C</link>.
> +        </definition>
> +      </definitions>
>        <notes>
>          <item-note>See <link
> href="http://www.w3.org/Graphics/SVG/">W3C</link></item-note>
>          <item-note>See <link
> href="http://www.svg.org/">svg.org</link></item-note>
> 
> 
> 
> 
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.1.385 / Virus Database: 268.4.5/322 - Release Date: 22/04/2006




Mime
View raw message