Hello Geir,
Both patches are attached.
-Bill
"Geir Magnusson Jr." wrote:
> I'm using entourage for the Mac (from MSFT) and can't find a way to tell it
> to not inline text attachments. Apparently MSFT know I will never need to be
> able to control that, apparently...
>
> Thx
>
> geir
> --
> Geir Magnusson Jr. [EMAIL PROTECTED]
> System and Software Consulting
> Be a giant. Take giant steps. Do giant things...
--- build.xml.orig Mon Feb 11 16:49:26 2002
+++ build.xml Mon Feb 11 17:49:32 2002
@@ -44,6 +44,10 @@
<!-- The printdocs destination directory -->
<property name="docs-printable.dest" value="docs_print"/>
+ <!-- Name of generated dvsl.jar file -->
+ <property name="dvsl.jar"
+ value="${project.name}-${project.version}.jar" />
+
<!-- ========== Compiler Defaults ========================================= -->
@@ -89,8 +93,7 @@
<!-- ================================================================== -->
<!-- I N I T -->
<!-- ================================================================== -->
- <target name="init"
- description="Initialize and evaluate conditionals">
+ <target name="init">
<echo message="-------- ${project.name} ${project.version} --------"/>
<filter token="name" value="${project.name}"/>
<filter token="version" value="${project.version}"/>
@@ -99,8 +102,7 @@
<!-- ================================================================== -->
<!-- P R E P A R E -->
<!-- ================================================================== -->
- <target name="prepare" depends="init"
- description="Prepare build directory">
+ <target name="prepare" depends="init">
<mkdir dir="${build.home}"/>
<mkdir dir="${build.home}/classes"/>
<mkdir dir="${build.home}/conf"/>
@@ -111,8 +113,7 @@
<!-- ================================================================== -->
<!-- S T A T I C -->
<!-- ================================================================== -->
- <target name="static" depends="prepare"
- description="Copy static files to build directory">
+ <target name="static" depends="prepare">
<tstamp/>
<copy todir="${build.home}/conf" filtering="on">
<fileset dir="${conf.home}" includes="*.MF"/>
@@ -148,7 +149,8 @@
<!-- ================================================================== -->
<!-- C O M P I L E - T E S T -->
<!-- ================================================================== -->
- <target name="compile-tests" depends="compile" description="Compile Testcases">
+ <target name="compile-tests" depends="compile"
+ description="Compile Testcases">
<javac srcdir="${source.home}/test"
destdir="${build.home}/tests"
@@ -170,7 +172,10 @@
<target name="clean"
description="Clean build and distribution directories">
<delete dir="${build.home}"/>
+ <delete file="${dvsl.jar}"/>
<delete dir="${dist.home}"/>
+ <delete dir="${docs.dest}"/>
+ <delete dir="${docs-printable.dest}"/>
</target>
<!-- ================================================================== -->
@@ -202,8 +207,9 @@
<!-- ================================================================== -->
<!-- J A R -->
<!-- ================================================================== -->
- <target name="jar" depends="compile">
- <jar jarfile="${project.name}-${project.version}.jar"
+ <target name="jar" depends="compile"
+ description="Creates jar file">
+ <jar jarfile="${dvsl.jar}"
basedir="${build.home}/classes"
manifest="${conf.home}/MANIFEST.MF"/>
</target>
@@ -212,10 +218,10 @@
<!-- I N S T A L L J A R -->
<!-- ================================================================== -->
<target name="install-jar" depends="jar"
- description="--> Installs .jar file in ${lib.repo}">
+ description="Installs .jar file in ${lib.repo}">
<copy todir="${lib.repo}" filtering="no">
<fileset dir="${basedir}">
- <include name="${project.name}-${project.version}.jar"/>
+ <include name="${dvsl.jar}"/>
</fileset>
</copy>
</target>
@@ -223,20 +229,12 @@
<!-- ================================================================== -->
<!-- D O C S -->
<!-- ================================================================== -->
- <target name="docs">
- <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
-
- <classpath>
- <pathelement location="${project.name}-${project.version}.jar"/>
- <path refid="classpath"/>
- </classpath>
-
- </taskdef>
-
+ <target name="docs" depends="docs-init"
+ description="Generate documentation">
<dvsl
basedir="${docs.src}"
destdir="${docs.dest}/"
- toolbox="${docs.src}/toolbox.props"
+ toolboxfile="${docs.src}/toolbox.props"
extension=".html"
style="${source.home}/stylesheets/site.dvsl"
excludes="**/project.xml"
@@ -244,29 +242,12 @@
/>
</target>
- <!-- Is the directory for printable docs already created?-->
- <target name="docsprint-dir-check">
- <available file="${docs-printable.dest}" type="file"
property="docsprint-dir.present"/>
- </target>
-
- <target name="docsprint-dir-create" depends="docsprint-dir-check"
unless="docsprint-dir.present">
- <mkdir dir="${docs-printable.dest}"/>
- </target>
-
-<target name="docs-printable" depends="docsprint-dir-create">
- <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
-
- <classpath>
- <pathelement location="${project.name}-${project.version}.jar"/>
- <path refid="classpath"/>
- </classpath>
-
- </taskdef>
-
+ <target name="docs-printable" depends="docs-init"
+ description="Generate printable documentation">
<dvsl
basedir="${docs.src}"
destdir="${docs-printable.dest}/"
- toolbox="${docs.src}/toolbox.props"
+ toolboxfile="${docs.src}/toolbox.props"
extension=".html"
style="${source.home}/stylesheets/site_printable.dvsl"
excludes="**/project.xml"
@@ -274,12 +255,21 @@
/>
</target>
+ <target name="docs-init">
+ <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
+ <classpath>
+ <pathelement location="${dvsl.jar}"/>
+ <path refid="classpath"/>
+ </classpath>
+ </taskdef>
+ </target>
+
<!-- ================================================================== -->
<!-- T E S T -->
<!-- ================================================================== -->
<target name="test" depends="test.transform"
- description="Run all unit tests">
+ description="Run all unit tests">
</target>
<target name="test.transform" depends="compile-tests">
Index: jakarta-velocity-dvsl/examples/velocitydocs/build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-velocity-dvsl/examples/velocitydocs/build.xml,v
retrieving revision 1.2
diff -u -w -u -r1.2 build.xml
--- jakarta-velocity-dvsl/examples/velocitydocs/build.xml 28 Dec 2001 00:20:46
-0000 1.2
+++ jakarta-velocity-dvsl/examples/velocitydocs/build.xml 12 Feb 2002 21:20:31
+-0000
@@ -47,7 +47,7 @@
basedir="${docs.src}"
destdir="${docs.dest}/"
extension=".html"
- toolbox="${docs.src}/toolbox.props"
+ toolboxfile="${docs.src}/toolbox.props"
style="../../src/stylesheets/site.dvsl"
excludes="**/project.xml"
includes="**/*.xml"
@@ -64,17 +64,14 @@
style="site.xsl"
excludes="empty.xml"
includes="*.xml">
+
<param name="relative-path" expression="."/>
<classpath refid="classpath"/>
-
</style>
</target>
</project>
-
-
-
Index: jakarta-velocity-dvsl/src/stylesheets/site.dvsl
===================================================================
RCS file: /home/cvspublic/jakarta-velocity-dvsl/src/stylesheets/site.dvsl,v
retrieving revision 1.2
diff -u -w -u -r1.2 site.dvsl
--- jakarta-velocity-dvsl/src/stylesheets/site.dvsl 11 Jan 2002 01:39:57 -0000
1.2
+++ jakarta-velocity-dvsl/src/stylesheets/site.dvsl 12 Feb 2002 21:20:31 -0000
@@ -12,6 +12,15 @@
#set( $table-th-bg = '#039acc')
#set( $table-td-bg = '#a0ddf0')
#set( $source-color = '#023264')
+#set( $source-font-size = '0')
+
+## Double quote for convenience
+#set ($qq = '"')
+
+## Macro to output argument if test evaluates to true
+#macro(ifset $test $output)
+#if ( $test )$output#end
+#end
#match( "document" )
@@ -131,7 +140,12 @@
<tr><td bgcolor="$banner-bg">
<font color="$banner-fg" face="arial,helvetica.sanserif">
- <a name="$attrib.name">
+ #if ( $attrib.anchor )
+ #set( $anchor = $attrib.anchor )
+ #else
+ #set( $anchor = $attrib.name )
+ #end
+ <a name="$anchor">
<strong>$attrib.name</strong></a></font>
</td></tr>
@@ -148,7 +162,12 @@
<!-- Subsection heading -->
<tr><td bgcolor="$sub-banner-bg">
<font color="$sub-banner-fg" face="arial,helvetica.sanserif">
- <a name="$attrib.name">
+ #if ( $attrib.anchor )
+ #set( $anchor = $attrib.anchor )
+ #else
+ #set( $anchor = $attrib.name )
+ #end
+ <a name="$anchor">
<strong>$attrib.name</strong></a></font>
</td></tr>
<!-- Subsection body -->
@@ -179,7 +198,7 @@
<img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0"
border="0"/>
</td>
<td bgcolor="#ffffff" height="1">
- <pre>$toolbox.htmlescape.getText( $node.value() )</pre>
+ <font size="$source-font-size"><pre>$toolbox.htmlescape.getText(
+$node.value() )</pre></font>
</td>
<td bgcolor="$source-color" width="1">
<img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0"
border="0"/>
@@ -215,11 +234,10 @@
#end
#match( "td" )
-
-#set ($colspan = $attrib.colspan)
-#set ($rowspan = $attrib.rowspan)
-
-<td bgcolor="$table-td-bg" colspan="$!colspan" rowspan="$!rowspan" valign="top"
align="left">
+<td bgcolor="$table-td-bg" #*
+ *##ifset($attrib.colspan "colspan=$qq$attrib.colspan$qq ")#*
+ *##ifset($attrib.rowspan "rowspan=$qq$attrib.rowspan$qq ")#*
+ *#valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
$node.copy( $node.children() )
</font>
@@ -227,11 +245,10 @@
#end
#match( "th" )
-
-#set ($colspan = $attrib.colspan )
-#set ($rowspan = $attrib.rowspan )
-
-<td bgcolor="$table-th-bg" colspan="$!colspan" rowspan="$!rowspan" valign="top"
align="left">
+<td bgcolor="$table-th-bg" #*
+ *##ifset($attrib.colspan "colspan=$qq$attrib.colspan$qq ")#*
+ *##ifset($attrib.rowspan "rowspan=$qq$attrib.rowspan$qq ")#*
+ *#valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
$node.copy( $node.children())
</font>
Index: jakarta-velocity-dvsl/src/stylesheets/site_printable.dvsl
===================================================================
RCS file: /home/cvspublic/jakarta-velocity-dvsl/src/stylesheets/site_printable.dvsl,v
retrieving revision 1.2
diff -u -w -u -r1.2 site_printable.dvsl
--- jakarta-velocity-dvsl/src/stylesheets/site_printable.dvsl 11 Feb 2002 11:18:12
-0000 1.2
+++ jakarta-velocity-dvsl/src/stylesheets/site_printable.dvsl 12 Feb 2002 21:20:31
+-0000
@@ -12,8 +12,15 @@
#set( $table-th-bg = '#FFEEEE')
#set( $table-td-bg = '#FFEEEE')
#set( $source-color = '#CCFFFF')
+#set( $source-font-size = '-1')
-#set($fontSizeCode = '1')
+## Double quote for convenience
+#set ($qq = '"')
+
+## Macro to output argument if test evaluates to true
+#macro(ifset $test $output)
+#if ( $test )$output#end
+#end
#match( "document" )
@@ -152,7 +159,12 @@
<tr><td bgcolor="$banner-bg">
<font color="$banner-fg" face="arial,helvetica.sanserif">
- <a name="$attrib.name">
+ #if ( $attrib.anchor )
+ #set( $anchor = $attrib.anchor )
+ #else
+ #set( $anchor = $attrib.name )
+ #end
+ <a name="$anchor">
<strong>$attrib.name</strong></a></font>
</td></tr>
@@ -169,7 +181,12 @@
<!-- Subsection heading -->
<tr><td bgcolor="$sub-banner-bg">
<font color="$sub-banner-fg" face="arial,helvetica.sanserif">
- <a name="$attrib.name">
+ #if ( $attrib.anchor )
+ #set( $anchor = $attrib.anchor )
+ #else
+ #set( $anchor = $attrib.name )
+ #end
+ <a name="$anchor">
<strong>$attrib.name</strong></a></font>
</td></tr>
<!-- Subsection body -->
@@ -194,7 +211,7 @@
<tr>
<td bgcolor="#ffffff" height="1">
- <font size="$fontSizeCode"><pre>$toolbox.htmlescape.getText( $node.value()
)</pre></font>
+ <font size="$source-font-size"><pre>$toolbox.htmlescape.getText(
+$node.value() )</pre></font>
</td>
</tr>
@@ -224,11 +241,10 @@
#end
#match( "td" )
-
-#set ($colspan = $attrib.colspan)
-#set ($rowspan = $attrib.rowspan)
-
-<td bgcolor="$table-td-bg" colspan="$!colspan" rowspan="$!rowspan" valign="top"
align="left">
+<td bgcolor="$table-td-bg" #*
+ *##ifset($attrib.colspan "colspan=$qq$attrib.colspan$qq ")#*
+ *##ifset($attrib.rowspan "rowspan=$qq$attrib.rowspan$qq ")#*
+ *#valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
$node.copy( $node.children() )
</font>
@@ -236,11 +252,10 @@
#end
#match( "th" )
-
-#set ($colspan = $attrib.colspan )
-#set ($rowspan = $attrib.rowspan )
-
-<td bgcolor="$table-th-bg" colspan="$!colspan" rowspan="$!rowspan" valign="top"
align="left">
+<td bgcolor="$table-th-bg" #*
+ *##ifset($attrib.colspan "colspan=$qq$attrib.colspan$qq ")#*
+ *##ifset($attrib.rowspan "rowspan=$qq$attrib.rowspan$qq ")#*
+ *#valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
$node.copy( $node.children())
</font>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
