From 8331d8e8032b209d5b60b8c3a40322faeaab5de9 Mon Sep 17 00:00:00 2001
From: Garth Minette <gminette@gmail.com>
Date: Tue, 1 Sep 2020 01:23:01 -0700
Subject: [PATCH] Cheat Sheet ordering tweak.

---
 scripts/gencheat.sh |  8 ++++----
 std.scad            | 28 +++++++++++++---------------
 version.scad        |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/scripts/gencheat.sh b/scripts/gencheat.sh
index 6fa49ec..e07a909 100755
--- a/scripts/gencheat.sh
+++ b/scripts/gencheat.sh
@@ -13,7 +13,7 @@ function lcase
 
 function columnize
 {
-    cols=4
+    cols=$2
     TMPFILE=$(mktemp -t $(basename $0).XXXXXX) || exit 1
     cat >>$TMPFILE
     if [[ $(wc -l $TMPFILE | awk '{print $1}') -gt 1 ]] ; then
@@ -79,7 +79,7 @@ function mkotherindex
     sed 's/([^)]*)//g' | sed 's/[^a-zA-Z0-9_.:$]//g' | awk -F ':' '{printf "[%s()](%s#%s)\n", $3, $1, $3}'
 }
 
-CHEAT_FILES=$(grep '^include' std.scad | sed 's/^.*<\([a-zA-Z0-9.]*\)>/\1/'|grep -v 'version.scad')
+CHEAT_FILES=$(grep '^include' std.scad | sed 's/^.*<\([a-zA-Z0-9.]*\)>/\1/' | grep -v 'version.scad' | grep -v 'primitives.scad')
 
 (
     echo '## Belfry OpenScad Library Cheat Sheet'
@@ -89,9 +89,9 @@ CHEAT_FILES=$(grep '^include' std.scad | sed 's/^.*<\([a-zA-Z0-9.]*\)>/\1/'|grep
     (
         grep -H '// Constant: ' $CHEAT_FILES | mkconstindex
         grep -H '^[A-Z$][A-Z0-9_]* *=.*//' $CHEAT_FILES | mkconstindex2
-    ) | sort -u | columnize 'Constants'
+    ) | sort -u | columnize 'Constants' 6
     for f in $CHEAT_FILES ; do
-        egrep -H '// Function: |// Function&Module: |// Module: ' $f | mkotherindex | sort -u | columnize $f
+        egrep -H '// Function: |// Function&Module: |// Module: ' $f | mkotherindex | columnize "[$f]($f)" 4
         echo
     done
 ) > BOSL2.wiki/CheatSheet.md
diff --git a/std.scad b/std.scad
index 1c2e45e..685b6ab 100644
--- a/std.scad
+++ b/std.scad
@@ -12,21 +12,6 @@ assert(version_num()>=20190301, "BOSL2 requires OpenSCAD version 2019.03.01 or l
 include <version.scad>
 
 include <constants.scad>
-include <edges.scad>
-include <common.scad>
-include <arrays.scad>
-include <strings.scad>
-include <vnf.scad>
-include <debug.scad>
-
-include <math.scad>
-include <vectors.scad>
-include <quaternions.scad>
-include <affine.scad>
-include <coords.scad>
-include <geometry.scad>
-include <regions.scad>
-
 include <transforms.scad>
 include <distributors.scad>
 include <mutators.scad>
@@ -36,6 +21,19 @@ include <shapes.scad>
 include <shapes2d.scad>
 include <masks.scad>
 include <paths.scad>
+include <edges.scad>
+include <arrays.scad>
+include <math.scad>
+include <vectors.scad>
+include <quaternions.scad>
+include <affine.scad>
+include <coords.scad>
+include <geometry.scad>
+include <regions.scad>
+include <strings.scad>
+include <vnf.scad>
+include <common.scad>
+include <debug.scad>
 
 
 // vim: expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap
diff --git a/version.scad b/version.scad
index 6ef424a..262b891 100644
--- a/version.scad
+++ b/version.scad
@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////////////
 
 
-BOSL_VERSION = [2,0,418];
+BOSL_VERSION = [2,0,419];
 
 
 // Section: BOSL Library Version Functions