diff options
author | Karl Berry <karl@freefriends.org> | 2012-05-22 23:07:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-05-22 23:07:56 +0000 |
commit | 780199d88743d4f05acb93c694a244896180e36a (patch) | |
tree | f5bd1aaf23f5c8ed1652610498a91d4fb0fdc558 /Build/source/texk | |
parent | 0e55f00ba51c1f81c7ac174220079f43e1ba922c (diff) |
epstopdf 2.18 (22may12)
git-svn-id: svn://tug.org/texlive/trunk@26577 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
3 files changed, 32 insertions, 18 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl b/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl index ca2bb234e4e..31dd47459e2 100755 --- a/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl +++ b/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl @@ -1,8 +1,5 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' - if 0; -use strict; - -# $Id: epstopdf.pl 26303 2012-05-11 22:54:04Z karl $ +#!/usr/bin/env perl +# $Id: epstopdf.pl 26570 2012-05-22 16:14:37Z karl $ # (Copyright lines below.) # # Redistribution and use in source and binary forms, with or without @@ -46,6 +43,12 @@ use strict; # # emacs-page # History +# 2012/05/22 v2.18 (Karl Berry) +# * use /usr/bin/env, since Ruby has apparently required #! for years, +# and we rely on it for our other scripts, so why not. +# (tex-k mail from Jean Krohn, 2 Aug 2010 15:57:54, +# per http://osdir.com/ml/lang.ruby.general/2002-06/msg01388.html +# and ruby-bugs:PR#315). # 2012/05/12 v2.17 (Karl Berry) # * uselessly placate -w. Debian bug 672281. # 2010/05/09 v2.16 (Karl Berry) @@ -151,7 +154,7 @@ use strict; ### program identification my $program = "epstopdf"; -my $ident = '($Id: epstopdf.pl 26303 2012-05-11 22:54:04Z karl $) 2.17'; +my $ident = '($Id: epstopdf.pl 26570 2012-05-22 16:14:37Z karl $) 2.18'; my $copyright = <<END_COPYRIGHT ; Copyright 2009-2012 Karl Berry et al. Copyright 2002-2009 Gerben Wierda et al. diff --git a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries index df289eb8a39..19a61c9b5d0 100755 --- a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries +++ b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries @@ -2,7 +2,7 @@ # File : makeglossaries # Author : Nicola Talbot -# Version : 2.03 (2011/12/02) +# Version : 2.04 (2011/06/21) # Description: simple Perl script that calls makeindex or xindy. # Intended for use with "glossaries.sty" (saves having to remember # all the various switches) @@ -27,9 +27,11 @@ # glossary-super.sty, glossaries.perl. # Also makeglossaries and makeglossaries. -my $version="2.03 (2011-12-02)"; +my $version="2.04 (2012-05-19)"; # History: +# v2.04 (2012-04-19): +# * fixed bug in &scan_aux # v2.03 (2011-04-12): # * added warning about possibly needing 'nomain' package option # v2.02 (2011-04-2): @@ -456,6 +458,10 @@ sub scan_aux{ if (m/\\\@input{(.+)\.aux}/) { &scan_aux($1); + + # v2.04 added + # (Fix provided by Daniel Grund) + next; } if (m/\\\@newglossary\s*\{(.*)\}{(.*)}{(.*)}{(.*)}/) diff --git a/Build/source/texk/texlive/linked_scripts/uptex/convbkmk.rb b/Build/source/texk/texlive/linked_scripts/uptex/convbkmk.rb index ab9e362df77..2794329384b 100755 --- a/Build/source/texk/texlive/linked_scripts/uptex/convbkmk.rb +++ b/Build/source/texk/texlive/linked_scripts/uptex/convbkmk.rb @@ -3,13 +3,13 @@ =begin -convbkmk Ver.0.01 +convbkmk Ver.0.03 = License convbkmk -Copyright (c) 2009-2011 Takuji Tanaka +Copyright (c) 2009-2012 Takuji Tanaka Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -33,10 +33,14 @@ THE SOFTWARE. 2009.08.02 0.00 Initial version. 2011.05.02 0.01 Bug fix: BOM was not correct. +2012.05.08 0.02 Bug fix: for a case of dvips with -z option and Ruby1.8. + Add conversion of /Creator and /Producer . +2012.05.09 0.03 Suppress halfwidth -> fullwidth katakana conversion + and MIME decoding in Ruby1.8. =end -Version = "0.01" +Version = "0.03" require "optparse" @@ -52,10 +56,10 @@ else $RUBY_M17N = false require "jcode" # for method each_char - require "kconv" + require "nkf" class String def to_utf16be(enc) - self.kconv(Kconv::UTF16, enc.kconv_enc) + NKF.nkf('-w16 -x -m0 '+enc.kconv_enc, self) end def ascii_only? return self !~ /[\x80-\xFF]/n @@ -64,7 +68,8 @@ else tmp = "\"" + self + "\"" tmp.gsub!("\\(","\\\\\\(") tmp.gsub!("\\)","\\\\\\)") - tmp.gsub!("\n","\\n").gsub!("\r","\\r") + tmp.gsub!("\n","\\n") + tmp.gsub!("\r","\\r") return tmp == self.inspect end def force_encoding(enc) @@ -88,9 +93,9 @@ class TeXEncoding @list = ['Shift_JIS', 'EUC-JP', 'UTF-8'] if !$RUBY_M17N @kconv_enc = nil - @kconv_list = {'Shift_JIS' => Kconv::SJIS, - 'EUC-JP' => Kconv::EUC, - 'UTF-8' => Kconv::UTF8} + @kconv_list = {'Shift_JIS' => '--sjis-input', + 'EUC-JP' => '--euc-input', + 'UTF-8' => '--utf8-input'} end end @@ -290,7 +295,7 @@ def file_treatment(ifile, ofile, enc) while l = ifile.gets do line.force_encoding('ASCII-8BIT') if $RUBY_M17N line += l - if (line !~ %r!(/Author|/Title|/Subject|/Keywords)! ) + if (line !~ %r!(/Title|/Author|/Keywords|/Subject|/Creator|/Producer)(\s+\(|$)! ) ofile.print line line = '' next |