Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · 400eb5d8 · 400eb5d8
--- a/.gitignore
+++ b/.gitignore
@@ -172,6 +172,7 @@ postgis/uninstall_sfcgal.sql
 *.pdf
 .idea/*
 .syntastic_c_config
+.vs/*

 # LLVM JIT
 *.bc

--- a/ChangeLog
+++ b/ChangeLog
+2018-11-18 08:43  Regina Obe <lr@pcorp.us>
+
+	* [r17023] Prepping for 2.5.1 release
+
+2018-11-15 16:08  Raúl Marín Rodríguez <rmrodriguez@carto.com>
+
+	* [r17021] Avoid undefined behaviour in gserialized_estimate
+	  
+	  References #4190
+
+2018-11-15 09:06  Raúl Marín Rodríguez <rmrodriguez@carto.com>
+
+	* [r17018] Allocate enough memory in gidx_to_string
+	  
+	  References #4236
+
+2018-11-13 10:47  Raúl Marín Rodríguez <rmrodriguez@carto.com>
+
+	* [r17006] Un-break build with debug logs
+	  
+	  Related to #4235
+
+2018-11-12 09:15  Raúl Marín Rodríguez <rmrodriguez@carto.com>
+
+	* [r17003] ST_Scale: Document the availability of the origin
+	  parameter
+	  
+	  References #4232
+
+2018-11-08 06:57  Darafei Praliaskouski <me@komzpa.net>
+
+	* [r16997] Documentation for AddRasterConstraint optional
+	  parameters
+	  
+	  Patch by Sunveer Singh
+	  
+	  Closes #2767
+	  Closes https://github.com/postgis/postgis/pull/325
+
+2018-11-07 17:56  Paul Ramsey <pramsey@cleverelephant.ca>
+
+	* [r16995] Revert change to avoid slicing on box access.
+	  References #4216
+
+2018-11-07 16:50  Regina Obe <lr@pcorp.us>
+
+	* [r16992] Get rid of trailing space
+
+2018-11-07 16:27  Regina Obe <lr@pcorp.us>
+
+	* [r16991] Schema qualify some missed calls in raster plpgsql/sql
+	  functions
+
+2018-11-06 22:26  Paul Ramsey <pramsey@cleverelephant.ca>
+
+	* [r16985] Add name to NEWS
+
+2018-11-06 20:30  Paul Ramsey <pramsey@cleverelephant.ca>
+
+	* [r16984] Move to "postgis blue" #468
+
+2018-11-05 22:46  Paul Ramsey <pramsey@cleverelephant.ca>
+
+	* [r16982] Update news for #4223
+
+2018-11-05 22:36  Paul Ramsey <pramsey@cleverelephant.ca>
+
+	* [r16980] Patch over bad behaviour for near-parallel boxes and
+	  distancetree.
+	  Unfortunately, this "fix" is probably breakable, just put the
+	  boxes closer and closer together until we get "close enough to be
+	  the same" results from the edge normal comparison again. Only way
+	  around this is to do dot product and comparisons in
+	  higher-than-double space
+	  References #4223
+
+2018-11-02 22:15  Paul Ramsey <pramsey@cleverelephant.ca>
+
+	* [r16974] Try for a responsive font size?
+
+2018-10-30 20:30  Paul Ramsey <pramsey@cleverelephant.ca>
+
+	* [r16966] Update icons to new doco versions
+
+2018-10-30 19:50  Paul Ramsey <pramsey@cleverelephant.ca>
+
+	* [r16965] Change doc target for debbie to be "html-chunked-web"
+	  for google analytics fragment
+
+2018-10-30 19:47  Paul Ramsey <pramsey@cleverelephant.ca>
+
+	* [r16964] Update HTML document styling to new "standard"
+
+2018-10-29 04:10  Darafei Praliaskouski <me@komzpa.net>
+
+	* [r16957] Fix typo in r16956
+	  
+	  Closes #4217
+
+2018-10-29 03:22  Darafei Praliaskouski <me@komzpa.net>
+
+	* [r16956] ST_Subdivide: don't crash if on some iteration you need
+	  to subdivide Empty
+	  Closes #4217
+
+2018-10-24 14:03  Darafei Praliaskouski <me@komzpa.net>
+
+	* [r16947] [raster] Use GDALFPolygonize unconditionally
+	  
+	  GDAL 1.10 is already required and 1.9 contains it, so no check
+	  needed.
+	  
+	  Closes #4215
+
+2018-10-23 13:00  Darafei Praliaskouski <me@komzpa.net>
+
+	* [r16941] [raster] Fix envelope Contains shortcut in ST_Clip
+	  
+	  Patch by Sai-bot
+	  
+	  Closes #3457
+
+2018-10-22 15:26  Darafei Praliaskouski <me@komzpa.net>
+
+	* [r16938] ST_Subdivide: support rect hole in rect shell
+	  
+	  Closes #4211
+	  Closes https://github.com/postgis/postgis/pull/317
+
+2018-10-17 14:25  Sandro Santilli <strk@kbt.io>
+
+	* [r16918] Fix support for PostgreSQL-12 ("getrelid" macro removed)
+	  
+	  The call is replaced with its expansion which should work
+	  as back as PostgreSQL-9.1 which is before the oldest version
+	  PostGIS-2.2 (our oldest maintained branch) supports.
+	  
+	  This is then safe to backport to all branches till 2.2.
+	  
+	  Patch by Laurenz Albe
+	  
+	  References #4306 in 2.5 branch
+
+2018-10-15 11:46  Sandro Santilli <strk@kbt.io>
+
+	* [r16910] Only drop function IF EXISTS ...
+
+2018-10-15 10:38  Sandro Santilli <strk@kbt.io>
+
+	* [r16901] [topology] properly drop removed internal functions on
+	  upgrade
+	  
+	  References #4202 in 2.5 branch
+
+2018-10-08 23:19  Regina Obe <lr@pcorp.us>
+
+	* [r16879] Fix packaging, was copying over old extension files
+
+2018-10-03 11:11  Raúl Marín Rodríguez <rmrodriguez@carto.com>
+
+	* [r16877] St_AsMVTGeom: Handle type changes in geometry
+	  collections
+	  
+	  References #4181
+
+2018-10-02 11:41  Raúl Marín Rodríguez <rmrodriguez@carto.com>
+
+	* [r16870] Fix undefined behaviour in ptarray_clone_deep
+	  
+	  References #4191
+
+2018-10-02 09:37  Raúl Marín Rodríguez <rmrodriguez@carto.com>
+
+	* [r16862] Fix undefined behaviour in SADFWrite
+	  
+	  Also addresses several gcc warnings
+	  References #4189
+
+2018-10-02 07:23  Regina Obe <lr@pcorp.us>
+
+	* [r16861] Fix packaging link - broke it on last change
+
+2018-10-01 15:55  Raúl Marín Rodríguez <rmrodriguez@carto.com>
+
+	* [r16859] Avoid division by zero in kmeans
+	  
+	  References #4188
+
+2018-10-01 13:31  Raúl Marín Rodríguez <rmrodriguez@carto.com>
+
+	* [r16857] St_AsMVTGeom: Drop invalid geometries after
+	  simplification
+	  
+	  References #4183
+
+2018-10-01 06:05  Regina Obe <lr@pcorp.us>
+
+	* [r16853] fix windows links should point at postgis.net and not
+	  postgis.org
+
+2018-09-26 12:18  Regina Obe <lr@pcorp.us>
+
+	* [r16843] fix packaging so doesn't include old extension files
+
+2018-09-24 01:07  Regina Obe <lr@pcorp.us>
+
+	* [r16837] flip to 2.5.1dev
+
+2018-09-23 20:04  Regina Obe <lr@pcorp.us>
+
+	* [r16835] Stamp date of release.
+	  Put in legacy stub function for RASTER_to_binary to allow pg
+	  upgrade (newer lib)
+	  Closes #4097
+
+2018-09-23 15:03  Regina Obe <lr@pcorp.us>
+
+	* [r16834] update changelog in prep for PostGIS 2.5.0 release
+
 2018-09-23 01:07  Regina Obe <lr@pcorp.us>
  
 	* [r16833] Prep for 2.5.0 release
--- a/NEWS
+++ b/NEWS
+PostGIS 2.5.1
+2018/11/18
+
+ * Bug fixes *
+  - #4183, St_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
+  - #4188, Avoid division by zero in kmeans (Raúl Marín)
+  - #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
+  - #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)
+  - #4020, Fix leftovers in topology upgrade from 2.1 (Sandro Santilli)
+  - #4206, Fix support for PostgreSQL 12 dev branch (Laurenz Albe)
+  - #4211, Fix ST_Subdivide for minimal exterior ring with minimal hole (Darafei
+    Praliaskouski)
+  - #3457, Fix raster envelope shortcut in ST_Clip (Sai-bot)
+  - #4215, Use floating point compare in ST_DumpAsPolygons (Darafei Praliaskouski)
+  - #4217, Fix ST_Subdivide crash on EMPTY in intermediate iterations (Darafei
+    Praliaskouski)
+  - #4223, ST_DistanceTree error for near parallel boxes (Paul Ramsey)
+  - Schema qualify more functions for raster (Regina Obe)
+  - #4216, Revert non-sliced box access (Paul Ramsey)
+  - #2767, Documentation for AddRasterConstraint optional parameters (Sunveer Singh)
+  - #4326, Allocate enough memory in gidx_to_string (Raúl Marín)
+  - #4190, Avoid undefined behaviour in gserialized_estimate
+
+
 PostGIS 2.5.0
 2018/09/23
 WARNING: If compiling with PostgreSQL+JIT, LLVM >= 6 is required

--- a/Version.config
+++ b/Version.config
@@ -5,7 +5,7 @@

 POSTGIS_MAJOR_VERSION=2
 POSTGIS_MINOR_VERSION=5
-POSTGIS_MICRO_VERSION=0
+POSTGIS_MICRO_VERSION=1

 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
--- a/ci/debbie/postgis_release_docs.sh
+++ b/ci/debbie/postgis_release_docs.sh
@@ -68,7 +68,7 @@ rm -rf images
 mkdir images
 cp html/images/* images
 make epub
-make -e chunked-html 2>&1 | tee -a doc-errors.log
+make -e chunked-html-web 2>&1 | tee -a doc-errors.log

 if [[ "$reference" == *"trunk"* ]]; then  #only do this for trunk because only trunk follows transifex
  #make update-po

--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -50,7 +50,7 @@ export PGPATH=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}
 export PGPATHEDB=${PGPATH}edb
 export PROJSO=libproj-9.dll
 export POSTGIS_MINOR_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
-export POSTGIS_MICRO_VER=${POSTGIS_MICRO_VERSION}
+export POSTGIS_MICRO_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}

 if [[ "$POSTGIS_MICRO_VERSION"  == *SVN* || "$POSTGIS_MICRO_VERSION"  == *dev* ]] ; then
 	export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_MINOR_VER}
@@ -77,7 +77,7 @@ export REL_PGVER=${PG_VER//./} #strip the period


 export RELDIR=${PROJECTS}/postgis/builds/${POSTGIS_MINOR_VER}
-export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MINOR_VER}.${POSTGIS_MICRO_VER}w${OS_BUILD}${GCC_TYPE}
+export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MINOR_VER}.${POSTGIS_MICRO_VERSION}w${OS_BUILD}${GCC_TYPE}
 export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
 export PCRE_VER=8.33 #PATH="${PGPATH}/bin:${PGPATH}/lib:${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
 #echo PATH AFTER: $PATH

--- a/configure
+++ b/configure
@@ -637,7 +637,6 @@ RT_LOADER
 RT_PG_LIB
 RT_CORE_LIB
 RASTER
-GDALFPOLYGONIZE
 LIBGDAL_DEPLIBS_LDFLAGS
 LIBGDAL_LDFLAGS
 LIBGDAL_CFLAGS
@@ -5576,11 +5575,8 @@ _LT_EOF
  test $ac_status = 0; }; then
    # Now try to grab the symbols.
    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
      # Try sorting and uniquifying the output.
      if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -17733,68 +17729,6 @@ fi
  
  
 		LIBS="$LIBGDAL_LDFLAGS"
-
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GDALFPolygonize" >&5
-$as_echo_n "checking for library containing GDALFPolygonize... " >&6; }
-if ${ac_cv_search_GDALFPolygonize+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char GDALFPolygonize ();
-int
-main ()
-{
-return GDALFPolygonize ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' gdal; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_GDALFPolygonize=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_GDALFPolygonize+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_GDALFPolygonize+:} false; then :
-
-else
-  ac_cv_search_GDALFPolygonize=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_GDALFPolygonize" >&5
-$as_echo "$ac_cv_search_GDALFPolygonize" >&6; }
-ac_res=$ac_cv_search_GDALFPolygonize
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-cat >>confdefs.h <<_ACEOF
-#define GDALFPOLYGONIZE 1
-_ACEOF
-
-fi
-
-
 		CPPFLAGS="$CPPFLAGS_SAVE"
 		CFLAGS="$CFLAGS_SAVE"
 		CC="$CC_SAVE"
@@ -17804,8 +17738,6 @@ fi
  
  
  
-
-
 	else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }

--- a/configure.ac
+++ b/configure.ac
@@ -1371,14 +1371,6 @@ if test "x$with_raster" != "xno"; then
 		AC_SEARCH_LIBS([OGRRegisterAll], [gdal], [], [AC_MSG_ERROR([could not find OGR])], [])

 		LIBS="$LIBGDAL_LDFLAGS"
-
-		dnl Check if the new polygonize function is present
-		AC_SEARCH_LIBS(
-			[GDALFPolygonize],
-			[gdal],
-			[AC_DEFINE_UNQUOTED([GDALFPOLYGONIZE], [1], [Define to 1 if GDALFPolygonize function is available])],
-			[])
-
 		CPPFLAGS="$CPPFLAGS_SAVE"
 		CFLAGS="$CFLAGS_SAVE"
 		CC="$CC_SAVE"
@@ -1388,8 +1380,6 @@ if test "x$with_raster" != "xno"; then
 		AC_SUBST([LIBGDAL_LDFLAGS])
 		AC_SUBST([LIBGDAL_DEPLIBS_LDFLAGS])

-		AC_SUBST([GDALFPOLYGONIZE])
-
 	else
 		AC_MSG_RESULT([not found])
 		AC_MSG_ERROR([gdal-config not found. Use --without-raster or try --with-gdalconfig=<path to gdal-config>])

--- a/debian/changelog
+++ b/debian/changelog
-postgis (2.5.0+dfsg-3) UNRELEASED; urgency=medium
+postgis (2.5.1+dfsg-1) UNRELEASED; urgency=medium

+  * New upstream release.
  * Add Build-Depends-Package field to symbols file.
+  * Disable SFCGAL support again, FTBFS with Boost 1.67.

- -- Bas Couwenberg <sebastic@debian.org>  Tue, 23 Oct 2018 12:47:10 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 19 Nov 2018 07:25:55 +0100

 postgis (2.5.0+dfsg-2) unstable; urgency=medium


--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: autoconf2.13,
               libjson-c-dev | libjson0-dev (>= 0.9~),
               libproj-dev (>= 4.6.0),
               libprotobuf-c-dev,
-               libsfcgal-dev [!armel],
+#               libsfcgal-dev [!armel],
               libxml2-dev (>= 2.5.0~),
               lsb-release,
               po-debconf,

--- a/debian/control.in
+++ b/debian/control.in
@@ -25,7 +25,7 @@ Build-Depends: autoconf2.13,
               libjson-c-dev | libjson0-dev (>= 0.9~),
               libproj-dev (>= 4.6.0),
               libprotobuf-c-dev,
-               libsfcgal-dev [!armel],
+#               libsfcgal-dev [!armel],
               libxml2-dev (>= 2.5.0~),
               lsb-release,
               po-debconf,

--- a/debian/liblwgeom-2.5-0.symbols
+++ b/debian/liblwgeom-2.5-0.symbols
@@ -3,12 +3,12 @@ liblwgeom-2.5.so.0 #PACKAGE# #MINVER#
 GBOX2GEOS@Base 2.2.0
 GEOS2LWGEOM@Base 2.0.0
 LWGEOM2GEOS@Base 2.0.0
- (arch=!armel)LWGEOM2SFCGAL@Base 2.2.0
+# (arch=!armel)LWGEOM2SFCGAL@Base 2.2.0
 LWGEOM_GEOS_buildArea@Base 2.0.0
 LWGEOM_GEOS_getPointN@Base 2.0.0
 LWGEOM_GEOS_makeValid@Base 2.5.0~beta1
 MULTITYPE@Base 2.1.5
- (arch=!armel)SFCGAL2LWGEOM@Base 2.2.0
+# (arch=!armel)SFCGAL2LWGEOM@Base 2.2.0
 UF_create@Base 2.2.0
 UF_destroy@Base 2.2.0
 UF_find@Base 2.2.0
@@ -440,8 +440,8 @@ liblwgeom-2.5.so.0 #PACKAGE# #MINVER#
 lwgeom_set_geodetic@Base 2.0.0
 lwgeom_set_handlers@Base 2.1.0
 lwgeom_set_srid@Base 2.0.0
- (arch=!armel)lwgeom_sfcgal_noop@Base 2.2.0
- (arch=!armel)lwgeom_sfcgal_version@Base 2.2.0
+# (arch=!armel)lwgeom_sfcgal_noop@Base 2.2.0
+# (arch=!armel)lwgeom_sfcgal_version@Base 2.2.0
 lwgeom_sharedpaths@Base 2.0.0
 lwgeom_simplify@Base 2.0.0
 lwgeom_simplify_in_place@Base 2.5.0~beta1

--- a/debian/tests/test-extension-creation
+++ b/debian/tests/test-extension-creation
@@ -5,7 +5,7 @@ set -eu
 for v in $(pg_buildext supported-versions); do
 	pg_virtualenv -v $v sh -e <<-'EOF'
 	# test extension
-	for ext in postgis postgis_sfcgal fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
+	for ext in postgis fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
 		psql -eXc "CREATE EXTENSION $ext"
 	done
 	EOF

--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -58,13 +58,19 @@ XSLTPROC_COMMONOPTS= \
 	--param funcsynopsis.style kr \
 	--param admon.graphics 1 \
 	--param admon.textlabel 0 \
+	--param make.clean.html 1 \
 	--param simplesect.in.toc 0 \
 	--param use.id.as.filename 1 \
 	--param chunk.quietly 1 \
+	--param header.rule 0 \
+	--param footer.rule 0 \
+	--param table.borders.with.css 1 \
+	--stringparam chunker.output.encoding UTF-8 \
+	--stringparam chunker.output.indent no \
+	--stringparam saxon.character.representation decimal \
+	--stringparam html.stylesheet style.css \
 	$(XSLTPROCFLAGS)

-XSLTPROC_HTMLOPTS= \
-	--stringparam html.stylesheet style.css \

 HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl
 CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl
@@ -240,12 +246,19 @@ postgis-out.xml: postgis.xml Makefile
 	$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@

 chunked-html: postgis-out.xml Makefile images $(XML_INPUTS)
-	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
+	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
 		--output html/ \
-		--stringparam saxon.character.representation decimal \
 		$(CHUNK_HTML_DOCBOOK_XSL) \
 		$<

+chunked-html-web: postgis-out.xml Makefile images $(XML_INPUTS)
+	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
+		--output html/ \
+		--stringparam html.script ga.js \
+		$(CHUNK_HTML_DOCBOOK_XSL) \
+		$<
+
+
 html: html/postgis$(DOCSUFFIX).html

 html-localized:
@@ -255,7 +268,7 @@ html-localized:
  done

 html/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile images $(XML_INPUTS)
-	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
+	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
 		--output html/postgis$(DOCSUFFIX).html \
 		$(HTML_DOCBOOK_XSL) \
 		$<

--- a/doc/html/ga.js
+++ b/doc/html/ga.js
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-37775762-1', 'auto');
+ga('send', 'pageview');
--- a/doc/html/images/check.png
+++ b/doc/html/images/check.png
--- a/doc/html/images/important.png
+++ b/doc/html/images/important.png
--- a/doc/html/images/warning.png
+++ b/doc/html/images/warning.png
--- a/doc/html/style.css
+++ b/doc/html/style.css
-/* PostGIS Alternative Docbook CSS | Dane Springmeyer
----------------------------------------------------- */
-
-/* 1. Body
----------------------------------------------------- */
-
-body { font: 90% 'Lucida Grande', Verdana, Geneva, Arial, Helvetica, sans-serif; background: #ffffff; color: #2e2e2e; margin: 2em; padding: 2em; }
-
-
-/* 2. Standard Tags
----------------------------------------------------- */
-
-a {text-decoration: none; color: #418acd; }
-a:hover, li a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover {color: #e9cb2b; }
-p,form,td,th,dt,li{font-size:10pt}
-h1, h2 {color: #282e5b;}
-h3,h4,th,dt,b {color: #213780;}
-h1 { font-size: 24px; line-height: 24px; margin-bottom: 24px;}
-h2 { font-size: 22px; line-height: 22px; margin-bottom: 21px;}
-h3 { font-size: 16px; line-height: 18px; margin-bottom: 16px;}
-h4 { font-size: 14px; line-height: 16px; margin-bottom: 14px;}
-h5 { font-size: 13px; line-height: 10px; margin-bottom: 13px;}
-table, td {border-collapse: collapse;}
-/*table, td {border: 1;padding: 0}
+/*
+* PostGIS Alternative Docbook CSS
+* Dane Springmeyer
+* Paul Ramsey
 */

-/* 3. Block Formatted
----------------------------------------------------- */
-pre, .literallayout { border-right-width: 0px; border-left-width: 0px; border-bottom-width: 2px; border-top-width: 2px; font-family: "DejaVu Sans", "Lucida Grande", "Verdana", Courier, mono; line-height: 16px; border-color: #f7931e; border-style: solid; font-size: 11px; margin-bottom: 10px; margin-top: 10px; overflow: auto; padding: 10px; background: #f8f8f9; -moz-border-radius: 2px; -webkit-border-radius: 2px;}
-.note { border-left-width: 0px; border-bottom-width: 2px; border-right-width: 0px; border-top-width: 2px; width: 80%; border-color: #a2d545; border-style: solid; font-size: 11px; margin-bottom: 10px; margin-top: 10px; overflow: auto; padding: 10px; background: #e4f7dd; -moz-border-radius: 2px; -webkit-border-radius: 2px;}
-/* code { border-right-style: solid; border-right-color: #79791a; border-left-color: #79791b; border-left-style: solid; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px; padding-left: 3px; padding-bottom: 1px; padding-right: 3px; padding-top: 1px; font-family: "Courier New", Courier, Monaco, monospace; color: #fefff7; background: #9b9e96; -moz-border-radius: 2px; -webkit-border-radius: 2px;} */
-.programlisting {font-family: "Courier New", Courier, Monaco, monospace;}
-.warning { border-left-width: 0px; border-bottom-width: 2px; border-right-width: 0px; border-top-width: 2px; width: 80%; border-color: #a2d545; border-style: solid; font-size: 11px; margin-bottom: 10px; margin-top: 10px; overflow: auto; padding: 10px; background: #FFE699; -moz-border-radius: 2px; -webkit-border-radius: 2px;}
-
-/* 4. Docbook Specifics
----------------------------------------------------- */
-.question {font-weight: bold; color: #213780;}
-.term { font-weight: bold; color: #38488d;}
-.term:hover { font-weight: bold; color: #88000f;}
-.chapter { margin-top: 60px; }
-.sect1 { margin-top: 50px; }
-.sect2 { margin-top: 40px; }
-.sect3 { margin-top: 30px; }
-.caption p {font-style: italic; font-size: 90%;}
-.remark { background: #ffff00; }
-.equation {font-style: italic; font-size: 90%;}
-.command, .code {font-weight: normal; font-family: "Courier New", Courier, Monaco, monospace; color: #000000;}
-.styledtable table thead th { border-right-width: 0px; border-left-width: 0px; border-bottom-width: 1px; border-top-width: 0px; border-color: #f7931e; border-style: solid;  }
-.styledtable > table { border-right-width: 0px; border-left-width: 0px; border-bottom-width: 2px; border-top-width: 2px; border-color: #f7931e; border-style: solid;  }
-.styledtable table td,th { color: #000000; font-style: italic; padding-right:10px; padding-left:10px; border-right-width: 0px; border-left-width: 0px; border-bottom-width: 2px; border-top-width: 2px; border-width: 0px;}
-.pdparam {color: #990000}
+/* 1. Body ----------------------------------------------------- */
+
+html {
+    font-family: 'Lucida Grande', Verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size: 12pt;
+}
+
+
+body {
+    background: #ffffff;
+    color: #2e2e2e;
+    margin: 0;
+    padding: 0em 6em 0em 6em;
+}
+div.navheader {
+    margin: 0em -6em 0em -6em;
+    padding: 2em 6em 2em 6em;
+    background: #468;
+}
+
+div.navfooter {
+    margin: 0em -6em 0em -6em;
+    padding: 2em 6em 2em 6em;
+    background: #468;
+    color: white;
+}
+
+
+
+/* Phone width */
+@media (max-width: 40em) {
+    html {
+        font-size: 14pt;
+    }
+    body {
+        padding: 0em 3em 0em 3em;
+    }
+    div.navheader {
+        margin: 0em -3em 0em -3em;
+        padding: 2em 3em 2em 3em;
+    }
+    div.navfooter {
+        margin: 0em -3em 0em -3em;
+        padding: 2em 3em 2em 3em;
+    }
+}
+
+div.navfooter table {
+    color: white;
+}
+
+div.navheader table tbody tr:first-child th {
+    color: white;
+    font-size: 1.5rem;
+    font-style: normal;
+}
+
+div.navheader table tbody tr:nth-child(2) {
+    display: none;
+}
+
+div.navfooter a {
+    text-decoration: none;
+    color: #bcF;
+}
+div.navfooter a:hover {
+    color: #e9cb2b;
+}
+
+div.refnamediv {
+    display: none;
+}
+
+div.funcsynopsis code {
+    font: unset;
+}
+
+
+
+/* 2. Standard Tags ----------------------------------------------------- */
+a {
+    text-decoration: none;
+    color: #55d;
+}
+a:hover, li a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover {
+    color: #e9cb2b;
+}
+h1, h2 {
+    color: #468;
+}
+h3, h4, th, dt, b, div.abstract-title, div.toc-title {
+    color: #468;
+}
+h1 {
+     font-size: 1.75em;
+     margin-top: 1.2em;
+     margin-bottom: 0.5em;
+}
+h2 {
+    font-size: 1.5em;
+    margin-top: 1.2em;
+    margin-bottom: 0.5em;
+}
+h3, div.abstract-title, div.toc-title {
+    font-size: 1.3em;
+    margin-top: 1.1em;
+    margin-bottom: 0.4em;
+}
+h4 {
+    font-size: 1.2em;
+    margin-top: 1em;
+    margin-bottom: 0.3em;
+}
+h5 {
+    font-size: 1.1em;
+    margin-top: 1em;
+    margin-bottom: 0.3em;
+}
+table, td {
+    border-collapse: collapse;
+}
+
+
+/* 3. Block Formatted ----------------------------------------------------- */
+
+pre, .literallayout {
+    border-width: 0;
+    font-family: Consolas, Monaco, monospace;
+    border-style: solid;
+    margin-bottom: 1em;
+    margin-top: 1em;
+    overflow: auto;
+    padding: 1em;
+    background: #eee;
+    border-radius: 1em;
+}
+
+div.note {
+    font-size: 0.9em;
+    border-color: #dd5;
+    border-style: solid;
+    border-width: 1.5px;
+    margin-bottom: 1em;
+    margin-top: 1em;
+    overflow: auto;
+    padding: 0.8em;
+    background: #ffe;
+    border-radius: 1em;
+}
+div.note table p {
+    font-size: 0.9em;
+    margin: 0 0 0 0;
+    padding: 0 0 0 0;
+}
+div.note table tr td img {
+    margin: 0 0.5em 0 0;
+    padding: 0 0 0 0;
+}
+
+div.warning {
+    font-size: 0.9em;
+    border-color: #cc5555;
+    border-style: solid;
+    border-width: 1.5px;
+    margin-bottom: 1em;
+    margin-top: 1em;
+    overflow: auto;
+    padding: 0.8em;
+    background: #FFf1f1;
+    border-radius: 1em;
+}
+div.warning table p {
+    font-size: 0.9em;
+    margin: 0 0 0 0;
+    padding: 0 0 0 0;
+}
+div.warning table tr td img {
+    margin: 0 0.5em 0 0;
+    padding: 0 0 0 0;
+}
+
+div.important {
+    font-size: 0.9em;
+    border-color: #55d;
+    border-style: solid;
+    border-width: 1.5px;
+    margin-bottom: 1em;
+    margin-top: 1em;
+    overflow: auto;
+    padding: 0.8em;
+    background: #eef;
+    border-radius: 1em;
+}
+div.important table p {
+    font-size: 0.9em;
+    margin: 0 0 0 0;
+    padding: 0 0 0 0;
+}
+div.important table tr td img {
+    margin: 0 0.5em 0 0;
+    padding: 0 0 0 0;
+}
+
+span.inlinemediaobject img {
+    vertical-align: middle;
+}
+
+.programlisting {
+    font-family: Consolas, Monaco, monospace;
+}
+
+/* 4. Docbook Specifics ----------------------------------------------------- */
+
+span.emphasis {
+    font-style: italic;
+}
+
+tr.question {
+    font-weight: bold;
+    color: #248;
+}
+tr.question td {
+    padding-bottom: 0.5em;
+    padding-top: 0.4em;
+}
+
+.term {
+    font-weight: bold;
+    color: #459;
+}
+.term:hover {
+    font-weight: bold;
+    color: #801;
+}
+.chapter {
+    margin-top: 60px;
+}
+.sect1 {
+    margin-top: 50px;
+}
+.sect2 {
+    margin-top: 40px;
+}
+.sect3 {
+    margin-top: 30px;
+}
+.caption p {
+    font-style: italic;
+}
+.remark {
+    background: #ff0;
+}
+.equation {
+    font-style: italic;
+}
+.command, .code, .varname, .filename {
+    font-size: 1.05em;
+    font-weight: normal;
+    font-family: Consolas, Monaco, monospace;
+    color: black;
+    background-color: #eee;
+    font-weight: bold;
+}
+
+.styledtable table td,th {
+    padding: 0.5em;
+}
+
+table.informaltable {
+    border-color: #aaa;
+}
+table.informaltable td, th {
+    padding: 0.2em 0.4em 0.2em 0.4em;
+}
+
+.pdparam {
+    color: #900
+}
+
+.simplelist td {
+    padding-right: 2em;
+}