[postgis-tickets] r16960 - More style tweaks and add 'chucked-html-web' target for
Paul Ramsey
pramsey at cleverelephant.ca
Mon Oct 29 03:20:48 PDT 2018
Author: pramsey
Date: 2018-10-29 15:20:48 -0700 (Mon, 29 Oct 2018)
New Revision: 16960
Added:
trunk/doc/html/ga.js
Modified:
trunk/doc/Makefile.in
trunk/doc/html/style.css
Log:
More style tweaks and add 'chucked-html-web' target for
building ref docs with google analytics code embedded
Modified: trunk/doc/Makefile.in
===================================================================
--- trunk/doc/Makefile.in 2018-10-29 20:22:41 UTC (rev 16959)
+++ trunk/doc/Makefile.in 2018-10-29 22:20:48 UTC (rev 16960)
@@ -62,10 +62,15 @@
--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
@@ -138,7 +143,7 @@
reporting.xml \
using_postgis_app.xml \
using_postgis_dataman.xml \
- using_raster_dataman.xml
+ using_raster_dataman.xml
XML_GENERATED_SOURCES = \
postgis_aggs_mm.xml \
@@ -209,31 +214,31 @@
postgis_comments.sql: ./xsl/postgis_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/postgis_comments.sql.xsl postgis-out.xml > $@
-
+
postgis_cheatsheet.html: ./xsl/postgis_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/postgis_cheatsheet.html.xsl postgis-out.xml > $@
-
+
raster_comments.sql: ./xsl/raster_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/raster_comments.sql.xsl postgis-out.xml > $@
-
+
raster_cheatsheet.html: ./xsl/raster_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/raster_cheatsheet.html.xsl postgis-out.xml > $@
-
+
topology_comments.sql: ./xsl/topology_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/topology_comments.sql.xsl postgis-out.xml > $@
-
+
topology_cheatsheet.html: ./xsl/topology_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/topology_cheatsheet.html.xsl postgis-out.xml > $@
-
+
sfcgal_comments.sql: ./xsl/sfcgal_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/sfcgal_comments.sql.xsl postgis-out.xml > $@
-
+
sfcgal_cheatsheet.html: ./xsl/sfcgal_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/sfcgal_cheatsheet.html.xsl postgis-out.xml > $@
-
+
tiger_geocoder_comments.sql: ./xsl/tiger_geocoder_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_comments.sql.xsl postgis-out.xml > $@
-
+
tiger_geocoder_cheatsheet.html: ./xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
@@ -241,12 +246,19 @@
$(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:
@@ -256,7 +268,7 @@
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) \
$<
@@ -280,7 +292,7 @@
-s "${PWD}/texstyle.sty" \
-o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf $<; \
fi
-
+
postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images $(XML_INPUTS)
if test x"$(DBTOEPUB)" = x; then \
echo "Error: dbtoepub not found, can't build epub"; \
@@ -308,13 +320,13 @@
doxygen: doxygen.cfg
doxygen $<
-images:
+images:
$(MAKE) -C html/image_src images
images-clean:
$(MAKE) -C html/image_src images-clean
-
-clean:
+
+clean:
rm -f html/*.html
rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
rm -f *.epub
@@ -339,7 +351,7 @@
cheatsheets: postgis_cheatsheet.html raster_cheatsheet.html topology_cheatsheet.html sfcgal_cheatsheet.html tiger_geocoder_cheatsheet.html
ifneq ($(CAN_BUILD_COMMENTS),yes)
-comments-install:
+comments-install:
if test -e postgis_comments.sql -a \
-e raster_comments.sql -a \
-e topology_comments.sql -a \
@@ -371,7 +383,7 @@
$(INSTALL_DATA) html/images/* $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images/
$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
-docs-uninstall:
+docs-uninstall:
rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/style.css
rm -rf $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images
@@ -437,11 +449,11 @@
@echo
requirements_not_met_imagemagick:
- @echo
+ @echo
@echo "configure was unable to find the ImageMagick's 'convert' utility program."
@echo "To build the documentation, install ImageMagick and then re-run configure. Alternatively "
@echo "refer to online manual:"
@echo
@echo " http://postgis.net/documentation"
- @echo
-
+ @echo
+
Added: trunk/doc/html/ga.js
===================================================================
--- trunk/doc/html/ga.js (rev 0)
+++ trunk/doc/html/ga.js 2018-10-29 22:20:48 UTC (rev 16960)
@@ -0,0 +1,7 @@
+(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');
Modified: trunk/doc/html/style.css
===================================================================
--- trunk/doc/html/style.css 2018-10-29 20:22:41 UTC (rev 16959)
+++ trunk/doc/html/style.css 2018-10-29 22:20:48 UTC (rev 16960)
@@ -10,16 +10,16 @@
background: #ffffff;
color: #2e2e2e;
margin: 0;
- padding: 0em 4em 0em 4em;
+ padding: 0em 6em 0em 6em;
}
div.navheader {
- margin: 0em -4em 0em -4em;
- padding: 2em;
+ margin: 0em -6em 0em -6em;
+ padding: 2em 6em 2em 6em;
background: #579;
}
div.navfooter {
- margin: 0em -4em 0em -4em;
+ margin: 0em -6em 0em -6em;
padding: 2em 6em 2em 6em;
background: #579;
color: white;
@@ -51,13 +51,6 @@
display: none;
}
-div.refentry {
- margin: 2em;
-}
-hr {
- display: none;
-}
-
div.funcsynopsis code {
font: unset;
}
@@ -70,13 +63,13 @@
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{
+p, form, td, th, dt, li {
/* font-size:10pt */
}
h1, h2 {
color: #579;
}
-h3,h4,th,dt,b, div.abstract-title, div.toc-title {
+h3, h4, th, dt, b, div.abstract-title, div.toc-title {
color: #579;
}
h1 {
@@ -108,10 +101,6 @@
border-collapse: collapse;
}
-/*table, td {
- border: 1;
- padding: 0
-}*/
/* 3. Block Formatted ----------------------------------------------------- */
@@ -166,7 +155,6 @@
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;
@@ -194,8 +182,6 @@
padding: 0 0 0 0;
}
-
-
span.inlinemediaobject img {
vertical-align: middle;
}
@@ -257,17 +243,8 @@
font-weight: bold;
}
-.styledtable table thead th {
- border-color: #ddd;
- border-style: solid;
-}
-.styledtable > table {
- border-color: #ddd;
- border-style: solid;
-}
.styledtable table td,th {
- color: black;
- padding: 0.3em;
+ padding: 0.5em;
}
table.informaltable {
More information about the postgis-tickets
mailing list