From: Stefan Seefeld Date: Fri, 13 May 2016 15:20:31 +0000 (-0400) Subject: Clean up build and revision control logic. X-Git-Tag: snapshot/2016-11-03-35~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f9b7285f0dd556fbee169e210277c761de820ca;p=docbook-dsssl Clean up build and revision control logic. --- diff --git a/buildtools/build-check b/buildtools/build-check index c7741940c..963a0e1f6 100755 --- a/buildtools/build-check +++ b/buildtools/build-check @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ grep=egrep LOGFILENAME=$1 # FIXME: This regexp may not catch all error messages emitted; diff --git a/buildtools/build-clean b/buildtools/build-clean index daf4282fc..eb9d55958 100755 --- a/buildtools/build-clean +++ b/buildtools/build-clean @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ if [ -z "$(svn status | egrep '^\?|^X')" ] then # remove all files ignored by Subversion diff --git a/buildtools/runtrang b/buildtools/runtrang index af2c235d5..4a0604338 100755 --- a/buildtools/runtrang +++ b/buildtools/runtrang @@ -1,7 +1,5 @@ #!/bin/bash -# $Id$ - # This script attempts to find and run trang. Any arguments given # to it are passed "as is" to trang. # diff --git a/buildtools/xjparse b/buildtools/xjparse index 9563bbb7a..a27b40075 100755 --- a/buildtools/xjparse +++ b/buildtools/xjparse @@ -9,7 +9,7 @@ MYDIR=`dirname $0` XERCES=`findxerces2` RESOLVER=`findresolver` -if [ ! "$RESOLVER" ] && [[ $CLASSPATH != *xml-commons-resolver* ]]; then +if [ ! "$RESOLVER" ] && [[ $CLASSPATH != *xml*resolver* ]]; then echo "cannot find resolver classes" 1>&2 exit 1 fi diff --git a/contrib/cldr/.cvsdir/Makefile b/contrib/cldr/.cvsdir/Makefile index d055c18eb..2e37aa996 100644 --- a/contrib/cldr/.cvsdir/Makefile +++ b/contrib/cldr/.cvsdir/Makefile @@ -1,5 +1,3 @@ -# $Id$ - DATE ?= $(shell date +"%Y-%m-%d") WGET ?= wget diff --git a/contrib/cldr/Makefile b/contrib/cldr/Makefile index b3cf51056..cf9b33838 100644 --- a/contrib/cldr/Makefile +++ b/contrib/cldr/Makefile @@ -1,5 +1,3 @@ -# $Id$ - include ../../buildtools/Makefile.incl CLDR_CVS_MODULES ?= common docs dtd tools diff --git a/contrib/doc/README b/contrib/doc/README index a567ccb99..b0bffff86 100644 --- a/contrib/doc/README +++ b/contrib/doc/README @@ -1,5 +1,3 @@ -$Id$ - The purpose of this directory is to hold contributed documentation about authoring and publishing DocBook documents. diff --git a/contrib/doc/michael.smith/refentry/refentry.notes.txt b/contrib/doc/michael.smith/refentry/refentry.notes.txt index a05355a15..06f9059cd 100644 --- a/contrib/doc/michael.smith/refentry/refentry.notes.txt +++ b/contrib/doc/michael.smith/refentry/refentry.notes.txt @@ -1,5 +1,3 @@ -$Id$ - This is simply a list of standard and commonly used section heading names for "top level" (.SH) sections in man pages (which correspond to Refsect1 element in DocBook. diff --git a/contrib/doc/michael.smith/tbl/Makefile b/contrib/doc/michael.smith/tbl/Makefile index 545e07589..f83fbfb3b 100644 --- a/contrib/doc/michael.smith/tbl/Makefile +++ b/contrib/doc/michael.smith/tbl/Makefile @@ -1,4 +1,3 @@ -# $Id$ # TBLSOURCE=http://cm.bell-labs.com/7thEdMan/vol2/tbl WGET=wget diff --git a/contrib/doc/michael.smith/tbl/README b/contrib/doc/michael.smith/tbl/README index c678fbe92..efb7162df 100644 --- a/contrib/doc/michael.smith/tbl/README +++ b/contrib/doc/michael.smith/tbl/README @@ -1,5 +1,3 @@ -$Id$ - The source for the M. E. Lesk paper "Tbl - A Program to Format Tables" and for all other parts of the Unix Seventh Edition Manual are still under copyright and so cannot be freely distributed. See diff --git a/contrib/samples/assembly/assemble.xsl b/contrib/samples/assembly/assemble.xsl index c2e6b5dac..dfeea9a80 100644 --- a/contrib/samples/assembly/assemble.xsl +++ b/contrib/samples/assembly/assemble.xsl @@ -7,8 +7,6 @@ exclude-result-prefixes="exsl d" version="1.0"> - - diff --git a/contrib/samples/assembly/topic-maker-chunk.xsl b/contrib/samples/assembly/topic-maker-chunk.xsl index d2274542a..1ff649a53 100644 --- a/contrib/samples/assembly/topic-maker-chunk.xsl +++ b/contrib/samples/assembly/topic-maker-chunk.xsl @@ -6,11 +6,6 @@ version="1.0" exclude-result-prefixes="exsl"> - - diff --git a/contrib/samples/assembly/topic-maker.xsl b/contrib/samples/assembly/topic-maker.xsl index 22d44411d..bdcb8d36c 100644 --- a/contrib/samples/assembly/topic-maker.xsl +++ b/contrib/samples/assembly/topic-maker.xsl @@ -7,8 +7,6 @@ exclude-result-prefixes="exsl" version="1.0"> - - diff --git a/contrib/tools/cloak/cloak b/contrib/tools/cloak/cloak index c03d050fc..061477450 100755 --- a/contrib/tools/cloak/cloak +++ b/contrib/tools/cloak/cloak @@ -1,7 +1,5 @@ #!/usr/bin/perl -# $Id$ - =head1 NAME cloak, uncloak - cloak/uncloak content in XML/SGML documents diff --git a/contrib/tools/dtd-flatten/Makefile b/contrib/tools/dtd-flatten/Makefile index b9e8c7c0e..9d354681d 100644 --- a/contrib/tools/dtd-flatten/Makefile +++ b/contrib/tools/dtd-flatten/Makefile @@ -1,5 +1,3 @@ -# $Id$ - DOWNLOAD_URL ?= http://woodstox.codehaus.org/tools DOWNLOAD_FILENAME ?= dtd-flatten.jar diff --git a/contrib/tools/emacs/docbook-menu/doc/Makefile b/contrib/tools/emacs/docbook-menu/doc/Makefile index df1c405b0..11a84c5c8 100644 --- a/contrib/tools/emacs/docbook-menu/doc/Makefile +++ b/contrib/tools/emacs/docbook-menu/doc/Makefile @@ -1,9 +1,6 @@ -# $Id$ # # ::: Basic makefile for generating HTML and HTML Help from DocBook XML source files # -# $DateTime: 2003/10/14 03:36:19 $ -# $Author$ SCP = scp SCP_OPTS = diff --git a/contrib/tools/emacs/docbook-menu/doc/docbook-menu.xml b/contrib/tools/emacs/docbook-menu/doc/docbook-menu.xml index 938061afc..d41cf5123 100644 --- a/contrib/tools/emacs/docbook-menu/doc/docbook-menu.xml +++ b/contrib/tools/emacs/docbook-menu/doc/docbook-menu.xml @@ -3,8 +3,8 @@ <command>docbk-menu-mode</command> — a DocBook menu for GNU Emacs - $Date$ - $Id$ + + xml source
diff --git a/contrib/tools/emacs/docbook-menu/doc/html-common.xsl b/contrib/tools/emacs/docbook-menu/doc/html-common.xsl index 0ef17490f..57d5d5bb4 100644 --- a/contrib/tools/emacs/docbook-menu/doc/html-common.xsl +++ b/contrib/tools/emacs/docbook-menu/doc/html-common.xsl @@ -1,8 +1,5 @@ - diff --git a/contrib/tools/emacs/docbook-menu/doc/make-help.xsl b/contrib/tools/emacs/docbook-menu/doc/make-help.xsl index f5644b6a8..3ad8ffcac 100644 --- a/contrib/tools/emacs/docbook-menu/doc/make-help.xsl +++ b/contrib/tools/emacs/docbook-menu/doc/make-help.xsl @@ -1,8 +1,5 @@ - diff --git a/contrib/tools/emacs/docbook-menu/doc/make-html.xsl b/contrib/tools/emacs/docbook-menu/doc/make-html.xsl index 5652347ba..8d3e811ba 100644 --- a/contrib/tools/emacs/docbook-menu/doc/make-html.xsl +++ b/contrib/tools/emacs/docbook-menu/doc/make-html.xsl @@ -1,8 +1,5 @@ - diff --git a/contrib/tools/emacs/docbook-menu/docbk-menu.el b/contrib/tools/emacs/docbook-menu/docbk-menu.el index 51eb9ddab..389e448ea 100644 --- a/contrib/tools/emacs/docbook-menu/docbk-menu.el +++ b/contrib/tools/emacs/docbook-menu/docbk-menu.el @@ -1,5 +1,4 @@ ;;; docbk-menu.el --- Easy access to DocBook docs -;; $Id$ ;; Copyright (C) 2003 Michael Smith @@ -7,9 +6,6 @@ ;; Maintainer: Michael Smith ;; Created: 2003-11-04 ;; Version: 0.92 -;; Revision: $Revision$ -;; Date: $Date$ -;; RCS Id: $Id$ ;; X-URL: http://docbook.sf.net/projects/docbook-menu ;; Keywords: xml docbook diff --git a/contrib/tools/emacs/docbook-menu/php/dir2lisp.php b/contrib/tools/emacs/docbook-menu/php/dir2lisp.php index 5e4484597..d4d51f910 100644 --- a/contrib/tools/emacs/docbook-menu/php/dir2lisp.php +++ b/contrib/tools/emacs/docbook-menu/php/dir2lisp.php @@ -1,8 +1,5 @@ - diff --git a/contrib/xsl/cldr2dbk/cldr2dbk.xsl b/contrib/xsl/cldr2dbk/cldr2dbk.xsl index 9eee0dd1a..c1c152060 100644 --- a/contrib/xsl/cldr2dbk/cldr2dbk.xsl +++ b/contrib/xsl/cldr2dbk/cldr2dbk.xsl @@ -9,8 +9,6 @@ indent="yes" /> - - diff --git a/contrib/xsl/tabular-toc/examples/book/html/index.html b/contrib/xsl/tabular-toc/examples/book/html/index.html index 39e9ca54c..8d79cd3bc 100644 --- a/contrib/xsl/tabular-toc/examples/book/html/index.html +++ b/contrib/xsl/tabular-toc/examples/book/html/index.html @@ -40,7 +40,7 @@ Some abstract. Some abstract. Some abstract. Some abstract. Jane Doe -

$Id$

+

Copyright © 1998, 1999, 2000, 2001, 2002 Norman Walsh

diff --git a/contrib/xsl/tabular-toc/examples/book/xml/book.001.xml b/contrib/xsl/tabular-toc/examples/book/xml/book.001.xml index fae71cdfc..5c4567498 100644 --- a/contrib/xsl/tabular-toc/examples/book/xml/book.001.xml +++ b/contrib/xsl/tabular-toc/examples/book/xml/book.001.xml @@ -7,7 +7,7 @@ Unit Test: book.001 -$Id$ + SomeCorp NormanWalsh diff --git a/contrib/xsl/tabular-toc/examples/website/html/book/index.html b/contrib/xsl/tabular-toc/examples/website/html/book/index.html index 56cbbdd26..0cb3956ea 100644 --- a/contrib/xsl/tabular-toc/examples/website/html/book/index.html +++ b/contrib/xsl/tabular-toc/examples/website/html/book/index.html @@ -35,7 +35,7 @@ Some abstract. Some abstract. Some abstract. Some abstract. Jane Doe
-

$Id$

+

Copyright © 1998, 1999, 2000, 2001, 2002 Norman Walsh

diff --git a/contrib/xsl/tabular-toc/examples/website/html/build.xml b/contrib/xsl/tabular-toc/examples/website/html/build.xml index a7ff54c7d..289d6f468 100644 --- a/contrib/xsl/tabular-toc/examples/website/html/build.xml +++ b/contrib/xsl/tabular-toc/examples/website/html/build.xml @@ -5,8 +5,6 @@ - - Unit Test: book.001 -$Id$ + SomeCorp NormanWalsh diff --git a/contrib/xsl/tabular-toc/xsl/html/website-common.xsl b/contrib/xsl/tabular-toc/xsl/html/website-common.xsl index d074401f7..e7990181e 100644 --- a/contrib/xsl/tabular-toc/xsl/html/website-common.xsl +++ b/contrib/xsl/tabular-toc/xsl/html/website-common.xsl @@ -16,8 +16,6 @@ --> - diff --git a/imageco/bin/areaoverlay b/imageco/bin/areaoverlay index 0d328d062..992f94774 100755 --- a/imageco/bin/areaoverlay +++ b/imageco/bin/areaoverlay @@ -2,8 +2,6 @@ # areaoverlay -- Generates images with callouts from DocBook imageobjectco's # -# $Id$ -# # Copyright (C) 2006 Norman Walsh # # This is free software; you can redistribute it and/or modify it diff --git a/imageco/bin/areasearch b/imageco/bin/areasearch index 3c0f7d4bb..d5cbb0745 100755 --- a/imageco/bin/areasearch +++ b/imageco/bin/areasearch @@ -2,8 +2,6 @@ # areasearch -- Searches for rectangles and generates coords # -# $Id$ -# # Copyright (C) 2006 Norman Walsh # # This is free software; you can redistribute it and/or modify it diff --git a/jrefentry/jrefentry.dtd b/jrefentry/jrefentry.dtd index 1d3e5e899..5cd60447a 100644 --- a/jrefentry/jrefentry.dtd +++ b/jrefentry/jrefentry.dtd @@ -3,8 +3,6 @@ Copyright (C) 2000, 2001 Norman Walsh http://sourceforge.net/projects/docbook/ - $Id$ - Please direct all questions and comments about this DTD to the DocBook Open Repository team. diff --git a/litprog/html/ldocbook.xweb b/litprog/html/ldocbook.xweb index e316c04c0..569b34691 100644 --- a/litprog/html/ldocbook.xweb +++ b/litprog/html/ldocbook.xweb @@ -13,7 +13,6 @@ Literate Programming in XML 05 Oct 2001 -$Id$ diff --git a/litprog/tangle.xweb b/litprog/tangle.xweb index 8bc99b8fb..30cf8d3ea 100644 --- a/litprog/tangle.xweb +++ b/litprog/tangle.xweb @@ -9,7 +9,6 @@ Literate Programming in XML 05 Oct 2001 -$Id$ diff --git a/litprog/weave.xweb b/litprog/weave.xweb index b9e61eced..a002ac3ad 100644 --- a/litprog/weave.xweb +++ b/litprog/weave.xweb @@ -12,7 +12,6 @@ Literate Programming in XML 05 Oct 2001 -$Id$ diff --git a/releasetools/Makefile b/releasetools/Makefile index 98bce0b1e..e58c66693 100644 --- a/releasetools/Makefile +++ b/releasetools/Makefile @@ -34,7 +34,7 @@ refentry.007.xml: ../testdocs/tests/refentry.007.xml cp $< $@ %.ns.xml: %.xml - $(XSLT) $< ../docbook/relaxng/tools/db4-upgrade.xsl > $@ + $(XSLT) $< ../xsl/tools/xsl/build/db4-upgrade.xsl > $@ clean: $(RM) modified-markup.xsl diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk index 565b7740b..14520022f 100644 --- a/releasetools/Targets.mk +++ b/releasetools/Targets.mk @@ -1,8 +1,6 @@ # this file is a -*- makefile -*- snippet # targets in the file are used only for release builds -# $Id$ - debug: .PHONY: ChangeLog.xml ChangeHistory.xml @@ -58,7 +56,7 @@ NEWS.xml: ChangeLog.xml param.file="$(XSL_PARAMS)" mv NEWS.xml NEWS-4.xml - $(XSLT) NEWS-4.xml $(repo_dir)/docbook/relaxng/tools/db4-upgrade.xsl $@ + $(XSLT) NEWS-4.xml $(repo_dir)/xsl/tools/xsl/build/db4-upgrade.xsl $@ rm NEWS-4.xml NEWS.html: NEWS.xml diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk index aa12a2912..feb0286ba 100644 --- a/releasetools/Variables.mk +++ b/releasetools/Variables.mk @@ -6,8 +6,6 @@ # used only when doing release builds. #----------------------------------------------------------------- -# $Id$ - include $(repo_dir)/buildtools/Makefile.incl RELEASE_ANNOUNCE=$(repo_dir)/releasetools/release-announce diff --git a/releasetools/catalog-install b/releasetools/catalog-install index 7dcda080d..f1b9b5dab 100755 --- a/releasetools/catalog-install +++ b/releasetools/catalog-install @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ if [ "$1" = "uninstall" ] then if [ -f ./uninstall.sh ] diff --git a/releasetools/deb2sourceforge b/releasetools/deb2sourceforge index 71ec3b4d4..10c2cacdd 100755 --- a/releasetools/deb2sourceforge +++ b/releasetools/deb2sourceforge @@ -1,7 +1,5 @@ #!/bin/sh -# $Id$ - # deb2sourceforge - Upload .deb to a Sourceforge project website # # Usage: deb2sourceforge diff --git a/releasetools/docbook-build b/releasetools/docbook-build deleted file mode 100755 index 968f665f3..000000000 --- a/releasetools/docbook-build +++ /dev/null @@ -1,423 +0,0 @@ -#!/bin/bash -# vim: number - -# docbook-build - Build script for generating DocBook project snapshots -# $Id$ - -# fail if no CLASSPATH set -if [ -z "$CLASSPATH" ]; then - cat <<- EOF -`basename $0`: error: CLASSPATH not set. Stopping. - -Before invoking `basename $0`, you must set the Java CLASSPATH -environment variable in the environment from which the script -runs, and it must contain absolute pathnames for the following: - - - Saxon or Xalan2 jar file or classes - - Xerces jar file(s) or classes - - Apache XML Commons Resolver jar file or classes - - directory containing CatalogManager.properties file -EOF - exit 1 -fi - -export repo_dir=`dirname $(cd $(dirname $0); pwd)` -# fail if no repo_dir set -if [ -z "$repo_dir" ]; then - cat <<- EOF -`basename $0`: error: repo_dir not set. Stopping. - -Before invoking `basename $0`, you must set the repo_dir -environment variable in the environment from which the script -runs. The value of repo_dir should be the absolute path to the -base of a DocBook Project Subversion working directory that -contains the various DocBook Project modules; that is, such that -the modules can be found in \$repo_dir/xsl, etc. -EOF - exit 1 -fi - -umask 002 -# set up some defaults -SVNCHECK=no -ENGINE=xsltproc -PDF_MAKER=dblatex -TAR=tar -TARFLAGS=P -ZIPTARG=zip -SITEBASE=/var/www -#SITEUSER=`whoami` -#SITEHOST=web.sourceforge.net -RELEASEVERSION=snapshot -if [ -z "$TMP" ]; then - TMP=/tmp -fi -# default timeout waiting for lock file to clear is 1200 seconds (20 mins) -LOCK_TIMEOUT=1200 - -usage="Usage: - - `basename $0` [-a ADDEDSUFFIX] [-b BASEDIR] [-d DOMAIN] - [-e ENGINENAME] [-f FORMATTER] [-l LOGDIR] - [-p PATH] [-r] [-s] [-t TMPDIR] [-u USER] - [-v VERSION] [-x ZIPTARG] [-z ZONE] DISTRO... - -" -opts_admon="Type '`basename $0` -h' for details about options. -" - -help=" -Options: - - -a ADDEDSUFFIX - Specifies a suffix for any additional packages that are built - along with the package for this distro. For example, in the - cause of the docbook-xsl package, we also build docbook-xsl-ns, - using \"-a ns\" - - -b BASEDIR - Specifies the location of the base directory containing the - SVN working directories for modules from the DocBook project - (directory containing 'xsl', 'dsssl', 'slides', etc. subdirs) - Default: value of the repo_dir environment variable, if - set; otherwise, the directory from which the script is run. - - -d DOMAIN - Specifies the remote host (domain) to which the snaphost is - uploaded. Default: 'web.sourceforge.net' - - -e ENGINENAME - Specifies which XSLT engine to use. Default: xsltproc - - -f FORMATTER - Specifies which formatter to use for generating the PDF - version of the release notes for the distribution. - Default: dblatex - - -l LOGDIR - Specifies the directory to which the script redirects its - standard output and standard error. - Default: none -- if not set, stdout and stderr are not - redirected to a log file. - - -p PATH - Specifies the upload path on the remote host. - Default: '/home/groups/d/do/docbook/htdocs/snapshots' - - -r - If specified, read commit message from standard input. - - -s - If specified, do an svn check to see if the workspace is up - to date, and if it is, stop the build. - - -t TMPDIR - Specifies the directory to which the script writes temporary - files. Default: /tmp - - -u USER - Specifies the (Sourceforge) username with which to upload the - snapshot to the target (Sourceforge) website. - Default: Username found in SVN/Root in working directory, if - found; otherwise, local username. - - -v VERSION - Specifies the version name to put on the build. - Default: 'snapshot' - - -x ZIPTARG - Specifies name of the target to use for building compressed - package file. Default: 'zip' - - -z ZONE - Specifies timezone to use for date/time stamps. - Default: none -- if not set, 'date' uses timezone configured - on local machine. - - DISTRO... - Space-separated list of distros to build (e.g. 'xsl dsssl') - -" -while getopts ":a:b:e:f:d:hl:p:rst:u:v:x:z:" opt; do - case $opt in - r ) # parse commit message - while read -r LINE - do - if echo $LINE | grep "^Revision: " >/dev/null; then - REVISION=$(echo $LINE | sed -r 's/^Revision: (.+)$/\1/') - break - fi - if echo $LINE | grep "^Modified: " >/dev/null; then - CHANGEPATH=$(echo $LINE | sed -r 's/^Modified:|Added:|Deleted: (.+)$/\1/') - break - fi - done ;; - a ) ADDEDSUFFIX=$OPTARG ;; - b ) BUILDDIR=$OPTARG ;; - e ) ENGINE=$OPTARG ;; - f ) PDF_MAKER=$OPTARG ;; - l ) LOGDIR=$OPTARG ;; - t ) TMP=$OPTARG ;; - v ) RELEASEVERSION=$OPTARG ;; - u ) SITEUSER=$OPTARG ;; - d ) SITEHOST=$OPTARG ;; - p ) SITEBASE=$OPTARG ;; - s ) SVNCHECK="yes" ;; - x ) ZIPTARG=$OPTARG ;; - z ) TZ=$OPTARG - alias date="TZ=$TZ date" ;; - h ) printf "$usage" - printf "$help" - exit 0 ;; - \? ) printf "$usage" - printf "$opts_admon" - exit 1 ;; - esac -done - -shift $(($OPTIND - 1)) - -if [ -z "$BUILDDIR" ]; then - BUILDDIR=`pwd` -fi -cd $BUILDDIR - -DISTROS="$@" -if [ -z "$DISTROS" ]; then - DISTROS=xsl -fi - -if [ -z "$DISTROS" ]; then - echo - echo "`basename $0`: error: No DISTROS specified. Stopping." - echo - printf "$usage" - printf "$opts_admon" - exit 1; -else - # We may want to use `git describe` here, once we use real tags... - REVISION=$(git rev-parse HEAD) - for DISTRO in $DISTROS; do - printf "Running svn update in gentext and $DISTRO working directories...\n" 1>&2 - if test "$SVNCHECK" = "yes"; then - if test $(cat $DISTRO/REVISION) = $REVISION; then - printf "$DISTRO distro is up to date. Skipping.\n" 1>&2 - break - fi - fi - echo $REVISION > $DISTRO/REVISION - lock_timer=0 - # wait for lock file (if any) to clear - printf "Waiting for lock file to clear..." 1>&2 - while [ -f $TMP/docbook-*-$RELEASEVERSION.lock ]; do - if [ $lock_timer = $LOCK_TIMEOUT ]; then - # time out after reaching $LOCK_TIMEOUT seconds - # default is 1200 seconds (20 minutes) - echo - printf "Timed out after $LOCK_TIMEOUT seconds waiting for lock file to clear.\n" - echo "You probably have a stale $TMP/docbook-$DISTRO-$RELEASEVERSION.lock file that you need to delete." - exit 1 - fi - printf "." 1>&2 - sleep 1 - let lock_timer=$lock_timer+1 - done - printf "Done.\n" 1>&2 - - printf "Doing some initialization..." 1>&2 - # create new lock file - touch $TMP/docbook-$DISTRO-$RELEASEVERSION.lock - # remove old log file, if any - rm -f $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp - - DATE=`date +%Y-%m-%d` - TIME=`date '+%H%M'` - ZONE=`date '+%Z'` - - #if [ -f $DISTRO/CVS/Root ]; then - # CVSROOT=`cat $DISTRO/CVS/Root` - # export CVSROOT - # CVSUSER=`sed 's/^:.\+:\([^@]\+\)@.\+$/\1/' $DISTRO/CVS/Root` - # if [ "$CVSUSER" != "anonymous" ]; then - # CVS_RSH=ssh - # export CVS_RSH - # fi - # if [ -z "$OVERRIDE_CVSUSER" ]; then - # # if no value for USER has been specified via -u option, set - # # SITEUSER for ssh uploads to same value as CVSUSER - # SITEUSER=$CVSUSER - # fi - #fi - #rm -f $DISTRO/LatestTag - rm -f $DISTRO/VERSION - git checkout $DISTRO/VERSION - - printf "." 1>&2 - - # replace the current fm:Version value with the snapshot number - cp -p $DISTRO/VERSION $DISTRO/VERSION.tmp - # FIXME: we really should be doing this using a modifiled XSLT identity - # transform, but anyway, this works OK for now... - if test "$SVNCHECK" = "yes"; then - sed "s/Version>.\+$RELEASEVERSION\_$REVISION\ $DISTRO/VERSION - else - # forced builds omit $REVISION suffix - sed "s/Version>.\+$RELEASEVERSION\ $DISTRO/VERSION - fi - rm $DISTRO/VERSION.tmp - - # copy VERSION to VERSION.xsl - cp $DISTRO/VERSION $DISTRO/VERSION.xsl - - printf "Done.\n" 1>&2 - - # start re-directing stout and stderr to log file (if logging enabled) - if [ $LOGDIR ]; then - echo "Logging all further output to $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp" - exec 1> $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp - exec 2>&1 - fi - - date - echo - # echo selected variables - set | grep "^CHANGE\|REVISION" - echo - - #echo "Running svn update in gentext and $DISTRO working directories..." - #svn cleanup - #svn update gentext || exit 1 - #svn update $DISTRO || exit 1 - #echo -# - echo - date - echo "Building $DISTRO distribution..." - echo - - if test "$SVNCHECK" = "yes"; then - make distrib -C $DISTRO XSLT="$repo_dir/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER - else - make release -C $DISTRO XSLT="$repo_dir/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER - fi - - cat <<- EOF > HEADER.txt -The snapshot for a particular distribution is re-built automatically each time -a change is checked into the SVN source tree for the distribution. The most -recent build was of the "$DISTRO" distribution, for revision $REVISION, -on $DATE at $TIME $ZONE. - -These snapshots are intended for testing purposes only and otherwise come with -no guarantees. Any of them may in fact be broken at any given time. -EOF - - make $ZIPTARG -C $DISTRO ZIPVER=$RELEASEVERSION TMP=$TMP XSLT="$repo_dir/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER || exit 1 - - cat <<- EOF > $TMP/line.tmp - --------------------------------------------------------------------------------- -Latest Changes: --------------------------------------------------------------------------------- - -EOF - git log -n 200 > LatestChanges - - cat HEADER.txt $TMP/line.tmp LatestChanges > README.txt - rm $TMP/line.tmp - - # Uncompress tarball to local mirror directory. - # Previously, we uploaded and untarred it to the remote host - # (sourceforge.net web server), but 100Mb quota limit at - # Sourceforge made that a not-very-efficient use of the - # project disk space - cp $TMP/docbook*-$DISTRO*$RELEASEVERSION.tar.bz2 $SITEBASE - (umask 002; \ - cd $SITEBASE; \ - rm -f docbook-$DISTRO-$RELEASEVERSION.log; \ - rm -rf $DISTRO; \ - rm -rf $DISTRO-$ADDEDSUFFIX; \ - for tarball in docbook-$DISTRO*$RELEASEVERSION.tar.bz2; do \ - cat $tarball | bunzip2 | \ - (cd $TMP; $TAR xf$TARFLAGS -); \ - done; \ - mkdir $DISTRO; \ - cp -pR $TMP/docbook-$DISTRO-$RELEASEVERSION/* $DISTRO; \ - if [ -d $TMP/docbook-$DISTRO-$ADDEDSUFFIX-$RELEASEVERSION ]; then \ - mkdir $DISTRO-$ADDEDSUFFIX; \ - cp -pR $TMP/docbook-$DISTRO-$ADDEDSUFFIX-$RELEASEVERSION/* $DISTRO-$ADDEDSUFFIX; \ - fi; \ - ) - cp \ - $TMP/docbook*-$DISTRO*$RELEASEVERSION.zip \ - README.txt \ - LatestChanges \ - $SITEBASE - - rm -rf $TMP/docbook-$DISTRO*$RELEASEVERSION.tar.bz2 - rm -rf $TMP/docbook-$DISTRO*$RELEASEVERSION.tar.gz - rm -rf $TMP/docbook-$DISTRO*$RELEASEVERSION.zip - rm -rf $TMP/docbook-$DISTRO-$RELEASEVERSION - rm -rf $TMP/docbook-$DISTRO-$ADDEDSUFFIX-$RELEASEVERSION - - rm -f $DISTRO/LatestChanges HEADER.txt README.txt LatestChanges - - date - - # set up the e-mail From and To headers for buildbot message - cat <<- EOF > $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt -From: docbook buildbot -To: docbook-snapshots@lists.sourceforge.net -EOF - - # Run build-check and determine if it exits without any errors - if $repo_dir/buildtools/build-check $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp - then - # build-check completed successfully, so prepare the - # buildbot message accordingly - echo "Subject: $DISTRO snapshot $REVISION now available" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo "$DISTRO snapshot $REVISION appears to have been built successfully" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - # append the commit message for this revision - git show --quiet $REVISION >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo "For further details about the code changes in this revision, see:" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo "http://docbook.svn.sf.net/docbook/?rev=$REVISION&view=rev" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo "You can download the snapshot here:" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo "http://docbook.sf.net/snapshots/" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - else - # build-check did not complete successfully, so prepare - # the buildbot message accordingly - echo "Subject: $DISTRO snapshot build is broken at r$REVISION" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo "The $DISTRO snapshot build appears to be broken at r$REVISION or before." >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - # run buildcheck again and copy the output to the beginning - # of the buildbot message - $repo_dir/buildtools/build-check $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - # append the commit message for this revision - git show --quiet $REVISION >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo "For further details about the code changes in this revision, see:" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo "http://docbook.svn.sf.net/docbook/?rev=$REVISION&view=rev" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo "The complete log file for the r$REVISION build follows." >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo "-----------------------------------------------------------------" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - # copy the entire log file to the buildbot message - cat $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - fi - - # send the buildbot message - /usr/sbin/sendmail -f buildbot@sideshowbarker.net docbook-snapshots@lists.sourceforge.net < $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt - - cp $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp $SITEBASE/docbook-$DISTRO-$RELEASEVERSION.log - rm -f $TMP/docbook-$DISTRO-$RELEASEVERSION.lock - - cd - - done -fi diff --git a/releasetools/docbook-dtd-test b/releasetools/docbook-dtd-test index 9a5a85312..a74061112 100755 --- a/releasetools/docbook-dtd-test +++ b/releasetools/docbook-dtd-test @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ TEMPDIR=/tmp SVN=svn diff --git a/releasetools/docbook.rng b/releasetools/docbook.rng index 3fc5bc1d2..b5f199bf5 100644 --- a/releasetools/docbook.rng +++ b/releasetools/docbook.rng @@ -29,8 +29,6 @@ Organization for the Advancement of Structured Information Standards (OASIS). - Release: $Id: docbook.rnc 7474 2007-09-28 18:50:07Z nwalsh $ - Permission to use, copy, modify and distribute the DocBook schema and its accompanying documentation for any purpose and without fee is hereby granted in perpetuity, provided that the above copyright diff --git a/releasetools/eval-xpath.xsl b/releasetools/eval-xpath.xsl index 97098a9bc..a3bc644c2 100644 --- a/releasetools/eval-xpath.xsl +++ b/releasetools/eval-xpath.xsl @@ -3,9 +3,6 @@ xmlns:sf="http://sourceforge.net/" xmlns:dyn="http://exslt.org/dynamic" version='1.0'> - diff --git a/releasetools/gitlog2docbook.xsl b/releasetools/gitlog2docbook.xsl index 5ca621178..4c9764be5 100644 --- a/releasetools/gitlog2docbook.xsl +++ b/releasetools/gitlog2docbook.xsl @@ -5,8 +5,6 @@ exclude-result-prefixes="exsl sf" version='1.0'> - diff --git a/releasetools/refentry.007.ns.xml b/releasetools/refentry.007.ns.xml index f66d6e0d3..c24c1c722 100644 --- a/releasetools/refentry.007.ns.xml +++ b/releasetools/refentry.007.ns.xml @@ -1,7 +1,7 @@ Unit Test: refentry.007 -$Id: refentry.007.xml 7282 2007-08-23 09:27:01Z xmldoc $ + NormanWalsh
ndw@nwalsh.com
 Reference diff --git a/releasetools/refentry.007.xml b/releasetools/refentry.007.xml index 452137631..3bfb249b5 100644 --- a/releasetools/refentry.007.xml +++ b/releasetools/refentry.007.xml @@ -4,7 +4,7 @@ Unit Test: refentry.007 -$Id: refentry.007.xml 7282 2007-08-23 09:27:01Z xmldoc $ + NormanWalsh
ndw@nwalsh.com
 diff --git a/releasetools/release-announce b/releasetools/release-announce index 57f92700a..97a13da91 100755 --- a/releasetools/release-announce +++ b/releasetools/release-announce @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # release-announce - send DocBook Project release announcements diff --git a/releasetools/xslnons-build b/releasetools/xslnons-build index 6c49b656a..571b8353c 100755 --- a/releasetools/xslnons-build +++ b/releasetools/xslnons-build @@ -4,8 +4,6 @@ # stylesheet directories from a directory of # non-namespaced stylesheets. # -# $Id: xslns-build 9483 2012-07-09 21:38:55Z bobstayton $ -# my $Usage = " USAGE: diff --git a/releasetools/xslnons.mk b/releasetools/xslnons.mk index fdc317c19..df2f69e32 100755 --- a/releasetools/xslnons.mk +++ b/releasetools/xslnons.mk @@ -2,8 +2,6 @@ # targets in this file are used to build and upload the namespaced # version of the DocBook Project XSL Stylesheets -# $Id$ - freshmeat-nons: ifeq ($(SFRELID),) @echo "You must specify the sourceforge release identifier in SFRELID" @@ -30,11 +28,11 @@ zip-nons: zip # Run xslt on xsl/webhelp/docsrc/readme.xml $(XSLT) \ $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/webhelp/docsrc/readme.xml \ - $(repo_dir)/docbook/relaxng/tools/db4-upgrade.xsl \ + $(repo_dir)/xsl/tools/xsl/build/db4-upgrade.xsl \ $(TMP)/docbook-$(DISTRO)-nons-$(ZIPVER)/webhelp/docsrc/readme.xml $(XSLT) \ $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/webhelp/docsrc/xinclude-test.xml \ - $(repo_dir)/docbook/relaxng/tools/db4-upgrade.xsl \ + $(repo_dir)/xsl/tools/xsl/build/db4-upgrade.xsl \ $(TMP)/docbook-$(DISTRO)-nons-$(ZIPVER)/webhelp/docsrc/xinclude-test.xml # Turn off validation in webhelp: diff --git a/releasetools/xslns-build b/releasetools/xslns-build index 1b3c213ab..45ebfa6c2 100755 --- a/releasetools/xslns-build +++ b/releasetools/xslns-build @@ -4,8 +4,6 @@ # stylesheet directories from a directory of # non-namespaced stylesheets. # -# $Id$ -# my $Usage = " USAGE: diff --git a/releasetools/xslns.mk b/releasetools/xslns.mk index bb61d0077..7b1aae95b 100644 --- a/releasetools/xslns.mk +++ b/releasetools/xslns.mk @@ -2,8 +2,6 @@ # targets in this file are used to build and upload the namespaced # version of the DocBook Project XSL Stylesheets -# $Id$ - freshmeat-ns: ifeq ($(SFRELID),) @echo "You must specify the sourceforge release identifier in SFRELID" @@ -30,11 +28,11 @@ zip-ns: zip # Run xslt on xsl/webhelp/docsrc/readme.xml $(XSLT) \ $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/webhelp/docsrc/readme.xml \ - $(repo_dir)/docbook/relaxng/tools/db4-upgrade.xsl \ + $(repo_dir)/xsl/tools/xsl/build/db4-upgrade.xsl \ $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/webhelp/docsrc/readme.xml $(XSLT) \ $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/webhelp/docsrc/xinclude-test.xml \ - $(repo_dir)/docbook/relaxng/tools/db4-upgrade.xsl \ + $(repo_dir)/xsl/tools/xsl/build/db4-upgrade.xsl \ $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/webhelp/docsrc/xinclude-test.xml # Turn off validation in webhelp: diff --git a/releasetools/xslnsfiles/manpages.table.xsl b/releasetools/xslnsfiles/manpages.table.xsl index 6e8e3399c..a92808d47 100644 --- a/releasetools/xslnsfiles/manpages.table.xsl +++ b/releasetools/xslnsfiles/manpages.table.xsl @@ -6,8 +6,6 @@ version='1.0'> - - - diff --git a/website/schema/dtd/extensions.mod b/website/schema/dtd/extensions.mod index 39c1e6d9d..b439e4ef0 100644 --- a/website/schema/dtd/extensions.mod +++ b/website/schema/dtd/extensions.mod @@ -3,8 +3,6 @@ Copyright (C) 2002 Norman Walsh http://sourceforge.net/projects/docbook/ - $Id$ - Please direct all questions and comments about this DTD to Norman Walsh, . --> diff --git a/website/schema/dtd/website-custom.dtd b/website/schema/dtd/website-custom.dtd index 1b17b9250..2c3c2f7e5 100644 --- a/website/schema/dtd/website-custom.dtd +++ b/website/schema/dtd/website-custom.dtd @@ -3,8 +3,6 @@ Copyright (C) 1997-2003 Norman Walsh http://sourceforge.net/projects/docbook/ - $Id$ - Please direct all questions and comments about this DTD to Norman Walsh, . diff --git a/website/schema/dtd/website-full.dtd b/website/schema/dtd/website-full.dtd index 0a5bc8995..58f78744f 100644 --- a/website/schema/dtd/website-full.dtd +++ b/website/schema/dtd/website-full.dtd @@ -3,8 +3,6 @@ Copyright (C) 2002 Norman Walsh http://sourceforge.net/projects/docbook/ - $Id$ - Please direct all questions and comments about this DTD to Norman Walsh, . diff --git a/website/schema/dtd/website.dtd b/website/schema/dtd/website.dtd index 8f715ece0..ccdd3ab0a 100644 --- a/website/schema/dtd/website.dtd +++ b/website/schema/dtd/website.dtd @@ -8,8 +8,6 @@ Copyright (C) 1997-2003 Norman Walsh http://sourceforge.net/projects/docbook/ - $Id$ - Please direct all questions and comments about this DTD to Norman Walsh, . diff --git a/website/schema/dtd/website.mod b/website/schema/dtd/website.mod index ffd489e92..5b81f4212 100644 --- a/website/schema/dtd/website.mod +++ b/website/schema/dtd/website.mod @@ -3,8 +3,6 @@ Copyright (C) 2002 Norman Walsh http://sourceforge.net/projects/docbook/ - $Id$ - Please direct all questions and comments about this DTD to Norman Walsh, . --> diff --git a/xsl-libxslt/python/README.LIBXSLT b/xsl-libxslt/python/README.LIBXSLT index 1644c9f66..f946ff5f6 100644 --- a/xsl-libxslt/python/README.LIBXSLT +++ b/xsl-libxslt/python/README.LIBXSLT @@ -1,7 +1,6 @@ ---------------------------------------------------------------------- README file for the libxslt extensions ---------------------------------------------------------------------- -$Id$ These are XSLT extensions written in Python for use with the DocBook XML stylesheets and the libxslt library[1]. diff --git a/xsl-libxslt/python/docbook.py b/xsl-libxslt/python/docbook.py index e06655be1..c3db23099 100644 --- a/xsl-libxslt/python/docbook.py +++ b/xsl-libxslt/python/docbook.py @@ -1,5 +1,4 @@ # docbook.py: extension module -# $Id$ import sys import string diff --git a/xsl-libxslt/python/xslt.py b/xsl-libxslt/python/xslt.py index 4ad1f204f..79347b66c 100644 --- a/xsl-libxslt/python/xslt.py +++ b/xsl-libxslt/python/xslt.py @@ -1,5 +1,4 @@ #!/usr/bin/python -u -# $Id$ import sys import libxml2 diff --git a/xsl-saxon/INSTALL b/xsl-saxon/INSTALL index aaad2506e..0188fc867 100644 --- a/xsl-saxon/INSTALL +++ b/xsl-saxon/INSTALL @@ -1,5 +1,3 @@ -$Id$ - INSTALL file for the DocBook Saxon extensions ---------------------------------------------------------------------- diff --git a/xsl-saxon/Makefile b/xsl-saxon/Makefile index 60f82317c..d9a6618a8 100644 --- a/xsl-saxon/Makefile +++ b/xsl-saxon/Makefile @@ -1,5 +1,3 @@ -# $Id$ - include ../buildtools/Makefile.incl include ../releasetools/Variables.mk diff --git a/xsl-saxon/README b/xsl-saxon/README index 3330767e0..1ae9a66b4 100644 --- a/xsl-saxon/README +++ b/xsl-saxon/README @@ -1,7 +1,6 @@ ---------------------------------------------------------------------- README file for the DocBook Saxon Extensions ---------------------------------------------------------------------- -$Id$ These are Java extensions for use with the DocBook XML stylesheets and the Saxon XSLT engine. diff --git a/xsl-saxon/src/com/nwalsh/saxon/CVS.java b/xsl-saxon/src/com/nwalsh/saxon/CVS.java index 9fcc530c3..7045cd0e1 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/CVS.java +++ b/xsl-saxon/src/com/nwalsh/saxon/CVS.java @@ -7,8 +7,6 @@ import java.util.TimeZone; /** *

Saxon extension to convert CVS date strings into local time

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -32,8 +30,6 @@ import java.util.TimeZone; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class CVS { /** diff --git a/xsl-saxon/src/com/nwalsh/saxon/CalloutEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/CalloutEmitter.java index 76ffade72..02d3fd2d4 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/CalloutEmitter.java +++ b/xsl-saxon/src/com/nwalsh/saxon/CalloutEmitter.java @@ -14,8 +14,6 @@ import com.icl.saxon.tree.AttributeCollection; /** *

Saxon extension to decorate a result tree fragment with callouts.

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides the guts of a @@ -42,8 +40,6 @@ import com.icl.saxon.tree.AttributeCollection; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class CalloutEmitter extends CopyEmitter { /** A stack for the preserving information about open elements. */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java index 30bc34d51..c050555d7 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java +++ b/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java @@ -6,8 +6,6 @@ import com.icl.saxon.om.NamePool; /** *

Saxon extension to scan the column widths in a result tree fragment.

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -30,8 +28,6 @@ import com.icl.saxon.om.NamePool; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class ColumnScanEmitter extends com.icl.saxon.output.Emitter { /** The number of columns seen. */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java index d41038c43..a8fd90c93 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java +++ b/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java @@ -9,8 +9,6 @@ import com.icl.saxon.tree.AttributeCollection; /** *

Saxon extension to scan the column widths in a result tree fragment.

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -33,8 +31,6 @@ import com.icl.saxon.tree.AttributeCollection; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class ColumnUpdateEmitter extends CopyEmitter { /** The number of columns seen. */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/CopyEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/CopyEmitter.java index c31e189cb..031793ccd 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/CopyEmitter.java +++ b/xsl-saxon/src/com/nwalsh/saxon/CopyEmitter.java @@ -10,8 +10,6 @@ import com.icl.saxon.output.Emitter; /** *

A Saxon 6.0 Emitter that clones its input.

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -35,8 +33,6 @@ import com.icl.saxon.output.Emitter; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class CopyEmitter extends com.icl.saxon.output.Emitter { /** The result tree fragment containing the copied fragment. */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/FormatCallout.java b/xsl-saxon/src/com/nwalsh/saxon/FormatCallout.java index bdb4c5939..e76f73109 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/FormatCallout.java +++ b/xsl-saxon/src/com/nwalsh/saxon/FormatCallout.java @@ -13,8 +13,6 @@ import com.nwalsh.saxon.Callout; /** *

Utility class for the Verbatim extension (ignore this).

* - *

$Id$

- * *

Copyright (C) 2000, 2001 Norman Walsh.

* *

Change Log:

@@ -27,9 +25,7 @@ import com.nwalsh.saxon.Callout; * ndw@nwalsh.com * * @see Verbatim - * - * @version $Id$ - **/ + */ public abstract class FormatCallout { protected static final String foURI = "http://www.w3.org/1999/XSL/Format"; diff --git a/xsl-saxon/src/com/nwalsh/saxon/FormatGraphicCallout.java b/xsl-saxon/src/com/nwalsh/saxon/FormatGraphicCallout.java index fde0409ce..9dcc36115 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/FormatGraphicCallout.java +++ b/xsl-saxon/src/com/nwalsh/saxon/FormatGraphicCallout.java @@ -13,8 +13,6 @@ import com.nwalsh.saxon.Callout; /** *

Utility class for the Verbatim extension (ignore this).

* - *

$Id$

- * *

Copyright (C) 2000, 2001 Norman Walsh.

* *

Change Log:

@@ -27,9 +25,7 @@ import com.nwalsh.saxon.Callout; * ndw@nwalsh.com * * @see Verbatim - * - * @version $Id$ - **/ + */ public class FormatGraphicCallout extends FormatCallout { String graphicsPath = ""; diff --git a/xsl-saxon/src/com/nwalsh/saxon/FormatTextCallout.java b/xsl-saxon/src/com/nwalsh/saxon/FormatTextCallout.java index 4de640585..ee6b48a8f 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/FormatTextCallout.java +++ b/xsl-saxon/src/com/nwalsh/saxon/FormatTextCallout.java @@ -8,8 +8,6 @@ import com.nwalsh.saxon.Callout; /** *

Utility class for the Verbatim extension (ignore this).

* - *

$Id$

- * *

Copyright (C) 2000, 2001 Norman Walsh.

* *

Change Log:

@@ -22,9 +20,7 @@ import com.nwalsh.saxon.Callout; * ndw@nwalsh.com * * @see Verbatim - * - * @version $Id$ - **/ + */ public class FormatTextCallout extends FormatCallout { public FormatTextCallout(NamePool nPool, boolean fo, boolean xhtml) { diff --git a/xsl-saxon/src/com/nwalsh/saxon/FormatUnicodeCallout.java b/xsl-saxon/src/com/nwalsh/saxon/FormatUnicodeCallout.java index 90bf33c73..1b0318d1d 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/FormatUnicodeCallout.java +++ b/xsl-saxon/src/com/nwalsh/saxon/FormatUnicodeCallout.java @@ -12,8 +12,6 @@ import com.nwalsh.saxon.Callout; /** *

Utility class for the Verbatim extension (ignore this).

* - *

$Id$

- * *

Copyright (C) 2000, 2001 Norman Walsh.

* *

Change Log:

@@ -26,9 +24,7 @@ import com.nwalsh.saxon.Callout; * ndw@nwalsh.com * * @see Verbatim - * - * @version $Id$ - **/ + */ public class FormatUnicodeCallout extends FormatCallout { int unicodeMax = 0; diff --git a/xsl-saxon/src/com/nwalsh/saxon/ImageIntrinsics.java b/xsl-saxon/src/com/nwalsh/saxon/ImageIntrinsics.java index 167bc73a2..5787f82fd 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/ImageIntrinsics.java +++ b/xsl-saxon/src/com/nwalsh/saxon/ImageIntrinsics.java @@ -13,8 +13,6 @@ import java.util.StringTokenizer; /** *

Saxon extension to examine intrinsic size of images

* - *

$Id$

- * *

Copyright (C) 2002 Norman Walsh.

* *

This class provides a @@ -30,8 +28,6 @@ import java.util.StringTokenizer; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class ImageIntrinsics implements ImageObserver { boolean imageLoaded = false; diff --git a/xsl-saxon/src/com/nwalsh/saxon/LineCountEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/LineCountEmitter.java index eac346638..2b8dd14b2 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/LineCountEmitter.java +++ b/xsl-saxon/src/com/nwalsh/saxon/LineCountEmitter.java @@ -5,8 +5,6 @@ import com.icl.saxon.om.NamePool; /** *

Saxon extension to count the lines in a result tree fragment.

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -31,8 +29,6 @@ import com.icl.saxon.om.NamePool; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class LineCountEmitter extends com.icl.saxon.output.Emitter { /** The number of lines seen. */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/NumberLinesEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/NumberLinesEmitter.java index d9421c0b6..cd8249fa3 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/NumberLinesEmitter.java +++ b/xsl-saxon/src/com/nwalsh/saxon/NumberLinesEmitter.java @@ -9,8 +9,6 @@ import com.icl.saxon.tree.AttributeCollection; /** *

Saxon extension to decorate a result tree fragment with line numbers.

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides the guts of a @@ -39,8 +37,6 @@ import com.icl.saxon.tree.AttributeCollection; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class NumberLinesEmitter extends CopyEmitter { /** A stack for the preserving information about open elements. */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/Table.java b/xsl-saxon/src/com/nwalsh/saxon/Table.java index 5c151c342..9c3bed513 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/Table.java +++ b/xsl-saxon/src/com/nwalsh/saxon/Table.java @@ -15,8 +15,6 @@ import com.icl.saxon.functions.Extensions; /** *

Saxon extensions supporting Tables

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -48,8 +46,6 @@ import com.icl.saxon.functions.Extensions; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class Table { /** The number of pixels per inch */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/Text.java b/xsl-saxon/src/com/nwalsh/saxon/Text.java index 69de167f9..92adae429 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/Text.java +++ b/xsl-saxon/src/com/nwalsh/saxon/Text.java @@ -21,8 +21,6 @@ import com.icl.saxon.expr.Expression; /** *

Saxon extension element for inserting text * - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -38,8 +36,6 @@ import com.icl.saxon.expr.Expression; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class Text extends StyleElement { /** diff --git a/xsl-saxon/src/com/nwalsh/saxon/TextFactory.java b/xsl-saxon/src/com/nwalsh/saxon/TextFactory.java index 831f7d71e..8e2a98a9e 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/TextFactory.java +++ b/xsl-saxon/src/com/nwalsh/saxon/TextFactory.java @@ -7,8 +7,6 @@ import com.icl.saxon.style.ExtensionElementFactory; /** *

Saxon extension element factory * - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -25,8 +23,6 @@ import com.icl.saxon.style.ExtensionElementFactory; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * * @see Text * */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinks.java b/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinks.java index 9c63c8f05..e5e4f707a 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinks.java +++ b/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinks.java @@ -15,8 +15,6 @@ import com.nwalsh.saxon.UnwrapLinksEmitter; /** *

Saxon extension for unwrapping nested links

* - *

$Id$

- * *

Copyright (C) 2000, 2002 Norman Walsh.

* *

This class provides a @@ -32,8 +30,6 @@ import com.nwalsh.saxon.UnwrapLinksEmitter; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class UnwrapLinks { /** True if the stylesheet is producing formatting objects */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinksEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinksEmitter.java index 06c928b3e..46986672c 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinksEmitter.java +++ b/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinksEmitter.java @@ -9,8 +9,6 @@ import com.icl.saxon.tree.AttributeCollection; /** *

Saxon extension to unwrap links in a result tree fragment.

* - *

$Id$

- * *

Copyright (C) 2000, 2002 Norman Walsh.

* *

This class provides the guts of a @@ -35,8 +33,6 @@ import com.icl.saxon.tree.AttributeCollection; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class UnwrapLinksEmitter extends CopyEmitter { /** A stack for the preserving information about open elements. */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/Verbatim.java b/xsl-saxon/src/com/nwalsh/saxon/Verbatim.java index 33d7328ec..478e1f6bd 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/Verbatim.java +++ b/xsl-saxon/src/com/nwalsh/saxon/Verbatim.java @@ -17,8 +17,6 @@ import com.nwalsh.saxon.CalloutEmitter; /** *

Saxon extensions supporting DocBook verbatim environments

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -50,8 +48,6 @@ import com.nwalsh.saxon.CalloutEmitter; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class Verbatim { /** True if the stylesheet is producing formatting objects */ diff --git a/xsl-saxon/src/com/nwalsh/saxon/Windows1252.java b/xsl-saxon/src/com/nwalsh/saxon/Windows1252.java index 49b73e38b..3b6c02aa5 100644 --- a/xsl-saxon/src/com/nwalsh/saxon/Windows1252.java +++ b/xsl-saxon/src/com/nwalsh/saxon/Windows1252.java @@ -4,8 +4,6 @@ package com.nwalsh.saxon; import com.icl.saxon.charcode.PluggableCharacterSet; /** - * - * $Id$ * * File: Windows1252CharacterSet.java * Created: May 26 2004 diff --git a/xsl-webhelpindexer/Makefile b/xsl-webhelpindexer/Makefile index 92973d0d5..7ed24dbc1 100755 --- a/xsl-webhelpindexer/Makefile +++ b/xsl-webhelpindexer/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 7424 2007-09-01 10:59:59Z xmldoc $ - include ../buildtools/Makefile.incl include ../releasetools/Variables.mk diff --git a/xsl-xalan/INSTALL b/xsl-xalan/INSTALL index dd376aae3..01f4f0f9f 100644 --- a/xsl-xalan/INSTALL +++ b/xsl-xalan/INSTALL @@ -1,5 +1,3 @@ -$Id: INSTALL 7275 2007-08-23 04:49:53Z xmldoc $ - INSTALL file for the DocBook Xalan extensions ---------------------------------------------------------------------- diff --git a/xsl-xalan/Makefile b/xsl-xalan/Makefile index 38e63b64f..759ad9d22 100644 --- a/xsl-xalan/Makefile +++ b/xsl-xalan/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 7296 2007-08-28 09:16:40Z xmldoc $ - include ../buildtools/Makefile.incl include ../releasetools/Variables.mk diff --git a/xsl-xalan/README b/xsl-xalan/README index a05052d88..b508b1766 100644 --- a/xsl-xalan/README +++ b/xsl-xalan/README @@ -1,7 +1,6 @@ ---------------------------------------------------------------------- README file for the DocBook Xalan Extensions ---------------------------------------------------------------------- -$Id: README 7275 2007-08-23 04:49:53Z xmldoc $ These are Java extensions for use with the DocBook XML stylesheets and the Xalan-Java XSLT engine. diff --git a/xsl-xalan/src/com/nwalsh/xalan/CVS.java b/xsl-xalan/src/com/nwalsh/xalan/CVS.java index 10a88387a..bacf93b54 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/CVS.java +++ b/xsl-xalan/src/com/nwalsh/xalan/CVS.java @@ -7,8 +7,6 @@ import java.util.TimeZone; /** *

Xalan extension to convert CVS date strings into local time

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -32,8 +30,6 @@ import java.util.TimeZone; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class CVS { /** diff --git a/xsl-xalan/src/com/nwalsh/xalan/Callout.java b/xsl-xalan/src/com/nwalsh/xalan/Callout.java index 1da0afd58..d828dc0f4 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/Callout.java +++ b/xsl-xalan/src/com/nwalsh/xalan/Callout.java @@ -5,8 +5,6 @@ import org.w3c.dom.Element; /** *

Utility class for the Verbatim extension (ignore this).

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class is just for book keeping in the Verbatim class. @@ -27,9 +25,7 @@ import org.w3c.dom.Element; * ndw@nwalsh.com * * @see Verbatim - * - * @version $Id$ - * */ + */ public class Callout implements Comparable { /** The callout number. */ private int callout = 0; diff --git a/xsl-xalan/src/com/nwalsh/xalan/FormatCallout.java b/xsl-xalan/src/com/nwalsh/xalan/FormatCallout.java index ac03f6e42..56918604b 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/FormatCallout.java +++ b/xsl-xalan/src/com/nwalsh/xalan/FormatCallout.java @@ -9,8 +9,6 @@ import com.nwalsh.xalan.Callout; /** *

Utility class for the Verbatim extension (ignore this).

* - *

$Id$

- * *

Copyright (C) 2000, 2001 Norman Walsh.

* *

Change Log:

@@ -23,8 +21,6 @@ import com.nwalsh.xalan.Callout; * ndw@nwalsh.com * * @see Verbatim - * - * @version $Id$ **/ public abstract class FormatCallout { diff --git a/xsl-xalan/src/com/nwalsh/xalan/FormatDingbatCallout.java b/xsl-xalan/src/com/nwalsh/xalan/FormatDingbatCallout.java index a27469fcf..ff36be39a 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/FormatDingbatCallout.java +++ b/xsl-xalan/src/com/nwalsh/xalan/FormatDingbatCallout.java @@ -11,8 +11,6 @@ import com.nwalsh.xalan.Callout; /** *

Utility class for the Verbatim extension (ignore this).

* - *

$Id$

- * *

Copyright (C) 2000, 2001 Norman Walsh.

* *

Change Log:

@@ -25,8 +23,6 @@ import com.nwalsh.xalan.Callout; * ndw@nwalsh.com * * @see Verbatim - * - * @version $Id$ **/ public class FormatDingbatCallout extends FormatCallout { diff --git a/xsl-xalan/src/com/nwalsh/xalan/FormatGraphicCallout.java b/xsl-xalan/src/com/nwalsh/xalan/FormatGraphicCallout.java index f3b03ffbb..6af0f551a 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/FormatGraphicCallout.java +++ b/xsl-xalan/src/com/nwalsh/xalan/FormatGraphicCallout.java @@ -12,8 +12,6 @@ import com.nwalsh.xalan.Callout; /** *

Utility class for the Verbatim extension (ignore this).

* - *

$Id$

- * *

Copyright (C) 2000, 2001 Norman Walsh.

* *

Change Log:

@@ -26,9 +24,7 @@ import com.nwalsh.xalan.Callout; * ndw@nwalsh.com * * @see Verbatim - * - * @version $Id$ - **/ + */ public class FormatGraphicCallout extends FormatCallout { String graphicsPath = ""; diff --git a/xsl-xalan/src/com/nwalsh/xalan/FormatTextCallout.java b/xsl-xalan/src/com/nwalsh/xalan/FormatTextCallout.java index 504faba60..0c9191f51 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/FormatTextCallout.java +++ b/xsl-xalan/src/com/nwalsh/xalan/FormatTextCallout.java @@ -6,8 +6,6 @@ import com.nwalsh.xalan.Callout; /** *

Utility class for the Verbatim extension (ignore this).

* - *

$Id$

- * *

Copyright (C) 2000, 2001 Norman Walsh.

* *

Change Log:

@@ -20,8 +18,6 @@ import com.nwalsh.xalan.Callout; * ndw@nwalsh.com * * @see Verbatim - * - * @version $Id$ **/ public class FormatTextCallout extends FormatCallout { diff --git a/xsl-xalan/src/com/nwalsh/xalan/FormatUnicodeCallout.java b/xsl-xalan/src/com/nwalsh/xalan/FormatUnicodeCallout.java index 6d7d487f4..96fec9fa9 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/FormatUnicodeCallout.java +++ b/xsl-xalan/src/com/nwalsh/xalan/FormatUnicodeCallout.java @@ -11,8 +11,6 @@ import com.nwalsh.xalan.Callout; /** *

Utility class for the Verbatim extension (ignore this).

* - *

$Id$

- * *

Copyright (C) 2000, 2001 Norman Walsh.

* *

Change Log:

@@ -25,8 +23,6 @@ import com.nwalsh.xalan.Callout; * ndw@nwalsh.com * * @see Verbatim - * - * @version $Id$ **/ public class FormatUnicodeCallout extends FormatCallout { diff --git a/xsl-xalan/src/com/nwalsh/xalan/ImageIntrinsics.java b/xsl-xalan/src/com/nwalsh/xalan/ImageIntrinsics.java index 9dffb0c61..0228a3110 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/ImageIntrinsics.java +++ b/xsl-xalan/src/com/nwalsh/xalan/ImageIntrinsics.java @@ -14,8 +14,6 @@ import org.apache.xalan.extensions.ExpressionContext; /** *

Xalan extension to examine intrinsic size of images

* - *

$Id$

- * *

Copyright (C) 2002 Norman Walsh.

* *

This class provides a @@ -31,8 +29,6 @@ import org.apache.xalan.extensions.ExpressionContext; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class ImageIntrinsics implements ImageObserver { boolean imageLoaded = false; diff --git a/xsl-xalan/src/com/nwalsh/xalan/Table.java b/xsl-xalan/src/com/nwalsh/xalan/Table.java index fefc74d48..ce0511a8b 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/Table.java +++ b/xsl-xalan/src/com/nwalsh/xalan/Table.java @@ -27,8 +27,6 @@ import org.xml.sax.helpers.AttributesImpl; /** *

Xalan extensions supporting Tables

* - *

$Id$

- * *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a @@ -60,8 +58,6 @@ import org.xml.sax.helpers.AttributesImpl; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class Table { /** The number of pixels per inch */ diff --git a/xsl-xalan/src/com/nwalsh/xalan/Text.java b/xsl-xalan/src/com/nwalsh/xalan/Text.java index 3e6b4bf0f..b5fc1dcdb 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/Text.java +++ b/xsl-xalan/src/com/nwalsh/xalan/Text.java @@ -22,8 +22,6 @@ import org.apache.xalan.transformer.TransformerImpl; /** *

Xalan extension element for inserting text * - *

$Id$

- * *

Copyright (C) 2001 Norman Walsh.

* *

This class provides a @@ -39,8 +37,6 @@ import org.apache.xalan.transformer.TransformerImpl; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class Text { /** diff --git a/xsl-xalan/src/com/nwalsh/xalan/Verbatim.java b/xsl-xalan/src/com/nwalsh/xalan/Verbatim.java index 8b868ea70..819ec3d17 100644 --- a/xsl-xalan/src/com/nwalsh/xalan/Verbatim.java +++ b/xsl-xalan/src/com/nwalsh/xalan/Verbatim.java @@ -31,8 +31,6 @@ import com.nwalsh.xalan.Params; /** *

Xalan extensions supporting DocBook verbatim environments

* - *

$Id$

- * *

Copyright (C) 2001 Norman Walsh.

* *

This class provides a @@ -64,8 +62,6 @@ import com.nwalsh.xalan.Params; * @author Norman Walsh * ndw@nwalsh.com * - * @version $Id$ - * */ public class Verbatim { /** A stack to hold the open elements while walking through a RTF. */ diff --git a/xsl/.make-catalog.xsl b/xsl/.make-catalog.xsl index b4d892bb0..c35b1b6f1 100644 --- a/xsl/.make-catalog.xsl +++ b/xsl/.make-catalog.xsl @@ -6,10 +6,6 @@ - - diff --git a/xsl/INSTALL b/xsl/INSTALL index 218cc3913..c98f3d7e6 100644 --- a/xsl/INSTALL +++ b/xsl/INSTALL @@ -1,4 +1,3 @@ -$Id$ INSTALL file for the DocBook XSL stylesheets distribution diff --git a/xsl/Makefile b/xsl/Makefile index 8cc7ad33e..ec68c66bf 100644 --- a/xsl/Makefile +++ b/xsl/Makefile @@ -21,7 +21,7 @@ DISTRIB_DEPENDS = doc docsrc install.sh RELEASE-NOTES.txt extensions tests # value of RELEASE_DEPENDS is a space-separated list of any # targets for this distro's "release" target to depend on -RELEASE_DEPENDS = check RELEASE-NOTES.pdf RELEASE-NOTES-PARTIAL.txt +RELEASE_DEPENDS = RELEASE-NOTES.pdf RELEASE-NOTES-PARTIAL.txt # value of RELEASE_CLEAN_TARGETS is any distro-specific targets # that should be run when the release-clean target is called @@ -70,23 +70,8 @@ DIRS=common lib html fo manpages htmlhelp javahelp eclipse roundtrip slides webs .PHONY: distrib clean doc docsrc xhtml all: base -# If you're annoyed about getting the reminder that it's possible -# to use xsltproc to build, delete the following conditional from -# this makefile. -ifeq (,$(findstring xsltproc,$(XSLT))) - @echo - @echo "-----------------------------------------------------------------" - @echo " To build using xsltproc, run make as follows:" - @echo " make XSLTENGINE=\"xsltproc\"" - @echo "-----------------------------------------------------------------" -endif - base: - for i in $(DIRS) __bogus__; do \ - if [ $$i != __bogus__ ] ; then \ - echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \ - fi \ - done + for d in $(DIRS) ; do $(MAKE) -C $$d; done xhtml: $(MAKE) -C xhtml @@ -99,11 +84,7 @@ doc: docsrc $(MAKE) -C doc RELVER=$(RELVER) clean: - for i in $(DIRS) __bogus__; do \ - if [ $$i != __bogus__ ] ; then \ - echo "$(MAKE) clean -C $$i"; $(MAKE) clean -C $$i; \ - fi \ - done + for d in $(DIRS) ; do $(MAKE) -C $$d clean; done $(MAKE) clean -C xhtml $(MAKE) clean -C xhtml-1_1 $(MAKE) clean -C doc diff --git a/xsl/Makefile.tests b/xsl/Makefile.tests index f665c41ae..8c0cef20a 100644 --- a/xsl/Makefile.tests +++ b/xsl/Makefile.tests @@ -1,4 +1,3 @@ -# $Id$ # # This makefile does a "smoketest" of stylesheets for various # output formats in the DocBook XSL Stylesheets release package. @@ -39,7 +38,11 @@ TMP_OUTPUT_DIR=/tmp/smoketest-output/ # SMOKETEST_CLEAN_TARGET; e.g. "make check SMOKETEST_CLEAN_TARGET=''" SMOKETEST_CLEAN_TARGET=smoketest-clean -check: smoketest-make-tmp-dir smoketest-normal smoketest-normal-profile smoketest-chunk smoketest-chunk-profile smoketest-man smoketest-man-profile smoketest-two-profile $(SMOKETEST_CLEAN_TARGET) +check: tests smoketest-make-tmp-dir smoketest-normal smoketest-normal-profile smoketest-chunk smoketest-chunk-profile smoketest-man smoketest-man-profile smoketest-two-profile $(SMOKETEST_CLEAN_TARGET) + +.PHONY: tests +tests: + $(MAKE) -C tests smoketest-make-tmp-dir: $(RM) -r $(TMP_OUTPUT_DIR) diff --git a/xsl/README b/xsl/README index 4591e00f9..5aff5dc8f 100644 --- a/xsl/README +++ b/xsl/README @@ -1,7 +1,6 @@ ---------------------------------------------------------------------- README file for the DocBook XSL Stylesheets ---------------------------------------------------------------------- -$Id$ These are XSL stylesheets for transforming DocBook XML document instances into various output formats. diff --git a/xsl/README.BUILD b/xsl/README.BUILD index 7b7971e5e..eabe1155e 100644 --- a/xsl/README.BUILD +++ b/xsl/README.BUILD @@ -1,5 +1,3 @@ -$Id$ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The DocBook XSL Stylesheets release build has been tested under the bash shell on Linux, Darwin/OSX with MacPorts, and Cygwin. You diff --git a/xsl/VERSION b/xsl/VERSION index 2f6331c40..df91c5470 100644 --- a/xsl/VERSION +++ b/xsl/VERSION @@ -26,7 +26,7 @@ XSL Stylesheets - 1.79.1 + snapshot diff --git a/xsl/VERSION.xsl b/xsl/VERSION.xsl index 2f6331c40..df91c5470 100644 --- a/xsl/VERSION.xsl +++ b/xsl/VERSION.xsl @@ -26,7 +26,7 @@ XSL Stylesheets - 1.79.1 + snapshot diff --git a/xsl/assembly/assemble.xsl b/xsl/assembly/assemble.xsl index 4766a2043..cd28c1b9b 100644 --- a/xsl/assembly/assemble.xsl +++ b/xsl/assembly/assemble.xsl @@ -7,8 +7,6 @@ exclude-result-prefixes="exsl d xlink" version="1.0"> - - diff --git a/xsl/assembly/topic-maker-chunk.xsl b/xsl/assembly/topic-maker-chunk.xsl index a91ef50ff..8f411dd03 100644 --- a/xsl/assembly/topic-maker-chunk.xsl +++ b/xsl/assembly/topic-maker-chunk.xsl @@ -5,10 +5,6 @@ version="1.0" exclude-result-prefixes="exsl"> - diff --git a/xsl/assembly/topic-maker.xsl b/xsl/assembly/topic-maker.xsl index b705aca05..5938e53fa 100644 --- a/xsl/assembly/topic-maker.xsl +++ b/xsl/assembly/topic-maker.xsl @@ -6,8 +6,6 @@ exclude-result-prefixes="exsl" version="1.0"> - - diff --git a/xsl/common/autoidx-kimber.xsl b/xsl/common/autoidx-kimber.xsl index 0daa3ef01..8e54cc74f 100644 --- a/xsl/common/autoidx-kimber.xsl +++ b/xsl/common/autoidx-kimber.xsl @@ -13,8 +13,6 @@ exclude-result-prefixes="k"> diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl index d76c9d6ac..b326f0ced 100644 --- a/xsl/common/common.xsl +++ b/xsl/common/common.xsl @@ -11,8 +11,6 @@ version='1.0'> diff --git a/xsl/common/entities.ent b/xsl/common/entities.ent index fce53023b..8ad134295 100644 --- a/xsl/common/entities.ent +++ b/xsl/common/entities.ent @@ -1,6 +1,4 @@ diff --git a/xsl/common/stripns.xsl b/xsl/common/stripns.xsl index 4b8c1b8a3..6e6d8c039 100644 --- a/xsl/common/stripns.xsl +++ b/xsl/common/stripns.xsl @@ -10,8 +10,6 @@ version='1.0'> diff --git a/xsl/doc/README b/xsl/doc/README index ddd9aebe7..78ea8e3c2 100644 --- a/xsl/doc/README +++ b/xsl/doc/README @@ -1,7 +1,6 @@ ---------------------------------------------------------------------- README file for the DocBook XSL Stylesheets reference documentation ---------------------------------------------------------------------- -$Id$ This is generated reference documentation for the DocBook XSL stylesheets, primarily documentation on the parameters you can diff --git a/xsl/docsrc/reference.css b/xsl/docsrc/reference.css index fe735f3a5..8ce7c75f9 100644 --- a/xsl/docsrc/reference.css +++ b/xsl/docsrc/reference.css @@ -1,6 +1,5 @@ /* reference.css, a stylesheet for reference documentation * generated by the DocBook XSL Stylesheets */ -/* $Id$ */ div.legalnotice { font-size: 80%; diff --git a/xsl/docsrc/reference.xml b/xsl/docsrc/reference.xml index 36590dc81..32a86e546 100644 --- a/xsl/docsrc/reference.xml +++ b/xsl/docsrc/reference.xml @@ -15,7 +15,7 @@ DocBook XSL Stylesheets: Reference Documentation - $Id$ + diff --git a/xsl/eclipse/eclipse.xsl b/xsl/eclipse/eclipse.xsl index bae6411fd..a5e2d36c0 100644 --- a/xsl/eclipse/eclipse.xsl +++ b/xsl/eclipse/eclipse.xsl @@ -9,8 +9,6 @@ - diff --git a/xsl/epub3/chunkfast.xsl b/xsl/epub3/chunkfast.xsl index 8ec9550e6..39563ec4a 100644 --- a/xsl/epub3/chunkfast.xsl +++ b/xsl/epub3/chunkfast.xsl @@ -4,8 +4,6 @@ - diff --git a/xsl/epub3/epub3-chunk-mods.xsl b/xsl/epub3/epub3-chunk-mods.xsl index 7aa690122..66d524626 100644 --- a/xsl/epub3/epub3-chunk-mods.xsl +++ b/xsl/epub3/epub3-chunk-mods.xsl @@ -14,8 +14,6 @@ exclude-result-prefixes="exsl dc ncx opf stext str xtext" version="1.0"> - - diff --git a/xsl/epub3/epub3-element-mods.xsl b/xsl/epub3/epub3-element-mods.xsl index 5fb1021c8..533761af4 100644 --- a/xsl/epub3/epub3-element-mods.xsl +++ b/xsl/epub3/epub3-element-mods.xsl @@ -29,8 +29,6 @@ exclude-result-prefixes="#default cf date db dc dcterms epub exsl m ncx opf pls set ssml stext str svg xtext" version="1.0"> - - diff --git a/xsl/epub3/profile-chunk.xsl b/xsl/epub3/profile-chunk.xsl index 64ed1fedd..6c9e3c326 100644 --- a/xsl/epub3/profile-chunk.xsl +++ b/xsl/epub3/profile-chunk.xsl @@ -4,8 +4,6 @@ - diff --git a/xsl/fo/fop1.xsl b/xsl/fo/fop1.xsl index 8272957a4..d79b2bdb5 100644 --- a/xsl/fo/fop1.xsl +++ b/xsl/fo/fop1.xsl @@ -5,8 +5,6 @@ version='1.0'> - - diff --git a/xsl/html/qandaset.xsl b/xsl/html/qandaset.xsl index b8bc2f9ec..72aff24c3 100644 --- a/xsl/html/qandaset.xsl +++ b/xsl/html/qandaset.xsl @@ -5,8 +5,6 @@ version='1.0'> - diff --git a/xsl/htmlhelp/htmlhelp.xsl b/xsl/htmlhelp/htmlhelp.xsl index aa0e7c74d..f3380656c 100644 --- a/xsl/htmlhelp/htmlhelp.xsl +++ b/xsl/htmlhelp/htmlhelp.xsl @@ -7,8 +7,6 @@ exclude-result-prefixes="doc exsl set"> diff --git a/xsl/roundtrip/dbk2ooo.xsl b/xsl/roundtrip/dbk2ooo.xsl index 8f18b7895..06258657c 100644 --- a/xsl/roundtrip/dbk2ooo.xsl +++ b/xsl/roundtrip/dbk2ooo.xsl @@ -31,8 +31,6 @@ - - - - diff --git a/xsl/roundtrip/pages2normalise.xsl b/xsl/roundtrip/pages2normalise.xsl index e8ea078a8..131856008 100644 --- a/xsl/roundtrip/pages2normalise.xsl +++ b/xsl/roundtrip/pages2normalise.xsl @@ -13,8 +13,6 @@ - - - - - - - - diff --git a/xsl/roundtrip/wordml2normalise.xsl b/xsl/roundtrip/wordml2normalise.xsl index 901fcc914..bfadfac4c 100644 --- a/xsl/roundtrip/wordml2normalise.xsl +++ b/xsl/roundtrip/wordml2normalise.xsl @@ -20,8 +20,6 @@ - diff --git a/xsl/slides/schema/relaxng/Makefile b/xsl/slides/schema/relaxng/Makefile index 817734043..5fffd33ba 100644 --- a/xsl/slides/schema/relaxng/Makefile +++ b/xsl/slides/schema/relaxng/Makefile @@ -6,6 +6,4 @@ all: slides.rng trang $< $@ clean: - -maintainer-clean: clean - rm -f slides.rng + rm -f *.rng diff --git a/xsl/slides/schema/relaxng/slides.rnc b/xsl/slides/schema/relaxng/slides.rnc index c876b148f..bd697367b 100644 --- a/xsl/slides/schema/relaxng/slides.rnc +++ b/xsl/slides/schema/relaxng/slides.rnc @@ -9,8 +9,6 @@ default namespace dbs = "http://docbook.org/ns/docbook-slides" # # Copyright 2012 Gabor Kovesdan # -# Release: $Id$ -# # Permission to use, copy, modify and distribute the DocBook Slides # schema and its accompanying documentation for any purpose and without # fee is hereby granted in perpetuity, provided that the above copyright diff --git a/xsl/slides/schema/xsd/Makefile b/xsl/slides/schema/xsd/Makefile index b3c2f54ef..dfd897cc1 100644 --- a/xsl/slides/schema/xsd/Makefile +++ b/xsl/slides/schema/xsd/Makefile @@ -6,6 +6,4 @@ slides.xsd: ../relaxng/slides.rnc trang $< $@ clean: - -maintainer-clean: clean - rm -f *.xsd + rm -rf *.xsd diff --git a/xsl/slides/xhtml/Makefile.param b/xsl/slides/xhtml/Makefile.param index 127c0d532..c2a839280 100644 --- a/xsl/slides/xhtml/Makefile.param +++ b/xsl/slides/xhtml/Makefile.param @@ -1,26 +1 @@ -PARAMS=../../params/disable.collapsible.xml \ - ../../params/disable.incremental.xml \ - ../../params/generate.copyright.xml \ - ../../params/generate.foilgroup.numbered.toc.xml \ - ../../params/generate.foilgroup.toc.xml \ - ../../params/generate.handoutnotes.xml \ - ../../params/generate.pubdate.xml \ - ../../params/generate.speakernotes.xml \ - ../../params/generate.titlepage.xml \ - ../../params/mml.embedding.mode.xml \ - ../../params/svg.embedding.mode.xml \ - ../../params/user.css.xml \ - ../../params/wrap.slidecontent.xml \ - ../../params/s5.controls.xml \ - ../../params/s5.defaultview.xml \ - ../../params/s5.opera.css.xml \ - ../../params/s5.outline.css.xml \ - ../../params/s5.path.prefix.xml \ - ../../params/s5.print.css.xml \ - ../../params/s5.slides.css.xml \ - ../../params/s5.slides.js.xml \ - ../../params/slidy.duration.xml \ - ../../params/slidy.path.prefix.xml \ - ../../params/slidy.slidy.css.xml \ - ../../params/slidy.slidy.js.xml \ - ../../params/slidy.user.css.xml +# foo diff --git a/xsl/slides/xhtml/param.xweb b/xsl/slides/xhtml/param.xweb index a0d5c6391..0cfb6e591 100644 --- a/xsl/slides/xhtml/param.xweb +++ b/xsl/slides/xhtml/param.xweb @@ -10,7 +10,6 @@ Slides XHTML Parameter Reference -$Id$ @@ -110,8 +109,6 @@ around all these parameters. - #include <varargs.h> -#include <mouteyh.h> -#include <qlmppzj.h> - - float rand - - - - - int max - - - - - int idiv - int n - int m - - - - Another. - - - - void qsort - void *dataptr[] - int left - int right - int (*comp) - void *, void * - - - - - - int foo_frob_something - foo_sometype1 foo_frob_parm1 - foo_sometype1 foo_frob_parm2 - foo_sometype1 foo_frob_parm3 - int (* parm4 ) - int a, int b, int c - - foo_sometype1 foo_frob_parm5 - - - - int foo_frob_something - foo_sometype1 foo_frob_parm1 - foo_sometype1 foo_frob_parm2 - foo_sometype1 foo_frob_parm3 - int (* parm4 ) - int a, int b, int c - - foo_sometype1 foo_frob_parm5 - - - - -Description - -This is a minimal RefEntry. - -The following is a Variablelist with a title. -My variablelist - - - varlistentry term 1 - some listitem text - - - varlistentry term 2 - some more listitem text - - - -Subsection - -This is a minimal RefEntry. - -The following is a Variablelist with a title and a nested variablelist - - - - glossentry term 1 - some glossdef text - - - glossentry term 2 - - - - nested variablelist term 1 - some variablelist text - - - nested variablelist term 2 - some more variablelist text - - - - - - - -Sub-subsection - -This is a minimal RefEntry. - - - - -More Description - -This is a not-so minimal RefEntry. - -This is a screen [break here] -that starts with a line of space. [break here] -And it ends with a line of space. - - -normal paragraph here - -This is a screen [break here] -that does not start with a line of space. [break here] -And does not end with a line of space. - -This is a normal paragraph that contains a screen. -This is a screen within a normal paragraph [break here] -that does not start with a line of space. [break here] -And does not end with a line of space but is followed -by a line of space. - - -This is another normal paragraph that contains a screen. -This is a screen within a normal paragraph [break here] -that does not start with a line of space. [break here] -And does not end with a line of space and is not followed -by a line of space. - -This is another normal paragraph that contains a screen. - -This is a screen within a normal paragraph [break here] -that starts with a line of space. [break here] -And ends with a line of space but is not followed by a line of space. - - -This is another normal paragraph that contains a screen. - -This is a screen within a normal paragraph [break here] -that starts with a line of space. [break here] -And ends with a line of space and is followed by a line of space. - - - -This is another normal paragraph that contains a screen. - - -This is a screen within a normal paragraph [break here] -that starts with a 2 lines of space. [break here] -And ends with 3 lines of space and is followed by a line of space. - - - - - -This paragraph contains an itemizedlist with a title. The title -is “Mrignkwolmcng”. -Mrignkwolmcng - - - itemizedlist listitem 1 - - - itemizedlist listitem 2 - - - -This is some useless text that follows the “Mrignkwolmcng” orderedlist -in the same para. - -The following is a Variablelist with a title and with a nested itemizedlist. -My variablelist - - - varlistentry term 1 - - nested itemizedlist - - - itemizedlist listitem 1 - - - itemizedlist listitem 2 - - - - - - varlistentry term 2 - some more listitem text - - - - -The following is a Variablelist with a title and with a -nested Varlistentry that contains multiple Terms -My nested-multi-term-per-varlistentry variablelist - - - Varlistentry term 1 - - - - varlistentry term 1.1 - varlistentry term 1.2 - varlistentry term 1.3 - All 'bout terms 1.1, 1.2, and 1.3 - - - - - - - varlistentry term 2 - some more listitem text - - - - -Subsection - -This is a minimal RefEntry. - - - -Even More Description - -This is an even less minimal RefEntry. - -This is a paragraph. It contains the following segmentedlist, -titled “Gibbererish”, with several segtitle elements. - - - Floober - Buugler - Sstangooo - Borobinda - - Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda - Mondorotoluafu - Ganafutralinga - Patagularamakundra - - - Cadraracondar - Hentirotomaambu - BdomentriolaiaBdomentriolaiaBdomentriolaia - Candamalaturuanio - - -This is some text that follows the segementedlist within the same -paragraph. The next part of this same paragraph is an -important admonition. - - It is very important that you read this. That’s why it stands - out the way that it does. - - - -This is a para with a footnote - Stuff here This is a program listing -that's two lines long. - and stuff after the -footnote - - - - - diff --git a/xsl/tests/refentry.007.xml b/xsl/tests/refentry.007.xml deleted file mode 100644 index 452137631..000000000 --- a/xsl/tests/refentry.007.xml +++ /dev/null @@ -1,340 +0,0 @@ - - - - -Unit Test: refentry.007 -$Id: refentry.007.xml 7282 2007-08-23 09:27:01Z xmldoc $ -NormanWalsh -

ndw@nwalsh.com
- - - -Reference - - - - - NormanWalsh - ndw@nwalsh.com - - Wrote the original version of this document. - - - - Added a bunch of test cases. - Michael(tm)Smith - smith@sideshowbarker.net - - - - 2003 - Norman Walsh - - - 2006 - Michael(tm) Smith - - - This file is a product of the DocBook Project. - - - Share and share alike. - - - -FirstName -SecondName -Purpose for FirstName - - - -ThirdName -Purpose for ThirdName - - - - - - - #include <varargs.h> -#include <mouteyh.h> -#include <qlmppzj.h> - - float rand - - - - - int max - - - - - int idiv - int n - int m - - - - Another. - - - - void qsort - void *dataptr[] - int left - int right - int (*comp) - void *, void * - - - - - - int foo_frob_something - foo_sometype1 foo_frob_parm1 - foo_sometype1 foo_frob_parm2 - foo_sometype1 foo_frob_parm3 - int (* parm4 ) - int a, int b, int c - - foo_sometype1 foo_frob_parm5 - - - - int foo_frob_something - foo_sometype1 foo_frob_parm1 - foo_sometype1 foo_frob_parm2 - foo_sometype1 foo_frob_parm3 - int (* parm4 ) - int a, int b, int c - - foo_sometype1 foo_frob_parm5 - - - - - -Description -This is a minimal RefEntry. - -The following is a Variablelist with a title. - - My variablelist - - varlistentry term 1 - some listitem text - - - varlistentry term 2 - some more listitem text - - - - -Subsection -This is a minimal RefEntry. - -The following is a Variablelist with a title and a nested variablelist - - My glosslist - - glossentry term 1 - some glossdef text - - - glossentry term 2 - - - - nested variablelist term 1 - some variablelist text - - - nested variablelist term 2 - some more variablelist text - - - - - - - - -Sub-subsection -This is a minimal RefEntry. - - - - - -More Description -This is a not-so minimal RefEntry. - -This is a screen [break here] -that starts with a line of space. [break here] -And it ends with a line of space. - - -normal paragraph here - -This is a screen [break here] -that does not start with a line of space. [break here] -And does not end with a line of space. - -This is a normal paragraph that contains a screen. -This is a screen within a normal paragraph [break here] -that does not start with a line of space. [break here] -And does not end with a line of space but is followed -by a line of space. - - -This is another normal paragraph that contains a screen. -This is a screen within a normal paragraph [break here] -that does not start with a line of space. [break here] -And does not end with a line of space and is not followed -by a line of space. - -This is another normal paragraph that contains a screen. - -This is a screen within a normal paragraph [break here] -that starts with a line of space. [break here] -And ends with a line of space but is not followed by a line of space. - - -This is another normal paragraph that contains a screen. - -This is a screen within a normal paragraph [break here] -that starts with a line of space. [break here] -And ends with a line of space and is followed by a line of space. - - - -This is another normal paragraph that contains a screen. - - -This is a screen within a normal paragraph [break here] -that starts with a 2 lines of space. [break here] -And ends with 3 lines of space and is followed by a line of space. - - - - - -This paragraph contains an itemizedlist with a title. The title -is “Mrignkwolmcng”. - - Mrignkwolmcng - - itemizedlist listitem 1 - - - itemizedlist listitem 2 - - - -This is some useless text that follows the “Mrignkwolmcng” orderedlist -in the same para. - -The following is a Variablelist with a title and with a nested itemizedlist. - - My variablelist - - varlistentry term 1 - - - nested itemizedlist - - itemizedlist listitem 1 - - - itemizedlist listitem 2 - - - - - - varlistentry term 2 - some more listitem text - - - - -The following is a Variablelist with a title and with a -nested Varlistentry that contains multiple Terms - - My nested-multi-term-per-varlistentry variablelist - - Varlistentry term 1 - - - - varlistentry term 1.1 - varlistentry term 1.2 - varlistentry term 1.3 - All 'bout terms 1.1, 1.2, and 1.3 - - - - - - - varlistentry term 2 - some more listitem text - - - - - -Subsection -This is a minimal RefEntry. - - - - -Even More Description -This is an even less minimal RefEntry. - -This is a paragraph. It contains the following segmentedlist, -titled “Gibbererish”, with several segtitle elements. - - Gibbererish - Floober - Buugler - Sstangooo - Borobinda - - Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda - Mondorotoluafu - Ganafutralinga - Patagularamakundra - - - Cadraracondar - Hentirotomaambu - BdomentriolaiaBdomentriolaiaBdomentriolaia - Candamalaturuanio - - -This is some text that follows the segementedlist within the same -paragraph. The next part of this same paragraph is an -important admonition. - - It is very important that you read this. That’s why it stands - out the way that it does. - - - -This is a para with a footnote - Stuff here This is a program listing -that's two lines long. - and stuff after the -footnote - - - - - diff --git a/xsl/tools/bin/docbook-xsl-update b/xsl/tools/bin/docbook-xsl-update index 6e762b55b..69507268c 100755 --- a/xsl/tools/bin/docbook-xsl-update +++ b/xsl/tools/bin/docbook-xsl-update @@ -2,7 +2,6 @@ # vim: number # docbook-xsl-update - Update environment to latest docbook-xsl snapshot -# $Id$ if [ -z $DOCBOOK_MIRROR ]; then myhost=docbook.xml-doc.org:5873; diff --git a/xsl/tools/xsl/build/db4-upgrade.xsl b/xsl/tools/xsl/build/db4-upgrade.xsl new file mode 100644 index 000000000..8ac210928 --- /dev/null +++ b/xsl/tools/xsl/build/db4-upgrade.xsl @@ -0,0 +1,1453 @@ + + + + + + + + + + + + + + + + + + + + + UNKNOWN + + + + + + + + + + + + Converted by db4-upgrade version + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + 1 + + + 0 + + + + + + + 1 + + + 0 + + + + + + + + Found title|subtitle|titleabbrev both inside and outside + . Moving all inside info element. + + + + + + + + + + + + + + + + + + + + + 1 + + + 0 + + + + + + + + + + Keeping one or more title elements before + + + + + + + + + + + + + + + + + + + + + Moving one or more title elements into + + + + + + + + + + + + + + + + + + + + + + + + + + + Discarding title from refentryinfo! + + + + + + + + Discarding titleabbrev from refentryinfo! + + + + + + + + Discarding subtitle from refentryinfo! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Convert equation without title to informal equation. + + + + + + + + + + + + + + + + + + + + + + + + Check conversion of srccredit + (othercredit="srccredit"). + + + + + ??? + + + + + + + + + + + + + + comment + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Converting invpartnumber to biblioid otherclass="invpartnumber". + + + + + + + + + + + + + + Converting contractsponsor to othercredit="contractsponsor". + + + + + + + + + + + + + + + + + + + + + Converting contractnum to othercredit="contractnum". + + + + + ??? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Check conversion of collabname + (orgname role="collabname"). + + + + + + + + + + + + Discarding modespec ( + + ). + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Check conversion of contrib + (othercontrib="contrib"). + + + + ??? + + + + + + + + + + + + + + + + + + + + Converting ulink to link. + + + + + + + + + + + + + + Converting ulink to uri. + + + + + + + + + + + + + + + + + + Discarding linkmode on olink. + + + + + + + + + Converting olink targetdocent to targetdoc. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -01- + + + + + -02- + + + + + -03- + + + + + -04- + + + + + -05- + + + + + -06- + + + + + -07- + + + + + -08- + + + + + -09- + + + + + -10- + + + + + -11- + + + + + -12- + + + + + + + + + + + + -01- + + + + + -02- + + + + + -03- + + + + + -04- + + + + + -05- + + + + + -06- + + + + + -07- + + + + + -08- + + + + + -09- + + + + + -10- + + + + + -11- + + + + + -12- + + + + + + + + + + + + + + + + + + Converted + + into + + for + + + + + + + + + + + + + + Unparseable date: + + in + + (Using default: + + ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Check + + title. + + + + + + + + Check + + title. + + + + + + + Check + + title. + + + + + + + + Removing title in refentryinfo. + + + + + + + + Removing + after info. Moved before or inside info. + + + + + + + + Removing + after blockinfo. Moved before or inside info. + + + + + + + + Removing + . Has been moved inside info. + + + + + + + + + + + + + + + + + + + CHECK abstract: removed from output (invalid location in 5.0). + + + + + + + + + + + + + + + significance + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + beginpage pagenum= + + + Replacing beginpage with comment + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CHECK OUTPUT: Found + inside + + + + + + + + + + + + + Replacing + inside + with phrase. + + + + + + + + + + + + + + CHECK OUTPUT: Converting + to phrase in + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + this-value-never-matches + + + + + + + + + + + + Discarding moreinfo on + + + + + + + + + + + + + + + + + + + + + + Discarding float on + + + + + + + Adding floatstyle='normal' on + + + + + normal + + + + + + + Discarding float on + + + + + + + + Discarding float on + + + + + + + Adding floatstyle=' + + ' on + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Converting refmiscinfo@role=type to + @class=other,otherclass=type + + + other + type + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ( + + ) + + + + diff --git a/xsl/tools/xsl/build/dblatex-release-notes.xsl b/xsl/tools/xsl/build/dblatex-release-notes.xsl index e545f7d06..55c0148e0 100644 --- a/xsl/tools/xsl/build/dblatex-release-notes.xsl +++ b/xsl/tools/xsl/build/dblatex-release-notes.xsl @@ -1,8 +1,6 @@ - diff --git a/xsl/xhtml5/chunkfast.xsl b/xsl/xhtml5/chunkfast.xsl index fd1be4d0d..39563ec4a 100644 --- a/xsl/xhtml5/chunkfast.xsl +++ b/xsl/xhtml5/chunkfast.xsl @@ -4,8 +4,6 @@ diff --git a/xsl/xhtml5/html5-chunk-mods.xsl b/xsl/xhtml5/html5-chunk-mods.xsl index 27426ac1a..b12f55730 100644 --- a/xsl/xhtml5/html5-chunk-mods.xsl +++ b/xsl/xhtml5/html5-chunk-mods.xsl @@ -6,8 +6,6 @@ exclude-result-prefixes="exsl" version="1.0"> - - diff --git a/xsl/xhtml5/onechunk.xsl b/xsl/xhtml5/onechunk.xsl index 92e887459..8b6a1d265 100644 --- a/xsl/xhtml5/onechunk.xsl +++ b/xsl/xhtml5/onechunk.xsl @@ -4,8 +4,6 @@