[gnumeric] xlsx: more grammar.

[Morten Welinder <mortenw src gnome org>]

commit e3f3f58ffca5890938170af6374637e8998ff166
Author: Morten Welinder <terra gnome org>
Date:   Mon Apr 20 13:34:20 2015 -0400

    xlsx: more grammar.

 plugins/excel/xlsx-read-drawing.c |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 9a5f1c4..8b5c7c3 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -2518,13 +2518,13 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
 
       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, VARY_COLORS, XL_NS_CHART,    "varyColors", GSF_XML_NO_CONTENT, 
&xlsx_chart_vary_colors, 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, PLOT_DLBLS, XL_NS_CHART,     "dLbls", GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (PLOT_DLBLS, PLOT_DLBLS_LEGEND, XL_NS_CHART, "showLegendKey", GSF_XML_NO_CONTENT, 
NULL, NULL),
+          GSF_XML_IN_NODE (PLOT_DLBLS, PLOT_DLBLS_VAL, XL_NS_CHART,    "showVal", GSF_XML_NO_CONTENT, NULL, 
NULL),
+          GSF_XML_IN_NODE (PLOT_DLBLS, PLOT_DLBLS_CAT_NAME, XL_NS_CHART,       "showCatName", 
GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (PLOT_DLBLS, PLOT_DLBLS_SERIES_NAME, XL_NS_CHART,    "showSerName", 
GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (PLOT_DLBLS, PLOT_DLBLS_PERCENT, XL_NS_CHART,        "showPercent", 
GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (PLOT_DLBLS, PLOT_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),
 
@@ -2639,6 +2639,7 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
         GSF_XML_IN_NODE (BUBBLE, BUBBLE_NEGATIVES, XL_NS_CHART,        "showNegBubbles", GSF_XML_NO_CONTENT, 
NULL, NULL),
         GSF_XML_IN_NODE (BUBBLE, BUBBLE_SIZE_REP, XL_NS_CHART, "sizeRepresents", GSF_XML_NO_CONTENT, NULL, 
NULL),
         GSF_XML_IN_NODE (BUBBLE, VARY_COLORS, XL_NS_CHART,     "varyColors", GSF_XML_2ND, NULL, NULL),
+       GSF_XML_IN_NODE (BUBBLE, PLOT_DLBLS,    XL_NS_CHART, "dLbls", GSF_XML_2ND, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, BARCOL, XL_NS_CHART,  "barChart", GSF_XML_NO_CONTENT, &xlsx_chart_bar, 
&xlsx_plot_end),
         GSF_XML_IN_NODE (BARCOL, VARY_COLORS, XL_NS_CHART, "varyColors", GSF_XML_2ND, NULL, NULL),
@@ -2648,6 +2649,7 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
         GSF_XML_IN_NODE (BARCOL, BARCOL_OVERLAP, XL_NS_CHART,"overlap", GSF_XML_NO_CONTENT, 
&xlsx_chart_bar_overlap, NULL),
         GSF_XML_IN_NODE (BARCOL, GROUPING,     XL_NS_CHART, "grouping", GSF_XML_NO_CONTENT, 
&xlsx_chart_bar_group, NULL),
         GSF_XML_IN_NODE (BARCOL, GAP_WIDTH,    XL_NS_CHART, "gapWidth", GSF_XML_NO_CONTENT, 
&xlsx_chart_bar_gap, NULL),
+       GSF_XML_IN_NODE (BARCOL, PLOT_DLBLS,    XL_NS_CHART, "dLbls", GSF_XML_2ND, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, LINE, XL_NS_CHART,    "lineChart", GSF_XML_NO_CONTENT, &xlsx_chart_line, 
&xlsx_plot_end),
         GSF_XML_IN_NODE (LINE, VARY_COLORS, XL_NS_CHART, "varyColors", GSF_XML_2ND, NULL, NULL),
@@ -2656,6 +2658,8 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
           GSF_XML_IN_NODE (SERIES, MARKER, XL_NS_CHART,        "marker", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (LINE, GROUPING, XL_NS_CHART,  "grouping", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (LINE, LINE_MARKER, XL_NS_CHART, "marker", GSF_XML_NO_CONTENT, 
&xlsx_chart_line_marker, NULL),
+        GSF_XML_IN_NODE (LINE, LINE_SMOOTH, XL_NS_CHART, "smooth", GSF_XML_NO_CONTENT, NULL, NULL),
+        GSF_XML_IN_NODE (LINE, PLOT_DLBLS, XL_NS_CHART,        "dLbls", GSF_XML_2ND, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, AREA, XL_NS_CHART,    "areaChart", GSF_XML_NO_CONTENT, &xlsx_chart_area, 
&xlsx_plot_end),
         GSF_XML_IN_NODE (AREA, PLOT_AXIS_ID, XL_NS_CHART,"axId", GSF_XML_2ND, NULL, NULL),
@@ -2668,12 +2672,14 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
         GSF_XML_IN_NODE (RADAR, SERIES, XL_NS_CHART,     "ser", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (RADAR, RADAR_STYLE, XL_NS_CHART, "radarStyle", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (RADAR, VARY_COLORS, XL_NS_CHART, "varyColors", GSF_XML_2ND, NULL, NULL),
+       GSF_XML_IN_NODE (RADAR, PLOT_DLBLS,    XL_NS_CHART, "dLbls", GSF_XML_2ND, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, PIE, XL_NS_CHART,     "pieChart", GSF_XML_NO_CONTENT, &xlsx_chart_pie, 
&xlsx_plot_end),
         GSF_XML_IN_NODE (PIE, SERIES, XL_NS_CHART,     "ser", GSF_XML_2ND, NULL, NULL),
           GSF_XML_IN_NODE (SERIES, PIE_SER_SEP, XL_NS_CHART,   "explosion", GSF_XML_NO_CONTENT, 
&xlsx_chart_pie_sep, NULL),
         GSF_XML_IN_NODE (PIE, VARY_COLORS, XL_NS_CHART,        "varyColors", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (PIE, PIE_FIRST_SLICE, XL_NS_CHART,    "firstSliceAng", GSF_XML_NO_CONTENT, 
&xlsx_chart_pie_angle, NULL),
+       GSF_XML_IN_NODE (PIE, PLOT_DLBLS,    XL_NS_CHART, "dLbls", GSF_XML_2ND, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, OF_PIE, XL_NS_CHART,  "ofPieChart", GSF_XML_NO_CONTENT, &xlsx_chart_pie, 
&xlsx_plot_end),
         GSF_XML_IN_NODE (OF_PIE, OF_PIE_TYPE,  XL_NS_CHART, "ofPieType", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -2683,12 +2689,14 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
         GSF_XML_IN_NODE (OF_PIE, PIE_GAP_WIDTH,        XL_NS_CHART, "gapWidth", GSF_XML_NO_CONTENT, NULL, 
NULL),
         GSF_XML_IN_NODE (OF_PIE, VARY_COLORS,  XL_NS_CHART, "varyColors", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (OF_PIE, OF_2ND_PIE,   XL_NS_CHART, "secondPieSize", GSF_XML_NO_CONTENT, NULL, NULL),
+       GSF_XML_IN_NODE (OF_PIE, PLOT_DLBLS,    XL_NS_CHART, "dLbls", GSF_XML_2ND, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, DOUGHNUT, XL_NS_CHART,        "doughnutChart", GSF_XML_NO_CONTENT, 
&xlsx_chart_ring, &xlsx_plot_end),
         GSF_XML_IN_NODE (DOUGHNUT, SERIES, XL_NS_CHART,        "ser", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (DOUGHNUT, VARY_COLORS, XL_NS_CHART,   "varyColors", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (DOUGHNUT, PIE_FIRST_SLICE, XL_NS_CHART,       "firstSliceAng", GSF_XML_2ND, NULL, 
NULL),
         GSF_XML_IN_NODE (DOUGHNUT, HOLE_SIZE, XL_NS_CHART,             "holeSize", GSF_XML_NO_CONTENT, NULL, 
NULL),
+       GSF_XML_IN_NODE (DOUGHNUT, PLOT_DLBLS,    XL_NS_CHART, "dLbls", GSF_XML_2ND, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, DATA_TABLE, XL_NS_CHART, "dTable", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (DATA_TABLE, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),