diff options
author | Karl Berry <karl@freefriends.org> | 2020-04-25 20:51:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-04-25 20:51:39 +0000 |
commit | e6ef624d41c49a62e8b2d8e051b4d2cb8dc1ff46 (patch) | |
tree | 8cb484f86ed4e60635b18880d91e3290648b21fc /Build/source | |
parent | b3f874e11dec455061f4a2eee43b3992c83a19ad (diff) |
lwarp (25apr20)
git-svn-id: svn://tug.org/texlive/trunk@54877 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua | 7 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl | 29 |
2 files changed, 25 insertions, 11 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua index dcf139cf615..a6239409bcf 100755 --- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua +++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2020 Brian Dunn -printversion = "v0.83" +printversion = "v0.84" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -379,7 +379,7 @@ function removeaux () -- Remove auxiliary files: -- All .aux files are removed since there may be many bbl*.aux files. -- Also removes sourcename_html.pdf, sourcename_html.html, --- and sourcename_html.sidetoc. +-- and sourcename_html.sidetoc, plus comment_*.cut. -- os.execute ( rmname .. " *.aux " .. sourcename ..".toc " .. sourcename .. "_html.toc " .. @@ -393,7 +393,8 @@ os.execute ( rmname .. " *.aux " .. sourcename .. "_html.pdf " .. sourcename .. "_html.html " .. sourcename .. "_html.sidetoc " .. - " *_html_inc.* " + " *_html_inc.* " .. + " comment_*.cut" ) end diff --git a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl index e0e10993713..a78f494655c 100755 --- a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl +++ b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl @@ -2010,6 +2010,11 @@ proc set_fontscale {s} { } } +proc zoom {n} { + if {$n <= 0} {set n 1} + set_fontscale [expr {$n*$::tkfontscale}] +} + ##### running external commands ##### # For capturing an external command, we need a separate output channel, @@ -2179,14 +2184,22 @@ proc populate_main {} { .mn.opt add cascade -label [__ "GUI font scaling"] \ -menu .mn.opt.fscale menu .mn.opt.fscale - foreach s {0.5 0.7 1 1.25 1.5 2 3 4 6 8} { - if {$s eq $::tkfontscale} { - set mlabel "$s *" - } else { - set mlabel $s - } - .mn.opt.fscale add command -label $mlabel \ - -command "set_fontscale $s" + foreach s {0.6 0.8 1 1.2 1.6 2 2.5 3 3.8 5 6 7.5 9} { + .mn.opt.fscale add command -label $s -command "set_fontscale $s" + } + + # browser-style keyboard shortcuts for scaling + bind . <Control-KeyRelease-minus> {zoom 0.8} + bind . <Control-KeyRelease-equal> {zoom 1.25} + bind . <Control-Shift-KeyRelease-equal> {zoom 1.25} + bind . <Control-KeyRelease-plus> {zoom 1.25} + bind . <Control-KeyRelease-0> {set_fontscale 1} + if {$::tcl_platform(os) eq "Darwin"} { + bind . <Command-KeyRelease-minus> {zoom 0.8} + bind . <Command-KeyRelease-equal> {zoom 1.25} + bind . <Command-Shift-KeyRelease-equal> {zoom 1.25} + bind . <Command-KeyRelease-plus> {zoom 1.25} + bind . <Command-KeyRelease-0> {set_fontscale 1} } |