diff --git a/datalets.xml b/datalets.xml
index 566e385..1adef51 100755
--- a/datalets.xml
+++ b/datalets.xml
@@ -15,73 +15,16 @@
Column
ColumnDescription
TEXT
- +
+ *
-
-
-
-
- piechart-datalet
- pie
-
-
-
- SliceLabels
- SliceLabelsDescription
- TEXT
- 1
-
-
- SliceSizes
- SliceSizesDescription
- NUMBER
- 1
-
-
-
- suffix
- suffixDescription
- TEXT
- 1
-
-
- theme
- themeDescription
- LIST
- 1
-
- - themeBase
- - themeDarkUnika
- - themeSandSignika
- - themeGridLight
- - themeSpod
-
-
-
- donut
- donutDescription
- LIST
- 1
-
- - false
- - true
-
-
-
-
-
-
-
-
-
-
+
- columnchart-datalet
- multiseries2
+ barchart-datalet
+ basic
@@ -96,6 +39,12 @@
NUMBER
*
+
+ Categories
+ CategoriesDescription
+ TEXT
+ ?
+
x-axis-label
@@ -116,58 +65,36 @@
1
- theme
- themeDescription
+ legend
+ dataLabelsDescription
LIST
1
- - themeBase
- - themeDarkUnika
- - themeSandSignika
- - themeGridLight
- - themeSpod
+ - topRight
+ - bottom
+ - false
-
-
-
-
-
-
- barchart-datalet
- multiseries2
-
-
-
- XAxis
- XAxisDescription
- TEXT
- 1
-
-
- NumericYAxis
- YAxisDescription
- NUMBER
- *
-
-
- x-axis-label
- XAxisLabelDescription
- TEXT
- 1
-
-
- y-axis-label
- YAxisLabelDescription
- TEXT
+ data-labels
+ dataLabelsDescription
+ LIST
1
+
+ - true
+ - false
+
- suffix
- suffixDescription
- TEXT
+ stack
+ stackDescription
+ LIST
1
+
+ - false
+ - normal
+ - percent
+
theme
@@ -186,10 +113,11 @@
-
+
+
- areachart-datalet
- multiseries2
+ columnchart-datalet
+ basic
@@ -204,6 +132,12 @@
NUMBER
*
+
+ Categories
+ CategoriesDescription
+ TEXT
+ ?
+
x-axis-label
@@ -224,6 +158,38 @@
1
+ legend
+ dataLabelsDescription
+ LIST
+ 1
+
+ - topRight
+ - bottom
+ - false
+
+
+
+ data-labels
+ dataLabelsDescription
+ LIST
+ 1
+
+ - true
+ - false
+
+
+
+ stack
+ stackDescription
+ LIST
+ 1
+
+ - false
+ - normal
+ - percent
+
+
+
theme
themeDescription
LIST
@@ -240,10 +206,11 @@
+
linechart-datalet
- multiseries2
+ basic
@@ -258,6 +225,12 @@
NUMBER
*
+
+ Categories
+ CategoriesDescription
+ TEXT
+ ?
+
x-axis-label
@@ -278,58 +251,36 @@
1
- theme
- themeDescription
+ legend
+ dataLabelsDescription
LIST
1
- - themeBase
- - themeDarkUnika
- - themeSandSignika
- - themeGridLight
- - themeSpod
+ - topRight
+ - bottom
+ - false
-
-
-
-
-
-
- heatmap-datalet
- multiseries2
-
-
-
- XAxis
- XAxisDescription
- TEXT
- 1
-
-
- NumericYAxis
- YAxisDescription
- NUMBER
- *
-
-
-
- x-axis-label
- XAxisLabelDescription
- TEXT
- 1
-
- y-axis-label
- YAxisLabelDescription
- TEXT
+ data-labels
+ dataLabelsDescription
+ LIST
1
+
+ - true
+ - false
+
- suffix
- suffixDescription
- TEXT
+ stack
+ stackDescription
+ LIST
1
+
+ - false
+ - normal
+ - percent
+
theme
@@ -349,12 +300,10 @@
-
-
-
+
- columnchart_stacked-datalet
- multiseries
+ areachart-datalet
+ basic
@@ -367,7 +316,13 @@
NumericYAxis
YAxisDescription
NUMBER
- 1
+ *
+
+
+ Categories
+ CategoriesDescription
+ TEXT
+ ?
@@ -389,16 +344,24 @@
1
- theme
- themeDescription
+ legend
+ dataLabelsDescription
LIST
1
- - themeBase
- - themeDarkUnika
- - themeSandSignika
- - themeGridLight
- - themeSpod
+ - topRight
+ - bottom
+ - false
+
+
+
+ data-labels
+ dataLabelsDescription
+ LIST
+ 1
+
+ - true
+ - false
@@ -407,18 +370,33 @@
LIST
1
+ - false
- normal
- percent
+
+ theme
+ themeDescription
+ LIST
+ 1
+
+ - themeBase
+ - themeDarkUnika
+ - themeSandSignika
+ - themeGridLight
+ - themeSpod
+
+
-
+
+
- barchart_stacked-datalet
- multiseries
+ heatmap-datalet
+ basic
@@ -431,7 +409,13 @@
NumericYAxis
YAxisDescription
NUMBER
- 1
+ *
+
+
+ Categories
+ CategoriesDescription
+ TEXT
+ ?
@@ -453,16 +437,24 @@
1
- theme
- themeDescription
+ legend
+ dataLabelsDescription
LIST
1
- - themeBase
- - themeDarkUnika
- - themeSandSignika
- - themeGridLight
- - themeSpod
+ - topRight
+ - bottom
+ - false
+
+
+
+ data-labels
+ dataLabelsDescription
+ LIST
+ 1
+
+ - true
+ - false
@@ -471,50 +463,84 @@
LIST
1
+ - false
- normal
- percent
+
+ theme
+ themeDescription
+ LIST
+ 1
+
+ - themeBase
+ - themeDarkUnika
+ - themeSandSignika
+ - themeGridLight
+ - themeSpod
+
+
-
+
+
- areachart_stacked-datalet
- multiseries
+ piechart-datalet
+ pie
- XAxis
- XAxisDescription
+ SliceLabels
+ SliceLabelsDescription
TEXT
1
- NumericYAxis
- YAxisDescription
+ SliceSizes
+ SliceSizesDescription
NUMBER
1
- x-axis-label
- XAxisLabelDescription
+ suffix
+ suffixDescription
TEXT
1
- y-axis-label
- YAxisLabelDescription
- TEXT
+ legend
+ dataLabelsDescription
+ LIST
1
+
+ - topRight
+ - bottom
+ - false
+
- suffix
- suffixDescription
- TEXT
+ data-labels
+ dataLabelsDescription
+ LIST
+ 1
+
+ - true
+ - false
+
+
+
+ donut
+ donutDescription
+ LIST
1
+
+ - false
+ - true
+
theme
@@ -529,72 +555,6 @@
- themeSpod
-
- stack
- stackDescription
- LIST
- 1
-
- - normal
- - percent
-
-
-
-
-
-
-
-
-
- leafletjs-datalet
- map
-
-
-
- Latitude
- LatitudeDescription
-
- NUMBER
- 1
-
-
- Longitude
- LongitudeDescription
-
- NUMBER
- 1
-
-
- BalloonContent
- BalloonContentDescription
- TEXT
- *
-
-
-
-
-
-
-
-
-
- leafletjs-geojson-datalet
- map-geojson
-
-
-
- GEOJSON
- GEOJSONDescription
- GEOJSON
- 1
-
-
- BalloonContent
- BalloonContentDescription
- TEXT
- *
-
-
@@ -638,6 +598,27 @@
1
+ legend
+ dataLabelsDescription
+ LIST
+ 1
+
+ - topRight
+ - bottom
+ - false
+
+
+
+ data-labels
+ dataLabelsDescription
+ LIST
+ 1
+
+ - true
+ - false
+
+
+
theme
themeDescription
LIST
@@ -677,13 +658,13 @@
BubbleSize
BubbleSizeDescription
NUMBER
- ?
+ 1
BubbleContent
BubbleContentDescription
TEXT
- ?
+ 1
Categories
@@ -705,6 +686,17 @@
1
+ legend
+ dataLabelsDescription
+ LIST
+ 1
+
+ - topRight
+ - bottom
+ - false
+
+
+
theme
themeDescription
LIST
@@ -732,10 +724,62 @@
Level
LevelDescription
TEXT
- +
+ *
+
+
+
+
+
+
+
+
+ leafletjs-datalet
+ map
+
+
+
+ Latitude
+ LatitudeDescription
+
+ NUMBER
+ 1
+
+
+ Longitude
+ LongitudeDescription
+
+ NUMBER
+ 1
+
+
+ BalloonContent
+ BalloonContentDescription
+ TEXT
+ *
+
+
+
+
+
+
+
+ leafletjs-geojson-datalet
+ map-geojson
+
+
+
+ GEOJSON
+ GEOJSONDescription
+
+ TEXT
+ 1
+
+
+ BalloonContent
+ BalloonContentDescription
+ TEXT
+ *
-
-
diff --git a/datalets/datalets.dtd b/datalets/datalets.dtd
index 75cd0f4..48bea37 100755
--- a/datalets/datalets.dtd
+++ b/datalets/datalets.dtd
@@ -2,7 +2,7 @@
-
+
@@ -11,4 +11,6 @@
-
\ No newline at end of file
+
+
+
\ No newline at end of file