diff options
| -rw-r--r-- | Master/texmf-dist/scripts/texlive/NEWS | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/texinfo/texinfo.tex | 40 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 11 |
3 files changed, 52 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS index 0144e9f204b..afc0f38c629 100644 --- a/Master/texmf-dist/scripts/texlive/NEWS +++ b/Master/texmf-dist/scripts/texlive/NEWS @@ -1,6 +1,10 @@ (This file public domain. Originally written by Norbert Preining and Karl Berry, 2010.) +<p><b>tlmgr revision 39198 (released 5jan16):</b> +<li>message and doc changes. +<li>ConTeXt paper size changes. + <p><b>tlmgr revision 37738 (released 3jul15):</b> <li>more accurate error codes, e.g., for paper sizes. <li>info searches titles, descriptions, file names, topics if available. diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index f140bba94b8..16f116b21cc 100644 --- a/Master/texmf-dist/tex/texinfo/texinfo.tex +++ b/Master/texmf-dist/tex/texinfo/texinfo.tex @@ -3,11 +3,11 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2015-12-20.12} +\def\texinfoversion{2016-01-04.21} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 +% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 % Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or @@ -9428,6 +9428,31 @@ directory should work if nowhere else does.} \global\righthyphenmin = #3\relax } +% Get input by bytes instead of by UTF-8 codepoints for XeTeX and LuaTeX, +% otherwise the encoding support is completely broken. +\ifx\XeTeXrevision\thisisundefined +\else +\XeTeXinputencoding "bytes" +\fi + +\ifx\luatexversion\thisisundefined +\else +\directlua{ +local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub + +local function convert_char (char) + return utf8_char(byte(char)) +end + +local function convert_line (line) + return gsub(line, ".", convert_char) +end + +callback.register("process_input_buffer", convert_line) +} +\fi + + % Helpers for encodings. % Set the catcode of characters 128 through 255 to the specified number. % @@ -11004,9 +11029,20 @@ directory should work if nowhere else does.} {@catcode`@^=7 @catcode`@^^M=13% @gdef@eatinput input texinfo#1^^M{@fixbackslash}} +% Emergency active definition of newline, in case an active newline token +% appears by mistake. +{@catcode`@^=7 @catcode13=13% +@gdef@enableemergencynewline{% + @gdef^^M{% + @par% + %<warning: active newline>@par% +}}} + + @gdef@fixbackslash{% @ifx\@eatinput @let\ = @ttbackslash @fi @catcode13=5 % regular end of line + @enableemergencynewline @let@c=@texinfoc % Also turn back on active characters that might appear in the input % file name, in case not using a pre-dumped format. diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index c92696a0dbb..8bf5e1588ea 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1207,6 +1207,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'bibtex' => '&POSTbibtex', 'bibtexperllibs' => '&POSTbibtexperllibs', 'cfr-lm' => '&POSTcfr_lm', + 'cmcyr' => '&POSTcmcyr', 'context' => '&POSTcontext', 'context-games' => '&POSTcontext_games', 'coordsys' => '&POSTcoordsys', @@ -2502,7 +2503,6 @@ $standardmfinstall = '\.mf$'; %specialmfinstall = ( 'asaetr' => 'NULL', # cmcscsl10.mf conflict 'astro' => 'astrosym.(cal|cmn|mac|uni|xtr)', - 'cmcyr' => '\.mf', 'ibygrk' => 'ibycus4\.map', # tex|mf source 'ifsym' => $standardmfinstall . '|\.gen', 'mcf2graph' => 'NULL', @@ -5286,6 +5286,15 @@ sub POSTcfr_lm { &SYSTEM("rmdir doc"); } +sub POSTcmcyr { + print "POST$package - exclude cmcsc{8,9,10}.mf from runtime\n"; + # because they are duplicates of the standard files + # It is probably possible to achieve this with a + # negative look-ahead assertion, but this seems more understandable. + # assuming brace expansion in the shell ... + &SYSTEM ("$MV $DEST/fonts/source/public/cmcyr/cmcsc{8,9,10}.mf ."); +} + sub POSTcontext { print "POST$package - rearrange, remove\n"; &xchdir ($DEST); |