[gnumeric] add more elements to xlsx_chart_dtd

[Andreas J. Guelzow <guelzow src gnome org>]

commit 90a2eb09176c8835bb57af286d86a59cf8afc8b6
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon Aug 5 15:50:45 2013 -0600

    add more elements to xlsx_chart_dtd
    
    2013-08-03  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * xlsx-read-drawing.c (xlsx_chart_dtd): add more elements

 plugins/excel/ChangeLog           |    6 +++++-
 plugins/excel/xlsx-read-drawing.c |   21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index edbd6fd..7f945e7 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,6 +1,10 @@
 2013-08-03  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-       *  ms-excel-read.c (excel_read_LABEL): check for NULL fd
+       * xlsx-read-drawing.c (xlsx_chart_dtd): add more elements
+
+2013-08-03  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * ms-excel-read.c (excel_read_LABEL): check for NULL fd
 
 2013-08-02  Jean Brefort  <jean brefort normalesup org>
 
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index f68fe98..b41b612 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -1510,6 +1510,8 @@ static GsfXMLInNode const xlsx_chart_dtd[] =
 {
 GSF_XML_IN_NODE_FULL (START, START, -1, NULL, GSF_XML_NO_CONTENT, FALSE, TRUE, NULL, NULL, 0),
 GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_CONTENT, FALSE, TRUE, NULL, 
NULL, 0),
+  GSF_XML_IN_NODE (CHART_SPACE, DATE1904, XL_NS_CHART, "date1904", GSF_XML_NO_CONTENT, NULL, NULL),
+  GSF_XML_IN_NODE (CHART_SPACE, ROUNDEDCORNERS, XL_NS_CHART, "roundedCorners", GSF_XML_NO_CONTENT, NULL, 
NULL),
   GSF_XML_IN_NODE (CHART_SPACE, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (SHAPE_PR, SP_XFRM, XL_NS_DRAW, "xfrm", GSF_XML_NO_CONTENT, NULL, NULL),
       GSF_XML_IN_NODE (SP_XFRM, SP_XFRM_OFF, XL_NS_DRAW, "off", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -1570,6 +1572,7 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
   GSF_XML_IN_NODE (CHART_SPACE, TEXT_PR, XL_NS_CHART, "txPr", GSF_XML_NO_CONTENT, NULL, NULL),         /* 
2nd Def */
 
   GSF_XML_IN_NODE (CHART_SPACE, CHART, XL_NS_CHART, "chart", GSF_XML_NO_CONTENT, NULL, NULL),
+    GSF_XML_IN_NODE (CHART, SHOW_DBLS_OVER_MAX, XL_NS_CHART, "showDLblsOverMax", GSF_XML_NO_CONTENT, NULL, 
NULL),
     GSF_XML_IN_NODE (CHART, PLOTAREA, XL_NS_CHART, "plotArea", GSF_XML_NO_CONTENT, &xlsx_plot_area, 
&xlsx_chart_pop),
       GSF_XML_IN_NODE (PLOTAREA, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),       /* 
2nd Def */
       GSF_XML_IN_NODE_FULL (PLOTAREA, CAT_AXIS, XL_NS_CHART, "catAx", GSF_XML_NO_CONTENT, FALSE, TRUE,
@@ -1707,10 +1710,28 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
         GSF_XML_IN_NODE (LAYOUT, MAN_LAYOUT, XL_NS_CHART, "manualLayout", GSF_XML_NO_CONTENT, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, SCATTER, XL_NS_CHART, "scatterChart", GSF_XML_NO_CONTENT, xlsx_chart_xy, 
&xlsx_plot_end),
+        GSF_XML_IN_NODE (SCATTER, VARYCOLORS, XL_NS_CHART,     "varyColors", GSF_XML_NO_CONTENT, NULL, NULL),
+        GSF_XML_IN_NODE (SCATTER, SCATTER_DLBLS, XL_NS_CHART,  "dLbls", GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (SCATTER_DLBLS, SCATTER_DLBLS_LEGEND, XL_NS_CHART,   "showLegendKey", 
GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (SCATTER_DLBLS, SCATTER_DLBLS_VAL, XL_NS_CHART,      "showVal", 
GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (SCATTER_DLBLS, SCATTER_DLBLS_CAT_NAME, XL_NS_CHART, "showCatName", 
GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (SCATTER_DLBLS, SCATTER_DLBLS_SERIES_NAME, XL_NS_CHART,      "showSerName", 
GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (SCATTER_DLBLS, SCATTER_DLBLS_PERCENT, XL_NS_CHART,  "showPercent", 
GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (SCATTER_DLBLS, SCATTER_DLBLS_BUBBLE, XL_NS_CHART,   "showBubbleSize", 
GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (SCATTER, SCATTER_STYLE, XL_NS_CHART,  "scatterStyle", GSF_XML_NO_CONTENT, 
&xlsx_scatter_style, NULL),
         GSF_XML_IN_NODE (SCATTER, PLOT_AXIS_ID, XL_NS_CHART,           "axId", GSF_XML_NO_CONTENT, 
&xlsx_plot_axis_id, NULL),
 
         GSF_XML_IN_NODE (SCATTER, SERIES, XL_NS_CHART, "ser", GSF_XML_NO_CONTENT, &xlsx_chart_ser_start, 
&xlsx_chart_ser_end),
+          GSF_XML_IN_NODE (SERIES, SERIES_TRENDLINE, XL_NS_CHART,      "trendline", GSF_XML_NO_CONTENT, 
NULL, NULL),
+            GSF_XML_IN_NODE (SERIES_TRENDLINE, SERIES_TRENDLINE_TYPE, XL_NS_CHART,     "trendlineType", 
GSF_XML_NO_CONTENT, NULL, NULL),
+            GSF_XML_IN_NODE (SERIES_TRENDLINE, SERIES_TRENDLINE_RSQR, XL_NS_CHART,     "dispRSqr", 
GSF_XML_NO_CONTENT, NULL, NULL),
+            GSF_XML_IN_NODE (SERIES_TRENDLINE, SERIES_TRENDLINE_EQ, XL_NS_CHART,       "dispEq", 
GSF_XML_NO_CONTENT, NULL, NULL),
+            GSF_XML_IN_NODE (SERIES_TRENDLINE, SERIES_TRENDLINE_LABEL, XL_NS_CHART,    "trendlineLbl", 
GSF_XML_NO_CONTENT, NULL, NULL),
+              GSF_XML_IN_NODE (SERIES_TRENDLINE_LABEL, SERIES_TRENDLINE_LABEL_LAYOUT, XL_NS_CHART, "layout", 
GSF_XML_NO_CONTENT, NULL, NULL),
+              GSF_XML_IN_NODE (SERIES_TRENDLINE_LABEL_LAYOUT, SERIES_TRENDLINE_LABEL_LAYOUT_MANUAL, 
XL_NS_CHART, "manualLayout", GSF_XML_NO_CONTENT, NULL, NULL),
+                GSF_XML_IN_NODE (SERIES_TRENDLINE_LABEL_LAYOUT_MANUAL, 
SERIES_TRENDLINE_LABEL_LAYOUT_MANUAL_X, XL_NS_CHART, "x", GSF_XML_NO_CONTENT, NULL, NULL),
+                GSF_XML_IN_NODE (SERIES_TRENDLINE_LABEL_LAYOUT_MANUAL, 
SERIES_TRENDLINE_LABEL_LAYOUT_MANUAL_Y, XL_NS_CHART, "y", GSF_XML_NO_CONTENT, NULL, NULL),
+              GSF_XML_IN_NODE (SERIES_TRENDLINE_LABEL, SERIES_TRENDLINE_LABEL_FORMAT, XL_NS_CHART, "numFmt", 
GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (SERIES, SERIES_IDX, XL_NS_CHART,    "idx", GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (SERIES, SERIES_ORDER, XL_NS_CHART,  "order", GSF_XML_NO_CONTENT, NULL, NULL),