@@ -1610,9 +1610,14 @@ Four kinds of tables may be used. The first three kinds presuppose the use of
16101610a fixed-width font, such as Courier. The fourth kind can be used with
16111611proportionally spaced fonts, as it does not require lining up columns.
16121612
1613−### Simple tables ###
1613+### Extension: `table_captions` ###
16141614
1615−#### Extension: `simple_tables`, `table_captions` ####
1615+A caption may optionally be provided with all 4 kinds of tables (as
1616+illustrated in the examples below). A caption is a paragraph beginning
1617+with the string `Table:` (or just `:`), which will be stripped off.
1618+It may appear either before or after the table.
1619+
1620+### Extension: `simple_tables` ###
16161621
16171622Simple tables look like this:
16181623
@@ -1641,10 +1646,7 @@ to the dashed line below it:[^4]
16411646 [Markdown discussion list](http://six.pairlist.net/pipermail/markdown-discuss/2005-March/001097.html).
16421647
16431648The table must end with a blank line, or a line of dashes followed by
1644−a blank line. A caption may optionally be provided (as illustrated in
1645−the example above). A caption is a paragraph beginning with the string
1646−`Table:` (or just `:`), which will be stripped off. It may appear either
1647−before or after the table.
1649+a blank line.
16481650
16491651The column headers may be omitted, provided a dashed line is used
16501652to end the table. For example:
@@ -1659,9 +1661,7 @@ When headers are omitted, column alignments are determined on the basis
16591661of the first line of the table body. So, in the tables above, the columns
16601662would be right, left, center, and right aligned, respectively.
16611663
1662−### Multiline tables ###
1663−
1664−#### Extension: `multiline_tables`, `table_captions` ####
1664+### Extension: `multiline_tables` ###
16651665
16661666Multiline tables allow headers and table rows to span multiple lines
16671667of text (but cells that span multiple columns or rows of the table are
@@ -1711,9 +1711,7 @@ It is possible for a multiline table to have just one row, but the row
17111711should be followed by a blank line (and then the row of dashes that ends
17121712the table), or the table may be interpreted as a simple table.
17131713
1714−### Grid tables ###
1715−
1716−#### Extension: `grid_tables`, `table_captions` ####
1714+### Extension: `grid_tables` ###
17171715
17181716Grid tables look like this:
17191717
@@ -1737,9 +1735,7 @@ columns or rows. Grid tables can be created easily using [Emacs table mode].
17371735
17381736 [Emacs table mode]: http://table.sourceforge.net/
17391737
1740−### Pipe tables ###
1741−
1742−#### Extension: `pipe_tables`, `table_captions` ####
1738+### Extension: `pipe_tables` ###
17431739
17441740Pipe tables look like this:
17451741
@@ -1749,7 +1745,7 @@ Pipe tables look like this:
17491745 | 123 | 123 | 123 | 123 |
17501746 | 1 | 1 | 1 | 1 |
17511747
1752− : Demonstration of simple table syntax.
1748+ : Demonstration of pipe table syntax.
17531749
17541750The syntax is [the same as in PHP markdown extra]. The beginning and
17551751ending pipe characters are optional, but pipes are required between all
@@ -1785,8 +1781,8 @@ The difference is that `+` is used instead of `|`. Other orgtbl features
17851781are not supported. In particular, to get non-default column alignment,
17861782you'll need to add colons as above.
17871783
1788−Title block
1789−-----------
1784+Metadata blocks
1785+---------------
17901786
17911787### Extension: `pandoc_title_block` ###
17921788
@@ -1864,9 +1860,6 @@ will also have "Pandoc User Manuals" in the footer.
18641860
18651861will also have "Version 4.0" in the header.
18661862
1867−YAML metadata block
1868−-------------------
1869−
18701863### Extension: `yaml_metadata_block` ###
18711864
18721865A YAML metadata block is a valid YAML object, delimited by a line of three
@@ -2386,9 +2379,7 @@ The link text will be used as the image's alt text:
23862379
23872380 [movie reel]: movie.gif
23882381
2389−### Pictures with captions ###
2390−
2391−#### Extension: `implicit_figures` ####
2382+### Extension: `implicit_figures` ###
23922383
23932384An image occurring by itself in a paragraph will be rendered as
23942385a figure with a caption.[^5] (In LaTeX, a figure environment will be