[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1169-gfa2b39876
git at osgeo.org
git at osgeo.org
Thu Jul 6 08:06:34 PDT 2023
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via fa2b39876fd0a5e54b7fed0ce97dcd63d73afb03 (commit)
from d59c3c547b1eb074741fdd2af69c4388dfacb220 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fa2b39876fd0a5e54b7fed0ce97dcd63d73afb03
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jul 6 17:02:05 2023 +0200
Share common cheatsheet templates in a common file
Templates list_in_param and break put there, there are
probably more to move
diff --git a/doc/xsl/common_cheatsheet.xsl b/doc/xsl/common_cheatsheet.xsl
new file mode 100644
index 000000000..eaa0d3510
--- /dev/null
+++ b/doc/xsl/common_cheatsheet.xsl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<!--macro to pull out function parameter names so we can provide a pretty arg list prefix for each function -->
+<xsl:template name="list_in_params">
+ <xsl:param name="func" />
+ <xsl:for-each select="$func">
+ <xsl:if test="count(paramdef/parameter) > 0"> </xsl:if>
+ <xsl:for-each select="paramdef">
+ <xsl:choose>
+ <xsl:when test="not( contains(parameter, 'OUT') )">
+ <xsl:value-of select="parameter" />
+ <xsl:if test="position()<last()"><xsl:text>, </xsl:text></xsl:if>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="break">
+ <xsl:param name="text" select="."/>
+ <xsl:choose>
+ <xsl:when test="contains($text, '
')">
+ <xsl:value-of select="substring-before($text, '
')"/>
+ <![CDATA[<br/>]]>
+ <xsl:call-template name="break">
+ <xsl:with-param
+ name="text"
+ select="substring-after($text, '
')"
+ />
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$text"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/doc/xsl/post_gis_day_cards.html.xsl b/doc/xsl/post_gis_day_cards.html.xsl
index 27422d7e4..6d369e65d 100644
--- a/doc/xsl/post_gis_day_cards.html.xsl
+++ b/doc/xsl/post_gis_day_cards.html.xsl
@@ -111,24 +111,4 @@ h1 {
<div class="card_separator"> </div>]]>
</xsl:template>
-<xsl:template name="break">
- <xsl:param name="text" select="."/>
- <xsl:choose>
- <xsl:when test="contains($text, '
')">
- <xsl:value-of select="substring-before($text, '
')"/>
- <![CDATA[<br/>]]>
- <xsl:call-template name="break">
- <xsl:with-param
- name="text"
- select="substring-after($text, '
')"
- />
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$text"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-
</xsl:stylesheet>
diff --git a/doc/xsl/postgis_cheatsheet.html.xsl b/doc/xsl/postgis_cheatsheet.html.xsl
index 2847a04bb..01aa0952e 100644
--- a/doc/xsl/postgis_cheatsheet.html.xsl
+++ b/doc/xsl/postgis_cheatsheet.html.xsl
@@ -9,6 +9,7 @@
******************************************************************** -->
<xsl:include href="common_utils.xsl" />
+ <xsl:include href="common_cheatsheet.xsl" />
<xsl:output method="text" />
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
@@ -226,40 +227,4 @@ code {font-size: 8pt}
</xsl:template>
-
-<xsl:template name="break">
- <xsl:param name="text" select="."/>
- <xsl:choose>
- <xsl:when test="contains($text, '
')">
- <xsl:value-of select="substring-before($text, '
')"/>
- <![CDATA[<br/>]]>
- <xsl:call-template name="break">
- <xsl:with-param
- name="text"
- select="substring-after($text, '
')"
- />
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$text"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!--macro to pull out function parameter names so we can provide a pretty arg list prefix for each function -->
-<xsl:template name="list_in_params">
- <xsl:param name="func" />
- <xsl:for-each select="$func">
- <xsl:if test="count(paramdef/parameter) > 0"> </xsl:if>
- <xsl:for-each select="paramdef">
- <xsl:choose>
- <xsl:when test="not( contains(parameter, 'OUT') )">
- <xsl:value-of select="parameter" />
- <xsl:if test="position()<last()"><xsl:text>, </xsl:text></xsl:if>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:for-each>
-</xsl:template>
-
</xsl:stylesheet>
diff --git a/doc/xsl/raster_cheatsheet.html.xsl b/doc/xsl/raster_cheatsheet.html.xsl
index 84855c42c..f3a97ad0b 100644
--- a/doc/xsl/raster_cheatsheet.html.xsl
+++ b/doc/xsl/raster_cheatsheet.html.xsl
@@ -9,6 +9,7 @@
******************************************************************** -->
<xsl:include href="common_utils.xsl" />
+ <xsl:include href="common_cheatsheet.xsl" />
<xsl:output method="text" />
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
@@ -198,40 +199,4 @@ code {font-size: 8pt}
</xsl:template>
-<xsl:template name="break">
- <xsl:param name="text" select="."/>
- <xsl:choose>
- <xsl:when test="contains($text, '
')">
- <xsl:value-of select="substring-before($text, '
')"/>
- <![CDATA[<br/>]]>
- <xsl:call-template name="break">
- <xsl:with-param
- name="text"
- select="substring-after($text, '
')"
- />
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$text"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!--macro to pull out function parameter names so we can provide a pretty arg list prefix for each function -->
-<xsl:template name="list_in_params">
- <xsl:param name="func" />
- <xsl:for-each select="$func">
- <xsl:if test="count(paramdef/parameter) > 0"> </xsl:if>
- <xsl:for-each select="paramdef">
- <xsl:choose>
- <xsl:when test="not( contains(parameter, 'OUT') )">
- <xsl:value-of select="parameter" />
- <xsl:if test="position()<last()"><xsl:text>, </xsl:text></xsl:if>
- </xsl:when>
- </xsl:choose>
-
- </xsl:for-each>
- </xsl:for-each>
-</xsl:template>
-
</xsl:stylesheet>
diff --git a/doc/xsl/sfcgal_cheatsheet.html.xsl b/doc/xsl/sfcgal_cheatsheet.html.xsl
index f29b3674f..ec3178861 100644
--- a/doc/xsl/sfcgal_cheatsheet.html.xsl
+++ b/doc/xsl/sfcgal_cheatsheet.html.xsl
@@ -9,6 +9,7 @@
******************************************************************** -->
<xsl:include href="common_utils.xsl" />
+ <xsl:include href="common_cheatsheet.xsl" />
<xsl:output method="text" />
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
@@ -175,39 +176,4 @@ h1 {
</xsl:template>
-<xsl:template name="break">
- <xsl:param name="text" select="."/>
- <xsl:choose>
- <xsl:when test="contains($text, '
')">
- <xsl:value-of select="substring-before($text, '
')"/>
- <![CDATA[<br/>]]>
- <xsl:call-template name="break">
- <xsl:with-param
- name="text"
- select="substring-after($text, '
')"
- />
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$text"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!--macro to pull out function parameter names so we can provide a pretty arg list prefix for each function -->
-<xsl:template name="list_in_params">
- <xsl:param name="func" />
- <xsl:for-each select="$func">
- <xsl:if test="count(paramdef/parameter) > 0"> </xsl:if>
- <xsl:for-each select="paramdef">
- <xsl:choose>
- <xsl:when test="not( contains(parameter, 'OUT') )">
- <xsl:value-of select="parameter" />
- <xsl:if test="position()<last()"><xsl:text>, </xsl:text></xsl:if>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:for-each>
-</xsl:template>
-
</xsl:stylesheet>
diff --git a/doc/xsl/tiger_geocoder_cheatsheet.html.xsl b/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
index 29f7cd3e7..43e8c8874 100644
--- a/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
+++ b/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
@@ -9,6 +9,7 @@
******************************************************************** -->
<xsl:include href="common_utils.xsl" />
+ <xsl:include href="common_cheatsheet.xsl" />
<xsl:output method="text" />
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
@@ -173,39 +174,4 @@ h1 {
</xsl:template>
-<xsl:template name="break">
- <xsl:param name="text" select="."/>
- <xsl:choose>
- <xsl:when test="contains($text, '
')">
- <xsl:value-of select="substring-before($text, '
')"/>
- <![CDATA[<br/>]]>
- <xsl:call-template name="break">
- <xsl:with-param
- name="text"
- select="substring-after($text, '
')"
- />
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$text"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!--macro to pull out function parameter names so we can provide a pretty arg list prefix for each function -->
-<xsl:template name="list_in_params">
- <xsl:param name="func" />
- <xsl:for-each select="$func">
- <xsl:if test="count(paramdef/parameter) > 0"> </xsl:if>
- <xsl:for-each select="paramdef">
- <xsl:choose>
- <xsl:when test="not( contains(parameter, 'OUT') )">
- <xsl:value-of select="parameter" />
- <xsl:if test="position()<last()"><xsl:text>, </xsl:text></xsl:if>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:for-each>
-</xsl:template>
-
</xsl:stylesheet>
diff --git a/doc/xsl/topology_cheatsheet.html.xsl b/doc/xsl/topology_cheatsheet.html.xsl
index adf5eb36a..8b4f42620 100644
--- a/doc/xsl/topology_cheatsheet.html.xsl
+++ b/doc/xsl/topology_cheatsheet.html.xsl
@@ -9,6 +9,7 @@
******************************************************************** -->
<xsl:include href="common_utils.xsl" />
+ <xsl:include href="common_cheatsheet.xsl" />
<xsl:output method="text" />
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
@@ -176,42 +177,6 @@ h1 {
</xsl:if>
<!--close section -->
-
</xsl:template>
-<xsl:template name="break">
- <xsl:param name="text" select="."/>
- <xsl:choose>
- <xsl:when test="contains($text, '
')">
- <xsl:value-of select="substring-before($text, '
')"/>
- <![CDATA[<br/>]]>
- <xsl:call-template name="break">
- <xsl:with-param
- name="text"
- select="substring-after($text, '
')"
- />
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$text"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!--macro to pull out function parameter names so we can provide a pretty arg list prefix for each function -->
-<xsl:template name="list_in_params">
- <xsl:param name="func" />
- <xsl:for-each select="$func">
- <xsl:if test="count(paramdef/parameter) > 0"> </xsl:if>
- <xsl:for-each select="paramdef">
- <xsl:choose>
- <xsl:when test="not( contains(parameter, 'OUT') )">
- <xsl:value-of select="parameter" />
- <xsl:if test="position()<last()"><xsl:text>, </xsl:text></xsl:if>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:for-each>
-</xsl:template>
-
</xsl:stylesheet>
-----------------------------------------------------------------------
Summary of changes:
doc/xsl/common_cheatsheet.xsl | 40 ++++++++++++++++++++++++++++++
doc/xsl/post_gis_day_cards.html.xsl | 20 ---------------
doc/xsl/postgis_cheatsheet.html.xsl | 37 +--------------------------
doc/xsl/raster_cheatsheet.html.xsl | 37 +--------------------------
doc/xsl/sfcgal_cheatsheet.html.xsl | 36 +--------------------------
doc/xsl/tiger_geocoder_cheatsheet.html.xsl | 36 +--------------------------
doc/xsl/topology_cheatsheet.html.xsl | 37 +--------------------------
7 files changed, 45 insertions(+), 198 deletions(-)
create mode 100644 doc/xsl/common_cheatsheet.xsl
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list