bare-script 4.0.1__tar.gz → 4.0.3__tar.gz

{bare_script-4.0.1/src/bare_script.egg-info → bare_script-4.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 4.0.1
+Version: 4.0.3
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -48,6 +48,7 @@ confident that BareScript will execute the same regardless of the underlying run
 
 - [The BareScript Language](https://craigahobbs.github.io/bare-script-py/language/)
 - [The BareScript Library](https://craigahobbs.github.io/bare-script-py/library/)
+- [The BareScript Include Library Tests](https://craigahobbs.github.io/bare-script/include/test/)
 - [API Documentation](https://craigahobbs.github.io/bare-script-py/)
 - [Source code](https://github.com/craigahobbs/bare-script-py)
 

{bare_script-4.0.1 → bare_script-4.0.3}/README.md

@@ -23,6 +23,7 @@ confident that BareScript will execute the same regardless of the underlying run
 
 - [The BareScript Language](https://craigahobbs.github.io/bare-script-py/language/)
 - [The BareScript Library](https://craigahobbs.github.io/bare-script-py/library/)
+- [The BareScript Include Library Tests](https://craigahobbs.github.io/bare-script/include/test/)
 - [API Documentation](https://craigahobbs.github.io/bare-script-py/)
 - [Source code](https://github.com/craigahobbs/bare-script-py)
 

{bare_script-4.0.1 → bare_script-4.0.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bare-script
-version = 4.0.1
+version = 4.0.3
 url = https://github.com/craigahobbs/bare-script
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com

{bare_script-4.0.1 → bare_script-4.0.3}/src/bare_script/include/dataLineChart.bare

@@ -135,11 +135,10 @@ dataLineChartCategoricalColors = [ \
 
 
 # Line chart constants (all numbers in pixels)
-dataLineChartPixelsPerPoint = 4 / 3
 dataLineChartSvgPrecision = 3
 dataLineChartChartFontFamily = 'Arial, Helvetica, sans-serif'
 dataLineChartChartFontWidthRatio = 0.6
-dataLineChartChartFontDefaultSize = 12
+dataLineChartChartFontDefaultSizePx = 16
 dataLineChartChartBackgroundColor = 'white'
 dataLineChartAxisColor = 'black'
 dataLineChartAxisTickLineColor = 'lightgray'
@@ -159,7 +158,7 @@ dataLineChartChartLineWidth = 3
 # $arg data: The data array
 # $arg lineChart: The [line chart model](model.html#var.vName='DataLineChart')
 # $arg options: Optional (default is null). The line chart options object with the following optional members:
-# $arg options: - **fontSize** - The font size, in points
+# $arg options: - **fontSize** - The font size, in pixels
 function dataLineChart(data, lineChart, options):
     elementModelRender = systemGlobalGet('elementModelRender')
     elementModelRender({'html': 'p', 'elem': dataLineChartElements(data, lineChart, options)})
@@ -172,16 +171,21 @@ endfunction
 # $arg data: The data array
 # $arg lineChart: The [line chart model](model.html#var.vName='DataLineChart')
 # $arg options: Optional (default is null). The line chart options object with the following optional members:
-# $arg options: - **fontSize** - The font size, in points
+# $arg options: - **fontSize** - The font size, in pixels
 # $return: The line chart [element model](https://github.com/craigahobbs/element-model#readme)
 function dataLineChartElements(data, lineChart, options):
-    chartFontSize = dataLineChartPixelsPerPoint * \
-        if(options != null && objectHas(options, 'fontSize'), objectGet(options, 'fontSize'), dataLineChartChartFontDefaultSize)
     xField = objectGet(lineChart, 'x')
     yFields = objectGet(lineChart, 'y')
     colorField = objectGet(lineChart, 'color')
     colorOrder = objectGet(lineChart, 'colorOrder')
 
+    # Determine the font size
+    fontSize = if(options, objectGet(options, 'fontSize'))
+    if !fontSize:
+        documentFontSize = systemGlobalGet('documentFontSize')
+        fontSize = if(documentFontSize, documentFontSize(), dataLineChartChartFontDefaultSizePx)
+    endif
+
     # Sort the rows by the X field
     arraySort(data, systemPartial(dataLineChartSortCompare, xField))
 
@@ -333,13 +337,13 @@ function dataLineChartElements(data, lineChart, options):
     endif
 
     # Chart title calculations
-    chartBorderSize = chartFontSize
-    chartTitleFontSize = 1.1 * chartFontSize
+    chartBorderSize = fontSize
+    chartTitleFontSize = 1.1 * fontSize
     chartTitleHeight = if(chartTitle != null, 1.5 * chartTitleFontSize, 0)
 
     # Y-axis calculations
-    axisTitleFontSize = 1 * chartFontSize
-    axisLabelFontSize = chartFontSize
+    axisTitleFontSize = 1 * fontSize
+    axisLabelFontSize = fontSize
     yAxisTitle = if(arrayLength(yFields) == 1, arrayGet(yFields, 0))
     yAxisTitleWidth = if(yAxisTitle != null, 1.8 * axisTitleFontSize, 0)
     yAxisLabelWidth = 0
@@ -372,7 +376,7 @@ function dataLineChartElements(data, lineChart, options):
     xAnnotationLabelOffsetY = 0.1 * annotationLabelFontSize
 
     # Color legend calculations
-    colorLegendFontSize = chartFontSize
+    colorLegendFontSize = fontSize
     colorLegendGap = 0.5 * colorLegendFontSize
     colorLegendLabelHeight = colorLegendFontSize
     colorLegendLabelGap = 0.35 * colorLegendLabelHeight

{bare_script-4.0.1 → bare_script-4.0.3}/src/bare_script/value.py

@@ -143,21 +143,17 @@ def value_boolean(value):
     :rtype: bool
     """
 
-    if value is None:
-        return False
+    if isinstance(value, bool):
+        return value
     elif isinstance(value, str):
         return value != ''
-    elif isinstance(value, bool):
-        return value
     elif isinstance(value, (int, float)):
         return value != 0
-    elif isinstance(value, datetime.date):
-        return True
     elif isinstance(value, list):
         return len(value) != 0
 
-    # Everything else is true
-    return True
+    # Everything else non-null is true
+    return value is not None
 
 
 def value_is(value1, value2):

{bare_script-4.0.1 → bare_script-4.0.3/src/bare_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 4.0.1
+Version: 4.0.3
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -48,6 +48,7 @@ confident that BareScript will execute the same regardless of the underlying run
 
 - [The BareScript Language](https://craigahobbs.github.io/bare-script-py/language/)
 - [The BareScript Library](https://craigahobbs.github.io/bare-script-py/library/)
+- [The BareScript Include Library Tests](https://craigahobbs.github.io/bare-script/include/test/)
 - [API Documentation](https://craigahobbs.github.io/bare-script-py/)
 - [Source code](https://github.com/craigahobbs/bare-script-py)