printing table in asciidoc with psql

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index e7fcc73..cd64b88 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -2092,8 +2092,8 @@ lo_import 152801
           <literal>aligned</literal>, <literal>wrapped</literal>,
           <literal>html</literal>,
           <literal>latex</literal> (uses <literal>tabular</literal>),
-          <literal>latex-longtable</literal>, or
-          <literal>troff-ms</literal>.
+          <literal>latex-longtable</literal>,
+          <literal>troff-ms</literal>, or <literal>asciidoc</literal>.
           Unique abbreviations are allowed.  (That would mean one letter
           is enough.)
           </para>
@@ -2120,7 +2120,8 @@ lo_import 152801
 
           <para>
           The <literal>html</>, <literal>latex</>,
-          <literal>latex-longtable</literal>, and <literal>troff-ms</>
+          <literal>latex-longtable</literal>, <literal>troff-ms</>,
+          and <literal>asciidoc</>
           formats put out tables that are intended to
           be included in documents using the respective mark-up
           language. They are not complete documents! This might not be
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 2227db4..ae6b106 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -2247,6 +2247,9 @@ _align2string(enum printFormat in)
 		case PRINT_TROFF_MS:
 			return "troff-ms";
 			break;
+		case PRINT_ASCIIDOC:
+			return "asciidoc";
+			break;
 	}
 	return "unknown";
 }
@@ -2316,9 +2319,11 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
 			popt->topt.format = PRINT_LATEX_LONGTABLE;
 		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
 			popt->topt.format = PRINT_TROFF_MS;
+		else if (pg_strncasecmp("asciidoc", value, vallen) == 0)
+			popt->topt.format = PRINT_ASCIIDOC;
 		else
 		{
-			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n");
+			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms, asciidoc\n");
 			return false;
 		}
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 6035a77..66da6ec 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -351,7 +351,7 @@ helpVariables(unsigned short int pager)
 	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
 	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
 	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
-	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
+	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, asciidoc ..]\n"));
 	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
 	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
 	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 3b3c3b7..956bbb1 100644
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -2475,6 +2475,200 @@ print_troff_ms_vertical(const printTableContent *cont, FILE *fout)
 	}
 }
 
+/*********************/
+/* ASCIIDOC **********/
+/*********************/
+
+static void
+print_asciidoc_text(const printTableContent *cont, FILE *fout)
+{
+	bool		opt_tuples_only = cont->opt->tuples_only;
+	unsigned short opt_border = cont->opt->border;
+	unsigned int i;
+	const char *const * ptr;
+
+	if (cancel_pressed)
+		return;
+
+	if (cont->opt->start_table)
+	{
+		/* print title */
+		if (!opt_tuples_only && cont->title)
+		{
+      fputs(".", fout);
+			fputs(cont->title, fout);
+      fputs("\n", fout);
+		}
+    
+    /* print table [] header definition */
+		fputs("[options=\"header\",cols=\"", fout);
+    for(i = 0; i < cont->ncolumns; i++) {
+      if (i != 0) fputs(",", fout);
+		  fprintf(fout, "%s", cont->aligns[(i) % cont->ncolumns] == 'r' ? ">literal" : "<literal");
+    }
+    fputs("\"", fout);
+    switch (opt_border) {
+      case 0:
+        fputs(",frame=\"none\",grid=\"none\"", fout);
+        break;
+      case 1:
+        fputs(",frame=\"none\"", fout);
+        break;
+      case 2:
+        fputs(",frame=\"all\",grid=\"all\"", fout);
+        break;
+    }
+    fputs("]\n", fout);
+		fputs("|====\n", fout);
+
+		/* print headers */
+		if (!opt_tuples_only)
+		{
+			for (ptr = cont->headers; *ptr; ptr++)
+			{
+        fputs("^| +++", fout);
+				fputs(*ptr, fout);
+        fputs("+++ ", fout);
+			}
+			fputs("\n", fout);
+		}
+	}
+
+	/* print cells */
+	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+	{
+		if (i % cont->ncolumns == 0)
+		{
+			if (cancel_pressed)
+				break;
+    }
+		
+    fprintf(fout, "| ");
+
+		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+			fputs(" ", fout);
+		else
+			fputs(*ptr, fout);
+
+		fputs(" ", fout);
+
+		if ((i + 1) % cont->ncolumns == 0)
+			fputs("\n", fout);
+
+	}
+  
+  fputs("|====\n", fout);
+
+	if (cont->opt->stop_table)
+	{
+		printTableFooter *footers = footers_with_default(cont);
+
+		/* print footers */
+		if (!opt_tuples_only && footers != NULL && !cancel_pressed)
+		{
+			printTableFooter *f;
+
+			fputs("\n....\n", fout);
+			for (f = footers; f; f = f->next)
+			{
+				fputs(f->data, fout);
+				fputs("\n", fout);
+			}
+			fputs("....\n", fout);
+		}
+
+	}
+}
+
+static void
+print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
+{
+	bool		opt_tuples_only = cont->opt->tuples_only;
+	unsigned short opt_border = cont->opt->border;
+	unsigned long record = cont->opt->prior_records + 1;
+	unsigned int i;
+	const char *const * ptr;
+
+	if (cancel_pressed)
+		return;
+
+	if (cont->opt->start_table)
+	{
+		/* print title */
+		if (!opt_tuples_only && cont->title)
+		{
+      fputs(".", fout);
+			fputs(cont->title, fout);
+      fputs("\n", fout);
+		}
+    
+    /* print table [] header definition */
+	  fputs("[cols=\"h,literal\"", fout);
+    switch (opt_border) {
+      case 0:
+        fputs(",frame=\"none\",grid=\"none\"", fout);
+        break;
+      case 1:
+        fputs(",frame=\"none\"", fout);
+        break;
+      case 2:
+        fputs(",frame=\"all\",grid=\"all\"", fout);
+        break;
+    }
+    fputs("]\n", fout);
+    fputs("|====\n", fout);
+
+	}
+
+	/* print records */
+	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+	{
+		if (i % cont->ncolumns == 0)
+		{
+			if (cancel_pressed)
+				break;
+			if (!opt_tuples_only)
+				fprintf(fout,
+						"2+^| Record %lu\n",
+						record++);
+			else
+				fputs("2| \n", fout);
+		}
+    
+    fputs("|+++", fout);
+		fputs(cont->headers[i % cont->ncolumns], fout);
+    fputs("+++", fout);
+
+		fprintf(fout, " %s|", cont->aligns[i % cont->ncolumns] == 'r' ? ">" : "<");
+		/* is string only whitespace? */
+		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+			fputs(" ", fout);
+		else
+			fputs(*ptr, fout);
+
+		fputs("\n", fout);
+	}
+
+	fputs("|====\n", fout);
+	
+  if (cont->opt->stop_table)
+	{
+		/* print footers */
+		if (!opt_tuples_only && cont->footers != NULL && !cancel_pressed)
+		{
+			printTableFooter *f;
+
+			fputs("\n....\n", fout);
+			for (f = cont->footers; f; f = f->next)
+			{
+				fputs(f->data, fout);
+				fputs("\n", fout);
+			}
+			fputs("....\n", fout);
+		}
+
+	}
+}
 
 /********************************/
 /* Public functions		*/
@@ -2872,6 +3066,12 @@ printTable(const printTableContent *cont, FILE *fout, FILE *flog)
 			else
 				print_troff_ms_text(cont, fout);
 			break;
+    case PRINT_ASCIIDOC:
+      if (cont->opt->expanded == 1)
+        print_asciidoc_vertical(cont, fout);
+      else
+        print_asciidoc_text(cont, fout);
+      break;
 		default:
 			fprintf(stderr, _("invalid output format (internal error): %d"),
 					cont->opt->format);
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
index f668b23..cf885ad 100644
--- a/src/bin/psql/print.h
+++ b/src/bin/psql/print.h
@@ -20,7 +20,8 @@ enum printFormat
 	PRINT_HTML,
 	PRINT_LATEX,
 	PRINT_LATEX_LONGTABLE,
-	PRINT_TROFF_MS
+	PRINT_TROFF_MS,
+  PRINT_ASCIIDOC
 	/* add your favourite output format here ... */
 };
 
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index b80fe13..a0c5230 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3633,7 +3633,7 @@ psql_completion(const char *text, int start, int end)
 		{
 			static const char *const my_list[] =
 			{"unaligned", "aligned", "wrapped", "html", "latex",
-			"troff-ms", NULL};
+			"troff-ms", "asciidoc", NULL};
 
 			COMPLETE_WITH_LIST_CS(my_list);
 		}
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index 3764127..4544c69 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -2123,3 +2123,203 @@ execute q;
 +------------------+-------------------+
 
 deallocate q;
+prepare q as select 'lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as "012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+\pset format asciidoc
+\pset expanded off
+\pset border 0
+execute q;
+[options="header",cols="<literal,<literal,>literal",frame="none",grid="none"]
+|====
+^| +++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ ^| +++0123456789+++ ^| +++int+++ 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|====
+
+....
+(10 rows)
+....
+\pset border 1
+execute q;
+[options="header",cols="<literal,<literal,>literal",frame="none"]
+|====
+^| +++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ ^| +++0123456789+++ ^| +++int+++ 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|====
+
+....
+(10 rows)
+....
+\pset border 2
+execute q;
+[options="header",cols="<literal,<literal,>literal",frame="all",grid="all"]
+|====
+^| +++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ ^| +++0123456789+++ ^| +++int+++ 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|====
+
+....
+(10 rows)
+....
+\pset expanded on
+\pset border 0
+execute q;
+[cols="h,literal",frame="none",grid="none"]
+|====
+2+^| Record 1
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 2
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 3
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 4
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 5
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 6
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 7
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 8
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 9
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 10
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+|====
+\pset border 1
+execute q;
+[cols="h,literal",frame="none"]
+|====
+2+^| Record 1
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 2
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 3
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 4
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 5
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 6
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 7
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 8
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 9
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 10
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+|====
+\pset border 2
+execute q;
+[cols="h,literal",frame="all",grid="all"]
+|====
+2+^| Record 1
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 2
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 3
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 4
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 5
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 6
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 7
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 8
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 9
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+2+^| Record 10
+|+++012345678 9abc def!*@#&!@(*&*~~_+-=\ \+++ <|lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+|+++0123456789+++ <|11
+|+++int+++ >|11
+|====
+deallocate q;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index 5ccc68f..6537c53 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -276,3 +276,28 @@ execute q;
 execute q;
 
 deallocate q;
+
+prepare q as select 'lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as "012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+
+\pset format asciidoc
+\pset expanded off
+\pset border 0
+execute q;
+
+\pset border 1
+execute q;
+
+\pset border 2
+execute q;
+
+\pset expanded on
+\pset border 0
+execute q;
+
+\pset border 1
+execute q;
+
+\pset border 2
+execute q;
+
+deallocate q;

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index e7fcc73..cd64b88 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -2092,8 +2092,8 @@ lo_import 152801
           <literal>aligned</literal>, <literal>wrapped</literal>,
           <literal>html</literal>,
           <literal>latex</literal> (uses <literal>tabular</literal>),
-          <literal>latex-longtable</literal>, or
-          <literal>troff-ms</literal>.
+          <literal>latex-longtable</literal>,
+          <literal>troff-ms</literal>, or <literal>asciidoc</literal>.
           Unique abbreviations are allowed.  (That would mean one letter
           is enough.)
           </para>
@@ -2120,7 +2120,8 @@ lo_import 152801
 
           <para>
           The <literal>html</>, <literal>latex</>,
-          <literal>latex-longtable</literal>, and <literal>troff-ms</>
+          <literal>latex-longtable</literal>, <literal>troff-ms</>,
+          and <literal>asciidoc</>
           formats put out tables that are intended to
           be included in documents using the respective mark-up
           language. They are not complete documents! This might not be
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 26089352..e00e47b 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -2248,6 +2248,9 @@ _align2string(enum printFormat in)
 		case PRINT_TROFF_MS:
 			return "troff-ms";
 			break;
+		case PRINT_ASCIIDOC:
+			return "asciidoc";
+			break;
 	}
 	return "unknown";
 }
@@ -2321,9 +2324,11 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
 			popt->topt.format = PRINT_LATEX_LONGTABLE;
 		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
 			popt->topt.format = PRINT_TROFF_MS;
+		else if (pg_strncasecmp("asciidoc", value, vallen) == 0)
+			popt->topt.format = PRINT_ASCIIDOC;
 		else
 		{
-			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n");
+			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms, asciidoc\n");
 			return false;
 		}
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index ae5fe88..b14b313 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -351,7 +351,7 @@ helpVariables(unsigned short int pager)
 	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
 	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
 	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
-	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
+	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, asciidoc ..]\n"));
 	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
 	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
 	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 3b3c3b7..83f268a 100644
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -2475,6 +2475,217 @@ print_troff_ms_vertical(const printTableContent *cont, FILE *fout)
 	}
 }
 
+/*********************/
+/* ASCIIDOC **********/
+/*********************/
+
+static void
+asciidoc_escaped_print(const char *in, FILE *fout)
+{
+  const char *p;
+  for (p = in; *p; p++)
+  {
+    switch(*p)
+    {
+      case '|':
+        fputs("\\|", fout);
+        break;
+      default:
+        fputc(*p, fout);
+    }
+  }
+}
+
+static void
+print_asciidoc_text(const printTableContent *cont, FILE *fout)
+{
+	bool		opt_tuples_only = cont->opt->tuples_only;
+	unsigned short opt_border = cont->opt->border;
+	unsigned int i;
+	const char *const * ptr;
+
+	if (cancel_pressed)
+		return;
+
+	if (cont->opt->start_table)
+	{
+		/* print title */
+		if (!opt_tuples_only && cont->title)
+		{
+      fputs(".", fout);
+			fputs(cont->title, fout);
+      fputs("\n", fout);
+		}
+    
+    /* print table [] header definition */
+		fputs("[options=\"header\",cols=\"", fout);
+    for(i = 0; i < cont->ncolumns; i++) {
+      if (i != 0) fputs(",", fout);
+		  fprintf(fout, "%s", cont->aligns[(i) % cont->ncolumns] == 'r' ? ">l" : "<l");
+    }
+    fputs("\"", fout);
+    switch (opt_border) {
+      case 0:
+        fputs(",frame=\"none\",grid=\"none\"", fout);
+        break;
+      case 1:
+        fputs(",frame=\"none\"", fout);
+        break;
+      case 2:
+        fputs(",frame=\"all\",grid=\"all\"", fout);
+        break;
+    }
+    fputs("]\n", fout);
+		fputs("|====\n", fout);
+
+		/* print headers */
+		if (!opt_tuples_only)
+		{
+			for (ptr = cont->headers; *ptr; ptr++)
+			{
+        fputs("^l| ", fout);
+        asciidoc_escaped_print(*ptr, fout);
+        fputs(" ", fout);
+			}
+			fputs("\n", fout);
+		}
+	}
+
+	/* print cells */
+	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+	{
+		if (i % cont->ncolumns == 0)
+		{
+			if (cancel_pressed)
+				break;
+    }
+		
+    fprintf(fout, "| ");
+
+		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+			fputs(" ", fout);
+		else
+			asciidoc_escaped_print(*ptr, fout);
+
+		fputs(" ", fout);
+
+		if ((i + 1) % cont->ncolumns == 0)
+			fputs("\n", fout);
+
+	}
+  
+  fputs("|====\n", fout);
+
+	if (cont->opt->stop_table)
+	{
+		printTableFooter *footers = footers_with_default(cont);
+
+		/* print footers */
+		if (!opt_tuples_only && footers != NULL && !cancel_pressed)
+		{
+			printTableFooter *f;
+
+			fputs("\n....\n", fout);
+			for (f = footers; f; f = f->next)
+			{
+				fputs(f->data, fout);
+				fputs("\n", fout);
+			}
+			fputs("....\n", fout);
+		}
+
+	}
+}
+
+static void
+print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
+{
+	bool		opt_tuples_only = cont->opt->tuples_only;
+	unsigned short opt_border = cont->opt->border;
+	unsigned long record = cont->opt->prior_records + 1;
+	unsigned int i;
+	const char *const * ptr;
+
+	if (cancel_pressed)
+		return;
+
+	if (cont->opt->start_table)
+	{
+		/* print title */
+		if (!opt_tuples_only && cont->title)
+		{
+      fputs(".", fout);
+			fputs(cont->title, fout);
+      fputs("\n", fout);
+		}
+    
+    /* print table [] header definition */
+	  fputs("[cols=\"h,l\"", fout);
+    switch (opt_border) {
+      case 0:
+        fputs(",frame=\"none\",grid=\"none\"", fout);
+        break;
+      case 1:
+        fputs(",frame=\"none\"", fout);
+        break;
+      case 2:
+        fputs(",frame=\"all\",grid=\"all\"", fout);
+        break;
+    }
+    fputs("]\n", fout);
+    fputs("|====\n", fout);
+
+	}
+
+	/* print records */
+	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+	{
+		if (i % cont->ncolumns == 0)
+		{
+			if (cancel_pressed)
+				break;
+			if (!opt_tuples_only)
+				fprintf(fout,
+						"2+^| Record %lu\n",
+						record++);
+			else
+				fputs("2| \n", fout);
+		}
+    
+    fputs("<|", fout);
+    asciidoc_escaped_print(cont->headers[i % cont->ncolumns], fout);
+    fputs(" ", fout);
+
+		fprintf(fout, " %s|", cont->aligns[i % cont->ncolumns] == 'r' ? ">" : "<");
+		/* is string only whitespace? */
+		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+			fputs(" ", fout);
+		else
+			asciidoc_escaped_print(*ptr, fout);
+
+		fputs("\n", fout);
+	}
+
+	fputs("|====\n", fout);
+	
+  if (cont->opt->stop_table)
+	{
+		/* print footers */
+		if (!opt_tuples_only && cont->footers != NULL && !cancel_pressed)
+		{
+			printTableFooter *f;
+
+			fputs("\n....\n", fout);
+			for (f = cont->footers; f; f = f->next)
+			{
+				fputs(f->data, fout);
+				fputs("\n", fout);
+			}
+			fputs("....\n", fout);
+		}
+
+	}
+}
 
 /********************************/
 /* Public functions		*/
@@ -2872,6 +3083,12 @@ printTable(const printTableContent *cont, FILE *fout, FILE *flog)
 			else
 				print_troff_ms_text(cont, fout);
 			break;
+    case PRINT_ASCIIDOC:
+      if (cont->opt->expanded == 1)
+        print_asciidoc_vertical(cont, fout);
+      else
+        print_asciidoc_text(cont, fout);
+      break;
 		default:
 			fprintf(stderr, _("invalid output format (internal error): %d"),
 					cont->opt->format);
@@ -3100,3 +3317,5 @@ strlen_max_width(unsigned char *str, int *target_width, int encoding)
 
 	return str - start;
 }
+
+
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
index f668b23..cf885ad 100644
--- a/src/bin/psql/print.h
+++ b/src/bin/psql/print.h
@@ -20,7 +20,8 @@ enum printFormat
 	PRINT_HTML,
 	PRINT_LATEX,
 	PRINT_LATEX_LONGTABLE,
-	PRINT_TROFF_MS
+	PRINT_TROFF_MS,
+  PRINT_ASCIIDOC
 	/* add your favourite output format here ... */
 };
 
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 886188c..042f147 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3785,7 +3785,7 @@ psql_completion(const char *text, int start, int end)
 		{
 			static const char *const my_list[] =
 			{"unaligned", "aligned", "wrapped", "html", "latex",
-			"troff-ms", NULL};
+			"troff-ms", "asciidoc", NULL};
 
 			COMPLETE_WITH_LIST_CS(my_list);
 		}
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index e87b82b..5f5fac0 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -2125,3 +2125,203 @@ execute q;
 +------------------+-------------------+
 
 deallocate q;
+prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+\pset format asciidoc
+\pset expanded off
+\pset border 0
+execute q;
+[options="header",cols="<l,<l,>l",frame="none",grid="none"]
+|====
+^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|====
+
+....
+(10 rows)
+....
+\pset border 1
+execute q;
+[options="header",cols="<l,<l,>l",frame="none"]
+|====
+^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|====
+
+....
+(10 rows)
+....
+\pset border 2
+execute q;
+[options="header",cols="<l,<l,>l",frame="all",grid="all"]
+|====
+^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|====
+
+....
+(10 rows)
+....
+\pset expanded on
+\pset border 0
+execute q;
+[cols="h,l",frame="none",grid="none"]
+|====
+2+^| Record 1
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 2
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 3
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 4
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 5
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 6
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 7
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 8
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 9
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 10
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+|====
+\pset border 1
+execute q;
+[cols="h,l",frame="none"]
+|====
+2+^| Record 1
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 2
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 3
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 4
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 5
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 6
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 7
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 8
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 9
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 10
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+|====
+\pset border 2
+execute q;
+[cols="h,l",frame="all",grid="all"]
+|====
+2+^| Record 1
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 2
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 3
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 4
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 5
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 6
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 7
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 8
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 9
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 10
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+|====
+deallocate q;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index 5ccc68f..fa1df8b 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -276,3 +276,28 @@ execute q;
 execute q;
 
 deallocate q;
+
+prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+
+\pset format asciidoc
+\pset expanded off
+\pset border 0
+execute q;
+
+\pset border 1
+execute q;
+
+\pset border 2
+execute q;
+
+\pset expanded on
+\pset border 0
+execute q;
+
+\pset border 1
+execute q;
+
+\pset border 2
+execute q;
+
+deallocate q;

commit f8ffd152aaa78ac1c96f808761680b8e593528a2
Author: Pavel Stehule <pavel.stehule@gooddata.com>
Date:   Thu Oct 30 09:02:59 2014 +0100

    fix formatting

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index e7fcc73..cd64b88 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -2092,8 +2092,8 @@ lo_import 152801
           <literal>aligned</literal>, <literal>wrapped</literal>,
           <literal>html</literal>,
           <literal>latex</literal> (uses <literal>tabular</literal>),
-          <literal>latex-longtable</literal>, or
-          <literal>troff-ms</literal>.
+          <literal>latex-longtable</literal>,
+          <literal>troff-ms</literal>, or <literal>asciidoc</literal>.
           Unique abbreviations are allowed.  (That would mean one letter
           is enough.)
           </para>
@@ -2120,7 +2120,8 @@ lo_import 152801
 
           <para>
           The <literal>html</>, <literal>latex</>,
-          <literal>latex-longtable</literal>, and <literal>troff-ms</>
+          <literal>latex-longtable</literal>, <literal>troff-ms</>,
+          and <literal>asciidoc</>
           formats put out tables that are intended to
           be included in documents using the respective mark-up
           language. They are not complete documents! This might not be
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 26089352..e00e47b 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -2248,6 +2248,9 @@ _align2string(enum printFormat in)
 		case PRINT_TROFF_MS:
 			return "troff-ms";
 			break;
+		case PRINT_ASCIIDOC:
+			return "asciidoc";
+			break;
 	}
 	return "unknown";
 }
@@ -2321,9 +2324,11 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
 			popt->topt.format = PRINT_LATEX_LONGTABLE;
 		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
 			popt->topt.format = PRINT_TROFF_MS;
+		else if (pg_strncasecmp("asciidoc", value, vallen) == 0)
+			popt->topt.format = PRINT_ASCIIDOC;
 		else
 		{
-			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n");
+			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms, asciidoc\n");
 			return false;
 		}
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index ae5fe88..b14b313 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -351,7 +351,7 @@ helpVariables(unsigned short int pager)
 	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
 	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
 	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
-	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
+	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, asciidoc ..]\n"));
 	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
 	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
 	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 3b3c3b7..ae98ff9 100644
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -2475,6 +2475,216 @@ print_troff_ms_vertical(const printTableContent *cont, FILE *fout)
 	}
 }
 
+/*************************/
+/* ASCIIDOC		 */
+/*************************/
+
+static void
+asciidoc_escaped_print(const char *in, FILE *fout)
+{
+	const char *p;
+	for (p = in; *p; p++)
+	{
+		switch(*p)
+		{
+			case '|':
+				fputs("\\|", fout);
+				break;
+			default:
+				fputc(*p, fout);
+		}
+	}
+}
+
+static void
+print_asciidoc_text(const printTableContent *cont, FILE *fout)
+{
+	bool		opt_tuples_only = cont->opt->tuples_only;
+	unsigned short opt_border = cont->opt->border;
+	unsigned int i;
+	const char *const * ptr;
+
+	if (cancel_pressed)
+		return;
+
+	if (cont->opt->start_table)
+	{
+		/* print title */
+		if (!opt_tuples_only && cont->title)
+		{
+			fputs(".", fout);
+			fputs(cont->title, fout);
+			fputs("\n", fout);
+		}
+
+		/* print table [] header definition */
+		fputs("[options=\"header\",cols=\"", fout);
+		for(i = 0; i < cont->ncolumns; i++)
+		{
+			if (i != 0)
+				fputs(",", fout);
+			fprintf(fout, "%s", cont->aligns[(i) % cont->ncolumns] == 'r' ? ">l" : "<l");
+		}
+		fputs("\"", fout);
+		switch (opt_border)
+		{
+			case 0:
+				fputs(",frame=\"none\",grid=\"none\"", fout);
+				break;
+			case 1:
+				fputs(",frame=\"none\"", fout);
+				break;
+			case 2:
+				fputs(",frame=\"all\",grid=\"all\"", fout);
+				break;
+		}
+		fputs("]\n", fout);
+		fputs("|====\n", fout);
+
+		/* print headers */
+		if (!opt_tuples_only)
+		{
+			for (ptr = cont->headers; *ptr; ptr++)
+			{
+				fputs("^l| ", fout);
+				asciidoc_escaped_print(*ptr, fout);
+				fputs(" ", fout);
+			}
+			fputs("\n", fout);
+		}
+	}
+
+	/* print cells */
+	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+	{
+		if (i % cont->ncolumns == 0)
+		{
+			if (cancel_pressed)
+				break;
+		}
+
+		fprintf(fout, "| ");
+
+		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+			fputs(" ", fout);
+		else
+			asciidoc_escaped_print(*ptr, fout);
+
+		fputs(" ", fout);
+
+		if ((i + 1) % cont->ncolumns == 0)
+			fputs("\n", fout);
+	}
+
+	fputs("|====\n", fout);
+
+	if (cont->opt->stop_table)
+	{
+		printTableFooter *footers = footers_with_default(cont);
+
+		/* print footers */
+		if (!opt_tuples_only && footers != NULL && !cancel_pressed)
+		{
+			printTableFooter *f;
+
+			fputs("\n....\n", fout);
+			for (f = footers; f; f = f->next)
+			{
+				fputs(f->data, fout);
+				fputs("\n", fout);
+			}
+			fputs("....\n", fout);
+		}
+	}
+}
+
+static void
+print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
+{
+	bool		opt_tuples_only = cont->opt->tuples_only;
+	unsigned short opt_border = cont->opt->border;
+	unsigned long record = cont->opt->prior_records + 1;
+	unsigned int i;
+	const char *const * ptr;
+
+	if (cancel_pressed)
+		return;
+
+	if (cont->opt->start_table)
+	{
+		/* print title */
+		if (!opt_tuples_only && cont->title)
+		{
+			fputs(".", fout);
+			fputs(cont->title, fout);
+			fputs("\n", fout);
+		}
+
+		/* print table [] header definition */
+		fputs("[cols=\"h,l\"", fout);
+		switch (opt_border)
+		{
+			case 0:
+				fputs(",frame=\"none\",grid=\"none\"", fout);
+				break;
+			case 1:
+				fputs(",frame=\"none\"", fout);
+				break;
+			case 2:
+				fputs(",frame=\"all\",grid=\"all\"", fout);
+			break;
+		}
+		fputs("]\n", fout);
+		fputs("|====\n", fout);
+	}
+
+	/* print records */
+	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+	{
+		if (i % cont->ncolumns == 0)
+		{
+			if (cancel_pressed)
+				break;
+			if (!opt_tuples_only)
+				fprintf(fout,
+						"2+^| Record %lu\n",
+						record++);
+			else
+				fputs("2| \n", fout);
+		}
+
+		fputs("<|", fout);
+		asciidoc_escaped_print(cont->headers[i % cont->ncolumns], fout);
+		fputs(" ", fout);
+
+		fprintf(fout, " %s|", cont->aligns[i % cont->ncolumns] == 'r' ? ">" : "<");
+		/* is string only whitespace? */
+		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+			fputs(" ", fout);
+		else
+			asciidoc_escaped_print(*ptr, fout);
+		fputs("\n", fout);
+	}
+
+	fputs("|====\n", fout);
+
+	if (cont->opt->stop_table)
+	{
+		/* print footers */
+		if (!opt_tuples_only && cont->footers != NULL && !cancel_pressed)
+		{
+			printTableFooter *f;
+
+			fputs("\n....\n", fout);
+			for (f = cont->footers; f; f = f->next)
+			{
+				fputs(f->data, fout);
+				fputs("\n", fout);
+			}
+			fputs("....\n", fout);
+		}
+	}
+}
 
 /********************************/
 /* Public functions		*/
@@ -2872,6 +3082,12 @@ printTable(const printTableContent *cont, FILE *fout, FILE *flog)
 			else
 				print_troff_ms_text(cont, fout);
 			break;
+    case PRINT_ASCIIDOC:
+      if (cont->opt->expanded == 1)
+        print_asciidoc_vertical(cont, fout);
+      else
+        print_asciidoc_text(cont, fout);
+      break;
 		default:
 			fprintf(stderr, _("invalid output format (internal error): %d"),
 					cont->opt->format);
@@ -3100,3 +3316,5 @@ strlen_max_width(unsigned char *str, int *target_width, int encoding)
 
 	return str - start;
 }
+
+
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
index f668b23..cf885ad 100644
--- a/src/bin/psql/print.h
+++ b/src/bin/psql/print.h
@@ -20,7 +20,8 @@ enum printFormat
 	PRINT_HTML,
 	PRINT_LATEX,
 	PRINT_LATEX_LONGTABLE,
-	PRINT_TROFF_MS
+	PRINT_TROFF_MS,
+  PRINT_ASCIIDOC
 	/* add your favourite output format here ... */
 };
 
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 886188c..042f147 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3785,7 +3785,7 @@ psql_completion(const char *text, int start, int end)
 		{
 			static const char *const my_list[] =
 			{"unaligned", "aligned", "wrapped", "html", "latex",
-			"troff-ms", NULL};
+			"troff-ms", "asciidoc", NULL};
 
 			COMPLETE_WITH_LIST_CS(my_list);
 		}
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index e87b82b..5f5fac0 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -2125,3 +2125,203 @@ execute q;
 +------------------+-------------------+
 
 deallocate q;
+prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+\pset format asciidoc
+\pset expanded off
+\pset border 0
+execute q;
+[options="header",cols="<l,<l,>l",frame="none",grid="none"]
+|====
+^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|====
+
+....
+(10 rows)
+....
+\pset border 1
+execute q;
+[options="header",cols="<l,<l,>l",frame="none"]
+|====
+^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|====
+
+....
+(10 rows)
+....
+\pset border 2
+execute q;
+[options="header",cols="<l,<l,>l",frame="all",grid="all"]
+|====
+^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11 
+|====
+
+....
+(10 rows)
+....
+\pset expanded on
+\pset border 0
+execute q;
+[cols="h,l",frame="none",grid="none"]
+|====
+2+^| Record 1
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 2
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 3
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 4
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 5
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 6
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 7
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 8
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 9
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 10
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+|====
+\pset border 1
+execute q;
+[cols="h,l",frame="none"]
+|====
+2+^| Record 1
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 2
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 3
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 4
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 5
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 6
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 7
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 8
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 9
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 10
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+|====
+\pset border 2
+execute q;
+[cols="h,l",frame="all",grid="all"]
+|====
+2+^| Record 1
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 2
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 3
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 4
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 5
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 6
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 7
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 8
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 9
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 10
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+|====
+deallocate q;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index 5ccc68f..fa1df8b 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -276,3 +276,28 @@ execute q;
 execute q;
 
 deallocate q;
+
+prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+
+\pset format asciidoc
+\pset expanded off
+\pset border 0
+execute q;
+
+\pset border 1
+execute q;
+
+\pset border 2
+execute q;
+
+\pset expanded on
+\pset border 0
+execute q;
+
+\pset border 1
+execute q;
+
+\pset border 2
+execute q;
+
+deallocate q;

commit 76e033f3a287115f15f249c657b544c148e2efd2
Author: Pavel Stehule <pavel.stehule@gooddata.com>
Date:   Sun Nov 16 23:38:46 2014 +0100

    every table is in own paragraph

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index e7fcc73..cd64b88 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -2092,8 +2092,8 @@ lo_import 152801
           <literal>aligned</literal>, <literal>wrapped</literal>,
           <literal>html</literal>,
           <literal>latex</literal> (uses <literal>tabular</literal>),
-          <literal>latex-longtable</literal>, or
-          <literal>troff-ms</literal>.
+          <literal>latex-longtable</literal>,
+          <literal>troff-ms</literal>, or <literal>asciidoc</literal>.
           Unique abbreviations are allowed.  (That would mean one letter
           is enough.)
           </para>
@@ -2120,7 +2120,8 @@ lo_import 152801
 
           <para>
           The <literal>html</>, <literal>latex</>,
-          <literal>latex-longtable</literal>, and <literal>troff-ms</>
+          <literal>latex-longtable</literal>, <literal>troff-ms</>,
+          and <literal>asciidoc</>
           formats put out tables that are intended to
           be included in documents using the respective mark-up
           language. They are not complete documents! This might not be
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 26089352..e00e47b 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -2248,6 +2248,9 @@ _align2string(enum printFormat in)
 		case PRINT_TROFF_MS:
 			return "troff-ms";
 			break;
+		case PRINT_ASCIIDOC:
+			return "asciidoc";
+			break;
 	}
 	return "unknown";
 }
@@ -2321,9 +2324,11 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
 			popt->topt.format = PRINT_LATEX_LONGTABLE;
 		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
 			popt->topt.format = PRINT_TROFF_MS;
+		else if (pg_strncasecmp("asciidoc", value, vallen) == 0)
+			popt->topt.format = PRINT_ASCIIDOC;
 		else
 		{
-			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n");
+			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms, asciidoc\n");
 			return false;
 		}
 
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 66d80b5..ea8b9c1 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -858,6 +858,10 @@ PrintQueryStatus(PGresult *results)
 			html_escaped_print(PQcmdStatus(results), pset.queryFout);
 			fputs("</p>\n", pset.queryFout);
 		}
+		else if (pset.popt.topt.format == PRINT_ASCIIDOC)
+		{
+			fprintf(pset.queryFout, "\n%s\n", PQcmdStatus(results));
+		}
 		else
 			fprintf(pset.queryFout, "%s\n", PQcmdStatus(results));
 	}
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index ae5fe88..b14b313 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -351,7 +351,7 @@ helpVariables(unsigned short int pager)
 	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
 	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
 	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
-	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
+	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, asciidoc ..]\n"));
 	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
 	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
 	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 3b3c3b7..3a8eb26 100644
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -2475,6 +2475,232 @@ print_troff_ms_vertical(const printTableContent *cont, FILE *fout)
 	}
 }
 
+/*************************/
+/* ASCIIDOC		 */
+/*************************/
+
+static void
+asciidoc_escaped_print(const char *in, FILE *fout)
+{
+	const char *p;
+	for (p = in; *p; p++)
+	{
+		switch(*p)
+		{
+			case '|':
+				fputs("\\|", fout);
+				break;
+			default:
+				fputc(*p, fout);
+		}
+	}
+}
+
+static void
+print_asciidoc_text(const printTableContent *cont, FILE *fout)
+{
+	bool		opt_tuples_only = cont->opt->tuples_only;
+	unsigned short opt_border = cont->opt->border;
+	unsigned int i;
+	const char *const * ptr;
+
+	if (cancel_pressed)
+		return;
+
+	if (cont->opt->start_table)
+	{
+		/* print table in new paragraph - enforce preliminary new line */
+		fputs("\n", fout);
+
+		/* print title */
+		if (!opt_tuples_only && cont->title)
+		{
+			fputs(".", fout);
+			fputs(cont->title, fout);
+			fputs("\n", fout);
+		}
+
+		/* print table [] header definition */
+		fputs("[options=\"header\",cols=\"", fout);
+		for(i = 0; i < cont->ncolumns; i++)
+		{
+			if (i != 0)
+				fputs(",", fout);
+			fprintf(fout, "%s", cont->aligns[(i) % cont->ncolumns] == 'r' ? ">l" : "<l");
+		}
+		fputs("\"", fout);
+		switch (opt_border)
+		{
+			case 0:
+				fputs(",frame=\"none\",grid=\"none\"", fout);
+				break;
+			case 1:
+				fputs(",frame=\"none\"", fout);
+				break;
+			case 2:
+				fputs(",frame=\"all\",grid=\"all\"", fout);
+				break;
+		}
+		fputs("]\n", fout);
+		fputs("|====\n", fout);
+
+		/* print headers */
+		if (!opt_tuples_only)
+		{
+			for (ptr = cont->headers; *ptr; ptr++)
+			{
+				fputs("^l| ", fout);
+				asciidoc_escaped_print(*ptr, fout);
+				fputs(" ", fout);
+			}
+			fputs("\n", fout);
+		}
+	}
+
+	/* print cells */
+	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+	{
+		if (i % cont->ncolumns == 0)
+		{
+			if (cancel_pressed)
+				break;
+		}
+
+		fputs("|", fout);
+
+		/* protect against needless spaces */
+		if (((*ptr)[strspn(*ptr, " \t")] == '\0') || ((*ptr)[strspn(*ptr, "  ")] == '\0'))
+		{
+			if ((i + 1) % cont->ncolumns != 0)
+			{
+				fputs(" ", fout);
+				continue;
+			}
+		}
+		else
+		{
+			fputs(" ", fout);
+			asciidoc_escaped_print(*ptr, fout);
+		}
+
+		if ((i + 1) % cont->ncolumns == 0)
+			fputs("\n", fout);
+		else
+			fputs(" ", fout);
+	}
+
+	fputs("|====\n", fout);
+
+	if (cont->opt->stop_table)
+	{
+		printTableFooter *footers = footers_with_default(cont);
+
+		/* print footers */
+		if (!opt_tuples_only && footers != NULL && !cancel_pressed)
+		{
+			printTableFooter *f;
+
+			fputs("\n....\n", fout);
+			for (f = footers; f; f = f->next)
+			{
+				fputs(f->data, fout);
+				fputs("\n", fout);
+			}
+			fputs("....\n", fout);
+		}
+	}
+}
+
+static void
+print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
+{
+	bool		opt_tuples_only = cont->opt->tuples_only;
+	unsigned short opt_border = cont->opt->border;
+	unsigned long record = cont->opt->prior_records + 1;
+	unsigned int i;
+	const char *const * ptr;
+
+	if (cancel_pressed)
+		return;
+
+	if (cont->opt->start_table)
+	{
+		/* print table in new paragraph - enforce preliminary new line */
+		fputs("\n", fout);
+
+		/* print title */
+		if (!opt_tuples_only && cont->title)
+		{
+			fputs(".", fout);
+			fputs(cont->title, fout);
+			fputs("\n", fout);
+		}
+
+		/* print table [] header definition */
+		fputs("[cols=\"h,l\"", fout);
+		switch (opt_border)
+		{
+			case 0:
+				fputs(",frame=\"none\",grid=\"none\"", fout);
+				break;
+			case 1:
+				fputs(",frame=\"none\"", fout);
+				break;
+			case 2:
+				fputs(",frame=\"all\",grid=\"all\"", fout);
+			break;
+		}
+		fputs("]\n", fout);
+		fputs("|====\n", fout);
+	}
+
+	/* print records */
+	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+	{
+		if (i % cont->ncolumns == 0)
+		{
+			if (cancel_pressed)
+				break;
+			if (!opt_tuples_only)
+				fprintf(fout,
+						"2+^| Record %lu\n",
+						record++);
+			else
+				fputs("2| \n", fout);
+		}
+
+		fputs("<|", fout);
+		asciidoc_escaped_print(cont->headers[i % cont->ncolumns], fout);
+		fputs(" ", fout);
+
+		fprintf(fout, " %s|", cont->aligns[i % cont->ncolumns] == 'r' ? ">" : "<");
+		/* is string only whitespace? */
+		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+			fputs(" ", fout);
+		else
+			asciidoc_escaped_print(*ptr, fout);
+		fputs("\n", fout);
+	}
+
+	fputs("|====\n", fout);
+
+	if (cont->opt->stop_table)
+	{
+		/* print footers */
+		if (!opt_tuples_only && cont->footers != NULL && !cancel_pressed)
+		{
+			printTableFooter *f;
+
+			fputs("\n....\n", fout);
+			for (f = cont->footers; f; f = f->next)
+			{
+				fputs(f->data, fout);
+				fputs("\n", fout);
+			}
+			fputs("....\n", fout);
+		}
+	}
+}
 
 /********************************/
 /* Public functions		*/
@@ -2872,6 +3098,12 @@ printTable(const printTableContent *cont, FILE *fout, FILE *flog)
 			else
 				print_troff_ms_text(cont, fout);
 			break;
+		case PRINT_ASCIIDOC:
+			if (cont->opt->expanded == 1)
+				print_asciidoc_vertical(cont, fout);
+			else
+				print_asciidoc_text(cont, fout);
+			break;
 		default:
 			fprintf(stderr, _("invalid output format (internal error): %d"),
 					cont->opt->format);
@@ -3100,3 +3332,5 @@ strlen_max_width(unsigned char *str, int *target_width, int encoding)
 
 	return str - start;
 }
+
+
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
index f668b23..08b6f24 100644
--- a/src/bin/psql/print.h
+++ b/src/bin/psql/print.h
@@ -20,7 +20,8 @@ enum printFormat
 	PRINT_HTML,
 	PRINT_LATEX,
 	PRINT_LATEX_LONGTABLE,
-	PRINT_TROFF_MS
+	PRINT_TROFF_MS,
+	PRINT_ASCIIDOC
 	/* add your favourite output format here ... */
 };
 
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 8c85425..728985e 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3787,7 +3787,7 @@ psql_completion(const char *text, int start, int end)
 		{
 			static const char *const my_list[] =
 			{"unaligned", "aligned", "wrapped", "html", "latex",
-			"troff-ms", NULL};
+			"troff-ms", "asciidoc", NULL};
 
 			COMPLETE_WITH_LIST_CS(my_list);
 		}
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index e87b82b..6e789b4 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -2125,3 +2125,209 @@ execute q;
 +------------------+-------------------+
 
 deallocate q;
+prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+\pset format asciidoc
+\pset expanded off
+\pset border 0
+execute q;
+
+[options="header",cols="<l,<l,>l",frame="none",grid="none"]
+|====
+^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|====
+
+....
+(10 rows)
+....
+\pset border 1
+execute q;
+
+[options="header",cols="<l,<l,>l",frame="none"]
+|====
+^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|====
+
+....
+(10 rows)
+....
+\pset border 2
+execute q;
+
+[options="header",cols="<l,<l,>l",frame="all",grid="all"]
+|====
+^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+|====
+
+....
+(10 rows)
+....
+\pset expanded on
+\pset border 0
+execute q;
+
+[cols="h,l",frame="none",grid="none"]
+|====
+2+^| Record 1
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 2
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 3
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 4
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 5
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 6
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 7
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 8
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 9
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 10
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+|====
+\pset border 1
+execute q;
+
+[cols="h,l",frame="none"]
+|====
+2+^| Record 1
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 2
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 3
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 4
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 5
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 6
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 7
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 8
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 9
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 10
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+|====
+\pset border 2
+execute q;
+
+[cols="h,l",frame="all",grid="all"]
+|====
+2+^| Record 1
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 2
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 3
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 4
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 5
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 6
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 7
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 8
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 9
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+2+^| Record 10
+<| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+<|0123456789  <|11
+<|int  >|11
+|====
+deallocate q;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index 5ccc68f..fa1df8b 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -276,3 +276,28 @@ execute q;
 execute q;
 
 deallocate q;
+
+prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+
+\pset format asciidoc
+\pset expanded off
+\pset border 0
+execute q;
+
+\pset border 1
+execute q;
+
+\pset border 2
+execute q;
+
+\pset expanded on
+\pset border 0
+execute q;
+
+\pset border 1
+execute q;
+
+\pset border 2
+execute q;
+
+deallocate q;

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
new file mode 100644
index a637001..82a91ec
*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
*************** lo_import 152801
*** 2092,2099 ****
            <literal>aligned</literal>, <literal>wrapped</literal>,
            <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
!           <literal>latex-longtable</literal>, or
!           <literal>troff-ms</literal>.
            Unique abbreviations are allowed.  (That would mean one letter
            is enough.)
            </para>
--- 2092,2099 ----
            <literal>aligned</literal>, <literal>wrapped</literal>,
            <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
!           <literal>latex-longtable</literal>,
!           <literal>troff-ms</literal>, or <literal>asciidoc</literal>.
            Unique abbreviations are allowed.  (That would mean one letter
            is enough.)
            </para>
*************** lo_import 152801
*** 2120,2126 ****
  
            <para>
            The <literal>html</>, <literal>latex</>,
!           <literal>latex-longtable</literal>, and <literal>troff-ms</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
            language. They are not complete documents! This might not be
--- 2120,2127 ----
  
            <para>
            The <literal>html</>, <literal>latex</>,
!           <literal>latex-longtable</literal>, <literal>troff-ms</>,
!           and <literal>asciidoc</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
            language. They are not complete documents! This might not be
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
new file mode 100644
index 7c9f28d..a96f0ef
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
*************** _align2string(enum printFormat in)
*** 2257,2262 ****
--- 2257,2265 ----
  		case PRINT_TROFF_MS:
  			return "troff-ms";
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			return "asciidoc";
+ 			break;
  	}
  	return "unknown";
  }
*************** do_pset(const char *param, const char *v
*** 2330,2338 ****
  			popt->topt.format = PRINT_LATEX_LONGTABLE;
  		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
  			popt->topt.format = PRINT_TROFF_MS;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n");
  			return false;
  		}
  
--- 2333,2343 ----
  			popt->topt.format = PRINT_LATEX_LONGTABLE;
  		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
  			popt->topt.format = PRINT_TROFF_MS;
+ 		else if (pg_strncasecmp("asciidoc", value, vallen) == 0)
+ 			popt->topt.format = PRINT_ASCIIDOC;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms, asciidoc\n");
  			return false;
  		}
  
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
new file mode 100644
index ac0dc27..93a517e
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
*************** helpVariables(unsigned short int pager)
*** 351,357 ****
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
--- 351,357 ----
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, asciidoc ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
new file mode 100644
index ce0d05d..09c5621
*** a/src/bin/psql/print.c
--- b/src/bin/psql/print.c
*************** print_troff_ms_vertical(const printTable
*** 2476,2481 ****
--- 2476,2702 ----
  	}
  }
  
+ /*************************/
+ /* ASCIIDOC		 */
+ /*************************/
+ 
+ static void
+ asciidoc_escaped_print(const char *in, FILE *fout)
+ {
+ 	const char *p;
+ 	for (p = in; *p; p++)
+ 	{
+ 		switch(*p)
+ 		{
+ 			case '|':
+ 				fputs("\\|", fout);
+ 				break;
+ 			default:
+ 				fputc(*p, fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_text(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fputs("[options=\"header\",cols=\"", fout);
+ 		for(i = 0; i < cont->ncolumns; i++)
+ 		{
+ 			if (i != 0)
+ 				fputs(",", fout);
+ 			fprintf(fout, "%s", cont->aligns[(i) % cont->ncolumns] == 'r' ? ">l" : "<l");
+ 		}
+ 		fputs("\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 				break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 
+ 		/* print headers */
+ 		if (!opt_tuples_only)
+ 		{
+ 			for (ptr = cont->headers; *ptr; ptr++)
+ 			{
+ 				if (ptr != cont->headers)
+ 					fputs(" ", fout);
+ 				fputs("^l|", fout);
+ 				asciidoc_escaped_print(*ptr, fout);
+ 			}
+ 			fputs("\n", fout);
+ 		}
+ 	}
+ 
+ 	/* print cells */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 		}
+ 
+ 		fputs("|", fout);
+ 
+ 		/* protect against needless spaces */
+ 		if (((*ptr)[strspn(*ptr, " \t")] == '\0'))
+ 		{
+ 			if ((i + 1) % cont->ncolumns != 0)
+ 			{
+ 				fputs(" ", fout);
+ 				continue;
+ 			}
+ 		}
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 
+ 		if ((i + 1) % cont->ncolumns == 0)
+ 			fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		printTableFooter *footers = footers_with_default(cont);
+ 
+ 		/* print footers */
+ 		if (!opt_tuples_only && footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned long record = cont->opt->prior_records + 1;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fputs("[cols=\"h,l\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 			break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 	}
+ 
+ 	/* print records */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 			if (!opt_tuples_only)
+ 				fprintf(fout,
+ 						"2+^|Record %lu\n",
+ 						record++);
+ 			else
+ 				fputs("2|\n", fout);
+ 		}
+ 
+ 		fputs("<|", fout);
+ 		asciidoc_escaped_print(cont->headers[i % cont->ncolumns], fout);
+ 
+ 		fprintf(fout, " %s|", cont->aligns[i % cont->ncolumns] == 'r' ? ">" : "<");
+ 		/* is string only whitespace? */
+ 		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+ 			fputs(" ", fout);
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 		fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		/* print footers */
+ 		if (!opt_tuples_only && cont->footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = cont->footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
  
  /********************************/
  /* Public functions		*/
*************** printTable(const printTableContent *cont
*** 2873,2878 ****
--- 3094,3105 ----
  			else
  				print_troff_ms_text(cont, fout);
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			if (cont->opt->expanded == 1)
+ 				print_asciidoc_vertical(cont, fout);
+ 			else
+ 				print_asciidoc_text(cont, fout);
+ 			break;
  		default:
  			fprintf(stderr, _("invalid output format (internal error): %d"),
  					cont->opt->format);
*************** strlen_max_width(unsigned char *str, int
*** 3101,3103 ****
--- 3328,3332 ----
  
  	return str - start;
  }
+ 
+ 
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
new file mode 100644
index a1a89d0..a7eff99
*** a/src/bin/psql/print.h
--- b/src/bin/psql/print.h
*************** enum printFormat
*** 20,26 ****
  	PRINT_HTML,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
! 	PRINT_TROFF_MS
  	/* add your favourite output format here ... */
  };
  
--- 20,27 ----
  	PRINT_HTML,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
! 	PRINT_TROFF_MS,
! 	PRINT_ASCIIDOC
  	/* add your favourite output format here ... */
  };
  
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
new file mode 100644
index e39a07c..82653f7
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
*************** psql_completion(const char *text, int st
*** 3791,3797 ****
  		{
  			static const char *const my_list[] =
  			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
--- 3791,3797 ----
  		{
  			static const char *const my_list[] =
  			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", "asciidoc", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
new file mode 100644
index e87b82b..6e789b4
*** a/src/test/regress/expected/psql.out
--- b/src/test/regress/expected/psql.out
*************** execute q;
*** 2125,2127 ****
--- 2125,2333 ----
  +------------------+-------------------+
  
  deallocate q;
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none",grid="none"]
+ |====
+ ^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 1
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none"]
+ |====
+ ^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 2
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="all",grid="all"]
+ |====
+ ^l|  \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l| 0123456789 ^l| int 
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |  \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& | 11 | 11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ [cols="h,l",frame="none",grid="none"]
+ |====
+ 2+^| Record 1
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 2
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 3
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 4
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 5
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 6
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 7
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 8
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 9
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 10
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ |====
+ \pset border 1
+ execute q;
+ 
+ [cols="h,l",frame="none"]
+ |====
+ 2+^| Record 1
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 2
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 3
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 4
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 5
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 6
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 7
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 8
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 9
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 10
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ |====
+ \pset border 2
+ execute q;
+ 
+ [cols="h,l",frame="all",grid="all"]
+ |====
+ 2+^| Record 1
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 2
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 3
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 4
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 5
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 6
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 7
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 8
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 9
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ 2+^| Record 10
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \  <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789  <|11
+ <|int  >|11
+ |====
+ deallocate q;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
new file mode 100644
index 5ccc68f..fa1df8b
*** a/src/test/regress/sql/psql.sql
--- b/src/test/regress/sql/psql.sql
*************** execute q;
*** 276,278 ****
--- 276,303 ----
  execute q;
  
  deallocate q;
+ 
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ 
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ deallocate q;

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
new file mode 100644
index a637001..82a91ec
*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
*************** lo_import 152801
*** 2092,2099 ****
            <literal>aligned</literal>, <literal>wrapped</literal>,
            <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
!           <literal>latex-longtable</literal>, or
!           <literal>troff-ms</literal>.
            Unique abbreviations are allowed.  (That would mean one letter
            is enough.)
            </para>
--- 2092,2099 ----
            <literal>aligned</literal>, <literal>wrapped</literal>,
            <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
!           <literal>latex-longtable</literal>,
!           <literal>troff-ms</literal>, or <literal>asciidoc</literal>.
            Unique abbreviations are allowed.  (That would mean one letter
            is enough.)
            </para>
*************** lo_import 152801
*** 2120,2126 ****
  
            <para>
            The <literal>html</>, <literal>latex</>,
!           <literal>latex-longtable</literal>, and <literal>troff-ms</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
            language. They are not complete documents! This might not be
--- 2120,2127 ----
  
            <para>
            The <literal>html</>, <literal>latex</>,
!           <literal>latex-longtable</literal>, <literal>troff-ms</>,
!           and <literal>asciidoc</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
            language. They are not complete documents! This might not be
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
new file mode 100644
index 7c9f28d..a96f0ef
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
*************** _align2string(enum printFormat in)
*** 2257,2262 ****
--- 2257,2265 ----
  		case PRINT_TROFF_MS:
  			return "troff-ms";
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			return "asciidoc";
+ 			break;
  	}
  	return "unknown";
  }
*************** do_pset(const char *param, const char *v
*** 2330,2338 ****
  			popt->topt.format = PRINT_LATEX_LONGTABLE;
  		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
  			popt->topt.format = PRINT_TROFF_MS;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n");
  			return false;
  		}
  
--- 2333,2343 ----
  			popt->topt.format = PRINT_LATEX_LONGTABLE;
  		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
  			popt->topt.format = PRINT_TROFF_MS;
+ 		else if (pg_strncasecmp("asciidoc", value, vallen) == 0)
+ 			popt->topt.format = PRINT_ASCIIDOC;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms, asciidoc\n");
  			return false;
  		}
  
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
new file mode 100644
index ac0dc27..93a517e
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
*************** helpVariables(unsigned short int pager)
*** 351,357 ****
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
--- 351,357 ----
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, asciidoc ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
new file mode 100644
index ce0d05d..6a32b5c
*** a/src/bin/psql/print.c
--- b/src/bin/psql/print.c
*************** print_troff_ms_vertical(const printTable
*** 2476,2481 ****
--- 2476,2704 ----
  	}
  }
  
+ /*************************/
+ /* ASCIIDOC		 */
+ /*************************/
+ 
+ static void
+ asciidoc_escaped_print(const char *in, FILE *fout)
+ {
+ 	const char *p;
+ 	for (p = in; *p; p++)
+ 	{
+ 		switch(*p)
+ 		{
+ 			case '|':
+ 				fputs("\\|", fout);
+ 				break;
+ 			default:
+ 				fputc(*p, fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_text(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fputs("[options=\"header\",cols=\"", fout);
+ 		for(i = 0; i < cont->ncolumns; i++)
+ 		{
+ 			if (i != 0)
+ 				fputs(",", fout);
+ 			fprintf(fout, "%s", cont->aligns[(i) % cont->ncolumns] == 'r' ? ">l" : "<l");
+ 		}
+ 		fputs("\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 				break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 
+ 		/* print headers */
+ 		if (!opt_tuples_only)
+ 		{
+ 			for (ptr = cont->headers; *ptr; ptr++)
+ 			{
+ 				if (ptr != cont->headers)
+ 					fputs(" ", fout);
+ 				fputs("^l|", fout);
+ 				asciidoc_escaped_print(*ptr, fout);
+ 			}
+ 			fputs("\n", fout);
+ 		}
+ 	}
+ 
+ 	/* print cells */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 		}
+ 
+ 		if (i != 0)
+ 			fputs(" ", fout);
+ 		fputs("|", fout);
+ 
+ 		/* protect against needless spaces */
+ 		if (((*ptr)[strspn(*ptr, " \t")] == '\0'))
+ 		{
+ 			if ((i + 1) % cont->ncolumns != 0)
+ 			{
+ 				fputs(" ", fout);
+ 				continue;
+ 			}
+ 		}
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 
+ 		if ((i + 1) % cont->ncolumns == 0)
+ 			fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		printTableFooter *footers = footers_with_default(cont);
+ 
+ 		/* print footers */
+ 		if (!opt_tuples_only && footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned long record = cont->opt->prior_records + 1;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fputs("[cols=\"h,l\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 			break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 	}
+ 
+ 	/* print records */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 			if (!opt_tuples_only)
+ 				fprintf(fout,
+ 						"2+^|Record %lu\n",
+ 						record++);
+ 			else
+ 				fputs("2|\n", fout);
+ 		}
+ 
+ 		fputs("<|", fout);
+ 		asciidoc_escaped_print(cont->headers[i % cont->ncolumns], fout);
+ 
+ 		fprintf(fout, " %s|", cont->aligns[i % cont->ncolumns] == 'r' ? ">" : "<");
+ 		/* is string only whitespace? */
+ 		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+ 			fputs(" ", fout);
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 		fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		/* print footers */
+ 		if (!opt_tuples_only && cont->footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = cont->footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
  
  /********************************/
  /* Public functions		*/
*************** printTable(const printTableContent *cont
*** 2873,2878 ****
--- 3096,3107 ----
  			else
  				print_troff_ms_text(cont, fout);
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			if (cont->opt->expanded == 1)
+ 				print_asciidoc_vertical(cont, fout);
+ 			else
+ 				print_asciidoc_text(cont, fout);
+ 			break;
  		default:
  			fprintf(stderr, _("invalid output format (internal error): %d"),
  					cont->opt->format);
*************** strlen_max_width(unsigned char *str, int
*** 3101,3103 ****
--- 3330,3334 ----
  
  	return str - start;
  }
+ 
+ 
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
new file mode 100644
index a1a89d0..a7eff99
*** a/src/bin/psql/print.h
--- b/src/bin/psql/print.h
*************** enum printFormat
*** 20,26 ****
  	PRINT_HTML,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
! 	PRINT_TROFF_MS
  	/* add your favourite output format here ... */
  };
  
--- 20,27 ----
  	PRINT_HTML,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
! 	PRINT_TROFF_MS,
! 	PRINT_ASCIIDOC
  	/* add your favourite output format here ... */
  };
  
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
new file mode 100644
index e39a07c..82653f7
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
*************** psql_completion(const char *text, int st
*** 3791,3797 ****
  		{
  			static const char *const my_list[] =
  			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
--- 3791,3797 ----
  		{
  			static const char *const my_list[] =
  			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", "asciidoc", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
new file mode 100644
index e87b82b..b37c62e
*** a/src/test/regress/expected/psql.out
--- b/src/test/regress/expected/psql.out
*************** execute q;
*** 2125,2127 ****
--- 2125,2333 ----
  +------------------+-------------------+
  
  deallocate q;
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none",grid="none"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 1
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 2
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="all",grid="all"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ [cols="h,l",frame="none",grid="none"]
+ |====
+ 2+^|Record 1
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 2
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 3
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 4
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 5
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 6
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 7
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 8
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 9
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 10
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ |====
+ \pset border 1
+ execute q;
+ 
+ [cols="h,l",frame="none"]
+ |====
+ 2+^|Record 1
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 2
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 3
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 4
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 5
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 6
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 7
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 8
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 9
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 10
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ |====
+ \pset border 2
+ execute q;
+ 
+ [cols="h,l",frame="all",grid="all"]
+ |====
+ 2+^|Record 1
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 2
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 3
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 4
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 5
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 6
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 7
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 8
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 9
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ 2+^|Record 10
+ <| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <|0123456789 <|11
+ <|int >|11
+ |====
+ deallocate q;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
new file mode 100644
index 5ccc68f..fa1df8b
*** a/src/test/regress/sql/psql.sql
--- b/src/test/regress/sql/psql.sql
*************** execute q;
*** 276,278 ****
--- 276,303 ----
  execute q;
  
  deallocate q;
+ 
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ 
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ deallocate q;

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
new file mode 100644
index a637001..82a91ec
*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
*************** lo_import 152801
*** 2092,2099 ****
            <literal>aligned</literal>, <literal>wrapped</literal>,
            <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
!           <literal>latex-longtable</literal>, or
!           <literal>troff-ms</literal>.
            Unique abbreviations are allowed.  (That would mean one letter
            is enough.)
            </para>
--- 2092,2099 ----
            <literal>aligned</literal>, <literal>wrapped</literal>,
            <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
!           <literal>latex-longtable</literal>,
!           <literal>troff-ms</literal>, or <literal>asciidoc</literal>.
            Unique abbreviations are allowed.  (That would mean one letter
            is enough.)
            </para>
*************** lo_import 152801
*** 2120,2126 ****
  
            <para>
            The <literal>html</>, <literal>latex</>,
!           <literal>latex-longtable</literal>, and <literal>troff-ms</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
            language. They are not complete documents! This might not be
--- 2120,2127 ----
  
            <para>
            The <literal>html</>, <literal>latex</>,
!           <literal>latex-longtable</literal>, <literal>troff-ms</>,
!           and <literal>asciidoc</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
            language. They are not complete documents! This might not be
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
new file mode 100644
index 7c9f28d..a96f0ef
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
*************** _align2string(enum printFormat in)
*** 2257,2262 ****
--- 2257,2265 ----
  		case PRINT_TROFF_MS:
  			return "troff-ms";
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			return "asciidoc";
+ 			break;
  	}
  	return "unknown";
  }
*************** do_pset(const char *param, const char *v
*** 2330,2338 ****
  			popt->topt.format = PRINT_LATEX_LONGTABLE;
  		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
  			popt->topt.format = PRINT_TROFF_MS;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n");
  			return false;
  		}
  
--- 2333,2343 ----
  			popt->topt.format = PRINT_LATEX_LONGTABLE;
  		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
  			popt->topt.format = PRINT_TROFF_MS;
+ 		else if (pg_strncasecmp("asciidoc", value, vallen) == 0)
+ 			popt->topt.format = PRINT_ASCIIDOC;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms, asciidoc\n");
  			return false;
  		}
  
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
new file mode 100644
index ac0dc27..93a517e
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
*************** helpVariables(unsigned short int pager)
*** 351,357 ****
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
--- 351,357 ----
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, asciidoc ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
new file mode 100644
index ce0d05d..266ed73
*** a/src/bin/psql/print.c
--- b/src/bin/psql/print.c
*************** print_troff_ms_vertical(const printTable
*** 2476,2481 ****
--- 2476,2704 ----
  	}
  }
  
+ /*************************/
+ /* ASCIIDOC		 */
+ /*************************/
+ 
+ static void
+ asciidoc_escaped_print(const char *in, FILE *fout)
+ {
+ 	const char *p;
+ 	for (p = in; *p; p++)
+ 	{
+ 		switch(*p)
+ 		{
+ 			case '|':
+ 				fputs("\\|", fout);
+ 				break;
+ 			default:
+ 				fputc(*p, fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_text(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fputs("[options=\"header\",cols=\"", fout);
+ 		for(i = 0; i < cont->ncolumns; i++)
+ 		{
+ 			if (i != 0)
+ 				fputs(",", fout);
+ 			fprintf(fout, "%s", cont->aligns[(i) % cont->ncolumns] == 'r' ? ">l" : "<l");
+ 		}
+ 		fputs("\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 				break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 
+ 		/* print headers */
+ 		if (!opt_tuples_only)
+ 		{
+ 			for (ptr = cont->headers; *ptr; ptr++)
+ 			{
+ 				if (ptr != cont->headers)
+ 					fputs(" ", fout);
+ 				fputs("^l|", fout);
+ 				asciidoc_escaped_print(*ptr, fout);
+ 			}
+ 			fputs("\n", fout);
+ 		}
+ 	}
+ 
+ 	/* print cells */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 		}
+ 
+ 		if (i != 0)
+ 			fputs(" ", fout);
+ 		fputs("|", fout);
+ 
+ 		/* protect against needless spaces */
+ 		if (((*ptr)[strspn(*ptr, " \t")] == '\0'))
+ 		{
+ 			if ((i + 1) % cont->ncolumns != 0)
+ 			{
+ 				fputs(" ", fout);
+ 				continue;
+ 			}
+ 		}
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 
+ 		if ((i + 1) % cont->ncolumns == 0)
+ 			fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		printTableFooter *footers = footers_with_default(cont);
+ 
+ 		/* print footers */
+ 		if (!opt_tuples_only && footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned long record = cont->opt->prior_records + 1;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fputs("[cols=\"h,l\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 			break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 	}
+ 
+ 	/* print records */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 			if (!opt_tuples_only)
+ 				fprintf(fout,
+ 						"2+^|Record %lu\n",
+ 						record++);
+ 			else
+ 				fputs("2|\n", fout);
+ 		}
+ 
+ 		fputs("<l|", fout);
+ 		asciidoc_escaped_print(cont->headers[i % cont->ncolumns], fout);
+ 
+ 		fprintf(fout, " %s|", cont->aligns[i % cont->ncolumns] == 'r' ? ">" : "<");
+ 		/* is string only whitespace? */
+ 		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+ 			fputs(" ", fout);
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 		fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		/* print footers */
+ 		if (!opt_tuples_only && cont->footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = cont->footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
  
  /********************************/
  /* Public functions		*/
*************** printTable(const printTableContent *cont
*** 2873,2878 ****
--- 3096,3107 ----
  			else
  				print_troff_ms_text(cont, fout);
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			if (cont->opt->expanded == 1)
+ 				print_asciidoc_vertical(cont, fout);
+ 			else
+ 				print_asciidoc_text(cont, fout);
+ 			break;
  		default:
  			fprintf(stderr, _("invalid output format (internal error): %d"),
  					cont->opt->format);
*************** strlen_max_width(unsigned char *str, int
*** 3101,3103 ****
--- 3330,3334 ----
  
  	return str - start;
  }
+ 
+ 
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
new file mode 100644
index a1a89d0..a7eff99
*** a/src/bin/psql/print.h
--- b/src/bin/psql/print.h
*************** enum printFormat
*** 20,26 ****
  	PRINT_HTML,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
! 	PRINT_TROFF_MS
  	/* add your favourite output format here ... */
  };
  
--- 20,27 ----
  	PRINT_HTML,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
! 	PRINT_TROFF_MS,
! 	PRINT_ASCIIDOC
  	/* add your favourite output format here ... */
  };
  
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
new file mode 100644
index e39a07c..82653f7
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
*************** psql_completion(const char *text, int st
*** 3791,3797 ****
  		{
  			static const char *const my_list[] =
  			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
--- 3791,3797 ----
  		{
  			static const char *const my_list[] =
  			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", "asciidoc", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
new file mode 100644
index e87b82b..754606c
*** a/src/test/regress/expected/psql.out
--- b/src/test/regress/expected/psql.out
*************** execute q;
*** 2125,2127 ****
--- 2125,2333 ----
  +------------------+-------------------+
  
  deallocate q;
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none",grid="none"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 1
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 2
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="all",grid="all"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+  | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ [cols="h,l",frame="none",grid="none"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ |====
+ \pset border 1
+ execute q;
+ 
+ [cols="h,l",frame="none"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ |====
+ \pset border 2
+ execute q;
+ 
+ [cols="h,l",frame="all",grid="all"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <|11
+ <l|int >|11
+ |====
+ deallocate q;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
new file mode 100644
index 5ccc68f..fa1df8b
*** a/src/test/regress/sql/psql.sql
--- b/src/test/regress/sql/psql.sql
*************** execute q;
*** 276,278 ****
--- 276,303 ----
  execute q;
  
  deallocate q;
+ 
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ 
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ deallocate q;

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
new file mode 100644
index a637001..82a91ec
*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
*************** lo_import 152801
*** 2092,2099 ****
            <literal>aligned</literal>, <literal>wrapped</literal>,
            <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
!           <literal>latex-longtable</literal>, or
!           <literal>troff-ms</literal>.
            Unique abbreviations are allowed.  (That would mean one letter
            is enough.)
            </para>
--- 2092,2099 ----
            <literal>aligned</literal>, <literal>wrapped</literal>,
            <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
!           <literal>latex-longtable</literal>,
!           <literal>troff-ms</literal>, or <literal>asciidoc</literal>.
            Unique abbreviations are allowed.  (That would mean one letter
            is enough.)
            </para>
*************** lo_import 152801
*** 2120,2126 ****
  
            <para>
            The <literal>html</>, <literal>latex</>,
!           <literal>latex-longtable</literal>, and <literal>troff-ms</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
            language. They are not complete documents! This might not be
--- 2120,2127 ----
  
            <para>
            The <literal>html</>, <literal>latex</>,
!           <literal>latex-longtable</literal>, <literal>troff-ms</>,
!           and <literal>asciidoc</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
            language. They are not complete documents! This might not be
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
new file mode 100644
index 7c9f28d..a96f0ef
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
*************** _align2string(enum printFormat in)
*** 2257,2262 ****
--- 2257,2265 ----
  		case PRINT_TROFF_MS:
  			return "troff-ms";
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			return "asciidoc";
+ 			break;
  	}
  	return "unknown";
  }
*************** do_pset(const char *param, const char *v
*** 2330,2338 ****
  			popt->topt.format = PRINT_LATEX_LONGTABLE;
  		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
  			popt->topt.format = PRINT_TROFF_MS;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n");
  			return false;
  		}
  
--- 2333,2343 ----
  			popt->topt.format = PRINT_LATEX_LONGTABLE;
  		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
  			popt->topt.format = PRINT_TROFF_MS;
+ 		else if (pg_strncasecmp("asciidoc", value, vallen) == 0)
+ 			popt->topt.format = PRINT_ASCIIDOC;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms, asciidoc\n");
  			return false;
  		}
  
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
new file mode 100644
index ac0dc27..93a517e
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
*************** helpVariables(unsigned short int pager)
*** 351,357 ****
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
--- 351,357 ----
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, asciidoc ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
new file mode 100644
index ce0d05d..4a72bf0
*** a/src/bin/psql/print.c
--- b/src/bin/psql/print.c
*************** print_troff_ms_vertical(const printTable
*** 2476,2481 ****
--- 2476,2701 ----
  	}
  }
  
+ /*************************/
+ /* ASCIIDOC		 */
+ /*************************/
+ 
+ static void
+ asciidoc_escaped_print(const char *in, FILE *fout)
+ {
+ 	const char *p;
+ 	for (p = in; *p; p++)
+ 	{
+ 		switch(*p)
+ 		{
+ 			case '|':
+ 				fputs("\\|", fout);
+ 				break;
+ 			default:
+ 				fputc(*p, fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_text(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fputs("[options=\"header\",cols=\"", fout);
+ 		for(i = 0; i < cont->ncolumns; i++)
+ 		{
+ 			if (i != 0)
+ 				fputs(",", fout);
+ 			fprintf(fout, "%s", cont->aligns[(i) % cont->ncolumns] == 'r' ? ">l" : "<l");
+ 		}
+ 		fputs("\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 				break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 
+ 		/* print headers */
+ 		if (!opt_tuples_only)
+ 		{
+ 			for (ptr = cont->headers; *ptr; ptr++)
+ 			{
+ 				if (ptr != cont->headers)
+ 					fputs(" ", fout);
+ 				fputs("^l|", fout);
+ 				asciidoc_escaped_print(*ptr, fout);
+ 			}
+ 			fputs("\n", fout);
+ 		}
+ 	}
+ 
+ 	/* print cells */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 		}
+ 
+ 		if (i % cont->ncolumns != 0)
+ 			fputs(" ", fout);
+ 		fputs("|", fout);
+ 
+ 		/* protect against needless spaces */
+ 		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+ 		{
+ 			if ((i + 1) % cont->ncolumns != 0)
+ 				fputs(" ", fout);
+ 		}
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 
+ 		if ((i + 1) % cont->ncolumns == 0)
+ 			fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		printTableFooter *footers = footers_with_default(cont);
+ 
+ 		/* print footers */
+ 		if (!opt_tuples_only && footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned long record = cont->opt->prior_records + 1;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fputs("[cols=\"h,l\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 			break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 	}
+ 
+ 	/* print records */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 			if (!opt_tuples_only)
+ 				fprintf(fout,
+ 						"2+^|Record %lu\n",
+ 						record++);
+ 			else
+ 				fputs("2+|\n", fout);
+ 		}
+ 
+ 		fputs("<l|", fout);
+ 		asciidoc_escaped_print(cont->headers[i % cont->ncolumns], fout);
+ 
+ 		fprintf(fout, " %s|", cont->aligns[i % cont->ncolumns] == 'r' ? ">l" : "<l");
+ 		/* is string only whitespace? */
+ 		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+ 			fputs(" ", fout);
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 		fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		/* print footers */
+ 		if (!opt_tuples_only && cont->footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = cont->footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
  
  /********************************/
  /* Public functions		*/
*************** printTable(const printTableContent *cont
*** 2873,2878 ****
--- 3093,3104 ----
  			else
  				print_troff_ms_text(cont, fout);
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			if (cont->opt->expanded == 1)
+ 				print_asciidoc_vertical(cont, fout);
+ 			else
+ 				print_asciidoc_text(cont, fout);
+ 			break;
  		default:
  			fprintf(stderr, _("invalid output format (internal error): %d"),
  					cont->opt->format);
*************** strlen_max_width(unsigned char *str, int
*** 3101,3103 ****
--- 3327,3331 ----
  
  	return str - start;
  }
+ 
+ 
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
new file mode 100644
index a1a89d0..a7eff99
*** a/src/bin/psql/print.h
--- b/src/bin/psql/print.h
*************** enum printFormat
*** 20,26 ****
  	PRINT_HTML,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
! 	PRINT_TROFF_MS
  	/* add your favourite output format here ... */
  };
  
--- 20,27 ----
  	PRINT_HTML,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
! 	PRINT_TROFF_MS,
! 	PRINT_ASCIIDOC
  	/* add your favourite output format here ... */
  };
  
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
new file mode 100644
index e39a07c..82653f7
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
*************** psql_completion(const char *text, int st
*** 3791,3797 ****
  		{
  			static const char *const my_list[] =
  			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
--- 3791,3797 ----
  		{
  			static const char *const my_list[] =
  			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", "asciidoc", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
new file mode 100644
index e87b82b..7963ee5
*** a/src/test/regress/expected/psql.out
--- b/src/test/regress/expected/psql.out
*************** execute q;
*** 2125,2127 ****
--- 2125,2333 ----
  +------------------+-------------------+
  
  deallocate q;
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none",grid="none"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 1
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 2
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="all",grid="all"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ [cols="h,l",frame="none",grid="none"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ |====
+ \pset border 1
+ execute q;
+ 
+ [cols="h,l",frame="none"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ |====
+ \pset border 2
+ execute q;
+ 
+ [cols="h,l",frame="all",grid="all"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ |====
+ deallocate q;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
new file mode 100644
index 5ccc68f..fa1df8b
*** a/src/test/regress/sql/psql.sql
--- b/src/test/regress/sql/psql.sql
*************** execute q;
*** 276,278 ****
--- 276,303 ----
  execute q;
  
  deallocate q;
+ 
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ 
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ deallocate q;

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
new file mode 100644
index a637001..82a91ec
*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
*************** lo_import 152801
*** 2092,2099 ****
            <literal>aligned</literal>, <literal>wrapped</literal>,
            <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
!           <literal>latex-longtable</literal>, or
!           <literal>troff-ms</literal>.
            Unique abbreviations are allowed.  (That would mean one letter
            is enough.)
            </para>
--- 2092,2099 ----
            <literal>aligned</literal>, <literal>wrapped</literal>,
            <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
!           <literal>latex-longtable</literal>,
!           <literal>troff-ms</literal>, or <literal>asciidoc</literal>.
            Unique abbreviations are allowed.  (That would mean one letter
            is enough.)
            </para>
*************** lo_import 152801
*** 2120,2126 ****
  
            <para>
            The <literal>html</>, <literal>latex</>,
!           <literal>latex-longtable</literal>, and <literal>troff-ms</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
            language. They are not complete documents! This might not be
--- 2120,2127 ----
  
            <para>
            The <literal>html</>, <literal>latex</>,
!           <literal>latex-longtable</literal>, <literal>troff-ms</>,
!           and <literal>asciidoc</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
            language. They are not complete documents! This might not be
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
new file mode 100644
index 7c9f28d..a96f0ef
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
*************** _align2string(enum printFormat in)
*** 2257,2262 ****
--- 2257,2265 ----
  		case PRINT_TROFF_MS:
  			return "troff-ms";
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			return "asciidoc";
+ 			break;
  	}
  	return "unknown";
  }
*************** do_pset(const char *param, const char *v
*** 2330,2338 ****
  			popt->topt.format = PRINT_LATEX_LONGTABLE;
  		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
  			popt->topt.format = PRINT_TROFF_MS;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n");
  			return false;
  		}
  
--- 2333,2343 ----
  			popt->topt.format = PRINT_LATEX_LONGTABLE;
  		else if (pg_strncasecmp("troff-ms", value, vallen) == 0)
  			popt->topt.format = PRINT_TROFF_MS;
+ 		else if (pg_strncasecmp("asciidoc", value, vallen) == 0)
+ 			popt->topt.format = PRINT_ASCIIDOC;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms, asciidoc\n");
  			return false;
  		}
  
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
new file mode 100644
index ac0dc27..93a517e
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
*************** helpVariables(unsigned short int pager)
*** 351,357 ****
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
--- 351,357 ----
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, asciidoc ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
new file mode 100644
index 40e5098..c3f317e
*** a/src/bin/psql/print.c
--- b/src/bin/psql/print.c
*************** print_troff_ms_vertical(const printTable
*** 2487,2492 ****
--- 2487,2712 ----
  	}
  }
  
+ /*************************/
+ /* ASCIIDOC		 */
+ /*************************/
+ 
+ static void
+ asciidoc_escaped_print(const char *in, FILE *fout)
+ {
+ 	const char *p;
+ 	for (p = in; *p; p++)
+ 	{
+ 		switch(*p)
+ 		{
+ 			case '|':
+ 				fputs("\\|", fout);
+ 				break;
+ 			default:
+ 				fputc(*p, fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_text(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fprintf(fout, "[%scols=\"", !opt_tuples_only ? "options=\"header\"," : "");
+ 		for(i = 0; i < cont->ncolumns; i++)
+ 		{
+ 			if (i != 0)
+ 				fputs(",", fout);
+ 			fprintf(fout, "%s", cont->aligns[(i) % cont->ncolumns] == 'r' ? ">l" : "<l");
+ 		}
+ 		fputs("\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 				break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 
+ 		/* print headers */
+ 		if (!opt_tuples_only)
+ 		{
+ 			for (ptr = cont->headers; *ptr; ptr++)
+ 			{
+ 				if (ptr != cont->headers)
+ 					fputs(" ", fout);
+ 				fputs("^l|", fout);
+ 				asciidoc_escaped_print(*ptr, fout);
+ 			}
+ 			fputs("\n", fout);
+ 		}
+ 	}
+ 
+ 	/* print cells */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 		}
+ 
+ 		if (i % cont->ncolumns != 0)
+ 			fputs(" ", fout);
+ 		fputs("|", fout);
+ 
+ 		/* protect against needless spaces */
+ 		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+ 		{
+ 			if ((i + 1) % cont->ncolumns != 0)
+ 				fputs(" ", fout);
+ 		}
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 
+ 		if ((i + 1) % cont->ncolumns == 0)
+ 			fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		printTableFooter *footers = footers_with_default(cont);
+ 
+ 		/* print footers */
+ 		if (!opt_tuples_only && footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned long record = cont->opt->prior_records + 1;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fputs("[cols=\"h,l\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 			break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 	}
+ 
+ 	/* print records */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 			if (!opt_tuples_only)
+ 				fprintf(fout,
+ 						"2+^|Record %lu\n",
+ 						record++);
+ 			else
+ 				fputs("2+|\n", fout);
+ 		}
+ 
+ 		fputs("<l|", fout);
+ 		asciidoc_escaped_print(cont->headers[i % cont->ncolumns], fout);
+ 
+ 		fprintf(fout, " %s|", cont->aligns[i % cont->ncolumns] == 'r' ? ">l" : "<l");
+ 		/* is string only whitespace? */
+ 		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+ 			fputs(" ", fout);
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 		fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		/* print footers */
+ 		if (!opt_tuples_only && cont->footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = cont->footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
  
  /********************************/
  /* Public functions		*/
*************** printTable(const printTableContent *cont
*** 2884,2889 ****
--- 3104,3115 ----
  			else
  				print_troff_ms_text(cont, fout);
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			if (cont->opt->expanded == 1)
+ 				print_asciidoc_vertical(cont, fout);
+ 			else
+ 				print_asciidoc_text(cont, fout);
+ 			break;
  		default:
  			fprintf(stderr, _("invalid output format (internal error): %d"),
  					cont->opt->format);
*************** strlen_max_width(unsigned char *str, int
*** 3112,3114 ****
--- 3338,3342 ----
  
  	return str - start;
  }
+ 
+ 
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
new file mode 100644
index a1a89d0..a7eff99
*** a/src/bin/psql/print.h
--- b/src/bin/psql/print.h
*************** enum printFormat
*** 20,26 ****
  	PRINT_HTML,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
! 	PRINT_TROFF_MS
  	/* add your favourite output format here ... */
  };
  
--- 20,27 ----
  	PRINT_HTML,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
! 	PRINT_TROFF_MS,
! 	PRINT_ASCIIDOC
  	/* add your favourite output format here ... */
  };
  
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
new file mode 100644
index e39a07c..82653f7
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
*************** psql_completion(const char *text, int st
*** 3791,3797 ****
  		{
  			static const char *const my_list[] =
  			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
--- 3791,3797 ----
  		{
  			static const char *const my_list[] =
  			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", "asciidoc", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
new file mode 100644
index e87b82b..7963ee5
*** a/src/test/regress/expected/psql.out
--- b/src/test/regress/expected/psql.out
*************** execute q;
*** 2125,2127 ****
--- 2125,2333 ----
  +------------------+-------------------+
  
  deallocate q;
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none",grid="none"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 1
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 2
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="all",grid="all"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ [cols="h,l",frame="none",grid="none"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ |====
+ \pset border 1
+ execute q;
+ 
+ [cols="h,l",frame="none"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ |====
+ \pset border 2
+ execute q;
+ 
+ [cols="h,l",frame="all",grid="all"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ |====
+ deallocate q;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
new file mode 100644
index 5ccc68f..fa1df8b
*** a/src/test/regress/sql/psql.sql
--- b/src/test/regress/sql/psql.sql
*************** execute q;
*** 276,278 ****
--- 276,303 ----
  execute q;
  
  deallocate q;
+ 
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ 
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ deallocate q;

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
new file mode 100644
index a33e460..1f29615
*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
*************** lo_import 152801
*** 2090,2096 ****
            <para>
            Sets the output format to one of <literal>unaligned</literal>,
            <literal>aligned</literal>, <literal>wrapped</literal>,
!           <literal>html</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
            <literal>latex-longtable</literal>, or
            <literal>troff-ms</literal>.
--- 2090,2096 ----
            <para>
            Sets the output format to one of <literal>unaligned</literal>,
            <literal>aligned</literal>, <literal>wrapped</literal>,
!           <literal>html</literal>, <literal>asciidoc</literal>,
            <literal>latex</literal> (uses <literal>tabular</literal>),
            <literal>latex-longtable</literal>, or
            <literal>troff-ms</literal>.
*************** lo_import 152801
*** 2119,2125 ****
            </para>
  
            <para>
!           The <literal>html</>, <literal>latex</>,
            <literal>latex-longtable</literal>, and <literal>troff-ms</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
--- 2119,2125 ----
            </para>
  
            <para>
!           The <literal>html</>, <literal>asciidoc</>, <literal>latex</>,
            <literal>latex-longtable</literal>, and <literal>troff-ms</>
            formats put out tables that are intended to
            be included in documents using the respective mark-up
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
new file mode 100644
index e64c033..916f1c6
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
*************** _align2string(enum printFormat in)
*** 2249,2254 ****
--- 2249,2257 ----
  		case PRINT_HTML:
  			return "html";
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			return "asciidoc";
+ 			break;
  		case PRINT_LATEX:
  			return "latex";
  			break;
*************** do_pset(const char *param, const char *v
*** 2325,2330 ****
--- 2328,2335 ----
  			popt->topt.format = PRINT_WRAPPED;
  		else if (pg_strncasecmp("html", value, vallen) == 0)
  			popt->topt.format = PRINT_HTML;
+ 		else if (pg_strncasecmp("asciidoc", value, vallen) == 0)
+ 			popt->topt.format = PRINT_ASCIIDOC;
  		else if (pg_strncasecmp("latex", value, vallen) == 0)
  			popt->topt.format = PRINT_LATEX;
  		else if (pg_strncasecmp("latex-longtable", value, vallen) == 0)
*************** do_pset(const char *param, const char *v
*** 2333,2339 ****
  			popt->topt.format = PRINT_TROFF_MS;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n");
  			return false;
  		}
  
--- 2338,2344 ----
  			popt->topt.format = PRINT_TROFF_MS;
  		else
  		{
! 			psql_error("\\pset: allowed formats are unaligned, aligned, wrapped, html, asciidoc, latex, troff-ms\n");
  			return false;
  		}
  
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
new file mode 100644
index 2da444b..f58f5e5
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
*************** helpVariables(unsigned short int pager)
*** 351,357 ****
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
--- 351,357 ----
  	fprintf(output, _("  expanded (or x)    toggle expanded output\n"));
  	fprintf(output, _("  fieldsep           field separator for unaligned output (default '|')\n"));
  	fprintf(output, _("  fieldsep_zero      set field separator in unaligned mode to zero\n"));
! 	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"));
  	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
  	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
  	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
new file mode 100644
index 9c12dbe..e97b563
*** a/src/bin/psql/print.c
--- b/src/bin/psql/print.c
*************** print_html_vertical(const printTableCont
*** 1879,1884 ****
--- 1879,2105 ----
  
  
  /*************************/
+ /* ASCIIDOC		 */
+ /*************************/
+ 
+ static void
+ asciidoc_escaped_print(const char *in, FILE *fout)
+ {
+ 	const char *p;
+ 	for (p = in; *p; p++)
+ 	{
+ 		switch(*p)
+ 		{
+ 			case '|':
+ 				fputs("\\|", fout);
+ 				break;
+ 			default:
+ 				fputc(*p, fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_text(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fprintf(fout, "[%scols=\"", !opt_tuples_only ? "options=\"header\"," : "");
+ 		for(i = 0; i < cont->ncolumns; i++)
+ 		{
+ 			if (i != 0)
+ 				fputs(",", fout);
+ 			fprintf(fout, "%s", cont->aligns[(i) % cont->ncolumns] == 'r' ? ">l" : "<l");
+ 		}
+ 		fputs("\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 				break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 
+ 		/* print headers */
+ 		if (!opt_tuples_only)
+ 		{
+ 			for (ptr = cont->headers; *ptr; ptr++)
+ 			{
+ 				if (ptr != cont->headers)
+ 					fputs(" ", fout);
+ 				fputs("^l|", fout);
+ 				asciidoc_escaped_print(*ptr, fout);
+ 			}
+ 			fputs("\n", fout);
+ 		}
+ 	}
+ 
+ 	/* print cells */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 		}
+ 
+ 		if (i % cont->ncolumns != 0)
+ 			fputs(" ", fout);
+ 		fputs("|", fout);
+ 
+ 		/* protect against needless spaces */
+ 		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+ 		{
+ 			if ((i + 1) % cont->ncolumns != 0)
+ 				fputs(" ", fout);
+ 		}
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 
+ 		if ((i + 1) % cont->ncolumns == 0)
+ 			fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		printTableFooter *footers = footers_with_default(cont);
+ 
+ 		/* print footers */
+ 		if (!opt_tuples_only && footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
+ 
+ static void
+ print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
+ {
+ 	bool		opt_tuples_only = cont->opt->tuples_only;
+ 	unsigned short opt_border = cont->opt->border;
+ 	unsigned long record = cont->opt->prior_records + 1;
+ 	unsigned int i;
+ 	const char *const * ptr;
+ 
+ 	if (cancel_pressed)
+ 		return;
+ 
+ 	if (cont->opt->start_table)
+ 	{
+ 		/* print table in new paragraph - enforce preliminary new line */
+ 		fputs("\n", fout);
+ 
+ 		/* print title */
+ 		if (!opt_tuples_only && cont->title)
+ 		{
+ 			fputs(".", fout);
+ 			fputs(cont->title, fout);
+ 			fputs("\n", fout);
+ 		}
+ 
+ 		/* print table [] header definition */
+ 		fputs("[cols=\"h,l\"", fout);
+ 		switch (opt_border)
+ 		{
+ 			case 0:
+ 				fputs(",frame=\"none\",grid=\"none\"", fout);
+ 				break;
+ 			case 1:
+ 				fputs(",frame=\"none\"", fout);
+ 				break;
+ 			case 2:
+ 				fputs(",frame=\"all\",grid=\"all\"", fout);
+ 			break;
+ 		}
+ 		fputs("]\n", fout);
+ 		fputs("|====\n", fout);
+ 	}
+ 
+ 	/* print records */
+ 	for (i = 0, ptr = cont->cells; *ptr; i++, ptr++)
+ 	{
+ 		if (i % cont->ncolumns == 0)
+ 		{
+ 			if (cancel_pressed)
+ 				break;
+ 			if (!opt_tuples_only)
+ 				fprintf(fout,
+ 						"2+^|Record %lu\n",
+ 						record++);
+ 			else
+ 				fputs("2+|\n", fout);
+ 		}
+ 
+ 		fputs("<l|", fout);
+ 		asciidoc_escaped_print(cont->headers[i % cont->ncolumns], fout);
+ 
+ 		fprintf(fout, " %s|", cont->aligns[i % cont->ncolumns] == 'r' ? ">l" : "<l");
+ 		/* is string only whitespace? */
+ 		if ((*ptr)[strspn(*ptr, " \t")] == '\0')
+ 			fputs(" ", fout);
+ 		else
+ 			asciidoc_escaped_print(*ptr, fout);
+ 		fputs("\n", fout);
+ 	}
+ 
+ 	fputs("|====\n", fout);
+ 
+ 	if (cont->opt->stop_table)
+ 	{
+ 		/* print footers */
+ 		if (!opt_tuples_only && cont->footers != NULL && !cancel_pressed)
+ 		{
+ 			printTableFooter *f;
+ 
+ 			fputs("\n....\n", fout);
+ 			for (f = cont->footers; f; f = f->next)
+ 			{
+ 				fputs(f->data, fout);
+ 				fputs("\n", fout);
+ 			}
+ 			fputs("....\n", fout);
+ 		}
+ 	}
+ }
+ 
+ /*************************/
  /* LaTeX				 */
  /*************************/
  
*************** printTable(const printTableContent *cont
*** 2872,2877 ****
--- 3093,3104 ----
  			else
  				print_html_text(cont, fout);
  			break;
+ 		case PRINT_ASCIIDOC:
+ 			if (cont->opt->expanded == 1)
+ 				print_asciidoc_vertical(cont, fout);
+ 			else
+ 				print_asciidoc_text(cont, fout);
+ 			break;
  		case PRINT_LATEX:
  			if (cont->opt->expanded == 1)
  				print_latex_vertical(cont, fout);
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
new file mode 100644
index 66cdaf3..322db4d
*** a/src/bin/psql/print.h
--- b/src/bin/psql/print.h
*************** enum printFormat
*** 18,23 ****
--- 18,24 ----
  	PRINT_ALIGNED,
  	PRINT_WRAPPED,
  	PRINT_HTML,
+ 	PRINT_ASCIIDOC,
  	PRINT_LATEX,
  	PRINT_LATEX_LONGTABLE,
  	PRINT_TROFF_MS
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
new file mode 100644
index e39a07c..dfcb66b
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
*************** psql_completion(const char *text, int st
*** 3790,3797 ****
  		if (strcmp(prev_wd, "format") == 0)
  		{
  			static const char *const my_list[] =
! 			{"unaligned", "aligned", "wrapped", "html", "latex",
! 			"troff-ms", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
--- 3790,3797 ----
  		if (strcmp(prev_wd, "format") == 0)
  		{
  			static const char *const my_list[] =
! 			{"unaligned", "aligned", "wrapped", "html", "asciidoc",
! 			"latex", "latex-longtable", "troff-ms", NULL};
  
  			COMPLETE_WITH_LIST_CS(my_list);
  		}
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
new file mode 100644
index a2a2615..6ff9be1
*** a/src/test/regress/expected/psql.out
--- b/src/test/regress/expected/psql.out
*************** execute q;
*** 2126,2128 ****
--- 2126,2334 ----
  +------------------+-------------------+
  
  deallocate q;
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none",grid="none"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 1
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="none"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset border 2
+ execute q;
+ 
+ [options="header",cols="<l,<l,>l",frame="all",grid="all"]
+ |====
+ ^l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ ^l|0123456789 ^l|int
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ | \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (& |11 |11
+ |====
+ 
+ ....
+ (10 rows)
+ ....
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ [cols="h,l",frame="none",grid="none"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ |====
+ \pset border 1
+ execute q;
+ 
+ [cols="h,l",frame="none"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ |====
+ \pset border 2
+ execute q;
+ 
+ [cols="h,l",frame="all",grid="all"]
+ |====
+ 2+^|Record 1
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 2
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 3
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 4
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 5
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 6
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 7
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 8
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 9
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ 2+^|Record 10
+ <l| \| -- \| 012345678 9abc def!*@#&!@(*&*~~_+-=\ \ <l| \| = \| lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&
+ <l|0123456789 <l|11
+ <l|int >l|11
+ |====
+ deallocate q;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
new file mode 100644
index 5ccc68f..fa1df8b
*** a/src/test/regress/sql/psql.sql
--- b/src/test/regress/sql/psql.sql
*************** execute q;
*** 276,278 ****
--- 276,303 ----
  execute q;
  
  deallocate q;
+ 
+ prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
+ 
+ \pset format asciidoc
+ \pset expanded off
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ \pset expanded on
+ \pset border 0
+ execute q;
+ 
+ \pset border 1
+ execute q;
+ 
+ \pset border 2
+ execute q;
+ 
+ deallocate q;