From 886faa3cbcf1840e024bb9c146ff38f8f202b757 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Tue, 29 Dec 2020 12:48:55 -0800
Subject: [PATCH] Bump to 2.11.3.2, update changelog and man page

---
 AUTHORS.md   |  3 +++
 MANUAL.txt   |  2 +-
 changelog.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/pandoc.1 |  9 +++++----
 pandoc.cabal |  2 +-
 5 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index ce4a357dc..f7be02865 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -128,6 +128,7 @@
 - Jens Getreu
 - Jens Petersen
 - Jeroen de Haas
+- Jerry Sky
 - Jesse Rosenthal
 - Joe Hermaszewski
 - Joe Hillenbrand
@@ -302,6 +303,8 @@
 - TEC
 - tgkokk
 - the-solipsist
+- timo-a
 - thsutton
 - vijayphoenix
 - wiefling
+- wuffi
diff --git a/MANUAL.txt b/MANUAL.txt
index 65da99484..b1f0f305c 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -1,7 +1,7 @@
 ---
 title: Pandoc User's Guide
 author: John MacFarlane
-date: December 17, 2020
+date: December 29, 2020
 ---
 
 # Synopsis
diff --git a/changelog.md b/changelog.md
index f6a6d18db..6fada3e95 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,59 @@
 # Revision history for pandoc
 
+## pandoc 2.11.3.2 (2020-12-29)
+
+  * HTML reader: use renderTags' from Text.Pandoc.Shared (Albert Krewinkel).
+    A side effect of this change is that empty `<col>` elements are written
+    as self-closing tags in raw HTML blocks.
+
+  * Asciidoc writer: Add support for writing nested tables (#6972, timo-a).
+    Asciidoc supports one level of nesting. If deeper tables are to be
+    written, they are omitted and a warning is issued.
+
+  * Docx writer: fix nested tables with captions (#6983).
+    Previously we got unreadable content, because docx seems
+    to want a `<w:p>` element (even an empty one) at the end of
+    every table cell.
+
+  * Powerpoint writer: allow arbitrary OOXML in raw inline elements
+    (Albert Krewinkel).  The raw text is now included verbatim in the
+    output. Previously is was parsed into XML elements, which prevented
+    the inclusion of partial XML snippets.
+
+  * LaTeX writer: support colspans and rowspans in tables (#6950,
+    Albert Krewinkel).  Note that the multirow package is needed for
+    rowspans.  It is included in the latex template under a variable,
+    so that it won't be used unless needed for a table.
+
+  * HTML writer: don't include p tags in CSL bibliography entries
+    (#6966).  Fixes a regression in 2.11.3.
+
+  * Add `meta-description` variable to HTML templates (#6982). This
+    is populated by the writer by stringifying the `description`
+    field of metadata (Jerry Sky).  The `description` meta tag will
+    make the generated HTML documents more complete and SEO-friendly.
+
+  * Citeproc: fix handling of empty URL variables (`DOI`, etc.).
+    The `linkifyVariables` function was changing these to links
+    which then got treated as non-empty by citeproc, leading
+    to wrong results (e.g. ignoring nonempty URL when empty DOI is present).
+    See jgm/citeproc#41.
+
+  * Use citeproc 0.3.0.3.  Fixes an issue in author-only citations when
+    both an author and translator are present, and an issue with
+    citation group delimiters.
+
+  * Require texmath 0.12.1.  This improves siunitx support in math,
+    fixes bugs with `\*mod` family operators and arrays, and avoids
+    italicizing symbols and operator names in docx output.
+
+  * Ensure that the perl interpreter used for filters with `.pl`
+    extension (wuffi).
+
+  * MANUAL: note that textarea content is never parsed as Markdown
+    (Albert Krewinkel).
+
+
 ## pandoc 2.11.3.1 (2020-12-18)
 
   * Added some missing files to extra-source-files and data
diff --git a/man/pandoc.1 b/man/pandoc.1
index 0e661fb38..8af64c17b 100644
--- a/man/pandoc.1
+++ b/man/pandoc.1
@@ -1,7 +1,7 @@
 '\" t
-.\" Automatically generated by Pandoc 2.11.3
+.\" Automatically generated by Pandoc 2.11.3.1
 .\"
-.TH "Pandoc User\[cq]s Guide" "" "December 17, 2020" "pandoc 2.11.3.1" ""
+.TH "Pandoc User\[cq]s Guide" "" "December 29, 2020" "pandoc 2.11.3.2" ""
 .hy
 .SH NAME
 pandoc - general markup converter
@@ -5166,8 +5166,9 @@ into
 .PP
 whereas \f[C]Markdown.pl\f[R] will preserve it as is.
 .PP
-There is one exception to this rule: text between \f[C]<script>\f[R] and
-\f[C]<style>\f[R] tags is not interpreted as Markdown.
+There is one exception to this rule: text between \f[C]<script>\f[R],
+\f[C]<style>\f[R], and \f[C]<textarea>\f[R] tags is not interpreted as
+Markdown.
 .PP
 This departure from standard Markdown should make it easier to mix
 Markdown with HTML block elements.
diff --git a/pandoc.cabal b/pandoc.cabal
index 410905b47..794eef91d 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,6 +1,6 @@
 cabal-version:   2.2
 name:            pandoc
-version:         2.11.3.1
+version:         2.11.3.2
 build-type:      Simple
 license:         GPL-2.0-or-later
 license-file:    COPYING.md