diff options
-rw-r--r-- | Build/source/utils/biber/TeXLive/TLConfig.pm | 295 | ||||
-rw-r--r-- | Build/source/utils/biber/TeXLive/TLUtils.pm | 140 | ||||
-rw-r--r-- | Build/source/utils/chktex/getopt.c | 2 | ||||
-rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/texbook2.bib | 12 | ||||
-rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/texbook3.bib | 24 | ||||
-rw-r--r-- | Master/texmf-dist/bibtex/bib/beebe/tugboat.bib | 47 | ||||
-rw-r--r-- | Master/texmf/web2c/texmf.cnf | 4 |
7 files changed, 472 insertions, 52 deletions
diff --git a/Build/source/utils/biber/TeXLive/TLConfig.pm b/Build/source/utils/biber/TeXLive/TLConfig.pm index 57f2181738f..8825b33e800 100644 --- a/Build/source/utils/biber/TeXLive/TLConfig.pm +++ b/Build/source/utils/biber/TeXLive/TLConfig.pm @@ -1,2 +1,297 @@ +# $Id: TLConfig.pm 23084 2011-06-22 03:07:01Z preining $ +# TeXLive::TLConfig.pm - module exporting configuration values +# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining +# This file is licensed under the GNU General Public License version 2 +# or any later version. + package TeXLive::TLConfig; + +my $svnrev = '$Revision: 23084 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + +BEGIN { + use Exporter (); + use vars qw( @ISA @EXPORT_OK @EXPORT ); + @ISA = qw(Exporter); + @EXPORT_OK = qw( + $ReleaseYear + @MetaCategories + @NormalCategories + @Categories + $MetaCategoriesRegexp + $CategoriesRegexp + $DefaultCategory + $DefaultContainerFormat + $DefaultContainerExtension + $InfraLocation + $DatabaseName + $PackageBackupDir + $BlockSize + $Archive + $TeXLiveServerURL + $TeXLiveServerPath + $TeXLiveURL + @CriticalPackagesList + $CriticalPackagesRegexp + $WindowsMainMenuName + $RelocPrefix + $RelocTree + %TLPDBOptions + %TLPDBSettings + %TLPDBConfigs + $NetworkTimeout + ); + @EXPORT = @EXPORT_OK; +} + +# the year of our release, will be used in the location of the +# network packages, and in menu names, and other places. +$ReleaseYear = 2011; + +# users can upgrade from this year to the current year; maybe a spread +# of more than one year will be useful at some point, but not now. +$MinRelease = $ReleaseYear - 1; + +# Meta Categories do not ship files, but only call for other packages. +our @MetaCategories = qw/Collection Scheme/; +our $MetaCategoriesRegexp = '(Collection|Scheme)'; +# +# Normal Categories contain actial files and do not depend on other things. +our @NormalCategories = qw/Package TLCore ConTeXt/; +# +# list of all Categories +our @Categories = (@MetaCategories, @NormalCategories); + +# repeat, as a regexp. +our $CategoriesRegexp = '(Collection|Scheme|Package|TLCore|ConTeXt)'; + +our $DefaultCategory = "Package"; + +# location of various infra files (texlive.tlpdb, .tlpobj etc) +# relative to a root (e.g., the Master/, or the installation path) +our $InfraLocation = "tlpkg"; +our $DatabaseName = "texlive.tlpdb"; + +# location of backups in default autobackup setting (under tlpkg) +our $PackageBackupDir = "$InfraLocation/backups"; + +our $BlockSize = 4096; + +our $Archive = "archive"; +our $TeXLiveServerURL = "http://mirror.ctan.org"; +# from 2009 on we try to put them all into tlnet directly without any +# release year since we hope that we can switch over to 2010 on the fly +# our $TeXLiveServerPath = "systems/texlive/tlnet/$ReleaseYear"; +our $TeXLiveServerPath = "systems/texlive/tlnet"; +our $TeXLiveURL = "$TeXLiveServerURL/$TeXLiveServerPath"; + +# Relocatable packages. +our $RelocTree = "texmf-dist"; +our $RelocPrefix = "RELOC"; + +our @CriticalPackagesList = qw/texlive.infra/; +our $CriticalPackagesRegexp = '^(texlive\.infra)'; +if ($^O =~ /^MSWin(32|64)$/i) { + push (@CriticalPackagesList, "tlperl.win32"); + $CriticalPackagesRegexp = '^(texlive\.infra|tlperl\.win32$)'; +} + +# the way we package things on the web +our $DefaultContainerFormat = "xz"; +our $DefaultContainerExtension = "tar.$DefaultContainerFormat"; + +# archive (not user) settings. +our %TLPDBConfigs = ( + "container_split_src_files" => 1, + "container_split_doc_files" => 1, + "container_format" => $DefaultContainerFormat, + "minrelease" => $MinRelease, + "release" => $ReleaseYear, +); + +# definition of the option strings and their value types +# possible types are: +# - u: url +# - b: boolean, saved as 0/1 +# - p: path (local path) +# - n: natural number +# it allows n:[a]..[b] +# if a is empty start at -infty +# if b is empty end at +infty +# so "n:.." is equivalent to "n" + +# $TLPDBOptions{"option"}->[0] --> type +# ->[1] --> default value +# ->[2] --> tlmgr name +# ->[3] --> tlmgr description +# the "option" is the value in the TLPDB + +our %TLPDBOptions = ( + "autobackup" => + [ "n:-1..", 1, "autobackup", + "Number of backups to keep" ], + "backupdir" => + [ "p", $PackageBackupDir, "backupdir", + "Directory for backups" ], + "create_formats" => + [ "b", 1, "formats", + "Create formats on installation" ], + "desktop_integration" => + [ "b", 1, "desktop_integration", + "Create Start menu shortcuts (w32)" ], + "file_assocs" => + [ "n:0..2", 1, "fileassocs", + "Change file associations (w32)" ], + "install_docfiles" => + [ "b", 1, "docfiles", + "Install documentation files" ], + "install_srcfiles" => + [ "b", 1, "srcfiles", + "Install source files" ], + "location" => + [ "u", "__MASTER__", "repository", + "Default package repository" ], + "post_code" => + [ "b", 1, "postcode", + "Run postinst code blobs" ], + "sys_bin" => + [ "p", "/usr/local/bin", "sys_bin", + "Destination for symlinks for binaries" ], + "sys_info" => + [ "p", "/usr/local/info", "sys_info", + "Destination for symlinks for info docs" ], + "sys_man" => + [ "p", "/usr/local/man", "sys_man", + "Destination for symlinks for man pages" ], + "w32_multi_user" => + [ "b", 0, "multiuser", + "Install for all users (w32)" ], + "generate_updmap" => + [ "b", 0, "generate_updmap", + "Run tlmgr generate updmap after maps have changed" ], +); + + +our %TLPDBSettings = ( + "platform" => [ "s", "Main platform for this computer" ], + "available_architectures" => [ "l", "All available/installed architectures" ] +); + +our $WindowsMainMenuName = "TeX Live $ReleaseYear"; + +# +# timeout for network connections (wget, LWP) in seconds +our $NetworkTimeout = 30; + 1; + + +=head1 NAME + +C<TeXLive::TLConfig> -- TeX Live Configurations + +=head1 SYNOPSIS + + use TeXLive::TLConfig; + +=head1 DESCRIPTION + +The L<TeXLive::TLConfig> module contains definitions of variables +configuring all of TeX Live. + +=over 4 + +=head1 EXPORTED VARIABLES + +All of the following variables are pulled into the callers namespace, +i.e., are declared with C<EXPORT> (and C<EXPORT_OK>). + +=item C<@TeXLive::TLConfig::MetaCategories> + +The list of meta categories, i.e., those categories whose packages only +depend on other packages, but don't ship any files. Currently +C<Collection> and <Scheme>. + +=item C<@TeXLive::TLConfig::NormalCategories> + +The list of normal categories, i.e., those categories whose packages do +ship files. Currently C<TLCore>, C<Package>, C<ConTeXt>. + +=item C<@TeXLive::TLConfig::Categories> + +The list of all categories, i.e., the union of the above. + +=item C<$TeXLive::TLConfig::CategoriesRegexp> + +A regexp matching any category. + +=item C<$TeXLive::TLConfig::DefaultCategory> + +The default category used when creating new packages. + +=item C<$TeXLive::TLConfig::InfraLocation> + +The subdirectory with various infrastructure files (C<texlive.tlpdb>, +tlpobj files, ...) relative to the root of the installation; currently +C<tlpkg>. + +=item C<$TeXLive::TLConfig::BlockSize> + +The assumed block size, currently 4k. + +=item C<$TeXLive::TLConfig::Archive> +=item C<$TeXLive::TLConfig::TeXLiveURL> + +These values specify where to find packages. + +=item C<$TeXLive::TLConfig::TeXLiveServerURL> +=item C<$TeXLive::TLConfig::TeXLiveServerPath> + +C<TeXLiveURL> is concatenated from these values, with a string between. +The defaults are respectively, C<http://mirror.ctan.org> and +C<systems/texlive/tlnet/>. + +=item C<@TeXLive::TLConfig::CriticalPackagesList> +=item C<@TeXLive::TLConfig::CriticalPackagesRegexp> + +A list of all those packages which we do not update regularly since they +are too central, currently texlive.infra and (for Windows) tlperl.win32. + +=item C<$TeXLive::TLConfig::RelocTree> + +The texmf-tree name that can be relocated, defaults to C<texmf-dist>. + +=item C<$TeXLive::TLConfig::RelocPrefix> + +The string that replaces the C<RelocTree> in the tlpdb if a package is +relocated, defaults to C<RELOC>". + +=back + +=head1 SEE ALSO + +The modules L<TeXLive::TLUtils>, L<TeXLive::TLPSRC>, +L<TeXLive::TLPDB>, L<TeXLive::TLTREE>, L<TeXLive::TeXCatalogue>. + +=head1 AUTHORS AND COPYRIGHT + +This script and its documentation were written for the TeX Live +distribution (L<http://tug.org/texlive>) and both are licensed under the +GNU General Public License Version 2 or later. + +=cut + +### Local Variables: +### perl-indent-level: 2 +### tab-width: 2 +### indent-tabs-mode: nil +### End: +# vim:set tabstop=2 expandtab: # diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm index d9234e2ddff..ea26a1ed41d 100644 --- a/Build/source/utils/biber/TeXLive/TLUtils.pm +++ b/Build/source/utils/biber/TeXLive/TLUtils.pm @@ -1,4 +1,4 @@ -# $Id: TLUtils.pm 23155 2011-06-28 00:43:01Z karl $ +# $Id: TLUtils.pm 23990 2011-09-17 07:40:33Z preining $ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. # Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 @@ -6,7 +6,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 23155 $'; +my $svnrev = '$Revision: 23990 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -62,6 +62,7 @@ C<TeXLive::TLUtils> -- utilities used in the TeX Live infrastructure TeXLive::TLUtils::setup_programs($bindir, $platform); TeXLive::TLUtils::tlcmp($file, $file); TeXLive::TLUtils::nulldev(); + TeXLive::TLUtils::get_full_line($fh); =head2 Installer Functions @@ -90,6 +91,7 @@ C<TeXLive::TLUtils> -- utilities used in the TeX Live infrastructure TeXLive::TLUtils::member($item, @list); TeXLive::TLUtils::merge_into(\%to, \%from); TeXLive::TLUtils::texdir_check($texdir); + TeXLive::TLUtils::quotify_path_with_spaces($path); TeXLive::TLUtils::conv_to_w32_path($path); TeXLive::TLUtils::native_slashify($internal_path); TeXLive::TLUtils::forward_slashify($path_from_user); @@ -156,6 +158,7 @@ BEGIN { &texdir_check &member "ewords + "ify_path_with_spaces &conv_to_w32_path &native_slashify &forward_slashify @@ -164,6 +167,8 @@ BEGIN { &merge_into &give_ctan_mirror &give_ctan_mirror_base + &create_mirror_list + &extract_mirror_entry &tlmd5 &xsystem &run_cmd @@ -180,6 +185,7 @@ BEGIN { &setup_persistent_downloads &mktexupd &nulldev + &get_full_line ); @EXPORT = qw(setup_programs download_file process_logging_options tldie tlwarn info log debug ddebug dddebug debug_hash @@ -262,6 +268,7 @@ sub platform_name { ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/; $CPU =~ s/^alpha(.*)/alpha/; # alphaev56 or whatever $CPU =~ s/powerpc64/powerpc/; # we don't distinguish ppc64 + $CPU =~ s/mips64el/mipsel/; # we don't distinguish mips64 and 32 el my @OSs = qw(aix cygwin darwin freebsd hpux irix kfreebsd linux netbsd openbsd solaris); @@ -1369,7 +1376,7 @@ sub install_package { # we assume that $::progs has been set up! my $wget = $::progs{'wget'}; - my $xzdec = "\"$::progs{'xzdec'}\""; + my $xzdec = quotify_path_with_spaces($::progs{'xzdec'}); if (!defined($wget) || !defined($xzdec)) { tlwarn("install_package: wget/xzdec programs not set up properly.\n"); return 0; @@ -1823,7 +1830,7 @@ after all packages have been unpacked. =cut sub announce_execute_actions { - my ($type, $tlp) = @_; + my ($type, $tlp, $what) = @_; # do simply return immediately if execute actions are suppressed return if $::no_execute_actions; @@ -1835,6 +1842,14 @@ sub announce_execute_actions { $::files_changed = 1; return; } + if (defined($type) && ($type eq "latex-updated")) { + $::latex_updated = 1; + return; + } + if (defined($type) && ($type eq "tex-updated")) { + $::tex_updated = 1; + return; + } if (!defined($type) || (($type ne "enable") && ($type ne "disable"))) { die "announce_execute_actions: enable or disable, not type $type"; } @@ -1842,22 +1857,28 @@ sub announce_execute_actions { if ($tlp->runfiles || $tlp->srcfiles || $tlp->docfiles) { $::files_changed = 1; } + $what = "map format hyphen" if (!defined($what)); foreach my $e ($tlp->executes) { if ($e =~ m/^add((Mixed)?Map)\s+([^\s]+)\s*$/) { - $::execute_actions{$type}{'maps'}{$3} = "$1"; + # save the refs as we have another =~ grep in the following lines + my $a = $1; + my $b = $3; + $::execute_actions{$type}{'maps'}{$b} = $a if ($what =~ m/map/); } elsif ($e =~ m/^AddFormat\s+(.*)\s*$/) { my %r = TeXLive::TLUtils::parse_AddFormat_line("$1"); if (defined($r{"error"})) { tlwarn ("$r{'error'} in parsing $e for return hash\n"); } else { - $::execute_actions{$type}{'formats'}{$r{'name'}} = \%r; + $::execute_actions{$type}{'formats'}{$r{'name'}} = \%r + if ($what =~ m/format/); } } elsif ($e =~ m/^AddHyphen\s+(.*)\s*$/) { my %r = TeXLive::TLUtils::parse_AddHyphen_line("$1"); if (defined($r{"error"})) { tlwarn ("$r{'error'} in parsing $e for return hash\n"); } else { - $::execute_actions{$type}{'hyphens'}{$r{'name'}} = \%r; + $::execute_actions{$type}{'hyphens'}{$r{'name'}} = \%r + if ($what =~ m/hyphen/); } } else { tlwarn("Unknown execute $e in ", $tlp->name, "\n"); @@ -2076,7 +2097,9 @@ sub untar { my $cwd = cwd(); chdir($targetdir) || die "chdir($targetdir) failed: $!"; - if (system($tar, "xf", $tarfile) != 0) { + # on w32 don't extract file modified time, because AV soft can open + # files in the mean time causing time stamp modification to fail + if (system($tar, win32() ? "xmf" : "xf", $tarfile) != 0) { tlwarn("untar: untarring $tarfile failed (in $targetdir)\n"); $ret = 0; } else { @@ -2417,6 +2440,31 @@ sub nulldev { return (&win32)? 'nul' : '/dev/null'; } +=item C<get_full_line ($fh)> + +returns the next line from the file handle $fh, taking +continuation lines into account (last character of a line is \, and +no quoting is parsed). + +=cut + +# open my $f, '<', $file_name or die; +# while (my $l = get_full_line($f)) { ... } +# close $f or die; +sub get_full_line { + my ($fh) = @_; + my $line = <$fh>; + return undef unless defined $line; + return $line unless $line =~ s/\\\r?\n$//; + my $cont = get_full_line($fh); + if (!defined($cont)) { + tlwarn('Continuation disallowed at end of file'); + $cont = ""; + } + $cont =~ s/^\s*//; + return $line . $cont; +} + =back @@ -3176,6 +3224,25 @@ sub process_logging_options { } } +=pod + +This function takes a single argument I<path> and returns it with +C<"> chars surrounding it on Unix. On Windows, the C<"> chars are only +added if I<path> a few special characters, since unconditional quoting +leads to errors there. In all cases, any C<"> chars in I<path> itself +are (erroneously) eradicated. + +=cut + +sub quotify_path_with_spaces { + my $p = shift; + my $m = win32() ? '[+=^&();,!%\s]' : '.'; + if ( $p =~ m/$m/ ) { + $p =~ s/"//g; # remove any existing double quotes + $p = "\"$p\""; + } + return($p); +} =pod @@ -3202,7 +3269,7 @@ sub conv_to_w32_path { chomp($cwd); $p = "$cwd\\$p"; } - if ($p =~ m/ /) { $p = "\"$p\""; } + $p = quotify_path_with_spaces($p); return($p); } @@ -3327,7 +3394,7 @@ sub check_on_working_mirror tlwarn ("check_on_working_mirror: Programs not set up, trying wget\n"); $wget = "wget"; } - $wget = "\"wget\""; + $wget = quotify_path_with_spaces($wget); # # the test is currently not completely correct, because we do not # use the LWP if it is set up for it, but I am currently too lazy @@ -3405,6 +3472,59 @@ sub give_ctan_mirror return (give_ctan_mirror_base(@_) . "/$TeXLiveServerPath"); } +=item C<create_mirror_list()> + +=item C<extract_mirror_entry($listentry)> + +C<create_mirror_list> returns the lists of viable mirrors according to +ctan-mirrors.pl, in a list which also contains continents, and country headers. + +C<extract_mirror_entry> extracts the actual repository data from one +of these entries. + +# KEEP THESE TWO FUNCTIONS IN SYNC!!! + +=cut + +sub create_mirror_list { + our $mirrors; + my @ret = (); + require("installer/ctan-mirrors.pl"); + my @continents = sort keys %$mirrors; + for my $continent (@continents) { + # first push the name of the continent + push @ret, uc($continent); + my @countries = sort keys %{$mirrors->{$continent}}; + for my $country (@countries) { + my @mirrors = sort keys %{$mirrors->{$continent}{$country}}; + my $first = 1; + for my $mirror (@mirrors) { + my $mfull = $mirror; + $mfull =~ s!/$!!; + # do not append the server path part here, but add + # it down there in the extract mirror entry + #$mfull .= "/" . $TeXLive::TLConfig::TeXLiveServerPath; + #if ($first) { + my $country_str = sprintf "%-12s", $country; + push @ret, " $country_str $mfull"; + # $first = 0; + #} else { + # push @ret, " $mfull"; + #} + } + } + } + return @ret; +} + +# extract_mirror_entry is not very intelligent, it assumes that +# the last "word" is the URL +sub extract_mirror_entry { + my $ent = shift; + my @foo = split ' ', $ent; + return $foo[$#foo] . "/" . $TeXLive::TLConfig::TeXLiveServerPath; +} + sub tlmd5 { my ($file) = @_; if (-r $file) { diff --git a/Build/source/utils/chktex/getopt.c b/Build/source/utils/chktex/getopt.c index ad5a66bc180..2f6984e263d 100644 --- a/Build/source/utils/chktex/getopt.c +++ b/Build/source/utils/chktex/getopt.c @@ -1,6 +1,6 @@ /* Getopt for GNU. - Copyright 2008, 2009, 2010 Karl Berry. + Copyright 2008, 2009, 2010, 2011 Karl Berry. Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 2000, 2010 Free Software Foundation, Inc. diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib index 55b05dca8d9..c4c3ca99969 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib @@ -5,9 +5,9 @@ %%% ==================================================================== %%% BibTeX-file{ %%% author = "Nelson H. F. Beebe", -%%% version = "2.03", -%%% date = "11 December 2010", -%%% time = "08:50:10 MST", +%%% version = "2.04", +%%% date = "29 September 2011", +%%% time = "06:58:08 MDT", %%% filename = "texbook2.bib", %%% address = "University of Utah %%% Department of Mathematics, 110 LCB @@ -16,7 +16,7 @@ %%% USA", %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", -%%% checksum = "52975 9077 34062 311775", +%%% checksum = "02076 9077 34062 311774", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", @@ -32,7 +32,7 @@ %%% printed if the is-alpha.bst or is-plain.bst %%% style files are used. %%% -%%% At version 2.03, the year coverage looked +%%% At version 2.04, the year coverage looked %%% like this: %%% %%% 1979 ( 1) 1990 ( 99) 2001 ( 2) @@ -3916,7 +3916,7 @@ @Book{Gander:SPS93, author = "Walter Gander and Ji{\v{r}}i - H{\v{r}}eb{\'{\i}}{\v{c}}ek", + H{\v{r}}eb{\'\i}{\v{c}}ek", title = "Solving Problems in Scientific Computing Using {MAPLE} and {MATLAB}", publisher = pub-SV, diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib index 9dd5e9240d5..fd57a3f1b23 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/texbook3.bib @@ -5,9 +5,9 @@ %%% ==================================================================== %%% BibTeX-file{ %%% author = "Nelson H. F. Beebe", -%%% version = "3.30", -%%% date = "16 September 2011", -%%% time = "12:32:52 MDT", +%%% version = "3.32", +%%% date = "29 September 2011", +%%% time = "06:59:08 MDT", %%% filename = "texbook3.bib", %%% address = "University of Utah %%% Department of Mathematics, 110 LCB @@ -17,7 +17,7 @@ %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", %%% URL = "http://www.math.utah.edu/~beebe", -%%% checksum = "60784 14148 58391 537984", +%%% checksum = "02463 14148 58391 537981", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", @@ -37,7 +37,7 @@ %%% covered in separate bibliographies %%% (ep.bib, epodd.bib, and sgml.bib). %%% -%%% At version 3.30, the year coverage looks +%%% At version 3.32, the year coverage looks %%% like this: %%% %%% 1928 ( 1) 1956 ( 0) 1984 ( 15) @@ -142,8 +142,8 @@ %%% 0895-6340. It is published by the University of California %%% Press, 2120 Berkeley Way, Berkeley, CA 94720. %%% -%%% Rates are US $40/yr for non-members, plus $4 postage if -%%% outside the US. Single copies are US $10. +%%% Rates are US \$40/yr for non-members, plus \$4 postage if +%%% outside the US. Single copies are US \$10. %%% %%% Editorial correspondence should be addressed to %%% @@ -3978,7 +3978,7 @@ author = "Dariusz Dyl", title = "Komputerowy sk{\l}ad tekstu w systemie {\LaTeX}. Przewodnik po komendach i {\'s}rodowiskach wraz z - przyk{\l}adami.", + przyk{\l}adami", publisher = pub-MARSZALEK, address = pub-MARSZALEK:adr, edition = "1.", @@ -8202,8 +8202,8 @@ @Book{Lammarsch:1996:CTL, author = "Joachim Lammarsch and Harald Schoppmann", - title = "{CTAN}-3: das {\TeX}-/{\LaTeX}-Archiv von {DANTE} - e.{V}.", + title = "{CTAN}-3: das {\TeX}-/{\LaTeX}-Archiv von {DANTE + e.V.}", publisher = pub-AW, address = pub-AW:adr, pages = "123", @@ -9264,7 +9264,7 @@ title = "Ris{\o}-rapporter i {\TeX}. Matematisk og naturvidenskabelig typografi i praksis (Ris{\o} reports in {\TeX}. Mathematical and scientific typography in - practice).", + practice)", publisher = pub-RISO, address = pub-RISO:adr, year = "1991", @@ -10422,7 +10422,7 @@ @Book{Rybicka:1995:PZ, author = "Ji{\v{r}}i Rybi{\v{c}}ka", - title = "{\LaTeX} pro za{\v{c}}{\'a}te{\v{c}}n{\'{\i}}ky", + title = "{\LaTeX} pro za{\v{c}}{\'a}te{\v{c}}n{\'\i}ky", publisher = "Konvoy", address = "Brno, Czech Republic", pages = "169", diff --git a/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib b/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib index 6ed65d15f8d..9a1e6fdb3c0 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib @@ -2,9 +2,9 @@ %%% ==================================================================== %%% BibTeX-file{ %%% author = "Nelson H. F. Beebe", -%%% version = "1.35", -%%% date = "13 July 2007", -%%% time = "10:24:20 MDT", +%%% version = "1.36", +%%% date = "29 September 2011", +%%% time = "07:02:18 MDT", %%% filename = "tugboat.bib", %%% address = "University of Utah %%% Department of Mathematics, 110 LCB @@ -14,20 +14,21 @@ %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", %%% URL = "http://www.math.utah.edu/~beebe", -%%% checksum = "35346 43987 149913 1513270", +%%% checksum = "34008 43988 149918 1513188", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", %%% keywords = "bibliography; BibTeX; TeX Users Group; %%% TUGboat", +%%% license = "public domain", %%% supported = "yes", %%% docstring = "This bibliography covers the contents of %%% TUGboat (ISSN 0896-3207, LCCN Z253.4.T47T83), %%% the Communications of the TeX Users Group. %%% -%%% At version 1.35, the year coverage looked +%%% At version 1.36, the year coverage looked %%% like this: -%%% +%%% %%% 1980 ( 11) 1989 ( 169) 1998 ( 113) %%% 1981 ( 119) 1990 ( 164) 1999 ( 134) %%% 1982 ( 50) 1991 ( 190) 2000 ( 84) @@ -37,11 +38,11 @@ %%% 1986 ( 114) 1995 ( 86) 2004 ( 30) %%% 1987 ( 138) 1996 ( 101) 2005 ( 85) %%% 1988 ( 125) 1997 ( 95) -%%% +%%% %%% Article: 2720 -%%% +%%% %%% Total entries: 2720 -%%% +%%% %%% The master files for this bibliography are %%% maintained at %%% @@ -537,7 +538,7 @@ } @Article{Lawson:TB2-1-20, - author = "C. L. Lawson and I. Zabala and M. D{\'{\i}}az", + author = "C. L. Lawson and I. Zabala and M. D{\'\i}az", title = "{{Brief functional characterization of the procedures in the {\TeX}/Pascal compilation unit, {\tt SYSDEP}}}", journal = j-TUGboat, @@ -554,7 +555,7 @@ } @Article{Lawson:TB2-1-32, - author = "C. L. Lawson and I. Zabala and M. D{\'{\i}}az", + author = "C. L. Lawson and I. Zabala and M. D{\'\i}az", title = "{{Detailed specifications of procedures in the {\TeX}/Pascal compilation unit, {\tt SYSDEP}}}", journal = j-TUGboat, @@ -718,7 +719,7 @@ } @Article{Diaz:TB2-1-55, - author = "Max D{\'{\i}}az", + author = "Max D{\'\i}az", title = "{{\TeX} macro package}", journal = j-TUGboat, volume = "2", @@ -1526,7 +1527,7 @@ } @Article{Diaz:TB2-2-Appendix-A, - author = "Max D{\'{\i}}az", + author = "Max D{\'\i}az", title = "{F\'acil {\TeX}}", journal = j-TUGboat, volume = "2", @@ -15621,7 +15622,7 @@ } @Article{Diaz:TB10-4-579, - author = "Max D{\'{\i}}az", + author = "Max D{\'\i}az", title = "{{\TeX} in M\'exico}", journal = j-TUGboat, volume = "10", @@ -19696,7 +19697,7 @@ } @Article{Vesely:TB12-2-302, - author = "Ji\v{r}\'{\i} Vesel{\'y}", + author = "Ji\v{r}{\'\i} Vesel{\'y}", title = "{Reporting {\TeX}'s hyphenations}", journal = j-TUGboat, volume = "12", @@ -28349,7 +28350,7 @@ } @Article{Zlatuska:TB16-3-227, - author = "Ji\v{r}\'{\i} Zlatu{\v{s}}ka", + author = "Ji\v{r}{\'\i} Zlatu{\v{s}}ka", title = "{When {\MF} does it alone}", journal = j-TUGboat, volume = "16", @@ -29605,7 +29606,7 @@ } @Article{Piska:TB17-2-92, - author = "Karel P\'{\i}{\v{s}}ka", + author = "Karel P{\'\i}{\v{s}}ka", title = "Cyrillic alphabets", journal = j-TUGboat, volume = "17", @@ -30046,7 +30047,7 @@ @Article{Sojka:TB17-3-244, author = "Petr Sojka and Han The Thanh and - Ji\v{r}{\'{\i}}Zlatu{\v{s}}ka", + Ji\v{r}{\'\i}Zlatu{\v{s}}ka", title = "{{The joy of {\TeX}2\acro{PDF}\Dash Acrobatics with an alternative to \acro{DVI} format}}", journal = j-TUGboat, @@ -35886,7 +35887,7 @@ } @Article{Koutny:TB20-4-347, - author = "Vladim{\'{\i}}r Koutn{\'y}", + author = "Vladim{\'\i}r Koutn{\'y}", title = "{TrueType fonts in \TeX}", journal = j-TUGboat, volume = "20", @@ -35902,7 +35903,7 @@ } @Article{Zyka:TB20-4-348, - author = "V{\'{\i}}t Z{\'y}ka", + author = "V{\'\i}t Z{\'y}ka", title = "The semaphore alphabet", journal = j-TUGboat, volume = "20", @@ -37130,8 +37131,8 @@ @Article{Carlisle:TB21-3-193, author = "David Carlisle", - title = "{{{\smc xmltex}: A non validating (and not 100\ in - {\TeX}}}", + title = "{{{\smc xmltex}: A non validating (and not 100\% in + {\TeX})}}", journal = j-TUGboat, volume = "21", number = "3", @@ -43744,7 +43745,7 @@ } @Article{Laguna:TB26-2-125, - author = "Javier Rodr\'{\i}guez Laguna", + author = "Javier Rodr{\'\i}guez Laguna", title = "{{H\'ong-Z\kern.05em\`{\i}: A Chinese \MF}}", journal = j-TUGboat, volume = "26", diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf index 73eee4d7c36..49aa187ea0e 100644 --- a/Master/texmf/web2c/texmf.cnf +++ b/Master/texmf/web2c/texmf.cnf @@ -303,6 +303,10 @@ BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}// MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// +% .ris and .bltxml bibliography formats. +RISINPUTS = .;$TEXMF/bibtex/ris// +BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml// + % MFT style files. MFTINPUTS = .;$TEXMF/mft// |