Skip to content

Commit

Permalink
4.1.1 Update changelog and version number
Browse files Browse the repository at this point in the history
This version adds countrts, cml bonds and fixes
DOCTYPE and file name / URL bugs.
  • Loading branch information
andreww committed Dec 6, 2011
1 parent fbc9fcf commit 45d42f5
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 23 deletions.
7 changes: 7 additions & 0 deletions Changelog
@@ -1,3 +1,10 @@
2011-12-05: version 4.1.1
Add new 'countrts' function to common
Add capability for wcml to handle bonds
Fix bug to allow 'empty' DOCTYPE names in SAX parser
Trap and report file name errors in SAX and DOM
Fix procedure name length and use statments in wkml

2010-02-09: version 4.1.0
Add wkml, a KML output module
Add invalid-pretty-print dom extension option
Expand Down
10 changes: 5 additions & 5 deletions DoX/FoX_DoX.html
Expand Up @@ -97,7 +97,7 @@ <h2>Other things</h2>
<a name="Versioning"/>
<h1>FoX versioning</h1>

<p>This documentation describes version 4.0 of the FoX library.</p>
<p>This documentation describes version 4.1 of the FoX library.</p>

<p>This version includes output modules for general XML, and for CML; and a fully validating XML parser, exposed through a Fortran version of the SAX2 input parser and a Fortran mapping of the W3C DOM interface.</p>

Expand Down Expand Up @@ -184,7 +184,7 @@ <h2>Testing</h2>

<p>To run them all, simply run <code>make check</code> from the top-level directory. This will run the individual testsuites, and collate their results.</p>

<p>If any failures occur (unrelated to known compiler issues, see the <a href="http://github.com/andreww/fox/issues">up-to-date list</a>), please send a message to the mailing list (<a href="m&#97;&#x69;&#108;&#x74;&#x6F;:&#x66;&#x6F;&#x78;&#x2D;d&#x69;&#x73;c&#117;&#x73;s&#64;&#x67;&#x6F;&#111;&#x67;&#x6C;&#101;&#103;&#114;&#111;&#x75;&#112;&#x73;.&#x63;&#x6F;m">&#x66;&#x6F;&#x78;&#x2D;d&#x69;&#x73;c&#117;&#x73;s&#64;&#x67;&#x6F;&#111;&#x67;&#x6C;&#101;&#103;&#114;&#111;&#x75;&#112;&#x73;.&#x63;&#x6F;m</a>) with details of compiler, hardware platform, and the nature of the failure.</p>
<p>If any failures occur (unrelated to known compiler issues, see the <a href="http://github.com/andreww/fox/issues">up-to-date list</a>), please send a message to the mailing list (<a href="&#109;&#x61;&#x69;&#108;&#x74;&#x6F;:&#x66;&#x6F;&#120;&#x2D;&#100;&#105;s&#99;&#x75;&#x73;&#115;&#64;&#x67;&#111;&#x6F;&#x67;&#108;&#x65;&#x67;&#114;&#111;&#x75;&#x70;&#x73;&#x2E;&#x63;&#x6F;&#x6D;">&#x66;&#x6F;&#120;&#x2D;&#100;&#105;s&#99;&#x75;&#x73;&#115;&#64;&#x67;&#111;&#x6F;&#x67;&#108;&#x65;&#x67;&#114;&#111;&#x75;&#x70;&#x73;&#x2E;&#x63;&#x6F;&#x6D;</a>) with details of compiler, hardware platform, and the nature of the failure.</p>

<p>The testsuites for the SAX and DOM libraries are very extensive, and are somewhat fragile, so are not distributed with FoX. Please contact the author for details.</p>

Expand Down Expand Up @@ -3653,9 +3653,9 @@ <h2>URI</h2>
<h1>Further information</h1>

<p>FoX evolved from the initial codebase of <a href="http://lcdx00.wm.lc.ehu.es/ag/xml/">xmlf90</a>,
which was written largely by Alberto Garcia &lt;<a href="&#x6D;&#x61;&#x69;&#x6C;&#x74;&#x6F;:&#97;&#x6C;&#x62;&#x65;&#114;&#x74;&#x6F;&#x67;&#64;i&#99;&#x6D;&#97;&#x62;&#46;&#101;&#115;">&#97;&#x6C;&#x62;&#x65;&#114;&#x74;&#x6F;&#x67;&#64;i&#99;&#x6D;&#97;&#x62;&#46;&#101;&#115;</a>> and Jon Wakelin &lt;<a href="&#109;&#97;&#105;&#x6C;&#x74;&#x6F;:j&#111;&#110;&#46;&#x77;&#97;&#x6B;&#101;&#108;&#x69;n&#64;b&#x72;&#x69;&#x73;&#116;&#111;&#108;&#x2E;&#x61;&#x63;&#x2E;&#117;&#107;">j&#111;&#110;&#46;&#x77;&#97;&#x6B;&#101;&#108;&#x69;n&#64;b&#x72;&#x69;&#x73;&#116;&#111;&#108;&#x2E;&#x61;&#x63;&#x2E;&#117;&#107;</a>>.</p>
which was written largely by Alberto Garcia &lt;<a href="&#109;&#97;&#105;&#108;t&#111;:a&#x6C;&#x62;&#101;&#114;&#x74;&#x6F;&#103;&#64;&#105;&#99;&#x6D;&#x61;&#x62;.&#101;&#115;">a&#x6C;&#x62;&#101;&#114;&#x74;&#x6F;&#103;&#64;&#105;&#99;&#x6D;&#x61;&#x62;.&#101;&#115;</a>> and Jon Wakelin &lt;<a href="&#x6D;&#x61;&#105;&#108;&#116;&#x6F;:&#106;&#x6F;&#110;&#x2E;&#119;&#x61;&#107;&#101;&#x6C;&#x69;&#x6E;&#64;&#x62;&#114;&#x69;&#115;&#x74;&#111;&#x6C;&#46;&#x61;&#x63;&#x2E;&#117;&#107;">&#106;&#x6F;&#110;&#x2E;&#119;&#x61;&#107;&#101;&#x6C;&#x69;&#x6E;&#64;&#x62;&#114;&#x69;&#115;&#x74;&#111;&#x6C;&#46;&#x61;&#x63;&#x2E;&#117;&#107;</a>>.</p>

<p>FoX is the work of Toby White &lt;<a href="&#x6D;&#97;&#x69;&#x6C;t&#x6F;:&#x74;ow&#64;&#x75;&#x73;&#x7A;&#108;&#97;&#x2E;&#x6D;&#x65;&#46;&#117;&#107;">&#x74;ow&#64;&#x75;&#x73;&#x7A;&#108;&#97;&#x2E;&#x6D;&#x65;&#46;&#117;&#107;</a>>, and all bug reports/complaints/bouquets of roses should be sent to him. Andrew Walker &lt;<a href="&#x6D;&#x61;&#105;&#108;&#x74;&#x6F;:&#x61;&#x6E;&#x64;&#114;&#x65;&#119;&#x2E;&#x77;&#x61;&#x6C;&#x6B;&#101;&#x72;&#64;&#98;&#114;&#105;&#115;&#x74;&#x6F;&#x6C;.&#x61;&#99;&#x2E;&#117;&#x6B;">&#x61;&#x6E;&#x64;&#114;&#x65;&#119;&#x2E;&#x77;&#x61;&#x6C;&#x6B;&#101;&#x72;&#64;&#98;&#114;&#105;&#115;&#x74;&#x6F;&#x6C;.&#x61;&#99;&#x2E;&#117;&#x6B;</a>> currently looks after maintenance of FoX.</p>
<p>FoX is the work of Toby White &lt;<a href="&#x6D;&#x61;&#x69;&#108;&#x74;&#x6F;:&#x74;&#x6F;&#x77;&#64;&#117;&#115;&#122;&#x6C;&#x61;.&#x6D;&#x65;&#46;&#x75;&#x6B;">&#x74;&#x6F;&#x77;&#64;&#117;&#115;&#122;&#x6C;&#x61;.&#x6D;&#x65;&#46;&#x75;&#x6B;</a>>, and all bug reports/complaints/bouquets of roses should be sent to him. Andrew Walker &lt;<a href="&#x6D;&#97;&#105;&#x6C;&#116;&#111;:&#97;&#110;&#100;&#114;&#101;&#119;&#46;&#x77;&#97;&#x6C;k&#101;&#114;&#64;&#98;&#114;&#105;&#115;&#116;&#111;&#x6C;&#46;&#x61;&#99;&#46;&#x75;&#107;">&#97;&#110;&#100;&#114;&#101;&#119;&#46;&#x77;&#97;&#x6C;k&#101;&#114;&#64;&#98;&#114;&#105;&#115;&#116;&#111;&#x6C;&#46;&#x61;&#99;&#46;&#x75;&#107;</a>> currently looks after maintenance of FoX.</p>

<p>There is a FoX website at <a href="http://www1.gly.bris.ac.uk/~walker/FoX/">http://www1.gly.bris.ac.uk/~walker/FoX/</a>.</p>

Expand All @@ -3676,7 +3676,7 @@ <h1>Licensing</h1>
&copy; 2003, 2004, Alberto Garcia, Jon Wakelin <br />
&copy; 2005-2008, Toby White <br />
&copy; 2007-2009, Gen-Tao Chiang
&copy; 2008-2010, Andrew Walker
&copy; 2008-2011, Andrew Walker
All rights reserved.</p>

<p>Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion DoX/Licensing.html
Expand Up @@ -19,7 +19,7 @@ <h1>Licensing</h1>
&copy; 2003, 2004, Alberto Garcia, Jon Wakelin <br />
&copy; 2005-2008, Toby White <br />
&copy; 2007-2009, Gen-Tao Chiang
&copy; 2008-2010, Andrew Walker
&copy; 2008-2011, Andrew Walker
All rights reserved.</p>

<p>Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion DoX/Licensing.md
Expand Up @@ -11,7 +11,7 @@ Copyright:
&copy; 2003, 2004, Alberto Garcia, Jon Wakelin
&copy; 2005-2008, Toby White
&copy; 2007-2009, Gen-Tao Chiang
&copy; 2008-2010, Andrew Walker
&copy; 2008-2011, Andrew Walker
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion DoX/Versioning.html
Expand Up @@ -9,7 +9,7 @@
<div class="DoX">
<h1>FoX versioning</h1>

<p>This documentation describes version 4.0 of the FoX library.</p>
<p>This documentation describes version 4.1 of the FoX library.</p>

<p>This version includes output modules for general XML, and for CML; and a fully validating XML parser, exposed through a Fortran version of the SAX2 input parser and a Fortran mapping of the W3C DOM interface.</p>

Expand Down
2 changes: 1 addition & 1 deletion DoX/Versioning.md
@@ -1,6 +1,6 @@
# FoX versioning

This documentation describes version 4.0 of the FoX library.
This documentation describes version 4.1 of the FoX library.

This version includes output modules for general XML, and for CML; and a fully validating XML parser, exposed through a Fortran version of the SAX2 input parser and a Fortran mapping of the W3C DOM interface.

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Expand Up @@ -10,7 +10,7 @@ as shown in the file utils/fox_m_utils_mtprng.f90
This version of FoX is:
(c) 2005-2009 Toby White <tow@uszla.me.uk>
(c) 2007-2009 Gen-Tao Chiang <gtc25@cam.ac.uk>
(c) 2008-2010 Andrew Walker <a.walker@ucl.ac.uk>
(c) 2008-2011 Andrew Walker <a.walker@ucl.ac.uk>

All rights reserved.

Expand Down
4 changes: 2 additions & 2 deletions common/FoX_common.F90
Expand Up @@ -11,9 +11,9 @@ module FoX_common
private

#ifdef DUMMYLIB
character(len=*), parameter :: FoX_version = '4.1.0-dummy'
character(len=*), parameter :: FoX_version = '4.1.1-dummy'
#else
character(len=*), parameter :: FoX_version = '4.1.0'
character(len=*), parameter :: FoX_version = '4.1.1'
#endif

public :: FoX_version
Expand Down
2 changes: 1 addition & 1 deletion config/configure.ac
@@ -1,4 +1,4 @@
AC_INIT([FoX],[4.1.0],[a.walker@ucl.ac.uk])
AC_INIT([FoX],[4.1.1],[a.walker@ucl.ac.uk])
AC_CONFIG_SRCDIR([README.FoX.txt])
dnl
dnl Find system type.
Expand Down
18 changes: 9 additions & 9 deletions configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for FoX 4.1.0.
# Generated by GNU Autoconf 2.61 for FoX 4.1.1.
#
# Report bugs to <a.walker@ucl.ac.uk>.
#
Expand Down Expand Up @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='FoX'
PACKAGE_TARNAME='fox'
PACKAGE_VERSION='4.1.0'
PACKAGE_STRING='FoX 4.1.0'
PACKAGE_VERSION='4.1.1'
PACKAGE_STRING='FoX 4.1.1'
PACKAGE_BUGREPORT='a.walker@ucl.ac.uk'

ac_unique_file="README.FoX.txt"
Expand Down Expand Up @@ -1183,7 +1183,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures FoX 4.1.0 to adapt to many kinds of systems.
\`configure' configures FoX 4.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1248,7 +1248,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of FoX 4.1.0:";;
short | recursive ) echo "Configuration of FoX 4.1.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1342,7 +1342,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
FoX configure 4.1.0
FoX configure 4.1.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
Expand All @@ -1356,7 +1356,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by FoX $as_me 4.1.0, which was
It was created by FoX $as_me 4.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -6804,7 +6804,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by FoX $as_me 4.1.0, which was
This file was extended by FoX $as_me 4.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -6847,7 +6847,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
FoX config.status 4.1.0
FoX config.status 4.1.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Expand Down
2 changes: 1 addition & 1 deletion wcml/test/test_cmlEndCml_2.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<cml convention="CMLComp" fileId="test.xml" xmlns="http://www.xml-cml.org/schema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:fpx="http://www.uszla.me.uk/fpx" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:units="http://www.uszla.me.uk/FoX/units" xmlns:cmlUnits="http://www.xml-cml.org/units/units" xmlns:siUnits="http://www.xml-cml.org/units/siUnits" xmlns:atomicUnits="http://www.xml-cml.org/units/atomic">
<metadata name="dc:contributor" content="FoX-4.1.0 (http://www.uszla.me.uk/FoX)"/>
<metadata name="dc:contributor" content="FoX-4.1.1 (http://www.uszla.me.uk/FoX)"/>
</cml>

0 comments on commit 45d42f5

Please sign in to comment.