[docs] xmldocs - docelic modified 9 files

docs at icdevgroup.org docs at icdevgroup.org
Sun Dec 5 17:12:08 EST 2004


User:      docelic
Date:      2004-12-05 22:12:08 GMT
Modified:  .        Makefile
Modified:  docbook  html-chunks.xsl
Modified:  files/tutorial-phase1 catalog.cfg
Modified:  files/tutorial-phase1/pages index.html
Modified:  files/tutorial-phase2 catalog.cfg
Modified:  files/tutorial-phase3 catalog.cfg
Modified:  files/tutorial-phase4 catalog.cfg
Modified:  files/tutorial-phase5 catalog.cfg
Removed:   files/tutorial-phase1/pages test.html
Log:
- Makefile:
 - Tuned order of dependencies

- docbook/html-chunks.xsl:
 - Finally, in chunked docs, ulinks to files/ directory are properly
   prefixed with "../" using XSL. Excellent stuff!

- files/tutorial*/catalog.cfg:
 - Remove TrackFile as Jon suggested

- files/tutorial-phase1/pages/index.html, guides/iccattut.xml:
 - Reverting to previous state we were all satisfied with:
   iccattut 1.24, index.html 1.1

Revision  Changes    Path
1.50      +1 -1      xmldocs/Makefile


rev 1.50, prev_rev 1.49
Index: Makefile
===================================================================
RCS file: /var/cvs/xmldocs/Makefile,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Makefile	4 Dec 2004 22:47:23 -0000	1.49
+++ Makefile	5 Dec 2004 22:12:07 -0000	1.50
@@ -188,7 +188,7 @@
 # Silly, rewrite this, I forgot about $*. Or $* wouldn't help? I'm not 
 # willing to think about it right now.
 refxmls: BOTH = --both
-refxmls: bin/refs-autogen $(foreach stype,$(SYMBOL_TYPES),refs/$(stype).xml) glossary/glossary.xml howtos/howtos.xml
+refxmls: bin/refs-autogen glossary/glossary.xml howtos/howtos.xml $(foreach stype,$(SYMBOL_TYPES),refs/$(stype).xml)
 	:
 $T/%.list: BNAME = $(subst $T/,,$@)
 refs/%.xml: BNAME = $(subst refs/,,$@)



1.10      +41 -1     xmldocs/docbook/html-chunks.xsl


rev 1.10, prev_rev 1.9
Index: html-chunks.xsl
===================================================================
RCS file: /var/cvs/xmldocs/docbook/html-chunks.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- html-chunks.xsl	9 Nov 2004 23:16:16 -0000	1.9
+++ html-chunks.xsl	5 Dec 2004 22:12:07 -0000	1.10
@@ -42,7 +42,47 @@
 	<xsl:include href="html-common.xsl"/>
 
 	<!-- Norman Walsh gave me a nice idea and code. Since chunked documents
-		need ../ prefix in relative links, add it with XSL.	-->
+		need ../ prefix in relative links, add it with XSL. And boy, here's 
+		the winner! ;-) -->
+	<xsl:template match="ulink" name="ulink">
+		<xsl:variable name="link">
+			<a>
+				<xsl:if test="@id">
+					<xsl:attribute name="name">
+						<xsl:value-of select="@id"/>
+					</xsl:attribute>
+				</xsl:if>
+				<xsl:attribute name="href">
+		<xsl:if test="starts-with(@url, 'files/')">../</xsl:if>
+		<xsl:value-of select="@url"/>
+				</xsl:attribute>
+				<xsl:if test="$ulink.target != ''">
+					<xsl:attribute name="target">
+						<xsl:value-of select="$ulink.target"/>
+					</xsl:attribute>
+				</xsl:if>
+				<xsl:choose>
+					<xsl:when test="count(child::node())=0">
+						<xsl:value-of select="@url"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</a>
+		</xsl:variable>
+		<!--
+		<xsl:choose>
+			<xsl:when test="function-available('suwl:unwrapLinks')">
+				<xsl:copy-of select="suwl:unwrapLinks($link)"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="$link"/>
+			</xsl:otherwise>
+		</xsl:choose>
+		-->
+		<xsl:copy-of select="$link"/>
+	</xsl:template>
 
 </xsl:stylesheet>
 



1.4       +6 -16     xmldocs/files/tutorial-phase1/catalog.cfg


rev 1.4, prev_rev 1.3
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/xmldocs/files/tutorial-phase1/catalog.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- catalog.cfg	25 Nov 2004 15:30:03 -0000	1.3
+++ catalog.cfg	5 Dec 2004 22:12:08 -0000	1.4
@@ -1,18 +1,8 @@
+VendURL       http://myhost.mydomain.local/cgi-bin/ic/tutorial
+SecureURL     http://myhost.mydomain.local/cgi-bin/ic/tutorial
+MailOrderTo   myname at mydomain.local
 
-# Web server paths
-VendURL          http://myhost.mydomain.local/cgi-bin/ic/tutorial
-SecureURL        http://myhost.mydomain.local/cgi-bin/ic/tutorial
-ImageDir         /tutorial/images
-MailOrderTo      myname at mydomain.local
-
-# Filesystem paths
-Variable DOCROOT /var/www/tutorial
-
-# Logging
-ErrorFile        /var/log/interchange/tutorial-error.log
-TrackFile        /var/log/interchange/tutorial-track.log
-
-# Databases
-Database         products  products.txt  TAB
-ProductFiles     products
+ErrorFile     /var/log/interchange/tutorial-error.log
 
+Database      products  products.txt  TAB
+ProductFiles  products



1.3       +4 -117    xmldocs/files/tutorial-phase1/pages/index.html


rev 1.3, prev_rev 1.2
Index: index.html
===================================================================
RCS file: /var/cvs/xmldocs/files/tutorial-phase1/pages/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html	25 Nov 2004 15:30:03 -0000	1.2
+++ index.html	5 Dec 2004 22:12:08 -0000	1.3
@@ -1,119 +1,6 @@
-[include templates/html/top]
+[include top]
+[include left]
 
-[include templates/html/banner]
+This is where your content goes.
 
-[include templates/html/left]
-
-[restrict]
-<div id="centercontent">
-	<h1>A Lesson on ITL Tags</h1>
-	<p>
-	<br />
-<!--
-If you're still with us, it means you have managed to grasp those most
-general principles of how Interchange features and functions are accessed
-from user pages.  It's now time for another cookie - for a more formal
-explanation.
-	</p>
--->
-	<p>
-<b>Interchange Tag Language (ITL)</b> is a simple and intuitive way of
-accessing
-Interchange functionality; that's why we chose it for this <i>introductory
-course</i>. Other possibilities include direct Perl programming, ASP-like
-syntax and combinations of the above, but we'll explain those at a later
-time.
-	</p>
-
-	<p>
-ITL is a successor to <b>MML</b>, or <b>Minivend Markup Language</b>.
-(Up to version 5.x, Interchange was called Minivend). It is of vital
-importance that you become familiar with this basic language and its
-syntax. As ITL naturally progressed and the ammount of functionality
-provided through it grew, it became more and more important to properly
-learn the basics.
-<a href="http://mark.stosberg.com/">Mark Stosberg</a>
-once put up a theory that MML actually stood for <i>Mere Mortals Language</i>,
-while you had to be <i>Information Technology Leader</i> to use ITL.
-However, it's not as discouraging as it might seem - stick to our firm
-guidance and you'll learn the basics without wasting your time.
-	</p>
-	
-	<p>
-In a way, ITL and HTML tags are similar - they both take parameters
-or attributes, and they can both be standalone or container tags.
-	</p>
-	<p>
-Standalone tag is one that does not have an ending tag (consequently,
-it has no "body"). One such example is the [time] tag; simply placing [time]
-on the page displays local time:
-	</p>
-	<p>
-[/restrict]
-[time]
-[restrict]
-	</p>
-	<p>
-Container tags, on the other hand, do have a body. Let's take [filter]
-as an example. In [filter&nbsp;op=mailto]root at mydomain.local[/filter],
-"root at mydomain.local" is considered the tag's <i>body</i> and placing the
-tag on a page produces a <tt>mailto</tt> link:
-	</p>
-	<p>
-[/restrict]
-[filter op=mailto]root at mydomain.local[/filter]
-[restrict]
-	</p>
-	<p>
-	</p>
-	<p>
-Besides being good for a container example, the above [filter] tag also
-accepted an attribute. If an attribute is required, or can be specified in
-positional order - then it is called a <i>parameter</i>. In our specific case,
-the <tt>op</tt> attribute of the [filter] tag is both required and
-positional, so it is a true parameter. (<i>You can't tell which attributes are
-required, positional or accepted just by looking at the tag - you need to 
-consult the appropriate tag's reference page</i>).
-	</p>
-	<p>
-	Let's see the named and positional approach to specifying parameters
-	and attributes:
-	</p>
-	<p>
-	<ul>
-		<li>[filter op=mailto]</li>
-		<li>[filter mailto]</li>
-	</ul>
-	</p>
-	<p>
-	It is important to note that you cannot mix positional and named
-	parameters - <b>each tag individually must be provided either all positional,
-	or all named parameters</b>. Additionally, some tags <i>look</i> like
-	container tags when they're not - for example, the closing &#91;/page] tag is
-	just a macro and not a closing tag to the corresponding [page] 
-	(consequently, the text between [page] and &#91;/page] is <b>not</b> treated
-	as the body of the [page] tag.
-	</p>
-	<p>
-	</p>
-	<p>
-	</p>
-	<p>
-	</p>
-	<p>
-	</p>
-	<p>
-	</p>
-	<p>
-	</p>
-	<p>
-	</p>
-	<p>
-	</p>
-
-</div>
-[/restrict]
-
-[include templates/html/right]
-
-[include templates/html/bottom]
+[include bottom]



1.3       +0 -1      xmldocs/files/tutorial-phase2/catalog.cfg


rev 1.3, prev_rev 1.2
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/xmldocs/files/tutorial-phase2/catalog.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- catalog.cfg	21 Sep 2004 16:33:19 -0000	1.2
+++ catalog.cfg	5 Dec 2004 22:12:08 -0000	1.3
@@ -3,7 +3,6 @@
 MailOrderTo   myname at mydomain.local
 
 ErrorFile     /var/log/interchange/tutorial-error.log
-TrackFile     /var/log/interchange/tutorial-track.log
 
 Database      products  products.txt  TAB
 ProductFiles  products



1.3       +0 -1      xmldocs/files/tutorial-phase3/catalog.cfg


rev 1.3, prev_rev 1.2
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/xmldocs/files/tutorial-phase3/catalog.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- catalog.cfg	21 Sep 2004 16:33:19 -0000	1.2
+++ catalog.cfg	5 Dec 2004 22:12:08 -0000	1.3
@@ -3,7 +3,6 @@
 MailOrderTo   myname at mydomain.local
 
 ErrorFile     /var/log/interchange/tutorial-error.log
-TrackFile     /var/log/interchange/tutorial-track.log
 
 Database      products  products.txt  TAB
 ProductFiles  products



1.3       +0 -1      xmldocs/files/tutorial-phase4/catalog.cfg


rev 1.3, prev_rev 1.2
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/xmldocs/files/tutorial-phase4/catalog.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- catalog.cfg	21 Sep 2004 16:33:19 -0000	1.2
+++ catalog.cfg	5 Dec 2004 22:12:08 -0000	1.3
@@ -3,7 +3,6 @@
 MailOrderTo   myname at mydomain.local
 
 ErrorFile     /var/log/interchange/tutorial-error.log
-TrackFile     /var/log/interchange/tutorial-track.log
 
 Database      products  products.txt  TAB
 ProductFiles  products



1.3       +0 -1      xmldocs/files/tutorial-phase5/catalog.cfg


rev 1.3, prev_rev 1.2
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/xmldocs/files/tutorial-phase5/catalog.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- catalog.cfg	21 Sep 2004 16:33:19 -0000	1.2
+++ catalog.cfg	5 Dec 2004 22:12:08 -0000	1.3
@@ -3,7 +3,6 @@
 MailOrderTo   myname at mydomain.local
 
 ErrorFile     /var/log/interchange/tutorial-error.log
-TrackFile     /var/log/interchange/tutorial-track.log
 
 Database      products  products.txt  TAB
 ProductFiles  products








More information about the docs mailing list