allow waf (& hopefully still scons) to correctly generate key bindings files

git-svn-id: svn://localhost/ardour2/branches/3.0@5091 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/SAE-de-keypad.bindings.in

@@ -6,166 +6,166 @@
 ;; punctuation
 (gtk_accel_path "<Actions>/Editor/center-playhead" "Escape")
 (gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
-(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>period")
+(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<@PRIMARY@>period")
-(gtk_accel_path "<Actions>/Transport/record-roll" "<%PRIMARY%>space")
+(gtk_accel_path "<Actions>/Transport/record-roll" "<@PRIMARY@>space")
-(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<@LEVEL4@>space")
 
-(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%PRIMARY%>comma")
+(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<@PRIMARY@>comma")
 
-(gtk_accel_path "<Actions>/Editor/align-regions-end" "<%PRIMARY%><%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-end" "<@PRIMARY@><@SECONDARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-end-relative" "<%PRIMARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-end-relative" "<@PRIMARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-start" "<%LEVEL4%><%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-start" "<@LEVEL4@><@SECONDARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<%LEVEL4%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<@LEVEL4@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<@SECONDARY@>less")
 (gtk_accel_path "<Actions>/Editor/align-regions-sync-relative" "less")
 
 ; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "semicolon")
 ; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe")
 (gtk_accel_path "<Actions>/Editor/cycle-edit-point" "asciicircum")
-(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<%SECONDARY%>asciicircum")
+(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<@SECONDARY@>asciicircum")
 
 (gtk_accel_path "<Actions>/Editor/extend-range-to-end-of-region" "rightanglebracket")
 (gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket")
 
-(gtk_accel_path "<Actions>/Editor/trim-from-start" "<%TERTIARY%>braceleft")
+(gtk_accel_path "<Actions>/Editor/trim-from-start" "<@TERTIARY@>braceleft")
-(gtk_accel_path "<Actions>/Editor/trim-to-end" "<%TERTIARY%>braceright")
+(gtk_accel_path "<Actions>/Editor/trim-to-end" "<@TERTIARY@>braceright")
 
-(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<@LEVEL4@>space")
-(gtk_accel_path "<Actions>/Editor/play-edit-range" "<%SECONDARY%>space")
+(gtk_accel_path "<Actions>/Editor/play-edit-range" "<@SECONDARY@>space")
 
 ;; letters
 
 ;; OBERE ZEILE
 
 (gtk_accel_path "<Actions>/Editor/set-fade-in-length" "q")
-(gtk_accel_path "<Actions>/Common/Quit" "<%PRIMARY%>q")
+(gtk_accel_path "<Actions>/Common/Quit" "<@PRIMARY@>q")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<%SECONDARY%>q")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<@SECONDARY@>q")
 (gtk_accel_path "<Actions>/Editor/set-playhead" "w")
 ;; note that ctrl-w is special and consumed by the keyboard snooper
 
 
-(gtk_accel_path "<Actions>/Main/Close" "<%PRIMARY%>w")
+(gtk_accel_path "<Actions>/Main/Close" "<@PRIMARY@>w")
 (gtk_accel_path "<Actions>/Editor/set-fade-out-length" "e")
-(gtk_accel_path "<Actions>/Main/ExportSession" "<%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Main/ExportSession" "<@PRIMARY@>e")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<%SECONDARY%>e")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<@SECONDARY@>e")
-(gtk_accel_path "<Actions>/Editor/export-region" "<%PRIMARY%><%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/export-region" "<@PRIMARY@><@TERTIARY@>e")
-(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<@TERTIARY@>e")
-; (gtk_accel_path "<Actions>/Common/goto-editor" "<%SECONDARY%>e")
+; (gtk_accel_path "<Actions>/Common/goto-editor" "<@SECONDARY@>e")
-(gtk_accel_path "<Actions>/Editor/redo" "<%PRIMARY%><%TERTIARY%>z")
+(gtk_accel_path "<Actions>/Editor/redo" "<@PRIMARY@><@TERTIARY@>z")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "r")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
-(gtk_accel_path "<Actions>/Editor/reverse-region" "<%LEVEL4%>r")
+(gtk_accel_path "<Actions>/Editor/reverse-region" "<@LEVEL4@>r")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "t")
-(gtk_accel_path "<Actions>/Common/ToggleThemeManager" "<%WINDOW%>t")
+(gtk_accel_path "<Actions>/Common/ToggleThemeManager" "<@WINDOW@>t")
-(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<%LEVEL4%>t")
+(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<@LEVEL4@>t")
 (gtk_accel_path "<Actions>/Editor/split-region" "y")
 (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
-(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%PRIMARY%>i")
+(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@PRIMARY@>i")
-(gtk_accel_path "<Actions>/Editor/invert-selection" "<%TERTIARY%>i")
+(gtk_accel_path "<Actions>/Editor/invert-selection" "<@TERTIARY@>i")
-(gtk_accel_path "<Actions>/Main/Open" "<%PRIMARY%>o")
+(gtk_accel_path "<Actions>/Main/Open" "<@PRIMARY@>o")
-(gtk_accel_path "<Actions>/Main/Recent" "<%PRIMARY%><%TERTIARY%>o")
+(gtk_accel_path "<Actions>/Main/Recent" "<@PRIMARY@><@TERTIARY@>o")
-(gtk_accel_path "<Actions>/Editor/naturalize-region" "<%LEVEL4%>o")
+(gtk_accel_path "<Actions>/Editor/naturalize-region" "<@LEVEL4@>o")
 (gtk_accel_path "<Actions>/Transport/TogglePunch" "p")
-(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<%TERTIARY%>p")
+(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<@TERTIARY@>p")
 
 ;; MITTELZEILE
 
 (gtk_accel_path "<Actions>/Editor/trim-front" "a")
-(gtk_accel_path "<Actions>/Editor/select-all" "<%PRIMARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all" "<@PRIMARY@>a")
-(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<%TERTIARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<@TERTIARY@>a")
-(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<%TERTIARY%><%SECONDARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<@TERTIARY@><@SECONDARY@>a")
 (gtk_accel_path "<Actions>/Editor/play-selected-regions" "s")
-(gtk_accel_path "<Actions>/Common/Save" "<%PRIMARY%>s")
+(gtk_accel_path "<Actions>/Common/Save" "<@PRIMARY@>s")
-(gtk_accel_path "<Actions>/Main/Snapshot" "<%PRIMARY%><%TERTIARY%>s")
+(gtk_accel_path "<Actions>/Main/Snapshot" "<@PRIMARY@><@TERTIARY@>s")
 (gtk_accel_path "<Actions>/Editor/trim-back" "d")
-(gtk_accel_path "<Actions>/Editor/duplicate-region" "<%PRIMARY%>d")
+(gtk_accel_path "<Actions>/Editor/duplicate-region" "<@PRIMARY@>d")
-(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<%PRIMARY%><%TERTIARY%>d")
+(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<@PRIMARY@><@TERTIARY@>d")
 (gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "f")
-(gtk_accel_path "<Actions>/Editor/toggle-rhythm-ferret" "<%WINDOW%>f")
+(gtk_accel_path "<Actions>/Editor/toggle-rhythm-ferret" "<@WINDOW@>f")
 ; (gtk_accel_path "<Actions>/Editor/set-edit-point" "g")
 ; (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-gain" "g")
 (gtk_accel_path "<Actions>/Editor/nudge-backward" "g")
 (gtk_accel_path "<Actions>/Editor/nudge-forward" "h")
-(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<%SECONDARY%>k")
+(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<@SECONDARY@>k")
-(gtk_accel_path "<Actions>/Common/ToggleLocations" "<%SECONDARY%>l")
+(gtk_accel_path "<Actions>/Common/ToggleLocations" "<@SECONDARY@>l")
 (gtk_accel_path "<Actions>/Transport/Loop" "l")
-(gtk_accel_path "<Actions>/Editor/lock-region" "<%LEVEL4%>l")
+(gtk_accel_path "<Actions>/Editor/lock-region" "<@LEVEL4@>l")
-(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<%TERTIARY%>l")
+(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<@TERTIARY@>l")
 
 ;; UNTERE ZEILE
 
 (gtk_accel_path "<Actions>/Editor/zoom-to-region" "z")
-(gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
+(gtk_accel_path "<Actions>/Editor/undo" "<@PRIMARY@>z")
-(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<%SECONDARY%>z")
+(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<@SECONDARY@>z")
-(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>z")
+(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<@TERTIARY@>z")
 (gtk_accel_path "<Actions>/Editor/editor-separate" "x")
-(gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
+(gtk_accel_path "<Actions>/Editor/editor-cut" "<@PRIMARY@>x")
 (gtk_accel_path "<Actions>/Editor/crop" "c")
-(gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c")
+(gtk_accel_path "<Actions>/Editor/editor-copy" "<@PRIMARY@>c")
-(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%SECONDARY%>c")
+(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<@SECONDARY@>c")
-(gtk_accel_path "<Actions>/Editor/editor-paste" "<%PRIMARY%>v")
+(gtk_accel_path "<Actions>/Editor/editor-paste" "<@PRIMARY@>v")
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "b")
-(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<%SECONDARY%>b")
+(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<@SECONDARY@>b")
 (gtk_accel_path "<Actions>/Editor/normalize-region" "n")
-(gtk_accel_path "<Actions>/Main/New" "<%PRIMARY%>n")
+(gtk_accel_path "<Actions>/Main/New" "<@PRIMARY@>n")
-(gtk_accel_path "<Actions>/Main/AddTrackBus" "<%PRIMARY%><%TERTIARY%>n")
+(gtk_accel_path "<Actions>/Main/AddTrackBus" "<@PRIMARY@><@TERTIARY@>n")
-(gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<%SECONDARY%>m")
+(gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<@SECONDARY@>m")
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "KP_Enter")
 (gtk_accel_path "<Actions>/Editor/mute-unmute-region" "m")
 
 ;; arrow keys, navigation etc.
 
 (gtk_accel_path "<Actions>/Editor/playhead-to-edit" "Return")
-(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<%SECONDARY%>Return")
+(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<@SECONDARY@>Return")
 (gtk_accel_path "<Actions>/Editor/editor-delete" "BackSpace")
-(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<%PRIMARY%>Delete")
+(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<@PRIMARY@>Delete")
 
-(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<@LEVEL4@>leftarrow")
 (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary" "leftarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-backward-to-grid" "<%TERTIARY%><%LEVEL4%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-backward-to-grid" "<@TERTIARY@><@LEVEL4@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "<@TERTIARY@><@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Transport/Rewind" "<%PRIMARY%>leftarrow")
+(gtk_accel_path "<Actions>/Transport/Rewind" "<@PRIMARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<@TERTIARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<%PRIMARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<@PRIMARY@><@SECONDARY@>leftarrow")
 
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<@PRIMARY@><@TERTIARY@>leftarrow")
 
-(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<%LEVEL4%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<@LEVEL4@>rightarrow")
 (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "rightarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-forward-to-grid" "<%TERTIARY%><%LEVEL4%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-forward-to-grid" "<@TERTIARY@><@LEVEL4@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "<@TERTIARY@><@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Transport/Forward" "<%PRIMARY%>rightarrow")
+(gtk_accel_path "<Actions>/Transport/Forward" "<@PRIMARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<%SECONDARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<@SECONDARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<@TERTIARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<%PRIMARY%><%SECONDARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<@PRIMARY@><@SECONDARY@>rightarrow")
 
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<@PRIMARY@><@TERTIARY@>rightarrow")
 
 
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-down" "Page_Down")
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-up" "Page_Up")
 
 (gtk_accel_path "<Actions>/Transport/GotoEnd" "End")
-(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%PRIMARY%><%TERTIARY%>End")
+(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<@PRIMARY@><@TERTIARY@>End")
-(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<%TERTIARY%>End")
+(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<@TERTIARY@>End")
 
 (gtk_accel_path "<Actions>/Transport/GotoStart" "Home")
-(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%PRIMARY%><%TERTIARY%>Home")
+(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<@PRIMARY@><@TERTIARY@>Home")
-(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<%TERTIARY%>Home")
+(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<@TERTIARY@>Home")
 
 (gtk_accel_path "<Actions>/Editor/select-prev-route" "uparrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<%PRIMARY%>uparrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<@PRIMARY@>uparrow")
-(gtk_accel_path "<Actions>/Editor/move-selected-tracks-up" "<%TERTIARY%>uparrow")
+(gtk_accel_path "<Actions>/Editor/move-selected-tracks-up" "<@TERTIARY@>uparrow")
 (gtk_accel_path "<Actions>/Editor/select-next-route" "downarrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<%PRIMARY%>downarrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<@PRIMARY@>downarrow")
-(gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<%TERTIARY%>downarrow")
+(gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<@TERTIARY@>downarrow")
 
 ;; keypad
 
-(gtk_accel_path "<Actions>/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up")
+(gtk_accel_path "<Actions>/Editor/finish-add-range" "<@TERTIARY@><@PRIMARY@>KP_Up")
 (gtk_accel_path "<Actions>/Editor/goto-mark-1" "KP_1")
 (gtk_accel_path "<Actions>/Editor/goto-mark-2" "KP_2")
 (gtk_accel_path "<Actions>/Editor/goto-mark-3" "KP_3")
@@ -175,10 +175,10 @@
 (gtk_accel_path "<Actions>/Editor/goto-mark-7" "KP_7")
 (gtk_accel_path "<Actions>/Editor/goto-mark-8" "KP_8")
 (gtk_accel_path "<Actions>/Editor/goto-mark-9" "KP_9")
-(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract")
+(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<@PRIMARY@>KP_Subtract")
 (gtk_accel_path "<Actions>/Editor/cut-region-gain" "KP_Subtract")
 
-(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add")
+(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<@PRIMARY@>KP_Add")
 (gtk_accel_path "<Actions>/Editor/boost-region-gain" "KP_Add")
 
 (gtk_accel_path "<Actions>/Transport/GotoZero" "KP_Insert")
@@ -186,9 +186,9 @@
 ;; F-N keys
 
 ; (gtk_accel_path "<Actions>/Editor/start-range" "F1")
-; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1")
+; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<@TERTIARY@>F1")
 ; (gtk_accel_path "<Actions>/Editor/finish-range" "F2")
-; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2")
+; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<@TERTIARY@>F2")
 ; (gtk_accel_path "<Actions>/Editor/brush-at-mouse" "F3")
 (gtk_accel_path "<Actions>/Editor/step-mouse-mode" "F1")
 (gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F2")
@@ -207,11 +207,11 @@
 (gtk_accel_path "<Actions>/Transport/ToggleClick" "7")
 
 (gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "8")
-(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<%LEVEL4%>8")
+(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<@LEVEL4@>8")
-; (gtk_accel_path "<Actions>/Editor/loop-region" "<%PRIMARY%>8")
+; (gtk_accel_path "<Actions>/Editor/loop-region" "<@PRIMARY@>8")
 
 (gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "9")
-(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<%LEVEL4%>9")
+(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<@LEVEL4@>9")
 
-(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "<%LEVEL4%>0")
+(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "<@LEVEL4@>0")
 (gtk_accel_path "<Actions>/Editor/set-tempo-from-edit-range" "0")

gtk2_ardour/SAE-de-nokeypad.bindings.in

@@ -6,165 +6,165 @@
 ;; punctuation
 (gtk_accel_path "<Actions>/Editor/center-playhead" "Escape")
 (gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
-(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>period")
+(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<@PRIMARY@>period")
-(gtk_accel_path "<Actions>/Transport/record-roll" "<%PRIMARY%>space")
+(gtk_accel_path "<Actions>/Transport/record-roll" "<@PRIMARY@>space")
-(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<@LEVEL4@>space")
 
-(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%PRIMARY%>comma")
+(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<@PRIMARY@>comma")
 
-(gtk_accel_path "<Actions>/Editor/align-regions-end" "<%PRIMARY%><%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-end" "<@PRIMARY@><@SECONDARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-end-relative" "<%PRIMARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-end-relative" "<@PRIMARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-start" "<%LEVEL4%><%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-start" "<@LEVEL4@><@SECONDARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<%LEVEL4%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<@LEVEL4@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<@SECONDARY@>less")
 (gtk_accel_path "<Actions>/Editor/align-regions-sync-relative" "less")
 
 ; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "semicolon")
 ; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe")
 (gtk_accel_path "<Actions>/Editor/cycle-edit-point" "asciicircum")
-(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<%SECONDARY%>asciicircum")
+(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<@SECONDARY@>asciicircum")
 
 (gtk_accel_path "<Actions>/Editor/extend-range-to-end-of-region" "rightanglebracket")
 (gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket")
 
-(gtk_accel_path "<Actions>/Editor/trim-from-start" "<%TERTIARY%>braceleft")
+(gtk_accel_path "<Actions>/Editor/trim-from-start" "<@TERTIARY@>braceleft")
-(gtk_accel_path "<Actions>/Editor/trim-to-end" "<%TERTIARY%>braceright")
+(gtk_accel_path "<Actions>/Editor/trim-to-end" "<@TERTIARY@>braceright")
 
-(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<@LEVEL4@>space")
-(gtk_accel_path "<Actions>/Editor/play-edit-range" "<%SECONDARY%>space")
+(gtk_accel_path "<Actions>/Editor/play-edit-range" "<@SECONDARY@>space")
 
 ;; letters
 
 ;; OBERE ZEILE
 
 (gtk_accel_path "<Actions>/Editor/set-fade-in-length" "q")
-(gtk_accel_path "<Actions>/Common/Quit" "<%PRIMARY%>q")
+(gtk_accel_path "<Actions>/Common/Quit" "<@PRIMARY@>q")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<%SECONDARY%>q")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<@SECONDARY@>q")
 (gtk_accel_path "<Actions>/Editor/set-playhead" "w")
 ;; note that ctrl-w is special and consumed by the keyboard snooper
 
 
-(gtk_accel_path "<Actions>/Main/Close" "<%PRIMARY%>w")
+(gtk_accel_path "<Actions>/Main/Close" "<@PRIMARY@>w")
 (gtk_accel_path "<Actions>/Editor/set-fade-out-length" "e")
-(gtk_accel_path "<Actions>/Main/ExportSession" "<%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Main/ExportSession" "<@PRIMARY@>e")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<%SECONDARY%>e")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<@SECONDARY@>e")
-(gtk_accel_path "<Actions>/Editor/export-region" "<%PRIMARY%><%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/export-region" "<@PRIMARY@><@TERTIARY@>e")
-(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<@TERTIARY@>e")
-; (gtk_accel_path "<Actions>/Common/goto-editor" "<%SECONDARY%>e")
+; (gtk_accel_path "<Actions>/Common/goto-editor" "<@SECONDARY@>e")
-(gtk_accel_path "<Actions>/Editor/redo" "<%PRIMARY%><%TERTIARY%>z")
+(gtk_accel_path "<Actions>/Editor/redo" "<@PRIMARY@><@TERTIARY@>z")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "r")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
-(gtk_accel_path "<Actions>/Editor/reverse-region" "<%LEVEL4%>r")
+(gtk_accel_path "<Actions>/Editor/reverse-region" "<@LEVEL4@>r")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "t")
-(gtk_accel_path "<Actions>/Common/ToggleThemeManager" "<%SECONDARY%>t")
+(gtk_accel_path "<Actions>/Common/ToggleThemeManager" "<@SECONDARY@>t")
-(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<%LEVEL4%>t")
+(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<@LEVEL4@>t")
 (gtk_accel_path "<Actions>/Editor/split-region" "y")
 (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
-(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%PRIMARY%>i")
+(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@PRIMARY@>i")
-(gtk_accel_path "<Actions>/Editor/invert-selection" "<%TERTIARY%>i")
+(gtk_accel_path "<Actions>/Editor/invert-selection" "<@TERTIARY@>i")
-(gtk_accel_path "<Actions>/Main/Open" "<%PRIMARY%>o")
+(gtk_accel_path "<Actions>/Main/Open" "<@PRIMARY@>o")
-(gtk_accel_path "<Actions>/Main/Recent" "<%PRIMARY%><%TERTIARY%>o")
+(gtk_accel_path "<Actions>/Main/Recent" "<@PRIMARY@><@TERTIARY@>o")
-(gtk_accel_path "<Actions>/Editor/naturalize-region" "<%LEVEL4%>o")
+(gtk_accel_path "<Actions>/Editor/naturalize-region" "<@LEVEL4@>o")
 (gtk_accel_path "<Actions>/Transport/TogglePunch" "p")
-(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<%TERTIARY%>p")
+(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<@TERTIARY@>p")
 
 ;; MITTELZEILE
 
 (gtk_accel_path "<Actions>/Editor/trim-front" "a")
-(gtk_accel_path "<Actions>/Editor/select-all" "<%PRIMARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all" "<@PRIMARY@>a")
-(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<%TERTIARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<@TERTIARY@>a")
-(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<%TERTIARY%><%SECONDARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<@TERTIARY@><@SECONDARY@>a")
 (gtk_accel_path "<Actions>/Editor/play-selected-regions" "s")
-(gtk_accel_path "<Actions>/Common/Save" "<%PRIMARY%>s")
+(gtk_accel_path "<Actions>/Common/Save" "<@PRIMARY@>s")
-(gtk_accel_path "<Actions>/Main/Snapshot" "<%PRIMARY%><%TERTIARY%>s")
+(gtk_accel_path "<Actions>/Main/Snapshot" "<@PRIMARY@><@TERTIARY@>s")
 (gtk_accel_path "<Actions>/Editor/trim-back" "d")
-(gtk_accel_path "<Actions>/Editor/duplicate-region" "<%PRIMARY%>d")
+(gtk_accel_path "<Actions>/Editor/duplicate-region" "<@PRIMARY@>d")
-(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<%PRIMARY%><%TERTIARY%>d")
+(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<@PRIMARY@><@TERTIARY@>d")
 (gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "f")
-(gtk_accel_path "<Actions>/Editor/toggle-rhythm-ferret" "<%SECONDARY%>f")
+(gtk_accel_path "<Actions>/Editor/toggle-rhythm-ferret" "<@SECONDARY@>f")
 ; (gtk_accel_path "<Actions>/Editor/set-edit-point" "g")
 ; (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-gain" "g")
 (gtk_accel_path "<Actions>/Editor/nudge-backward" "g")
 (gtk_accel_path "<Actions>/Editor/nudge-forward" "h")
-(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<%SECONDARY%>k")
+(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<@SECONDARY@>k")
-(gtk_accel_path "<Actions>/Common/ToggleLocations" "<%SECONDARY%>l")
+(gtk_accel_path "<Actions>/Common/ToggleLocations" "<@SECONDARY@>l")
 (gtk_accel_path "<Actions>/Transport/Loop" "l")
-(gtk_accel_path "<Actions>/Editor/lock-region" "<%LEVEL4%>l")
+(gtk_accel_path "<Actions>/Editor/lock-region" "<@LEVEL4@>l")
-(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<%TERTIARY%>l")
+(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<@TERTIARY@>l")
 
 ;; UNTERE ZEILE
 
 (gtk_accel_path "<Actions>/Editor/zoom-to-region" "z")
-(gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
+(gtk_accel_path "<Actions>/Editor/undo" "<@PRIMARY@>z")
-(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<%SECONDARY%>z")
+(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<@SECONDARY@>z")
-(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>z")
+(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<@TERTIARY@>z")
 (gtk_accel_path "<Actions>/Editor/editor-separate" "x")
-(gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
+(gtk_accel_path "<Actions>/Editor/editor-cut" "<@PRIMARY@>x")
 (gtk_accel_path "<Actions>/Editor/crop" "c")
-(gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c")
+(gtk_accel_path "<Actions>/Editor/editor-copy" "<@PRIMARY@>c")
-(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%SECONDARY%>c")
+(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<@SECONDARY@>c")
-(gtk_accel_path "<Actions>/Editor/editor-paste" "<%PRIMARY%>v")
+(gtk_accel_path "<Actions>/Editor/editor-paste" "<@PRIMARY@>v")
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "b")
-(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<%SECONDARY%>b")
+(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<@SECONDARY@>b")
 (gtk_accel_path "<Actions>/Editor/normalize-region" "n")
-(gtk_accel_path "<Actions>/Main/New" "<%PRIMARY%>n")
+(gtk_accel_path "<Actions>/Main/New" "<@PRIMARY@>n")
-(gtk_accel_path "<Actions>/Main/AddTrackBus" "<%PRIMARY%><%TERTIARY%>n")
+(gtk_accel_path "<Actions>/Main/AddTrackBus" "<@PRIMARY@><@TERTIARY@>n")
-(gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<%SECONDARY%>m")
+(gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<@SECONDARY@>m")
 (gtk_accel_path "<Actions>/Editor/mute-unmute-region" "m")
 
 ;; arrow keys, navigation etc.
 
 (gtk_accel_path "<Actions>/Editor/playhead-to-edit" "Return")
-(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<%SECONDARY%>Return")
+(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<@SECONDARY@>Return")
 (gtk_accel_path "<Actions>/Editor/editor-delete" "BackSpace")
-(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<%PRIMARY%>BackSpace")
+(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<@PRIMARY@>BackSpace")
 
-(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<@LEVEL4@>leftarrow")
 (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary" "leftarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-backward-to-grid" "<%TERTIARY%><%LEVEL4%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-backward-to-grid" "<@TERTIARY@><@LEVEL4@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "<@TERTIARY@><@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Transport/Rewind" "<%PRIMARY%>leftarrow")
+(gtk_accel_path "<Actions>/Transport/Rewind" "<@PRIMARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<@TERTIARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<%PRIMARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<@PRIMARY@><@SECONDARY@>leftarrow")
 
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<@PRIMARY@><@TERTIARY@>leftarrow")
 
-(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<%LEVEL4%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<@LEVEL4@>rightarrow")
 (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "rightarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-forward-to-grid" "<%TERTIARY%><%LEVEL4%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-forward-to-grid" "<@TERTIARY@><@LEVEL4@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "<@TERTIARY@><@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Transport/Forward" "<%PRIMARY%>rightarrow")
+(gtk_accel_path "<Actions>/Transport/Forward" "<@PRIMARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<%SECONDARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<@SECONDARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<@TERTIARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<%PRIMARY%><%SECONDARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<@PRIMARY@><@SECONDARY@>rightarrow")
 
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<@PRIMARY@><@TERTIARY@>rightarrow")
 
 
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-down" "Page_Down")
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-up" "Page_Up")
 
 (gtk_accel_path "<Actions>/Transport/GotoEnd" "End")
-(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%PRIMARY%><%TERTIARY%>End")
+(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<@PRIMARY@><@TERTIARY@>End")
-(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<%TERTIARY%>End")
+(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<@TERTIARY@>End")
 
 (gtk_accel_path "<Actions>/Transport/GotoStart" "Home")
-(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%PRIMARY%><%TERTIARY%>Home")
+(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<@PRIMARY@><@TERTIARY@>Home")
-(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<%TERTIARY%>Home")
+(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<@TERTIARY@>Home")
 
 (gtk_accel_path "<Actions>/Editor/select-prev-route" "uparrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<%PRIMARY%>uparrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<@PRIMARY@>uparrow")
-(gtk_accel_path "<Actions>/Editor/move-selected-tracks-up" "<%TERTIARY%>uparrow")
+(gtk_accel_path "<Actions>/Editor/move-selected-tracks-up" "<@TERTIARY@>uparrow")
 (gtk_accel_path "<Actions>/Editor/select-next-route" "downarrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<%PRIMARY%>downarrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<@PRIMARY@>downarrow")
-(gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<%TERTIARY%>downarrow")
+(gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<@TERTIARY@>downarrow")
 
 ;; keypad
 
-(gtk_accel_path "<Actions>/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up")
+(gtk_accel_path "<Actions>/Editor/finish-add-range" "<@TERTIARY@><@PRIMARY@>KP_Up")
 (gtk_accel_path "<Actions>/Editor/goto-mark-1" "KP_1")
 (gtk_accel_path "<Actions>/Editor/goto-mark-2" "KP_2")
 (gtk_accel_path "<Actions>/Editor/goto-mark-3" "KP_3")
@@ -174,10 +174,10 @@
 (gtk_accel_path "<Actions>/Editor/goto-mark-7" "KP_7")
 (gtk_accel_path "<Actions>/Editor/goto-mark-8" "KP_8")
 (gtk_accel_path "<Actions>/Editor/goto-mark-9" "KP_9")
-; (gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract")
+; (gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<@PRIMARY@>KP_Subtract")
 (gtk_accel_path "<Actions>/Editor/cut-region-gain" "j")
 
-; (gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add")
+; (gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<@PRIMARY@>KP_Add")
 (gtk_accel_path "<Actions>/Editor/boost-region-gain" "k")
 
 (gtk_accel_path "<Actions>/Transport/GotoZero" "KP_Insert")
@@ -185,9 +185,9 @@
 ;; F-N keys
 
 ; (gtk_accel_path "<Actions>/Editor/start-range" "F1")
-; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1")
+; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<@TERTIARY@>F1")
 ; (gtk_accel_path "<Actions>/Editor/finish-range" "F2")
-; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2")
+; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<@TERTIARY@>F2")
 ; (gtk_accel_path "<Actions>/Editor/brush-at-mouse" "F3")
 (gtk_accel_path "<Actions>/Editor/step-mouse-mode" "F1")
 (gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F2")
@@ -206,12 +206,12 @@
 (gtk_accel_path "<Actions>/Transport/ToggleClick" "7")
 
 (gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "8")
-(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<%LEVEL4%>8")
+(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<@LEVEL4@>8")
-; (gtk_accel_path "<Actions>/Editor/loop-region" "<%PRIMARY%>8")
+; (gtk_accel_path "<Actions>/Editor/loop-region" "<@PRIMARY@>8")
 
 (gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "9")
-(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<%LEVEL4%>9")
+(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<@LEVEL4@>9")
 
-(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "<%LEVEL4%>0")
+(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "<@LEVEL4@>0")
 (gtk_accel_path "<Actions>/Editor/set-tempo-from-edit-range" "0")
 

gtk2_ardour/SAE-us-keypad.bindings.in

@@ -6,164 +6,164 @@
 ;; punctuation
 (gtk_accel_path "<Actions>/Editor/center-playhead" "Escape")
 (gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
-(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>period")
+(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<@PRIMARY@>period")
-(gtk_accel_path "<Actions>/Transport/record-roll" "<%PRIMARY%>space")
+(gtk_accel_path "<Actions>/Transport/record-roll" "<@PRIMARY@>space")
-(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<@LEVEL4@>space")
-(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%PRIMARY%>comma")
+(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<@PRIMARY@>comma")
-(gtk_accel_path "<Actions>/Editor/align-regions-end" "<%PRIMARY%><%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-end" "<@PRIMARY@><@SECONDARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-end-relative" "<%PRIMARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-end-relative" "<@PRIMARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-start" "<%LEVEL4%><%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-start" "<@LEVEL4@><@SECONDARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<%LEVEL4%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<@LEVEL4@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<@SECONDARY@>less")
 (gtk_accel_path "<Actions>/Editor/align-regions-sync-relative" "less")
 
 ; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "semicolon")
 ; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe")
 (gtk_accel_path "<Actions>/Editor/cycle-edit-point" "asciicircum")
-(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<%SECONDARY%>asciicircum")
+(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<@SECONDARY@>asciicircum")
 
 (gtk_accel_path "<Actions>/Editor/extend-range-to-end-of-region" "rightanglebracket")
 (gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket")
 
-(gtk_accel_path "<Actions>/Editor/trim-from-start" "<%TERTIARY%>braceleft")
+(gtk_accel_path "<Actions>/Editor/trim-from-start" "<@TERTIARY@>braceleft")
-(gtk_accel_path "<Actions>/Editor/trim-to-end" "<%TERTIARY%>braceright")
+(gtk_accel_path "<Actions>/Editor/trim-to-end" "<@TERTIARY@>braceright")
 
-(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<@LEVEL4@>space")
-(gtk_accel_path "<Actions>/Editor/play-edit-range" "<%SECONDARY%>space")
+(gtk_accel_path "<Actions>/Editor/play-edit-range" "<@SECONDARY@>space")
 
 ;; letters
 
 ;; OBERE ZEILE
 
 (gtk_accel_path "<Actions>/Editor/set-fade-in-length" "q")
-(gtk_accel_path "<Actions>/Common/Quit" "<%PRIMARY%>q")
+(gtk_accel_path "<Actions>/Common/Quit" "<@PRIMARY@>q")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<%SECONDARY%>q")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<@SECONDARY@>q")
 (gtk_accel_path "<Actions>/Editor/set-playhead" "w")
 ;; note that ctrl-w is special and consumed by the keyboard snooper
 
 
-(gtk_accel_path "<Actions>/Main/Close" "<%PRIMARY%>w")
+(gtk_accel_path "<Actions>/Main/Close" "<@PRIMARY@>w")
 (gtk_accel_path "<Actions>/Editor/set-fade-out-length" "e")
-(gtk_accel_path "<Actions>/Main/ExportSession" "<%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Main/ExportSession" "<@PRIMARY@>e")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<%SECONDARY%>e")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<@SECONDARY@>e")
-(gtk_accel_path "<Actions>/Editor/export-region" "<%PRIMARY%><%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/export-region" "<@PRIMARY@><@TERTIARY@>e")
-(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<@TERTIARY@>e")
-; (gtk_accel_path "<Actions>/Common/goto-editor" "<%SECONDARY%>e")
+; (gtk_accel_path "<Actions>/Common/goto-editor" "<@SECONDARY@>e")
-(gtk_accel_path "<Actions>/Editor/redo" "<%PRIMARY%><%TERTIARY%>z")
+(gtk_accel_path "<Actions>/Editor/redo" "<@PRIMARY@><@TERTIARY@>z")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "r")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
-(gtk_accel_path "<Actions>/Editor/reverse-region" "<%LEVEL4%>r")
+(gtk_accel_path "<Actions>/Editor/reverse-region" "<@LEVEL4@>r")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "t")
-(gtk_accel_path "<Actions>/Common/ToggleThemeManager" "<%WINDOW%>t")
+(gtk_accel_path "<Actions>/Common/ToggleThemeManager" "<@WINDOW@>t")
-(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<%LEVEL4%>t")
+(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<@LEVEL4@>t")
 (gtk_accel_path "<Actions>/Editor/split-region" "z")
 (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
-(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%PRIMARY%>i")
+(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@PRIMARY@>i")
-(gtk_accel_path "<Actions>/Editor/invert-selection" "<%TERTIARY%>i")
+(gtk_accel_path "<Actions>/Editor/invert-selection" "<@TERTIARY@>i")
-(gtk_accel_path "<Actions>/Main/Open" "<%PRIMARY%>o")
+(gtk_accel_path "<Actions>/Main/Open" "<@PRIMARY@>o")
-(gtk_accel_path "<Actions>/Main/Recent" "<%PRIMARY%><%TERTIARY%>o")
+(gtk_accel_path "<Actions>/Main/Recent" "<@PRIMARY@><@TERTIARY@>o")
-(gtk_accel_path "<Actions>/Editor/naturalize-region" "<%LEVEL4%>o")
+(gtk_accel_path "<Actions>/Editor/naturalize-region" "<@LEVEL4@>o")
 (gtk_accel_path "<Actions>/Transport/TogglePunch" "p")
-(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<%TERTIARY%>p")
+(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<@TERTIARY@>p")
 
 ;; MITTELZEILE
 
 (gtk_accel_path "<Actions>/Editor/trim-front" "a")
-(gtk_accel_path "<Actions>/Editor/select-all" "<%PRIMARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all" "<@PRIMARY@>a")
-(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<%TERTIARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<@TERTIARY@>a")
-(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<%TERTIARY%><%SECONDARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<@TERTIARY@><@SECONDARY@>a")
 (gtk_accel_path "<Actions>/Editor/play-selected-regions" "s")
-(gtk_accel_path "<Actions>/Common/Save" "<%PRIMARY%>s")
+(gtk_accel_path "<Actions>/Common/Save" "<@PRIMARY@>s")
-(gtk_accel_path "<Actions>/Main/Snapshot" "<%PRIMARY%><%TERTIARY%>s")
+(gtk_accel_path "<Actions>/Main/Snapshot" "<@PRIMARY@><@TERTIARY@>s")
 (gtk_accel_path "<Actions>/Editor/trim-back" "d")
-(gtk_accel_path "<Actions>/Editor/duplicate-region" "<%PRIMARY%>d")
+(gtk_accel_path "<Actions>/Editor/duplicate-region" "<@PRIMARY@>d")
-(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<%PRIMARY%><%TERTIARY%>d")
+(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<@PRIMARY@><@TERTIARY@>d")
 (gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "f")
-(gtk_accel_path "<Actions>/Editor/toggle-rhythm-ferret" "<%WINDOW%>f")
+(gtk_accel_path "<Actions>/Editor/toggle-rhythm-ferret" "<@WINDOW@>f")
 ; (gtk_accel_path "<Actions>/Editor/set-edit-point" "g")
 ; (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-gain" "g")
 (gtk_accel_path "<Actions>/Editor/nudge-backward" "g")
 (gtk_accel_path "<Actions>/Editor/nudge-forward" "h")
-(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<%SECONDARY%>k")
+(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<@SECONDARY@>k")
-(gtk_accel_path "<Actions>/Common/ToggleLocations" "<%SECONDARY%>l")
+(gtk_accel_path "<Actions>/Common/ToggleLocations" "<@SECONDARY@>l")
 (gtk_accel_path "<Actions>/Transport/Loop" "l")
-(gtk_accel_path "<Actions>/Editor/lock-region" "<%LEVEL4%>l")
+(gtk_accel_path "<Actions>/Editor/lock-region" "<@LEVEL4@>l")
-(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<%TERTIARY%>l")
+(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<@TERTIARY@>l")
 
 ;; UNTERE ZEILE
 
 (gtk_accel_path "<Actions>/Editor/zoom-to-region" "y")
-(gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
+(gtk_accel_path "<Actions>/Editor/undo" "<@PRIMARY@>z")
-(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<%SECONDARY%>y")
+(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<@SECONDARY@>y")
-(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>y")
+(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<@TERTIARY@>y")
 (gtk_accel_path "<Actions>/Editor/editor-separate" "x")
-(gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
+(gtk_accel_path "<Actions>/Editor/editor-cut" "<@PRIMARY@>x")
 (gtk_accel_path "<Actions>/Editor/crop" "c")
-(gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c")
+(gtk_accel_path "<Actions>/Editor/editor-copy" "<@PRIMARY@>c")
-(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%SECONDARY%>c")
+(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<@SECONDARY@>c")
-(gtk_accel_path "<Actions>/Editor/editor-paste" "<%PRIMARY%>v")
+(gtk_accel_path "<Actions>/Editor/editor-paste" "<@PRIMARY@>v")
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "b")
-(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<%SECONDARY%>b")
+(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<@SECONDARY@>b")
 (gtk_accel_path "<Actions>/Editor/normalize-region" "n")
-(gtk_accel_path "<Actions>/Main/New" "<%PRIMARY%>n")
+(gtk_accel_path "<Actions>/Main/New" "<@PRIMARY@>n")
-(gtk_accel_path "<Actions>/Main/AddTrackBus" "<%PRIMARY%><%TERTIARY%>n")
+(gtk_accel_path "<Actions>/Main/AddTrackBus" "<@PRIMARY@><@TERTIARY@>n")
-(gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<%SECONDARY%>m")
+(gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<@SECONDARY@>m")
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "KP_Enter")
 (gtk_accel_path "<Actions>/Editor/mute-unmute-region" "m")
 
 ;; arrow keys, navigation etc.
 
 (gtk_accel_path "<Actions>/Editor/playhead-to-edit" "Return")
-(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<%SECONDARY%>Return")
+(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<@SECONDARY@>Return")
 (gtk_accel_path "<Actions>/Editor/editor-delete" "BackSpace")
-(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<%PRIMARY%>Delete")
+(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<@PRIMARY@>Delete")
 
-(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<@LEVEL4@>leftarrow")
 (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary" "leftarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-backward-to-grid" "<%TERTIARY%><%LEVEL4%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-backward-to-grid" "<@TERTIARY@><@LEVEL4@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "<@TERTIARY@><@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Transport/Rewind" "<%PRIMARY%>leftarrow")
+(gtk_accel_path "<Actions>/Transport/Rewind" "<@PRIMARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<@TERTIARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<%PRIMARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<@PRIMARY@><@SECONDARY@>leftarrow")
 
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<@PRIMARY@><@TERTIARY@>leftarrow")
 
-(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<%LEVEL4%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<@LEVEL4@>rightarrow")
 (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "rightarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-forward-to-grid" "<%TERTIARY%><%LEVEL4%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-forward-to-grid" "<@TERTIARY@><@LEVEL4@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "<@TERTIARY@><@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Transport/Forward" "<%PRIMARY%>rightarrow")
+(gtk_accel_path "<Actions>/Transport/Forward" "<@PRIMARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<%SECONDARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<@SECONDARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<@TERTIARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<%PRIMARY%><%SECONDARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<@PRIMARY@><@SECONDARY@>rightarrow")
 
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<@PRIMARY@><@TERTIARY@>rightarrow")
 
 
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-down" "Page_Down")
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-up" "Page_Up")
 
 (gtk_accel_path "<Actions>/Transport/GotoEnd" "End")
-(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%PRIMARY%><%TERTIARY%>End")
+(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<@PRIMARY@><@TERTIARY@>End")
-(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<%TERTIARY%>End")
+(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<@TERTIARY@>End")
 
 (gtk_accel_path "<Actions>/Transport/GotoStart" "Home")
-(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%PRIMARY%><%TERTIARY%>Home")
+(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<@PRIMARY@><@TERTIARY@>Home")
-(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<%TERTIARY%>Home")
+(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<@TERTIARY@>Home")
 
 (gtk_accel_path "<Actions>/Editor/select-prev-route" "uparrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<%PRIMARY%>uparrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<@PRIMARY@>uparrow")
-(gtk_accel_path "<Actions>/Editor/move-selected-tracks-up" "<%TERTIARY%>uparrow")
+(gtk_accel_path "<Actions>/Editor/move-selected-tracks-up" "<@TERTIARY@>uparrow")
 (gtk_accel_path "<Actions>/Editor/select-next-route" "downarrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<%PRIMARY%>downarrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<@PRIMARY@>downarrow")
-(gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<%TERTIARY%>downarrow")
+(gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<@TERTIARY@>downarrow")
 
 ;; keypad
 
-(gtk_accel_path "<Actions>/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up")
+(gtk_accel_path "<Actions>/Editor/finish-add-range" "<@TERTIARY@><@PRIMARY@>KP_Up")
 (gtk_accel_path "<Actions>/Editor/goto-mark-1" "KP_1")
 (gtk_accel_path "<Actions>/Editor/goto-mark-2" "KP_2")
 (gtk_accel_path "<Actions>/Editor/goto-mark-3" "KP_3")
@@ -173,10 +173,10 @@
 (gtk_accel_path "<Actions>/Editor/goto-mark-7" "KP_7")
 (gtk_accel_path "<Actions>/Editor/goto-mark-8" "KP_8")
 (gtk_accel_path "<Actions>/Editor/goto-mark-9" "KP_9")
-(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract")
+(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<@PRIMARY@>KP_Subtract")
 (gtk_accel_path "<Actions>/Editor/cut-region-gain" "KP_Subtract")
 
-(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add")
+(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<@PRIMARY@>KP_Add")
 (gtk_accel_path "<Actions>/Editor/boost-region-gain" "KP_Add")
 
 (gtk_accel_path "<Actions>/Transport/GotoZero" "KP_Insert")
@@ -184,9 +184,9 @@
 ;; F-N keys
 
 ; (gtk_accel_path "<Actions>/Editor/start-range" "F1")
-; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1")
+; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<@TERTIARY@>F1")
 ; (gtk_accel_path "<Actions>/Editor/finish-range" "F2")
-; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2")
+; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<@TERTIARY@>F2")
 ; (gtk_accel_path "<Actions>/Editor/brush-at-mouse" "F3")
 (gtk_accel_path "<Actions>/Editor/step-mouse-mode" "F1")
 (gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F2")
@@ -205,13 +205,13 @@
 (gtk_accel_path "<Actions>/Transport/ToggleClick" "7")
 
 (gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "8")
-(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<%LEVEL4%>8")
+(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<@LEVEL4@>8")
-; (gtk_accel_path "<Actions>/Editor/loop-region" "<%PRIMARY%>8")
+; (gtk_accel_path "<Actions>/Editor/loop-region" "<@PRIMARY@>8")
 
 (gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "9")
-(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<%LEVEL4%>9")
+(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<@LEVEL4@>9")
 
-(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "<%LEVEL4%>0")
+(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "<@LEVEL4@>0")
 (gtk_accel_path "<Actions>/Editor/set-tempo-from-edit-range" "0")
 
 ;;
@@ -303,7 +303,7 @@
 ; (gtk_accel_path "<Actions>/Main/Cleanup" "")
 ; (gtk_accel_path "<Actions>/Main/CleanupUnused" "")
 ; (gtk_accel_path "<Actions>/Main/ControlSurfaces" "")
-; (gtk_accel_path "<Actions>/Main/Export" "<%PRIMARY%>e")
+; (gtk_accel_path "<Actions>/Main/Export" "<@PRIMARY@>e")
 ; (gtk_accel_path "<Actions>/Main/ExportRangeMarkers" "")
 ; (gtk_accel_path "<Actions>/Main/ExportSelection" "")
 ; (gtk_accel_path "<Actions>/Main/FlushWastebasket" "")
@@ -419,7 +419,7 @@
 ; (gtk_accel_path "<Actions>/redirectmenu/cut" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/deactivate" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/deactivate_all" "")
-; (gtk_accel_path "<Actions>/redirectmenu/deselectall" "<%PRIMARY%><%TERTIARY%>a")
+; (gtk_accel_path "<Actions>/redirectmenu/deselectall" "<@PRIMARY@><@TERTIARY@>a")
 ; (gtk_accel_path "<Actions>/redirectmenu/edit" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/newinsert" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/newplugin" "")

gtk2_ardour/SAE-us-nokeypad.bindings.in

@@ -6,163 +6,163 @@
 ;; punctuation
 (gtk_accel_path "<Actions>/Editor/center-playhead" "Escape")
 (gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
-(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>period")
+(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<@PRIMARY@>period")
-(gtk_accel_path "<Actions>/Transport/record-roll" "<%PRIMARY%>space")
+(gtk_accel_path "<Actions>/Transport/record-roll" "<@PRIMARY@>space")
-(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<@LEVEL4@>space")
-(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%PRIMARY%>comma")
+(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<@PRIMARY@>comma")
-(gtk_accel_path "<Actions>/Editor/align-regions-end" "<%PRIMARY%><%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-end" "<@PRIMARY@><@SECONDARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-end-relative" "<%PRIMARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-end-relative" "<@PRIMARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-start" "<%LEVEL4%><%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-start" "<@LEVEL4@><@SECONDARY@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<%LEVEL4%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<@LEVEL4@>less")
-(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<@SECONDARY@>less")
 (gtk_accel_path "<Actions>/Editor/align-regions-sync-relative" "less")
 
 ; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "semicolon")
 ; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe")
 (gtk_accel_path "<Actions>/Editor/cycle-edit-point" "asciicircum")
-(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<%SECONDARY%>asciicircum")
+(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<@SECONDARY@>asciicircum")
 
 (gtk_accel_path "<Actions>/Editor/extend-range-to-end-of-region" "rightanglebracket")
 (gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket")
 
-(gtk_accel_path "<Actions>/Editor/trim-from-start" "<%TERTIARY%>braceleft")
+(gtk_accel_path "<Actions>/Editor/trim-from-start" "<@TERTIARY@>braceleft")
-(gtk_accel_path "<Actions>/Editor/trim-to-end" "<%TERTIARY%>braceright")
+(gtk_accel_path "<Actions>/Editor/trim-to-end" "<@TERTIARY@>braceright")
 
-(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<@LEVEL4@>space")
-(gtk_accel_path "<Actions>/Editor/play-edit-range" "<%SECONDARY%>space")
+(gtk_accel_path "<Actions>/Editor/play-edit-range" "<@SECONDARY@>space")
 
 ;; letters
 
 ;; OBERE ZEILE
 
 (gtk_accel_path "<Actions>/Editor/set-fade-in-length" "q")
-(gtk_accel_path "<Actions>/Common/Quit" "<%PRIMARY%>q")
+(gtk_accel_path "<Actions>/Common/Quit" "<@PRIMARY@>q")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<%SECONDARY%>q")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<@SECONDARY@>q")
 (gtk_accel_path "<Actions>/Editor/set-playhead" "w")
 ;; note that ctrl-w is special and consumed by the keyboard snooper
 
 
-(gtk_accel_path "<Actions>/Main/Close" "<%PRIMARY%>w")
+(gtk_accel_path "<Actions>/Main/Close" "<@PRIMARY@>w")
 (gtk_accel_path "<Actions>/Editor/set-fade-out-length" "e")
-(gtk_accel_path "<Actions>/Main/ExportSession" "<%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Main/ExportSession" "<@PRIMARY@>e")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<%SECONDARY%>e")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<@SECONDARY@>e")
-(gtk_accel_path "<Actions>/Editor/export-region" "<%PRIMARY%><%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/export-region" "<@PRIMARY@><@TERTIARY@>e")
-(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<@TERTIARY@>e")
-; (gtk_accel_path "<Actions>/Common/goto-editor" "<%SECONDARY%>e")
+; (gtk_accel_path "<Actions>/Common/goto-editor" "<@SECONDARY@>e")
-(gtk_accel_path "<Actions>/Editor/redo" "<%PRIMARY%><%TERTIARY%>z")
+(gtk_accel_path "<Actions>/Editor/redo" "<@PRIMARY@><@TERTIARY@>z")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "r")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
-(gtk_accel_path "<Actions>/Editor/reverse-region" "<%LEVEL4%>r")
+(gtk_accel_path "<Actions>/Editor/reverse-region" "<@LEVEL4@>r")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "t")
-(gtk_accel_path "<Actions>/Common/ToggleThemeManager" "<%SECONDARY%>t")
+(gtk_accel_path "<Actions>/Common/ToggleThemeManager" "<@SECONDARY@>t")
-(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<%LEVEL4%>t")
+(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<@LEVEL4@>t")
 (gtk_accel_path "<Actions>/Editor/split-region" "z")
 (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
-(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%PRIMARY%>i")
+(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@PRIMARY@>i")
-(gtk_accel_path "<Actions>/Editor/invert-selection" "<%TERTIARY%>i")
+(gtk_accel_path "<Actions>/Editor/invert-selection" "<@TERTIARY@>i")
-(gtk_accel_path "<Actions>/Main/Open" "<%PRIMARY%>o")
+(gtk_accel_path "<Actions>/Main/Open" "<@PRIMARY@>o")
-(gtk_accel_path "<Actions>/Main/Recent" "<%PRIMARY%><%TERTIARY%>o")
+(gtk_accel_path "<Actions>/Main/Recent" "<@PRIMARY@><@TERTIARY@>o")
-(gtk_accel_path "<Actions>/Editor/naturalize-region" "<%LEVEL4%>o")
+(gtk_accel_path "<Actions>/Editor/naturalize-region" "<@LEVEL4@>o")
 (gtk_accel_path "<Actions>/Transport/TogglePunch" "p")
-(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<%TERTIARY%>p")
+(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<@TERTIARY@>p")
 
 ;; MITTELZEILE
 
 (gtk_accel_path "<Actions>/Editor/trim-front" "a")
-(gtk_accel_path "<Actions>/Editor/select-all" "<%PRIMARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all" "<@PRIMARY@>a")
-(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<%TERTIARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<@TERTIARY@>a")
-(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<%TERTIARY%><%SECONDARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<@TERTIARY@><@SECONDARY@>a")
 (gtk_accel_path "<Actions>/Editor/play-selected-regions" "s")
-(gtk_accel_path "<Actions>/Common/Save" "<%PRIMARY%>s")
+(gtk_accel_path "<Actions>/Common/Save" "<@PRIMARY@>s")
-(gtk_accel_path "<Actions>/Main/Snapshot" "<%PRIMARY%><%TERTIARY%>s")
+(gtk_accel_path "<Actions>/Main/Snapshot" "<@PRIMARY@><@TERTIARY@>s")
 (gtk_accel_path "<Actions>/Editor/trim-back" "d")
-(gtk_accel_path "<Actions>/Editor/duplicate-region" "<%PRIMARY%>d")
+(gtk_accel_path "<Actions>/Editor/duplicate-region" "<@PRIMARY@>d")
-(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<%PRIMARY%><%TERTIARY%>d")
+(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<@PRIMARY@><@TERTIARY@>d")
 (gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "f")
-(gtk_accel_path "<Actions>/Editor/toggle-rhythm-ferret" "<%SECONDARY%>f")
+(gtk_accel_path "<Actions>/Editor/toggle-rhythm-ferret" "<@SECONDARY@>f")
 ; (gtk_accel_path "<Actions>/Editor/set-edit-point" "g")
 ; (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-gain" "g")
 (gtk_accel_path "<Actions>/Editor/nudge-backward" "g")
 (gtk_accel_path "<Actions>/Editor/nudge-forward" "h")
-(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<%SECONDARY%>k")
+(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<@SECONDARY@>k")
-(gtk_accel_path "<Actions>/Common/ToggleLocations" "<%SECONDARY%>l")
+(gtk_accel_path "<Actions>/Common/ToggleLocations" "<@SECONDARY@>l")
 (gtk_accel_path "<Actions>/Transport/Loop" "l")
-(gtk_accel_path "<Actions>/Editor/lock-region" "<%LEVEL4%>l")
+(gtk_accel_path "<Actions>/Editor/lock-region" "<@LEVEL4@>l")
-(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<%TERTIARY%>l")
+(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<@TERTIARY@>l")
 
 ;; UNTERE ZEILE
 
 (gtk_accel_path "<Actions>/Editor/zoom-to-region" "y")
-(gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
+(gtk_accel_path "<Actions>/Editor/undo" "<@PRIMARY@>z")
-(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<%SECONDARY%>y")
+(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<@SECONDARY@>y")
-(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>y")
+(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<@TERTIARY@>y")
 (gtk_accel_path "<Actions>/Editor/editor-separate" "x")
-(gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
+(gtk_accel_path "<Actions>/Editor/editor-cut" "<@PRIMARY@>x")
 (gtk_accel_path "<Actions>/Editor/crop" "c")
-(gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c")
+(gtk_accel_path "<Actions>/Editor/editor-copy" "<@PRIMARY@>c")
-(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%SECONDARY%>c")
+(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<@SECONDARY@>c")
-(gtk_accel_path "<Actions>/Editor/editor-paste" "<%PRIMARY%>v")
+(gtk_accel_path "<Actions>/Editor/editor-paste" "<@PRIMARY@>v")
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "b")
-(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<%SECONDARY%>b")
+(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<@SECONDARY@>b")
 (gtk_accel_path "<Actions>/Editor/normalize-region" "n")
-(gtk_accel_path "<Actions>/Main/New" "<%PRIMARY%>n")
+(gtk_accel_path "<Actions>/Main/New" "<@PRIMARY@>n")
-(gtk_accel_path "<Actions>/Main/AddTrackBus" "<%PRIMARY%><%TERTIARY%>n")
+(gtk_accel_path "<Actions>/Main/AddTrackBus" "<@PRIMARY@><@TERTIARY@>n")
-(gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<%SECONDARY%>m")
+(gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<@SECONDARY@>m")
 (gtk_accel_path "<Actions>/Editor/mute-unmute-region" "m")
 
 ;; arrow keys, navigation etc.
 
 (gtk_accel_path "<Actions>/Editor/playhead-to-edit" "Return")
-(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<%SECONDARY%>Return")
+(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<@SECONDARY@>Return")
 (gtk_accel_path "<Actions>/Editor/editor-delete" "BackSpace")
-(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<%PRIMARY%>BackSpace")
+(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<@PRIMARY@>BackSpace")
 
-(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<@LEVEL4@>leftarrow")
 (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary" "leftarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-backward-to-grid" "<%TERTIARY%><%LEVEL4%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-backward-to-grid" "<@TERTIARY@><@LEVEL4@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "<@TERTIARY@><@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Transport/Rewind" "<%PRIMARY%>leftarrow")
+(gtk_accel_path "<Actions>/Transport/Rewind" "<@PRIMARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<@TERTIARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<%PRIMARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<@PRIMARY@><@SECONDARY@>leftarrow")
 
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<@PRIMARY@><@TERTIARY@>leftarrow")
 
-(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<%LEVEL4%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<@LEVEL4@>rightarrow")
 (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "rightarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-forward-to-grid" "<%TERTIARY%><%LEVEL4%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-forward-to-grid" "<@TERTIARY@><@LEVEL4@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "<@TERTIARY@><@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Transport/Forward" "<%PRIMARY%>rightarrow")
+(gtk_accel_path "<Actions>/Transport/Forward" "<@PRIMARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<%SECONDARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<@SECONDARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<@TERTIARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<%PRIMARY%><%SECONDARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<@PRIMARY@><@SECONDARY@>rightarrow")
 
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<@PRIMARY@><@TERTIARY@>rightarrow")
 
 
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-down" "Page_Down")
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-up" "Page_Up")
 
 (gtk_accel_path "<Actions>/Transport/GotoEnd" "End")
-(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%PRIMARY%><%TERTIARY%>End")
+(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<@PRIMARY@><@TERTIARY@>End")
-(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<%TERTIARY%>End")
+(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<@TERTIARY@>End")
 
 (gtk_accel_path "<Actions>/Transport/GotoStart" "Home")
-(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%PRIMARY%><%TERTIARY%>Home")
+(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<@PRIMARY@><@TERTIARY@>Home")
-(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<%TERTIARY%>Home")
+(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<@TERTIARY@>Home")
 
 (gtk_accel_path "<Actions>/Editor/select-prev-route" "uparrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<%PRIMARY%>uparrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<@PRIMARY@>uparrow")
-(gtk_accel_path "<Actions>/Editor/move-selected-tracks-up" "<%TERTIARY%>uparrow")
+(gtk_accel_path "<Actions>/Editor/move-selected-tracks-up" "<@TERTIARY@>uparrow")
 (gtk_accel_path "<Actions>/Editor/select-next-route" "downarrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<%PRIMARY%>downarrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<@PRIMARY@>downarrow")
-(gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<%TERTIARY%>downarrow")
+(gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<@TERTIARY@>downarrow")
 
 ;; keypad
 
-(gtk_accel_path "<Actions>/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up")
+(gtk_accel_path "<Actions>/Editor/finish-add-range" "<@TERTIARY@><@PRIMARY@>KP_Up")
 (gtk_accel_path "<Actions>/Editor/goto-mark-1" "KP_1")
 (gtk_accel_path "<Actions>/Editor/goto-mark-2" "KP_2")
 (gtk_accel_path "<Actions>/Editor/goto-mark-3" "KP_3")
@@ -172,10 +172,10 @@
 (gtk_accel_path "<Actions>/Editor/goto-mark-7" "KP_7")
 (gtk_accel_path "<Actions>/Editor/goto-mark-8" "KP_8")
 (gtk_accel_path "<Actions>/Editor/goto-mark-9" "KP_9")
-; (gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract")
+; (gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<@PRIMARY@>KP_Subtract")
 (gtk_accel_path "<Actions>/Editor/cut-region-gain" "j")
 
-; (gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add")
+; (gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<@PRIMARY@>KP_Add")
 (gtk_accel_path "<Actions>/Editor/boost-region-gain" "k")
 
 (gtk_accel_path "<Actions>/Transport/GotoZero" "KP_Insert")
@@ -183,9 +183,9 @@
 ;; F-N keys
 
 ; (gtk_accel_path "<Actions>/Editor/start-range" "F1")
-; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1")
+; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<@TERTIARY@>F1")
 ; (gtk_accel_path "<Actions>/Editor/finish-range" "F2")
-; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2")
+; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<@TERTIARY@>F2")
 ; (gtk_accel_path "<Actions>/Editor/brush-at-mouse" "F3")
 (gtk_accel_path "<Actions>/Editor/step-mouse-mode" "F1")
 (gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F2")
@@ -204,12 +204,12 @@
 (gtk_accel_path "<Actions>/Transport/ToggleClick" "7")
 
 (gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "8")
-(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<%LEVEL4%>8")
+(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<@LEVEL4@>8")
-; (gtk_accel_path "<Actions>/Editor/loop-region" "<%PRIMARY%>8")
+; (gtk_accel_path "<Actions>/Editor/loop-region" "<@PRIMARY@>8")
 
 (gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "9")
-(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<%LEVEL4%>9")
+(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<@LEVEL4@>9")
 
-(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "<%LEVEL4%>0")
+(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "<@LEVEL4@>0")
 (gtk_accel_path "<Actions>/Editor/set-tempo-from-edit-range" "0")
 

gtk2_ardour/SConscript

@@ -451,20 +451,20 @@ if gtkardour['GTKOSX']:
 	#  NSCommand (aka "Command" aka "Apple" aka "Cauliflower") -> Meta
 	#  NSAlternate (aka "Option")  -> Mod1
 	#
-	keybindings_dict['%PRIMARY%'] = 'Meta'
+	keybindings_dict['@PRIMARY@'] = 'Meta'
-	keybindings_dict['%SECONDARY%'] = 'Mod1'
+	keybindings_dict['@SECONDARY@'] = 'Mod1'
-	keybindings_dict['%TERTIARY%'] = 'Shift'
+	keybindings_dict['@TERTIARY@'] = 'Shift'
-	keybindings_dict['%LEVEL4%'] = 'Ctrl'
+	keybindings_dict['@LEVEL4@'] = 'Ctrl'
-	keybindings_dict['%WINDOW%'] = 'Mod1'
+	keybindings_dict['@WINDOW@'] = 'Mod1'
 else:
 	#
 	# Ctrl, Alt, Shift, Mod4(Super/Windows/Hyper)
 	#
-	keybindings_dict['%PRIMARY%'] = 'Ctrl'
+	keybindings_dict['@PRIMARY@'] = 'Ctrl'
-	keybindings_dict['%SECONDARY%'] = 'Alt'
+	keybindings_dict['@SECONDARY@'] = 'Alt'
-	keybindings_dict['%TERTIARY%'] = 'Shift'
+	keybindings_dict['@TERTIARY@'] = 'Shift'
-	keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY']
+	keybindings_dict['@LEVEL4@'] = env['WINDOWS_KEY']
-	keybindings_dict['%WINDOW%'] = 'Alt'
+	keybindings_dict['@WINDOW@'] = 'Alt'
 
 for b in [ 'SAE-de-keypad',  'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'mnemonic-us', 'ergonomic-us' ]:
 	target_file = b + '.bindings'

gtk2_ardour/ergonomic-us.bindings.in

@@ -2,35 +2,35 @@
 ; this file is an automated accelerator map dump
 ;
 ; (gtk_accel_path "<Actions>/RegionList/RegionListSort" "")
-(gtk_accel_path "<Actions>/Common/Quit" "<%PRIMARY%>q")
+(gtk_accel_path "<Actions>/Common/Quit" "<@PRIMARY@>q")
-(gtk_accel_path "<Actions>/Common/Save" "<%PRIMARY%>s")
+(gtk_accel_path "<Actions>/Common/Save" "<@PRIMARY@>s")
 ; (gtk_accel_path "<Actions>/Editor/Pullup" "")
 ; (gtk_accel_path "<Actions>/Editor/zoom-to-session" "")
 ; (gtk_accel_path "<Actions>/JACK/JACKReconnect" "")
 ; (gtk_accel_path "<Actions>/Editor/Autoconnect" "")
 ; (gtk_accel_path "<Actions>/Editor/Edit" "")
 (gtk_accel_path "<Actions>/Editor/cycle-edit-point" "grave")
-(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<%SECONDARY%>grave")
+(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<@SECONDARY@>grave")
 (gtk_accel_path "<Actions>/Editor/toggle-edit-mode" "1")
 (gtk_accel_path "<Actions>/Editor/cycle-snap-mode" "2")
 (gtk_accel_path "<Actions>/Editor/cycle-snap-choice" "3")
 ; (gtk_accel_path "<Actions>/redirectmenu/copy" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffFaster" "")
-(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>space")
+(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<@PRIMARY@>space")
-(gtk_accel_path "<Actions>/Transport/record-roll" "<%TERTIARY%>space")
+(gtk_accel_path "<Actions>/Transport/record-roll" "<@TERTIARY@>space")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionLength" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffSlowest" "")
 ; (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-sync" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/deactivate_all" "")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionPosition" "")
 ; (gtk_accel_path "<Actions>/Editor/ZoomFocus" "")
-(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%SECONDARY%>i")
+(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@SECONDARY@>i")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffSlow" "")
 ; (gtk_accel_path "<Actions>/RegionList/rlHide" "")
 ; (gtk_accel_path "<Actions>/Main/Metering" "")
 (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "rightarrow")
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<@PRIMARY@><@TERTIARY@>rightarrow")
 ; (gtk_accel_path "<Actions>/Zoom/zoom-focus-playhead" "")
 ; (gtk_accel_path "<Actions>/Editor/center-edit-cursor" "")
 ; (gtk_accel_path "<Actions>/Editor/Monitoring" "")
@@ -40,19 +40,19 @@
 ; (gtk_accel_path "<Actions>/ShuttleActions/SetShuttleUnitsPercentage" "")
 ; (gtk_accel_path "<Actions>/Main/Close" "")
 ; (gtk_accel_path "<Actions>/Main/New" "")
-(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract")
+(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<@PRIMARY@>KP_Subtract")
 ; (gtk_accel_path "<Actions>/Editor/EditSelectRangeOptions" "")
 ; (gtk_accel_path "<Actions>/Transport/ToggleTimeMaster" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-thirds" "")
-(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<%TERTIARY%>a")
+(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<@TERTIARY@>a")
 ; (gtk_accel_path "<Actions>/Main/Export" "")
-(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<%PRIMARY%>KP_Right")
+(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<@PRIMARY@>KP_Right")
 ; (gtk_accel_path "<Actions>/Editor/Smpte30" "")
 ; (gtk_accel_path "<Actions>/Editor/playhead-to-range-start" "")
 ; (gtk_accel_path "<Actions>/Editor/Subframes" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte2997drop" "")
-(gtk_accel_path "<Actions>/Main/AddTrackBus" "<%PRIMARY%><%SECONDARY%>n")
+(gtk_accel_path "<Actions>/Main/AddTrackBus" "<@PRIMARY@><@SECONDARY@>n")
-(gtk_accel_path "<Actions>/Editor/align-regions-end" "<%LEVEL4%>a")
+(gtk_accel_path "<Actions>/Editor/align-regions-end" "<@LEVEL4@>a")
 ; (gtk_accel_path "<Actions>/JACK/JACKDisconnect" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffFast" "")
 ; (gtk_accel_path "<Actions>/options/FileDataFormatFloat" "")
@@ -63,17 +63,17 @@
 ; (gtk_accel_path "<Actions>/options/DoNotRunPluginsWhileRecording" "")
 ; (gtk_accel_path "<Actions>/Editor/PullupNone" "")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-range" "r")
-(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<%PRIMARY%>KP_Left")
+(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<@PRIMARY@>KP_Left")
 ; (gtk_accel_path "<Actions>/Main/AudioFileFormatData" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffFastest" "")
 (gtk_accel_path "<Actions>/Editor/play-selected-regions" "w")
-(gtk_accel_path "<Actions>/Editor/play-edit-range" "<%SECONDARY%>w")
+(gtk_accel_path "<Actions>/Editor/play-edit-range" "<@SECONDARY@>w")
-(gtk_accel_path "<Actions>/Transport/Forward" "<%PRIMARY%>rightarrow")
+(gtk_accel_path "<Actions>/Transport/Forward" "<@PRIMARY@>rightarrow")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-smpte-seconds" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-smpte-frame" "")
 ; (gtk_accel_path "<Actions>/Main/ExportSelection" "")
 ; (gtk_accel_path "<Actions>/options/StopPluginsWithTransport" "")
-(gtk_accel_path "<Actions>/Editor/editor-paste" "<%PRIMARY%>v")
+(gtk_accel_path "<Actions>/Editor/editor-paste" "<@PRIMARY@>v")
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-down" "Page_Down")
 (gtk_accel_path "<Actions>/Editor/select-next-route" "downarrow")
 (gtk_accel_path "<Actions>/Editor/select-prev-route" "uparrow")
@@ -89,7 +89,7 @@
 ; (gtk_accel_path "<Actions>/options/MeterHoldOff" "")
 ; (gtk_accel_path "<Actions>/options/OutputAutoConnectMaster" "")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency64" "")
-(gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
+(gtk_accel_path "<Actions>/Editor/undo" "<@PRIMARY@>z")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
 ; (gtk_accel_path "<Actions>/Editor/center-playhead" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-region-start" "")
@@ -101,7 +101,7 @@
 ; (gtk_accel_path "<Actions>/Editor/Smpte30drop" "")
 ; (gtk_accel_path "<Actions>/Zoom/zoom-focus-edit" "")
 (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary" "leftarrow")
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<@PRIMARY@><@TERTIARY@>leftarrow")
 ; (gtk_accel_path "<Actions>/Editor/EditCursorMovementOptions" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/activate_all" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/paste" "")
@@ -123,8 +123,8 @@
 ; (gtk_accel_path "<Actions>/Editor/RegionEditOps" "")
 ; (gtk_accel_path "<Actions>/Editor/snap-magnetic" "")
 ; (gtk_accel_path "<Actions>/Editor/playhead-to-range-end" "")
-(gtk_accel_path "<Actions>/Editor/scroll-playhead-forward" "<%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/scroll-playhead-forward" "<@TERTIARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/align-regions-sync-relative" "<%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/align-regions-sync-relative" "<@SECONDARY@>less")
 (gtk_accel_path "<Actions>/Editor/align-regions-sync" "less")
 ; (gtk_accel_path "<Actions>/Editor/EditSelectRegionOptions" "")
 (gtk_accel_path "<Actions>/Editor/crop" "c")
@@ -134,8 +134,8 @@
 ; (gtk_accel_path "<Actions>/Editor/MeterFalloff" "")
 ; (gtk_accel_path "<Actions>/RegionList/rlRemove" "")
 (gtk_accel_path "<Actions>/Transport/GotoStart" "Home")
-(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%TERTIARY%>Home")
+(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<@TERTIARY@>Home")
-(gtk_accel_path "<Actions>/Editor/scroll-playhead-backward" "<%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/scroll-playhead-backward" "<@TERTIARY@>leftarrow")
 (gtk_accel_path "<Actions>/Editor/split-region" "z")
 ; (gtk_accel_path "<Actions>/Transport/ToggleAutoInput" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-thirtyseconds" "")
@@ -149,47 +149,47 @@
 ; (gtk_accel_path "<Actions>/Editor/PullupPlus4Plus1" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-region-boundary" "")
 ; (gtk_accel_path "<Actions>/JACK/JACK" "")
-(gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
+(gtk_accel_path "<Actions>/Editor/editor-cut" "<@PRIMARY@>x")
 (gtk_accel_path "<Actions>/Editor/editor-separate" "F4")
 ; (gtk_accel_path "<Actions>/RegionList/SortAscending" "")
 ; (gtk_accel_path "<Actions>/Main/Help" "")
 ; (gtk_accel_path "<Actions>/options/UseExternalMonitoring" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte23976" "")
-(gtk_accel_path "<Actions>/Common/goto-editor" "<%WINDOW%>e")
+(gtk_accel_path "<Actions>/Common/goto-editor" "<@WINDOW@>e")
 (gtk_accel_path "<Actions>/Editor/select-all" "F14")
 (gtk_accel_path "<Actions>/Editor/invert-selection" "F15")
-(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add")
+(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<@PRIMARY@>KP_Add")
 ; (gtk_accel_path "<Actions>/options/ShowSoloMutes" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-eighths" "")
-(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<%TERTIARY%><%PRIMARY%>p")
+(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<@TERTIARY@><@PRIMARY@>p")
 (gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F11")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFileLength" "")
 ; (gtk_accel_path "<Actions>/Editor/Timecode" "")
 ; (gtk_accel_path "<Actions>/Transport/PlaySelection" "")
 ; (gtk_accel_path "<Actions>/Editor/PullupMinus4Minus1" "")
-(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%TERTIARY%><%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<@TERTIARY@><@PRIMARY@>e")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFileName" "")
 (gtk_accel_path "<Actions>/Editor/finish-range" "F2")
 (gtk_accel_path "<Actions>/Editor/select-range-between-cursors" "F16")
 (gtk_accel_path "<Actions>/Transport/Loop" "l")
 ; (gtk_accel_path "<Actions>/Editor/CrossfadesFull" "")
-(gtk_accel_path "<Actions>/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up")
+(gtk_accel_path "<Actions>/Editor/finish-add-range" "<@TERTIARY@><@PRIMARY@>KP_Up")
 ; (gtk_accel_path "<Actions>/options/SendMTC" "")
 ; (gtk_accel_path "<Actions>/Transport/TogglePunchOut" "")
-(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<%PRIMARY%>l")
+(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<@PRIMARY@>l")
-(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<@TERTIARY@>e")
 ; (gtk_accel_path "<Actions>/options/SoloInPlace" "")
 ; (gtk_accel_path "<Actions>/Main/Options" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffMedium" "")
 (gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "f")
 ; (gtk_accel_path "<Actions>/Main/SaveTemplate" "")
-(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<%PRIMARY%>uparrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<@PRIMARY@>uparrow")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionStartinFile" "")
 ; (gtk_accel_path "<Actions>/options/GainReduceFastTransport" "")
 ; (gtk_accel_path "<Actions>/Common/ToggleInspector" "")
 ; (gtk_accel_path "<Actions>/Transport/ToggleAutoPlay" "")
 ; (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-sync" "")
-(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<%SECONDARY%>Return")
+(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<@SECONDARY@>Return")
 ; (gtk_accel_path "<Actions>/Editor/LayerMoveAddHigher" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte60" "")
 ; (gtk_accel_path "<Actions>/Main/Open" "")
@@ -200,18 +200,18 @@
 ; (gtk_accel_path "<Actions>/Transport/ToggleAutoReturn" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte2997" "")
 ; (gtk_accel_path "<Actions>/Editor/ToggleWaveformVisibility" "")
-(gtk_accel_path "<Actions>/Editor/redo" "<%PRIMARY%>r")
+(gtk_accel_path "<Actions>/Editor/redo" "<@PRIMARY@>r")
 ; (gtk_accel_path "<Actions>/Main/ExportSession" "")
 ; (gtk_accel_path "<Actions>/options/InputAutoConnectPhysical" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-edit-cursor" "")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "t")
 ; (gtk_accel_path "<Actions>/JACK/Latency" "")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<@TERTIARY@>F2")
 ; (gtk_accel_path "<Actions>/redirectmenu/rename" "")
 ; (gtk_accel_path "<Actions>/RegionList/rlShowAuto" "")
-(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<%PRIMARY%>p")
+(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<@PRIMARY@>p")
 ; (gtk_accel_path "<Actions>/Main/Session" "")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<@TERTIARY@>F1")
 ; (gtk_accel_path "<Actions>/Main/AudioFileFormat" "")
 ; (gtk_accel_path "<Actions>/Transport/Transport" "")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-timefx" "t")
@@ -220,7 +220,7 @@
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-gain" "g")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-frame" "")
 ; (gtk_accel_path "<Actions>/Editor/SnapTo" "")
-(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<%PRIMARY%>downarrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<@PRIMARY@>downarrow")
 ; (gtk_accel_path "<Actions>/Editor/Crossfades" "")
 ; (gtk_accel_path "<Actions>/Editor/PullupPlus4" "")
 ; (gtk_accel_path "<Actions>/Main/MeteringHoldTime" "")
@@ -228,28 +228,28 @@
 ; (gtk_accel_path "<Actions>/Editor/Smpte24976" "")
 ; (gtk_accel_path "<Actions>/options/FileDataFormat24bit" "")
 ; (gtk_accel_path "<Actions>/Editor/SnapMode" "")
-(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%WINDOW%>o")
+(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<@WINDOW@>o")
 ; (gtk_accel_path "<Actions>/Editor/PullupMinus4" "")
-(gtk_accel_path "<Actions>/Common/goto-mixer" "<%WINDOW%>m")
+(gtk_accel_path "<Actions>/Common/goto-mixer" "<@WINDOW@>m")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFileCreationDate" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/activate" "")
 (gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket")
 ; (gtk_accel_path "<Actions>/Editor/PullupMinus1" "")
 ; (gtk_accel_path "<Actions>/Editor/snap-normal" "")
-(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<%WINDOW%>b")
+(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<@WINDOW@>b")
-(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<%WINDOW%>k")
+(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<@WINDOW@>k")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-asixteenthbeat" "")
-(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<%PRIMARY%>d")
+(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<@PRIMARY@>d")
 ; (gtk_accel_path "<Actions>/redirectmenu/edit" "")
 (gtk_accel_path "<Actions>/Editor/duplicate-region" "d")
-(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<%SECONDARY%>d")
+(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<@SECONDARY@>d")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency2048" "")
 ; (gtk_accel_path "<Actions>/Editor/ToggleWaveformsWhileRecording" "")
 ; (gtk_accel_path "<Actions>/Zoom/zoom-focus-right" "")
-(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<%PRIMARY%>Delete")
+(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<@PRIMARY@>Delete")
 ; (gtk_accel_path "<Actions>/options/FileHeaderFormatWAVE" "")
 (gtk_accel_path "<Actions>/Transport/GotoZero" "KP_0")
-(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%TERTIARY%>End")
+(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<@TERTIARY@>End")
 ; (gtk_accel_path "<Actions>/redirectmenu/cut" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/newinsert" "")
 ; (gtk_accel_path "<Actions>/options/UseMMC" "")
@@ -264,14 +264,14 @@
 ; (gtk_accel_path "<Actions>/Transport/ToggleVideoSync" "")
 (gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFilesystem" "")
-(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%WINDOW%>c")
+(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<@WINDOW@>c")
 ; (gtk_accel_path "<Actions>/Common/About" "")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency32" "")
 (gtk_accel_path "<Actions>/Editor/playhead-to-edit" "Return")
 ; (gtk_accel_path "<Actions>/options/FileHeaderFormatWAVE64" "")
 (gtk_accel_path "<Actions>/Editor/brush-at-mouse" "F3")
 ; (gtk_accel_path "<Actions>/RegionList/rlShowAll" "")
-(gtk_accel_path "<Actions>/Transport/Rewind" "<%PRIMARY%>leftarrow")
+(gtk_accel_path "<Actions>/Transport/Rewind" "<@PRIMARY@>leftarrow")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionTimestamp" "")
 ; (gtk_accel_path "<Actions>/options/VerifyRemoveLastCapture" "")
 ; (gtk_accel_path "<Actions>/options/OutputAutoConnectPhysical" "")
@@ -280,10 +280,10 @@
 ; (gtk_accel_path "<Actions>/Main/AudioFileFormatHeader" "")
 ; (gtk_accel_path "<Actions>/options/MeterHoldShort" "")
 ; (gtk_accel_path "<Actions>/options/MeterHoldMedium" "")
-(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<@PRIMARY@>e")
 ; (gtk_accel_path "<Actions>/Editor/Subframes80" "")
 ; (gtk_accel_path "<Actions>/options/FileHeaderFormatCAF" "")
-(gtk_accel_path "<Actions>/Common/ToggleLocations" "<%WINDOW%>l")
+(gtk_accel_path "<Actions>/Common/ToggleLocations" "<@WINDOW@>l")
 ; (gtk_accel_path "<Actions>/Editor/ToggleGeneric MIDISurface" "")
 (gtk_accel_path "<Actions>/Editor/editor-delete" "BackSpace")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency256" "")
@@ -297,12 +297,12 @@
 ; (gtk_accel_path "<Actions>/Snap/snap-to-bar" "")
 ; (gtk_accel_path "<Actions>/Editor/LayerLaterHigher" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/selectall" "")
-(gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c")
+(gtk_accel_path "<Actions>/Editor/editor-copy" "<@PRIMARY@>c")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-quarters" "")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "r")
 ; (gtk_accel_path "<Actions>/options/UseSoftwareMonitoring" "")
 ; (gtk_accel_path "<Actions>/Editor/Subframes100" "")
-(gtk_accel_path "<Actions>/Editor/mute-unmute-region" "<%SECONDARY%>m")
+(gtk_accel_path "<Actions>/Editor/mute-unmute-region" "<@SECONDARY@>m")
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "m")
 ; (gtk_accel_path "<Actions>/options/OutputAutoConnectManual" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-region-sync" "")
@@ -317,11 +317,11 @@
 ; (gtk_accel_path "<Actions>/options/MeterHoldLong" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-seconds" "")
 (gtk_accel_path "<Actions>/Editor/set-fade-in-length" "q")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<%SECONDARY%>q")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<@SECONDARY@>q")
 (gtk_accel_path "<Actions>/Editor/set-fade-out-length" "e")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<%SECONDARY%>e")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<@SECONDARY@>e")
-(gtk_accel_path "<Actions>/Editor/trim-from-start" "<%TERTIARY%>braceleft")
+(gtk_accel_path "<Actions>/Editor/trim-from-start" "<@TERTIARY@>braceleft")
-(gtk_accel_path "<Actions>/Editor/trim-to-end" "<%TERTIARY%>braceright")
+(gtk_accel_path "<Actions>/Editor/trim-to-end" "<@TERTIARY@>braceright")
 (gtk_accel_path "<Actions>/Editor/trim-front" "a")
 (gtk_accel_path "<Actions>/Editor/trim-back" "s")
 (gtk_accel_path "<Actions>/Editor/goto-mark-1" "KP_1")
@@ -338,10 +338,10 @@
 (gtk_accel_path "<Actions>/Transport/focus-on-clock" "KP_Divide")
 (gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "bracketright")
 (gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "bracketleft")
-(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<%PRIMARY%><%SECONDARY%>bracketright")
+(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<@PRIMARY@><@SECONDARY@>bracketright")
-(gtk_accel_path "<Actions>/Editor/loop-region" "<%PRIMARY%>bracketright")
+(gtk_accel_path "<Actions>/Editor/loop-region" "<@PRIMARY@>bracketright")
 (gtk_accel_path "<Actions>/Editor/toggle-zoom" "o")
 (gtk_accel_path "<Actions>/Editor/zoom-to-region" "y")
 (gtk_accel_path "<Actions>/Editor/pitch-shift-region" "F5")
-(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<@LEVEL4@>space")
 

gtk2_ardour/mnemonic-us.bindings.in

@@ -10,32 +10,32 @@
 (gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe")
 (gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "semicolon")
 (gtk_accel_path "<Actions>/Editor/cycle-edit-point" "grave")
-(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<%PRIMARY%>asciicircum")
+(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<@PRIMARY@>asciicircum")
 
 (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "period")
-(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-sync" "<%PRIMARY%>period")
+(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-sync" "<@PRIMARY@>period")
 
 (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary" "comma")
-(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-sync" "<%PRIMARY%>comma")
+(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-sync" "<@PRIMARY@>comma")
 
 (gtk_accel_path "<Actions>/Editor/extend-range-to-end-of-region" "rightanglebracket")
 (gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket")
 
 (gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
-(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>space")
+(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<@PRIMARY@>space")
-(gtk_accel_path "<Actions>/Transport/record-roll" "<%TERTIARY%>space")
+(gtk_accel_path "<Actions>/Transport/record-roll" "<@TERTIARY@>space")
 
 (gtk_accel_path "<Actions>/Editor/set-fade-in-length" "slash")
 (gtk_accel_path "<Actions>/Editor/set-fade-out-length" "backslash")
 
-(gtk_accel_path "<Actions>/Editor/trim-from-start" "<%TERTIARY%>braceleft")
+(gtk_accel_path "<Actions>/Editor/trim-from-start" "<@TERTIARY@>braceleft")
-(gtk_accel_path "<Actions>/Editor/trim-to-end" "<%TERTIARY%>braceright")
+(gtk_accel_path "<Actions>/Editor/trim-to-end" "<@TERTIARY@>braceright")
 
 (gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "bracketright")
-(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<%SECONDARY%>bracketright")
+(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<@SECONDARY@>bracketright")
 
 (gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "bracketleft")
-(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<%SECONDARY%>bracketleft")
+(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<@SECONDARY@>bracketleft")
 
 (gtk_accel_path "<Actions>/Editor/boost-region-gain" "asciicircum")
 (gtk_accel_path "<Actions>/Editor/cut-region-gain" "ampersand")
@@ -44,96 +44,96 @@
 
 ;; TOP ROW
 
-(gtk_accel_path "<Actions>/Common/Quit" "<%PRIMARY%>q")
+(gtk_accel_path "<Actions>/Common/Quit" "<@PRIMARY@>q")
 
 ;; note that ctrl-w is special and consumed by the keyboard snooper
 
 (gtk_accel_path "<Actions>/Editor/set-edit-point" "e")
-(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<@PRIMARY@>e")
-(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<@TERTIARY@>e")
-(gtk_accel_path "<Actions>/Common/goto-editor" "<%WINDOW%>e")
+(gtk_accel_path "<Actions>/Common/goto-editor" "<@WINDOW@>e")
-(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%TERTIARY%><%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<@TERTIARY@><@PRIMARY@>e")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-range" "r")
-(gtk_accel_path "<Actions>/Editor/redo" "<%PRIMARY%>r")
+(gtk_accel_path "<Actions>/Editor/redo" "<@PRIMARY@>r")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-timefx" "t")
-(gtk_accel_path "<Actions>/Editor/insert-time" "<%PRIMARY%>t")
+(gtk_accel_path "<Actions>/Editor/insert-time" "<@PRIMARY@>t")
 (gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "u")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
-(gtk_accel_path "<Actions>/Editor/invert-selection" "<%TERTIARY%>i")
+(gtk_accel_path "<Actions>/Editor/invert-selection" "<@TERTIARY@>i")
-(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%SECONDARY%>i")
+(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@SECONDARY@>i")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-object" "o")
-(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%WINDOW%>o")
+(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<@WINDOW@>o")
 (gtk_accel_path "<Actions>/Editor/set-playhead" "p")
-(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<%PRIMARY%>p")
+(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<@PRIMARY@>p")
-(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<%TERTIARY%><%PRIMARY%>p")
+(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<@TERTIARY@><@PRIMARY@>p")
 
 ;; MIDDLE ROW
 
 (gtk_accel_path "<Actions>/Editor/align-regions-sync-relative" "a")
-(gtk_accel_path "<Actions>/Editor/select-all" "<%PRIMARY%>a")
+(gtk_accel_path "<Actions>/Editor/select-all" "<@PRIMARY@>a")
-(gtk_accel_path "<Actions>/Editor/align-regions-end" "<%SECONDARY%>a")
+(gtk_accel_path "<Actions>/Editor/align-regions-end" "<@SECONDARY@>a")
-(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<%TERTIARY%>a")
+(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<@TERTIARY@>a")
-(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<%LEVEL4%>a")
+(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<@LEVEL4@>a")
 (gtk_accel_path "<Actions>/Editor/split-region" "s")
-(gtk_accel_path "<Actions>/Common/Save" "<%PRIMARY%>s")
+(gtk_accel_path "<Actions>/Common/Save" "<@PRIMARY@>s")
 (gtk_accel_path "<Actions>/Editor/duplicate-region" "d")
-(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<%PRIMARY%>d")
+(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<@PRIMARY@>d")
 (gtk_accel_path "<Actions>/Editor/fit-tracks" "f")
-(gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "<%PRIMARY%>f")
+(gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "<@PRIMARY@>f")
-(gtk_accel_path "<Actions>/Editor/toggle-rhythm-ferret" "<%WINDOW%>f")
+(gtk_accel_path "<Actions>/Editor/toggle-rhythm-ferret" "<@WINDOW@>f")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-gain" "g")
 (gtk_accel_path "<Actions>/Editor/play-selected-regions" "h")
 (gtk_accel_path "<Actions>/Editor/trim-front" "j")
 (gtk_accel_path "<Actions>/Editor/trim-back" "k")
-(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<%WINDOW%>k")
+(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<@WINDOW@>k")
 (gtk_accel_path "<Actions>/Transport/Loop" "l")
-(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<%PRIMARY%>l")
+(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<@PRIMARY@>l")
-(gtk_accel_path "<Actions>/Common/ToggleLocations" "<%WINDOW%>l")
+(gtk_accel_path "<Actions>/Common/ToggleLocations" "<@WINDOW@>l")
 
 ;; HOME ROW
 
-(gtk_accel_path "<Actions>/Editor/zoom-to-region" "<%PRIMARY%><%SECONDARY%>z")
+(gtk_accel_path "<Actions>/Editor/zoom-to-region" "<@PRIMARY@><@SECONDARY@>z")
-(gtk_accel_path "<Actions>/Editor/zoom-to-region-both-axes" "<%SECONDARY%>z")
+(gtk_accel_path "<Actions>/Editor/zoom-to-region-both-axes" "<@SECONDARY@>z")
-(gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
+(gtk_accel_path "<Actions>/Editor/undo" "<@PRIMARY@>z")
-(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>z")
+(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<@TERTIARY@>z")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-zoom" "z")
-(gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
+(gtk_accel_path "<Actions>/Editor/editor-cut" "<@PRIMARY@>x")
-(gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c")
+(gtk_accel_path "<Actions>/Editor/editor-copy" "<@PRIMARY@>c")
-(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%WINDOW%>c")
+(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<@WINDOW@>c")
 (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "v")
-(gtk_accel_path "<Actions>/Editor/editor-paste" "<%PRIMARY%>v")
+(gtk_accel_path "<Actions>/Editor/editor-paste" "<@PRIMARY@>v")
-(gtk_accel_path "<Actions>/Editor/brush-at-mouse" "<%PRIMARY%>b")
+(gtk_accel_path "<Actions>/Editor/brush-at-mouse" "<@PRIMARY@>b")
-(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<%WINDOW%>b")
+(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<@WINDOW@>b")
 (gtk_accel_path "<Actions>/Editor/normalize-region" "n")
 (gtk_accel_path "<Actions>/Editor/mute-unmute-region" "m")
-(gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<%WINDOW%>m")
+(gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<@WINDOW@>m")
 
 ;; arrow keys, navigation etc.
 
 (gtk_accel_path "<Actions>/Editor/step-tracks-up" "uparrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<%TERTIARY%>uparrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<@TERTIARY@>uparrow")
-(gtk_accel_path "<Actions>/Editor/select-prev-route" "<%SECONDARY%>uparrow")
+(gtk_accel_path "<Actions>/Editor/select-prev-route" "<@SECONDARY@>uparrow")
-(gtk_accel_path "<Actions>/Editor/move-selected-tracks-up" "<%PRIMARY%>uparrow")
+(gtk_accel_path "<Actions>/Editor/move-selected-tracks-up" "<@PRIMARY@>uparrow")
 
 (gtk_accel_path "<Actions>/Editor/step-tracks-down" "downarrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<%TERTIARY%>downarrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<@TERTIARY@>downarrow")
-(gtk_accel_path "<Actions>/Editor/select-next-route" "<%SECONDARY%>downarrow")
+(gtk_accel_path "<Actions>/Editor/select-next-route" "<@SECONDARY@>downarrow")
-(gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<%PRIMARY%>downarrow")
+(gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<@PRIMARY@>downarrow")
 
 (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary" "leftarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<@LEVEL4@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<%PRIMARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<@PRIMARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<@SECONDARY@>leftarrow")
-(gtk_accel_path "<Actions>/Transport/Rewind" "<%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Transport/Rewind" "<@TERTIARY@>leftarrow")
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<@PRIMARY@><@TERTIARY@>leftarrow")
 
 (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "rightarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<%LEVEL4%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<@LEVEL4@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<%PRIMARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<@PRIMARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<%SECONDARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<@SECONDARY@>rightarrow")
-(gtk_accel_path "<Actions>/Transport/Forward" "<%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Transport/Forward" "<@TERTIARY@>rightarrow")
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<@PRIMARY@><@TERTIARY@>rightarrow")
 
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-down" "Page_Down")
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-up" "Page_Up")
@@ -142,24 +142,24 @@
 (gtk_accel_path "<Actions>/Editor/editor-delete" "Delete")
 
 (gtk_accel_path "<Actions>/Editor/playhead-to-edit" "Return")
-(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<%SECONDARY%>Return")
+(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<@SECONDARY@>Return")
-(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<%PRIMARY%>Delete")
+(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<@PRIMARY@>Delete")
 
 ;; keypad
 
 (gtk_accel_path "<Actions>/Editor/nudge-backward" "KP_Subtract")
-(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract")
+(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<@PRIMARY@>KP_Subtract")
 
-(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<%PRIMARY%>KP_Right")
+(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<@PRIMARY@>KP_Right")
-(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<%PRIMARY%>KP_Left")
+(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<@PRIMARY@>KP_Left")
 
 (gtk_accel_path "<Actions>/Editor/nudge-forward" "KP_Add")
-(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add")
+(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<@PRIMARY@>KP_Add")
 
-(gtk_accel_path "<Actions>/Editor/start-range" "<%PRIMARY%>KP_Down")
+(gtk_accel_path "<Actions>/Editor/start-range" "<@PRIMARY@>KP_Down")
 
-(gtk_accel_path "<Actions>/Editor/finish-range" "<%PRIMARY%>KP_Up")
+(gtk_accel_path "<Actions>/Editor/finish-range" "<@PRIMARY@>KP_Up")
-(gtk_accel_path "<Actions>/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up")
+(gtk_accel_path "<Actions>/Editor/finish-add-range" "<@TERTIARY@><@PRIMARY@>KP_Up")
 
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "KP_Enter")
 (gtk_accel_path "<Actions>/Transport/focus-on-clock" "KP_Divide")
@@ -185,31 +185,31 @@
 (gtk_accel_path "<Actions>/Editor/select-range-between-cursors" "F6")
 (gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F11")
 
-(gtk_accel_path "<Actions>/Editor/save-visual-state-1" "<%PRIMARY%>F1")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-1" "<@PRIMARY@>F1")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-2" "<%PRIMARY%>F2")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-2" "<@PRIMARY@>F2")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-3" "<%PRIMARY%>F3")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-3" "<@PRIMARY@>F3")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-4" "<%PRIMARY%>F4")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-4" "<@PRIMARY@>F4")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-5" "<%PRIMARY%>F5")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-5" "<@PRIMARY@>F5")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-6" "<%PRIMARY%>F6")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-6" "<@PRIMARY@>F6")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-7" "<%PRIMARY%>F7")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-7" "<@PRIMARY@>F7")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-8" "<%PRIMARY%>F8")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-8" "<@PRIMARY@>F8")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-9" "<%PRIMARY%>F9")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-9" "<@PRIMARY@>F9")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-10" "<%PRIMARY%>F10")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-10" "<@PRIMARY@>F10")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-11" "<%PRIMARY%>F11")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-11" "<@PRIMARY@>F11")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-12" "<%PRIMARY%>F12")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-12" "<@PRIMARY@>F12")
 
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-1" "<release><%PRIMARY%>F1")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-1" "<release><@PRIMARY@>F1")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-2" "<release><%PRIMARY%>F2")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-2" "<release><@PRIMARY@>F2")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-3" "<release><%PRIMARY%>F3")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-3" "<release><@PRIMARY@>F3")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-4" "<release><%PRIMARY%>F4")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-4" "<release><@PRIMARY@>F4")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-5" "<release><%PRIMARY%>F5")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-5" "<release><@PRIMARY@>F5")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-6" "<release><%PRIMARY%>F6")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-6" "<release><@PRIMARY@>F6")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-7" "<release><%PRIMARY%>F7")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-7" "<release><@PRIMARY@>F7")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-8" "<release><%PRIMARY%>F8")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-8" "<release><@PRIMARY@>F8")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-9" "<release><%PRIMARY%>F9")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-9" "<release><@PRIMARY@>F9")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-10" "<release><%PRIMARY%>F10")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-10" "<release><@PRIMARY@>F10")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-11" "<release><%PRIMARY%>F11")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-11" "<release><@PRIMARY@>F11")
-(gtk_accel_path "<Actions>/Editor/goto-visual-state-12" "<release><%PRIMARY%>F12")
+(gtk_accel_path "<Actions>/Editor/goto-visual-state-12" "<release><@PRIMARY@>F12")
 
 
 ;; numbers

gtk2_ardour/wscript

@@ -349,17 +349,17 @@ def build(bld):
 	# Keybindings
 	keybindings_dict = {}
 	if bld.env['GTKOSX']:
-		keybindings_dict['%PRIMARY%']   = 'Meta'
+		keybindings_dict['PRIMARY']   = 'Meta'
-		keybindings_dict['%SECONDARY%'] = 'Mod1'
+		keybindings_dict['SECONDARY'] = 'Mod1'
-		keybindings_dict['%TERTIARY%']  = 'Shift'
+		keybindings_dict['TERTIARY']  = 'Shift'
-		keybindings_dict['%LEVEL4%']    = 'Ctrl'
+		keybindings_dict['LEVEL4']    = 'Ctrl'
-		keybindings_dict['%WINDOW%']    = 'Mod1'
+		keybindings_dict['WINDOW']    = 'Mod1'
 	else:
-		keybindings_dict['%PRIMARY%']   = 'Ctrl'
+		keybindings_dict['PRIMARY']   = 'Ctrl'
-		keybindings_dict['%SECONDARY%'] = 'Alt'
+		keybindings_dict['SECONDARY'] = 'Alt'
-		keybindings_dict['%TERTIARY%']  = 'Shift'
+		keybindings_dict['TERTIARY']  = 'Shift'
-		keybindings_dict['%LEVEL4%']    = bld.env['WINDOWS_KEY']
+		keybindings_dict['LEVEL4']    = bld.env['WINDOWS_KEY']
-		keybindings_dict['%WINDOW%']    = 'Alt'
+		keybindings_dict['WINDOW']    = 'Alt'
 
 	for b in [ 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad',
 	           'mnemonic-us', 'ergonomic-us' ]: