Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gmSKj-00059Q-69 for pgsql-docs@arkaria.postgresql.org; Wed, 23 Jan 2019 23:53:25 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1gmSKh-0007lI-26 for pgsql-docs@arkaria.postgresql.org; Wed, 23 Jan 2019 23:53:23 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gmSKg-0007lA-BA for pgsql-docs@lists.postgresql.org; Wed, 23 Jan 2019 23:53:22 +0000 Received: from momjian.us ([72.94.173.45]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gmSKX-0002PL-V7 for pgsql-docs@lists.postgresql.org; Wed, 23 Jan 2019 23:53:21 +0000 Received: from bruce by momjian.us with local (Exim 4.84_2) (envelope-from ) id 1gmSKW-0000cg-F6; Wed, 23 Jan 2019 18:53:12 -0500 Date: Wed, 23 Jan 2019 18:53:12 -0500 From: Bruce Momjian To: =?iso-8859-1?Q?J=FCrgen?= Purtz Cc: pgsql-docs@lists.postgresql.org Subject: Re: First SVG graphic Message-ID: <20190123235312.GB8334@momjian.us> References: <0e0b8e73-cc7c-0557-c76f-35d9592eb50e@purtz.de> <20190117174053.GC10895@momjian.us> <20190118.074307.1409947743977067766.t-ishii@sraoss.co.jp> <2e5ef806-c4f8-3fe7-e9a4-4fcfd124568e@purtz.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <2e5ef806-c4f8-3fe7-e9a4-4fcfd124568e@purtz.de> User-Agent: Mutt/1.5.23 (2014-03-12) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk On Mon, Jan 21, 2019 at 03:02:43PM +0100, Jürgen Purtz wrote: > The attached patch contains all necessary changes to the sgml, svg, and > Makefile. (Possibly we need some more changes regarding the 'install*' tasks > of Makefile.) How to go on? Shall I send the patch to a different list or to > Commitfest 2019-03? This is a pretty complicated issue with a lot of back-story. I am thinking Tatsuo or me will probably commit it before March. --------------------------------------------------------------------------- > > Kind regards > > Jürgen Purtz > > > On 17.01.19 23:43, Tatsuo Ishii wrote: > >>>Thanks to an additional template created by Alexander Lakhin, which extends the > >>>'nochunk' stylesheet for SVG and MathML processing, it is now possible to > >>>create the "single HTML file" of our documentation including SVG. For me this > >>>is a working solution as long as we use Docbook 4. After the migration to > >>>Docbook 5, both languages as well as full namespace support will be natively > >>>included in Docbook. > >>> > >>>Does anyone faced some more problems? Or can we start to include the three > >>>first SVG graphics into PG's documentation? > >>OK, the wiki pages look good, as do the diagrams, and I think you have > >>the process we all agreed with. Should we move ahead and commit some of > >>these diagrams to the souce tree for PG 12? > >Yes, I think we should. > > > >Best regards, > >-- > >Tatsuo Ishii > >SRA OSS, Inc. Japan > >English: http://www.sraoss.co.jp/index_en.php > >Japanese:http://www.sraoss.co.jp > > > > > diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile > index 8326c7c673..27d1e674f4 100644 > --- a/doc/src/sgml/Makefile > +++ b/doc/src/sgml/Makefile > @@ -57,6 +57,8 @@ GENERATED_SGML = version.sgml \ > > ALLSGML := $(wildcard $(srcdir)/*.sgml $(srcdir)/ref/*.sgml) $(GENERATED_SGML) > > +SVGSRC := $(wildcard $(srcdir)/svg/*.svg) > + > > ## > ## Man pages > @@ -125,10 +127,12 @@ endif > > html: html-stamp > > -html-stamp: stylesheet.xsl postgres.sgml $(ALLSGML) > +html-stamp: stylesheet.xsl postgres.sgml $(ALLSGML) $(SVGSRC) > $(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^) > $(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $(wordlist 1,2,$^) > cp $(srcdir)/stylesheet.css html/ > + $(MKDIR_P) html/svg > + cp $(SVGSRC) html/svg > touch $@ > > htmlhelp: stylesheet-hh.xsl postgres.sgml $(ALLSGML) > @@ -136,7 +140,7 @@ htmlhelp: stylesheet-hh.xsl postgres.sgml $(ALLSGML) > $(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(wordlist 1,2,$^) > > # single-page HTML > -postgres.html: stylesheet-html-nochunk.xsl postgres.sgml $(ALLSGML) > +postgres.html: stylesheet-html-nochunk.xsl postgres.sgml $(ALLSGML) $(SVGSRC) > $(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^) > $(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) -o $@ $(wordlist 1,2,$^) > > @@ -152,15 +156,15 @@ postgres.txt: postgres.html > postgres.pdf: > $(error Invalid target; use postgres-A4.pdf or postgres-US.pdf as targets) > > -%-A4.fo: stylesheet-fo.xsl %.sgml $(ALLSGML) > +%-A4.fo: stylesheet-fo.xsl %.sgml > $(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^) > $(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) --stringparam paper.type A4 -o $@ $(wordlist 1,2,$^) > > -%-US.fo: stylesheet-fo.xsl %.sgml $(ALLSGML) > +%-US.fo: stylesheet-fo.xsl %.sgml > $(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^) > $(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) --stringparam paper.type USletter -o $@ $(wordlist 1,2,$^) > > -%.pdf: %.fo > +%.pdf: %.fo $(ALLSGML) $(SVGSRC) > $(FOP) -fo $< -pdf $@ > > > @@ -169,7 +173,7 @@ postgres.pdf: > ## > > epub: postgres.epub > -postgres.epub: postgres.sgml $(ALLSGML) > +postgres.epub: postgres.sgml $(ALLSGML) $(SVGSRC) > $(XMLLINT) --noout --valid $< > $(DBTOEPUB) $< > > @@ -209,7 +213,7 @@ check: postgres.sgml $(ALLSGML) check-tabs > install: install-html install-man > > installdirs: > - $(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) > + $(MKDIR_P) '$(DESTDIR)$(htmldir)'/html/svg html/svg $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) > > # If the install used a man directory shared with other applications, this will remove all files. > uninstall: > diff --git a/doc/src/sgml/gin.sgml b/doc/src/sgml/gin.sgml > index cc7cd1ed2c..195e385798 100644 > --- a/doc/src/sgml/gin.sgml > +++ b/doc/src/sgml/gin.sgml > @@ -453,6 +453,17 @@ > key values for different columns can be of different types. > > > + > + > + > + > + > + > + > + > + > + > + > > GIN Fast Update Technique > > diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml > index 9e0bb93f08..1fd9ced5f5 100644 > --- a/doc/src/sgml/ref/pg_dump.sgml > +++ b/doc/src/sgml/ref/pg_dump.sgml > @@ -73,6 +73,17 @@ PostgreSQL documentation > architectures. > > > + > + > + > + > + > + > + > + > + > + > + > > When used with one of the archive file formats and combined with > pg_restore, > diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml > index 8ef2ac8010..4d39ceb958 100644 > --- a/doc/src/sgml/storage.sgml > +++ b/doc/src/sgml/storage.sgml > @@ -775,6 +775,17 @@ data. Empty in ordinary tables. > > > > + > + > + > + > + > + > + > + > + > + > + > > > The first 24 bytes of each page consists of a page header > diff --git a/doc/src/sgml/stylesheet-html-nochunk.xsl b/doc/src/sgml/stylesheet-html-nochunk.xsl > index ffd2012e91..9e756708f5 100644 > --- a/doc/src/sgml/stylesheet-html-nochunk.xsl > +++ b/doc/src/sgml/stylesheet-html-nochunk.xsl > @@ -9,4 +9,27 @@ > > > > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > > diff --git a/doc/src/sgml/svg/Inkscape/PageLayout_Inkscape.svg b/doc/src/sgml/svg/Inkscape/PageLayout_Inkscape.svg > new file mode 100644 > index 0000000000..5803077781 > --- /dev/null > +++ b/doc/src/sgml/svg/Inkscape/PageLayout_Inkscape.svg > @@ -0,0 +1,81 @@ > + > + > + > + > + > + image/svg+xml > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + Page Layout > + 8 k B > + Free space > + > + > + Header > + > + ItemId > + > + ItemId > + > + > + > + > + > + > + > + Item > + > + > + Item > + > + Special > + > + Content grows from start to center and from end to center. > + > diff --git a/doc/src/sgml/svg/Inkscape/gin_Inkscape.svg b/doc/src/sgml/svg/Inkscape/gin_Inkscape.svg > new file mode 100644 > index 0000000000..be9a9b4c73 > --- /dev/null > +++ b/doc/src/sgml/svg/Inkscape/gin_Inkscape.svg > @@ -0,0 +1,124 @@ > + > + > + > + > + > + image/svg+xml > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + Meta page > + > + > + Entry tree > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + Posting tree > + > + > + > + > + > + > + > + > + > + Posting tree > + > + > + > + > + Posting tree > + > + > + > + > + > + > + > + > + > + Pending list > + > + > + > + > + > + > + > + > + > + > + Pointers to Posting tree > + > + Heap pointers (in Posting list or Posting tree) > + > diff --git a/doc/src/sgml/svg/Inkscape/pgDump_Inkscape.svg b/doc/src/sgml/svg/Inkscape/pgDump_Inkscape.svg > new file mode 100644 > index 0000000000..3e74b485a0 > --- /dev/null > +++ b/doc/src/sgml/svg/Inkscape/pgDump_Inkscape.svg > @@ -0,0 +1,102 @@ > + > + > + > + > + > + image/svg+xml > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + Original > + Database > + > + pg_dump, script format > + > + pg_dump, other archive formats > + > + > + > + > + SQL INSERT > + commands > + > + psql > + > + > + > + > + Binary > + File(s) > + > + pg_restore > + > + > + > + > + Restored > + Database > + > + > diff --git a/doc/src/sgml/svg/PageLayout.svg b/doc/src/sgml/svg/PageLayout.svg > new file mode 100644 > index 0000000000..cf504ad640 > --- /dev/null > +++ b/doc/src/sgml/svg/PageLayout.svg > @@ -0,0 +1,70 @@ > + > + > + > + > + > + > + > + > + > + + fill="whitesmoke" stroke="#CCCCCC" /> > + > + > + Page Layout > + 8 k B > + Free space > + > + > + Header > + > + ItemId > + > + ItemId > + > + > + > + > + > + > + Item > + > + Item > + > + Special > + > + Content grows from start to center and from end to center. > + > + > diff --git a/doc/src/sgml/svg/gin.svg b/doc/src/sgml/svg/gin.svg > new file mode 100644 > index 0000000000..8a5e77b252 > --- /dev/null > +++ b/doc/src/sgml/svg/gin.svg > @@ -0,0 +1,123 @@ > + > + > + > + > + > + > + > + > + + fill="whitesmoke" stroke="#CCCCCC" /> > + > + > + > + Meta page > + > + > + > + Entry tree > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + Posting tree > + > + > + > + > + > + > + > + > + > + > + Posting tree > + > + > + > + > + > + Posting tree > + > + > + > + > + > + > + > + > + > + > + Pending list > + > + > + > + > + > + > + > + > + > + > + > + Pointers to Posting tree > + > + Heap pointers (in Posting list or Posting tree) > + > + > diff --git a/doc/src/sgml/svg/pgDump.svg b/doc/src/sgml/svg/pgDump.svg > new file mode 100644 > index 0000000000..33e4a7d467 > --- /dev/null > +++ b/doc/src/sgml/svg/pgDump.svg > @@ -0,0 +1,96 @@ > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + + fill="whitesmoke" stroke="#CCCCCC" /> > + > + > + > + > + Original > + Database > + > + pg_dump, script format > + > + pg_dump, other archive formats > + > + > + > + > + > + SQL INSERT > + commands > + > + psql > + > + > + > + > + > + Binary > + File(s) > + > + pg_restore > + > + > + > + > + > + Restored > + Database > + > + > + > + -- Bruce Momjian http://momjian.us EnterpriseDB http://enterprisedb.com + As you are, so once was I. As I am, so you will be. + + Ancient Roman grave inscription +