summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-16 23:47:34 +0000
committerKarl Berry <karl@freefriends.org>2011-02-16 23:47:34 +0000
commit2ca7d2da16b783917e76a644f46f0d659dc171af (patch)
tree6f7240b32e548d6881874bb0dbd31878821820e7 /Master
parent81b284582782cc2e54250458279b2ad92c14df80 (diff)
* collection-xetex: rm fontspec.
* collection-latexrecommended: add fontspec, and merge in packages from latex3 (expl3 mh xpackages). * collection-latex3: remove collection. * scheme-full: rm collection-latex3. * fontspec: no dependency on latex3 after all. git-svn-id: svn://tug.org/texlive/trunk@21417 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/tlpsrc/collection-latex3.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-xetex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/fontspec.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-full.tlpsrc1
5 files changed, 4 insertions, 9 deletions
diff --git a/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc b/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc
deleted file mode 100644
index 53a536f911b..00000000000
--- a/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc
+++ /dev/null
@@ -1,6 +0,0 @@
-category Collection
-shortdesc LaTeX3 packages
-depend expl3
-depend mh
-depend xpackages
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
index a4d0816b535..5786ecf2b24 100644
--- a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
@@ -8,11 +8,13 @@ depend booktabs
depend caption
depend cite
depend cmap
+depend collection-latex
depend crop
depend ctable
depend ec
depend eso-pic
depend euler
+depend expl3
depend extsizes
depend fancybox
depend fancyref
@@ -26,6 +28,7 @@ depend listings
depend mdwtools
depend memoir
depend metalogo
+depend mh
depend microtype
depend ms
depend ntgclass
@@ -48,4 +51,5 @@ depend underscore
depend url
depend xcolor
depend xkeyval
+depend xpackages
depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
index ce4211d532c..5a79a99081b 100644
--- a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
@@ -4,7 +4,6 @@ longdesc Packages for XeTeX, the Unicode/OpenType-enabled TeX by Jonathan Kew,
longdesc http://scripts.sil.org/xetex.
depend arabxetex
depend euenc
-depend fontspec
depend fontwrap
depend harvardkyoto
depend mathspec
diff --git a/Master/tlpkg/tlpsrc/fontspec.tlpsrc b/Master/tlpkg/tlpsrc/fontspec.tlpsrc
index 5c15e51eb62..26eb82dd0f5 100644
--- a/Master/tlpkg/tlpsrc/fontspec.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fontspec.tlpsrc
@@ -1,2 +1 @@
depend kastrup
-depend collection-latex3
diff --git a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
index 82f021b619c..7581ea1ddb3 100644
--- a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
@@ -70,7 +70,6 @@ depend collection-langturkmen
depend collection-langenglish
depend collection-langvietnamese
depend collection-latex
-depend collection-latex3
depend collection-latexextra
depend collection-latexrecommended
depend collection-luatex