X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Ffmt-bindings;h=d2dd1adfca5e19b92ee56723d40123df05922d9a;hb=5dd4c33915c4521de92ef78704c3e026ed3c9459;hp=0ab6b3c34d321805bc122ee910a9947fbf5686da;hpb=19fa64610bc1212d18fd7fff527e00a71a8f39a4;p=ardour.git diff --git a/tools/fmt-bindings b/tools/fmt-bindings index 0ab6b3c34d..d2dd1adfca 100755 --- a/tools/fmt-bindings +++ b/tools/fmt-bindings @@ -23,8 +23,8 @@ $group_number = 0; $platform = linux; $winkey = 'Win'; -$make_cheatsheet = 1; -$make_accelmap = 0; +$make_cheatsheet = 0; +$make_accelmap = 1; $merge_from = ""; $html = 0; @@ -264,7 +264,7 @@ while () { } } - # print the accelmap output + # store the accelmap output if ($key =~ /^\+/) { # remove + and don't print it in the accelmap @@ -280,9 +280,12 @@ while () { $b =~ s/SECONDARY/Secondary-/; $b =~ s/TERTIARY/Tertiary-/; $b =~ s/LEVEL4/Level4-/; - + + $g = $group_names{$gkey}; + $g =~ s/\\&/&/g; + $bref = $owner_bindings{$owner}; - push (@$bref, [ $action, $b ]); + push (@$bref, [ $action, $b, $g]); } } @@ -294,6 +297,9 @@ while () { $bref = $group_bindings{$key}; push (@$bref, [$binding, $text]); + $sref = $section_text{$key}; + push (@$sref, [$owner]); + next; } @@ -304,19 +310,19 @@ if ($make_accelmap) { print "\n"; foreach $owner (keys %owner_bindings) { - print " \n \n \n"; $bindings = $owner_bindings{$owner}; shift (@$bindings); # remove initial empty element for my $binding (@$bindings) { - print ' \n"; + print ' \n"; } print " \n \n"; } # merge in the "fixed" bindings that are not defined by the argument given to this program - # namely, the step editor and the mixer windows + # this covers things like the step editor, monitor and processor box bindings - foreach $hardcoded_bindings ("mixer.bindings", "step_editing.bindings") { + foreach $hardcoded_bindings ("mixer.bindings", "step_editing.bindings", "monitor.bindings", "processor_box.bindings") { $path = File::Spec->catfile (dirname ($ARGV[0]), $hardcoded_bindings); open HARDCODED, "<", $path or die $!; while () { @@ -325,7 +331,7 @@ if ($make_accelmap) { close HARDCODED; } - print "\n"; + print "\n"; } if ($make_accelmap || !$make_cheatsheet) {