plplot-cvs — For PLplot svn commit messages

[Plplot-cvs] SF.net SVN: plplot:[12988] trunk/cmake/epa_build/cmake/CMakeLists.txt

[<ai...@us...>]

Revision: 12988
          http://sourceforge.net/p/plplot/code/12988
Author:   airwin
Date:     2014-02-09 20:41:00 +0000 (Sun, 09 Feb 2014)
Log Message:
-----------
Revert recent version change which was not comprehensively tested for
this release.

Modified Paths:
--------------
    trunk/cmake/epa_build/cmake/CMakeLists.txt

Modified: trunk/cmake/epa_build/cmake/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/cmake/CMakeLists.txt	2014-02-09 05:21:49 UTC (rev 12987)
+++ trunk/cmake/epa_build/cmake/CMakeLists.txt	2014-02-09 20:41:00 UTC (rev 12988)
@@ -61,10 +61,10 @@
 
 # Data that is related to downloads.
 set(DIR v2.8)
-set(VERSION 2.8.12.2)
+set(VERSION 2.8.12.1)
 set(URL http://www.cmake.org/files/${DIR}/cmake-${VERSION}.tar.gz)
 set(DOWNLOAD_HASH_TYPE MD5)
-set(DOWNLOAD_HASH 17c6513483d23590cbce6957ec6d1e66)
+set(DOWNLOAD_HASH 9d38cd4e2c94c3cea97d0e2924814acc)
 
 ExternalProject_Add(
   build_${PACKAGE}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12987] trunk/cmake/epa_build

[<ai...@us...>]

Revision: 12987
          http://sourceforge.net/p/plplot/code/12987
Author:   airwin
Date:     2014-02-09 05:21:49 +0000 (Sun, 09 Feb 2014)
Log Message:
-----------
Set svn:eol-style property to native for all files under version
control in cmake_epa_build directory tree.  This only affects a subset
of the files because most of them had this property set already.

Property Changed:
----------------
    trunk/cmake/epa_build/ExternalProject.cmake
    trunk/cmake/epa_build/README
    trunk/cmake/epa_build/README.developers
    trunk/cmake/epa_build/ToDo
    trunk/cmake/epa_build/add_packages.xml
    trunk/cmake/epa_build/configure_epa.cmake
    trunk/cmake/epa_build/configured_pango.patch
    trunk/cmake/epa_build/download_check.cmake
    trunk/cmake/epa_build/epa_CMakeLists.txt.in
    trunk/cmake/epa_build/itk/autoreconf.patch
    trunk/cmake/epa_build/itk/itk4_case.patch
    trunk/cmake/epa_build/itk/itk4_header_list.patch
    trunk/cmake/epa_build/itk3/autotools_backport.patch
    trunk/cmake/epa_build/itstool/itstool-1.2.0-python-location-fixes.patch
    trunk/cmake/epa_build/iwidgets/iwidgets4.1.patch
    trunk/cmake/epa_build/iwidgets/iwidgets4_case.patch
    trunk/cmake/epa_build/libharu/cmake.patch
    trunk/cmake/epa_build/libharu/large_font.patch
    trunk/cmake/epa_build/libharu/remove_configured.patch
    trunk/cmake/epa_build/libharu/visibility.patch
    trunk/cmake/epa_build/ndiff/README.ndiff
    trunk/cmake/epa_build/ndiff/config.h.cmake
    trunk/cmake/epa_build/patch_gtk_packages.xml
    trunk/cmake/epa_build/setup/setup_mingw_makefiles
    trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain
    trunk/cmake/epa_build/setup/setup_msys_makefiles
    trunk/cmake/epa_build/shapelib/README
    trunk/cmake/epa_build/swig/octave-3.8.0.patch
    trunk/cmake/epa_build/wildcard_remove.cmake
    trunk/cmake/epa_build/xmlcatalog-wrapper/filter_arguments.cmake
    trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper.sh.in

Index: trunk/cmake/epa_build/ExternalProject.cmake
===================================================================
--- trunk/cmake/epa_build/ExternalProject.cmake	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/ExternalProject.cmake	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/ExternalProject.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/README
===================================================================
--- trunk/cmake/epa_build/README	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/README	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/README.developers
===================================================================
--- trunk/cmake/epa_build/README.developers	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/README.developers	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/README.developers
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/ToDo
===================================================================
--- trunk/cmake/epa_build/ToDo	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/ToDo	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/ToDo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/add_packages.xml
===================================================================
--- trunk/cmake/epa_build/add_packages.xml	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/add_packages.xml	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/add_packages.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/configure_epa.cmake
===================================================================
--- trunk/cmake/epa_build/configure_epa.cmake	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/configure_epa.cmake	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/configure_epa.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/configured_pango.patch
===================================================================
--- trunk/cmake/epa_build/configured_pango.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/configured_pango.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/configured_pango.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/download_check.cmake
===================================================================
--- trunk/cmake/epa_build/download_check.cmake	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/download_check.cmake	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/download_check.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/epa_CMakeLists.txt.in
===================================================================
--- trunk/cmake/epa_build/epa_CMakeLists.txt.in	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/epa_CMakeLists.txt.in	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/epa_CMakeLists.txt.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/itk/autoreconf.patch
===================================================================
--- trunk/cmake/epa_build/itk/autoreconf.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/itk/autoreconf.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/itk/autoreconf.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/itk/itk4_case.patch
===================================================================
--- trunk/cmake/epa_build/itk/itk4_case.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/itk/itk4_case.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/itk/itk4_case.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/itk/itk4_header_list.patch
===================================================================
--- trunk/cmake/epa_build/itk/itk4_header_list.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/itk/itk4_header_list.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/itk/itk4_header_list.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/itk3/autotools_backport.patch
===================================================================
--- trunk/cmake/epa_build/itk3/autotools_backport.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/itk3/autotools_backport.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/itk3/autotools_backport.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/itstool/itstool-1.2.0-python-location-fixes.patch
===================================================================
--- trunk/cmake/epa_build/itstool/itstool-1.2.0-python-location-fixes.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/itstool/itstool-1.2.0-python-location-fixes.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/itstool/itstool-1.2.0-python-location-fixes.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/iwidgets/iwidgets4.1.patch
===================================================================
--- trunk/cmake/epa_build/iwidgets/iwidgets4.1.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/iwidgets/iwidgets4.1.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/iwidgets/iwidgets4.1.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/iwidgets/iwidgets4_case.patch
===================================================================
--- trunk/cmake/epa_build/iwidgets/iwidgets4_case.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/iwidgets/iwidgets4_case.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/iwidgets/iwidgets4_case.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libharu/cmake.patch
===================================================================
--- trunk/cmake/epa_build/libharu/cmake.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/libharu/cmake.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/libharu/cmake.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libharu/large_font.patch
===================================================================
--- trunk/cmake/epa_build/libharu/large_font.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/libharu/large_font.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/libharu/large_font.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libharu/remove_configured.patch
===================================================================
--- trunk/cmake/epa_build/libharu/remove_configured.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/libharu/remove_configured.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/libharu/remove_configured.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libharu/visibility.patch
===================================================================
--- trunk/cmake/epa_build/libharu/visibility.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/libharu/visibility.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/libharu/visibility.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/ndiff/README.ndiff
===================================================================
--- trunk/cmake/epa_build/ndiff/README.ndiff	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/ndiff/README.ndiff	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/ndiff/README.ndiff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/ndiff/config.h.cmake
===================================================================
--- trunk/cmake/epa_build/ndiff/config.h.cmake	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/ndiff/config.h.cmake	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/ndiff/config.h.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/patch_gtk_packages.xml
===================================================================
--- trunk/cmake/epa_build/patch_gtk_packages.xml	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/patch_gtk_packages.xml	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/patch_gtk_packages.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/setup/setup_mingw_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_makefiles	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/setup/setup_mingw_makefiles	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/setup/setup_mingw_makefiles
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/setup/setup_msys_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_msys_makefiles	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/setup/setup_msys_makefiles	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/setup/setup_msys_makefiles
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/shapelib/README
===================================================================
--- trunk/cmake/epa_build/shapelib/README	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/shapelib/README	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/shapelib/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/swig/octave-3.8.0.patch
===================================================================
--- trunk/cmake/epa_build/swig/octave-3.8.0.patch	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/swig/octave-3.8.0.patch	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/swig/octave-3.8.0.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/wildcard_remove.cmake
===================================================================
--- trunk/cmake/epa_build/wildcard_remove.cmake	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/wildcard_remove.cmake	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/wildcard_remove.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/xmlcatalog-wrapper/filter_arguments.cmake
===================================================================
--- trunk/cmake/epa_build/xmlcatalog-wrapper/filter_arguments.cmake	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/xmlcatalog-wrapper/filter_arguments.cmake	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/xmlcatalog-wrapper/filter_arguments.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper.sh.in
===================================================================
--- trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper.sh.in	2014-02-09 03:12:14 UTC (rev 12986)
+++ trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper.sh.in	2014-02-09 05:21:49 UTC (rev 12987)

Property changes on: trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper.sh.in
___________________________________________________________________
Deleted: svn:eol
## -1 +0,0 ##
-native
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12986] trunk/cmake/epa_build/xmlcatalog-wrapper/ xmlcatalog-wrapper.sh.in

[<ai...@us...>]

Revision: 12986
          http://sourceforge.net/p/plplot/code/12986
Author:   airwin
Date:     2014-02-09 03:12:14 +0000 (Sun, 09 Feb 2014)
Log Message:
-----------
svn:eol property fixup.

Property Changed:
----------------
    trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper.sh.in

Index: trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper.sh.in
===================================================================
--- trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper.sh.in	2014-02-08 19:43:20 UTC (rev 12985)
+++ trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper.sh.in	2014-02-09 03:12:14 UTC (rev 12986)

Property changes on: trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper.sh.in
___________________________________________________________________
Added: svn:eol
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12985] trunk/cmake/epa_build

[<ai...@us...>]

Revision: 12985
          http://sourceforge.net/p/plplot/code/12985
Author:   airwin
Date:     2014-02-08 19:43:20 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
Set correct native line endings property for all the CMakeLists.txt
files of the epa_build project.

Modified Paths:
--------------
    trunk/cmake/epa_build/cmake/CMakeLists.txt
    trunk/cmake/epa_build/swig/CMakeLists.txt

Property Changed:
----------------
    trunk/cmake/epa_build/cairo/CMakeLists.txt
    trunk/cmake/epa_build/cmake/CMakeLists.txt
    trunk/cmake/epa_build/docbook-xml/CMakeLists.txt
    trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt
    trunk/cmake/epa_build/fontconfig/CMakeLists.txt
    trunk/cmake/epa_build/glib/CMakeLists.txt
    trunk/cmake/epa_build/gobject-introspection/CMakeLists.txt
    trunk/cmake/epa_build/gperf/CMakeLists.txt
    trunk/cmake/epa_build/gtk-doc/CMakeLists.txt
    trunk/cmake/epa_build/harfbuzz/CMakeLists.txt
    trunk/cmake/epa_build/intltool/CMakeLists.txt
    trunk/cmake/epa_build/itcl3/CMakeLists.txt
    trunk/cmake/epa_build/itk/CMakeLists.txt
    trunk/cmake/epa_build/itk3/CMakeLists.txt
    trunk/cmake/epa_build/itstool/CMakeLists.txt
    trunk/cmake/epa_build/iwidgets/CMakeLists.txt
    trunk/cmake/epa_build/libagg/CMakeLists.txt
    trunk/cmake/epa_build/libffi/CMakeLists.txt
    trunk/cmake/epa_build/libharu/CMakeLists.txt
    trunk/cmake/epa_build/libpcre/CMakeLists.txt
    trunk/cmake/epa_build/libqhull/CMakeLists.txt
    trunk/cmake/epa_build/libxml2/CMakeLists.txt
    trunk/cmake/epa_build/libxslt/CMakeLists.txt
    trunk/cmake/epa_build/ndiff/CMakeLists.txt
    trunk/cmake/epa_build/pango/CMakeLists.txt
    trunk/cmake/epa_build/pixman/CMakeLists.txt
    trunk/cmake/epa_build/pkg-config/CMakeLists.txt
    trunk/cmake/epa_build/plplot/CMakeLists.txt
    trunk/cmake/epa_build/ragel/CMakeLists.txt
    trunk/cmake/epa_build/shapelib/CMakeLists.txt
    trunk/cmake/epa_build/subversion/CMakeLists.txt
    trunk/cmake/epa_build/swig/CMakeLists.txt
    trunk/cmake/epa_build/tcl/CMakeLists.txt
    trunk/cmake/epa_build/tk/CMakeLists.txt
    trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
    trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt
    trunk/cmake/epa_build/yelp-tools/CMakeLists.txt
    trunk/cmake/epa_build/yelp-xsl/CMakeLists.txt

Index: trunk/cmake/epa_build/cairo/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/cairo/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/cairo/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/cairo/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/cmake/epa_build/cmake/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/cmake/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/cmake/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)
@@ -1,76 +1,76 @@
-# cmake/CMakeLists.txt
-
-# Configure the build of cmake.
-
-# Copyright (C) 2013 Alan W. Irwin
-
-# This file is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this file; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-# An external curl library (see --system-curl option below) is
-# required to build cmake because the cmake internal version of curl
-# is quite lame (no openssl capability, for example).  Also, we
-# haven't yet implemented a curl epa_build configuration because that
-# is going to be somewhat difficult due to the large number of
-# dependencies.  See
-# http://www.linuxfromscratch.org/blfs/view/svn/basicnet/curl.html for
-# a list of those dependencies.  There is some hope because
-# some of those are optional so I may tackle the curl epa_build configuration
-# sooner rather than later.
-
-# For now we are okay on Linux because we can just use the system curl
-# library for the cmake build, but on Windows it is unlikely curl is
-# installed so we will be unable to build a powerful cmake (until a
-# curl epa_build configuration is available).  Note, if the Windows
-# build of cmake fails, then either install curl (if that is possible)
-# or use the workaround of downloading a binary download from kitware
-# that apparently does use a powerful Windows version of curl.
-
-set(PACKAGE cmake)
-
-# List of dependencies (most of which are build tools) which should be
-# ignored.
-set(ignored_dependencies_LIST curl ${extra_ignored_dependencies_list})
-
-set(dependencies_LIST curl)
-
-# Do boilerplate tasks that must be done for each different project
-# that is configured as part of epa_build.
-epa_boilerplate(
-  ignored_dependencies_LIST
-  PACKAGE
-  dependencies_LIST
-  dependencies_targets
-  EPA_PATH
-  source_PATH
-  )
-
-set(CFLAGS "$ENV{CFLAGS}")
-set(CXXFLAGS "$ENV{CXXFLAGS}")
-
-# Data that is related to downloads.
-set(DIR v2.8)
-set(VERSION 2.8.12.2)
-set(URL http://www.cmake.org/files/${DIR}/cmake-${VERSION}.tar.gz)
-set(DOWNLOAD_HASH_TYPE MD5)
-set(DOWNLOAD_HASH 17c6513483d23590cbce6957ec6d1e66)
-
-ExternalProject_Add(
-  build_${PACKAGE}
-  URL ${URL}
-  URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${SH_EXECUTABLE} ${EPA_BASE}/Source/build_${PACKAGE}/bootstrap --prefix=${EPA_CMAKE_INSTALL_PREFIX} --parallel=8 --verbose --system-curl --no-qt-gui
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
-  )
+# cmake/CMakeLists.txt
+
+# Configure the build of cmake.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# An external curl library (see --system-curl option below) is
+# required to build cmake because the cmake internal version of curl
+# is quite lame (no openssl capability, for example).  Also, we
+# haven't yet implemented a curl epa_build configuration because that
+# is going to be somewhat difficult due to the large number of
+# dependencies.  See
+# http://www.linuxfromscratch.org/blfs/view/svn/basicnet/curl.html for
+# a list of those dependencies.  There is some hope because
+# some of those are optional so I may tackle the curl epa_build configuration
+# sooner rather than later.
+
+# For now we are okay on Linux because we can just use the system curl
+# library for the cmake build, but on Windows it is unlikely curl is
+# installed so we will be unable to build a powerful cmake (until a
+# curl epa_build configuration is available).  Note, if the Windows
+# build of cmake fails, then either install curl (if that is possible)
+# or use the workaround of downloading a binary download from kitware
+# that apparently does use a powerful Windows version of curl.
+
+set(PACKAGE cmake)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(ignored_dependencies_LIST curl ${extra_ignored_dependencies_list})
+
+set(dependencies_LIST curl)
+
+# Do boilerplate tasks that must be done for each different project
+# that is configured as part of epa_build.
+epa_boilerplate(
+  ignored_dependencies_LIST
+  PACKAGE
+  dependencies_LIST
+  dependencies_targets
+  EPA_PATH
+  source_PATH
+  )
+
+set(CFLAGS "$ENV{CFLAGS}")
+set(CXXFLAGS "$ENV{CXXFLAGS}")
+
+# Data that is related to downloads.
+set(DIR v2.8)
+set(VERSION 2.8.12.2)
+set(URL http://www.cmake.org/files/${DIR}/cmake-${VERSION}.tar.gz)
+set(DOWNLOAD_HASH_TYPE MD5)
+set(DOWNLOAD_HASH 17c6513483d23590cbce6957ec6d1e66)
+
+ExternalProject_Add(
+  build_${PACKAGE}
+  URL ${URL}
+  URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${SH_EXECUTABLE} ${EPA_BASE}/Source/build_${PACKAGE}/bootstrap --prefix=${EPA_CMAKE_INSTALL_PREFIX} --parallel=8 --verbose --system-curl --no-qt-gui
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
+  )


Property changes on: trunk/cmake/epa_build/cmake/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/docbook-xml/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/docbook-xml/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/docbook-xml/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/docbook-xml/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/fontconfig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/fontconfig/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/fontconfig/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/fontconfig/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/glib/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/glib/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/glib/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/glib/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/gobject-introspection/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/gobject-introspection/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/gobject-introspection/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/gobject-introspection/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/gperf/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/gperf/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/gperf/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/gperf/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/gtk-doc/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/gtk-doc/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/gtk-doc/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/gtk-doc/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/harfbuzz/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/harfbuzz/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/harfbuzz/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/harfbuzz/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/intltool/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/intltool/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/intltool/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/intltool/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/itcl3/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itcl3/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/itcl3/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/itcl3/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/itk/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itk/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/itk/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/itk/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/itk3/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itk3/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/itk3/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/itk3/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/itstool/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itstool/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/itstool/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/itstool/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/iwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/iwidgets/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/iwidgets/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/iwidgets/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libagg/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libagg/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/libagg/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/libagg/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libffi/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libffi/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/libffi/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/libffi/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libharu/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libharu/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/libharu/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/libharu/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libpcre/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libpcre/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/libpcre/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/libpcre/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libqhull/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libqhull/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/libqhull/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/libqhull/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libxml2/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libxml2/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/libxml2/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/libxml2/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/libxslt/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libxslt/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/libxslt/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/libxslt/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/ndiff/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/ndiff/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/ndiff/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/ndiff/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/pango/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/pango/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/pango/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/pango/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/pixman/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/pixman/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/pixman/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/pixman/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/pkg-config/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/pkg-config/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/pkg-config/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/pkg-config/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/plplot/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/ragel/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/ragel/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/ragel/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/ragel/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/shapelib/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/shapelib/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/shapelib/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/shapelib/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/subversion/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/subversion/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/subversion/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/subversion/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/cmake/epa_build/swig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/swig/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)
@@ -1,87 +1,87 @@
-# swig/CMakeLists.txt
-
-# Configure the build of swig.
-
-# N.B. this file is generated so if you edit it you will lose all your
-# changes the next time it is generated (typically by running
-# either/both the update_added_packages.sh or update_pango_packages.sh
-# scripts).  If those scripts do not provide good results, then
-# consider changing their source files (e.g., by editing the files
-# used in those scripts) or add a patch to be run by those scripts.
-
-# Copyright (C) 2013 Alan W. Irwin
-
-# This file is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this file; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-set(PACKAGE swig)
-
-# List of dependencies (most of which are build tools) which should be
-# ignored.
-set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
-
-set(dependencies_LIST libpcre)
-
-# Do boilerplate tasks that must be done for each different project
-# that is configured as part of epa_build.
-epa_boilerplate(
-  ignored_dependencies_LIST
-  PACKAGE
-  dependencies_LIST
-  dependencies_targets
-  EPA_PATH
-  source_PATH
-  )
-
-if(MSYS_PLATFORM)
-  # Add two MSYS specific flags to avoid compile errors
-  # It is unclear if they have any unexpected effects
-  set(CFLAGS "-D__NO_MINGW_LFS -U__STRICT_ANSI__ $ENV{CFLAGS}")
-else(MSYS_PLATFORM)
-  set(CFLAGS "$ENV{CFLAGS}")
-endif(MSYS_PLATFORM)
-
-set(CXXFLAGS "$ENV{CXXFLAGS}")
-
-# Drop -fvisibility=hidden since that option does not work for a
-# number of software packages that are configured automatically using
-# this template.
-string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
-string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}")
-
-# Data that is related to downloads.
-set(URL http://downloads.sourceforge.net/swig/swig/swig-2.0.11/swig-2.0.11.tar.gz)
-set(DOWNLOAD_HASH_TYPE SHA256)
-set(DOWNLOAD_HASH 63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e)
-
-ExternalProject_Add(
-  build_${PACKAGE}
-  DEPENDS ${dependencies_targets}
-  URL ${URL}
-  URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "LDFLAGS=-Wl,-rpath -Wl,${EPA_CMAKE_INSTALL_PREFIX}/lib" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
-  BUILD_IN_SOURCE OFF
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}  install
-  )
-
-add_custom_command(
-  OUTPUT
-  ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
-  COMMAND ${CMAKE_COMMAND} -E echo
-  "Provide swig support for octave-3.8.0"
-  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/octave-3.8.0.patch
-  APPEND
-  )
+# swig/CMakeLists.txt
+
+# Configure the build of swig.
+
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts).  If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+set(PACKAGE swig)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
+
+set(dependencies_LIST libpcre)
+
+# Do boilerplate tasks that must be done for each different project
+# that is configured as part of epa_build.
+epa_boilerplate(
+  ignored_dependencies_LIST
+  PACKAGE
+  dependencies_LIST
+  dependencies_targets
+  EPA_PATH
+  source_PATH
+  )
+
+if(MSYS_PLATFORM)
+  # Add two MSYS specific flags to avoid compile errors
+  # It is unclear if they have any unexpected effects
+  set(CFLAGS "-D__NO_MINGW_LFS -U__STRICT_ANSI__ $ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(CFLAGS "$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+
+set(CXXFLAGS "$ENV{CXXFLAGS}")
+
+# Drop -fvisibility=hidden since that option does not work for a
+# number of software packages that are configured automatically using
+# this template.
+string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
+string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}")
+
+# Data that is related to downloads.
+set(URL http://downloads.sourceforge.net/swig/swig/swig-2.0.11/swig-2.0.11.tar.gz)
+set(DOWNLOAD_HASH_TYPE SHA256)
+set(DOWNLOAD_HASH 63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e)
+
+ExternalProject_Add(
+  build_${PACKAGE}
+  DEPENDS ${dependencies_targets}
+  URL ${URL}
+  URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
+  PATCH_COMMAND ""
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "LDFLAGS=-Wl,-rpath -Wl,${EPA_CMAKE_INSTALL_PREFIX}/lib" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
+  BUILD_IN_SOURCE OFF
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}  install
+  )
+
+add_custom_command(
+  OUTPUT
+  ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
+  COMMAND ${CMAKE_COMMAND} -E echo
+  "Provide swig support for octave-3.8.0"
+  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/octave-3.8.0.patch
+  APPEND
+  )


Property changes on: trunk/cmake/epa_build/swig/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/tcl/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/tcl/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/tcl/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/tcl/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/tk/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/tk/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/tk/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/tk/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/yelp-tools/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/yelp-tools/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/yelp-tools/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/yelp-tools/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/cmake/epa_build/yelp-xsl/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/yelp-xsl/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
+++ trunk/cmake/epa_build/yelp-xsl/CMakeLists.txt	2014-02-08 19:43:20 UTC (rev 12985)

Property changes on: trunk/cmake/epa_build/yelp-xsl/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12984] trunk/cmake/epa_build/swig/CMakeLists.txt

[<arj...@us...>]

Revision: 12984
          http://sourceforge.net/p/plplot/code/12984
Author:   arjenmarkus
Date:     2014-02-08 19:09:26 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
Add two compile flags to avoid compile errors (regarding the off64_t type and regarding the struct for directory contents)

Modified Paths:
--------------
    trunk/cmake/epa_build/swig/CMakeLists.txt

Modified: trunk/cmake/epa_build/swig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/swig/CMakeLists.txt	2014-02-08 19:00:24 UTC (rev 12983)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt	2014-02-08 19:09:26 UTC (rev 12984)
@@ -46,6 +46,7 @@
 
 if(MSYS_PLATFORM)
   # Add two MSYS specific flags to avoid compile errors
+  # It is unclear if they have any unexpected effects
   set(CFLAGS "-D__NO_MINGW_LFS -U__STRICT_ANSI__ $ENV{CFLAGS}")
 else(MSYS_PLATFORM)
   set(CFLAGS "$ENV{CFLAGS}")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12983] trunk

[<arj...@us...>]

Revision: 12983
          http://sourceforge.net/p/plplot/code/12983
Author:   arjenmarkus
Date:     2014-02-08 19:00:24 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/bindings/tcl/CMakeLists.txt
    trunk/bindings/tk/plserver.c
    trunk/cmake/epa_build/cmake/CMakeLists.txt
    trunk/cmake/epa_build/swig/CMakeLists.txt

Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt	2014-02-07 05:42:56 UTC (rev 12982)
+++ trunk/bindings/tcl/CMakeLists.txt	2014-02-08 19:00:24 UTC (rev 12983)
@@ -23,11 +23,11 @@
   # Check consistency of plplot_parameters.h.
   add_custom_target(
     check_tcl_parameters
-    COMMAND ${CMAKE_COMMAND} -E remove -f 
+    COMMAND ${CMAKE_COMMAND} -E remove -f
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
     COMMAND
-    sed -f ${CMAKE_CURRENT_SOURCE_DIR}/global_defines.sed < 
-    ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i > 
+    sed -f ${CMAKE_CURRENT_SOURCE_DIR}/global_defines.sed <
+    ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i >
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
     COMMAND
     ${CMAKE_COMMAND} -E echo "Check that plplot_parameters.h is consistent with the #defines in bindings/swig-support/plplotcapi.i"
@@ -186,6 +186,7 @@
      ${TCL_LIBRARY}
     )
 
+  message(STATUS "ENABLE_itcl: ${ENABLE_itcl}")
   if(ENABLE_itcl)
     include_directories(${ITCL_INCLUDE_PATH})
 
@@ -208,6 +209,7 @@
       ${ITCL_LIBRARY}
       )
   endif(ENABLE_itcl)
+  message(STATUS "Itcl libraries: ${plplottcltk_Main${LIB_TAG}_link_libraries}")
 
   if(ENABLE_tkX)
     set(plplottcltk${LIB_TAG}_LIB_SRCS
@@ -438,10 +440,10 @@
   # _target suffix to avoid nameclash with filename plplot.tcl.  This
   # nameclash screwed up ../tk/configuration which had a non-generated file
   # of the same name which was a dependency of a custom target.
-  add_custom_target(plplot.tcl_target ALL 
+  add_custom_target(plplot.tcl_target ALL
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
     )
-  set_property(GLOBAL PROPERTY 
+  set_property(GLOBAL PROPERTY
     FILES_plplot.tcl_target ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
     )
 
@@ -455,7 +457,7 @@
   add_custom_target(tclIndex_tcl ALL
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
     )
-  set_property(GLOBAL PROPERTY 
+  set_property(GLOBAL PROPERTY
     FILES_tclIndex_tcl ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
     )
 
@@ -593,7 +595,7 @@
       )
   endif(USE_RPATH)
 
-  install(TARGETS pltcl 
+  install(TARGETS pltcl
     EXPORT export_plplot
     DESTINATION ${BIN_DIR}
     )

Modified: trunk/bindings/tk/plserver.c
===================================================================
--- trunk/bindings/tk/plserver.c	2014-02-07 05:42:56 UTC (rev 12982)
+++ trunk/bindings/tk/plserver.c	2014-02-08 19:00:24 UTC (rev 12983)
@@ -115,25 +115,33 @@
 
 // Save arglist to get around Tk_ParseArgv limitations
 
+    fprintf(stderr, "Before myargv\n");
+
     myargv = (const char **) malloc( argc * sizeof ( char * ) );
     for ( i = 0; i < argc; i++ )
     {
         myargv[i] = argv[i];
     }
 
+    fprintf(stderr, "After myargv\n");
+
 // Parse args
 // Examine the result string to see if an error return is really an error
 
     if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv,
              argTable, TK_ARGV_NO_DEFAULTS ) != TCL_OK )
     {
+    fprintf(stderr, "Error in Tk_ParseArgv\n");
         fprintf( stderr, "\n(plserver) %s\n\n", Tcl_GetStringResult( interp ) );
         fprintf( stderr, "\
 The client_<xxx> and -child options should not be used except via the\n\
 PLplot/Tk driver.\n\n(wish) " );
+    fprintf(stderr, "Before Tcl_SetResult\n");
         Tcl_SetResult( interp, (char *) helpmsg, TCL_VOLATILE );
     }
 
+    fprintf(stderr, "After Tk_ParseArgv\n");
+
 // No longer need interpreter
 
 #if TCL_MAJOR_VERSION < 7 || ( TCL_MAJOR_VERSION == 7 && TCL_MINOR_VERSION < 5 )

Modified: trunk/cmake/epa_build/cmake/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/cmake/CMakeLists.txt	2014-02-07 05:42:56 UTC (rev 12982)
+++ trunk/cmake/epa_build/cmake/CMakeLists.txt	2014-02-08 19:00:24 UTC (rev 12983)
@@ -1,76 +1,76 @@
-# cmake/CMakeLists.txt
-
-# Configure the build of cmake.
-
-# Copyright (C) 2013 Alan W. Irwin
-
-# This file is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this file; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-# An external curl library (see --system-curl option below) is
-# required to build cmake because the cmake internal version of curl
-# is quite lame (no openssl capability, for example).  Also, we
-# haven't yet implemented a curl epa_build configuration because that
-# is going to be somewhat difficult due to the large number of
-# dependencies.  See
-# http://www.linuxfromscratch.org/blfs/view/svn/basicnet/curl.html for
-# a list of those dependencies.  There is some hope because
-# some of those are optional so I may tackle the curl epa_build configuration
-# sooner rather than later.
-
-# For now we are okay on Linux because we can just use the system curl
-# library for the cmake build, but on Windows it is unlikely curl is
-# installed so we will be unable to build a powerful cmake (until a
-# curl epa_build configuration is available).  Note, if the Windows
-# build of cmake fails, then either install curl (if that is possible)
-# or use the workaround of downloading a binary download from kitware
-# that apparently does use a powerful Windows version of curl.
-
-set(PACKAGE cmake)
-
-# List of dependencies (most of which are build tools) which should be
-# ignored.
-set(ignored_dependencies_LIST curl ${extra_ignored_dependencies_list})
-
-set(dependencies_LIST curl)
-
-# Do boilerplate tasks that must be done for each different project
-# that is configured as part of epa_build.
-epa_boilerplate(
-  ignored_dependencies_LIST
-  PACKAGE
-  dependencies_LIST
-  dependencies_targets
-  EPA_PATH
-  source_PATH
-  )
-
-set(CFLAGS "$ENV{CFLAGS}")
-set(CXXFLAGS "$ENV{CXXFLAGS}")
-
-# Data that is related to downloads.
-set(DIR v2.8)
-set(VERSION 2.8.12.1)
-set(URL http://www.cmake.org/files/${DIR}/cmake-${VERSION}.tar.gz)
-set(DOWNLOAD_HASH_TYPE MD5)
-set(DOWNLOAD_HASH 9d38cd4e2c94c3cea97d0e2924814acc)
-
-ExternalProject_Add(
-  build_${PACKAGE}
-  URL ${URL}
-  URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${SH_EXECUTABLE} ${EPA_BASE}/Source/build_${PACKAGE}/bootstrap --prefix=${EPA_CMAKE_INSTALL_PREFIX} --parallel=8 --verbose --system-curl --no-qt-gui
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
-  )
+# cmake/CMakeLists.txt
+
+# Configure the build of cmake.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# An external curl library (see --system-curl option below) is
+# required to build cmake because the cmake internal version of curl
+# is quite lame (no openssl capability, for example).  Also, we
+# haven't yet implemented a curl epa_build configuration because that
+# is going to be somewhat difficult due to the large number of
+# dependencies.  See
+# http://www.linuxfromscratch.org/blfs/view/svn/basicnet/curl.html for
+# a list of those dependencies.  There is some hope because
+# some of those are optional so I may tackle the curl epa_build configuration
+# sooner rather than later.
+
+# For now we are okay on Linux because we can just use the system curl
+# library for the cmake build, but on Windows it is unlikely curl is
+# installed so we will be unable to build a powerful cmake (until a
+# curl epa_build configuration is available).  Note, if the Windows
+# build of cmake fails, then either install curl (if that is possible)
+# or use the workaround of downloading a binary download from kitware
+# that apparently does use a powerful Windows version of curl.
+
+set(PACKAGE cmake)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(ignored_dependencies_LIST curl ${extra_ignored_dependencies_list})
+
+set(dependencies_LIST curl)
+
+# Do boilerplate tasks that must be done for each different project
+# that is configured as part of epa_build.
+epa_boilerplate(
+  ignored_dependencies_LIST
+  PACKAGE
+  dependencies_LIST
+  dependencies_targets
+  EPA_PATH
+  source_PATH
+  )
+
+set(CFLAGS "$ENV{CFLAGS}")
+set(CXXFLAGS "$ENV{CXXFLAGS}")
+
+# Data that is related to downloads.
+set(DIR v2.8)
+set(VERSION 2.8.12.2)
+set(URL http://www.cmake.org/files/${DIR}/cmake-${VERSION}.tar.gz)
+set(DOWNLOAD_HASH_TYPE MD5)
+set(DOWNLOAD_HASH 17c6513483d23590cbce6957ec6d1e66)
+
+ExternalProject_Add(
+  build_${PACKAGE}
+  URL ${URL}
+  URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${SH_EXECUTABLE} ${EPA_BASE}/Source/build_${PACKAGE}/bootstrap --prefix=${EPA_CMAKE_INSTALL_PREFIX} --parallel=8 --verbose --system-curl --no-qt-gui
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
+  )

Modified: trunk/cmake/epa_build/swig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/swig/CMakeLists.txt	2014-02-07 05:42:56 UTC (rev 12982)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt	2014-02-08 19:00:24 UTC (rev 12983)
@@ -1,85 +1,86 @@
-# swig/CMakeLists.txt
-
-# Configure the build of swig.
-
-# N.B. this file is generated so if you edit it you will lose all your
-# changes the next time it is generated (typically by running
-# either/both the update_added_packages.sh or update_pango_packages.sh
-# scripts).  If those scripts do not provide good results, then
-# consider changing their source files (e.g., by editing the files
-# used in those scripts) or add a patch to be run by those scripts.
-
-# Copyright (C) 2013 Alan W. Irwin
-
-# This file is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this file; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-set(PACKAGE swig)
-
-# List of dependencies (most of which are build tools) which should be
-# ignored.
-set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
-
-set(dependencies_LIST libpcre)
-
-# Do boilerplate tasks that must be done for each different project
-# that is configured as part of epa_build.
-epa_boilerplate(
-  ignored_dependencies_LIST
-  PACKAGE
-  dependencies_LIST
-  dependencies_targets
-  EPA_PATH
-  source_PATH
-  ) 
-
-if(MSYS_PLATFORM)
-  set(CFLAGS "$ENV{CFLAGS}")
-else(MSYS_PLATFORM)
-  set(CFLAGS "$ENV{CFLAGS}")
-endif(MSYS_PLATFORM)
-
-set(CXXFLAGS "$ENV{CXXFLAGS}")
-
-# Drop -fvisibility=hidden since that option does not work for a
-# number of software packages that are configured automatically using
-# this template.
-string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
-string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}")
-
-# Data that is related to downloads.
-set(URL http://downloads.sourceforge.net/swig/swig/swig-2.0.11/swig-2.0.11.tar.gz)
-set(DOWNLOAD_HASH_TYPE SHA256)
-set(DOWNLOAD_HASH 63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e)
-
-ExternalProject_Add(
-  build_${PACKAGE}
-  DEPENDS ${dependencies_targets}
-  URL ${URL}
-  URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "LDFLAGS=-Wl,-rpath -Wl,${EPA_CMAKE_INSTALL_PREFIX}/lib" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} 
-  BUILD_IN_SOURCE OFF
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}  install
-  )
-
-add_custom_command(
-  OUTPUT
-  ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
-  COMMAND ${CMAKE_COMMAND} -E echo 
-  "Provide swig support for octave-3.8.0"
-  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/octave-3.8.0.patch
-  APPEND
-  )
+# swig/CMakeLists.txt
+
+# Configure the build of swig.
+
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts).  If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+set(PACKAGE swig)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
+
+set(dependencies_LIST libpcre)
+
+# Do boilerplate tasks that must be done for each different project
+# that is configured as part of epa_build.
+epa_boilerplate(
+  ignored_dependencies_LIST
+  PACKAGE
+  dependencies_LIST
+  dependencies_targets
+  EPA_PATH
+  source_PATH
+  )
+
+if(MSYS_PLATFORM)
+  # Add two MSYS specific flags to avoid compile errors
+  set(CFLAGS "-D__NO_MINGW_LFS -U__STRICT_ANSI__ $ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(CFLAGS "$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+
+set(CXXFLAGS "$ENV{CXXFLAGS}")
+
+# Drop -fvisibility=hidden since that option does not work for a
+# number of software packages that are configured automatically using
+# this template.
+string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
+string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}")
+
+# Data that is related to downloads.
+set(URL http://downloads.sourceforge.net/swig/swig/swig-2.0.11/swig-2.0.11.tar.gz)
+set(DOWNLOAD_HASH_TYPE SHA256)
+set(DOWNLOAD_HASH 63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e)
+
+ExternalProject_Add(
+  build_${PACKAGE}
+  DEPENDS ${dependencies_targets}
+  URL ${URL}
+  URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
+  PATCH_COMMAND ""
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "LDFLAGS=-Wl,-rpath -Wl,${EPA_CMAKE_INSTALL_PREFIX}/lib" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
+  BUILD_IN_SOURCE OFF
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}  install
+  )
+
+add_custom_command(
+  OUTPUT
+  ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
+  COMMAND ${CMAKE_COMMAND} -E echo
+  "Provide swig support for octave-3.8.0"
+  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/octave-3.8.0.patch
+  APPEND
+  )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12982] trunk/cmake/epa_build/CMakeLists.txt

[<ai...@us...>]

Revision: 12982
          http://sourceforge.net/p/plplot/code/12982
Author:   airwin
Date:     2014-02-07 05:42:56 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
Do not allow a cmake build for the MSYS platform case for the
reasons mentioned in cmake/epa_build/README.

Modified Paths:
--------------
    trunk/cmake/epa_build/CMakeLists.txt

Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt	2014-02-07 02:49:25 UTC (rev 12981)
+++ trunk/cmake/epa_build/CMakeLists.txt	2014-02-07 05:42:56 UTC (rev 12982)
@@ -378,7 +378,6 @@
   # Order does not matter because the dependency logic takes
   # care of any ordering issues.
   set(subdirectories_LIST
-    cmake
     pkg-config
     ##subversion
     swig
@@ -395,6 +394,15 @@
     # iwidgets (version 4.0.1)
     iwidgets4.0
     )
+  if(NOT MSYS_PLATFORM)
+    # Required system version of libcurl, an essential cmake build
+    # dependency, is not currently (until the epa_build project
+    # configures that build) available for the MSYS_PLATFORM.  So only
+    # allow the potential to build the cmake buildtool for the
+    # non-MSYS platform case.  And for the MSYS platform case use a
+    # binary version of CMake supplied by Kitware.
+    list(APPEND subdirectories_LIST cmake)
+  endif(NOT MSYS_PLATFORM)
 else(BUILD_THE_BUILDTOOLS)
   # List sufficient normal package configurations so they will suck in 
   # the remaining configurations via dependencies.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12981] trunk/README.release

[<ai...@us...>]

Revision: 12981
          http://sourceforge.net/p/plplot/code/12981
Author:   airwin
Date:     2014-02-07 02:49:25 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
Describe my tests for this release.  Note the tough part of these are
already done (comprehensive noninteractive test on MinGW/MSYS) and I
am completely confident I can finish the rest, but if not these notes
will have to be revised.

Modified Paths:
--------------
    trunk/README.release

Modified: trunk/README.release
===================================================================
--- trunk/README.release	2014-02-06 08:05:34 UTC (rev 12980)
+++ trunk/README.release	2014-02-07 02:49:25 UTC (rev 12981)
@@ -25,6 +25,8 @@
 
 3. Tests made for the current release
 
+4. Tests made for the prior release
+
 1. OFFICIAL NOTICES FOR USERS
 
 The distinction we made prior to 5.10.0 between stable and development
@@ -61,8 +63,11 @@
 2.3 Update the PLplot build system so that the Tcl/Tk/Itcl/Itk/Iwidgets
 bindings and examples work on MinGW/MSYS.
 
-2.4 Update api.xml to be consistent with our public API defined by plplot.h.
+2.4 Make many minor build-system fixes so that comprehensive tests (see
+test summaries below) finally work well on MinGW/MSYS.
 
+2.5 Update api.xml to be consistent with our public API defined by plplot.h.
+
 This substantial improvement to our DocBook documentation for our
 public API has been made possible by the "check" application written
 by Hǎiliàng Wáng (see
@@ -80,13 +85,64 @@
 
 3. Tests made for the current release.
 
-None at this time.  
+Note that "comprehensive tests" below refers to running
+scripts/comprehensive_test.sh in default mode (i.e., not dropping any
+tests).  For each of our three major configurations (shared
+libraries/dynamic devices, shared libraries/nondynamic devices, and
+static libraries/nondynamic devices) this test script runs ctest in
+the build tree and runs the test_noninteractive and test_interactive
+targets in the build tree, the installed examples tree configured with
+a CMake-based build system for the examples, and an installed examples
+tree configured with our traditional (Make + pkg-config) build system
+for the examples.  Testers can run that script directly or there is a
+convenient option called -DENABLE_COMPREHENSIVE_PLPLOT_TEST=ON for
+epa_build (see cmake/epa_build/README) that automatically runs that
+script for the build_plplot_lite case (The cairo, qt, and wxwidgets
+device drivers are dropped) or the usual build_plplot case (no components
+of PLplot dropped).
 
-However, to remind testers of what they did in the latter
-stages of the release cycle for the previous release
-here are the notes from those earlier tests:
+Note that all tests mentioned below were successful ones unless
+noted differently.
 
+* Alan W. Irwin ran comprehensive tests via epa_build of plplot (as
+opposed to plplot_lite) on a 64-bit Debian Wheezy Linux platform on
+AMD-64 hardware.  That system has virtually every relevant PLplot
+dependency either epa_built or system-installed.  So these tests are
+virtually complete test of all aspects of PLplot.
 
+* Alan W. Irwin ran comprehensive tests via epa_build of plplot_lite (as
+opposed to plplot) on a 64-bit Debian Wheezy Linux platform on
+AMD-64 hardware.  These tests show that the remaining components
+of PLplot work well when some important components (i.e., cairo, qt, and
+wxwidgets device drivers) are dropped.
+
+* Alan W. Irwin ran comprehensive tests of plplot_lite on 32-bit
+MinGW/MSYS/Wine for AMD-64 hardware.  (This test is only for
+plplot_lite since currently some of the additional dependencies of
+plplot do not build on MinGW/MSYS/Wine.  It is not clear whether this
+is due to a Wine issue or an epa_build configuration issue for
+MinGW/MSYS.)  The language bindings and examples tested were ada, c,
+c++, f95, lua, python, tcl, tk, itcl, itk. and iwidgets.  The device
+drivers tested were ntk, pdf, ps, svg, wingcc, and xfig.  So this test
+is less complete than the equivalent Linux test above due to lack of
+PLplot dependencies on MinGW/MSYS.  But the epa_build project has
+already closed some of that dependency gap for this platform (e.g., by
+providing builds of pkg-config, swig, libagg, libharu, shapelib,
+libqhull, and everything Tcl-related), and it is hoped it will close
+even more of that dependency gap in the future.
+
+The Wine version for this test was 1.6.1 which was built on Debian
+Wheezy; the compiler was (MinGW) gcc-4.7.2; the Windows binary version
+of CMake was downloaded from Kitware and was version 2.8.12.1; the
+CMake generator was "MSYS Makefiles"; and the build command was "make"
+(i.e., the MSYS version, not the MinGW version).
+
+4. Tests made for the prior release
+
+To remind the test team of the tests that were run for the
+last release (5.9.11) here are the complete notes on
+those tests from the previous release announcement.
+
 Note that "comprehensive tests" below refers to running
 scripts/comprehensive_test.sh in default mode (i.e., not dropping any
 tests).  For each of our three major configurations (shared
@@ -104,7 +160,7 @@
 * Alan W. Irwin ran comprehensive tests for a complete system build
 environment on 64-bit Debian Wheezy Linux for AMD-64 hardware.
 
-* Alan W. Irwin ran comprehensive testsfor a limited (qt, cairo, wxwidgets,
+* Alan W. Irwin ran comprehensive tests for a limited (qt, cairo, wxwidgets,
 and octave PLplot components were dropped) epa_build environment on
 64-bit Debian Wheezy Linux for AMD-64 hardware.
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12980] trunk/cmake/epa_build/README

[<ai...@us...>]

Revision: 12980
          http://sourceforge.net/p/plplot/code/12980
Author:   airwin
Date:     2014-02-06 08:05:34 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
Update directions to be consistent with my recent experience with
epa_build.

Modified Paths:
--------------
    trunk/cmake/epa_build/README

Modified: trunk/cmake/epa_build/README
===================================================================
--- trunk/cmake/epa_build/README	2014-02-06 07:29:41 UTC (rev 12979)
+++ trunk/cmake/epa_build/README	2014-02-06 08:05:34 UTC (rev 12980)
@@ -1,5 +1,5 @@
-This file contains directions for epa_build users.  If in addition you
-are interested in helping to develop that project, you should look at
+This file contains directions for epa_build users.  If you are
+interested in helping to develop that project, you should look at
 README.developers as well.
 
 The epa_build project should work out of the box for Linux or Mac OS X
@@ -79,31 +79,52 @@
 ===============================================================================
 Set up instructions for epa_build
 
+Setup consists of setting the following environment variables
+in a way that is appropriate for your particular system.
+
+INSTALL_PREFIX
+EPA_BUILD_SOURCE_PATH
+CFLAGS
+CXXFLAGS
+FFLAGS
+CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH
+PATH
+PKG_CONFIG_PATH
+BUILD_COMMAND
+GENERATOR_STRING
+
+These environment variables are normally set by using
+the source command from bash.  See how this is done for
+various platforms below.
+
 I. Unix platforms:
 
 * Linux
 
-Tailor the indicated values in setup/setup_linux_makefiles for your own
-system, then source that file, e.g.,
+Tailor the indicated values (which are appropriate for my particular
+Linux system) in setup/setup_linux_makefiles for your own system, then
+source that file, i.e.,
 
 source <Top directory of PLplot source tree>/cmake/epa_build/setup/setup_linux_makefiles
 
 * Mac OS X
 
-This has not been tried yet, but something similar to
+This has not been tried yet, but a tailored version of
 setup_linux_makefiles should do the job.
 
 * Cygwin on Windows
 
 Some experiments with this have just been started with nothing written
-down with regards to setup.  But ultimately it should be very similar
-to the Linux case.
+down with regards to setup.  But ultimately it should be similar
+to a tailored form of the Linux case.
 
 II. Non-Cygwin Windows platforms:
 
 * MinGW/MSYS for the Wine version of Windows
 
-Tailor the indicated values in setup_mingw_msys_wine_toolchain and
+Tailor the indicated values (which are appropriate for my particular
+Wine system) in setup_mingw_msys_wine_toolchain and
 setup/setup_msys_makefiles for your own system.  Then execute something
 similar to the following from Linux to get into the bash.exe shell
 on Wine:
@@ -115,10 +136,11 @@
 
 bash.exe-3.1$ pushd /z/home/software/plplot_svn/HEAD/plplot_allura/cmake/epa_build/setup;source setup_msys_makefiles;popd
 
-(You need to pushd or cd above to the setup directory because the the
-setup_msys_makefiles file that is sourced, automatically executes
-"source setup_mingw_msys_wine_toolchain", and that only works if it is
-done from the setup directory.)
+You need to pushd to the setup directory to run the source command on
+this platform, then popd back to the original directory as above.  The
+reason for this minor complication is setup_msys_makefiles excecutes "source
+setup_mingw_msys_wine_toolchain", and that only works if it is done
+from the setup directory (the location of that file).
 
 * MinGW/MSYS for the Microsoft version of Windows
 
@@ -148,8 +170,7 @@
 
 Note that setup_linux_makefiles (which needs to be tailored by each
 individual who uses epa_build) sets up all the important environment
-variables you need including GENERATOR_STRING, INSTALL_PREFIX,
-EPA_BUILD_SOURCE_PATH, and BUILD_COMMAND.
+variables listed above.
 
 A. [OPTIONAL] build necessary additional buildtools whose versions you
 prefer compared to the versions available on your Linux distro.
@@ -170,7 +191,7 @@
 ${BUILD_COMMAND} help
 
 # I recommend building all of them on Linux.
-make build_all >& build_all.out
+${BUILD_COMMAND} build_all >& build_all.out
 
 # Check build_all.out for any errors
 less build_all.out
@@ -178,8 +199,8 @@
 B. Build and test a lite version of PLplot (without building or using
 major soft dependencies such as pango/cairo, Qt4, and wxwidgets)
 and [OPTIONAL] a fully configured PLplot version (where currently
-pango/cairo and wxwidgets are built and used and the system
-version of Qt4 is used).
+pango/cairo, wxwidgets, and Qt4 are built and used and the system
+version of octave is used).
 
 # Insure you start with an empty build tree and vacant install tree
 # Set <Build tree prefix> to any convenient directory under your control
@@ -188,15 +209,28 @@
 rm -rf <Build tree prefix>/build_dir-linux/* ${INSTALL_PREFIX}
 cd <Build tree prefix>/build_dir-linux
 
-cmake -DCMAKE_VERBOSE_MAKEFILE=ON -G"$GENERATOR_STRING" -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX} $EPA_BUILD_SOURCE_PATH >& cmake.out
 
+# N.B. the -DENABLE_COMPREHENSIVE_PLPLOT_TEST=ON option below
+# configurues a run of the comprehensive test script just after PLplot
+# is built and installed for both the build_plplot and
+# build_plplot_lite targets.  This test script (familiar to PLplot
+# developers) requires substantial extra CPU time and ~4GB of extra
+# disk space to run.  If you prefer only to build and install PLplot
+# without doing any run-time testing of the results do not set this
+# option or else use -DENABLE_COMPREHENSIVE_PLPLOT_TEST=OFF
+
+cmake -DCMAKE_VERBOSE_MAKEFILE=ON -G"$GENERATOR_STRING" -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX -DENABLE_COMPREHENSIVE_PLPLOT_TEST=ON $EPA_BUILD_SOURCE_PATH >& cmake.out
+
 # Check cmake.out for any errors
 less cmake.out
 
 # Figure out which packages you want to build
 ${BUILD_COMMAND} help
 
-# Build and test the "lite" version of PLplot
+# Build and test the "lite" version of PLplot.
+# Comprehensive checks of PLplot will be performed if
+# you have set -DENABLE_COMPREHENSIVE_PLPLOT_TEST=ON above, but
+# they will take substantial time and disk space.
 ${BUILD_COMMAND} build_plplot_lite >& build_plplot_lite.out
 
 # Check build_plplot_lite.out for any errors
@@ -208,13 +242,6 @@
 # Check build_plplot.out for any errors
 less build_plplot.out
 
-# N.B. add the option -DENABLE_COMPREHENSIVE_PLPLOT_TEST=ON to the
-# above cmake command to run a comprehensive test script just after
-# PLplot is built and installed for both the build_plplot and
-# build_plplot_lite targets.  This test script (familiar to PLplot
-# developers) requires substantial extra CPU time and ~4GB of extra
-# disk space to run.
-
 * Mac OS X and Cygwin
 
 These epa_builds should be very similar to the Linux case.  I suggest
@@ -227,43 +254,42 @@
 II. Non-Cygwin Windows platforms
 
 Note that setup_msys_makefiles and setup_mingw_makefiles (which need
-to be tailored by each individual who uses epa_build) are designed to
-set up for the "MSYS Makefiles" generator and the "MinGW Makefiles
-generator all the important environment variables you need including
-GENERATOR_STRING, INSTALL_PREFIX, EPA_BUILD_SOURCE_PATH, and
-BUILD_COMMAND.  Similarly, other setup files should be created for
-other Windows generators that I (AWI) have tried so far by hand such as
-"NMake Makefiles JOM" and "Ninja".
+to be tailored by each individual who uses epa_build) for these
+platforms are designed to set up for the "MSYS Makefiles" generator
+and the "MinGW Makefiles generator all the environment variables
+listed above.  Similarly, other setup files should be created for
+other Windows generators that I (AWI) have tried so far by hand such
+as "NMake Makefiles JOM" and "Ninja".
 
 For the MinGW/MSYS/Wine case, I (AWI) essentially followed the same
-instructions as above for the Linux case.  However, some of the
-buildtools (e.g., Tcl/Tk/Itcl/Itk/Iwidgets variants) don't yet build
-on Windows and although CMake builds fine on MinGW/MSYS, the result
-does not have the power (supplied only by a fully configured curl
-library and not by the internal curl alternative that the CMake build
-can use as a backup) to download from "https" archives which is
-essential for some of the epa_builds.  The Linux and Cygwin platforms
-do give the required access to a full-featured Curl library for the
-cmake build to link to, but on MinGW/MSYS the only alternative is to
-build your own curl library, and the epa_build configuration for that
-has not been implemented yet although it is on my ToDo list.  The net
-result of these considerations is I only built pkg-config and swig for
-the -DBUILD_THE_BUILDTOOLS=ON case which in turn implied I dropped
-everything that was Tcl related from the PLplot build and relied on
-the pre-built (and fully powered) binary version of CMake downloaded
-from Kitware (see above setup instructions).  Also, for ordinary
-epa_builds (with -DBUILD_THE_BUILDTOOLS=OFF), I only had success with
-plplot_lite and not plplot.  The reason was the extra pango and qt
-dependencies of plplot which had dependent packages of their own that
-could not yet be built on Windows.
+instructions as above for the Linux case, including building all the
+buildtools.  The run-time results for all those buildtools are fine
+except for cmake.  Although the epa_build of cmake has no build
+errors, the result does not have the power (supplied only by a fully
+configured curl library and not by the internal curl alternative that
+the cmake epa_build on Windows currently uses as a backup) to download
+from "https" archives which is essential for some of the epa_builds.
+The Linux and Cygwin platforms do give the required access to a
+full-featured Curl library for the cmake epa_build to link to, but on
+MinGW/MSYS the only alternative is to build your own curl library, and
+the epa_build configuration for that has not been implemented yet
+(although it is on my ToDo list).  The net result of these
+considerations is I placed (via the above setup files) the pre-built
+(and fully powered) binary version of CMake downloaded from Kitware
+higher on my PATH than the epa_build version of that buildtool.  Also,
+for ordinary epa_builds (with -DBUILD_THE_BUILDTOOLS=OFF), I only had
+success with plplot_lite and not plplot on MinGW/MSYS.  The reason was the extra
+pango and qt dependencies of plplot which had dependent packages of
+their own that have build errors on MinGW/MSYS.
 
-N.B. the tweaks required to make all epa_builds work on Windows should
-be few per project since many others have had success building all
-projects on Windows that are covered by epa_build.  But there are a
-lot of such projects in, for example, the dependency list for pango,
-and often the Windows build tweaks are not well publicized.  Thus,
-some substantial and sustained effort (but not an impossibly difficult
-effort) will be required to get all of the epa_build configurations to
-work for the Windows case, and the success I have achieved with a
-limited group of projects for the MinGW/MSYS/Wine case is a good
+N.B. the epa_build configuration tweaks required to make all epa_builds work on
+MinGW/MSYS (and other Windows platforms) should be few per project
+since many others have had success building all projects on Windows
+that are covered by epa_build.  But there are a lot of such projects
+in, for example, the dependency list for pango, and often the Windows
+build tweaks are not well publicized.  Thus, some substantial and
+sustained effort (but not an inherently difficult effort) will be
+required to get all of the epa_build configurations to work for the
+Windows case, and the success I have achieved with a limited group of
+projects for the plplot_lite case on MinGW/MSYS/Wine is a promising
 start.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12979] trunk/cmake/epa_build/setup/ setup_mingw_msys_wine_toolchain

[<ai...@us...>]

Revision: 12979
          http://sourceforge.net/p/plplot/code/12979
Author:   airwin
Date:     2014-02-06 07:29:41 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
If cmake is epa_built as one of the buildtools on MinGW/MSYS
platforms, ignore it in favor of the more powerful Windows binary
version you can download from kitware.  This measure will be required
until the curl library and its dependencies (including openssl) are
configured as part of epa_build and made dependencies of the cmake
epa_build. Without access to an external curl, cmake drops back to its
internal curl library which does not allow downloads of "https" URLS
(essential for epa_build to work!).

Modified Paths:
--------------
    trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain

Modified: trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain	2014-02-06 05:14:46 UTC (rev 12978)
+++ trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain	2014-02-06 07:29:41 UTC (rev 12979)
@@ -44,13 +44,6 @@
 CMAKE_INCLUDE_PATH=$PYTHON_PATH/include:$CMAKE_INCLUDE_PATH
 CMAKE_LIBRARY_PATH=$PYTHON_PATH/libs:$CMAKE_LIBRARY_PATH
 
-# Put CMake, Python, subversion and MinGW on the PATH.
-
-PATH=$CMAKE_PATH:$PATH
-PATH=$PYTHON_PATH:$PATH
-PATH=$CMAKE_PATH:$PATH
-PATH=$MINGW_PREFIX/bin/:$PATH
-
 # Allow using -DBUILD_THE_BUILDTOOLS=ON results from epa_build
 # pkg-config, tclsh, and wish setup.
 PATH=$BUILDTOOLS_PREFIX/bin:$PATH
@@ -58,4 +51,12 @@
 # Allow using itcl3 and itk3 libraries:
 PATH=$BUILDTOOLS_PREFIX/lib/itcl3.4:$BUILDTOOLS_PREFIX/lib/itk3.3:$PATH
 
+# Put downloaded binary CMake (which overrides the buildtools result
+# for cmake which is weaker at the moment because of the lack of a
+# proper Curl library epa_build), Python, and MinGW on the PATH.
+
+PATH=$CMAKE_PATH:$PATH
+PATH=$PYTHON_PATH:$PATH
+PATH=$MINGW_PREFIX/bin/:$PATH
+
 export PKG_CONFIG_PATH=/z/home/wine/newstart/MinGW-4.7.2/msys/1.0/lib/pkgconfig:$BUILDTOOLS_PREFIX/share/pkgconfig:$BUILDTOOLS_PREFIX/lib/pkgconfig

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12978] trunk/cmake/epa_build

[<ai...@us...>]

Revision: 12978
          http://sourceforge.net/p/plplot/code/12978
Author:   airwin
Date:     2014-02-06 05:14:46 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
Improve logic dealing with ENABLE_COMPREHENSIVE_PLPLOT_TEST choices.

This logic gives good test results (so far just the noninteractive
case has been tested) for the epa_build build_plplot_lite
target on Linux for -DENABLE_COMPREHENSIVE_PLPLOT_TEST=ON

A preliminary subset of those plplot_lite tests have been successfully
run on MinGW/MSYS/Wine, and a job with the same comprehensive test
conditions as above has been started on that platform.

Modified Paths:
--------------
    trunk/cmake/epa_build/plplot/CMakeLists.txt
    trunk/cmake/epa_build/plplot_lite/CMakeLists.txt

Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-02-06 05:06:07 UTC (rev 12977)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-02-06 05:14:46 UTC (rev 12978)
@@ -83,46 +83,71 @@
   determine_msys_path(EPA_PATH "${EPA_PATH}")
 endif(MSYS_PLATFORM)
 
-if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
-  string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
-
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
-    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_test_interactive no"
-    )
-
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
-    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_ctest no --do_test_noninteractive no"
-    )
-
-endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
-
 ExternalProject_Add(
   build_${PACKAGE}
   DEPENDS "${dependencies_targets}"
   DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLPLOT_LOCAL_SOURCE_DIR} ${EPA_BASE}/Source/build_${PACKAGE}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "FFLAGS=${FFLAGS}" ${EPA_CMAKE_COMMAND} -DBUILD_TEST=ON ${cmake_args} ${EPA_BASE}/Source/build_${PACKAGE}
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
   TEST_BEFORE_INSTALL OFF
   TEST_COMMAND ""
   STEP_TARGETS configure build install test
   )
 
 if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+  string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_ctest no --do_test_noninteractive no"
+    )
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_test_interactive no"
+    )
+
   add_custom_command(
     OUTPUT
     ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    APPEND
+    )
+
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
     COMMAND ${CMAKE_COMMAND} -E echo "comprehensive noninteractive tests"
     COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
     APPEND
     )
+else(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
 
+  # If ENABLE_COMPREHENSIVE_PLPLOT_TEST is not true, then just
+  # configure a pure default case and build and install it.
+
   add_custom_command(
     OUTPUT
-    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
-    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
-    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-configure
+    COMMAND ${CMAKE_COMMAND} -E echo "configure"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "FFLAGS=${FFLAGS}" ${EPA_CMAKE_COMMAND} -DBUILD_TEST=ON ${cmake_args} ${EPA_BASE}/Source/build_${PACKAGE}
     APPEND
     )
 
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-build
+    COMMAND ${CMAKE_COMMAND} -E echo "build"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
+    APPEND
+    )
+
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
+    COMMAND ${CMAKE_COMMAND} -E echo "install"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
+    APPEND
+    )
+
 endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)

Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2014-02-06 05:06:07 UTC (rev 12977)
+++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2014-02-06 05:14:46 UTC (rev 12978)
@@ -82,46 +82,71 @@
   determine_msys_path(EPA_PATH "${EPA_PATH}")
 endif(MSYS_PLATFORM)
 
-if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
-  string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
-
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
-    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_test_interactive no"
-    )
-
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
-    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_ctest no --do_test_noninteractive no"
-    )
-
-endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
-
 ExternalProject_Add(
   build_${PACKAGE}
   DEPENDS "${dependencies_targets}"
   DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLPLOT_LOCAL_SOURCE_DIR} ${EPA_BASE}/Source/build_${PACKAGE}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "FFLAGS=${FFLAGS}" ${EPA_CMAKE_COMMAND} -DBUILD_TEST=ON ${cmake_args} ${EPA_BASE}/Source/build_${PACKAGE}
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
   TEST_BEFORE_INSTALL OFF
   TEST_COMMAND ""
   STEP_TARGETS configure build install test
   )
 
 if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+  string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_ctest no --do_test_noninteractive no"
+    )
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_test_interactive no"
+    )
+
   add_custom_command(
     OUTPUT
     ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    APPEND
+    )
+
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
     COMMAND ${CMAKE_COMMAND} -E echo "comprehensive noninteractive tests"
     COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
     APPEND
     )
+else(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
 
+  # If ENABLE_COMPREHENSIVE_PLPLOT_TEST is not true, then just
+  # configure a pure default case and build and install it.
+
   add_custom_command(
     OUTPUT
-    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
-    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
-    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-configure
+    COMMAND ${CMAKE_COMMAND} -E echo "configure"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "FFLAGS=${FFLAGS}" ${EPA_CMAKE_COMMAND} -DBUILD_TEST=ON ${cmake_args} ${EPA_BASE}/Source/build_${PACKAGE}
     APPEND
     )
 
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-build
+    COMMAND ${CMAKE_COMMAND} -E echo "build"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
+    APPEND
+    )
+
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
+    COMMAND ${CMAKE_COMMAND} -E echo "install"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
+    APPEND
+    )
+
 endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12977] trunk/cmake/modules/pkg-config.cmake

[<ai...@us...>]

Revision: 12977
          http://sourceforge.net/p/plplot/code/12977
Author:   airwin
Date:     2014-02-06 05:06:07 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
Fix recently introduced regression in the Linux case for PKG_CONFIG_ENV.

Modified Paths:
--------------
    trunk/cmake/modules/pkg-config.cmake

Modified: trunk/cmake/modules/pkg-config.cmake
===================================================================
--- trunk/cmake/modules/pkg-config.cmake	2014-02-06 05:04:19 UTC (rev 12976)
+++ trunk/cmake/modules/pkg-config.cmake	2014-02-06 05:06:07 UTC (rev 12977)
@@ -41,14 +41,28 @@
   message(STATUS "Looking for pkg-config - found")
   set(PKG_CONFIG_DIR "${LIB_DIR}/pkgconfig")
   set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
-  if(env_PKG_CONFIG_PATH)
-    set(_pkg_config_path "${PKG_CONFIG_DIR};${env_PKG_CONFIG_PATH}")
-  else(env_PKG_CONFIG_PATH)
-    set(_pkg_config_path "${PKG_CONFIG_DIR}")
-  endif(env_PKG_CONFIG_PATH)
 
+  # Will likely need WIN32 and CYGWIN stanzas as well
   if(MINGW)
+    if(env_PKG_CONFIG_PATH)
+      # On MinGW (and probably Cygwin and bare Windows) env_PKG_CONFIG_PATH
+      # is semi-colon delimited.
+      set(_pkg_config_path "${PKG_CONFIG_DIR};${env_PKG_CONFIG_PATH}")
+    else(env_PKG_CONFIG_PATH)
+      set(_pkg_config_path "${PKG_CONFIG_DIR}")
+    endif(env_PKG_CONFIG_PATH)
+    # Convert semi-colon delimited path string with colon drive
+    # letters to a colong delimited path form with slash drive letters
+    # that pkg-config configuration files can use.
     determine_msys_path(_pkg_config_path "${_pkg_config_path}")
+  else(MINGW)
+    # Only tested on Unix (Linux) so far where env_PKG_CONFIG_PATH
+    # is colon-delimited.
+    if(env_PKG_CONFIG_PATH)
+      set(_pkg_config_path "${PKG_CONFIG_DIR}:${env_PKG_CONFIG_PATH}")
+    else(env_PKG_CONFIG_PATH)
+      set(_pkg_config_path "${PKG_CONFIG_DIR}")
+    endif(env_PKG_CONFIG_PATH)
   endif(MINGW)
 
   set(PKG_CONFIG_ENV PKG_CONFIG_PATH="${_pkg_config_path}")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12976] trunk/examples/CMakeLists.txt

[<ai...@us...>]

Revision: 12976
          http://sourceforge.net/p/plplot/code/12976
Author:   airwin
Date:     2014-02-06 05:04:19 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
Install Darwin-dmd.cmake (which is likely necessary for the
CMake-based build system for the installed D examples on Mac OS X).

Make CMake minimum version and policy for the installed examples
configuration consistent with the core configuration.

Output CMAKE_PLATFORM_INFO_DIR since there has sometimes been trouble
with that variable being defined.

Modified Paths:
--------------
    trunk/examples/CMakeLists.txt

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2014-02-05 22:23:38 UTC (rev 12975)
+++ trunk/examples/CMakeLists.txt	2014-02-06 05:04:19 UTC (rev 12976)
@@ -360,10 +360,12 @@
       language_support/cmake:CMakeDInformation.cmake
       language_support/cmake:CMakeDetermineDCompiler.cmake
       language_support/cmake:CMakeTestDCompiler.cmake
-      language_support/cmake/Platform:/Linux-dmd.cmake
+      language_support/cmake/Platform:Darwin-dmd.cmake
+      language_support/cmake/Platform:Linux-dmd.cmake
       language_support/cmake/Platform:Linux-gdc.cmake
       language_support/cmake/Platform:Windows-dmd.cmake
       language_support/cmake/Platform:Windows-gdc.cmake
+      language_support/cmake/Platform:Windows-gdc.cmake
       )
   endif(ENABLE_d)
 
@@ -383,23 +385,20 @@
   message(STATUS "CMake version = ${CMAKE_VERSION}")
   message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
 
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    # We prefer to support only the latest CMake version because it
-    # tends to be more free of issues and more consistent with recent
-    # software releases of software that PLplot depends on than earlier versions.
-    # However, as a special concession to our modern (not enterprise or
-    # LTS) Linux distro users so they can avoid a download of recent CMake,
-    # we allow them to use the system version of
-    # CMake which at this time (2011-10) is typically 2.8.2 or later.
-    cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR)
-  else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    # For non-Linux platforms we prefer to support only the most recent
-    # CMake version since that tends to be most free of issues and most
-    # consistent with releases of software that PLplot depends on.  The
-    # most recently released CMake is 2.8.6 at this time (2011-10).
-    cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
-  endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  # The minimum version and policy settings normally follow what is
+  # done for the core build.  Check the core build for the reasons for
+  # these decisions.
+  cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
+  if(POLICY CMP0022)
+    message(STATUS "Explicitly setting policy CMP0022 to OLD")
+    cmake_policy(SET CMP0022 OLD)
+  endif(POLICY CMP0022)
+  if(POLICY CMP0023)
+    message(STATUS "Explicitly setting policy CMP0023 to OLD")
+    cmake_policy(SET CMP0023 OLD)
+  endif(POLICY CMP0023)
 
+  message(STATUS "CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}")
   # Locations where PLplot cmake build system first looks for cmake modules.
   set(CMAKE_MODULE_PATH
     ${PROJECT_SOURCE_DIR}/cmake/modules

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12975] trunk

[<ai...@us...>]

Revision: 12975
          http://sourceforge.net/p/plplot/code/12975
Author:   airwin
Date:     2014-02-05 22:23:38 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
Update the configuration of pkg-config files so that good results are
obtained on MinGW/MSYS.

Lightly tested on MinGW/MSYS/Wine using the traditional build of
some of the installed examples.

Modified Paths:
--------------
    trunk/cmake/modules/pkg-config.cmake
    trunk/cmake/modules/plplot_functions.cmake
    trunk/src/CMakeLists.txt

Modified: trunk/cmake/modules/pkg-config.cmake
===================================================================
--- trunk/cmake/modules/pkg-config.cmake	2014-02-02 19:32:14 UTC (rev 12974)
+++ trunk/cmake/modules/pkg-config.cmake	2014-02-05 22:23:38 UTC (rev 12975)
@@ -42,10 +42,17 @@
   set(PKG_CONFIG_DIR "${LIB_DIR}/pkgconfig")
   set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
   if(env_PKG_CONFIG_PATH)
-    set(PKG_CONFIG_ENV PKG_CONFIG_PATH="${PKG_CONFIG_DIR}:${env_PKG_CONFIG_PATH}")
+    set(_pkg_config_path "${PKG_CONFIG_DIR};${env_PKG_CONFIG_PATH}")
   else(env_PKG_CONFIG_PATH)
-    set(PKG_CONFIG_ENV PKG_CONFIG_PATH="${PKG_CONFIG_DIR}")
+    set(_pkg_config_path "${PKG_CONFIG_DIR}")
   endif(env_PKG_CONFIG_PATH)
+
+  if(MINGW)
+    determine_msys_path(_pkg_config_path "${_pkg_config_path}")
+  endif(MINGW)
+
+  set(PKG_CONFIG_ENV PKG_CONFIG_PATH="${_pkg_config_path}")
+
 else(PKG_CONFIG_EXECUTABLE)
   message(STATUS "Looking for pkg-config - not found")
   message(STATUS
@@ -110,7 +117,8 @@
 macro(pkg_config_link_flags _link_flags_out _link_flags_in)
   # Transform link flags into a form that is suitable to be used for
   # output pkg-config (*.pc) files.
-  # N.B. ${_link_flags_in} must be a string and not a list.
+  # N.B. ${_link_flags_in} must be in quoted "${list_variable}" form
+  # where list_variable is a CMake list.
 
   # First strip out optimized / debug options which are not needed
   # Currently only FindQt4 seems to need this.
@@ -135,28 +143,42 @@
   # since it appears pkg-config handles that latter form much better (with
   # regard to keeping the correct order and eliminating duplicates).
 
-  # These REGEX REPLACE's won't actually replace anything on bare windows since
-  # library names are not of this form on that platform.  Something to be
-  # considered later if we decide to use pkg-config on bare windows.
+  # This logic appears to work fine on Linux, Mac OS X, and MinGW/MSYS
+  # but it may need some generalization on other platforms such as
+  # Cygwin.
+  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(suffix_list "\\.so" "\\.a")
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(suffix_list "\\.so" "\\.a" "\\.dylib")
+  elseif(WIN32_OR_CYGWIN)
+    # Order is important here.
+    set(suffix_list "\\.dll\\.a" "\\.a")
+  else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    # Probably a non-Linux, non-Mac OS X, Unix platform
+    # For this case we assume the same as Linux.
+    set(suffix_list "\\.so" "\\.a")
+  endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
-  # This logic will need to be expanded for Unix platforms other than
-  # Mac OS X and Linux.
-  if(APPLE)
-    set(suffix_list ".so" ".a" ".dylib")
-  else(APPLE)
-    set(suffix_list ".so" ".a")
-  endif(APPLE)
-
   foreach(suffix ${suffix_list})
+    if(WIN32_OR_CYGWIN)
+      # Look for colon-delimited drive-letter form on these platforms.
+      string(
+	REGEX REPLACE "([a-zA-Z]:/[^ ]*)/lib([^ ]*)${suffix}" "-L\\1 -l\\2"
+	${_link_flags_out}
+	"${${_link_flags_out}}"
+	)
+      #message("(${suffix}) ${_link_flags_out} = ${${_link_flags_out}}")
+    endif(WIN32_OR_CYGWIN)
+    # Look for form starting with "/" on all platforms.
     string(
-    REGEX REPLACE "(/[^ ]*)/lib([^ ]*)\\${suffix}" "-L\\1 -l\\2"
-    ${_link_flags_out}
-    "${${_link_flags_out}}"
-    )
+      REGEX REPLACE "(/[^ ]*)/lib([^ ]*)${suffix}" "-L\\1 -l\\2"
+      ${_link_flags_out}
+      "${${_link_flags_out}}"
+      )
     #message("(${suffix}) ${_link_flags_out} = ${${_link_flags_out}}")
   endforeach(suffix ${suffix_list})
 
-  if(APPLE)
+  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     # For Mac OS X transform frameworks information into correct form.
     string(
     REGEX REPLACE
@@ -166,7 +188,7 @@
     ${${_link_flags_out}}
     )
     #message("(frameworks) ${_link_flags_out} = ${${_link_flags_out}}")
-  endif(APPLE)
+  endif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 
 endmacro(pkg_config_link_flags)
 

Modified: trunk/cmake/modules/plplot_functions.cmake
===================================================================
--- trunk/cmake/modules/plplot_functions.cmake	2014-02-02 19:32:14 UTC (rev 12974)
+++ trunk/cmake/modules/plplot_functions.cmake	2014-02-05 22:23:38 UTC (rev 12975)
@@ -221,3 +221,21 @@
   #message("DEBUG: (filtered) ${rpath} = ${internal_rpath}")
   set(${rpath} ${internal_rpath} PARENT_SCOPE)
 endfunction(filter_rpath)
+
+if(MINGW)
+  # Useful function to convert Windows list of semicolon-delimited
+  # PATHs to the equivalent list of MSYS PATHs (exactly like the
+  # colon-delimited Unix list of PATHs except the driver letters are
+  # specified as the initial one-character component of each of the
+  # PATHs).  For example, this function will transform the Windows
+  # list of PATHs, "z:\path1;c:\path2" to "/z/path1:/c/path2".
+  function(determine_msys_path MSYS_PATH NATIVE_PATH)
+    #message(STATUS "NATIVE_PATH = ${NATIVE_PATH}")
+    string(REGEX REPLACE "^\([a-zA-z]\):" "/\\1" PATH  "${NATIVE_PATH}")
+    string(REGEX REPLACE ";\([a-zA-z]\):" ";/\\1" PATH  "${PATH}")
+    string(REGEX REPLACE ";" ":" PATH  "${PATH}")
+    file(TO_CMAKE_PATH "${PATH}" PATH)
+    #message(STATUS "MSYS_PATH = ${PATH}")
+    set(${MSYS_PATH} ${PATH} PARENT_SCOPE)
+  endfunction(determine_msys_path)
+endif(MINGW)

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2014-02-02 19:32:14 UTC (rev 12974)
+++ trunk/src/CMakeLists.txt	2014-02-05 22:23:38 UTC (rev 12975)
@@ -191,15 +191,17 @@
   set(PC_REQUIRES_TAG "Requires")
 endif(NON_TRANSITIVE)
 
+# Deal with external libraries.
 set(LIB_INSTALL_RPATH ${LIB_DIR})
+set(libplplot${LIB_TAG}_LINK_LIBRARIES)
 if(ENABLE_DYNDRIVERS)
-  set(libplplot${LIB_TAG}_LINK_LIBRARIES ${LTDL_LIBRARIES})
+  list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES ${LTDL_LIBRARIES})
   #message("libplplot${LIB_TAG}_LINK_LIBRARIES =  ${libplplot${LIB_TAG}_LINK_LIBRARIES}")
   #message("libplplot${LIB_TAG}_RPATH = ${libplplot${LIB_TAG}_RPATH}")
-  set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${libplplot${LIB_TAG}_RPATH})
+  list(APPEND LIB_INSTALL_RPATH ${libplplot${LIB_TAG}_RPATH})
 else(ENABLE_DYNDRIVERS)
-  set(libplplot${LIB_TAG}_LINK_LIBRARIES ${DRIVERS_LINK_FLAGS})
-  set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${DRIVERS_RPATH})
+  list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES ${DRIVERS_LINK_FLAGS})
+  list(APPEND LIB_INSTALL_RPATH ${DRIVERS_RPATH})
   if(ANY_QT_DEVICE)
     # Update the target COMPILE_DEFINITIONS and INCLUDE_DIRECTORIES
     set_qt_target_properties(plplot${LIB_TAG})
@@ -208,18 +210,47 @@
 #message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
 
 if(MATH_LIB)
-  set(
-    libplplot${LIB_TAG}_LINK_LIBRARIES
-    ${libplplot${LIB_TAG}_LINK_LIBRARIES}
-    ${MATH_LIB}
-    )
+  list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES ${MATH_LIB})
 endif(MATH_LIB)
 
 # Transform "${libplplot${LIB_TAG}_LINK_LIBRARIES}" string to the 
 # standard pkg-config form.
 
+if(HAVE_SHAPELIB)
+  get_source_file_property(PLMAP_COMPILE_PROPS plmap.c COMPILE_FLAGS)
+  # Deal with NOTFOUND case.
+  if(NOT PLMAP_COMPILE_PROPS)
+    set(PLMAP_COMPILE_PROPS)
+  endif(NOT PLMAP_COMPILE_PROPS)
+  set_source_files_properties(plmap.c 
+    PROPERTIES
+    COMPILE_FLAGS "${PLMAP_COMPILE_PROPS} -I${SHAPELIB_INCLUDE_DIR}"
+    )
+  if(HAVE_SAHOOKS)
+  set_source_files_properties(plmap.c 
+    PROPERTIES
+    COMPILE_DEFINITIONS HAVE_SAHOOKS
+    )
+  endif(HAVE_SAHOOKS)
+
+  list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES ${SHAPELIB_LIBRARIES})
+  list(APPEND LIB_INSTALL_RPATH ${SHAPELIB_RPATH})
+
+endif(HAVE_SHAPELIB)
+
+if(WITH_FREETYPE)
+  get_source_file_property(PLFREETYPE_COMPILE_PROPS plfreetype.c COMPILE_FLAGS)
+  # Deal with NOTFOUND case.
+  if(NOT PLFREETYPE_COMPILE_PROPS)
+    set(PLFREETYPE_COMPILE_PROPS)
+  endif(NOT PLFREETYPE_COMPILE_PROPS)
+  set_source_files_properties(plfreetype.c PROPERTIES COMPILE_FLAGS "${PLFREETYPE_COMPILE_PROPS} -I${FREETYPE_INCLUDE_DIR}")
+  list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES ${FREETYPE_LIBRARIES})
+  
+endif(WITH_FREETYPE)
+
 set(libstdcxx_full_path)
-if(NOT BUILD_SHARED_LIBS)
+if(ENABLE_cxx AND NOT BUILD_SHARED_LIBS)
   # For this special case where the plplot library is a static C++
   # library, pkg-config needs to add -L and -l options corresponding
   # to libstd++.so to the link flags it delivers.  Another alternative
@@ -243,15 +274,17 @@
   endif(EXISTS "${CMAKE_CXX_COMPILER}")
   if(CXX_rc STREQUAL "0" AND CXX_string MATCHES "LIBRARY_PATH=")
     string(REGEX REPLACE "^.*(LIBRARY_PATH=.*)\nCOLLECT_GCC_OPTIONS.*$" "\\1"
-      CXX_library_path_string ${CXX_string}
+      CXX_library_path_string "${CXX_string}"
       )
     #message(STATUS "CXX_library_path_string = ${CXX_library_path_string}")
     if(CXX_library_path_string MATCHES "^LIBRARY_PATH=")
-      string(REGEX REPLACE "^LIBRARY_PATH=" "" CXX_library_path ${CXX_library_path_string})
-      # This converts native path delimiters to a semicolon-delimited
-      #(cmake) list of directories.
-      file(TO_CMAKE_PATH ${CXX_library_path} CXX_library_path)
-      message(STATUS "CXX_library_path = ${CXX_library_path}")
+      string(REGEX REPLACE "^LIBRARY_PATH=" "" CXX_library_path "${CXX_library_path_string}")
+      # For both Linux and MinGW, CXX_library_path is a semicolon
+      # delimited list which is identical to the form of a CMake list.
+      # Furthermore, for the MinGW case, the drive letters are in the
+      # colon form, but experiments show that is exactly the form
+      # required by find_library for the MinGW case.  Net result: no
+      # conversion necessary for either Linux or MinGW.
       find_library(libstdcxx_full_path NAMES stdc++ PATHS ${CXX_library_path})
       message(STATUS "libstdcxx_full_path = ${libstdcxx_full_path}")
     else(CXX_library_path_string MATCHES "^LIBRARY_PATH=")
@@ -266,10 +299,16 @@
     message(STATUS "CXX_string = ${CXX_string}")
   endif(CXX_rc STREQUAL "0" AND CXX_string MATCHES "LIBRARY_PATH=")
   if(NOT libstdcxx_full_path)
-    message(STATUS "WARNING: failed to find viable C++ compiler library so pkg-config link flags will be incomplete") 
+    message(STATUS "WARNING: failed to find libstdc++ so pkg-config link flags will be incomplete") 
   endif(NOT libstdcxx_full_path)
-endif(NOT BUILD_SHARED_LIBS)
+endif(ENABLE_cxx AND NOT BUILD_SHARED_LIBS)
 
+# Transform current information in libplplot${LIB_TAG}_LINK_LIBRARIES
+# into pkg-config (libplplot${LIB_TAG}_LINK_FLAGS) form.  Both variables
+# will have data added to them afterward due to the internal PLplot libraries
+# which have a different pkg-config treatment than the external libraries
+# dealt with here.
+
 if(libstdcxx_full_path)
   pkg_config_link_flags(
     libplplot${LIB_TAG}_LINK_FLAGS
@@ -282,24 +321,20 @@
   )
 endif(libstdcxx_full_path)
 
+# The above completes dealing with the external libraries.  Now
+# deal with the internal libraries that are built by the PLplot
+# build system.
+
 if(WITH_CSA)
+  list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES csirocsa)
   set(
-    libplplot${LIB_TAG}_LINK_LIBRARIES
-    ${libplplot${LIB_TAG}_LINK_LIBRARIES}
-    csirocsa
-    )
-  set(
     libplplot${LIB_TAG}_LINK_FLAGS
     "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsirocsa"
     )
 endif(WITH_CSA)
 
 if(PL_HAVE_QHULL)
-  set(
-    libplplot${LIB_TAG}_LINK_LIBRARIES
-    ${libplplot${LIB_TAG}_LINK_LIBRARIES}
-    csironn
-    )
+  list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES csironn)
   if(QHULL_RPATH)
     set(
       libplplot${LIB_TAG}_LINK_FLAGS
@@ -317,11 +352,11 @@
     )
   # Needed by the traditional pkg-config approach for installed examples
   # as well as the new CMake-based build system for the installed examples.
-  set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${QHULL_RPATH})
+  list(APPEND LIB_INSTALL_RPATH ${QHULL_RPATH})
 endif(PL_HAVE_QHULL)
 
 if(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
-  list(APPEND  libplplot${LIB_TAG}_LINK_LIBRARIES nistcd)
+  list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES nistcd)
   set(
     libplplot${LIB_TAG}_LINK_FLAGS
     "${libplplot${LIB_TAG}_LINK_FLAGS} -lnistcd"
@@ -329,84 +364,12 @@
   include_directories(${CMAKE_SOURCE_DIR}/lib/nistcd)
 endif(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
 
+list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES qsastime)
 set(
-  libplplot${LIB_TAG}_LINK_LIBRARIES
-  ${libplplot${LIB_TAG}_LINK_LIBRARIES}
-  qsastime
-  )
-set(
   libplplot${LIB_TAG}_LINK_FLAGS
   "${libplplot${LIB_TAG}_LINK_FLAGS} -lqsastime"
   )
 
-if(WITH_FREETYPE)
-  get_source_file_property(PLFREETYPE_COMPILE_PROPS plfreetype.c COMPILE_FLAGS)
-  # Deal with NOTFOUND case.
-  if(NOT PLFREETYPE_COMPILE_PROPS)
-    set(PLFREETYPE_COMPILE_PROPS)
-  endif(NOT PLFREETYPE_COMPILE_PROPS)
-  set_source_files_properties(plfreetype.c PROPERTIES COMPILE_FLAGS "${PLFREETYPE_COMPILE_PROPS} -I${FREETYPE_INCLUDE_DIR}")
-  set(
-    libplplot${LIB_TAG}_LINK_LIBRARIES
-    ${libplplot${LIB_TAG}_LINK_LIBRARIES}
-    ${FREETYPE_LIBRARIES}
-    )
-  
-  # Convert to -L... -l... form.
-  string(REGEX REPLACE "(/[^ ]*)/lib([^ ]*)\\.so" "-L\\1 -l\\2"
-    _FREETYPE_LINK_FLAGS
-    ${FREETYPE_LIBRARIES}
-    )
-  string(REGEX REPLACE "(/[^ ]*)/lib([^ ]*)\\.so" "-L\\1 -l\\2"
-    FREETYPE_LINK_FLAGS
-    ${_FREETYPE_LINK_FLAGS}
-    )
-  set(
-    libplplot${LIB_TAG}_LINK_FLAGS
-    "${libplplot${LIB_TAG}_LINK_FLAGS} ${FREETYPE_LINK_FLAGS}"
-    )
-endif(WITH_FREETYPE)
-
-if(HAVE_SHAPELIB)
-  get_source_file_property(PLMAP_COMPILE_PROPS plmap.c COMPILE_FLAGS)
-  # Deal with NOTFOUND case.
-  if(NOT PLMAP_COMPILE_PROPS)
-    set(PLMAP_COMPILE_PROPS)
-  endif(NOT PLMAP_COMPILE_PROPS)
-  set_source_files_properties(plmap.c 
-    PROPERTIES
-    COMPILE_FLAGS "${PLMAP_COMPILE_PROPS} -I${SHAPELIB_INCLUDE_DIR}"
-    )
-  if(HAVE_SAHOOKS)
-  set_source_files_properties(plmap.c 
-    PROPERTIES
-    COMPILE_DEFINITIONS HAVE_SAHOOKS
-    )
-  endif(HAVE_SAHOOKS)
-
-  set(
-    libplplot${LIB_TAG}_LINK_LIBRARIES
-    ${libplplot${LIB_TAG}_LINK_LIBRARIES}
-    ${SHAPELIB_LIBRARIES}
-    )
-  
-  set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${SHAPELIB_RPATH})
-
-  # Convert to -L... -l... form.
-  string(REGEX REPLACE "(/[^ ]*)/lib([^ ]*)\\.so" "-L\\1 -l\\2"
-    _SHAPELIB_LINK_FLAGS
-    ${SHAPELIB_LIBRARIES}
-    )
-  string(REGEX REPLACE "(/[^ ]*)/lib([^ ]*)\\.so" "-L\\1 -l\\2"
-    SHAPELIB_LINK_FLAGS
-    ${_SHAPELIB_LINK_FLAGS}
-    )
-  set(
-    libplplot${LIB_TAG}_LINK_FLAGS
-    "${libplplot${LIB_TAG}_LINK_FLAGS} ${SHAPELIB_LINK_FLAGS}"
-    )
-endif(HAVE_SHAPELIB)
-
 #message(STATUS
 #"libplplot${LIB_TAG}_LINK_LIBRARIES = ${libplplot${LIB_TAG}_LINK_LIBRARIES}"
 #)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12974] trunk/README.release

[<ai...@us...>]

Revision: 12974
          http://sourceforge.net/p/plplot/code/12974
Author:   airwin
Date:     2014-02-02 19:32:14 +0000 (Sun, 02 Feb 2014)
Log Message:
-----------
Update what has been accomplished for this forthcoming release.

Modified Paths:
--------------
    trunk/README.release

Modified: trunk/README.release
===================================================================
--- trunk/README.release	2014-01-29 17:33:31 UTC (rev 12973)
+++ trunk/README.release	2014-02-02 19:32:14 UTC (rev 12974)
@@ -43,8 +43,41 @@
 
 2. Changes relative to the previous release
 
-None at this time.
+2.1 Update the parts of the build system that find Tcl-related software.
 
+The build system now checks extensively for the consistency of the
+Tcl/Tk/Itcl/Itk/Iwidgets components that are found.
+
+2.2 Update the Tcl-related epa_build configurations.
+
+The epa_build subproject of PLplot design goal is to make it easy to
+build PLplot dependencies on all platforms.
+
+Previously version 8.6 of Tcl/Tk and version 3 of Itcl/Itk, version 4
+of Itcl/Itk, and versions 4.0 and 4.1 of Iwidgets could be epa_built
+on Linux, but now the epa_build configuration files have been updated
+so these builds also succeed on MinGW/MSYS.
+
+2.3 Update the PLplot build system so that the Tcl/Tk/Itcl/Itk/Iwidgets
+bindings and examples work on MinGW/MSYS.
+
+2.4 Update api.xml to be consistent with our public API defined by plplot.h.
+
+This substantial improvement to our DocBook documentation for our
+public API has been made possible by the "check" application written
+by Hǎiliàng Wáng (see
+https://github.com/hailiang/go-plplot/tree/master/c/check) which uses
+gccxml to convert the API information in plplot.h into XML and
+compares those results (names of functions in our public API, and for
+each of those functions, number of arguments, names of arguments, and
+types of arguments) with the corresponding information in api.xml.
+The original report from the check_api_xml_consistency target (which
+runs the check programme) showed ~150 inconsistencies between api.xml
+and our public API including several functions in our public API that
+were not documented at all in api.xml.  That number of inconsistencies
+has now been reduced to zero which constitutes a substantial upgrade
+in the quality of our API documentation.
+
 3. Tests made for the current release.
 
 None at this time.  

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12973] trunk/README.Release_Manager_Cookbook

[<ai...@us...>]

Revision: 12973
          http://sourceforge.net/p/plplot/code/12973
Author:   airwin
Date:     2014-01-29 17:33:31 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Rearrange into more logical order without numbers.

Modified Paths:
--------------
    trunk/README.Release_Manager_Cookbook

Modified: trunk/README.Release_Manager_Cookbook
===================================================================
--- trunk/README.Release_Manager_Cookbook	2014-01-29 16:52:35 UTC (rev 12972)
+++ trunk/README.Release_Manager_Cookbook	2014-01-29 17:33:31 UTC (rev 12973)
@@ -1,20 +1,27 @@
 INDEX
-(1) Prepare and test the documentation
-(2) Check and potentially fix internal consistency
-(3) Update website-related files
-(4) Install and test a (preliminary) local copy of the PLplot website
-(5) Prepare a (preliminary) version of the ChangeLog file for this release
-(6) Prepare the README.release file and/or press those who have made
-(7) Update Release date and versions
-(8) Create (a preliminary version of) the release tarball and check the result
-(9) Do comprehensive test of PLplot.
-(10) Install and test a local copy of the PLplot website
-(11) Create ChangeLog.release
-(12) Create the PLplot Release
-(13) Upload the local website to SourceForge
-(14) Prepare a file release
-(15) Publicize the release announcement
-(16) Prepare immediately for the next release cycle
+** Prepare a (preliminary) version of the ChangeLog file for this release
+** Prepare the README.release file and/or press those who have made
+   changes in this release cycle to update that file
+** Prepare and test the documentation
+** Check and potentially fix internal consistency
+** Update website-related files
+** Install and test a (preliminary) local copy of the PLplot website
+** Update Release date and versions
+** Create (a preliminary version of) the release tarball and check the
+   result for errors
+** Do comprehensive test of PLplot
+** Install and test a local copy of the PLplot website
+** Create ChangeLog.release
+** Create the PLplot Release
+   ++ Preliminaries
+   ++ Install and test a local copy of the PLplot website
+   ++ Upload the local website to SourceForge
+   ++ Create a final release tarball and check the result for errors
+   ++ Sign the release with your plplot Release Manager gpg key
+   ++ Verify the release tarball signing
+   ++ Make a SourceForge file release
+** Publicize the release announcement
+** Prepare immediately for the next release cycle
 
 (A1) GNU Privacy Guard (gpg)
 (A2) Creating a test tarball from trunk
@@ -25,10 +32,37 @@
 final release tarball and ChangeLog which depend on virtually all
 prior steps).
 
-(1) Prepare and test the documentation
+Prepare a (preliminary) version of the ChangeLog file for this release
 
 This step does not depend on other steps.
 
+# This makes the BASE used below correct.
+svn update
+
+svn log --revision BASE:<LAST_RELEASE_REVISION> --verbose  >| ChangeLog.release_preliminary
+
+where <LAST_RELEASE_REVISION> stands for the last revision number of
+the previous release which can be determined e.g., by viewing the
+ChangeLog.release file from the previous release.  Note the
+"_preliminary" suffix to distinguish this from the final result below
+which will contain (if all goes well in the steps below) a record of
+all but the last commit (of the ChangeLog itself) for this release.
+
+** Prepare the README.release file and/or press those who have made
+   changes in this release cycle to update that file
+
+This step depends on the step above entitled
+
+"Prepare a (preliminary) version of the ChangeLog file for this release".
+
+To double-check that file is complete with regards to all major
+developments during this release cycle, skim all the commit messages in
+ChangeLog.release_preliminary determined above.
+
+** Prepare and test the documentation
+
+This step does not depend on other steps.
+
 The steps below entitled 
 
 "Check and potentially fix internal consistency" and
@@ -47,7 +81,7 @@
 Update, generate and test our Docbook documentation following the
 instructions in doc/docbook/README.developers.
 
-(2) Check and potentially fix internal consistency
+** Check and potentially fix internal consistency
 
 This step depends on the step above entitled 
 
@@ -107,7 +141,7 @@
 Check that plplot_h.inc is consistent with touchup.ml and plplot_h
 Built target check_plplot_h.inc
 
-(3) Update website-related files
+** Update website-related files
 
 This step does not depend on other steps.
 
@@ -140,7 +174,7 @@
 present release announcements for the website if desired.  See
 www/announce/README for just how easy this step would be.
 
-(4) Install and test a (preliminary) local copy of the PLplot website
+** Install and test a (preliminary) local copy of the PLplot website
 
 This step depends on the steps above entitled
 
@@ -221,33 +255,8 @@
 the PLplot version in www/example.php will be wrong.  Those
 issues are addressed in "Update release date and versions" below.
 
-(5) Prepare a (preliminary) version of the ChangeLog file for this release
+** Update Release date and versions
 
-# This makes the BASE used below correct.
-svn update
-
-svn log --revision BASE:<LAST_RELEASE_REVISION> --verbose  >| ChangeLog.release_preliminary
-
-where <LAST_RELEASE_REVISION> stands for the last revision number of
-the previous release which can be determined e.g., by viewing the
-ChangeLog.release file from the previous release.  Note the
-"_preliminary" suffix to distinguish this from the final result below
-which will contain (if all goes well in the steps below) a record of
-all but the last commit (of the ChangeLog itself) for this release.
-
-(6) Prepare the README.release file and/or press those who have made
-changes in this release cycle to update that file.
-
-This step depends on the step above entitled
-
-"Prepare a (preliminary) version of the ChangeLog file for this release".
-
-To double-check that file is complete with regards to all major
-developments during this release cycle, skim all the commit messages in
-ChangeLog.release_preliminary determined above.
-
-(7) Update Release date and versions
-
 This step depends on no others.
 
 The following steps entitled
@@ -266,8 +275,8 @@
 SOVERSION, the minor number and the patch number for each versioned
 library created by the PLplot build.
 
-(8) Create (a preliminary version of) the release tarball and check the result
-for errors
+** Create (a preliminary version of) the release tarball and check the
+   result for errors
 
 This step depends on the steps above entitled
 
@@ -303,7 +312,7 @@
 
 info /tmp/plplot_install/share/info/plplotdoc.info
 
-(9) Do comprehensive test of PLplot.
+** Do comprehensive test of PLplot
 
 This step depends on the steps above entitled
 
@@ -321,7 +330,7 @@
 Enter results of these and all other tests of this release into
 README.release.
 
-(10) Create ChangeLog.release
+** Create ChangeLog.release
 
 N.B. commit all local changes to the repository so they will be
 reflected in the ChangeLog, tagged version of the release, and the release
@@ -349,8 +358,10 @@
 last commit for the trunk version of PLplot (see remarks above
 about when it is necessary to repeat this step).
 
-(11) Create the PLplot Release
+** Create the PLplot Release
 
+   ++ Preliminaries
+
 Based on suggestions in the svn manual, the PLplot svn archive is configured
 as follows:
 
@@ -394,7 +405,7 @@
 # IMPORTANT: use this tagged version to create the website and tarball
 cd plplot_tags_5.9.11
 
-(11a) Install and test a local copy of the PLplot website
+   ++ Install and test a local copy of the PLplot website
 
 This step depends on the steps above entitled
 
@@ -413,7 +424,7 @@
 correct RELEASE_DATE and VERSION and also do this
 using the files from the tagged release directory, e.g., plplot_tags_5.9.11
 
-(11b) Upload the local website to SourceForge
+   ++ Upload the local website to SourceForge
 
 Once you are satisfied with the local website, you should upload it to
 SourceForge with rsync.
@@ -474,7 +485,7 @@
 index.php, download.php, examples.php, documentation.php, and credits.php
 to validate those pages.
 
-(11c) Create a final release tarball and check the result for errors
+   ++ Create a final release tarball and check the result for errors
 
 Follow the above step entitled 
 
@@ -483,15 +494,16 @@
 but this time for the tagged release to make sure the tarball is exactly
 consistent with the release tag.
 
-(11d) Sign the release with your plplot Release Manager gpg key:
+   ++ Sign the release with your plplot Release Manager gpg key
+
 gpg --default-key YYYYYYYY --detach-sign --armor /tmp/plplot-dist-prep/plplot-X.Y.Z.tar.gz
 
 A list of your GPG keys can be obtained using the command "gpg --list-keys <name>".
 
-(11e) Verify the release tarball signing
+   ++ Verify the release tarball signing
 gpg --verify /tmp/plplot-dist-prep/plplot-X.Y.Z.tar.gz.asc
 
-(11f) Prepare a file release
+   ++ Make a SourceForge file release
 
 #IMPORTANT
 cd /tmp/plplot-dist-prep/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12972] trunk/doc/docbook/src/CMakeLists.txt

[<ai...@us...>]

Revision: 12972
          http://sourceforge.net/p/plplot/code/12972
Author:   airwin
Date:     2014-01-29 16:52:35 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Adjust to new version of H?\199?\142ili?\195?\160ng W?\195?\161ng's check programme which now has
a -incdir argument to specify where the configured headers included by
plplot.h are located.

This change in "check" means it is no longer necessary to copy plplot.h from
the source to the build directory in order to get this
application to work.

Tested on Linux using the check_api_xml_consistency target which
still produces a clean result on the consistency of api.xml with
our API as defined by plplot.h.

Modified Paths:
--------------
    trunk/doc/docbook/src/CMakeLists.txt

Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt	2014-01-29 02:27:57 UTC (rev 12971)
+++ trunk/doc/docbook/src/CMakeLists.txt	2014-01-29 16:52:35 UTC (rev 12972)
@@ -36,12 +36,7 @@
   find_program(API_XML_CONSISTENCY_CHECKER api.xml_consistency_checker)
   if(API_XML_CONSISTENCY_CHECKER)
     add_custom_target(check_api_xml_consistency
-      # Currently the checker needs plplot.h to be in the same directory
-      # as the configured header files.
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-      ${CMAKE_SOURCE_DIR}/include/plplot.h
-      ${CMAKE_BINARY_DIR}/include/plplot.h
-      COMMAND ${API_XML_CONSISTENCY_CHECKER} -header=${CMAKE_BINARY_DIR}/include/plplot.h -apixml=${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
+      COMMAND ${API_XML_CONSISTENCY_CHECKER} -header=${CMAKE_SOURCE_DIR}/include/plplot.h -incdir=${CMAKE_BINARY_DIR}/include -apixml=${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
       )
   else(API_XML_CONSISTENCY_CHECKER)
     message(STATUS "WARNING: cannot find the api.xml_consistency_checker application so cannot check the consistency of api.xml with plplot.h")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12971] trunk/doc/docbook/src

[<ai...@us...>]

Revision: 12971
          http://sourceforge.net/p/plplot/code/12971
Author:   airwin
Date:     2014-01-29 02:27:57 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Make remaining changes to bring api.xml into complete consistency with
plplot.h according to the new check_api_xml_consistency target that I
developed for our build system that was based on H?\199?\142ili?\195?\160ng W?\195?\161ng's
"check" application that was written in the Go language.

Modified Paths:
--------------
    trunk/doc/docbook/src/api.xml
    trunk/doc/docbook/src/plplotdoc.xml.in

Modified: trunk/doc/docbook/src/api.xml
===================================================================
--- trunk/doc/docbook/src/api.xml	2014-01-29 02:23:42 UTC (rev 12970)
+++ trunk/doc/docbook/src/api.xml	2014-01-29 02:27:57 UTC (rev 12971)
@@ -2347,7 +2347,7 @@
       <varlistentry>
 	<term>
 	  <parameter>labels</parameter>
-	  (<literal>const char *const *</literal>, input)
+	  (<literal>const char * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -2378,7 +2378,7 @@
       <varlistentry>
 	<term>
 	  <parameter>axis_opts</parameter>
-	  (<literal>const char *const *</literal>, input)
+	  (<literal>const char * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -2427,7 +2427,7 @@
       <varlistentry>
 	<term>
 	  <parameter>values</parameter>
-	  (<literal>const PLFLT *const *</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -2741,7 +2741,7 @@
       <varlistentry>
 	<term>
 	  <parameter>f</parameter>
-	  (<literal>const PLFLT *const *</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -6988,7 +6988,7 @@
       <varlistentry>
 	<term>
 	  <parameter>idata</parameter>
-	  (<literal>const PLFLT *const *</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -7148,7 +7148,7 @@
       <varlistentry>
 	<term>
 	  <parameter>idata</parameter>
-	  (<literal>const PLFLT *const *</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -7808,7 +7808,7 @@
       <varlistentry>
 	<term>
 	  <parameter>text</parameter>
-	  (<literal>const char *const *</literal>, input)
+	  (<literal>const char * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -7940,7 +7940,7 @@
       <varlistentry>
 	<term>
 	  <parameter>symbols</parameter>
-	  (<literal>const char *const *</literal>, input)
+	  (<literal>const char * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8610,7 +8610,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>const PLFLT *const *</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8752,7 +8752,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>const PLFLT *const *</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9327,7 +9327,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>const PLFLT *const *</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9485,7 +9485,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>const PLFLT *const *</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9696,7 +9696,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>const PLFLT *const *</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -13667,7 +13667,7 @@
       <varlistentry>
 	<term>
 	  <parameter>a</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -13768,7 +13768,7 @@
       <varlistentry>
 	<term>
 	  <parameter>clevel</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -13831,7 +13831,7 @@
       <varlistentry>
 	<term>
 	  <parameter>fill</parameter>
-	  (<literal>void (*) (PLINT, PLFLT *, PLFLT *)</literal>, input)
+	  (<literal>void (*) (PLINT, const PLFLT *, const PLFLT *)</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -13969,7 +13969,7 @@
       <varlistentry>
 	<term>
 	  <parameter>a</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -14139,7 +14139,7 @@
       <varlistentry>
 	<term>
 	  <parameter>fill</parameter>
-	  (<literal>void (*) (PLINT, PLFLT *, PLFLT *)</literal>, input)
+	  (<literal>void (*) (PLINT, const PLFLT *, const PLFLT *)</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -14257,7 +14257,7 @@
       <varlistentry>
 	<term>
 	  <parameter>a</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -14480,7 +14480,7 @@
       <varlistentry>
 	<term>
 	  <parameter>fill</parameter>
-	  (<literal>void (*) (PLINT, PLFLT *, PLFLT *)</literal>, input)
+	  (<literal>void (*) (PLINT, const PLFLT *, const PLFLT *)</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -14599,7 +14599,7 @@
       <varlistentry>
 	<term>
 	  <parameter>label_func</parameter>
-	  (<literal>void (*) (PLINT, PLFLT, char *, PLINT, void *)</literal>, input)
+	  (<literal>void (*) (PLINT, PLFLT, char *, PLINT, PLPointer)</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -14651,7 +14651,7 @@
       <varlistentry>
 	<term>
 	  <parameter>label_data</parameter>
-	  (<literal>void *</literal>, input)
+	  (<literal>PLPointer</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -15152,10 +15152,10 @@
 
   <sect1 id="plspal1" renderas="sect3">
     <title>
-      <function>plspal1</function>: Set the colors for color table 1
-      from a cmap1 file
+      <function>plspal1</function>: Set the palette for cmap1
+      using the specified cmap1*.pal format file
     </title>
-
+    
     <para>
       <funcsynopsis>
 	<funcprototype>
@@ -15163,12 +15163,13 @@
 	    <function>plspal1</function>
 	  </funcdef>
 	  <paramdef><parameter>filename</parameter></paramdef>
+	  <paramdef><parameter>interpolate</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
     </para>
 
     <para>
-      Set the colors for color table 1 from a cmap1 file
+      Set the palette for cmap1 using the specified cmap1*.pal format file.
     </para>
 
     <variablelist>
@@ -15179,19 +15180,42 @@
 	</term>
 	<listitem>
 	  <para>
-	    The name of the cmap1 file, or a empty to string to
-	    specify the default cmap1 file.
+	    The name of the cmap1*.pal file, or an empty string to
+	    specify the default cmap1.pal file.
 	  </para>
 	</listitem>
       </varlistentry>
+      <varlistentry>
+	<term>
+	  <parameter>interpolate</parameter>
+	  (<literal>PLBOOL</literal>, input)
+	</term>
+	<listitem>
+	  <para>
+	    If this parameter is true, the columns containing the
+	    intensity index, r, g, b, alpha and
+	    alt_hue_path in the cmap1*.pal file are used to set
+	    the cmap1 palette with a call to &plscmap1la;.
+	    (The cmap1*.pal header contains a flag which controls
+	    whether the r, g, b data sent to &plscmap1la; are
+	    interpreted as HLS or RGB.)
+	  </para>
+	  <para>
+	    If this parameter is false, the intensity index and alt_hue_path columns
+	    are ignored and the r, g, b (interpreted as RGB), and alpha columns of the
+	    cmap1*.pal file are used instead to set the cmap1 palette directly
+	    with a call to &plscmap1a;.
+	  </para>
+	</listitem>
+      </varlistentry>
     </variablelist>
 
     <para>
-      Redacted form: <function>plspal1(filename)</function>
+      Redacted form: <function>plspal1(filename, interpolate)</function>
     </para>
 
     <para>
-      This function is in example 16.
+      This function is used in example 16.
     </para>
 
   </sect1>
@@ -15482,7 +15506,7 @@
 	  <funcdef>
 	    <function>plstart</function>
 	  </funcdef>
-	  <paramdef><parameter>device</parameter></paramdef>
+	  <paramdef><parameter>devname</parameter></paramdef>
 	  <paramdef><parameter>nx</parameter></paramdef>
 	  <paramdef><parameter>ny</parameter></paramdef>
 	</funcprototype>
@@ -15491,12 +15515,12 @@
 
     <para>
       Alternative to &plstar; for initializing the plotting package.  The
-      <literal><parameter>device</parameter></literal> name keyword for the
-      desired output device must be supplied as an argument.  The device
+      device name keyword for the
+      desired output device must be supplied as an argument.  These
       keywords are the same as those printed out by &plstar;.  If the
       requested device is not available, or if the input string is empty or
       begins with ``?'', the prompted start up of &plstar; is used.  This
-      routine also divides the output device into
+      routine also divides the output device page into
       <literal><parameter>nx</parameter></literal> by
       <literal><parameter>ny</parameter></literal> subpages, each of which
       may be used independently.  The subroutine &pladv; is used to advance
@@ -15506,12 +15530,12 @@
     <variablelist>
       <varlistentry>
 	<term>
-	  <parameter>device</parameter>
+	  <parameter>devname</parameter>
 	  (<literal>const char *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
-	    Device name (keyword) of the required output device.  If NULL
+	    Device name keyword of the required output device.  If NULL
 	    or if the first character is a ``?'', the normal (prompted)
 	    start up is used.
 	  </para>
@@ -15548,12 +15572,12 @@
       <itemizedlist>
 	<listitem>
 	  <para>
-	    General: <function>plstart(device, nx, ny)</function>
+	    General: <function>plstart(devname, nx, ny)</function>
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Perl/PDL: <function>plstart(nx, ny, device)</function>
+	    Perl/PDL: <function>plstart(nx, ny, devname)</function>
 	  </para>
 	</listitem>
       </itemizedlist>
@@ -15577,27 +15601,28 @@
 	  <funcdef>
 	    <function>plstransform</function>
 	  </funcdef>
-	  <paramdef><parameter>transform_fun</parameter></paramdef>
-	  <paramdef><parameter>data</parameter></paramdef>
+	  <paramdef><parameter>coordinate_transform</parameter></paramdef>
+	  <paramdef><parameter>coordinate_transform_data</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
     </para>
 
     <para>
-      This function can be used to define a coordinate transformation which
-      affects all elements drawn within the current plot window.  The
-      transformation function is similar to that provided for the &plmap;
-      and &plmeridians; functions.  The
-      <literal><parameter>data</parameter></literal> parameter may be used to
-      pass extra data to
-      <literal><parameter>transform_fun</parameter></literal>.
+      This function can be used to define a coordinate transformation
+      which affects all elements drawn within the current plot window.
+      The <literal><parameter>coordinate_transform</parameter></literal>
+      function is similar to that provided for the &plmap; and
+      &plmeridians; functions.  The
+      <literal><parameter>coordinate_transform_data</parameter></literal>
+      parameter may be used to pass extra data to
+      <literal><parameter>coordinate_transform</parameter></literal>.
     </para>
 
     <variablelist>
       <varlistentry>
 	<term>
-	  <parameter>transform_fun</parameter>
-          (<literal>void (*) (PLFLT, PLFLT, PLFLT*, PLFLT*, PLPointer)
+	  <parameter>coordinate_transform</parameter>
+          (<literal>void (*) (PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer)
           </literal>, input)
 	</term>
 	<listitem>
@@ -15610,13 +15635,13 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>data</parameter>
+	  <parameter>coordinate_transform_data</parameter>
 	  (<literal>PLPointer</literal>, input)
 	</term>
 	<listitem>
 	  <para>
             Optional extra data for
-            <parameter><literal>transform_fun</literal></parameter>.
+            <parameter><literal>coordinate_transform</literal></parameter>.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -15627,7 +15652,7 @@
       <itemizedlist>
 	<listitem>
 	  <para>
-	    General: <function>plstransform(transform_fun, data)</function>
+	    General: <function>plstransform(coordinate_transform, coordinate_transform_data)</function>
 	  </para>
 	</listitem>
       </itemizedlist>
@@ -15687,7 +15712,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -15698,7 +15723,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -15782,7 +15807,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -15793,7 +15818,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -15804,7 +15829,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -15849,7 +15874,7 @@
 	    <function>plstripa</function>
 	  </funcdef>
 	  <paramdef><parameter>id</parameter></paramdef>
-	  <paramdef><parameter>p</parameter></paramdef>
+	  <paramdef><parameter>pen</parameter></paramdef>
 	  <paramdef><parameter>x</parameter></paramdef>
 	  <paramdef><parameter>y</parameter></paramdef>
 	</funcprototype>
@@ -15872,13 +15897,13 @@
 	</term>
 	<listitem>
 	  <para>
-	    Identification number (set up in &plstripc;) of the strip chart.
+	    Identification number of the strip chart (set up in &plstripc;).
 	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>p</parameter>
+	  <parameter>pen</parameter>
 	  (<literal>PLINT</literal>, input)
 	</term>
 	<listitem>
@@ -15912,7 +15937,7 @@
     </variablelist>
 
     <para>
-      Redacted form: <function>plstripa(id, p, x, y)</function>
+      Redacted form: <function>plstripa(id, pen, x, y)</function>
     </para>
 
     <para>
@@ -15975,7 +16000,7 @@
       <varlistentry>
 	<term>
 	  <parameter>xspec</parameter>
-	  (<literal>char *</literal>, input)
+	  (<literal>const char *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -15986,7 +16011,7 @@
       <varlistentry>
 	<term>
 	  <parameter>yspec</parameter>
-	  (<literal>char *</literal>, input)
+	  (<literal>const char *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16128,7 +16153,7 @@
       <varlistentry>
 	<term>
 	  <parameter>colline</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16139,7 +16164,7 @@
       <varlistentry>
 	<term>
 	  <parameter>styline</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16150,7 +16175,7 @@
       <varlistentry>
 	<term>
 	  <parameter>legline</parameter>
-	  (<literal>char **</literal>, input)
+	  (<literal>const char **</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16161,7 +16186,7 @@
       <varlistentry>
 	<term>
 	  <parameter>labx</parameter>
-	  (<literal>char *</literal>, input)
+	  (<literal>const char *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16172,7 +16197,7 @@
       <varlistentry>
 	<term>
 	  <parameter>laby</parameter>
-	  (<literal>char *</literal>, input)
+	  (<literal>const char *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16183,7 +16208,7 @@
       <varlistentry>
 	<term>
 	  <parameter>labtop</parameter>
-	  (<literal>char *</literal>, input)
+	  (<literal>const char *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16271,7 +16296,7 @@
 	  <funcdef>
 	    <function>plstyl</function>
 	  </funcdef>
-	  <paramdef><parameter>nels</parameter></paramdef>
+	  <paramdef><parameter>nms</parameter></paramdef>
 	  <paramdef><parameter>mark</parameter></paramdef>
 	  <paramdef><parameter>space</parameter></paramdef>
 	</funcprototype>
@@ -16285,16 +16310,16 @@
       <literal><parameter>mark</parameter></literal> and
       <literal><parameter>space</parameter></literal> respectively.  The
       number of mark-space pairs is specified by
-      <literal><parameter>nels</parameter></literal>.  In order to return
+      <literal><parameter>nms</parameter></literal>.  In order to return
       the line style to the default continuous line, &plstyl; should be
-      called with <literal><parameter>nels</parameter>=0</literal>.(see
+      called with <literal><parameter>nms</parameter>=0</literal>.(see
       also &pllsty;)
     </para>
 
     <variablelist>
       <varlistentry>
 	<term>
-	  <parameter>nels</parameter>
+	  <parameter>nms</parameter>
 	  (<literal>PLINT</literal>, input)
 	</term>
 	<listitem>
@@ -16302,16 +16327,16 @@
 	    The number of <literal><parameter>mark</parameter></literal>
 	    and <literal><parameter>space</parameter></literal> elements in
 	    a line.  Thus a simple broken line can be obtained by setting
-	    <literal><parameter>nels</parameter>=1</literal>.  A continuous
+	    <literal><parameter>nms</parameter>=1</literal>.  A continuous
 	    line is specified by setting
-	    <literal><parameter>nels</parameter>=0</literal>.
+	    <literal><parameter>nms</parameter>=0</literal>.
 	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term>
 	  <parameter>mark</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16323,7 +16348,7 @@
       <varlistentry>
 	<term>
 	  <parameter>space</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16384,7 +16409,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16396,7 +16421,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16408,7 +16433,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16496,7 +16521,7 @@
       <varlistentry>
 	<term>
 	  <parameter>clevel</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16574,7 +16599,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16586,7 +16611,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16598,7 +16623,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16685,7 +16710,7 @@
       <varlistentry>
 	<term>
 	  <parameter>clevel</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16735,7 +16760,7 @@
       <varlistentry>
 	<term>
 	  <parameter>indexymin</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16754,7 +16779,7 @@
       <varlistentry>
 	<term>
 	  <parameter>indexymax</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16812,7 +16837,7 @@
     <para>
       Plots a three dimensional shaded surface plot within the environment set up
       by &plw3d;. The surface is defined by the data contained in the 2D 
-      <literal>PLFLT **</literal> matrix or the <literal>PLfGrid2</literal> structure
+      <literal>const PLFLT * const *</literal> matrix or the <literal>PLfGrid2</literal> structure
       <literal><parameter>zp</parameter></literal>. How the data in 
       <literal><parameter>zp</parameter></literal> is rendered is determined by the 
       <literal><parameter>zops</parameter></literal> parameter.
@@ -16821,7 +16846,7 @@
       PLplot core will return an appropriate function pointer: 
       <literal>plf2ops_c()</literal> (use when 
       <literal><parameter>zp</parameter></literal> is of type 
-      <literal>PLFLT **</literal>),
+      <literal>const PLFLT * const *</literal>),
       <literal>plf2ops_grid_c()</literal> (use when 
       <literal><parameter>zp</parameter></literal> 
       is a pointer to a row-major <literal>PLfGrid2</literal> structure), 
@@ -16842,7 +16867,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16854,7 +16879,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16866,7 +16891,7 @@
       <varlistentry>
 	<term>
 	  <parameter>zops</parameter>
-	  (<literal>void (*) (?)</literal>, input)
+	  (<literal>PLF2OPS</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -16877,13 +16902,13 @@
       <varlistentry>
 	<term>
 	  <parameter>zp</parameter>
-	  (<literal>PLFLT ** or PLfGrid2 *</literal>, input)
+	  (<literal>PLPointer</literal>, input)
 	</term>
 	<listitem>
 	  <para>
 	    Pointer to the data to be plotted, either as a vectored 
-	    two-dimensional array with set of function values, or as
-	    PLfGrid2 structure.
+	    two-dimensional array with set of function values or as
+	    a PLfGrid2 structure.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -16966,7 +16991,7 @@
       <varlistentry>
 	<term>
 	  <parameter>clevel</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -17024,7 +17049,7 @@
       <varlistentry>
 	<term>
 	  <parameter>arrowx, arrowy</parameter>
-	  (<literal>PLFLT *</literal>,input)
+	  (<literal>const PLFLT *</literal>,input)
 	</term>
 	<listitem>
 	  <para>
@@ -17334,7 +17359,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -17345,7 +17370,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -17669,7 +17694,7 @@
       <varlistentry>
 	<term>
 	  <parameter>u, v</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT * const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>

Modified: trunk/doc/docbook/src/plplotdoc.xml.in
===================================================================
--- trunk/doc/docbook/src/plplotdoc.xml.in	2014-01-29 02:23:42 UTC (rev 12970)
+++ trunk/doc/docbook/src/plplotdoc.xml.in	2014-01-29 02:27:57 UTC (rev 12971)
@@ -187,7 +187,9 @@
 <!ENTITY plscmap0n '<link linkend="plscmap0n"><function>plscmap0n</function></link>'>
 <!ENTITY plscmap1_range '<link linkend="plscmap1_range"><function>plgsmap1_range</function></link>'>
 <!ENTITY plscmap1 '<link linkend="plscmap1"><function>plscmap1</function></link>'>
+<!ENTITY plscmap1a '<link linkend="plscmap1a"><function>plscmap1a</function></link>'>
 <!ENTITY plscmap1l '<link linkend="plscmap1l"><function>plscmap1l</function></link>'>
+<!ENTITY plscmap1la '<link linkend="plscmap1la"><function>plscmap1la</function></link>'>
 <!ENTITY plscmap1n '<link linkend="plscmap1n"><function>plscmap1n</function></link>'>
 <!ENTITY plscol0 '<link linkend="plscol0"><function>plscol0</function></link>'>
 <!ENTITY plscolbg '<link linkend="plscolbg"><function>plscolbg</function></link>'>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12970] trunk/scripts/comprehensive_test.sh

[<ai...@us...>]

Revision: 12970
          http://sourceforge.net/p/plplot/code/12970
Author:   airwin
Date:     2014-01-29 02:23:42 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Tweak one of the messages.

Modified Paths:
--------------
    trunk/scripts/comprehensive_test.sh

Modified: trunk/scripts/comprehensive_test.sh
===================================================================
--- trunk/scripts/comprehensive_test.sh	2014-01-29 02:20:43 UTC (rev 12969)
+++ trunk/scripts/comprehensive_test.sh	2014-01-29 02:23:42 UTC (rev 12970)
@@ -287,7 +287,7 @@
 	    fi
 	fi
     fi
-    echo "Restore PATH to the the original PATH"
+    echo "Restore PATH to the original PATH"
     PATH=$PATH_SAVE
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12969] trunk/README.release

[<ai...@us...>]

Revision: 12969
          http://sourceforge.net/p/plplot/code/12969
Author:   airwin
Date:     2014-01-29 02:20:43 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
This change substantially reorganizes and simplifies the release
notes. This is possible because we are dropping the artificial
distinction between stable and development releases as discussed on
list.

ToDo.  Add what has changed for this release and add notes
on the tests done for this release as those happen.

Modified Paths:
--------------
    trunk/README.release

Modified: trunk/README.release
===================================================================
--- trunk/README.release	2014-01-29 01:42:57 UTC (rev 12968)
+++ trunk/README.release	2014-01-29 02:20:43 UTC (rev 12969)
@@ -1,9 +1,10 @@
 PLplot Release 5.10.0
 ~~~~~~~~~~~~~~~~~~~~
-This is a stable release of PLplot. It represents the ongoing efforts
-of the community to improve the PLplot plotting package. Development
-releases in the 5.11.x series will be available every few months. The next
-stable release will be 5.12.0.
+This is a release of the PLplot plotting package. It represents the
+ongoing best efforts of the PLplot community to improve the PLplot
+plotting package, and it is the only version of PLplot that we attempt
+to support. Releases in the 5.x.y series should be available several
+times per year.
 
 If you encounter a problem that is not already documented in the
 PROBLEMS file or on our bug tracker, then please send bug reports to
@@ -18,103 +19,39 @@
 
 INDEX
 
-1. OFFICIAL NOTICES FOR USERS SINCE 5.9.11 (the previous development release)
+1. OFFICIAL NOTICES FOR USERS
 
-2. Tests made for release 5.10.0
+2. Changes relative to the previous release
 
-3. Changes relative to PLplot 5.9.11 (the previous development release)
+3. Tests made for the current release
 
-4. OFFICIAL NOTICES FOR USERS SINCE 5.8.0 (the previous stable release)
+1. OFFICIAL NOTICES FOR USERS
 
-5. Changes relative to PLplot 5.8.0 (the previous stable release)
+The distinction we made prior to 5.10.0 between stable and development
+releases was essentially completely artificial and has now been
+dropped.  In each case, the latest release was "stable" in the sense
+that it was the PLplot team's best effort with substantial testing on
+the computer platforms available to our test team.  And that tradition
+continues for the release of 5.10.0.  Note we have bumped the minor
+number in this release triplet compared to the previous 5.9.11 release
+because from now on we want to reserve the patch number in that
+triplet only for those (rare) releases that contain emergency fixes
+compared to the previous release.  Note especially that 5.10.0 is not
+that different from the prior release 5.9.11, and we don't ordinarily
+require such emergency releases so our forthcoming release numbers are
+likely to be 5.11.0, 5.12.0, etc.
 
-5.1 All autotools-related files have now been removed
-5.2 Build system bug fixes
-5.3 Build system improvements
-5.4 Implement build-system infrastructure for installed Ada bindings and
-examples
-5.5 Code cleanup
-5.6 Date / time labels for axes
-5.7 Alpha value support
-5.8 New PLplot functions
-5.9 External libLASi library improvements affecting our psttf device
-5.10 Improvements to the cairo driver family
-5.11 wxWidgets driver improvements
-5.12 pdf driver improvements
-5.13 svg driver improvements
-5.14 Ada language support
-5.15 OCaml language support
-5.16 Perl/PDL language support
-5.17 Update to various language bindings
-5.18 Update to various examples
-5.19 Extension of our test framework
-5.20 Rename test subdirectory to plplot_test
-5.21 Website support files updated
-5.22 Internal changes to function visibility
-5.23 Dynamic driver support in Windows
-5.24 Documentation updates
-5.25 libnistcd (a.k.a. libcd) now built internally for -dev cgm
-5.26 get-drv-info now changed to test-drv-info
-5.27 Text clipping now enabled by default for the cairo devices
-5.28 A powerful qt device driver has been implemented
-5.29 The PLplot API is now accessible from Qt GUI applications
-5.30 NaN / Inf support for some PLplot functions
-5.31 Various bug fixes
-5.32 Cairo driver improvements
-5.33 PyQt changes
-5.34 Color Palettes
-5.35 Re-implementation of a "soft landing" when a bad/missing compiler is
-detected
-5.36 Make PLplot aware of LC_NUMERIC locale
-5.37 Linear gradients have been implemented
-5.38 Cairo Windows driver implemented
-5.39 Custom axis labelling implemented
-5.40 Universal coordinate transform implemented
-5.41 Support for arbitrary storage of 2D user data
-5.42 Font improvements
-5.42 Alpha value support for plotting in memory.
-5.43 Add a Qt device for in memory plotting.
-5.44 Add discrete legend capability.
-5.45 Add full bindings and examples for the D language.
-5.46 The plstring and plstring3 functions have been added
-5.47 The pllegend API has been finalized
-5.48 Octave bindings now implemented with swig
-5.49 Documentation redone for our swig-generated Python and Octave bindings
-5.50 Support large polygons
-5.51 Complete set of PLplot parameters now available for Fortran
-5.52 The plarc function has been added
-5.53 The format for map data used by plmap has changed
-5.54 Python support for Numeric has been dropped
-5.55 Backwards-incompatible API change to non-integer line widths
-5.56 Improvements to the build system for the Cygwin case
-5.57 The plcolorbar API has been finalized
-5.58 Documentation of the new legend and color bar capabilities of PLplot
-5.59 The D bindings and examples have been converted from the
-old version of D (D1) to the new version of D (D2)
-5.60 The DocBook documentation for PLplot is now generated using modern
-XML/XSL backend tools for DocBook
-5.61 Implement experimental build_projects sub-project
-5.62 Implement extremely simple "00" example
-5.63 Convert to using the Allura form of SourceForge software
-5.64 Use NON_TRANSITIVE linking by default for the shared libraries case for
-all non-windows systems
-5.65 Update f95 examples to take larger advantage of Fortran 95 capabilities
-5.66 Substantial additions to the doxygen documentation
-5.67 NUMERIC_INCLUDE_PATH ==> NUMPY_INCLUDE_PATH
-5.68 Major overhaul of the build system and bindings for Tcl and friends
-5.69 Substantial overhaul of the build system for the Qt-components of PLplot
-5.70 The epa_build project has been implemented
+2. Changes relative to the previous release
 
-1. OFFICIAL NOTICES FOR USERS SINCE 5.9.11 (the previous development release)
-
 None at this time.
 
-2. Tests made for release 5.10.0
+3. Tests made for the current release.
 
 None at this time.  
 
-However, to remind testers of what they did in the release cycle
-leading up to 5.9.11 here are the notes from those earlier tests:
+However, to remind testers of what they did in the latter
+stages of the release cycle for the previous release
+here are the notes from those earlier tests:
 
 
 Note that "comprehensive tests" below refers to running
@@ -262,1475 +199,3 @@
 Lion.  The report from Felipe stated the compiler suite used was
 probably from MacPorts, and did not state anything about the hardware
 type.
-
-3. Changes relative to PLplot 5.9.11 (the previous development release)
-
-None at this time.
-
-4. OFFICIAL NOTICES FOR USERS SINCE 5.8.0 (the previous stable release)
-
-(5.9.11) Backwards-incompatible API change.  The numerical symbolic
-constants that are #defined as macros in plplot.h have been
-repropagated to the Python, Java, Lua, Octave, Fortran 95, and Tcl
-language bindings using scripts.  Previously, this propagation was
-done by hand in a piece-meal manner so use of the scripts has created
-a number of changes in the PLplot symbolic constants for these
-languages.  These changes are the addition of 25 symbolic constants
-that were previously only available for C, no deletions of symbolic
-constants, no changes to numerical values, but the following
-backwards-incompatible name changes:
-
-PLESC_PLFLTBUFFERING ==> PLESC_DOUBLEBUFFERING
-PLESPLFLTBUFFERING_DISABLE ==> PLESC_DOUBLEBUFFERING_ENABLE
-PLESPLFLTBUFFERING_ENABLE ==> PLESC_DOUBLEBUFFERING_ENABLE
-PLESPLFLTBUFFERING_QUERY ==> PLESC_DOUBLEBUFFERING_QUERY
-
-So those users who were using the symbolic constants on the left for
-the above languages will have to change their source code or scripts
-to use the constants on the right.  No changes in source code or
-scripts should be required of other users.
-
-(5.9.11) Backwards-incompatible API change.  The PLplot build system
-and bindings for Tcl and friends have had a major overhaul, see below.
-Part of this change was to split the former libplplottcltk into two
-components.  The new libplplottcltk is now a pure Tcl/Tk extension
-that can be linked to the stub versions of the Tcl/Tk libraries and
-dynamically loaded from a tclsh or wish environment using the
-appropriate "package require" command.  The new libplplottcltk_Main
-library contains code (e.g., pltclMain and pltkMain) required by C
-plotting applications (e.g., pltcl, plrender, and xtk0[124].c) that
-link to libplplottcltk.
-
-(5.9.11) Backwards-incompatible change.  Our Fortran 77 bindings
-and examples have been completely removed because Fortran 95 is just a
-much better language which we have been supporting for a long time,
-and our judgement call based on user feedback we have received is
-nobody is interested in plotting using strict Fortran 77 language
-constructs any more.  However, if there is still some Fortran 77
-source code out there that uses PLplot, typically the only change you
-should have to do to port it to our Fortran 95 bindings is to place
-the command "use plplot" as the first line of the source code of the
-main routine.
-
-(5.9.11) Deprecation.  The functionality of the AGG backend and
-FreeType option in the wxwidgets device driver is provided (and in
-some cases exceeded) by other backends and options that we have
-implemented for this device driver.  The AGG backend and Freetype
-option are therefore deprecated with the intention to remove them in a
-future release.
-
-(5.9.10) The minimum version of CMake has been bumped to 5.8.9.  This
-change allows our build system to take advantage of CMake features
-introduced in later versions of CMake.  Even more importantly it also
-updates user's builds to the CMake policy conventions (important
-backwards-incompatible changes in CMake behaviour introduced in later
-versions of CMake) to the default CMake policy used for 5.8.9.
-
-(5.9.10) The long deprecated support for the python Numeric package has been
-dropped. This is no longer supported and is superseded by numpy. Support for
-numpy has been the default in PLplot for a number of years so most users
-should notice no difference.
-
-(5.9.10) The current format for maps used by plmap has been deprecated in
-favour of using shapefiles (a standard format widely used for GIS and with
-suitable free data sources available). This requires the shapelib library
-to be installed. If this library is not installed then by default no map
-support will be available. Support for the old binary format is still
-available by setting the cmake variable PL_DEPRECATED, however this
-support will be removed in a future release of PLplot.
-
-(5.9.10) Those who use the Python version of plgriddata will have to
-change their use of this function for this release as follows (see
-examples/xw21.py)
-
-# old version (which overwrites preexisting zg in place):
-zg = reshape(zeros(xp*yp),(xp,yp))
-plgriddata(x, y, z, xg, yg, zg, alg, opt[alg-1])
-
-# new version (which uses a properly returned newly created NumPy array
-# as per the normal Python expectations):
-
-zg = plgriddata(x, y, z, xg, yg, alg, opt[alg-1])
-
-(5.9.10) Significant efforts have been made to ensure the PLplot code
-is standards compliant and free from warnings. Compliance has been
-tested using the gcc compiler suite -std, -pedantic and -W  flags. The
-language standards adopted are
-C: ISO C99 with POSIX.1-2001 base specification (required for a number
-of C library calls)
-C++: ISO C++ 1998 standard plus amendments
-F95: Fortran 95 standard
-
-Specifically, the following gcc / g++ / gfortran flags were used
-
-CFLAGS='-O3 -std=c99 -pedantic -D_POSIX_C_SOURCE=200112L -Wall  \
--Wextra -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs \
--Wconversion -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings'
-
-CXXFLAGS='-O3 -fvisibility=hidden -std=c++98 -pedantic -Wall -Wextra '
-
-FFLAGS='-std=f95 -O3 -fall-intrinsics -fvisibility=hidden -pedantic \
--Wall -Wextra '
-
-Note that the code is not yet quite standards compliant or warning free,
-but this is our aim. We know that a number of common compilers do not
-support these standards "out of the box", so we will continue to develop
-and support workarounds to ensure that PLplot remains easily built on
-a variety of platforms and compilers. Standards compliance should make
-it easier to port to new systems in the future. Using aggressive
-warnings flags will help to detect and eliminate errors or problems in
-the libraries.
-
-The gfortran -fall-intrinsics flag is required for a couple of
-non-standard intrinsics which are used in the code. In the future
-adopting the fortran 2003 or 2008 standard should allow this to be
-removed.
-
-Note: currently this code cleanup does not apply to code generated by
-swig (octave, python, java, lua bindings) which gives a large number of
-code warnings.
-
-(5.9.10) For some years now we have had both FORTRAN 77 and Fortran 95
-bindings, but to the best of our knowledge, there are no longer
-any maintained FORTRAN 77 compilers left that do not also support
-Fortran 95. (g77 for instance has not been maintained for several
-years now. Its successor gfortran supports Fortran 95 and later standards
-as well all g77's legacy features).
-
-An important consequence is that we can not test the implementation for
-compliance to the FORTRAN 77 standard.
-Furthermore, we would prefer to concentrate all our Fortran
-development effort on our f95 bindings and strongly encourage all our
-Fortran users to use those bindings if they haven't switched from the
-f77 version already. Therefore, as of this release we are deprecating
-the f77 bindings and examples and plan no further support for them.
-We signal this deprecation by disabling f77 by default (although our
-users can still get access to these unsupported bindings and examples
-for now by specifying the -DENABLE_f77=ON cmake option).
-
-We plan to completely remove the f77 bindings and examples
-two releases after this one.
-
-(5.9.10) We have found that some distributions of the Windows
-MinGW/gfortran compiler (i.e., MinGW/gfortran 4.6.1 and 4.6.2 from
-http://www.equation.com) may cause a link error due to duplicate
-symbols like __gfortran_setarg_. These errors can be suppressed by
-adding the flag -Wl,--allow-multiple-define. It is very likely that
-this is a bug in these distributions.
-
-As building the libraries and the examples succeeds without any problem
-if you use most other distributions of Windows MinGW/gfortran,
-we have decided not to include this flag in our build system.
-
-Distributions that are known to work:
-- MinGW/gfortran-4.5 from http://www.equation.com,
-- MinGW/gfortran-4.5.2-1 that is installed using the latest
-  mingw-get-inst-20110802 automatic installer available at
-  http://sourceforge.net/projects/mingw/files/Installer/mingw-get-inst
-- MinGW/gfortran-4.6.2 from tdm-gcc.tdragon.net
-
-(Therefore it is not the 4.5.x versus 4.6.x version of MinGW/gfortran
-as such that causes this problem.)
-
-(5.9.9) This is a quick release to deal with two broken build issues
-that were recently discovered for our Windows platform.  Windows users should
-avoid 5.9.8 because of these problems for that release, and instead use
-5.9.9 which has been heavily tested on a number of platforms including
-Windows, see "Tests made for release 5.9.9" below.
-
-(5.9.8) For unicode-aware devices we now follow what is done for the
-Hershey font case for epsilon, theta, and phi.  This means the #ge,
-#gh, and #gf escapes now give users the Greek lunate epsilon, the
-ordinary Greek lower case theta, and the Greek symbol phi for Unicode
-fonts just like has occurred since the dawn of PLplot history for the
-Hershey font case.  Previously these legacy escapes were assigned to
-ordinary Greek lower-case epsilon, the Greek symbol theta (= script
-theta), and the ordinary Greek lower case phi for unicode fonts
-inconsistently with what occurred for Hershey fonts.  This change gets
-rid of this inconsistency, that is the #g escapes should give the best
-unicode approximation to the Hershey glyph result that is possible for
-unicode-aware devices.
-
-In general we encourage users of unicode-aware devices who might
-dislike the Greek glyph Hershey-lookalike choices they get with the
-legacy #g escapes to use instead either PLplot unicode escapes (e.g.,
-"#[0x03b5]" for ordinary Greek lower-case epsilon, see page 3 of
-example 23) or better yet, UTF-8 strings (e.g., "ε") to specify
-exactly what unicode glyph they want.
-
-(5.9.8) The full set of PLplot constants have been made available to
-our Fortran 95 users as part of the plplot module.  This means those
-users will have to remove any parameter statements where they have
-previously defined the PLplot constants (whose names typically start
-with "PL_" for themselves.  For a complete list of the affected
-constants, see the #defines in swig-support/plplotcapi.i which are
-used internally to help generate the plplot module.  See also Index
-item 5.51 below.
-
-(5.9.8) There has been widespread const modifier changes in the API
-for libplplotd and libplplotcxxd.  Those backwards-incompatible API
-changes are indicated in the usual way by a soversion bump in those
-two libraries which will force all apps and libraries that depend on
-those two libraries to be rebuilt.
-
-Specifically, we have changed the following arguments in the C library
-(libplplotd) case
-
-type * name1 ==> const type * name1
-type * name2 ==> const type ** name2
-
-and the following arguments in the C++ library (libplplotcxxd) case
-
-type * name1 ==> const type * name1
-type * name1 ==> const type * const * name2
-
-where name1 is the name of a singly dimensioned array whose values are
-not changed internally by the PLplot libraries and name2 is the name
-of a doubly dimensioned array whose values are not changed internally
-by the PLplot libraries.
-
-The general documentation and safety justification for such const
-modifier changes to our API is given in
-http://www.cprogramming.com/tutorial/const_correctness.html.
-Essentially, the above const modifier changes constitute our guarantee
-that the associated arrays are not changed internally by the PLplot
-libraries.
-
-Although it is necessary to rebuild all apps and libraries that depend
-on libplplotd and/or libplplotcxxd, that rebuild should be possible
-with unchanged source code without build errors in all cases.  For C
-apps and libraries (depending on libplplotd) there will be additional
-build warnings due to a limitation in the C standard discussed at
-http://c-faq.com/ansi/constmismatch.html unless all doubly dimensioned
-arrays (but not singly dimensioned) are explicitly cast to (const type
-**).  However, such source code changes will not be necessary to avoid
-warning messages for the C++ (libplplotcxxd) change because of the
-double use of const in the above "const type * const * name2" change.
-
-(5.9.8) The plarc API has changed in release 5.9.8.  The plarc API now
-has a rotation parameter which will eventually allow for rotated arcs.
-PLplot does not currently support rotated arcs, but the plarc function
-signature has been modified to avoid changing the API when this
-functionality is added.
-
-(5.9.6) We have retired the pbm driver containing the pbm (actually
-portable pixmap) file device. This device is quite primitive and
-poorly maintained. It ignores unicode fonts (i.e., uses the Hershey
-font fallback), falls back to ugly software fills, doesn't support
-alpha transparency, etc.  It also has a serious run-time issue with
-example 2 (double free detected by glibc) which probably indicates
-some fundamental issue with the 100 colors in cmap0 for that
-example. For those who really need portable pixmap results, we suggest
-using the ImageMagick convert programme, e.g., "convert
-examples/x24c01.pngqt test.ppm" or "convert examples/x24c01.pngcairo
-test.ppm" to produce good-looking portable pixmap results from our
-best png device results.
-
-(5.9.6) We have retired the linuxvga driver containing the linuxvga
-interactive device.  This device is quite primitive, difficult to
-test, and poorly maintained. It ignores unicode fonts (i.e., uses the
-Hershey font fallback), falls back to ugly software fills, doesn't
-support alpha transparency, etc.  It is Linux only, can only be run as
-root, and svgalib (the library used by linuxsvga) is not supported by
-some mainstream (e.g., Intel) chipsets.  All of these characteristics
-make it difficult to even test this device much less use it for
-anything serious.  Finally, it has had a well-known issue for years
-(incorrect colors) which has never been fixed indicating nobody is
-interested in maintaining this device.
-
-(5.9.6) We have retired our platform support of djgpp that used to
-reside in sys/dos/djgpp.  The developer (Andrew Roach) who used to
-maintain those support files for djgpp feels that the djgpp platform
-is no longer actively developed, and he no longer uses djgpp himself.
-
-(5.9.6) We have changed plpoin results for ascii codes 92, 94, and 95
-from centred dot, degree symbol, and centred dot glyphs to the correct
-backslash, caret, and underscore glyphs that are associated with those
-ascii indices.  This change is consistent with the documentation of
-plpoin and solves a long-standing issue with backslash, caret, and
-underscore ascii characters in character strings used for example by
-pl[mp]tex.  Those who need access to a centred dot with plpoin should
-use index 1.  The degree symbol is no longer accessible with plpoin,
-but it is available in ordinary text input to PLplot as Hershey escape
-"#(718)", where 718 is the Hershey index of the degree symbol, unicode
-escape "#[0x00B0]" where 0x00B0 is the unicode index for the degree
-symbol or direct UTF8 unicode string "°".
-
-(5.9.6) We have retired the gcw device driver and the related gnome2
-and pygcw bindings since these are unmaintained and there are good
-replacements.  These components of PLplot were deprecated as of
-release 5.9.3.  A good replacement for the gcw device is either the
-xcairo or qtwidget device.  A good replacement for the gnome2 bindings
-is the externally supplied XDrawable or Cairo context associated with
-the xcairo device and the extcairo device (see
-examples/c/README.cairo).  A good replacement for pygcw is our new
-pyqt4 bindings for PLplot.
-
-(5.9.6) We have deprecated support for the python Numeric array
-extensions. Numeric is no longer maintained and users of Numeric are
-advised to migrate to numpy. Numpy has been the standard for PLplot
-for some time. If numpy is not present PLplot will now disable python
-by default. If you still require Numeric support in the short term
-then set USE_NUMERIC to ON in cmake. The PLplot support for Numeric
-will be dropped in a future release.
-
-(5.9.5) We have removed pyqt3 access to PLplot and replaced it by
-pyqt4 access to PLplot (see details below).
-
-(5.9.5) The only method of specifying a non-default compiler (and
-associated compiler options) that we support is the environment
-variable approach, e.g.,
-
-export CC='gcc -g -fvisibility=hidden'
-export CXX='g++ -g -fvisibility=hidden'
-export FC='gfortran -g -fvisibility=hidden'
-
-All other CMake methods of specifying a non-default compiler and
-associated compiler options will not be supported until CMake bug 9220
-is fixed, see discussion below of the soft-landing re-implementation
-for details.
-
-(5.9.5) We have retired the hpgl driver (containing the hp7470,
-hp7580, and lj_hpgl devices), the impress driver (containing the imp
-device), the ljii driver (containing the ljii and ljiip devices), and
-the tek driver (containing the conex, mskermit, tek4107, tek4107f,
-tek4010, tek4010f, versaterm, vlt, and xterm devices).  Retirement
-means we have removed the build options which would allow these
-devices to build and install.  Recent tests have shown a number of
-run-time issues (hpgl, impress, and ljii) or build-time issues (tek)
-with these devices, and as far as we know there is no more user
-interest in them. Therefore, we have decided to retire these devices
-rather than fix them.
-
-(5.9.4) We have deprecated the pbm device driver (containing the pbm
-device) because glibc detects a catastrophic double free.
-
-(5.9.3) Our build system requires CMake version 5.6.0 or higher.
-
-(5.9.3) We have deprecated the gcw device driver and the related
-gnome2 and pygcw bindings since these are essentially unmaintained.
-For example, the gcw device and associated bindings still depends on
-the plfreetype approach for accessing unicode fonts which has known
-issues (inconsistent text offsets, inconvenient font setting
-capabilities, and incorrect rendering of CTL languages).  To avoid
-these issues we advise using the xcairo device and the externally
-supplied XDrawable or Cairo context associated with the xcairo device
-and the extcairo device (see examples/c/README.cairo) instead. If you
-still absolutely must use -dev gcw or the related gnome2 or pygcw
-bindings despite the known problems, then they can still be accessed
-by setting PLD_gcw, ENABLE_gnome2, and/or ENABLE_pygcw to ON.
-
-(5.9.3) We have deprecated the gd device driver which implements the
-png, jpeg, and gif devices.  This device driver is essentially
-unmaintained. For example, it still depends on the plfreetype approach
-for accessing unicode fonts which has known issues (inconsistent text
-offsets, inconvenient font setting capabilities, and incorrect
-rendering of CTL languages).  To avoid these issues for PNG format, we
-advise using the pngcairo or pngqt devices.  To avoid these issues for
-the JPEG format, we advise using the jpgqt device.  PNG is normally
-considered a better raster format than GIF, but if you absolutely
-require GIF format, we advise using the pngcairo or pngqt devices and
-then downgrading the results to the GIF format using the ImageMagick
-"convert" application.  For those platforms where libgd (the
-dependency of the gd device driver) is accessible while the required
-dependencies of the cairo and/or qt devices are not accessible, you
-can still use these deprecated devices by setting PLD_png, PLD_jpeg,
-or PLD_gif to ON.
-
-(5.9.3) We have re-enabled the tk, itk, and itcl components of PLplot
-by default that were disabled by default as of release 5.9.1 due to
-segfaults.  The cause of the segfaults was a bug (now fixed) in how
-pthread support was implemented for the Tk-related components of
-PLplot.
-
-(5.9.2) We have set HAVE_PTHREAD (now called PL_HAVE_PTHREAD as of
-release 5.9.8) to ON by default for all platforms other than Darwin.
-Darwin will follow later once it appears the Apple version of X
-supports it.
-
-(5.9.1) We have removed our previously deprecated autotools-based
-build system.  Instead, use the CMake-based build system following the
-directions in the INSTALL file.
-
-(5.9.1) We no longer support Octave-5.1.73 which has a variety of
-run-time issues in our tests of the Octave examples on different
-platforms. In contrast our tests show we get good run-time results
-with all our Octave examples for Octave-3.0.1. Also, that is the
-recommended stable version of Octave at
-http://www.gnu.org/software/octave/download.html so that is the only
-version of Octave we support at this time.
-
-(5.9.1) We have decided for consistency sake to change the PLplot
-stream variables plsc->vpwxmi, plsc->vpwxma, plsc->vpwymi, and
-plsc->vpwyma and the results returned by plgvpw to reflect the exact
-window limit values input by users using plwind. Previously to this
-change, the stream variables and the values returned by plgvpw
-reflected the internal slightly expanded range of window limits used
-by PLplot so that the user's specified limits would be on the graph.
-Two users noted this slight difference, and we agree with them it
-should not be there. Note that internally, PLplot still uses the
-expanded ranges so most users results will be identical.  However, you
-may notice some small changes to your plot results if you use these
-stream variables directly (only possible in C/C++) or use plgvpw.
-
-5. Changes relative to PLplot 5.8.0 (the previous stable release)
-
-N.B. This release includes many code cleanups and fixes relative to
-5.8.0 that are not mentioned in the list below.
-
-5.1 All autotools-related files have now been removed
-
-CMake is now the only supported build system. It has been tested on
-Linux / Unix, Mac OS-X and Windows platforms.
-
-5.2 Build system bug fixes
-
-Various fixes include the following:
-
-Ctest will now work correctly when the build tree path includes symlinks.
-
-Dependencies for swig generated files fixed so they are not rebuilt every
-time make is called.
-
-Various dependency fixes to ensure that parallel builds (using make -j)
-work under unix.
-
-5.3 Build system improvements
-
-We now transform link flag results delivered to the CMake environment by
-pkg-config into the preferred CMake form of library information.  The
-practical effect of this improvement is that external libraries in
-non-standard locations now have their rpath options set correctly for our
-build system both for the build tree and the install tree so you don't have
-to fiddle with LD_LIBRARY_PATH, etc.
-
-5.4 Implement build-system infrastructure for installed Ada bindings and
-examples
-
-Install source files, library information files, and the plplotada library
-associated with the Ada bindings.  Configure and install the pkg-config file
-for the plplotada library.  Install the Ada examples and a configured Makefile
-to build them in the install tree.
-
-5.5 Code cleanup
-
-The PLplot source code has been cleaned up to make consistent use of
-(const char *) and (char *) throughout. Some API functions have changed
-to use const char * instead of char * to make it clear that the strings
-are not modified by the function. The C and C++ examples have been updated
-consistent with this. These changes fix a large number of warnings
-with gcc-4.5. Note: this should not require programs using PLplot to be
-recompiled as it is not a binary API change.
-
-There has also been some cleanup of include files in the C++ examples
-so the code will compile with the forthcoming gcc-4.3.
-
-5.6 Date / time labels for axes
-
-PLplot now allows date / time labels to be used on axes. A new option
-('d') is available for the xopt and yopt arguments to plbox which
-indicates that the axis should be interpreted as a date / time. Similarly
-there is a new range of options for plenv to select date / time labels.
-The time format is seconds since the epoch (usually 1 Jan 1970). This
-format is commonly used on most systems. The C gmtime routine can be
-used to calculate this for a given date and time. The format for the
-labels is controlled using a new pltimefmt function, which takes a
-format string. All formatting is done using the C strftime function.
-See documentation for available options on your platform. Example 29
-demonstrates the new capabilities.
-
-N.B. Our reliance on C library POSIX time routines to (1) convert from
-broken-down time to time-epoch, (2) to convert from time-epoch to
-broken-down time, and (3) to format results with strftime have proved
-problematic for non-C languages which have time routines of variable
-quality.  Also, it is not clear that even the POSIX time routines are
-available on Windows. So we have plans afoot to implement high-quality
-versions of (1), (2), and (3) with additional functions to get/set the epoch
-in the PLplot core library itself.  These routines should work on all C
-platforms and should also be uniformly accessible for all our language
-bindings.
-
-WARNING.....  Therefore, assuming these plans are implemented, the present
-part of our date/time PLplot API that uses POSIX time routines will be
-changed.
-
-5.7 Alpha value support
-
-PLplot core has been modified to support a transparency or alpha value
-channel for each color in color map 0 and 1. In addition a number of new
-functions were added the PLplot API so that the user can both set and query
-alpha values for color in the two color maps. These functions have the same
-name as their non-alpha value equivalents, but with a an "a" added to the
-end. Example 30 demonstrates some different ways to use these functions
-and the effects of alpha values, at least for those drivers that support alpha
-values. This change should have no effect on the device drivers that do not
-currently support alpha values. Currently only the cairo, qt, gd, wxwidgets and
-aquaterm drivers support alpha values. There are some limitations with the gd
-driver due to transparency support in the underlying libgd library.
-
-5.8 New PLplot functions
-
-An enhanced version of plimage, plimagefr has been added. This allows images
-to be plotted using coordinate transformation, and also for the dynamic range
-of the plotted values to be altered. Example 20 has been modified to
-demonstrate this new functionality.
-
-To ensure consistent results in example 21 between different platforms and
-language bindings PLplot now includes a small random number generator within
-the library. plrandd will return a PLFLT random number in the range 0.0-1.0.
-plseed will allow the random number generator to be seeded.
-
-5.9 External libLASi library improvements affecting our psttf device
-
-Our psttf device depends on the libLASi library. libLASi-1.1.0 has just been
-released at http://sourceforge.net/svn/?group_id=187113 .  We recommend
-using this latest version of libLASi for building PLplot and the psttf
-device since this version of libLASi is more robust against glyph
-information returned by pango/cairo/fontconfig that on rare occasions is not
-suitable for use by libLASi.
-
-5.10 Improvements to the cairo driver family
-
-Jonathan Woithe improved the xcairo driver so that it can optionally be
-used with an external user supplied X Drawable. This enables a nice
-separation of graphing (PLplot) and window management (Gtk, etc..). Doug
-Hunt fixed the bugs that broke the memcairo driver and it is now fully
-functional. Additionally, a new extcairo driver was added that will plot
-into a user supplied cairo context.
-
-5.11 wxWidgets driver improvements
-
-Complete reorganization of the driver code. A new backend was added, based
-on the wxGraphicsContext class, which is available for wxWidgets 5.8.4
-and later. This backend produces antialiased output similar to the
-AGG backend but has no dependency on the AGG library. The basic wxDC
-backend and the wxGraphicsContext backend process the text output
-on their own, which results in much nicer plots than with the standard
-Hershey fonts and is much faster than using the freetype library. New
-options were introduced in the wxWidgets driver:
- - backend: Choose backend: (0) standard, (1) using AGG library,
-                            (2) using wxGraphicsContext
- - hrshsym: Use Hershey symbol set (hrshsym=0|1)
- - text: Use own text routines (text=0|1)
- - freetype: Use FreeType library (freetype=0|1)
-The option "text" changed its meaning, since it enabled the FreeType library
-support, while now the option enables the driver's own text routines.
-
-Some other features were added:
- * the wxWidgets driver now correctly clears the background (or parts of it)
- * transparency support was added
- * the "locate mode" (already available in the xwin and tk driver) was
-   implemented, where graphics input events are processed and translated
-   to world coordinates
-
-5.12 pdf driver improvements
-
-The pdf driver (which is based on the haru library http://www.libharu.org)
-processes the text output now on its own. So far only the Adobe Type1
-fonts are supported. TrueType font support will follow. Full unicode
-support will follow after the haru library will support unicode strings. The
-driver is now able to produce A4, letter, A5 and A3 pages. The Hershey font
-may be used only for symbols. Output can now be compressed, resulting in
-much smaller file sizes.
-Added new options:
- - text: Use own text routines (text=0|1)
- - compress: Compress pdf output (compress=0|1)
- - hrshsym: Use Hershey symbol set (hrshsym=0|1)
- - pagesize: Set page size (pagesize=A4|letter|A3|A5)
-
-5.13 svg driver improvements
-
-This device driver has had the following improvements: schema for generated
-file now validates properly at http://validator.w3.org/ for the
-automatically detected document type of SVG 1.1; -geometry option now works;
-alpha channel transparency has been implemented; file familying for
-multipage examples has been implemented; coordinate scaling has been
-implemented so that full internal PLplot resolution is used; extraneous
-whitespace and line endings that were being injected into text in error have
-now been removed; and differential correction to string justification is now
-applied.
-
-The result of these improvements is that our SVG device now gives the
-best-looking results of all our devices.  However, currently you must be
-careful of which SVG viewer or editor you try because a number of them have
-some bugs that need to be resolved.  For example, there is a librsvg bug in
-text placement (http://bugzilla.gnome.org/show_bug.cgi?id=525023) that
-affects all svg use within GNOME as well as the ImageMagick "display"
-application.  However, at least the latest konqueror and firefox as well as
-inkscape and scribus-ng (but not scribus!) give outstanding looking results
-for files generated by our svg device driver.
-
-5.14 Ada language support
-
-We now have a complete Ada bindings implemented for PLplot. We also have a
-complete set of our standard examples implemented in Ada which give results
-that are identical with corresponding results for the C standard examples.
-This is an excellent test of a large subset of the Ada bindings. We now
-enable Ada by default for our users and request widespread testing of this
-new feature.
-
-5.15 OCaml language support
-
-Thanks primarily to Hezekiah M. Carty's efforts we now have a complete OCaml
-bindings implemented for PLplot. We also have a complete set of our standard
-examples implemented in OCaml which give results that are identical with
-corresponding results for the C standard examples. This is an excellent test
-of a large subset of the OCaml bindings. We now enable OCaml by default for
-our users and request widespread testing of this new feature.
-
-5.16 Perl/PDL language support
-
-Thanks to Doug Hunt's efforts the external Perl/PDL module,
-PDL::Graphics::PLplot version 0.46 available at
-http://search.cpan.org/dist/PDL-Graphics-PLplot has been brought up to date
-to give access to recently added PLplot API.  The instructions for how to
-install this module on top of an official PDL release are given in
-examples/perl/README.perldemos. Doug has also finished implementing a
-complete set of standard examples in Perl/PDL which are part of PLplot and
-which produce identical results to their C counterparts if the above updated
-module has been installed.  Our build system tests the version of
-PDL::Graphics::PLplot that is available, and if it is not 0.46 or later, the
-list of Perl/PDL examples that are run as part of our standard tests is
-substantially reduced to avoid examples that use the new functionality.  In
-sum, if you use PDL::Graphics::PLplot version 0.46 or later the full
-complement of PLplot commands is available to you from Perl/PDL, but
-otherwise not.
-
-5.17 Updates to various language bindings
-
-A concerted effort has been made to bring all the language bindings up to
-date with recently added functions. Ada, C++, f77, f95, Java, OCaml, Octave,
-Perl/PDL, Python, and Tcl now all support the common PLplot API (with the
-exception of the mapping functions which are not yet implemented for all
-bindings due to technical issues.) This is a significant step forward for
-those using languages other than C.
-
-5.18 Updates to various examples
-
-To help test the updates to the language bindings the examples have been
-thoroughly checked. Ada, C, C++, f77, f95, and OCaml now contain a full set
-of non-interactive tests (examples 1-31 excluding 14 and 17). Java, Octave,
-Python and Tcl are missing example 19 because of the issue with the mapping
-functions. The examples have also been checked to ensure consistent results
-between different language bindings. Currently there are still some minor
-differences in the results for the tcl examples, probably due to rounding
-errors.  Some of the Tcl examples (example 21) require Tcl version 8.5 for
-proper support for NaNs.
-
-Also new is an option for the plplot_test.sh script to run the examples
-using a debugging command. This is enabled using the --debug option. The
-default it to use the valgrind memory checker. This has highlighted at
-least one memory leaks in PLplot which have been fixed. It is not part
-of the standard ctest tests because it can be _very_ slow for a complete
-set of language bindings and device drivers.
-
-5.19 Extension of our test framework
-
-The standard test suite for PLplot now carries out a comparison of the
-stdout output (especially important for example 31 which tests most of our
-set and get functions) and PostScript output for different languages as a
-check.  Thanks to the addition of example 31, the inclusion of examples 14
-and 17 in the test suite and other recent extensions of the other
-examples we now have rigorous testing in place for almost the entirety
-of our common API.  This extensive testing framework has already helped
-us track down a number of bugs, and it should make it much easier for us
-to maintain high quality for our ongoing PLplot releases.
-
-5.20 Rename test subdirectory to plplot_test
-
-This change was necessary to quit clashing with the "make test" target which
-now works for the first time ever (by executing ctest).
-
-5.21 Website support files updated
-
-Our new website content is generated with PHP and uses CSS (cascaded style
-sheets) to implement a consistent style.  This new approach demanded lots of
-changes in the website support files that are used to generate and upload
-our website and which are automatically included with the release.
-
-5.22 Internal changes to function visibility
-
-The internal definitions of functions in PLplot have been significantly
-tidied up to allow the use of the -fvisibility=hidden option with newer
-versions of gcc. This prevents internal functions from being exported
-to the user where possible. This extends the existing support for this
-on windows.
-
-5.23 Dynamic driver support in Windows
-
-An interface based on the ltdl library function calls was established
-which allows to open and close dynamic link libraries (DLL) during
-run-time and call functions from these libraries. As a consequence
-drivers can now be compiled into single DLLs separate from the core
-PLplot DLL also in Windows. The cmake option ENABLE_DYNDRIVERS is now
-ON by default for Windows if a shared PLplot library is built.
-
-5.24 Documentation updates
-
-The DocBook documentation has been updated to include many of the
-C-specific functions (for example plAlloc2dGrid) which are not part
-of the common API, but are used in the examples and may be helpful
-for PLplot users.
-
-5.25 libnistcd (a.k.a. libcd) now built internally for -dev cgm
-
-CGM format is a long-established (since 1987) open standard for vector
-graphics that is supported by w3c (see http://www.w3.org/Graphics/WebCGM/).
-PLplot has long had a cgm device driver which depended on the (mostly)
-public domain libcd library that was distributed in the mid 90's by National
-Institute of Standards and Technology (NIST) and which is still available
-from http://www.pa.msu.edu/ftp/pub/unix/cd1.3.tar.gz.  As a convenience
-to our -dev cgm users, we have brought that
-source code in house under lib/nistcd and now build libnistcd routinely
-as part of our ordinary builds.  The only changes we have made to the
-cd1.3 source code is visibility changes in cd.h and swapping the sense of
-the return codes for the test executables so that 0 is returned on success
-and 1 on failure.  If you want to test libnistcd on your platform,
-please run
-
-make test_nistcd
-
-in the top-level build tree.  (That tests runs all the test executables
-that are built as part of cd1.3 and compares the results that are generated
-with the *.cgm files that are supplied as part of cd1.3.)
-
-Two applications that convert and/or display CGM results on Linux are
-ralcgm (which is called by the ImageMagick convert and display applications)
-and uniconvertor.
-
-Some additional work on -dev cgm is required to implement antialiasing and
-non-Hershey fonts, but both those should be possible using libnistcd according
-to the text that is shown by lib/nistcd/cdtext.cgm and lib/nistcd/cdexp1.cgm.
-
-5.26 get-drv-info now changed to test-drv-info
-
-To make cross-building much easier for PLplot we now configure the *.rc
-files that are used to describe our various dynamic devices rather than
-generating the required *.rc files with get-drv-info.  We have changed the
-name of get-drv-info to test-drv-info.  That name is more appropriate
-because that executable has always tested dynamic loading of the driver
-plug-ins as well as generating the *.rc files from the information gleaned
-from that dynamic loading.  Now, we simply run test-drv-info as an option
-(defaults to ON unless cross-building is enabled) and compare the resulting
-*.rc file with the one configured by cmake to be sure the dynamic device
-has been built correctly.
-
-5.27 Text clipping now enabled by default for the cairo devices
-
-When correct text clipping was first implemented for cairo devices, it was
-discovered that the libcairo library of that era (2007-08) did that clipping
-quite inefficiently so text clipping was disabled by default.  Recent tests
-of text clipping for the cairo devices using libcairo 1.6.4 (released in
-2008-04) shows text clipping is quite efficient now.  Therefore, it is now
-enabled by default.  If you notice a significant slowdown for some libcairo
-version prior to 1.6.4 you can use the option -drvopt text_clipping=0 for
-your cairo device plots (and accept the improperly clipped text results that
-might occur with that option).  Better yet, use libcairo 1.6.4 or later.
-
-5.28 A powerful qt device driver has been implemented
-
-Thanks to the efforts of Alban Rochel of the QSAS team, we now have a new qt
-device driver which delivers the following 9 (!) devices: qtwidget, bmpqt,
-jpgqt, pngqt, ppmqt, tiffqt, epsqt, pdfqt, and svgqt. qtwidget is an
-elementary interactive device where, for now, the possible interactions
-consist of resizing the window and right clicking with the mouse (or hitting
-<return> to be consistent with other PLplot interactive devices) to control
-paging.  The qtwidget overall size is expressed in pixels. bmpqt, jpgqt,
-pngqt, ppmqt, and tiffqt are file devices whose overall sizes are specified
-in pixels and whose output is BMP (Windows bitmap), JPEG, PNG, PPM (portable
-pixmap), and TIFF (tagged image file format) formatted files. epsqt, pdfqt,
-svgqt are file devices whose overall sizes are specified in points (1/72 of
-an inch) and whose output is EPS (encapsulated PostScript), PDF, and SVG
-formatted files.  The qt device driver is based on the powerful facilities
-of Qt4 so all qt devices implement variable opacity (alpha channel) effects
-(see example 30).  The qt devices also use system unicode fonts, and deal
-with CTL (complex text layout) languages automatically without any
-intervention required by the user.  (To show this, try qt device results
-from examples 23 [mathematical symbols] and 24 [CTL languages].)
-
-Our exhaustive Linux testing of the qt devices (which consisted of detailed
-comparisons for all our standard examples between qt device results and the
-corresponding cairo device results) indicates this device driver is mature,
-but testing on other platforms is requested to confirm that maturity. Qt-4.5
-(the version we used for most of our tests) has some essential SVG
-functionality so we recommend that version (downloadable from
-http://www.qtsoftware.com/downloads for Linux, Mac OS X, and Windows) for
-svgqt.  One of our developers found that pdfqt was orders of magnitude
-slower than the other qt devices for Qt-4.4.3 on Ubuntu 8.10 installed on a
-64 bit box.  That problem was completely cured by moving to the downloadable
-Qt-4.5 version.  However, we have also had good Qt-4.4.3 pdfqt reports on
-other platforms.  One of our developers also found that all first pages of
-examples were black for just the qtwidget device for Qt-4.5.1 on Mac OS X.
-From the other improvements we see in Qt-4.5.1 relative to Qt-4.4.3 we
-assume this black first page for qtwidget problem also exists for Qt-4.4.3,
-but we haven't tested that combination.
-
-In sum, Qt-4.4.3 is worth trying if it is already installed on your machine,
-but if you run into any difficulty with it please switch to Qt-4.5.x (once
-Qt-4.5.x is installed all you have to do is to put the 4.5.x version of
-qmake in your path, and cmake does the rest).  If the problem persists for
-Qt-4.5, then it is worth reporting a qt bug.
-
-5.29 The PLplot API is now accessible from Qt GUI applications
-
-This important new feature has been implemented by Alban Rochel of the QSAS
-team as a spin-off of the qt device driver project using the extqt device
-(which constitutes the tenth qt device).  See examples/c++/README.qt_example
-for a brief description of a simple Qt example which accesses the PLplot API
-and which is built in the installed examples tree using the pkg-config
-approach. Our build system has been enhanced to configure the necessary
-plplotd-qt.pc file.
-
-5.30 NaN / Inf support for some PLplot functions
-
-Some PLplot now correctly handle Nan or Inf values in the data to be plotted.
-Line plotting (plline etc) and image plotting (plimage, plimagefr) will
-now ignore NaN / Inf values. Currently some of the contour plotting / 3-d
-routines do not handle NaN / Inf values. This functionality will
-depend on whether the language binding used supports NaN / Inf values.
-
-5.31 Various bug fixes
-
-Various bugs in the 5.9.3 release have been fixed including:
-
-- Include missing file needed for the aqt driver on Mac OS X
-- Missing library version number for nistcd
-- Fixes for the qt examples with dynamic drivers disabled
-- Fixes to several tcl examples so they work with plserver
-- Fix pkg-config files to work correctly with Debug / Release build types set
-- Make Fortran command line argument parsing work with shared libraries on Windows
-
-5.32 Cairo driver improvements
-
-Improvements to the cairo driver to give better results for bitmap
-formats when used with anti-aliasing file viewers.
-
-5.33 PyQt changes
-
-Years ago we got a donation of a hand-crafted pyqt3 interface to PLplot
-(some of the functions in plplot_widgetmodule.c in bindings/python) and a
-proof-of-concept example (prova.py and qplplot.py in examples/python), but
-this code did not gain any developer interest and was therefore not
-understood or maintained. Recently one of our core developers has
-implemented a sip-generated pyqt4 interface to PLplot (controlled by
-plplot_pyqt4.sip in bindings/qt_gui/pyqt4) that builds without problems as a
-python extension module, and a good-looking pyqt4 example (pyqt4_example.py
-in examples/python) that works well.  Since this pyqt4 approach is
-maintained by a PLplot developer it appears to have a good future, and we
-have therefore decided to concentrate on pyqt4 and remove the pyqt3 PLplot
-interface and example completely.
-
-5.34 Color Palettes
-
-Support has been added to PLplot for user defined color palette files.
-These files can be loaded at the command line using the -cmap0 or
--cmap1 commands, or via the API using the plspal0 and plspal1 commands.
-The commands cmap0 / plspal0 are used to load cmap0 type files which
-specify the colors in PLplot's color table 0. The commands cmap1 /
-plspal1 are used to load cmap1 type files which specify PLplot's color
-table 1. Examples of both types of files can be found in either the
-plplot-source/data directory or the PLplot installed directory
-(typically /usr/local/share/plplotx.y.z/ on Linux).
-
-5.35 Reimplementation of a "soft landing" when a bad/missing compiler is
-detected
-
-The PLplot core library is written in C so our CMake-based build system will
-error out if it doesn't detect a working C compiler.  However all other
-compiled languages (Ada, C++, D, Fortran, Java, and OCaml) we support are
-optional.  If a working compiler is not available, we give a "soft landing"
-(give a warning message, disable the optional component, and keep going).
-The old implementation of the soft landing was not applied consistently (C++
-was unnecessarily mandatory before) and also caused problems for ccmake (a
-CLI front-end to the cmake application) and cmake-gui (a CMake GUI front-end
-to the cmake application) which incorrectly dropped languages as a result
-even when there was a working compiler.
-
-We now have completely reimplemented the soft landing logic.  The result
-works well for cmake, ccmake, and cmake-gui.  The one limitation of this new
-method that we are aware of is it only recognizes either the default
-compiler chosen by the generator or else a compiler specified by the
-environment variable approach (see Official Notice XII above).  Once CMake
-bug 9220 has been fixed (so that the OPTIONAL signature of the
-enable_language command actually works without erroring out), then our
-soft-landing approach (which is a workaround for bug 9220) will be replaced
-by the OPTIONAL signature of enable_language, and all CMake methods of
-specifying compilers and compiler options will automatically be recognized
-as a result.
-
-5.36 Make PLplot aware of LC_NUMERIC locale
-
-For POSIX-compliant systems, locale is set globally so any external
-applications or libraries that use the PLplot library or any external
-libraries used by the PLplot library or PLplot device drivers could
-potentially change the LC_NUMERIC locale used by PLplot to anything those
-external applications and libraries choose. The principal consequence of
-such choice is the decimal separator could be a comma (for some locales)
-rather than the period assumed for the "C" locale.  For previous versions of
-PLplot a comma decimal separator would have lead to a large number of
-errors, but this issue is now addressed with a side benefit that our plots
-now have the capability of displaying the comma (e.g., in axis labels) for
-the decimal separator for those locales which require that.
-
-If you are not satisfied with the results for the default PLplot locale set
-by external applications and libraries, then you can now choose the
-LC_NUMERIC locale for PLplot by (a) specifying the new -locale command-line
-option for PLplot (if you do not specify that option, a default locale is
-chosen depending on applications and libraries external to PLplot (see
-comments above), and (b) setting an environment variable (LC_ALL,
-LC_NUMERIC, or LANG on Linux, for example) to some locale that has been
-installed on your system.  On Linux, to find what locales are installed, use
-the "locale -a" option. The "C" locale is always installed, but usually
-there is also a principal locale that works on a platform such as
-en_US.UTF8, nl_NL.UTF8, etc.  Furthermore, it is straightforward to build
-and install any additional locale you desire.  (For example, on Debian Linux
-you do that by running "dpkg-reconfigure locales".)
-
-Normally, users will not use the -locale option since the period
-decimal separator that you get for the normal LC_NUMERIC default "C"
-locale used by external applications and libraries is fine for their needs.
-However, if the resulting decimal separator is not what the user
-wants, then they would do something like the following to (a) use a period
-decimal separator for command-line input and plots:
-
-LC_ALL=C examples/c/x09c -locale -dev psc -o test.psc -ori 0.5
-
-or (b) use a comma decimal separator for command-line input and plots:
-
-LC_ALL=nl_NL.UTF8 examples/c/x09c -locale -dev psc -o test.psc -ori 0,5
-
-N.B. in either case if the wrong separator is used for input (e.g., -ori 0,5
-in the first case or -ori 0.5 in the second) the floating-point conversion
-(using atof) is silently terminated at the wrong separator for the locale,
-i.e., the fractional part of the number is silently dropped.  This is
-obviously not ideal, but on the other hand there are relatively few
-floating-point command-line options for PLplot, and we also expect those who
-use the -locale option to specifically ask for a given separator for plots
-(e.g., axis labels) will then use it for command-line input of
-floating-point values as well.
-
-Certain critical areas of the PLplot library (e.g., our color palette file
-reading routines and much of the code in our device drivers) absolutely
-require a period for the decimal separator.  We now protect those critical
-areas by saving the normal PLplot LC_NUMERIC locale (established with the
-above -locale option or by default by whatever is set by external
-applications or libraries), setting the LC_NUMERIC "C" locale, executing the
-critical code, then restoring back to the normal PLplot LC_NUMERIC locale.
-Previous versions of PLplot did not have this protection of the critical
-areas so were vulnerable to default LC_NUMERIC settings of external
-applications that resulted in a comma decimal separator that did not work
-correctly for the critical areas.
-
-5.37 Linear gradients have been implemented
-
-The new plgradient routine draws a linear gradient (based on the
-current color map 1) at a specified angle with the x axis for a
-specified polygon.  Standard examples 25 and 30 now demonstrate use of
-plgradient.  Some devices use a software fallback to render the
-gradient.  This fallback is implemented with plshades which uses a
-series of rectangles to approximate the gradient. Tiny alignment
-issues for those rectangles relative to the pixel grid may look
-problematic for transparency gradients.  To avoid that issue, we try
-to use native gradient capability whenever that is possible for any of
-our devices.  Currently, this has been implemented for our svg, qt,
-and cairo devices.  The result is nice-looking smooth transparency
-gradients for those devices, for, e.g., example 30, page 5.
-
-5.38 Cairo Windows driver implemented
-
-A cairo Windows driver has been implemented. This provides an
-interactive cairo driver for Windows similar to xcairo on Linux.
-Work to improve its functionality is ongoing.
-
-5.39 Custom axis labelling implemented
-
-Axis text labels can now be customized using the new plslabelfunc function.
-This allows a user to specify what text should be draw at a given position
-along a plot axis.  Example 19 has been updated to illustrate this function's
-use through labelling geographic coordinates in degrees North, South, East and
-West.
-
-5.40 Universal coordinate transform implemented
-
-A custom coordinate transformation function can be set using plstransform.
-This transformation function affects all subsequent plot function calls which
-work with plot window coordinates.  Testing and refinement of this support is
-ongoing.
-
-5.41 Support for arbitrary storage of 2D user data
-
-This improvement courtesy of David MacMahon adds support for arbitrary
-storage of 2D user data.  This is very similar to the technique employed
-by some existing functions (e.g. plfcont and plfshade) that use "evaluator"
-functions to access 2D user data that is stored in an arbitrary format.
-The new approach extends the concept of a user-supplied (or predefined)
-"evaluator" function to a group of user-supplied (or predefined) "operator"
-functions.  The operator functions provide f...
 
[truncated message content]

[Plplot-cvs] SF.net SVN: plplot:[12968] trunk

[<ai...@us...>]

Revision: 12968
          http://sourceforge.net/p/plplot/code/12968
Author:   airwin
Date:     2014-01-29 01:42:57 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Use better parameter names (xmin0, xmax0, ymin0, ymax0, zmin0, zmax0)
==> (xmin, xmax, ymin, ymax, zmin, zmax) for some of the plw3d
arguments.

Modified Paths:
--------------
    trunk/include/plplot.h
    trunk/src/plwind.c

Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h	2014-01-29 00:29:24 UTC (rev 12967)
+++ trunk/include/plplot.h	2014-01-29 01:42:57 UTC (rev 12968)
@@ -1980,9 +1980,9 @@
 // Set up a window for three-dimensional plotting.
 
 PLDLLIMPEXP void
-c_plw3d( PLFLT basex, PLFLT basey, PLFLT height, PLFLT xmin0,
-         PLFLT xmax0, PLFLT ymin0, PLFLT ymax0, PLFLT zmin0,
-         PLFLT zmax0, PLFLT alt, PLFLT az );
+c_plw3d( PLFLT basex, PLFLT basey, PLFLT height, PLFLT xmin,
+         PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT zmin,
+         PLFLT zmax, PLFLT alt, PLFLT az );
 
 #ifdef PL_DEPRECATED
 // Set pen width with deprecated integer width

Modified: trunk/src/plwind.c
===================================================================
--- trunk/src/plwind.c	2014-01-29 00:29:24 UTC (rev 12967)
+++ trunk/src/plwind.c	2014-01-29 01:42:57 UTC (rev 12968)
@@ -136,11 +136,11 @@
 //--------------------------------------------------------------------------
 
 void
-c_plw3d( PLFLT basex, PLFLT basey, PLFLT height, PLFLT xmin0,
-         PLFLT xmax0, PLFLT ymin0, PLFLT ymax0, PLFLT zmin0,
-         PLFLT zmax0, PLFLT alt, PLFLT az )
+c_plw3d( PLFLT basex, PLFLT basey, PLFLT height, PLFLT xmin,
+         PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT zmin,
+         PLFLT zmax, PLFLT alt, PLFLT az )
 {
-    PLFLT xmin, xmax, ymin, ymax, zmin, zmax, d;
+    PLFLT xmin_adjusted, xmax_adjusted, ymin_adjusted, ymax_adjusted, zmin_adjusted, zmax_adjusted, d;
     PLFLT cx, cy, saz, caz, salt, calt, zscale;
 
     if ( plsc->level < 3 )
@@ -153,7 +153,7 @@
         plabort( "plw3d: Invalid world coordinate boxsize" );
         return;
     }
-    if ( xmin0 == xmax0 || ymin0 == ymax0 || zmin0 == zmax0 )
+    if ( xmin == xmax || ymin == ymax || zmin == zmax )
     {
         plabort( "plw3d: Invalid axis range" );
         return;
@@ -164,40 +164,40 @@
         return;
     }
 
-    d      = 1.0e-5 * ( xmax0 - xmin0 );
-    xmax   = xmax0 + d;
-    xmin   = xmin0 - d;
-    d      = 1.0e-5 * ( ymax0 - ymin0 );
-    ymax   = ymax0 + d;
-    ymin   = ymin0 - d;
-    d      = 1.0e-5 * ( zmax0 - zmin0 );
-    zmax   = zmax0 + d;
-    zmin   = zmin0 - d;
-    cx     = basex / ( xmax - xmin );
-    cy     = basey / ( ymax - ymin );
-    zscale = height / ( zmax - zmin );
-    saz    = sin( dtr * az );
-    caz    = cos( dtr * az );
-    salt   = sin( dtr * alt );
-    calt   = cos( dtr * alt );
+    d             = 1.0e-5 * ( xmax - xmin );
+    xmax_adjusted = xmax + d;
+    xmin_adjusted = xmin - d;
+    d             = 1.0e-5 * ( ymax - ymin );
+    ymax_adjusted = ymax + d;
+    ymin_adjusted = ymin - d;
+    d             = 1.0e-5 * ( zmax - zmin );
+    zmax_adjusted = zmax + d;
+    zmin_adjusted = zmin - d;
+    cx            = basex / ( xmax_adjusted - xmin_adjusted );
+    cy            = basey / ( ymax_adjusted - ymin_adjusted );
+    zscale        = height / ( zmax_adjusted - zmin_adjusted );
+    saz           = sin( dtr * az );
+    caz           = cos( dtr * az );
+    salt          = sin( dtr * alt );
+    calt          = cos( dtr * alt );
 
-    plsc->domxmi = xmin;
-    plsc->domxma = xmax;
-    plsc->domymi = ymin;
-    plsc->domyma = ymax;
+    plsc->domxmi = xmin_adjusted;
+    plsc->domxma = xmax_adjusted;
+    plsc->domymi = ymin_adjusted;
+    plsc->domyma = ymax_adjusted;
     plsc->zzscl  = zscale;
-    plsc->ranmi  = zmin;
-    plsc->ranma  = zmax;
+    plsc->ranmi  = zmin_adjusted;
+    plsc->ranma  = zmax_adjusted;
 
     plsc->base3x = basex;
     plsc->base3y = basey;
-    plsc->basecx = 0.5 * ( xmin + xmax );
-    plsc->basecy = 0.5 * ( ymin + ymax );
+    plsc->basecx = 0.5 * ( xmin_adjusted + xmax_adjusted );
+    plsc->basecy = 0.5 * ( ymin_adjusted + ymax_adjusted );
 // Mathematical explanation of the 3 transformations of coordinates:
 // (I) Scaling:
 //     x' = cx*(x-x_mid) = cx*(x-plsc->basecx)
 //     y' = cy*(y-y_mid) = cy*(y-plsc->basecy)
-//     z' = zscale*(z-zmin) = zscale*(z-plsc->ranmi)
+//     z' = zscale*(z-zmin_adjusted) = zscale*(z-plsc->ranmi)
 // (II) Rotation about z' axis clockwise by the angle of the azimut when
 //      looking from the top in a right-handed coordinate system.
 //     x''          x'

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12967] trunk/include/plplot.h

[<ai...@us...>]

Revision: 12967
          http://sourceforge.net/p/plplot/code/12967
Author:   airwin
Date:     2014-01-29 00:29:24 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Change parameter names left, right, bottom, top ==> xmin, xmax, ymin,
ymax for plshade and plshade1 to be consistent with the argument
names for those functions in src/plshade.c and
also to be consistent with the names for the equivalent arguments
of plshades (both in include/plplot.h and src/plshade.c).

Modified Paths:
--------------
    trunk/include/plplot.h

Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h	2014-01-29 00:01:50 UTC (rev 12966)
+++ trunk/include/plplot.h	2014-01-29 00:29:24 UTC (rev 12967)
@@ -1630,7 +1630,7 @@
 
 PLDLLIMPEXP void
 c_plshade( const PLFLT * const *a, PLINT nx, PLINT ny, PLINT ( *defined )( PLFLT, PLFLT ),
-           PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
+           PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
            PLFLT shade_min, PLFLT shade_max,
            PLINT sh_cmap, PLFLT sh_color, PLFLT sh_width,
            PLINT min_color, PLFLT min_width,
@@ -1641,7 +1641,7 @@
 
 PLDLLIMPEXP void
 c_plshade1( const PLFLT *a, PLINT nx, PLINT ny, PLINT ( *defined )( PLFLT, PLFLT ),
-            PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
+            PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
             PLFLT shade_min, PLFLT shade_max,
             PLINT sh_cmap, PLFLT sh_color, PLFLT sh_width,
             PLINT min_color, PLFLT min_width,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12966] trunk

[<ai...@us...>]

Revision: 12966
          http://sourceforge.net/p/plplot/code/12966
Author:   airwin
Date:     2014-01-29 00:01:50 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Finish the previous renaming of pos ==> intensity for the
plscmap1l and plscmap1la arguments in plplot.h by making the same change
in src/plctrl.c.

Change the argument name of plseed from s ==> seed.

Modified Paths:
--------------
    trunk/include/plplot.h
    trunk/src/plctrl.c

Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h	2014-01-28 20:23:52 UTC (rev 12965)
+++ trunk/include/plplot.h	2014-01-29 00:01:50 UTC (rev 12966)
@@ -1599,7 +1599,7 @@
 // Set seed for internal random number generator
 
 PLDLLIMPEXP void
-c_plseed( unsigned int s );
+c_plseed( unsigned int seed );
 
 // Set the escape character for text strings.
 

Modified: trunk/src/plctrl.c
===================================================================
--- trunk/src/plctrl.c	2014-01-28 20:23:52 UTC (rev 12965)
+++ trunk/src/plctrl.c	2014-01-29 00:01:50 UTC (rev 12966)
@@ -632,7 +632,7 @@
 //! The inputs are:
 //! @param itype 0: HLS, 1: RGB
 //! @param npts	number of control points
-//! @param pos[] position for each control point
+//! @param intensity[] intensity index for each control point
 //! @param coord1[] first coordinate for each control point
 //! @param coord2[] second coordinate for each control point
 //! @param coord3[] third coordinate for each control point
@@ -640,7 +640,7 @@
 //! for the associated interval.
 
 void
-c_plscmap1l( PLINT itype, PLINT npts, const PLFLT *pos,
+c_plscmap1l( PLINT itype, PLINT npts, const PLFLT *intensity,
              const PLFLT *coord1, const PLFLT *coord2, const PLFLT *coord3, const PLINT *alt_hue_path )
 {
     int   n;
@@ -652,7 +652,7 @@
         return;
     }
 
-    if ( ( pos[0] != 0 ) || ( pos[npts - 1] != 1 ) )
+    if ( ( intensity[0] != 0 ) || ( intensity[npts - 1] != 1 ) )
     {
         plabort( "plscmap1l: First, last control points must lie on boundary" );
         return;
@@ -692,7 +692,7 @@
         plsc->cmap1cp[n].h = h;
         plsc->cmap1cp[n].l = l;
         plsc->cmap1cp[n].s = s;
-        plsc->cmap1cp[n].p = pos[n];
+        plsc->cmap1cp[n].p = intensity[n];
         plsc->cmap1cp[n].a = 1.0;
 
         if ( alt_hue_path == NULL )
@@ -717,7 +717,7 @@
 //!
 //! @param itype 0: HLS, 1: RGB
 //! @param npts	number of control points
-//! @param pos[] position for each control point
+//! @param intensity[] intensity index for each control point
 //! @param coord1[] first coordinate for each control point
 //! @param coord2[] second coordinate for each control point
 //! @param coord3[] third coordinate for each control point
@@ -726,7 +726,7 @@
 //! for the associated interval.
 
 void
-c_plscmap1la( PLINT itype, PLINT npts, const PLFLT *pos,
+c_plscmap1la( PLINT itype, PLINT npts, const PLFLT *intensity,
               const PLFLT *coord1, const PLFLT *coord2, const PLFLT *coord3, const PLFLT *alpha, const PLINT *alt_hue_path )
 {
     int   n;
@@ -738,7 +738,7 @@
         return;
     }
 
-    if ( ( pos[0] != 0 ) || ( pos[npts - 1] != 1 ) )
+    if ( ( intensity[0] != 0 ) || ( intensity[npts - 1] != 1 ) )
     {
         plabort( "plscmap1la: First, last control points must lie on boundary" );
         return;
@@ -778,7 +778,7 @@
         plsc->cmap1cp[n].h = h;
         plsc->cmap1cp[n].l = l;
         plsc->cmap1cp[n].s = s;
-        plsc->cmap1cp[n].p = pos[n];
+        plsc->cmap1cp[n].p = intensity[n];
         plsc->cmap1cp[n].a = alpha[n];
 
         if ( alt_hue_path == NULL )
@@ -3045,13 +3045,13 @@
 //
 //! Set the seed for the random number generator included.
 //!
-//! @param s The random number generator seed value.
+//! @param seed The random number generator seed value.
 //--------------------------------------------------------------------------
 
 void
-c_plseed( unsigned int s )
+c_plseed( unsigned int seed )
 {
-    init_genrand( s );
+    init_genrand( seed );
 }
 
 //--------------------------------------------------------------------------

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12965] trunk

[<arj...@us...>]

Revision: 12965
          http://sourceforge.net/p/plplot/code/12965
Author:   arjenmarkus
Date:     2014-01-28 20:23:52 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
Small corrections (FALSE instead of 0, plFramePtr->tkwin instead of new and a few superfluous empty lines removed)

Modified Paths:
--------------
    trunk/bindings/tk/plframe.c
    trunk/drivers/tk.c
    trunk/drivers/wingcc.c

Modified: trunk/bindings/tk/plframe.c
===================================================================
--- trunk/bindings/tk/plframe.c	2014-01-28 09:57:01 UTC (rev 12964)
+++ trunk/bindings/tk/plframe.c	2014-01-28 20:23:52 UTC (rev 12965)
@@ -469,7 +469,7 @@
 
 // Start up event handlers and other good stuff
 
-    Tk_SetClass( new, "Plframe" );
+    Tk_SetClass( plFramePtr->tkwin, "Plframe" );
 
     Tk_CreateEventHandler( plFramePtr->tkwin, StructureNotifyMask,
         PlFrameConfigureEH, (ClientData) plFramePtr );

Modified: trunk/drivers/tk.c
===================================================================
--- trunk/drivers/tk.c	2014-01-28 09:57:01 UTC (rev 12964)
+++ trunk/drivers/tk.c	2014-01-28 20:23:52 UTC (rev 12965)
@@ -268,7 +268,7 @@
     if ( dev->iodev == NULL )
         plexit( "plD_init_tk: Out of memory." );
 
-    dev->exit_eventloop = 0;
+    dev->exit_eventloop = FALSE;
 
 // Variables used in querying plserver for events
 

Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c	2014-01-28 09:57:01 UTC (rev 12964)
+++ trunk/drivers/wingcc.c	2014-01-28 20:23:52 UTC (rev 12965)
@@ -981,8 +981,6 @@
     case PLSTATE_CMAP0:
     case PLSTATE_CMAP1:
         dev->colour = RGB( pls->curcolor.r, pls->curcolor.g, pls->curcolor.b );
-
-
         break;
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12964] trunk/doc/docbook/src/api.xml

[<ai...@us...>]

Revision: 12964
          http://sourceforge.net/p/plplot/code/12964
Author:   airwin
Date:     2014-01-28 09:57:01 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
Additional argument name and type mismatch fixups to reduce size
of report delivered by check_api_xml_consistency target, but not done yet.

Additional fixups done while I was dealing with the rest: 

color map [01] ==> cmap[01]

Drop period from end of title for some 20 functions
to be consistent with the rest.

Some redacted form fixups.

Modified Paths:
--------------
    trunk/doc/docbook/src/api.xml

Modified: trunk/doc/docbook/src/api.xml
===================================================================
--- trunk/doc/docbook/src/api.xml	2014-01-28 06:46:00 UTC (rev 12963)
+++ trunk/doc/docbook/src/api.xml	2014-01-28 09:57:01 UTC (rev 12964)
@@ -820,7 +820,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -832,7 +832,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -1900,7 +1900,7 @@
 
   <sect1 id="plcol0" renderas="sect3">
     <title>
-      <function>plcol0</function>: Set color, map0
+      <function>plcol0</function>: Set color, cmap0
     </title>
 
     <para>
@@ -1915,7 +1915,7 @@
     </para>
 
     <para>
-      Sets the color index for color map0 (see <xref linkend="color-map-0"/>).
+      Sets the color index for cmap0 (see <xref linkend="color-map-0"/>).
     </para>
 
     <variablelist>
@@ -1966,7 +1966,7 @@
 
   <sect1 id="plcol1" renderas="sect3">
     <title>
-      <function>plcol1</function>: Set color, map1
+      <function>plcol1</function>: Set color, cmap1
     </title>
 
     <para>
@@ -1980,7 +1980,7 @@
       </funcsynopsis>
     </para>
 
-    <para> Sets the color for color map1 (see <xref
+    <para> Sets the color for cmap1 (see <xref
     linkend="color-map-1"/>).  </para>
 
     <variablelist>
@@ -2390,7 +2390,7 @@
       <varlistentry>
 	<term>
 	  <parameter>ticks</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -2402,7 +2402,7 @@
       <varlistentry>
 	<term>
 	  <parameter>sub_ticks</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -2414,7 +2414,7 @@
       <varlistentry>
 	<term>
 	  <parameter>n_values</parameter>
-	  (<literal>PLINT</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -2427,7 +2427,7 @@
       <varlistentry>
 	<term>
 	  <parameter>values</parameter>
-	  (<literal>PLFLT *const *</literal>, input)
+	  (<literal>const PLFLT *const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -2582,19 +2582,19 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>ifbzero_control</parameter>
+	  <parameter>ifbtime_offset</parameter>
 	  (<literal>PLBOOL</literal>, input)
 	</term>
 	<listitem>
 	  <para>
-            <parameter>ifbzero_control</parameter> controls how the
+            <parameter>ifbtime_offset</parameter> controls how the
 	    epoch of the continuous time scale is specified by the
-	    user. If <parameter>ifbzero_control</parameter> is false,
+	    user. If <parameter>ifbtime_offset</parameter> is false,
 	    then <parameter>offset1</parameter> and
 	    <parameter>offset2</parameter> are used to specify the
 	    epoch, and the following broken-down time parameters are
 	    completely ignored.  If
-	    <parameter>ifbzero_control</parameter> is true, then
+	    <parameter>ifbtime_offset</parameter> is true, then
 	    <parameter>offset1</parameter> and
 	    <parameter>offset2</parameter> are completely ignored, and
 	    the following broken-down time parameters are used to
@@ -2741,7 +2741,7 @@
       <varlistentry>
 	<term>
 	  <parameter>f</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT *const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -2787,7 +2787,7 @@
       <varlistentry>
 	<term>
 	  <parameter>clevel</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -3176,7 +3176,7 @@
   <sect1 id="plenv0" renderas="sect3">
     <title>
       <function>plenv0</function>: Same as &plenv; but if in multiplot
-      mode does not advance the subpage, instead clears it.
+      mode does not advance the subpage, instead clears it
     </title>
     <para>
       <funcsynopsis>
@@ -3954,7 +3954,7 @@
       <varlistentry>
 	<term>
 	  <parameter>xmin</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -3966,7 +3966,7 @@
       <varlistentry>
 	<term>
 	  <parameter>xmax</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -3978,7 +3978,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -4062,7 +4062,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -4073,7 +4073,7 @@
       <varlistentry>
 	<term>
 	  <parameter>ymin</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -4085,7 +4085,7 @@
       <varlistentry>
 	<term>
 	  <parameter>ymax</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -4204,7 +4204,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -4215,7 +4215,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -4286,7 +4286,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -4297,7 +4297,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -4308,7 +4308,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -4620,7 +4620,7 @@
   <sect1 id="plgcol0" renderas="sect3">
     <title>
       <function>plgcol0</function>: Returns 8-bit RGB values for given color
-      from color map0
+      index from cmap0
     </title>
 
     <para>
@@ -4638,7 +4638,7 @@
     </para>
 
     <para>
-      Returns 8-bit RGB values (0-255) for given color from color map0 (see
+      Returns 8-bit RGB values (0-255) for given color from cmap0 (see
       <xref linkend="color-map-0"/>).  Values are
       negative if an invalid color id is given.
     </para>
@@ -4703,7 +4703,7 @@
   <sect1 id="plgcol0a" renderas="sect3">
     <title>
       <function>plgcol0a</function>: Returns 8-bit RGB values and double alpha
-      value for given color from color map0.
+      transparency value for given color index from cmap0
     </title>
 
     <para>
@@ -4716,14 +4716,14 @@
 	  <paramdef><parameter>r</parameter></paramdef>
 	  <paramdef><parameter>g</parameter></paramdef>
 	  <paramdef><parameter>b</parameter></paramdef>
-	  <paramdef><parameter>a</parameter></paramdef>
+	  <paramdef><parameter>alpha</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
     </para>
 
     <para>
-      Returns 8-bit RGB values (0-255) and double alpha value (0.0 - 1.0) for 
-      given color from color map0 (see <xref linkend="color-map-0"/>).  Values 
+      Returns 8-bit RGB values (0-255) and double alpha transparency value (0.0 - 1.0) for 
+      given color from cmap0 (see <xref linkend="color-map-0"/>).  Values 
       are negative if an invalid color id is given.
     </para>
 
@@ -4774,12 +4774,12 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>a</parameter>
+	  <parameter>alpha</parameter>
 	  (<literal>PLFLT *</literal>, output)
 	</term>
 	<listitem>
 	  <para>
-	    Pointer to PLFLT alpha value.
+	    Pointer to PLFLT alpha transparency value.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -4866,7 +4866,7 @@
   <sect1 id="plgcolbga" renderas="sect3">
     <title>
       <function>plgcolbga</function>:  Returns the background color (cmap0[0]) 
-      by 8-bit RGB value and double alpha value.
+      by 8-bit RGB value and double alpha transparency value
     </title>
 
     <para>
@@ -4878,14 +4878,14 @@
 	  <paramdef><parameter>r</parameter></paramdef>
 	  <paramdef><parameter>g</parameter></paramdef>
 	  <paramdef><parameter>b</parameter></paramdef>
-	  <paramdef><parameter>a</parameter></paramdef>
+	  <paramdef><parameter>alpha</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
     </para>
 
     <para>
       Returns the background color (cmap0[0]) by 8-bit RGB value and double
-      alpha value.
+      alpha transparency value.
     </para>
 
     <variablelist>
@@ -4927,12 +4927,12 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>a</parameter>
+	  <parameter>alpha</parameter>
 	  (<literal>PLFLT *</literal>, output)
 	</term>
 	<listitem>
 	  <para>
-	    Pointer to PLFLT alpha value.
+	    Pointer to PLFLT alpha transparency value.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -5815,7 +5815,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -5826,7 +5826,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -5902,7 +5902,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -5913,7 +5913,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -5924,7 +5924,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -5949,7 +5949,7 @@
       <varlistentry>
 	<term>
 	  <parameter>xg</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -5974,7 +5974,7 @@
       <varlistentry>
 	<term>
 	  <parameter>yg</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -6727,7 +6727,7 @@
       <varlistentry>
 	<term>
 	  <parameter>data</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -6954,7 +6954,7 @@
 
   <sect1 id="plimagefr" renderas="sect3">
     <title>
-      <function>plimagefr</function>: Plot a 2D matrix using color map1
+      <function>plimagefr</function>: Plot a 2D matrix using cmap1
     </title>
 
     <para>
@@ -6981,14 +6981,14 @@
     </para>
 
     <para>
-      Plot a 2D matrix using color map1.
+      Plot a 2D matrix using cmap1.
     </para>
 
     <variablelist>
       <varlistentry>
 	<term>
 	  <parameter>idata</parameter>
-	  (<literal>PLFLT**</literal>, input)
+	  (<literal>const PLFLT *const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -7111,7 +7111,7 @@
 
   <sect1 id="plimage" renderas="sect3">
     <title>
-      <function>plimage</function>: Plot a 2D matrix using color map1 with
+      <function>plimage</function>: Plot a 2D matrix using cmap1 with
       automatic colour adjustment
     </title>
 
@@ -7148,7 +7148,7 @@
       <varlistentry>
 	<term>
 	  <parameter>idata</parameter>
-	  (<literal>PLFLT**</literal>, input)
+	  (<literal>const PLFLT *const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8081,7 +8081,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8092,7 +8092,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8157,7 +8157,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8168,7 +8168,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8179,7 +8179,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8249,7 +8249,7 @@
 
   <sect1 id="plmap" renderas="sect3">
     <title>
-      <function>plmap</function>: Plot continental outline in world coordinates.
+      <function>plmap</function>: Plot continental outline in world coordinates
     </title>
 
     <para>
@@ -8296,7 +8296,7 @@
       <varlistentry>
 	<term>
 	  <parameter>type</parameter>
-	  (<literal>char *</literal>, input)
+	  (<literal>const char *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8405,7 +8405,7 @@
 
   <sect1 id="plmeridians" renderas="sect3">
     <title>
-      <function>plmeridians</function>: Plot latitude and longitude lines.
+      <function>plmeridians</function>: Plot latitude and longitude lines
     </title>
 
     <para>
@@ -8586,7 +8586,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8598,7 +8598,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8610,7 +8610,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT *const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8696,7 +8696,7 @@
 
   <sect1 id="plmeshc" renderas="sect3">
     <title>
-      <function>plmeshc</function>: Magnitude colored plot surface mesh with contour.
+      <function>plmeshc</function>: Magnitude colored plot surface mesh with contour
     </title>
 
     <para>
@@ -8728,7 +8728,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8740,7 +8740,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8752,7 +8752,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT *const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -8847,7 +8847,7 @@
       <varlistentry>
 	<term>
 	  <parameter>clevel</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9107,7 +9107,7 @@
   <sect1 id="plmtex3" renderas="sect3">
     <title>
       <function>plmtex3</function>: Write text relative to viewport boundaries
-      in 3D plots.
+      in 3D plots
     </title>
 
     <para>
@@ -9303,7 +9303,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9315,7 +9315,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9327,7 +9327,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT *const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9425,7 +9425,7 @@
 
   <sect1 id="plot3dc" renderas="sect3">
     <title>
-      <function>plot3dc</function>: Magnitude colored plot surface with contour.
+      <function>plot3dc</function>: Magnitude colored plot surface with contour
     </title>
 
     <para>
@@ -9461,7 +9461,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9473,7 +9473,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9485,7 +9485,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT *const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9580,7 +9580,7 @@
       <varlistentry>
 	<term>
 	  <parameter>clevel</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9672,7 +9672,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9684,7 +9684,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9696,7 +9696,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT **</literal>, input)
+	  (<literal>const PLFLT *const *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9791,7 +9791,7 @@
       <varlistentry>
 	<term>
 	  <parameter>clevel</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9841,7 +9841,7 @@
       <varlistentry>
 	<term>
 	  <parameter>indexymin</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9860,7 +9860,7 @@
       <varlistentry>
 	<term>
 	  <parameter>indexymax</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -9940,7 +9940,7 @@
       <varlistentry>
 	<term>
 	  <parameter>argv</parameter>
-	  (<literal>char **</literal>, input)
+	  (<literal>const char **</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10111,7 +10111,7 @@
       <varlistentry>
 	<term>
 	  <parameter>inc</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10125,7 +10125,7 @@
       <varlistentry>
 	<term>
 	  <parameter>del</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10163,7 +10163,7 @@
   <sect1 id="plpath" renderas="sect3">
     <title>
       <function>plpath</function>: Draw a line between two points, accounting
-      for coordinate transforms.
+      for coordinate transforms
     </title>
 
     <para>
@@ -10311,7 +10311,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10322,7 +10322,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10407,7 +10407,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10418,7 +10418,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10429,7 +10429,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10530,7 +10530,7 @@
       <varlistentry>
 	<term>
 	  <parameter>x</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10541,7 +10541,7 @@
       <varlistentry>
 	<term>
 	  <parameter>y</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10552,7 +10552,7 @@
       <varlistentry>
 	<term>
 	  <parameter>z</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10563,7 +10563,7 @@
       <varlistentry>
 	<term>
 	  <parameter>draw</parameter>
-	  (<literal>PLBOOL *</literal>, input)
+	  (<literal>const PLBOOL *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -10613,7 +10613,7 @@
 	  <funcdef>
 	    <function>plprec</function>
 	  </funcdef>
-	  <paramdef><parameter>set</parameter></paramdef>
+	  <paramdef><parameter>setp</parameter></paramdef>
 	  <paramdef><parameter>prec</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
@@ -10626,16 +10626,16 @@
     <variablelist>
       <varlistentry>
 	<term>
-	  <parameter>set</parameter>
+	  <parameter>setp</parameter>
 	  (<literal>PLINT</literal>, input)
 	</term>
 	<listitem>
 	  <para>
-	    If <literal><parameter>set</parameter></literal> is equal to 0
+	    If <literal><parameter>setp</parameter></literal> is equal to 0
 	    then PLplot automatically determines the number of places to
 	    use after the decimal point in numeric labels (like those used
 	    to label axes).  If
-	    <literal><parameter>set</parameter></literal> is 1 then
+	    <literal><parameter>setp</parameter></literal> is 1 then
 	    <literal><parameter>prec</parameter></literal> sets the number
 	    of places.
 	  </para>
@@ -10656,7 +10656,7 @@
     </variablelist>
 
     <para>
-      Redacted form: <function>plprec(set, prec)</function>
+      Redacted form: <function>plprec(setp, prec)</function>
     </para>
 
     <para>
@@ -10676,7 +10676,7 @@
 	  <funcdef>
 	    <function>plpsty</function>
 	  </funcdef>
-	  <paramdef><parameter>n</parameter></paramdef>
+	  <paramdef><parameter>patt</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
     </para>
@@ -10689,7 +10689,7 @@
     <variablelist>
       <varlistentry>
 	<term>
-	  <parameter>n</parameter>
+	  <parameter>patt</parameter>
 	  (<literal>PLINT</literal>, input)
 	</term>
 	<listitem>
@@ -10703,7 +10703,7 @@
     </variablelist>
 
     <para>
-      Redacted form: <function>plpsty(n)</function>
+      Redacted form: <function>plpsty(patt)</function>
     </para>
 
     <para>
@@ -10842,7 +10842,7 @@
 
   <sect1 id="plptex3" renderas="sect3">
     <title>
-      <function>plptex3</function>: Write text inside the viewport of a 3D plot.
+      <function>plptex3</function>: Write text inside the viewport of a 3D plot
     </title>
 
     <para>
@@ -10851,9 +10851,9 @@
 	  <funcdef>
 	    <function>plptex3</function>
 	  </funcdef>
-	  <paramdef><parameter>x</parameter></paramdef>
-	  <paramdef><parameter>y</parameter></paramdef>
-	  <paramdef><parameter>z</parameter></paramdef>
+	  <paramdef><parameter>wx</parameter></paramdef>
+	  <paramdef><parameter>wy</parameter></paramdef>
+	  <paramdef><parameter>wz</parameter></paramdef>
 	  <paramdef><parameter>dx</parameter></paramdef>
 	  <paramdef><parameter>dy</parameter></paramdef>
 	  <paramdef><parameter>dz</parameter></paramdef>
@@ -10874,8 +10874,8 @@
       position of the reference point along this line is determined by
       <literal><parameter>just</parameter></literal>, and the reference
       point is placed at world coordinates
-      <literal>(<parameter>x</parameter>, <parameter>y</parameter>,
-      <parameter>z</parameter>)</literal> within the viewport. The
+      <literal>(<parameter>wx</parameter>, <parameter>wy</parameter>,
+      <parameter>wz</parameter>)</literal> within the viewport. The
       inclination and shear of the string is specified in terms of
       differences of world coordinates making it easy to write text parallel
       to a line in a graph.
@@ -10884,34 +10884,34 @@
     <variablelist>
       <varlistentry>
 	<term>
-	  <parameter>x</parameter>
+	  <parameter>wx</parameter>
 	  (<literal>PLFLT</literal>, input)
 	</term>
 	<listitem>
 	  <para>
-	    x coordinate of reference point of string.
+	    x world coordinate of reference point of string.
 	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>y</parameter>
+	  <parameter>wy</parameter>
 	  (<literal>PLFLT</literal>, input)
 	</term>
 	<listitem>
 	  <para>
-	    y coordinate of reference point of string.
+	    y world coordinate of reference point of string.
 	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>z</parameter>
+	  <parameter>wz</parameter>
 	  (<literal>PLFLT</literal>, input)
 	</term>
 	<listitem>
 	  <para>
-	    z coordinate of reference point of string.
+	    z world coordinate of reference point of string.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -11051,7 +11051,7 @@
   <sect1 id="plrandd" renderas="sect3">
     <title>
       <function>plrandd</function>: Random number generator 
-      returning a real random number in the range [0,1].
+      returning a real random number in the range [0,1]
     </title>
 
     <para>
@@ -11296,7 +11296,7 @@
 
   <sect1 id="plscmap0" renderas="sect3">
     <title>
-      <function>plscmap0</function>: Set color map0 colors by 8-bit RGB values
+      <function>plscmap0</function>: Set cmap0 colors by 8-bit RGB values
     </title>
 
     <para>
@@ -11314,7 +11314,7 @@
     </para>
 
     <para>
-      Set color map0 colors using 8-bit RGB values (see <xref linkend="color-map-0"/>).  This sets the entire color
+      Set cmap0 colors using 8-bit RGB values (see <xref linkend="color-map-0"/>).  This sets the entire color
       map &ndash; only as many colors as specified will be allocated.
     </para>
 
@@ -11322,7 +11322,7 @@
       <varlistentry>
 	<term>
 	  <parameter>r</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11334,7 +11334,7 @@
       <varlistentry>
 	<term>
 	  <parameter>g</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11346,7 +11346,7 @@
       <varlistentry>
 	<term>
 	  <parameter>b</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11372,7 +11372,7 @@
     </variablelist>
 
     <para>
-      Redacted form: <function>plscmap0(r, g, b, ncol0)</function>
+      Redacted form: <function>plscmap0(r, g, b)</function>
     </para>
 
     <para>
@@ -11383,8 +11383,8 @@
 
   <sect1 id="plscmap0a" renderas="sect3">
     <title>
-      <function>plscmap0a</function>: Set color map0 colors by 8-bit RGB values and 
-      double alpha value.
+      <function>plscmap0a</function>: Set cmap0 colors by 8-bit RGB values and 
+      double alpha transparency value
     </title>
 
     <para>
@@ -11396,15 +11396,15 @@
 	  <paramdef><parameter>r</parameter></paramdef>
 	  <paramdef><parameter>g</parameter></paramdef>
 	  <paramdef><parameter>b</parameter></paramdef>
-	  <paramdef><parameter>a</parameter></paramdef>
+	  <paramdef><parameter>alpha</parameter></paramdef>
 	  <paramdef><parameter>ncol0</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
     </para>
 
     <para>
-      Set color map0 colors using 8-bit RGB values (see <xref linkend="color-map-0"/>) 
-      and floating point alpha value.  This sets the entire color
+      Set cmap0 colors using 8-bit RGB values (see <xref linkend="color-map-0"/>) 
+      and floating point alpha transparency value.  This sets the entire color
       map &ndash; only as many colors as specified will be allocated.
     </para>
 
@@ -11412,7 +11412,7 @@
       <varlistentry>
 	<term>
 	  <parameter>r</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11424,7 +11424,7 @@
       <varlistentry>
 	<term>
 	  <parameter>g</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11436,7 +11436,7 @@
       <varlistentry>
 	<term>
 	  <parameter>b</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11447,13 +11447,13 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>a</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  <parameter>alpha</parameter>
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
 	    Pointer to array with set of PLFLT values (0.0 - 1.0)
-	    representing the transparency of the color.
+	    representing the alpha transparency of the color.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -11468,13 +11468,17 @@
 	    <literal><parameter>r</parameter></literal>,
 	    <literal><parameter>g</parameter></literal>,
 	    <literal><parameter>b</parameter></literal>, and
-	    <literal><parameter>a</parameter></literal> arrays.
+	    <literal><parameter>alpha</parameter></literal> arrays.
 	  </para>
 	</listitem>
       </varlistentry>
     </variablelist>
 
     <para>
+      Redacted form: <function>plscmap0a(r, g, b, alpha)</function>
+    </para>
+
+    <para>
       This function is used in examples 30.
     </para>
 
@@ -11482,7 +11486,7 @@
 
   <sect1 id="plscmap0n" renderas="sect3">
     <title>
-      <function>plscmap0n</function>: Set number of colors in color map0
+      <function>plscmap0n</function>: Set number of colors in cmap0
     </title>
 
     <para>
@@ -11597,7 +11601,7 @@
 
   <sect1 id="plscmap1" renderas="sect3">
     <title>
-      <function>plscmap1</function>: Set color map1 colors using 8-bit RGB
+      <function>plscmap1</function>: Set cmap1 colors using 8-bit RGB
       values
     </title>
 
@@ -11615,7 +11619,7 @@
       </funcsynopsis>
     </para>
 
-    <para> Set color map1 colors using 8-bit RGB values (see <xref
+    <para> Set cmap1 colors using 8-bit RGB values (see <xref
     linkend="color-map-1"/>).  This also sets the number of colors.
     </para>
 
@@ -11623,7 +11627,7 @@
       <varlistentry>
 	<term>
 	  <parameter>r</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11635,7 +11639,7 @@
       <varlistentry>
 	<term>
 	  <parameter>g</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11647,7 +11651,7 @@
       <varlistentry>
 	<term>
 	  <parameter>b</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11673,7 +11677,7 @@
     </variablelist>
 
     <para>
-      Redacted form: <function>plscmap1(r, g, b, ncol1)</function>
+      Redacted form: <function>plscmap1(r, g, b)</function>
     </para>
 
     <para>
@@ -11684,8 +11688,8 @@
 
   <sect1 id="plscmap1a" renderas="sect3">
     <title>
-      <function>plscmap1a</function>: Set color map1 colors using 8-bit RGB values
-      and double alpha values.
+      <function>plscmap1a</function>: Set cmap1 colors using 8-bit RGB values
+      and double alpha transparency values
     </title>
 
     <para>
@@ -11697,21 +11701,21 @@
 	  <paramdef><parameter>r</parameter></paramdef>
 	  <paramdef><parameter>g</parameter></paramdef>
 	  <paramdef><parameter>b</parameter></paramdef>
-	  <paramdef><parameter>a</parameter></paramdef>
+	  <paramdef><parameter>alpha</parameter></paramdef>
 	  <paramdef><parameter>ncol1</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
     </para>
 
-    <para> Set color map1 colors using 8-bit RGB values (see <xref
-    linkend="color-map-1"/>) and double alpha values. This also sets 
-    the number of colors.</para>
+    <para> Set cmap1 colors using 8-bit RGB values (see <xref
+    linkend="color-map-1"/>) and double alpha transparency values.
+    This also sets the number of colors.</para>
 
     <variablelist>
       <varlistentry>
 	<term>
 	  <parameter>r</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11723,7 +11727,7 @@
       <varlistentry>
 	<term>
 	  <parameter>g</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11735,7 +11739,7 @@
       <varlistentry>
 	<term>
 	  <parameter>b</parameter>
-	  (<literal>PLINT *</literal>, input)
+	  (<literal>const PLINT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11746,13 +11750,13 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>a</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  <parameter>alpha</parameter>
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
 	    Pointer to array with set of double values (0.0-1.0)
-	    representing the alpha value of the color.
+	    representing the alpha transparency value of the color.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -11767,13 +11771,17 @@
 	    <literal><parameter>r</parameter></literal>,
 	    <literal><parameter>g</parameter></literal>,
 	    <literal><parameter>b</parameter></literal>, and
-	    <literal><parameter>a</parameter></literal> arrays.
+	    <literal><parameter>alpha</parameter></literal> arrays.
 	  </para>
 	</listitem>
       </varlistentry>
     </variablelist>
 
     <para>
+      Redacted form: <function>plscmap1a(r, g, b, alpha)</function>
+    </para>
+
+    <para>
       This function is used in example 31.
     </para>
 
@@ -11781,7 +11789,7 @@
 
   <sect1 id="plscmap1l" renderas="sect3">
     <title>
-      <function>plscmap1l</function>: Set color map1 colors using a
+      <function>plscmap1l</function>: Set cmap1 colors using a
       piece-wise linear relationship
     </title>
 
@@ -11793,7 +11801,7 @@
 	  </funcdef>
 	  <paramdef><parameter>itype</parameter></paramdef>
 	  <paramdef><parameter>npts</parameter></paramdef>
-	  <paramdef><parameter>pos</parameter></paramdef>
+	  <paramdef><parameter>intensity</parameter></paramdef>
 	  <paramdef><parameter>coord1</parameter></paramdef>
 	  <paramdef><parameter>coord2</parameter></paramdef>
 	  <paramdef><parameter>coord3</parameter></paramdef>
@@ -11802,22 +11810,22 @@
       </funcsynopsis>
     </para>
 
-    <para> Set color map1 colors using a piece-wise linear relationship
-    between position in the color map (from 0 to 1) and position in HLS or
+    <para> Set cmap1 colors using a piece-wise linear relationship
+    between intensity index (from 0. to 1.) of cmap1 and position in HLS or
     RGB color space (see <xref linkend="color-map-1"/>).  May be called at
     any time. </para>
 
     <para>
       The idea here is to specify a number of control points that define
-      the mapping between palette 1 input positions (intensities) and 
+      the mapping between input cmap1 intensity indices and 
       HLS (or RGB).  Between
       these points, linear interpolation is used which
       gives a smooth variation of
-      color with input position.  Any number of control points may be specified,
+      color with intensity index.  Any number of control points may be specified,
       located at arbitrary positions, although typically 2 - 4
       are enough. Another way of stating this is that we are traversing a
       given number of lines through HLS (or RGB) space as we move through
-      color map1 entries.  The control points at the minimum and maximum
+      cmap1 intensity indices.  The control points at the minimum and maximum
       position (0 and 1) must always be specified.  By adding more control
       points you can get more variation.  One good technique for plotting
       functions that vary about some expected average is to use an
@@ -11827,7 +11835,8 @@
       allows the highs and lows to be very easily distinguished.
     </para>
     <para>
-      Each control point must specify the position in color map1 as well as
+      Each control point must specify the cmap1 intensity index and
+      the associated 
       three coordinates in HLS or RGB space.  The first point
       <emphasis>must</emphasis> correspond to position = 0, and the last to
       position = 1.
@@ -11905,12 +11914,12 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>pos</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  <parameter>intensity</parameter>
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
-	    position for each control point (between 0.0 and 1.0, in
+	    intensity index for each control point (between 0.0 and 1.0, in
 	    ascending order)
 	  </para>
 	</listitem>
@@ -11918,7 +11927,7 @@
       <varlistentry>
 	<term>
 	  <parameter>coord1</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11929,7 +11938,7 @@
       <varlistentry>
 	<term>
 	  <parameter>coord2</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11940,7 +11949,7 @@
       <varlistentry>
 	<term>
 	  <parameter>coord3</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11951,7 +11960,7 @@
       <varlistentry>
 	<term>
 	  <parameter>alt_hue_path</parameter>
-	  (<literal>PLBOOL: *</literal>, input)
+	  (<literal>const PLBOOL *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -11965,7 +11974,7 @@
     </variablelist>
 
     <para>
-      Redacted form: <function>plscmap1l(itype, pos, coord1, coord2, coord3, alt_hue_path)</function>
+      Redacted form: <function>plscmap1l(itype, intensity, coord1, coord2, coord3, alt_hue_path)</function>
     </para>
 
     <para>
@@ -11976,8 +11985,8 @@
 
   <sect1 id="plscmap1la" renderas="sect3">
     <title>
-      <function>plscmap1la</function>: Set color map1 colors using a
-      piece-wise linear relationship
+      <function>plscmap1la</function>: Set cmap1 colors and alpha
+      transparency using a piece-wise linear relationship
     </title>
 
     <para>
@@ -11988,22 +11997,23 @@
 	  </funcdef>
 	  <paramdef><parameter>itype</parameter></paramdef>
 	  <paramdef><parameter>npts</parameter></paramdef>
-	  <paramdef><parameter>pos</parameter></paramdef>
+	  <paramdef><parameter>intensity</parameter></paramdef>
 	  <paramdef><parameter>coord1</parameter></paramdef>
 	  <paramdef><parameter>coord2</parameter></paramdef>
 	  <paramdef><parameter>coord3</parameter></paramdef>
-	  <paramdef><parameter>coord4</parameter></paramdef>	
+	  <paramdef><parameter>alpha</parameter></paramdef>	
 	  <paramdef><parameter>alt_hue_path</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
     </para>
 
     <para>
-      This is a version of &plscmap1l; that supports alpha
-      transparency. It sets color map1 colors using a piece-wise linear
-      relationship between position in the color map (from 0 to 1) and
+      This is a variant of &plscmap1l; that supports alpha channel
+      transparency. It sets cmap1 colors using a piece-wise linear
+      relationship between cmap1 intensity index (from 0. to 1.) and
       position in HLS or RGB color space (see <xref linkend="color-map-1"/>)
-      with alpha value (0.0 - 1.0). It may be called at any time.
+      with <literal><parameter>alpha</parameter></literal> transparency value 
+      (0.0 - 1.0). It may be called at any time.
     </para>
 
     <variablelist>
@@ -12031,8 +12041,8 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>pos</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  <parameter>intensity</parameter>
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -12044,7 +12054,7 @@
       <varlistentry>
 	<term>
 	  <parameter>coord1</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -12055,7 +12065,7 @@
       <varlistentry>
 	<term>
 	  <parameter>coord2</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -12066,7 +12076,7 @@
       <varlistentry>
 	<term>
 	  <parameter>coord3</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -12076,19 +12086,19 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>coord4</parameter>
-	  (<literal>PLFLT *</literal>, input)
+	  <parameter>alpha</parameter>
+	  (<literal>const PLFLT *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
-	    fourth coordinate, the alpha value for each control point
+	    the alpha transparency value for each control point
 	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term>
 	  <parameter>alt_hue_path</parameter>
-	  (<literal>PLBOOL: *</literal>, input)
+	  (<literal>const PLBOOL *</literal>, input)
 	</term>
 	<listitem>
 	  <para>
@@ -12102,6 +12112,11 @@
     </variablelist>
 
     <para>
+      Redacted form: <function>plscmap1la(itype, intensity, coord1,
+      coord2, coord3, alpha, alt_hue_path)</function>
+    </para>
+
+    <para>
       This function is used in example 30.
     </para>
 
@@ -12109,7 +12124,7 @@
 
   <sect1 id="plscmap1n" renderas="sect3">
     <title>
-      <function>plscmap1n</function>: Set number of colors in color map1
+      <function>plscmap1n</function>: Set number of colors in cmap1
     </title>
 
     <para>
@@ -12123,7 +12138,7 @@
       </funcsynopsis>
     </para>
 
-    <para> Set number of colors in color map1, (re-)allocate color map1, and
+    <para> Set number of colors in cmap1, (re-)allocate color map1, and
     set default values if this is the first allocation (see <xref
     linkend="color-map-1"/>). </para>
 
@@ -12156,8 +12171,8 @@
 
   <sect1 id="plscol0" renderas="sect3">
     <title>
-      <function>plscol0</function>:  Set a given color from color map0 by 8
-      bit RGB value
+      <function>plscol0</function>:  Set 8-bit RGB values for given
+      cmap0 color index
     </title>
 
     <para>
@@ -12174,7 +12189,8 @@
       </funcsynopsis>
     </para>
 
-    <para> Set a given color by 8-bit RGB value for color map0 (see <xref linkend="color-map-0"/>).  Overwrites
+    <para> Set 8-bit RGB values for given cmap0 (see <xref
+    linkend="color-map-0"/>) index.  Overwrites
     the previous color value for the given index and, thus, does
     not result in any additional allocation of space for colors. </para>
 
@@ -12241,8 +12257,9 @@
 
   <sect1 id="plscol0a" renderas="sect3">
     <title>
-      <function>plscol0a</function>:  Set a given color from color map0 by 8
-      bit RGB value and double alpha value.
+      <function>plscol0a</function>:  Set 8-bit 
+      RGB values and double alpha transparency value for given
+      cmap0 color index
     </title>
 
     <para>
@@ -12255,13 +12272,13 @@
 	  <paramdef><parameter>r</parameter></paramdef>
 	  <paramdef><parameter>g</parameter></paramdef>
 	  <paramdef><parameter>b</parameter></paramdef>
-	  <paramdef><parameter>a</parameter></paramdef>
+	  <paramdef><parameter>alpha</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
     </para>
 
-    <para> Set a given color by 8-bit RGB value and double alpha value for color 
-    map0 (see <xref linkend="color-map-0"/>).  Overwrites the previous color value 
+    <para> Set 8-bit RGB value and double alpha transparency value for given
+    cmap0 (see <xref linkend="color-map-0"/>) index.  Overwrites the previous color value 
     for the given index and, thus, does not result in any additional allocation 
     of space for colors. </para>
 
@@ -12316,13 +12333,13 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>a</parameter>
+	  <parameter>alpha</parameter>
 	  (<literal>PLFLT</literal>, input)
 	</term>
 	<listitem>
 	  <para>
 	    double value (0.0-1.0) representing the
-	    alpha value of the color.
+	    alpha transparency value of the color.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -12410,7 +12427,7 @@
   <sect1 id="plscolbga" renderas="sect3">
     <title>
       <function>plscolbga</function>: Set the background color
-      by 8-bit RGB value and double alpha value.
+      by 8-bit RGB value and double alpha transparency value.
     </title>
 
     <para>
@@ -12422,14 +12439,14 @@
 	  <paramdef><parameter>r</parameter></paramdef>
 	  <paramdef><parameter>g</parameter></paramdef>
 	  <paramdef><parameter>b</parameter></paramdef>
-	  <paramdef><parameter>a</parameter></paramdef>
+	  <paramdef><parameter>alpha</parameter></paramdef>
 	</funcprototype>
       </funcsynopsis>
     </para>
 
     <para>
       Set the background color (color 0 in color map 0) by 8-bit RGB value (see
-      <xref linkend="color-map-0"/>) and double alpha value.
+      <xref linkend="color-map-0"/>) and double alpha transparency value.
     </para>
 
     <variablelist>
@@ -12471,13 +12488,13 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <parameter>a</parameter>
+	  <parameter>alpha</parameter>
 	  (<literal>PLFLT</literal>, input)
 	</term>
 	<listitem>
 	  <para>
 	    double value (0.0-1.0) representing the
-	    alpha value of the color.
+	    alpha transparency value of the color.
 	  </para>
 	</listitem>
       </varlistentry>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.