summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/w32_wrapper/README8
-rw-r--r--Build/source/texk/texlive/w32_wrapper/bitmap2eps.ico (renamed from Master/tlpkg/doc/bitmap2eps.ico)bin3262 -> 3262 bytes
-rw-r--r--Build/source/texk/texlive/w32_wrapper/bitmap2eps.svg (renamed from Master/tlpkg/doc/bitmap2eps.svg)0
-rw-r--r--Build/source/texk/texlive/w32_wrapper/tlmgr.ico (renamed from Master/tlpkg/doc/tlmgr.ico)bin4286 -> 4286 bytes
-rw-r--r--Build/source/texk/texlive/w32_wrapper/tlmgr.svg (renamed from Master/tlpkg/doc/tlmgr.svg)0
-rwxr-xr-xMaster/install-tl12
-rw-r--r--Master/tlpkg/doc/graphics/README6
-rw-r--r--Master/tlpkg/doc/graphics/TeXLive-square.png (renamed from Master/tlpkg/doc/TeXLive-square.png)bin25328 -> 25328 bytes
-rw-r--r--Master/tlpkg/doc/graphics/TeXLive-square.xcf (renamed from Master/tlpkg/doc/TeXLive-square.xcf)bin58629 -> 58629 bytes
-rw-r--r--Master/tlpkg/doc/graphics/texlive-installer-graphic.xcf (renamed from Master/tlpkg/doc/texlive-installer-graphic.xcf)bin199473 -> 199473 bytes
-rw-r--r--Master/tlpkg/doc/historic/multi-repository.txt (renamed from Master/tlpkg/doc/multi-repository.txt)0
-rw-r--r--Master/tlpkg/doc/historic/new-installer-layout.txt (renamed from Master/tlpkg/doc/new-installer-layout.txt)0
-rw-r--r--Master/tlpkg/doc/historic/tl-security-proposal.txt (renamed from Master/tlpkg/doc/tl-security-proposal.txt)0
-rw-r--r--Master/tlpkg/doc/historic/tlmgr-shell.txt (renamed from Master/tlpkg/doc/tlmgr-shell.txt)0
-rw-r--r--Master/tlpkg/doc/releng.txt2
-rw-r--r--Master/tlpkg/doc/tnc_config.vbs252
16 files changed, 20 insertions, 260 deletions
diff --git a/Build/source/texk/texlive/w32_wrapper/README b/Build/source/texk/texlive/w32_wrapper/README
new file mode 100644
index 00000000000..33eb4ae5181
--- /dev/null
+++ b/Build/source/texk/texlive/w32_wrapper/README
@@ -0,0 +1,8 @@
+This file and the graphics are public domain.
+
+This directory is for the generic TeX Live wrapper on Windows that is
+used for most scripts. The main file is runscript.tlu.
+
+*.svg are the sources for *.ico,
+and the *.ico are used in wrappers.
+Hence their locaton here.
diff --git a/Master/tlpkg/doc/bitmap2eps.ico b/Build/source/texk/texlive/w32_wrapper/bitmap2eps.ico
index be4be44b3d1..be4be44b3d1 100644
--- a/Master/tlpkg/doc/bitmap2eps.ico
+++ b/Build/source/texk/texlive/w32_wrapper/bitmap2eps.ico
Binary files differ
diff --git a/Master/tlpkg/doc/bitmap2eps.svg b/Build/source/texk/texlive/w32_wrapper/bitmap2eps.svg
index aac123a3914..aac123a3914 100644
--- a/Master/tlpkg/doc/bitmap2eps.svg
+++ b/Build/source/texk/texlive/w32_wrapper/bitmap2eps.svg
diff --git a/Master/tlpkg/doc/tlmgr.ico b/Build/source/texk/texlive/w32_wrapper/tlmgr.ico
index 6f0c37f54e0..6f0c37f54e0 100644
--- a/Master/tlpkg/doc/tlmgr.ico
+++ b/Build/source/texk/texlive/w32_wrapper/tlmgr.ico
Binary files differ
diff --git a/Master/tlpkg/doc/tlmgr.svg b/Build/source/texk/texlive/w32_wrapper/tlmgr.svg
index 6e60a8f273c..6e60a8f273c 100644
--- a/Master/tlpkg/doc/tlmgr.svg
+++ b/Build/source/texk/texlive/w32_wrapper/tlmgr.svg
diff --git a/Master/install-tl b/Master/install-tl
index 2fbeb6e0379..271026b5124 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -2758,7 +2758,7 @@ text installer, or equivalent.
Besides C<selected_scheme>, here is the list of variable names supported
in a profile:
-=item B<collection options> (prefix C<collection->)
+B<collection options> (prefix C<collection->)
Collections are specified with a variable name with the prefix
C<collection-> followed by a collection name; there is no value. For
@@ -2768,7 +2768,7 @@ C<C> menu.
Schemes and collections (and packages) are ultimately defined by the
files in the C<tlpkg/tlpsrc/> source directory.
-=item B<path options>
+B<path options>
It is best to define all of these, even though they may not be used in
the installation, so as to avoid unintentionally getting a default value
@@ -2782,7 +2782,7 @@ that could cause problems later.
TEXMFSYSCONFIG
TEXMFSYSVAR
-=item B<installer options> (prefix C<instopt_>)
+B<installer options> (prefix C<instopt_>)
=over 4
@@ -2809,7 +2809,7 @@ Enable C<\write18> for a restricted set of programs.
=back
-=item B<tlpdb options> (prefix C<tlpdbopt_>)
+B<tlpdb options> (prefix C<tlpdbopt_>)
The definitive list is given in C<tlpkg/TeXLive/TLConfig.pm>, in
C<%TeXLive::TLConfig::TLPDBOptions>, together with explanations. All
@@ -2830,7 +2830,7 @@ Here is the current list:
tlpdbopt_sys_man
tlpdbopt_w32_multi_user
-=item B<platform options> (prefix C<binary_>)
+B<platform options> (prefix C<binary_>)
For each supported platform in TeX Live (directories under C<bin/>), the
variable C<binary_>I<PLATFORM> can be set. For example:
@@ -2840,8 +2840,6 @@ variable C<binary_>I<PLATFORM> can be set. For example:
If no C<binary_> variable is specified, the default is whatever the
current machine is running.
-=back
-
In releases before 2017, many profile variables had different
names (not documented here; see the C<install-tl> source). They are
accepted and transformed to the names given above. When a profile is
diff --git a/Master/tlpkg/doc/graphics/README b/Master/tlpkg/doc/graphics/README
new file mode 100644
index 00000000000..c38e538065a
--- /dev/null
+++ b/Master/tlpkg/doc/graphics/README
@@ -0,0 +1,6 @@
+This file and all the graphics are public domain.
+
+*-square is used for the github repository.
+
+*-installer is used both for the GUI installer and in the manual.
+It needs to be updated for every release.
diff --git a/Master/tlpkg/doc/TeXLive-square.png b/Master/tlpkg/doc/graphics/TeXLive-square.png
index 03fd5065493..03fd5065493 100644
--- a/Master/tlpkg/doc/TeXLive-square.png
+++ b/Master/tlpkg/doc/graphics/TeXLive-square.png
Binary files differ
diff --git a/Master/tlpkg/doc/TeXLive-square.xcf b/Master/tlpkg/doc/graphics/TeXLive-square.xcf
index 477915804b8..477915804b8 100644
--- a/Master/tlpkg/doc/TeXLive-square.xcf
+++ b/Master/tlpkg/doc/graphics/TeXLive-square.xcf
Binary files differ
diff --git a/Master/tlpkg/doc/texlive-installer-graphic.xcf b/Master/tlpkg/doc/graphics/texlive-installer-graphic.xcf
index 5da7dae326d..5da7dae326d 100644
--- a/Master/tlpkg/doc/texlive-installer-graphic.xcf
+++ b/Master/tlpkg/doc/graphics/texlive-installer-graphic.xcf
Binary files differ
diff --git a/Master/tlpkg/doc/multi-repository.txt b/Master/tlpkg/doc/historic/multi-repository.txt
index ca1192e080b..ca1192e080b 100644
--- a/Master/tlpkg/doc/multi-repository.txt
+++ b/Master/tlpkg/doc/historic/multi-repository.txt
diff --git a/Master/tlpkg/doc/new-installer-layout.txt b/Master/tlpkg/doc/historic/new-installer-layout.txt
index 3b869c4e1fc..3b869c4e1fc 100644
--- a/Master/tlpkg/doc/new-installer-layout.txt
+++ b/Master/tlpkg/doc/historic/new-installer-layout.txt
diff --git a/Master/tlpkg/doc/tl-security-proposal.txt b/Master/tlpkg/doc/historic/tl-security-proposal.txt
index b2d4a65a2f4..b2d4a65a2f4 100644
--- a/Master/tlpkg/doc/tl-security-proposal.txt
+++ b/Master/tlpkg/doc/historic/tl-security-proposal.txt
diff --git a/Master/tlpkg/doc/tlmgr-shell.txt b/Master/tlpkg/doc/historic/tlmgr-shell.txt
index 7c2491f4291..7c2491f4291 100644
--- a/Master/tlpkg/doc/tlmgr-shell.txt
+++ b/Master/tlpkg/doc/historic/tlmgr-shell.txt
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index db93de62e3c..f8fd97666eb 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -111,7 +111,7 @@ A.0. Specifics for tlperl update:
svn rm `cat /tmp/c1`
svn add --parents --no-auto-props `cat /tmp/c2`
svn status | fgrep \? # shouldn't be any
- find tlperl -name \*.dll | xargs svn propset svn:executable 1
+ find tlperl -name \*.dll -o -name \*.exe | xargs svn propset svn:executable 1
find tlperl -type d -empty | xargs svn rm # repeat until no output
update tlperl/README.TEXLIVE
svn commit when ready ...
diff --git a/Master/tlpkg/doc/tnc_config.vbs b/Master/tlpkg/doc/tnc_config.vbs
deleted file mode 100644
index 51f5784d671..00000000000
--- a/Master/tlpkg/doc/tnc_config.vbs
+++ /dev/null
@@ -1,252 +0,0 @@
-Option Explicit
-
-Dim oWsh, oExec, oEnv, sTmp, oTmp, sTL, sGS, sVal, sDat, dDat, oFS
-Dim sP, sPr, bFirstConfig, bAdobe, sAdobe, i, j, s
-
-On Error Resume Next
-
-Set oWsh = Wscript.CreateObject("WScript.Shell")
-Set oFS = CreateObject("Scripting.FileSystemObject")
-Set oEnv = oWsh.Environment("PROCESS")
-
-'''''''''''''''''''''''''''''''''''
-' WMI hocuspocus for deleting registry keys recursively, from
-' http://www.tek-tips.com/viewthread.cfm?qid=674375&page=8
-
-const hkcr=&h80000000
-const hkcu=&h80000001
-const hklm=&h80000002
-
-Dim oReg
-
-Set oReg = GetObject("winmgmts:{impersonationLevel=impersonate}//" _
- & "./root/default:StdRegProv")
-
-Function DeleteRegEntry( sHive, sEnumPath )
-
- Dim lRC, sKeyName, sNames
-
- ' Attempt to delete key. If it fails, start the subkey
- ' enumeration process.
- On Error Goto 0
- lRC = oReg.DeleteKey(sHive, sEnumPath)
- ' The deletion failed, start deleting subkeys.
- If (lRC <> 0) Then
-
- ' Subkey Enumerator
- On Error Resume Next
-
- lRC = oReg.EnumKey( sHive, sEnumPath, sNames )
-
- For Each sKeyName In sNames
- If Err.Number <> 0 Then Exit For
- lRC = DeleteRegEntry( sHive, sEnumPath & "\" & sKeyName )
- Next
- ' On Error Goto 0
-
- ' At this point we should have looped through all subkeys, trying
- ' to delete the registry key again.
- lRC = oReg.DeleteKey( sHive, sEnumPath )
- End If
-End Function
-'''''''''''''''''''''''''''''''''''
-
-' the installer calls this script with a parameter;
-' the menu shortcut for later reconfiguration calls it without
-Set oTmp = Wscript.Arguments
-bFirstConfig = (oTmp.count >= 1)
-
-sTL = ""
-s = Left (wscript.version, 3)
-s = replace (s, ".", "")
-i = CInt(s)
-If i < 56 Then
- sTL = _
- oFS.GetFolder(oFS.GetFile(Wscript.ScriptFullName).ParentFolder).ParentFolder
-Else
- sTmp = ""
- ' ask kpathsea
- Set oExec = oWsh.Exec("kpsewhich -var-value=SELFAUTOPARENT")
- sTmp = oExec.StdOut.ReadAll
- Err.clear()
- If sTmp <> "" then
- sTmp = replace(sTmp, vbCr, "")
- sTmp = replace(sTmp, vbLf, "")
- sTL = replace(sTmp, "/", "\")
- End If
-End If
-If sTL = "" Then
- MsgBox "TeX Live not found; aborting...", vbOKOnly+vbCritical, "Error"
- quit
-End If
-sTL = oFS.GetFolder(sTL).ShortPath
-'wscript.echo "Root: " & sTL
-
-If Not bFirstConfig then
- i = MsgBox("Please make sure that TeXnicCenter is not running!", _
- vbOKCancel+vbExclamation, "Check for TeXnicCenter")
- If i = vbCancel Then
- wscript.quit(1)
- End If
-End If
-
-Const sPro = "HKCU\software\toolscenter\texniccenter\profiles\"
-
-' remove old settings recursively
-
-Err.clear
-DeleteRegEntry hkcu, "software\toolscenter\texniccenter\profiles"
-Err.clear
-
-' [pdf]latex
-For Each sPr in Array( _
- "LaTeX => DVI\", "LaTeX => PDF\", "LaTeX => PS\", "LaTeX => PS => PDF\")
- sP = sPro & sPr
- oWsh.RegWrite sP & "RunLatex", 1, "REG_DWORD"
- If sPr = "LaTeX => PDF\" Then
- oWsh.RegWrite sP & "LatexPath", sTL & "\bin\win32\pdflatex.exe"
- Else
- oWsh.RegWrite sP & "LatexPath", sTL & "\bin\win32\latex.exe"
- End If
- oWsh.RegWrite sP & "LatexArgs", "-synctex=-1 -interaction=nonstopmode ""%Wm"""
- oWsh.RegWrite sP & "LatexStopOnError", 0, "REG_DWORD"
- oWsh.RegWrite sP & "RunBibTex", 1, "REG_DWORD"
- oWsh.RegWrite sP & "BibTexPath", sTL & "\bin\win32\bibtex.exe"
- oWsh.RegWrite sP & "BibTexArgs", """%bm"""
- oWsh.RegWrite sP & "RunMakeIndex", 1, "REG_DWORD"
- oWsh.RegWrite sP & "MakeIndexPath", sTL & "\bin\win32\makeindex.exe"
- oWsh.RegWrite sP & "MakeIndexArgs", """%bm"""
- oWsh.RegWrite sP & "CloseViewBeforeCompilation", 0, "REG_DWORD"
-Next
-
-' postprocessing: dvips
-For Each sPr in Array("LaTeX => PS\", "LaTeX => PS => PDF\")
- sP = sPro & sPr & "PostProcessors\"
-oWsh.RegWrite sP & "PostProcessor0", _
- "DviPs" & vbLf & _
- sTL & "\bin\win32\dvips.exe" & vbLf & """%Bm.dvi""" & vbLf & vbLf
-Next
-
-' postprocessing: ps2pdf
-sGS = replace(sTL, "\", "/") & "/tlpkg/tlgs/"
-oWsh.RegWrite sPro & "LaTeX => PS => PDF\PostProcessors\PostProcessor1", _
- "gswin32c" & vbLf & _
- sTL & "\tlpkg\tlgs\bin\gswin32c.exe" & vbLf & _
- "-I""" & sGS & "lib;" & sGS & "fonts;" & sGS & "Resource""" & _
- " -sPAPERSIZE#a4 -dPDFSETTINGS#/prepress -dCOMPATIBILITYLEVEL#1.3" & _
- " -dNOPAUSE -dBATCH -q -dSAFER -sDEVICE#pdfwrite" & _
- " -sOutputFile#""%Bm.pdf"" ""%Bm.ps""" & vbLf & vbLf
-
-' viewing: dvi
-sPr = "LaTeX => DVI\"
-oWsh.RegWrite sPro & sPr & "ViewerPath", _
- "wscript """ & sTL & "\tlrug\dviout.vbs"""
-
-For Each s in Array("ViewCurrentCmd\", "ViewProjectCmd\")
- sP = sPro & sPr & s
- oWsh.RegWrite sP & "ProcessCmd", _
- "wscript """ & sTL & "\tlrug\dviout.vbs""" & vbLf & """%bm.dvi"""
- oWsh.RegWrite sP & "DDECmd", vbLf & "System" & vbLf & vbLf
-Next
-
-' viewing: ps
-sPr = "LaTeX => PS\"
-oWsh.RegWrite sPro & sPr & "ViewerPath", "wscript """ & sTL & "\tlrug\psv.vbs"""
-For Each s in Array("ViewCurrentCmd\", "ViewProjectCmd\")
- sP = sPro & sPr & s
- oWsh.RegWrite sP & "ProcessCmd", _
- "wscript """ & sTL & "\tlrug\psv.vbs""" & vbLf & """%bm.ps"""
- oWsh.RegWrite sP & "DDECmd", vbLf & "System" & vbLf & vbLf
-Next
-
-' viewing: pdf
-' when reconfiguring, check for Adobe Reader;
-' if found, ask whether to use it
-If bFirstConfig Then
- bAdobe = False
-Else
- Err.clear
- bAdobe = True
- sTmp = oWsh.RegRead("HKCR\AcroExch.Document\Shell\Open\Command\")
- If Err.number>0 Then
- bAdobe = False
- Err.clear
- Else
- 'wscript.echo "open command:" & vbnewline & stmp & vbnewline
- If InStr(sTmp, """") = 1 Then
- sTmp = Mid(sTmp, 2)
- End If
- i = InStr(sTmp, ".exe")
- If i=0 Then
- bAdobe = False
- Else
- sAdobe = Mid(sTmp, 1, InStr(sTmp, ".exe")+3)
- 'wscript.echo "reader:" & sAdobe
- Err.clear
- oTmp = oFS.GetFile(sAdobe)
- If Err.number>0 Then
- bAdobe = False
- Err.clear
- 'wscript.echo sadobe & " not a file"
- End If
- End If
- End If
-End If
-If bAdobe Then
- i = MsgBox( "Use Adobe Reader/Acrobat instead of SumatraPDF?", _
- vbYesNo+vbQuestion, "PDF viewer")
- If i = vbNo Then
- bAdobe = False
- End If
-End If
-'If badobe Then
-' wscript.echo "reader: " & sadobe
-'Else
-' wscript.echo "no reader"
-'End If
-
-For Each sPr in Array("LaTeX => PDF\", "LaTeX => PS => PDF\")
- If bAdobe Then
- oWsh.RegWrite sPro & sPr & "ViewerPath", sAdobe
- oWsh.RegWrite sPro & sPr & "CloseViewBeforeCompilation", 1, "REG_DWORD"
- For Each s in Array("ViewCurrentCmd\", "ViewProjectCmd\")
- sP = sPro & sPr & s
- oWsh.RegWrite sP & "ActiveType", 1, "REG_DWORD"
- oWsh.RegWrite sP & "ProcessCmd", vbLf
- oWsh.RegWrite sP & "DDECmd", "acroview" & vbLf & "control" & vbLf & _
- "[DocOpen(""%bm.pdf"")][FileOpen(""%bm.pdf"")]" & _
- vbLf & sAdobe
- ' "[MenuitemExecute(""GoBack"")]" &
- Next
- sP = sPro & sPr & "ViewCloseCmd\"
- oWsh.RegWrite sP & "ActiveType", 1, "REG_DWORD"
- oWsh.RegWrite sP & "ProcessCmd", vbLf
- oWsh.RegWrite sP & "DDECmd", _
- "acroview" & vbLf & "control" & vbLf & _
- "[DocClose(""%bm.pdf"")]" & vbLf
- Else
- oWsh.RegWrite sPro & sPr & "ViewerPath", sTL & "\sumatrapdf\SumatraPDF.exe"
- oWsh.RegWrite sPro & sPr & "CloseViewBeforeCompilation", 0, "REG_DWORD"
- For Each s in Array("ViewCurrentCmd\", "ViewProjectCmd\")
- sP = sPro & sPr & s
- oWsh.RegWrite sP & "ActiveType", 1, "REG_DWORD"
- oWsh.RegWrite sP & "DDECmd", "SUMATRA" & vbLf & "control" & vbLf & _
- "[ForwardSearch(""%bm.pdf"",""%nc"",%l,0)]" & vbLf & _
- sTL & "\sumatrapdf\SumatraPDF.exe"
- 'oWsh.RegWrite sP & "ProcessCmd", _
- ' sTL & "\SumatraPDF\SumatraPDF.exe" & vbLf & """%bm.pdf"""
- oWsh.RegWrite sP & "ProcessCmd", vbLf
- Next
- oWsh.RegWrite sPro & sPr
- End If
-Next
-
-If Not bFirstConfig Then
- If bAdobe then
- MsgBox "TeXnicCenter now configured for TeX Live 2008 and Adobe Reader", _
- 0, "TeXnicCenter Configuration"
- Else
- MsgBox "TeXnicCenter now configured for TeX Live 2008 and SumatraPDF", _
- 0, "TeXnicCenter Configuration"
- End If
-End If