Update of /project/bayescl/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv21440

Modified Files: webpage.dtd webpage.css web2html.xsl manual2web.xsl manual.dtd Log Message: Moving right along

Date: Wed Nov 26 23:07:57 2003 Author: aventimiglia

Index: public_html/webpage.dtd diff -u public_html/webpage.dtd:1.2 public_html/webpage.dtd:1.3 --- public_html/webpage.dtd:1.2 Wed Nov 26 16:27:35 2003 +++ public_html/webpage.dtd Wed Nov 26 23:07:57 2003 @@ -1,4 +1,6 @@ -<!-- $Id: webpage.dtd,v 1.2 2003/11/26 21:27:35 aventimiglia Exp $ --> +<!-- $Id: webpage.dtd,v 1.3 2003/11/27 04:07:57 aventimiglia Exp $ --> +<!ENTITY % desc "description CDATA"> + <!ELEMENT webpage (page-header, page-links, body-text)> <!ATTLIST webpage title CDATA #REQUIRED>

@@ -8,8 +10,14 @@

<!ELEMENT link EMPTY> <!ATTLIST link uri CDATA #REQUIRED - description CDATA #REQUIRED> + %desc; #REQUIRED> + +<!ELEMENT body-text (#PCDATA | p | link | toc)*> + +<!ELEMENT p (#PCDATA | link)*>

-<!ELEMENT body-text (#PCDATA | p | link)*> +<!ELEMENT toc (chapter+)>

-<!ELEMENT p (#PCDATA | link)*> \ No newline at end of file +<!ELEMENT chapter (section*)> +<!ATTLIST chapter title ID #REQUIRED + %desc; #IMPLIED> \ No newline at end of file

Index: public_html/webpage.css diff -u public_html/webpage.css:1.3 public_html/webpage.css:1.4 --- public_html/webpage.css:1.3 Wed Nov 26 18:39:47 2003 +++ public_html/webpage.css Wed Nov 26 23:07:57 2003 @@ -1,5 +1,5 @@ /* -*- c -*- */ -/* $Id: webpage.css,v 1.3 2003/11/26 23:39:47 aventimiglia Exp $ +/* $Id: webpage.css,v 1.4 2003/11/27 04:07:57 aventimiglia Exp $

Stylesheet for my Common-lisp project pages. */ @@ -14,7 +14,7 @@ background-color: #45AE1C; }

-#page-title { +#page-title, .section-header { color: #C1693D; }

@@ -73,5 +73,12 @@ clear: left; font-size: 130%; margin: 5em 8em; +} + +.section-header { + font-variant: small-caps; + display: block; + font-size: 150%; + font-weight: bold; }

Index: public_html/web2html.xsl diff -u public_html/web2html.xsl:1.2 public_html/web2html.xsl:1.3 --- public_html/web2html.xsl:1.2 Wed Nov 26 16:27:35 2003 +++ public_html/web2html.xsl Wed Nov 26 23:07:57 2003 @@ -52,4 +52,23 @@ </xsl:element> </xsl:template>

+ <xsl:template match="toc"> + <div id="toc" class="toc"> + <span class="section-header">Table of Contents</span> + <ol> + <xsl:apply-templates /> + </ol> + </div> + </xsl:template> + + <xsl:template match="chapter"> + <li class="toc-chapter"> + <xsl:element name="a"> + <xsl:attribute name="href">#<xsl:value-of select="@title"/></xsl:attribute> + <xsl:value-of select="@title"/> + </xsl:element> + -- <xsl:value-of select="@description" /> + </li> + </xsl:template> + </xsl:stylesheet>

Index: public_html/manual2web.xsl diff -u public_html/manual2web.xsl:1.1 public_html/manual2web.xsl:1.2 --- public_html/manual2web.xsl:1.1 Wed Nov 26 21:50:58 2003 +++ public_html/manual2web.xsl Wed Nov 26 23:07:57 2003 @@ -12,8 +12,32 @@ <xsl:attribute name="title"> <xsl:value-of select="@title"/> </xsl:attribute> + <page-header><xsl:value-of select="@title"/></page-header> + <page-links> + <link uri="index.html" description="Main" /> + <link uri="ftp://common-lisp.net/pub/project/bayescl/" + description="download"/> + <link uri="http://common-lisp.net/cgi-bin/viewcvs.cgi/bayescl/?cvsroot=bayescl" description="viewcvs"/> + </page-links> + <body-text> + <xsl:call-template name="TOC" /> + </body-text> </xsl:element> + </xsl:template>

+ <xsl:template name="TOC"> + <toc> + <xsl:for-each select="chapter"> + <xsl:element name="{name()}"> + <xsl:attribute name="title"> + <xsl:value-of select="@title" /> + </xsl:attribute> + <xsl:attribute name="description"> + <xsl:value-of select="@description" /> + </xsl:attribute> + </xsl:element> + </xsl:for-each> + </toc> </xsl:template>

</xsl:stylesheet>

Index: public_html/manual.dtd diff -u public_html/manual.dtd:1.1 public_html/manual.dtd:1.2 --- public_html/manual.dtd:1.1 Wed Nov 26 21:50:58 2003 +++ public_html/manual.dtd Wed Nov 26 23:07:57 2003 @@ -1,11 +1,9 @@ -<!-- $Id: manual.dtd,v 1.1 2003/11/27 02:50:58 aventimiglia Exp $ --> - -<!ENTITY % title "title CDATA #REQUIRED"> +<!-- $Id: manual.dtd,v 1.2 2003/11/27 04:07:57 aventimiglia Exp $ -->

<!ELEMENT manual (chapter)+> -<!ATTLIST manual %title; +<!ATTLIST manual title CDATA #REQUIRED revision CDATA #REQUIRED>

<!ELEMENT chapter (#PCDATA)> -<!ATTLIST chapter %title; +<!ATTLIST chapter title ID #REQUIRED description CDATA #IMPLIED>