diff options
author | Norbert Preining <preining@logic.at> | 2008-04-23 07:40:15 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2008-04-23 07:40:15 +0000 |
commit | 5f7b536552cc0d5acd11625bca7d334f408bd576 (patch) | |
tree | 43a8d107ab9fd52d8bbdef7ffefa94bb9d3d70ed | |
parent | d615cd3b73bae5c1ad8eaa7bd67392fa70b16c10 (diff) |
support tlmgr paper
git-svn-id: svn://tug.org/texlive/trunk@7611 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Master/install-tl | 9 | ||||
-rwxr-xr-x | Master/texmf/scripts/texlive/texconf.tlu | 77 | ||||
-rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.tlu | 32 |
3 files changed, 55 insertions, 63 deletions
diff --git a/Master/install-tl b/Master/install-tl index 3297ff6564c..a8af0f84746 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -912,13 +912,8 @@ sub do_postinst_stuff { # letter instead of a4 if ($vars{'option_letter'}) { - if (win32()) { - tllog($::LOG_NORMAL, "Setting default paper size to letter\n"); - system("texlua.exe", "$TEXDIR/texmf/scripts/texlive/texconf.tlu", "--sys", "paper", "letter"); - } else { - tllog($::LOG_NORMAL, "Calling texconfig-sys paper letter\n"); - system("texconfig-sys", "paper", "letter"); - } + tllog($::LOG_NORMAL, "Setting default paper size to letter\n"); + system("texlua.exe", "$TEXDIR/texmf/scripts/texlive/texconf.tlu", "--sys", "paper", "letter"); } # all formats option diff --git a/Master/texmf/scripts/texlive/texconf.tlu b/Master/texmf/scripts/texlive/texconf.tlu index 16776dcfb2f..fe3c486ec87 100755 --- a/Master/texmf/scripts/texlive/texconf.tlu +++ b/Master/texmf/scripts/texlive/texconf.tlu @@ -188,7 +188,7 @@ function set_dvips_papersize(papersize) end end elseif papersize=='help' then - io.stdout:write('Usage: texconf dvips paper PAPER\n\n'.. + io.stdout:write('Usage: texconf paper dvips PAPER\n\n'.. 'Valid PAPER settings:\n ') local buffer='' for key, val in ipairs(par_papersize) do @@ -294,7 +294,7 @@ function set_xdvi_papersize(papersize) end end elseif papersize=='help' then - io.stdout:write('Usage: texconf xdvi paper PAPER\n\n'.. + io.stdout:write('Usage: texconf paper xdvi PAPER\n\n'.. 'Valid PAPER settings:\n ') local buffer='' for ptype, psize in pairs(xdvi_papersize) do @@ -365,7 +365,7 @@ function set_pdftex_papersize(papersize) end end elseif papersize=='help' then - io.stdout:write('Usage: texconf pdftex paper PAPER\n\n'.. + io.stdout:write('Usage: texconf paper pdftex PAPER\n\n'.. 'Valid PAPER settings:\n ') local buffer='' for ptype, sizes in pairs(pdftex_papersize) do @@ -429,7 +429,7 @@ function set_dvipdfm_papersize(papersize, program) end end elseif papersize=='help' then - io.stdout:write('Usage: texconf '..program..' paper PAPER\n\n'.. + io.stdout:write('Usage: texconf paper '..program..' PAPER\n\n'.. 'Valid PAPER settings:\n ') local buffer='' for i, ptype in pairs(dvipdfm_papersize) do @@ -487,59 +487,58 @@ end function usage_main() local usage={ 'help', - 'xdvi paper PAPER (xdvi paper size)', - 'dvips paper PAPER (dvips paper size)', - 'pdftex paper PAPER (pdftex paper size)', - 'dvipdfm paper PAPER (dvipdfm paper size)', - 'dvipdfmx paper PAPER (dvipdfmx paper size)', + 'paper xdvi PAPER (xdvi paper size)', + 'paper dvips PAPER (dvips paper size)', + 'paper pdftex PAPER (pdftex paper size)', + 'paper dvipdfm PAPER (dvipdfm paper size)', + 'dpaper vipdfmx PAPER (dvipdfmx paper size)', 'paper [a4|letter] (paper size for all programs)' } io.stdout:write('Usage:\n') for i, msg in ipairs(usage) do io.stdout:write(' '..basename..' '..msg..'\n') end + os.exit(0) end function usage_paper(progname) io.stdout:write('Usage: '..basename..' '..progname..' paper PAPER\n') io.stdout:write(' '..basename..' '..progname..' help\n') + os.exit(0) end +function set_prog_papersize(prog,size) + if (prog == 'dvips') then + set_dvips_papersize(size) + elseif (prog == 'xdvi') then + set_xdvi_papersize(size) + elseif (prog == 'pdftex') then + set_pdftex_papersize(size) + elseif (prog == 'dvipdfm') then + set_dvipdfm_papersize(size) + elseif (prog == 'dvipdfmx') then + set_dvipdfm_papersize(size) + end +end + + if arg[1] == 'help' then usage_main() - elseif arg[1] == 'paper' then + if arg[2] == 'help' or arg[2] == nil then + usage_main() + elseif arg[2] == 'dvips' or arg[2] == 'xdvi' or arg[2] == 'pdftex' or + arg[2] == 'dvipdfm' or arg[2] == 'dvipdfmx' then + if arg[3] == 'help' or arg[3] == nil then + usage_paper(arg[2]) + else + set_prog_papersize(arg[2], arg[3]) + end + else set_papersize(arg[2]) -elseif arg[1] == 'dvips' then - if arg[2] == 'help' or arg[3]==nil then - usage_paper('dvips') - elseif arg[2]=='paper' then - set_dvips_papersize(arg[3]) - end -elseif arg[1] == 'xdvi' then - if arg[2] == 'help' or arg[3]==nil then - usage_paper('xdvi') - elseif arg[2]=='paper' then - set_xdvi_papersize(arg[3]) - end -elseif arg[1] == 'pdftex' then - if arg[2] == 'help' or arg[3]==nil then - usage_paper(pdftex) - elseif arg[2]=='paper' then - set_pdftex_papersize(arg[3]) - end -elseif arg[1] == 'dvipdfm' then - if arg[2] == 'help' or arg[3]==nil then - usage_paper('dvipdfm') - elseif arg[2]=='paper' then - set_dvipdfm_papersize(arg[3], 'dvipdfm') - end -elseif arg[1] == 'dvipdfmx' then - if arg[2] == 'help' or arg[3]==nil then - usage_paper('dvipdfmx') - elseif arg[2]=='paper' then - set_dvipdfm_papersize(arg[3], 'dvipdfmx') end +else + usage_main() end if sys then diff --git a/Master/texmf/scripts/texlive/tlmgr.tlu b/Master/texmf/scripts/texlive/tlmgr.tlu index 933de46670d..bb1743dba21 100755 --- a/Master/texmf/scripts/texlive/tlmgr.tlu +++ b/Master/texmf/scripts/texlive/tlmgr.tlu @@ -114,7 +114,7 @@ TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR') BINDIR=kpse.var_value('SELFAUTOLOC') -if arg[1] == 'uninstall' then +if arg[1] == 'uninstall' then if os.type == 'windows' then print ("Please use Add/Remove Programs from the Control Panel to remove TeX Live!") os.exit(0); @@ -170,9 +170,7 @@ if arg[1] == 'uninstall' then print("Ok, cancelling the removal.") os.exit(0) end -end - -if arg[1] == 'generate-fmtutil' then +elseif arg[1] == 'generate-fmtutil' then setupperl() script = findscript('generate-fmtutil.pl') if script then @@ -180,9 +178,7 @@ if arg[1] == 'generate-fmtutil' then else os.exit(1) end -end - -if arg[1] == 'generate-language' then +elseif arg[1] == 'generate-language' then setupperl() script = findscript('generate-language.pl') if script then @@ -190,9 +186,7 @@ if arg[1] == 'generate-language' then else os.exit(1) end -end - -if arg[1] == 'generate-updmap' then +elseif arg[1] == 'generate-updmap' then setupperl() script = findscript('generate-updmap.pl') if script then @@ -200,12 +194,16 @@ if arg[1] == 'generate-updmap' then else os.exit(1) end -end - --- in all other cases we call tl-package-manager for now ... --- --- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or --- arg[1] == 'globalsearch' then +elseif arg[1] == 'paper' then + -- all changes made via tlmgr paper are global + script = findscript('texconf.tlu') + if script then + command = { 'texlua', script, '--sys' } + else + os.exit(1) + end +else + -- in all other cases we call tl-package-manager for now ... setupperl() script = findscript('tl-package-manager.pl') if script then @@ -213,7 +211,7 @@ end else os.exit(1) end --- end +end for i=1, #arg do command[#command+1]=arg[i] |