From 3f924fa5891d79e6d1b7d7918ea158cd233e0466 Mon Sep 17 00:00:00 2001
From: Mark Hansen <mark@markhansen.co.nz>
Date: Sun, 7 Jun 2020 19:24:25 +1000
Subject: [PATCH] Move caption to top of table.

Caption is required to be just after the table element.

Upstreaming
https://gitlab.com/graphviz/graphviz.gitlab.io/-/merge_requests/121
---
 doc/info/attrs.html | 6 +++---
 doc/infosrc/types   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/info/attrs.html b/doc/info/attrs.html
index dfb040476..e234164aa 100644
--- a/doc/info/attrs.html
+++ b/doc/info/attrs.html
@@ -2561,6 +2561,7 @@ enclosed in the parentheses,  <TT>(...)+</TT> indicates 1 or more, and
   Examples of linear and radial gradient fill can be seen under  <A HREF=#k:colorList>colorList</A>.
   <P>
     <TABLE border=1>
+      <CAPTION>Basic style settings for nodes</CAPTION>
       <TR><TD align="center"><tt>solid</tt> <TD><IMG SRC="n_solid.png">
          <TD align="center"><tt>dashed</tt> <TD><IMG SRC="n_dashed.png">
          <TD align="center"><tt>dotted</tt> <TD><IMG SRC="n_dotted.png"> </TR>
@@ -2570,18 +2571,18 @@ enclosed in the parentheses,  <TT>(...)+</TT> indicates 1 or more, and
       <TR><TD align="center"><tt>filled</tt> <TD><IMG SRC="n_filled.png">
          <TD align="center"><tt>striped</tt> <TD><IMG SRC="n_striped.png">
          <TD align="center"><tt>wedged</tt> <TD><IMG SRC="n_wedged.png"></TR>
-      <CAPTION>Basic style settings for nodes</CAPTION>
     </TABLE>
   <P>
     <TABLE border=1>
+      <CAPTION>Basic style settings for edges</CAPTION>
       <TR><TD align="center"><tt>solid</tt> <TD><IMG SRC="e_solid.png"> 
           <TD align="center"><tt>dashed</tt> <TD><IMG SRC="e_dashed.png"> </TR>
       <TR><TD align="center"><tt>dotted</tt> <TD><IMG SRC="e_dotted.png">
           <TD align="center"><tt>bold</tt> <TD><IMG SRC="e_bold.png"></TR> <TR>
-      <CAPTION>Basic style settings for edges</CAPTION>
     </TABLE>
   <P>
     <TABLE border=1>
+      <CAPTION>Basic style settings for clusters</CAPTION>
       <TR><TD align="center"><tt>solid</tt> <TD><IMG SRC="c_solid.png"> 
           <TD align="center"><tt>dashed</tt> <TD><IMG SRC="c_dashed.png">
           <TD align="center"><tt>dotted</tt> <TD><IMG SRC="c_dotted.png">
@@ -2589,7 +2590,6 @@ enclosed in the parentheses,  <TT>(...)+</TT> indicates 1 or more, and
       <TR><TD align="center"><tt>rounded</tt> <TD><IMG SRC="c_rounded.png">
           <TD align="center"><tt>filled</tt> <TD><IMG SRC="c_filled.png">
           <TD align="center"><tt>striped</tt> <TD><IMG SRC="c_striped.png"></TR>
-      <CAPTION>Basic style settings for clusters</CAPTION>
     </TABLE>
   <P>
   The effect of <tt>style=tapered</tt> depends on the <A HREF=#d:penwidth>penwidth</A>,
diff --git a/doc/infosrc/types b/doc/infosrc/types
index 14e7ed7fc..c40cf50e1 100644
--- a/doc/infosrc/types
+++ b/doc/infosrc/types
@@ -370,6 +370,7 @@ Examples of tapered line styles are given below.
 Examples of linear and radial gradient fill can be seen under  <A HREF=#k:colorList>colorList</A>.
 <P>
   <TABLE border=1>
+    <CAPTION>Basic style settings for nodes</CAPTION>
     <TR><TD align="center"><tt>solid</tt> <TD><IMG SRC="n_solid.png">
        <TD align="center"><tt>dashed</tt> <TD><IMG SRC="n_dashed.png">
        <TD align="center"><tt>dotted</tt> <TD><IMG SRC="n_dotted.png"> </TR>
@@ -379,18 +380,18 @@ Examples of linear and radial gradient fill can be seen under  <A HREF=#k:colorL
     <TR><TD align="center"><tt>filled</tt> <TD><IMG SRC="n_filled.png">
        <TD align="center"><tt>striped</tt> <TD><IMG SRC="n_striped.png">
        <TD align="center"><tt>wedged</tt> <TD><IMG SRC="n_wedged.png"></TR>
-    <CAPTION>Basic style settings for nodes</CAPTION>
   </TABLE>
 <P>
   <TABLE border=1>
+    <CAPTION>Basic style settings for edges</CAPTION>
     <TR><TD align="center"><tt>solid</tt> <TD><IMG SRC="e_solid.png"> 
         <TD align="center"><tt>dashed</tt> <TD><IMG SRC="e_dashed.png"> </TR>
     <TR><TD align="center"><tt>dotted</tt> <TD><IMG SRC="e_dotted.png">
         <TD align="center"><tt>bold</tt> <TD><IMG SRC="e_bold.png"></TR> <TR>
-    <CAPTION>Basic style settings for edges</CAPTION>
   </TABLE>
 <P>
   <TABLE border=1>
+    <CAPTION>Basic style settings for clusters</CAPTION>
     <TR><TD align="center"><tt>solid</tt> <TD><IMG SRC="c_solid.png"> 
         <TD align="center"><tt>dashed</tt> <TD><IMG SRC="c_dashed.png">
         <TD align="center"><tt>dotted</tt> <TD><IMG SRC="c_dotted.png">
@@ -398,7 +399,6 @@ Examples of linear and radial gradient fill can be seen under  <A HREF=#k:colorL
     <TR><TD align="center"><tt>rounded</tt> <TD><IMG SRC="c_rounded.png">
         <TD align="center"><tt>filled</tt> <TD><IMG SRC="c_filled.png">
         <TD align="center"><tt>striped</tt> <TD><IMG SRC="c_striped.png"></TR>
-    <CAPTION>Basic style settings for clusters</CAPTION>
   </TABLE>
 <P>
 The effect of <tt>style=tapered</tt> depends on the <A HREF=#d:penwidth>penwidth</A>,
-- 
2.40.0