From ee319270156737da5be087c9d6cfe179fd0a36e6 Mon Sep 17 00:00:00 2001
From: Justin Lin <caterpillar@openhome.cc>
Date: Wed, 15 May 2019 19:31:29 +0800
Subject: [PATCH] use __is_float

---
 src/__private__/__half_trapezium.scad |  6 +++---
 src/shape_square.scad                 | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/__private__/__half_trapezium.scad b/src/__private__/__half_trapezium.scad
index 960634bb..e08b9ca8 100644
--- a/src/__private__/__half_trapezium.scad
+++ b/src/__private__/__half_trapezium.scad
@@ -44,9 +44,9 @@ function __br_corner(frags, b_ang, l1, l2, h, round_r) =
 
 function __half_trapezium(length, h, round_r) =
     let(
-        is_vt = __is_vector(length),
-        l1 = is_vt ? length[0] : length,
-        l2 = is_vt ? length[1] : length,
+        is_flt = __is_float(length),
+        l1 = is_flt ? length : length[0],
+        l2 = is_flt ? length : length[1],
         frags = __frags(round_r),
         b_ang = atan2(h, l1 - l2),
         br_corner = __br_corner(frags, b_ang, l1, l2, h, round_r),
diff --git a/src/shape_square.scad b/src/shape_square.scad
index b43685a4..edea534b 100644
--- a/src/shape_square.scad
+++ b/src/shape_square.scad
@@ -8,17 +8,17 @@
 *
 **/
 
-include <__private__/__is_vector.scad>;
+include <__private__/__is_float.scad>;
 include <__private__/__frags.scad>;
 include <__private__/__pie_for_rounding.scad>;
 include <__private__/__half_trapezium.scad>;
 include <__private__/__trapezium.scad>;
-
+ 
 function shape_square(size, corner_r = 0) = 
     let(
-        is_vt = __is_vector(size),
-        x = is_vt ? size[0] : size,
-        y = is_vt ? size[1] : size        
+        is_flt = __is_float(size),
+        x = is_flt ? size : size[0],
+        y = is_flt ? size : size[1]        
     )
     __trapezium(
         length = x,