diff options
author | Karl Berry <karl@freefriends.org> | 2014-11-11 23:02:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-11-11 23:02:06 +0000 |
commit | 769fe8a38377f89203d058f498f6d1b3c4c39c1e (patch) | |
tree | 24b16277a94e43830ff57450787f098678ed1695 | |
parent | 1c9110f6a6e59feff05d46837175993a607a90d6 (diff) |
sync
git-svn-id: svn://tug.org/texlive/trunk@35562 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua | 13 | ||||
-rw-r--r-- | Master/texmf-dist/tex/texinfo/texinfo.tex | 27 |
2 files changed, 29 insertions, 11 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua b/Build/source/texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua index 46e42fa9cf8..2b1d361a8c6 100755 --- a/Build/source/texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua +++ b/Build/source/texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua @@ -1,7 +1,7 @@ #!/usr/bin/env texlua NAME = "ptex2pdf[.lua]" -VERSION = "0.4" +VERSION = "0.5" AUTHOR = "Norbert Preining <norbert@preining.info>" SHORTDESC = NAME .. ": Convert Japanese TeX documents to pdf" LONGDESC = [[ @@ -28,7 +28,7 @@ LICENSECOPYRIGHT = [[ Originally based on musixtex.lua from Bob Tennent. (c) Copyright 2012 Bob Tennent rdt@cs.queensu.ca -(c) Copyright 2013 Norbert Preining norbert@preining.info +(c) Copyright 2013-2014 Norbert Preining norbert@preining.info This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -122,6 +122,9 @@ CHANGELOG = [[ version 0.4 2013-05-07 NP quote the filename with ", so that special chars do survive add an example for TeXworks for files with different kanji encoding + version 0.5 2014-11-05 NP + on Windows: set command_line_encoding to utf8 when running uptex + (patch by Akira Kakuto) ]] @@ -252,6 +255,12 @@ if not io.open(filename .. ".tex", "r") then print("Non-existent file: ", filename .. ".tex") exit_code = 1 else + -- make sure that on Windows/uptex we are using utf8 as command line encoding + if use_uptex == 1 then + if os.type == 'windows' then + os.setenv('command_line_encoding', 'utf8') + end + end print("Processing ".. filename .. ".tex.") if (os.execute(tex .. " " .. texopts .. " \"" .. filename .. "\"") == 0) and (dvipdf == "" or (os.execute(dvipdf .. " " .. dvipdfopts .. " \"" .. filename .. "\"") == 0)) diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index 6312dadbce0..72c8cf4eed7 100644 --- a/Master/texmf-dist/tex/texinfo/texinfo.tex +++ b/Master/texmf-dist/tex/texinfo/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{2014-05-20.16} +\def\texinfoversion{2014-10-29.10} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -5739,13 +5739,16 @@ end % % #1 is the text, #2 is the section type (Ynumbered, Ynothing, % Yappendix, Yomitfromtoc), #3 the chapter number. +% Not used for @heading series. % % To test against our argument. \def\Ynothingkeyword{Ynothing} -\def\Yomitfromtockeyword{Yomitfromtoc} \def\Yappendixkeyword{Yappendix} +\def\Yomitfromtockeyword{Yomitfromtoc} % \def\chapmacro#1#2#3{% + \checkenv{}% chapters, etc., should not start inside an environment. + % % Insert the first mark before the heading break (see notes for \domark). \let\prevchapterdefs=\lastchapterdefs \let\prevsectiondefs=\lastsectiondefs @@ -5891,22 +5894,28 @@ end % Print any size, any type, section title. % -% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is -% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the -% section number. +% #1 is the text of the title, +% #2 is the section level (sec/subsec/subsubsec), +% #3 is the section type (Ynumbered, Ynothing, Yappendix, Yomitfromtoc), +% #4 is the section number. % \def\seckeyword{sec} % \def\sectionheading#1#2#3#4{% {% - \checkenv{}% should not be in an environment. + \def\sectionlevel{#2}% + \def\temptype{#3}% + % + % It is ok for the @heading series commands to appear inside an + % environment (it's been historically allowed, though the logic is + % dubious), but not the others. + \ifx\temptype\Yomitfromtockeyword\else + \checkenv{}% non-@*heading should not be in an environment. + \fi % % Switch to the right set of fonts. \csname #2fonts\endcsname \rmisbold % - \def\sectionlevel{#2}% - \def\temptype{#3}% - % % Insert first mark before the heading break (see notes for \domark). \let\prevsectiondefs=\lastsectiondefs \ifx\temptype\Ynothingkeyword |