diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5442a32 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +*.o +Makefile +autom4te.cache +config.h +config.log +config.status +doc/mxml.d +doc/mxml.man +libmxml.1.dylib +libmxml.a +libmxml.dylib +libmxml.so +libmxml.so.1 +mxml.list +mxml.pc +mxmldoc +mxmldoc-static +org.minixml.atom +org.minixml.docset +org.minixml.xar +temp1.xmlfd +testmxml diff --git a/Makefile.in b/Makefile.in index ba773d2..7d9d794 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,7 @@ # -# "$Id$" -# # Makefile for Mini-XML, a small XML-like file parsing library. # -# Copyright 2003-2014 by Michael R Sweet. +# Copyright 2003-2017 by Michael R Sweet. # # These coded instructions, statements, and computer programs are the # property of Michael R Sweet and are protected by Federal copyright @@ -11,7 +9,7 @@ # which should have been included with this file. If this file is # missing or damaged, see the license at: # -# http://www.msweet.org/projects.php/Mini-XML +# https://michaelrsweet.github.io/mxml # # @@ -427,8 +425,3 @@ doc/mxml.man: mxmldoc-static mxml.xml # $(OBJS): Makefile config.h - - -# -# End of "$Id$". -# diff --git a/config.h.in b/config.h.in index 1c62b36..58502f6 100644 --- a/config.h.in +++ b/config.h.in @@ -1,9 +1,7 @@ /* - * "$Id$" + * Configuration file for Mini-XML, a small XML file parsing library. * - * Configuration file for Mini-XML, a small XML-like file parsing library. - * - * Copyright 2003-2014 by Michael R Sweet. + * Copyright 2003-2017 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,7 +9,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.msweet.org/projects.php/Mini-XML + * https://michaelrsweet.github.io/mxml */ /* @@ -89,7 +87,3 @@ extern int _mxml_snprintf(char *, size_t, const char *, ...); extern int _mxml_vsnprintf(char *, size_t, const char *, va_list); # define vsnprintf _mxml_vsnprintf # endif /* !HAVE_VSNPRINTF */ - -/* - * End of "$Id$". - */ diff --git a/configure b/configure index 04cbab0..05f976f 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Mini-XML 2.10. +# Generated by GNU Autoconf 2.69 for Mini-XML 2.11. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -267,7 +267,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: http://www.msweet.org/bugs.php/Mini-XML about your +$0: https://github.com/michaelrsweet/mxml/issues about your $0: system, including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -580,10 +580,10 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Mini-XML' PACKAGE_TARNAME='mxml' -PACKAGE_VERSION='2.10' -PACKAGE_STRING='Mini-XML 2.10' -PACKAGE_BUGREPORT='http://www.msweet.org/bugs.php/Mini-XML' -PACKAGE_URL='http://www.msweet.org/projects.php/Mini-XML' +PACKAGE_VERSION='2.11' +PACKAGE_STRING='Mini-XML 2.11' +PACKAGE_BUGREPORT='https://github.com/michaelrsweet/mxml/issues' +PACKAGE_URL='https://michaelrsweet.github.io/mxml' # Factoring default headers for most tests. ac_includes_default="\ @@ -1258,7 +1258,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 Mini-XML 2.10 to adapt to many kinds of systems. +\`configure' configures Mini-XML 2.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Mini-XML 2.10:";; + short | recursive ) echo "Configuration of Mini-XML 2.11:";; esac cat <<\_ACEOF @@ -1354,8 +1354,8 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . -Mini-XML home page: . +Report bugs to . +Mini-XML home page: . _ACEOF ac_status=$? fi @@ -1418,7 +1418,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Mini-XML configure 2.10 +Mini-XML configure 2.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1728,9 +1728,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------------------------ ## -## Report this to http://www.msweet.org/bugs.php/Mini-XML ## -## ------------------------------------------------------ ##" +( $as_echo "## ----------------------------------------------------------- ## +## Report this to https://github.com/michaelrsweet/mxml/issues ## +## ----------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -1825,7 +1825,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 Mini-XML $as_me 2.10, which was +It was created by Mini-XML $as_me 2.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2177,7 +2177,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h" -VERSION="2.10" +VERSION="2.11" cat >>confdefs.h <<_ACEOF #define MXML_VERSION "Mini-XML v$VERSION" @@ -4974,7 +4974,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Mini-XML $as_me 2.10, which was +This file was extended by Mini-XML $as_me 2.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5030,14 +5030,14 @@ $config_files Configuration headers: $config_headers -Report bugs to . -Mini-XML home page: ." +Report bugs to . +Mini-XML home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Mini-XML config.status 2.10 +Mini-XML config.status 2.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 70c528f..8ec9cce 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,7 @@ dnl -dnl "$Id$" -dnl dnl Configuration script for Mini-XML, a small XML-like file parsing library. dnl -dnl Copyright 2003-2016 by Michael R Sweet. +dnl Copyright 2003-2017 by Michael R Sweet. dnl dnl These coded instructions, statements, and computer programs are the dnl property of Michael R Sweet and are protected by Federal copyright @@ -11,11 +9,11 @@ dnl law. Distribution and use rights are outlined in the file "COPYING" dnl which should have been included with this file. If this file is dnl missing or damaged, see the license at: dnl -dnl http://www.msweet.org/projects.php/Mini-XML +dnl https://michaelrsweet.github.io/mxml dnl dnl Package name and version... -AC_INIT([Mini-XML], [2.10], [http://www.msweet.org/bugs.php/Mini-XML], [mxml], [http://www.msweet.org/projects.php/Mini-XML]) +AC_INIT([Mini-XML], [2.11], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://michaelrsweet.github.io/mxml]) dnl Set the name of the config header file... AC_CONFIG_HEADER(config.h) diff --git a/doc/0.gif b/doc/0.gif deleted file mode 100644 index d5e883c..0000000 Binary files a/doc/0.gif and /dev/null differ diff --git a/doc/1.gif b/doc/1.gif deleted file mode 100644 index 316ff7c..0000000 Binary files a/doc/1.gif and /dev/null differ diff --git a/doc/2.gif b/doc/2.gif deleted file mode 100644 index ebc1e75..0000000 Binary files a/doc/2.gif and /dev/null differ diff --git a/doc/3.gif b/doc/3.gif deleted file mode 100644 index 2b3ac7b..0000000 Binary files a/doc/3.gif and /dev/null differ diff --git a/doc/4.gif b/doc/4.gif deleted file mode 100644 index bd145f2..0000000 Binary files a/doc/4.gif and /dev/null differ diff --git a/doc/5.gif b/doc/5.gif deleted file mode 100644 index fbbb5fb..0000000 Binary files a/doc/5.gif and /dev/null differ diff --git a/doc/6.gif b/doc/6.gif deleted file mode 100644 index a4a57a8..0000000 Binary files a/doc/6.gif and /dev/null differ diff --git a/doc/7.gif b/doc/7.gif deleted file mode 100644 index 80d675f..0000000 Binary files a/doc/7.gif and /dev/null differ diff --git a/doc/8.gif b/doc/8.gif deleted file mode 100644 index 58605dd..0000000 Binary files a/doc/8.gif and /dev/null differ diff --git a/doc/9.gif b/doc/9.gif deleted file mode 100644 index 07388f3..0000000 Binary files a/doc/9.gif and /dev/null differ diff --git a/doc/A.gif b/doc/A.gif deleted file mode 100644 index 7f2a147..0000000 Binary files a/doc/A.gif and /dev/null differ diff --git a/doc/B.gif b/doc/B.gif deleted file mode 100644 index 54f81f4..0000000 Binary files a/doc/B.gif and /dev/null differ diff --git a/doc/C.gif b/doc/C.gif deleted file mode 100644 index 891e7fe..0000000 Binary files a/doc/C.gif and /dev/null differ diff --git a/doc/D.gif b/doc/D.gif deleted file mode 100644 index dd8f829..0000000 Binary files a/doc/D.gif and /dev/null differ diff --git a/doc/E.gif b/doc/E.gif deleted file mode 100644 index 6b164c0..0000000 Binary files a/doc/E.gif and /dev/null differ diff --git a/doc/F.gif b/doc/F.gif deleted file mode 100644 index 88961f0..0000000 Binary files a/doc/F.gif and /dev/null differ diff --git a/doc/advanced.html b/doc/advanced.html index 67fcbb8..0456386 100644 --- a/doc/advanced.html +++ b/doc/advanced.html @@ -1,9 +1,8 @@ -

3More Mini-XML -Programming Techniques

+

Chapter 3 - More Mini-XML +Programming Techniques

This chapter shows additional ways to use the Mini-XML library in your programs.

diff --git a/doc/basics.html b/doc/basics.html index 7823fa6..318aefc 100644 --- a/doc/basics.html +++ b/doc/basics.html @@ -1,9 +1,8 @@ -

2Getting Started -with Mini-XML

+

Chapter 2 - Getting Started +with Mini-XML

This chapter describes how to write programs that use Mini-XML to access data in an XML file. Mini-XML provides the following @@ -333,7 +332,7 @@ the MXML_TEXT_CALLBACK constant which specifies that all data nodes in the document contain whitespace-separated text values. Other standard callbacks include MXML_IGNORE_CALLBACK, MXML_INTEGER_CALLBACK, -MXML_OPAQUE_CALLBACK, and +MXML_OPAQUE_CALLBACK, and MXML_REAL_CALLBACK.

The mxmlLoadString @@ -459,7 +458,7 @@ can be used to iterate through the XML node tree:

     mxml_node_t *node;
-    
+
     node = mxmlWalkPrev(current, tree,
                         MXML_DESCEND);
 
@@ -473,7 +472,7 @@ function:

 
 
     mxml_node_t *node;
-    
+
     node = mxmlFindElement(tree, tree, "name",
                            "attr", "value",
                            MXML_DESCEND);
diff --git a/doc/chapters.xcf.gz b/doc/chapters.xcf.gz
deleted file mode 100644
index e12a942..0000000
Binary files a/doc/chapters.xcf.gz and /dev/null differ
diff --git a/doc/hires/0.gif b/doc/hires/0.gif
deleted file mode 100644
index 6b47203..0000000
Binary files a/doc/hires/0.gif and /dev/null differ
diff --git a/doc/hires/1.gif b/doc/hires/1.gif
deleted file mode 100644
index f96a166..0000000
Binary files a/doc/hires/1.gif and /dev/null differ
diff --git a/doc/hires/2.gif b/doc/hires/2.gif
deleted file mode 100644
index 4db284a..0000000
Binary files a/doc/hires/2.gif and /dev/null differ
diff --git a/doc/hires/3.gif b/doc/hires/3.gif
deleted file mode 100644
index 49ade8c..0000000
Binary files a/doc/hires/3.gif and /dev/null differ
diff --git a/doc/hires/4.gif b/doc/hires/4.gif
deleted file mode 100644
index cb2b811..0000000
Binary files a/doc/hires/4.gif and /dev/null differ
diff --git a/doc/hires/5.gif b/doc/hires/5.gif
deleted file mode 100644
index 95bbc68..0000000
Binary files a/doc/hires/5.gif and /dev/null differ
diff --git a/doc/hires/6.gif b/doc/hires/6.gif
deleted file mode 100644
index 1bab481..0000000
Binary files a/doc/hires/6.gif and /dev/null differ
diff --git a/doc/hires/7.gif b/doc/hires/7.gif
deleted file mode 100644
index dc66892..0000000
Binary files a/doc/hires/7.gif and /dev/null differ
diff --git a/doc/hires/8.gif b/doc/hires/8.gif
deleted file mode 100644
index 6231d1a..0000000
Binary files a/doc/hires/8.gif and /dev/null differ
diff --git a/doc/hires/9.gif b/doc/hires/9.gif
deleted file mode 100644
index a40ce87..0000000
Binary files a/doc/hires/9.gif and /dev/null differ
diff --git a/doc/hires/A.gif b/doc/hires/A.gif
deleted file mode 100644
index 8fcc8d3..0000000
Binary files a/doc/hires/A.gif and /dev/null differ
diff --git a/doc/hires/B.gif b/doc/hires/B.gif
deleted file mode 100644
index eac747e..0000000
Binary files a/doc/hires/B.gif and /dev/null differ
diff --git a/doc/hires/C.gif b/doc/hires/C.gif
deleted file mode 100644
index c45f960..0000000
Binary files a/doc/hires/C.gif and /dev/null differ
diff --git a/doc/hires/D.gif b/doc/hires/D.gif
deleted file mode 100644
index 0be8510..0000000
Binary files a/doc/hires/D.gif and /dev/null differ
diff --git a/doc/hires/E.gif b/doc/hires/E.gif
deleted file mode 100644
index 4de1f96..0000000
Binary files a/doc/hires/E.gif and /dev/null differ
diff --git a/doc/hires/F.gif b/doc/hires/F.gif
deleted file mode 100644
index 80d92bb..0000000
Binary files a/doc/hires/F.gif and /dev/null differ
diff --git a/doc/hires/logo.gif b/doc/hires/logo.gif
deleted file mode 100644
index b41644d..0000000
Binary files a/doc/hires/logo.gif and /dev/null differ
diff --git a/doc/hires/mxml.png b/doc/hires/mxml.png
new file mode 100644
index 0000000..68088fb
Binary files /dev/null and b/doc/hires/mxml.png differ
diff --git a/doc/install.html b/doc/install.html
index 5884501..5f7c876 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -1,9 +1,8 @@
 
 
 
-
1Building,
-Installing, and Packaging Mini-XML

+
Chapter 1 - Building,
+Installing, and Packaging Mini-XML

 
 
This chapter describes how to build, install, and package
 Mini-XML on your system from the source archive. You will need an
diff --git a/doc/intro.html b/doc/intro.html
index e44de57..8b5e95a 100644
--- a/doc/intro.html
+++ b/doc/intro.html
@@ -1,16 +1,15 @@
 
 
-	Mini-XML Programmers Manual, Version 2.10
-	
+	Mini-XML Programmers Manual, Version 2.11
+	
 	
 	
 
 
 
-
0Introduction

+
Introduction

 
-
This programmers manual describes Mini-XML version 2.10, a small
+
This programmers manual describes Mini-XML version 2.11, a small
 XML parsing library that you can use to read and write XML data
 files in your C and C++ applications.

 
@@ -53,7 +52,7 @@ following projects/software applications:

 
 
 
-
Please file a bug on msweet.org if you would like your project added or
+
Please file a bug on Github if you would like your project added or
 removed from this list, or if you have any comments/quotes you would like me to
 publish about your experiences with Mini-XML.

 
@@ -87,14 +86,11 @@ appendices:

         provides the terms and conditions for using and distributing
         Mini-XML.
 
-	
  • Appendix B, "Release Notes",
-	lists the changes in each release of Mini-XML.
    • 
-
-	
  • Appendix C, "Library
+	
  • Appendix B, "Library
 	Reference", contains a complete reference for
 	Mini-XML, generated by mxmldoc.
    • 
 
-	
  • Appendix D, "XML Schema", shows
+	
  • Appendix C, "XML Schema", shows
 	the XML schema used for the XML files produced by
 	mxmldoc.
    • 
 
@@ -187,7 +183,7 @@ manual:
    
 
 
    Legal Stuff
    
 
-
    The Mini-XML library is copyright 2003-2016 by Michael R Sweet. License terms
+
    The Mini-XML library is copyright 2003-2017 by Michael R Sweet. License terms
 are described in Appendix A - Mini-XML License.
    
 
 
diff --git a/doc/license.html b/doc/license.html
index 5a8ed3e..3aa11ea 100644
--- a/doc/license.html
+++ b/doc/license.html
@@ -1,9 +1,8 @@
 
 
 
-
    AMini-XML
-License
    
+
    Appendix A - Mini-XML
+License
    
 
 
    The Mini-XML library and included programs are provided under
 the terms of the GNU Library General Public License version 2
@@ -566,7 +565,7 @@ Lesser General Public License for more details.
 
 
    You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 02111-1307  USA
 
 
diff --git a/doc/logo.gif b/doc/logo.gif
deleted file mode 100644
index 28731f0..0000000
Binary files a/doc/logo.gif and /dev/null differ
diff --git a/doc/logo.xcf.gz b/doc/logo.xcf.gz
deleted file mode 100644
index 4fb6eeb..0000000
Binary files a/doc/logo.xcf.gz and /dev/null differ
diff --git a/doc/makedocs.sh b/doc/makedocs.sh
index 6f5ef14..f072ea8 100755
--- a/doc/makedocs.sh
+++ b/doc/makedocs.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# "$Id$"
-#
 # Script to make documentation...
 #
 # Copyright 2003-2010 by Michael R Sweet.
@@ -12,7 +10,7 @@
 # which should have been included with this file.  If this file is
 # missing or damaged, see the license at:
 #
-#     http://www.minixml.org/
+#     https://michaelrsweet.github.io/mxml
 #
 
 htmldoc --verbose --path "hires;." --batch mxml.book -f mxml.pdf
@@ -22,7 +20,3 @@ htmldoc --verbose --batch mxml.book --no-title -f mxml.html
 rm -rf mxml.d
 mkdir mxml.d
 htmldoc --verbose --batch mxml.book --no-title -t html -d mxml.d
-
-#
-# End of "$Id$".
-#
diff --git a/doc/mxml.book b/doc/mxml.book
index 59448ea..2ca502c 100644
--- a/doc/mxml.book
+++ b/doc/mxml.book
@@ -1,4 +1,4 @@
-#HTMLDOC 1.8.27.1
+#HTMLDOC 1.8.30
 -t pdf14 -f "mxml.pdf" --book --toclevels 3 --no-numbered --toctitle "Table of Contents" --title --titleimage "title.html" --linkstyle plain --size 4.25x6.875in --left 0.750in --right 0.50in --top 0.50in --bottom 0.50in --header .t. --header1 ... --footer h.1 --nup 1 --tocheader .t. --tocfooter ..i --duplex --portrait --color --no-pscommands --no-xrxcomments --compression=9 --jpeg=95 --fontsize 9.0 --fontspacing 1.2 --headingfont Helvetica --bodyfont Helvetica --headfootsize 8.0 --headfootfont Helvetica-Oblique --charset iso-8859-1 --links --embedfonts --pagemode outline --pagelayout single --firstpage c1 --pageeffect none --pageduration 10 --effectduration 1.0 --no-encryption --permissions all  --owner-password ""  --user-password "" --browserwidth 300 --no-strict --no-overflow
 intro.html
 install.html
@@ -6,6 +6,5 @@ basics.html
 advanced.html
 mxmldoc.html
 license.html
-relnotes.html
 reference.html
 schema.html
diff --git a/doc/mxml.html b/doc/mxml.html
index 97f495a..e54fc02 100644
--- a/doc/mxml.html
+++ b/doc/mxml.html
@@ -1,9 +1,9 @@
 
 
 
-Mini-XML Programmers Manual, Version 2.10
+Mini-XML Programmers Manual, Version 2.11
 
-
+