From 7cc43a18192477f09e16089c8bacc7f23d4a86aa Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 12 Aug 2012 20:43:04 +0100
Subject: [PATCH] manual-gcode-generator: allow ws before !; support orgx/orgy

---
 manual-gcode-generator | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/manual-gcode-generator b/manual-gcode-generator
index c9e452e..16a0c66 100755
--- a/manual-gcode-generator
+++ b/manual-gcode-generator
@@ -11,7 +11,7 @@ sub readdata () {
     while (<>) {
 	chomp or die;
 	s/\s+$//;
-	s/^\!\s*/!/;
+	s/^\s*\!\s*/!/;
 	$l .= $_;
 	next if $l =~ s/\\$//;
 
@@ -49,6 +49,8 @@ defvar('retractfeedrate',1800);
 defvar('movefeedrate',7800);
 defvar('zlift',0.1);
 defvar('zprint');
+defvar('orgx',0);
+defvar('orgy',0);
 
 sub float_g ($) {
     my ($f) = @_;
@@ -86,6 +88,14 @@ sub proc ($) {
 		m/\,/ or die $!;
 		[ $`, $', !!$jerk ]; # '];
 	    } @coords;
+	    foreach my $co (@coords) {
+		foreach my $xy (qw(0 1)) {
+		    my $xyv = $co->[$xy];
+		    next unless $xyv =~ s/^\@//;
+		    my $orgxy = ($c{orgx},$c{orgy})[$xy];
+		    $co->[$xy] = float_g($xyv + $orgxy);
+		}
+	    }
 	    my $extrudepos=$c{restart};
 	    pl("G92 E0");
 	    my $zmove=$c{zprint}+$c{zlift};
-- 
2.30.2