X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=commitid.scad.pl;h=053bcc32f91fe6f7d5051cd26edfb4fed785df08;hb=d9f979afb3faa0ba92f86d5c5221a59f0dd8a89f;hp=7d13fb2dd97e31c99d95453978cfb47e2251bb26;hpb=d60aedb03f0b079ca09d30492b4a74f6c6b8c5cc;p=reprap-play.git diff --git a/commitid.scad.pl b/commitid.scad.pl index 7d13fb2..053bcc3 100755 --- a/commitid.scad.pl +++ b/commitid.scad.pl @@ -25,7 +25,7 @@ $SIG{__WARN__} = sub { die @_; }; # generate a form FORM containing TEXT # TEXT can contain newlines (final newline usually undesirable) # if FORM not specified, generates Arg0 Arg1 Arg2 in sequence -# character set is SPC 0-9 a-f + * (`*' glyph is `=/='). +# character set is SPC 0-9 a-f + * # # We generate a physical indication of which commit was used. # @@ -52,51 +52,47 @@ $SIG{__WARN__} = sub { die @_; }; # # We can generate these forms: # -# Tiny3: -# Tiny4: -# Tiny5: -# Tiny6: -# Tiny7: -# Tiny8: +# In each case: +# if tree is dirty, * is suffixed or prefixed to count or commitid +# if tree has untracked files, + is added +# (where it is added depends on the Form; in any case it does not +# change the size, but steals space from digits) +# +# Small2 Small3 ... Small10: # git rev-list --first-parent --count HEAD # typically 3-4 characters but we allow for up to 6 # padded with zeroes; if too long we reduce mod 10^n -# eg -# Tiny4 1070 -# If tree is dirty, + or * is suffixed, reducing number of -# digits by 1. +# eg if the count is 123456 +# Small5 3456* +# Small8 __123456 (where _ are spaces) # -# Tiny4Q: -# Tiny6Q: -# Tiny9Q: -# same but in two lines eg -# Tiny4Q 10 -# 70 +# Small2S Small4S ... Small10S: +# Small3T Small9T: +# same but split into two lines (S) or three lines (T) eg +# Small4S 45 Small6T _3 +# 6* 45 +# 6* # -# Git4 Git4Q -# Git6 Git6Q -# Git8 Git8Q +# Git2 Git3 ... Git10: +# Git4S Git6S ... Git10S: +# Git6T Git9T: # git-rev-parse HEAD (prefix of requested length) -# eg -# Git6 82f2a2 -# If tree is dirty, + or * is suffixed to commitid, -# reducing number of hex digits by 1. - -# Full3 -# Full4 -# Full5 -# Full6 -# Full7 -# Full8 -# Full9 -# Full10 +# eg if the commitid is abcdef0123... +# Git5 abcd* + +# Full4 Full6 ... Full10: # git-rev-list --first-parent --count HEAD # git-rev-parse HEAD # eg -# Full6 1070 -# 82f2a2 -# If tree is dirty, + or * is suffixed to count (but not to -# commitid) reducing number of digits by 1. +# Full6 abcdef Full8 abcdef01 +# 23456* _123456* +# +# Full6T Full9T ... Full30T +# as Full but commit is split over two lines +# for a 3-line message; eg +# Full9T abc +# de* +# 456 # # FontDemo # @@ -123,6 +119,15 @@ sub chrmodname ($) { return "Commitid__chr_$chrx"; } +our $gtm_demo_i = -1; +our $gtm_demo_j; +our @gtm_demo_o; + +sub gentextmodule_demo_start_batch () { + $gtm_demo_j = 0; + $gtm_demo_i++; +} + sub gentextmodule ($@) { my ($form, @lines) = @_; my $modb = "Commitid_$form"; @@ -135,9 +140,9 @@ sub gentextmodule ($@) { $y--; my $x = 0; foreach my $chr (split //, $line) { - next if $chr !~ m/\S/; p sprintf " translate([%d * 0.8, %d * 1.2]) %s();\n", - $x, $y, chrmodname $chr; + $x, $y, chrmodname $chr + if $chr =~ m/\S/; $x++; } $cols = $x if $x > $cols; @@ -148,8 +153,20 @@ sub gentextmodule ($@) { p " d=Commitid_depth();\n"; p " translate([0,0,-d]) linear_extrude(height=d*2) ${modb}_2D();\n"; p "}\n"; + p sprintf "function %s_sz() = Commitid__scale() * 0.1 * [ %d, %d ];\n", $modb, 2 * ($cols * 4 - 1), 2 * (@lines * 6 - 1); + + push @gtm_demo_o, < $sz - ? substr($whole, $lw-$sz) - : sprintf "%${sz}s", $whole; + my $spare = $sz - $lw - (length $prefix); + return + ($spare > 0 ? (' ' x $spare) : ''). + $prefix. + substr($whole, ($spare < 0 ? -$spare : 0)); } -sub ljustt ($$$) { # always includes $suffix +sub ljustt ($$;$) { my ($sz, $whole, $suffix) = @_; + $suffix //= ''; $sz -= length $suffix; return sprintf "%-${sz}.${sz}s%s", $whole, $suffix; } +sub gentextmodule_q ($$$) { + my ($form, $s, $lines) = @_; + $gtm_demo_j++; + my $l = length $s; + return if $l % $lines; + my $e = $l/$lines; + return if $e < 2; + $gtm_demo_j--; + gentextmodule($form, $s =~ m/.{$e}/g); +} + sub gentextmodule_plusq ($$) { my ($form, $s) = @_; - my $l = length $s; gentextmodule($form, $s); - if (!($l & 1) && $l>=4) { - gentextmodule("${form}Q", substr($s,0,$l/2), substr($s,$l/2)); - } + gentextmodule_q("${form}S", $s, 2); + gentextmodule_q("${form}T", $s, 3); } our @gcmd; @@ -306,17 +337,26 @@ sub do_git () { $git_object = gitoutput qw(rev-parse HEAD); } - foreach my $sz (3..8) { - gentextmodule_plusq("Tiny$sz", rjustt($sz, $git_count.$git_dirty)) + foreach my $sz (2..10) { + gentextmodule_demo_start_batch(); + + gentextmodule_plusq("Small$sz", rjustt($sz, $git_count, $git_dirty)) if defined $git_count; gentextmodule_plusq("Git$sz", ljustt($sz, $git_object, $git_dirty)) if defined $git_object; - gentextmodule("Full$sz", - rjustt($sz, $git_count.$git_dirty), - ljustt($sz, $git_object, '')) - if defined $git_count && defined $git_object; + if (defined $git_count && defined $git_object) { + gentextmodule("Full$sz", + ljustt($sz, $git_object), + rjustt($sz, $git_count, $git_dirty)); + + my $e = $sz; + gentextmodule("Full".($e*3)."T", + ljustt($e*2, $git_object, $git_dirty) + =~ m/.{$e}/g, + rjustt($e, $git_count)); + } } } @@ -344,10 +384,17 @@ while (@ARGV) { $do_git //= defined($argcounter) ? '' : 'co'; +gentextmodule_demo_start_batch(); gentextmodule('FontDemo', @demo); do_git(); +p "module Commitid_2DDemo(){\n"; +p " st = Commitid__scale() * [ 10, 5 ];\n"; +p " e = Commitid_pixelsz();\n"; +p $_ foreach @gtm_demo_o; +p "}\n"; + flush STDOUT or die $!; close STDOUT or die $!; @@ -379,8 +426,8 @@ a b c d e f + * - r - # ### -### # - # ### - L + # # + # \#/ +### ### + # /#\ + # #