From 5bb0f0b1e6761f7b27e44ca76b7644405c14f5b0 Mon Sep 17 00:00:00 2001
From: renato <rended83@gmail.com>
Date: Wed, 23 Mar 2016 14:50:47 +0100
Subject: [PATCH] new datalets + dtd

---
 datalets.xml          | 424 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------
 datalets/datalets.dtd |  13 ++++---------
 2 files changed, 269 insertions(+), 168 deletions(-)

diff --git a/datalets.xml b/datalets.xml
index ea55c5b..64001e0 100755
--- a/datalets.xml
+++ b/datalets.xml
@@ -4,14 +4,16 @@
 
 <handler_configuration>
     <components>
+        
+        <!--table-->
         <component>
             <name>datatable-datalet</name>
             <type>table</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Cell</name>
-                        <description>cellDescription</description>
+                        <name>Column</name>
+                        <description>ColumnDescription</description>
                         <selection>*</selection>
                     </input>
                     <layouts>
@@ -19,377 +21,480 @@
                 </inputs>
             </idm>
         </component>
+
+        <!--multiseries-->
+
+        <!--bar-->
         <component>
             <name>barchart-datalet</name>
-            <type>base</type>
+            <type>multiseries</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Categories</name>
-                        <description>categoriesDescription</description>
+                        <name>XAxis</name>
+                        <description>XAxisDescription</description>
                     </input>
                     <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
+                        <name>YAxis</name>
+                        <description>YAxisDescription</description>
                     </input>
                     <layouts>
                         <input>
                             <name>x-axis-label</name>
                             <description>XAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>y-axis-label</name>
                             <description>YAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>suffix</name>
                             <description>suffixDescription</description>
+                            <type>text</type>
+                        </input>
+                        <input>
+                            <name>theme</name>
+                            <description>themeDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>themeBase</item>
+                                <item>themeDarkUnika</item>
+                                <item>themeSandSignika</item>
+                                <item>themeGridLight</item>
+                                <item>themeSpod</item>
+                            </list>
                         </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
+        <!--column-->
         <component>
             <name>columnchart-datalet</name>
-            <type>base</type>
+            <type>multiseries</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Categories</name>
-                        <description>categoriesDescription</description>
+                        <name>XAxis</name>
+                        <description>XAxisDescription</description>
                     </input>
                     <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
+                        <name>YAxis</name>
+                        <description>YAxisDescription</description>
                     </input>
                     <layouts>
                         <input>
                             <name>x-axis-label</name>
                             <description>XAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>y-axis-label</name>
                             <description>YAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>suffix</name>
                             <description>suffixDescription</description>
+                            <type>text</type>
+                        </input>
+                        <input>
+                            <name>theme</name>
+                            <description>themeDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>themeBase</item>
+                                <item>themeDarkUnika</item>
+                                <item>themeSandSignika</item>
+                                <item>themeGridLight</item>
+                                <item>themeSpod</item>
+                            </list>
                         </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
+        <!--area-->
         <component>
-            <name>linechart-datalet</name>
-            <type>base</type>
+            <name>areachart-datalet</name>
+            <type>multiseries</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Categories</name>
-                        <description>categoriesDescription</description>
+                        <name>XAxis</name>
+                        <description>XAxisDescription</description>
                     </input>
                     <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
+                        <name>YAxis</name>
+                        <description>YAxisDescription</description>
                     </input>
                     <layouts>
                         <input>
                             <name>x-axis-label</name>
                             <description>XAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>y-axis-label</name>
                             <description>YAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>suffix</name>
                             <description>suffixDescription</description>
+                            <type>text</type>
+                        </input>
+                        <input>
+                            <name>theme</name>
+                            <description>themeDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>themeBase</item>
+                                <item>themeDarkUnika</item>
+                                <item>themeSandSignika</item>
+                                <item>themeGridLight</item>
+                                <item>themeSpod</item>
+                            </list>
                         </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
+        <!--line-->
         <component>
-            <name>column3Dchart-datalet</name>
-            <type>base</type>
+            <name>linechart-datalet</name>
+            <type>multiseries</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Categories</name>
-                        <description>categoriesDescription</description>
+                        <name>XAxis</name>
+                        <description>XAxisDescription</description>
                     </input>
                     <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
+                        <name>YAxis</name>
+                        <description>YAxisDescription</description>
                     </input>
                     <layouts>
                         <input>
                             <name>x-axis-label</name>
                             <description>XAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>y-axis-label</name>
                             <description>YAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>suffix</name>
                             <description>suffixDescription</description>
+                            <type>text</type>
+                        </input>
+                        <input>
+                            <name>theme</name>
+                            <description>themeDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>themeBase</item>
+                                <item>themeDarkUnika</item>
+                                <item>themeSandSignika</item>
+                                <item>themeGridLight</item>
+                                <item>themeSpod</item>
+                            </list>
                         </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
+        <!--heatmap-->
         <component>
-            <name>areachart-datalet</name>
-            <type>base</type>
+            <name>heatmap-datalet</name>
+            <type>multiseries</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Categories</name>
-                        <description>categoriesDescription</description>
+                        <name>XAxis</name>
+                        <description>XAxisDescription</description>
                     </input>
                     <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
+                        <name>YAxis</name>
+                        <description>YAxisDescription</description>
                     </input>
                     <layouts>
                         <input>
                             <name>x-axis-label</name>
                             <description>XAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>y-axis-label</name>
                             <description>YAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>suffix</name>
                             <description>suffixDescription</description>
+                            <type>text</type>
+                        </input>
+                        <input>
+                            <name>theme</name>
+                            <description>themeDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>themeBase</item>
+                                <item>themeDarkUnika</item>
+                                <item>themeSandSignika</item>
+                                <item>themeGridLight</item>
+                                <item>themeSpod</item>
+                            </list>
                         </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
-        <!--<component>-->
-            <!--<name>donutpie3dchart-datalet</name>-->
-            <!--<type>pie</type>-->
-            <!--<idm>-->
-                <!--<inputs>-->
-                    <!--<input>-->
-                        <!--<name>Series</name>-->
-                        <!--<description>pieSeriesDescription</description>-->
-                    <!--</input>-->
-                    <!--<input>-->
-                        <!--<name>Size</name>-->
-                        <!--<description>pieSizeDescription</description>-->
-                    <!--</input>-->
-                    <!--<layouts>-->
-                    <!--</layouts>-->
-                <!--</inputs>-->
-            <!--</idm>-->
-        <!--</component>-->
-        <component>
-            <name>piechart-datalet</name>
-            <type>pie</type>
-            <idm>
-                <inputs>
-                    <input>
-                        <name>Series</name>
-                        <description>pieSeriesDescription</description>
-                    </input>
-                    <input>
-                        <name>Size</name>
-                        <description>pieSizeDescription</description>
-                    </input>
-                    <layouts>
-                    </layouts>
-                </inputs>
-            </idm>
-        </component>
+
+        <!--multiseries_stacked-->
+
+        <!--bar stacked-->
         <component>
-            <name>treemap-datalet</name>
-            <type>treemap</type>
+            <name>barchart_stacked-datalet</name>
+            <type>multiseries</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Level</name>
-                        <description>levelDescription</description>
-                        <selection>*</selection>
+                        <name>XAxis</name>
+                        <description>XAxisDescription</description>
                     </input>
-                    <layouts>
-                    </layouts>
-                </inputs>
-            </idm>
-        </component>
-        <component>
-            <name>leafletjs-datalet</name>
-            <type>leafletjs</type>
-            <idm>
-                <inputs>
                     <input>
-                        <name>Latitude</name>
-                        <description>LatitudeDescription</description>
-                    </input>
-                    <input>
-                        <name>Longitude</name>
-                        <description>LongitudeDescription</description>
-                    </input>
-                    <input>
-                        <name>Balloon content</name>
-                        <description>BalloonContentDescription</description>
+                        <name>YAxis</name>
+                        <description>YAxisDescription</description>
                     </input>
                     <layouts>
+                        <input>
+                            <name>x-axis-label</name>
+                            <description>XAxisLabelDescription</description>
+                            <type>text</type>
+                        </input>
+                        <input>
+                            <name>y-axis-label</name>
+                            <description>YAxisLabelDescription</description>
+                            <type>text</type>
+                        </input>
+                        <input>
+                            <name>suffix</name>
+                            <description>suffixDescription</description>
+                            <type>text</type>
+                        </input>
+                        <input>
+                            <name>theme</name>
+                            <description>themeDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>themeBase</item>
+                                <item>themeDarkUnika</item>
+                                <item>themeSandSignika</item>
+                                <item>themeGridLight</item>
+                                <item>themeSpod</item>
+                            </list>
+                        </input>
+                        <input>
+                            <name>stack</name>
+                            <description>stackDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>normal</item>
+                                <item>percent</item>
+                            </list>
+                        </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
+        <!--column stacked-->
         <component>
-            <name>bubble3d-datalet</name>
-            <type>bubble</type>
+            <name>columnchart_stacked-datalet</name>
+            <type>multiseries</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Categories</name>
-                        <description>bubbleCategoriesDescription</description>
-                    </input>
-                    <input>
-                        <name>Y values</name>
-                        <description>bubbleYValuesDescription</description>
+                        <name>XAxis</name>
+                        <description>XAxisDescription</description>
                     </input>
                     <input>
-                        <name>Z values</name>
-                        <description>bubbleZValuesDescription</description>
-                    </input>
-                    <input>
-                        <name>Series</name>
-                        <description>bubbleSeriesDescription</description>
+                        <name>YAxis</name>
+                        <description>YAxisDescription</description>
                     </input>
                     <layouts>
                         <input>
                             <name>x-axis-label</name>
                             <description>XAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>y-axis-label</name>
                             <description>YAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>suffix</name>
                             <description>suffixDescription</description>
+                            <type>text</type>
+                        </input>
+                        <input>
+                            <name>theme</name>
+                            <description>themeDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>themeBase</item>
+                                <item>themeDarkUnika</item>
+                                <item>themeSandSignika</item>
+                                <item>themeGridLight</item>
+                                <item>themeSpod</item>
+                            </list>
+                        </input>
+                        <input>
+                            <name>stack</name>
+                            <description>stackDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>normal</item>
+                                <item>percent</item>
+                            </list>
                         </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
+        <!--area stacked-->
         <component>
-            <name>bubblechart-datalet</name>
-            <type>bubble</type>
+            <name>areachart_stacked-datalet</name>
+            <type>multiseries</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Categories</name>
-                        <description>bubbleCategoriesDescription</description>
-                    </input>
-                    <input>
-                        <name>Y values</name>
-                        <description>bubbleYValuesDescription</description>
-                    </input>
-                    <input>
-                        <name>Z values</name>
-                        <description>bubbleZValuesDescription</description>
+                        <name>XAxis</name>
+                        <description>XAxisDescription</description>
                     </input>
                     <input>
-                        <name>Series</name>
-                        <description>bubbleSeriesDescription</description>
+                        <name>YAxis</name>
+                        <description>YAxisDescription</description>
                     </input>
                     <layouts>
                         <input>
                             <name>x-axis-label</name>
                             <description>XAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>y-axis-label</name>
                             <description>YAxisLabelDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
                             <name>suffix</name>
                             <description>suffixDescription</description>
+                            <type>text</type>
+                        </input>
+                        <input>
+                            <name>theme</name>
+                            <description>themeDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>themeBase</item>
+                                <item>themeDarkUnika</item>
+                                <item>themeSandSignika</item>
+                                <item>themeGridLight</item>
+                                <item>themeSpod</item>
+                            </list>
+                        </input>
+                        <input>
+                            <name>stack</name>
+                            <description>stackDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>normal</item>
+                                <item>percent</item>
+                            </list>
                         </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
+
+        <!--pie-->
         <component>
-            <name>scatterchart-datalet</name>
-            <type>scatter</type>
+            <name>piechart-datalet</name>
+            <type>pie</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Categories</name>
-                        <description>scatterCategoriesDescription</description>
+                        <name>SliceLabels</name>
+                        <description>SliceLabelsDescription</description>
                     </input>
                     <input>
-                        <name>X values</name>
-                        <description>scatterXValuesDescription</description>
-                    </input>
-                    <input>
-                        <name>Y values</name>
-                        <description>scatterYValuesDescription</description>
+                        <name>SliceSizes</name>
+                        <description>SliceSizesDescription</description>
                     </input>
                     <layouts>
                         <input>
-                            <name>x-axis-label</name>
-                            <description>XAxisLabelDescription</description>
+                            <name>suffix</name>
+                            <description>suffixDescription</description>
+                            <type>text</type>
                         </input>
                         <input>
-                            <name>y-axis-label</name>
-                            <description>YAxisLabelDescription</description>
+                            <name>theme</name>
+                            <description>themeDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>themeBase</item>
+                                <item>themeDarkUnika</item>
+                                <item>themeSandSignika</item>
+                                <item>themeGridLight</item>
+                                <item>themeSpod</item>
+                            </list>
                         </input>
                         <input>
-                            <name>suffix</name>
-                            <description>suffixDescription</description>
+                            <name>donut</name>
+                            <description>donutDescription</description>
+                            <type>list</type>
+                            <list>
+                                <item>false</item>
+                                <item>true</item>
+                            </list>
                         </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
+
+        <!--map-->
         <component>
-            <name>heatmap-datalet</name>
-            <type>heatmap</type>
+            <name>leafletjs-datalet</name>
+            <type>map</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Categories</name>
-                        <description>heatmapCategoriesDescription</description>
-                    </input>
-                    <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
-                    </input>
-                    <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
-                    </input>
-                    <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
-                    </input>
-                    <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
+                        <name>Latitude</name>
+                        <description>LatitudeDescription</description>
                     </input>
                     <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
+                        <name>Longitude</name>
+                        <description>LongitudeDescription</description>
                     </input>
                     <input>
-                        <name>Series</name>
-                        <description>seriesDescription</description>
+                        <name>BalloonContent</name>
+                        <description>BalloonContentDescription</description>
+                        <selection>*</selection>
                     </input>
                     <layouts>
                     </layouts>
                 </inputs>
             </idm>
         </component>
+
+        <!--preview HIDDEN-->
         <component>
             <name>preview-datalet</name>
             <type>hidden</type>
@@ -408,5 +513,6 @@
                 </inputs>
             </idm>
         </component>
+
     </components>
 </handler_configuration>
diff --git a/datalets/datalets.dtd b/datalets/datalets.dtd
index d5edc5f..47ab84f 100755
--- a/datalets/datalets.dtd
+++ b/datalets/datalets.dtd
@@ -1,19 +1,14 @@
 <!ELEMENT handler_configuration (components)>
 <!ELEMENT components (component*)>
 <!ELEMENT component (name, type, idm)>
-<!--<!ELEMENT component (name, attributes, idm)>-->
-<!--<!ELEMENT attributes (attribute*)>-->
-<!--<!ELEMENT attribute (name)>-->
 <!ELEMENT idm (inputs*)>
 <!ELEMENT inputs (input*, layouts)>
 <!ELEMENT layouts (input*)>
-<!--<!ELEMENT input (name, description?, scale?, role?, selection?, type?, validator?)>-->
-<!ELEMENT input (name, description?, selection?, type?, validator?)>
+<!ELEMENT input (name, description?, selection?, type?, validator?, list?)>
+<!ELEMENT list (item+)>
+<!ELEMENT item (#PCDATA)>
 <!ELEMENT name (#PCDATA)>
 <!ELEMENT description (#PCDATA)>
-<!--<!ELEMENT scale (#PCDATA)>-->
-<!--<!ELEMENT role (#PCDATA)>-->
 <!ELEMENT selection (#PCDATA)>
 <!ELEMENT type (#PCDATA)>
-<!ELEMENT validator (#PCDATA)>
-
+<!ELEMENT validator (#PCDATA)>
\ No newline at end of file
--
libgit2 0.21.4