From 1753337cf5d0aa5ba04b29ded65b824d9cf12c00 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 22 Nov 2009 05:20:41 +0000
Subject: Improve psql's tabular display of wrapped-around data by inserting
 markers in the formerly-always-blank columns just to left and right of the
 data. Different marking is used for a line break caused by a newline in the
 data than for a straight wraparound.  A newline break is signaled by a "+" in
 the right margin column in ASCII mode, or a carriage return arrow in UNICODE
 mode. Wraparound is signaled by a dot in the right margin as well as the
 following left margin in ASCII mode, or an ellipsis symbol in the same places
 in UNICODE mode.  "\pset linestyle old-ascii" is added to make the previous
 behavior available if anyone really wants it.

In passing, this commit also cleans up a few regression test files that
had unintended spacing differences from the current actual output.

Roger Leigh, reviewed by Gabrielle Roth and other members of PDXPUG.
---
 doc/src/sgml/ref/psql-ref.sgml | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

(limited to 'doc/src/sgml/ref/psql-ref.sgml')

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index bbccb3b87b9..95ce850195e 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.232 2009/10/13 21:04:01 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.233 2009/11/22 05:20:41 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -1765,30 +1765,54 @@ lo_import 152801
           <listitem>
           <para>
           Sets the border line drawing style to one
-          of <literal>ascii</literal> or <literal>unicode</literal>.
+          of <literal>ascii</literal>, <literal>old-ascii</literal>
+          or <literal>unicode</literal>.
           Unique abbreviations are allowed.  (That would mean one
           letter is enough.)
           </para>
 
           <para>
-          <quote>ASCII</quote> uses plain <acronym>ASCII</acronym> characters.
+          <literal>ascii</literal> style uses plain <acronym>ASCII</acronym>
+          characters.  Newlines in data are shown using
+          a <literal>+</literal> symbol in the right-hand margin.
+          When the data wraps from one line
+          to the next without a newline character, a dot (<literal>.</>)
+          is shown in the right-hand margin of the first line, and
+          again in the left-hand margin of the following line.
           </para>
 
           <para>
-          <quote>Unicode</quote> uses Unicode box-drawing characters.
+          <literal>old-ascii</literal> style uses plain <acronym>ASCII</>
+          characters, using the formatting style used
+          in <productname>PostgreSQL</productname> 8.4 and earlier.
+          Newlines in data are shown using a <literal>:</literal>
+          symbol in place of the left-hand column separator.
+          When the data wraps from one line
+          to the next without a newline character, a <literal>;</>
+          symbol is used in place of the left-hand column separator.
+          </para>
+
+          <para>
+          <literal>unicode</literal> style uses Unicode box-drawing characters.
+          Newlines in data are shown using a carriage return symbol
+          in the right-hand margin.  When the data wraps from one line
+          to the next without a newline character, an ellipsis symbol
+          is shown in the right-hand margin of the first line, and
+          again in the left-hand margin of the following line.
           </para>
 
           <para>
           When the selected output format is one that draws lines or boxes
-          around the data, this setting controls how the lines are drawn.
+          around the data, this setting also determines the characters
+          with which the lines are drawn.
           Plain <acronym>ASCII</acronym> characters work everywhere, but
           Unicode characters look nicer on displays that recognize them.
           </para>
 
           <para>
-          If this option has not been set, the default behavior is to
-          use Unicode characters if the client character set encoding
-          is UTF-8, otherwise <acronym>ASCII</acronym> characters.
+          If this option has not been set, the default behavior is to use
+          <literal>unicode</literal> style if the client character set encoding
+          is UTF-8, otherwise <literal>ascii</literal> style.
           </para>
           </listitem>
           </varlistentry>
-- 
cgit v1.2.3