summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/build-aux/texinfo.tex30
-rw-r--r--Master/tlpkg/installer/ctan-mirrors.pl8
2 files changed, 32 insertions, 6 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex
index e568ce2e77e..bfd765dd211 100644
--- a/Build/source/build-aux/texinfo.tex
+++ b/Build/source/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2013-09-11.09}
+\def\texinfoversion{2013-09-11.11}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2894,6 +2894,15 @@ end
\def\inlinefmtname{#1}%
\ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
}
+%
+% @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if
+% FMTNAME is tex, else ELSE-TEXT.
+\long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish}
+\long\def\doinlinefmtifelse#1,#2,#3,#4,\finish{%
+ \def\inlinefmtname{#1}%
+ \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\else \ignorespaces #3\fi
+}
+%
% For raw, must switch into @tex before parsing the argument, to avoid
% setting catcodes prematurely. Doing it this way means that, for
% example, @inlineraw{html, foo{bar} gets a parse error instead of being
@@ -2910,6 +2919,23 @@ end
\endgroup % close group opened by \tex.
}
+% @inlineifset{VAR, TEXT} expands TEXT if VAR is @set.
+%
+\long\def\inlineifset#1{\doinlineifset #1,\finish}
+\long\def\doinlineifset#1,#2,\finish{%
+ \def\inlinevarname{#1}%
+ \expandafter\ifx\csname SET\inlinevarname\endcsname\relax
+ \else\ignorespaces#2\fi
+}
+
+% @inlineifclear{VAR, TEXT} expands TEXT if VAR is not @set.
+%
+\long\def\inlineifclear#1{\doinlineifclear #1,\finish}
+\long\def\doinlineifclear#1,#2,\finish{%
+ \def\inlinevarname{#1}%
+ \expandafter\ifx\csname SET\inlinevarname\endcsname\relax \ignorespaces#2\fi
+}
+
\message{glyphs,}
% and logos.
@@ -4205,7 +4231,7 @@ end
\def\value{\begingroup\makevalueexpandable\valuexxx}
\def\valuexxx#1{\expandablevalue{#1}\endgroup}
{
- \catcode`\- = \active \catcode`\_ = \active
+ \catcode`\-=\active \catcode`\_=\active
%
\gdef\makevalueexpandable{%
\let\value = \expandablevalue
diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl
index 6843ae2f001..a90790fb093 100644
--- a/Master/tlpkg/installer/ctan-mirrors.pl
+++ b/Master/tlpkg/installer/ctan-mirrors.pl
@@ -9,6 +9,7 @@ $mirrors = {
'China' => {
'http://ftp.ctex.org/mirrors/CTAN/' => 1,
'http://mirror.neu.edu.cn/CTAN/' => 1,
+ 'http://mirrors.hustunique.com/CTAN/' => 1,
'http://mirrors.ustc.edu.cn/CTAN/' => 1
},
'Hong Kong' => {
@@ -22,7 +23,7 @@ $mirrors = {
'http://s2.mirrors.gudangteknologi.com/tex-archive/' => 1
},
'Iran' => {
- 'http://ctan.yazd.ac.ir/' => 1
+ 'http://ctan.um.ac.ir/' => 1
},
'Israel' => {
'http://mirror.isoc.org.il/pub/ctan/' => 1
@@ -30,6 +31,7 @@ $mirrors = {
'Japan' => {
'ftp://ftp.kddilabs.jp/CTAN/' => 1,
'ftp://ftp.riken.go.jp/pub/tex-archive/' => 1,
+ 'ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/' => 1,
'http://ftp.jaist.ac.jp/pub/CTAN/' => 1
},
'Korea' => {
@@ -86,6 +88,7 @@ $mirrors = {
'ftp://ftp.fu-berlin.de/tex/CTAN/' => 1,
'ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/' => 1,
'ftp://ftp.tu-chemnitz.de/pub/tex/' => 1,
+ 'http://ctan.space-pro.be/tex-archive/' => 1,
'http://ftp.uni-erlangen.de/mirrors/CTAN/' => 1,
'http://funnyshare.org/mirrors/ctan/' => 1,
'http://mirror.informatik.uni-mannheim.de/pub/mirrors/tex-archive/' => 1,
@@ -143,9 +146,6 @@ $mirrors = {
'Costa Rica' => {
'http://mirrors.ucr.ac.cr/CTAN/' => 1
},
- 'Mexico' => {
- 'http://tezcatl.fciencias.unam.mx/tex-archive/' => 1
- },
'USA' => {
'http://bay.uchicago.edu/tex-archive/' => 1,
'http://ctan.mackichan.com/' => 1,