summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-08-28 22:34:54 +0000
committerKarl Berry <karl@freefriends.org>2014-08-28 22:34:54 +0000
commit0f564a17622b9656e1deda585b42e4b5a6dbb066 (patch)
treefb25e292da1eeba3416a8f7a9675618528a4fb7c
parent9c6c604c4822d8c09684d8deccadd4c9ac1e1bab (diff)
babel-hungarian: switch to generic and include README
git-svn-id: svn://tug.org/texlive/trunk@35053 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/babel-hungarian/README12
-rw-r--r--Master/texmf-dist/tex/generic/babel-hungarian/magyar.ldf (renamed from Master/texmf-dist/tex/latex/babel-hungarian/magyar.ldf)0
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo11
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
4 files changed, 21 insertions, 3 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-hungarian/README b/Master/texmf-dist/doc/generic/babel-hungarian/README
new file mode 100644
index 00000000000..b3249749bc5
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/babel-hungarian/README
@@ -0,0 +1,12 @@
+This is the new version 1.5 for Hungarian in LaTeX. See more info about
+Hungarian typography in LaTeX in our TUG 2004 article (get it from
+http://www.inf.bme.hu/~pts/ , search for TUG 2004).
+
+This file is intended to be part of the standard Babel system, but the
+maintainer of Babel has not had time to incorporate it into the
+official distribution.
+
+Users are urged to report their experiences with the package to the
+maintainer of Babel as well as to the author of the package. The
+maintainer of Babel is interested in positive feedback about the
+package as well as problems. \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/babel-hungarian/magyar.ldf b/Master/texmf-dist/tex/generic/babel-hungarian/magyar.ldf
index 832d3fb07db..832d3fb07db 100644
--- a/Master/texmf-dist/tex/latex/babel-hungarian/magyar.ldf
+++ b/Master/texmf-dist/tex/generic/babel-hungarian/magyar.ldf
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index eac612083d6..80ca069ff64 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -166,7 +166,6 @@ sub find_ctan_dir {
$ctan_dir = "info/translations/vn" if $me eq "ntheorem-vn";
$ctan_dir = "language/armenian/armtex" if $me eq "armenian";
$ctan_dir = "language/basque" if $me eq "hyphen-basque";
- $ctan_dir = "language/hungarian/babel" if $me eq "magyar";
$ctan_dir = "language/hyphenation/dehyph" if $me eq "hyphen-german";
$ctan_dir = "language/hyphenation/elhyphen" if $me eq "hyphen-greek";
$ctan_dir = "macros/generic" if $me eq "genmisc";
@@ -261,9 +260,15 @@ sub catalogue_find_ctan_path {
# which case we return undef here and let the code above find it.
# (The Catalogue maintainers do not consider this a problem.)
#
+ # Subcase of (2): package name is babel-hungarian, but CTAN path is
+ # babel-contrib/hungarian. Sigh.
+ #
+warn "ctan path $ctan_path, pkg $pkgname\n";
if ($ctan_path =~ /file='true'/) {
- if ($ctan_path =~ m,/$pkgname/,) { # pkg dir somewhere in path?
- return undef;
+ (my $ctan_babel_path = $ctan_path) =~ s,babel-contrib/,babel-,;
+ if ($ctan_path =~ m,/$pkgname/,
+ || $ctan_babel_path =~ m,/$pkgname/,) {
+ return undef; # pkg dir somewhere in path.
} else {
return $do_copy # are we called by prepare() or not?
? &copy_to_tmpdir ($pkgname, "$CTAN/$ctan_loc")
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 4c63a8b9fd8..b727c3a09f1 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -621,6 +621,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'ly1', "&MAKEcopy",
'lyx', "die 'skipping, container directory'",
'mab2bib', "die 'skipping, python'",
+ 'magyar', "die 'skipping, use babel-hungarian'",
'make-env', "die 'skipping, no license, too old to bother with'",
'makebarcode', "&MAKEcopy",
'makecell', "&MAKEnosymlinks",