From f6d37096894bec4b24ac8deb2bc07b7c068e9c63 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 14 Mar 2021 22:59:48 +0000 Subject: latexindent (14mar21) git-svn-id: svn://tug.org/texlive/trunk@58361 c570f23f-e606-0410-a88d-b1316a301751 --- .../texlive/linked_scripts/latexindent/latexindent.pl | 11 +---------- .../texk/texlive/linked_scripts/tlshell/tlshell.tcl | 17 +++++++++-------- 2 files changed, 10 insertions(+), 18 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl b/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl index f38d6c3fb53..77ae1fb829f 100755 --- a/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl +++ b/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# latexindent.pl, version 3.8.3, 2020-11-06 +# latexindent.pl, version 3.9, 2021-03-14 # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -64,15 +64,6 @@ if($switches{readLocalSettings} and scalar(@ARGV) < 1) { $switches{readLocalSettings} = ''; } -# default value of readLocalSettings -# -# latexindent -l myfile.tex -# -# means that we wish to use localSettings.yaml -if(defined($switches{readLocalSettings}) and ($switches{readLocalSettings} eq '')){ - $switches{readLocalSettings} = 'localSettings.yaml'; -} - # allow STDIN as input, if a filename is not present unshift( @ARGV, '-' ) unless @ARGV; diff --git a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl index 782b492357d..dd06e4d1caf 100755 --- a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl +++ b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl @@ -1493,7 +1493,6 @@ proc platforms_select {} { .tlpl.pl column stat -width [expr {$::cw * 3}] .tlpl.pl heading plat -text [__ "platform"] -anchor w .tlpl.pl column plat -width [expr {$::cw * 20}] - # tag for indicating changed entries .tlpl.pl tag configure "changed" -font bfont @@ -1504,6 +1503,7 @@ proc platforms_select {} { .tlpl.pl insert {} end -id $pname -values \ [list [mark_sym [dict get $::platforms $pname "cur"]] $pname] } + set_tree_col_width .tlpl.pl "plat" bind .tlpl.pl {toggle_pl_marked [.tlpl.pl focus] "#1"} bind .tlpl.pl {toggle_pl_marked [.tlpl.pl focus] "#1"} @@ -1573,16 +1573,16 @@ proc commit_papers {} { } proc papersize_advanced {} { - # dialog for settings papersize for: + # dialog for settings paper size for: # all | pdftex | dvipdfmx | context | dvips | psutils | xdvi # on windows, xdvi is omitted - # we also insert a non-existent engine to test handling of missing entries # we could have handled papers somewhat like the platforms dialog, # but radio buttons seem more natural, # and there are not enough items to worry about scrollability. # we create a grid with the radio buttons and a column 'changed'. - set ::papers(dummy) "" ; # dummy: see comment above + ## a non-existent engine 'dummy' to test handling of missing entries + #set ::papers(dummy) "" foreach nm {"pdftex" "dvipdfmx" "context" "dvips" "psutils" "xdvi"} { set ::papers($nm) "" } @@ -1610,7 +1610,7 @@ proc papersize_advanced {} { } set nms [array names ::papers] ; # invalid names have now been weeded out if {[llength $nms] < 1} { - tk_messageBox -title [__ "Error"] -message [__ "No papersizes available"] + tk_messageBox -title [__ "Error"] -message [__ "No paper sizes available"] # we did not yet start building the dialog, so we can just: return } @@ -1634,8 +1634,8 @@ proc papersize_advanced {} { pack [ttk::frame .tlpap.radios] -in .tlpap.bg foreach {p c} {"a4" 1 "letter" 2} { - pgrid [ttk::label .tlpap.radios.head$p -text $p -font bfont] \ - -row 0 -column $c + pgrid [ttk::label .tlpap.radios.head$p \ + -text [string totitle $p] -font bfont] -row 0 -column $c } grid [ttk::separator .tlpap.radios.sep0 -orient horizontal] \ -row 1 -column 0 -columnspan 3 -sticky ew @@ -2387,7 +2387,7 @@ proc populate_main {} { .mn.opt add cascade -label [__ "Paper ..."] -menu .mn.opt.paper incr inx menu .mn.opt.paper - foreach p {a4 letter} { + foreach p {A4 Letter} { .mn.opt.paper add command -label $p -command \ "set_all_papers [string tolower $p]" } @@ -2635,6 +2635,7 @@ proc populate_main {} { .pkglist heading remoterev -text [__ "Remote rev. (ver.)"] -anchor w .pkglist heading shortdesc -text [__ "Description"] -anchor w .pkglist column mk -width [expr {$::cw * 3}] -stretch 0 + # column widths are resizable: no need to accommodate the longest names .pkglist column name -width [expr {$::cw * 25}] -stretch 1 .pkglist column localrev -width [expr {$::cw * 18}] -stretch 0 .pkglist column remoterev -width [expr {$::cw * 18}] -stretch 0 -- cgit v1.2.3