Merge branch 'master' into master

rounding.scad

@@ -12,6 +12,7 @@
 include <BOSL2/beziers.scad>
 include <BOSL2/strings.scad>
 include <BOSL2/structs.scad>
+include <BOSL2/skin.scad>
 
 
 // CommonCode:
@@ -884,7 +885,7 @@ function os_profile(points, extra,check_valid, quality, offset_maxstep, offset)
 // Example: If you give a non-convex input you get a convex hull output
 //   right(50) linear_extrude(height=7) star(5,r=22,ir=13);
 //   convex_offset_extrude(bottom = os_chamfer(height=-2), top=os_chamfer(height=1), height=7)
-//     star(5,r=22,ir=13)
+//     star(5,r=22,ir=13);
 module convex_offset_extrude(
 	height, h, l, 
 	top=[], bottom=[],

scripts/docs_gen.py

@@ -149,7 +149,7 @@ def run_openscad_script(libfile, infile, imgfile, imgsize=(320,240), eye=None, s
     p = subprocess.Popen(scadcmd, shell=False, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     (stdoutdata, stderrdata) = p.communicate(None)
     res = p.returncode
-    if res != 0 or b"ERROR:" in stderrdata or b"WARNING:" in stderrdata:
+    if res != 0 or b"ERROR:" in stderrdata or b"TRACE:" in stderrdata:
         print("\n\n{}".format(stderrdata.decode('utf-8')))
         print("////////////////////////////////////////////////////")
         print("// {}: {} for {}".format(libfile, infile, imgfile))

scripts/make_all_docs.sh

@@ -17,7 +17,7 @@ done
 if [[ "$FILES" != "" ]]; then
     PREVIEW_LIBS="$FILES"
 else
-    PREVIEW_LIBS="version common errors attachments math arrays vectors affine coords geometry triangulation quaternions strings stacks queues structs vnf skin hull constants edges transforms primitives shapes masks shapes2d paths beziers rounding walls cubetruss metric_screws threading partitions involute_gears sliders joiners linear_bearings nema_steppers wiring phillips_drive torx_drive polyhedra knurling cubetruss debug"
+    PREVIEW_LIBS="affine arrays attachments beziers bosl1compat bottlecaps common constants coords cubetruss debug distributors edges errors geometry hingesnaps hull involute_gears joiners knurling linear_bearings masks math metric_screws mutators nema_steppers partitions paths phillips_drive polyhedra primitives quaternions queues regions rounding shapes shapes2d skin sliders stacks std strings structs threading torx_drive transforms triangulation vectors version vnf walls wiring"
 fi
 
 dir="$(basename $PWD)"

skin.scad

@@ -967,13 +967,13 @@ module sweep(shape, transformations, closed=false, caps, convexity=10) {
 //   yzcircle = yrot(90,p=circle($fn=64, r=30));
 //   ushape = [[-10, 0],[-10, 10],[ -7, 10],[ -7, 2],[  7, 2],[  7, 7],[ 10, 7],[ 10, 0]];
 //   path_sweep(ushape, yzcircle, method="manual", normal=UP, closed=true);
-// Examples: The "natural" method will introduce twists when the curvature changes direction.  A warning is displayed.  
+// Example: The "natural" method will introduce twists when the curvature changes direction.  A warning is displayed.  
 //   arc1 = path3d(arc(angle=90, r=30));
 //   arc2 = xrot(-90, cp=[0,30],p=path3d(arc(angle=[90,180], r=30)));
 //   two_arcs = simplify_path(concat(arc1,arc2));
 //   ushape = [[-10, 0],[-10, 10],[ -7, 10],[ -7, 2],[  7, 2],[  7, 7],[ 10, 7],[ 10, 0]];
 //   path_sweep(ushape, two_arcs, method="natural");
-// Examples: The only simple way to get a good result is the "incremental" method:
+// Example: The only simple way to get a good result is the "incremental" method:
 //   arc1 = path3d(arc(angle=90, r=30));
 //   arc2 = xrot(-90, cp=[0,30],p=path3d(arc(angle=[90,180], r=30)));
 //   arc3 = apply( translate([-30,60,30])*yrot(90), path3d(arc(angle=[270,180], r=30)));

version.scad

@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////////////
 
 
-BOSL_VERSION = [2,0,138];
+BOSL_VERSION = [2,0,140];
 
 
 // Section: BOSL Library Version Functions