Left-align labels, watch for .folk.temp files

2 files changed, 16 insertions, 3 deletions

diff --git a/virtual-programs/label.folk b/virtual-programs/label.folk
index 30787555..d18bdd02 100644
--- a/virtual-programs/label.folk
+++ b/virtual-programs/label.folk
@@ -4,10 +4,17 @@ When /thing/ has region /region/ {
     set width [boxWidth $bbox]
     set height [boxHeight $bbox]
 
+
     set radians [lindex $region 2]
     if {$radians eq ""} {set radians 0}
 
     set upsidedown [expr {abs($radians) < 1.57}]
+    if ($upsidedown) {
+        set x [expr {$x + $width * 0.4}]
+        set y [expr {$y - $height * 0.2}]
+    } else {
+        set x [expr {$x - $width * 0.4}]
+    }
     if {$::isLaptop} {set upsidedown false}
 
     When the collected matches for [list /someone/ wishes $thing is labelled /text/] are /matches/ {
diff --git a/virtual-programs/tags-and-calibration.folk b/virtual-programs/tags-and-calibration.folk
index c624614a..f3155612 100644
--- a/virtual-programs/tags-and-calibration.folk
+++ b/virtual-programs/tags-and-calibration.folk
@@ -79,9 +79,15 @@ When (non-capturing) tag /tag/ has center /c/ size /size/ {
 When (non-capturing) tag /tag/ is a tag {
      puts "Added tag $tag"
 
-     set fp [open "$::env(HOME)/folk-printed-programs/$tag.folk" r]
-     set code [read $fp]
-     close $fp
+    set tempPath "$::env(HOME)/folk-printed-programs/$tag.folk.temp"
+
+    if {[file exists $tempPath]} {
+      set path [open "$::env(HOME)/folk-printed-programs/$tag.folk.temp" r]
+    } else {
+      set path [open "$::env(HOME)/folk-printed-programs/$tag.folk" r]
+    }
+     set code [read $path]
+     close $path
 
      # Wish $tag is outlined green
      Claim $tag has program code $code