convbkmk now its own package

git-svn-id: svn://tug.org/texlive/trunk@30408 c570f23f-e606-0410-a88d-b1316a301751

30 files changed, 48 insertions, 25 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index f93f9d4511d..da488b129b8 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -85,6 +85,7 @@ texmf_other_scripts = \
 	cachepic/cachepic.tlu \
 	checkcites/checkcites.lua \
 	context/perl/mptopdf.pl \
+	convbkmk/convbkmk.rb \
 	ctanify/ctanify \
 	ctanupload/ctanupload.pl \
 	de-macro/de-macro \
@@ -148,7 +149,6 @@ texmf_other_scripts = \
 	texloganalyser/texloganalyser \
 	thumbpdf/thumbpdf.pl \
 	ulqda/ulqda.pl \
-	uptex/convbkmk.rb \
 	urlbst/urlbst \
 	vpe/vpe.pl
 texmf_context_scripts = \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index f06bfd19702..3af566e52db 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -262,6 +262,7 @@ texmf_other_scripts = \
 	cachepic/cachepic.tlu \
 	checkcites/checkcites.lua \
 	context/perl/mptopdf.pl \
+	convbkmk/convbkmk.rb \
 	ctanify/ctanify \
 	ctanupload/ctanupload.pl \
 	de-macro/de-macro \
@@ -325,7 +326,6 @@ texmf_other_scripts = \
 	texloganalyser/texloganalyser \
 	thumbpdf/thumbpdf.pl \
 	ulqda/ulqda.pl \
-	uptex/convbkmk.rb \
 	urlbst/urlbst \
 	vpe/vpe.pl
 
diff --git a/Build/source/texk/texlive/linked_scripts/uptex/convbkmk.rb b/Build/source/texk/texlive/linked_scripts/convbkmk/convbkmk.rb
index 2c566fe6301..2c566fe6301 100755
--- a/Build/source/texk/texlive/linked_scripts/uptex/convbkmk.rb
+++ b/Build/source/texk/texlive/linked_scripts/convbkmk/convbkmk.rb
diff --git a/Master/bin/alpha-linux/convbkmk b/Master/bin/alpha-linux/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/alpha-linux/convbkmk
+++ b/Master/bin/alpha-linux/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/convbkmk b/Master/bin/amd64-freebsd/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/amd64-freebsd/convbkmk
+++ b/Master/bin/amd64-freebsd/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/convbkmk b/Master/bin/amd64-kfreebsd/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/amd64-kfreebsd/convbkmk
+++ b/Master/bin/amd64-kfreebsd/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/convbkmk b/Master/bin/amd64-netbsd/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/amd64-netbsd/convbkmk
+++ b/Master/bin/amd64-netbsd/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/armel-linux/convbkmk b/Master/bin/armel-linux/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/armel-linux/convbkmk
+++ b/Master/bin/armel-linux/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/armhf-linux/convbkmk b/Master/bin/armhf-linux/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/armhf-linux/convbkmk
+++ b/Master/bin/armhf-linux/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/convbkmk b/Master/bin/i386-cygwin/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/i386-cygwin/convbkmk
+++ b/Master/bin/i386-cygwin/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/convbkmk b/Master/bin/i386-freebsd/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/i386-freebsd/convbkmk
+++ b/Master/bin/i386-freebsd/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/convbkmk b/Master/bin/i386-kfreebsd/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/i386-kfreebsd/convbkmk
+++ b/Master/bin/i386-kfreebsd/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/i386-linux/convbkmk b/Master/bin/i386-linux/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/i386-linux/convbkmk
+++ b/Master/bin/i386-linux/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/convbkmk b/Master/bin/i386-netbsd/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/i386-netbsd/convbkmk
+++ b/Master/bin/i386-netbsd/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/convbkmk b/Master/bin/i386-solaris/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/i386-solaris/convbkmk
+++ b/Master/bin/i386-solaris/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/mips-irix/convbkmk b/Master/bin/mips-irix/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/mips-irix/convbkmk
+++ b/Master/bin/mips-irix/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/mipsel-linux/convbkmk b/Master/bin/mipsel-linux/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/mipsel-linux/convbkmk
+++ b/Master/bin/mipsel-linux/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/convbkmk b/Master/bin/powerpc-linux/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/powerpc-linux/convbkmk
+++ b/Master/bin/powerpc-linux/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/convbkmk b/Master/bin/sparc-solaris/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/sparc-solaris/convbkmk
+++ b/Master/bin/sparc-solaris/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/convbkmk b/Master/bin/universal-darwin/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/universal-darwin/convbkmk
+++ b/Master/bin/universal-darwin/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/convbkmk b/Master/bin/x86_64-darwin/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/x86_64-darwin/convbkmk
+++ b/Master/bin/x86_64-darwin/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/convbkmk b/Master/bin/x86_64-linux/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/x86_64-linux/convbkmk
+++ b/Master/bin/x86_64-linux/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/convbkmk b/Master/bin/x86_64-solaris/convbkmk
index 1dba94392d3..de7a3541375 120000
--- a/Master/bin/x86_64-solaris/convbkmk
+++ b/Master/bin/x86_64-solaris/convbkmk
@@ -1 +1 @@
-../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
+../../texmf-dist/scripts/convbkmk/convbkmk.rb
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/convbkmk/README b/Master/texmf-dist/doc/support/convbkmk/README
new file mode 100644
index 00000000000..d6528f62b45
--- /dev/null
+++ b/Master/texmf-dist/doc/support/convbkmk/README
@@ -0,0 +1,19 @@
+convbkmk Ver.0.08
+
+2013.05.11
+Takuji Tanaka
+KXD02663 (at) nifty.ne.jp
+http://homepage3.nifty.com/ttk/comp/tex/uptex_en.html
+
+
+convbkmk is a tiny utility for making correct bookmarks in pdf files
+typesetted by platex/uplatex with the hyperref package.
+platex/uplatex + hyperref outputs data of bookmarks
+in their internal encodings (EUC-JP, Shift_JIS or UTF-8).
+On the other hand, the PostScript/PDF format requests that
+the data is written in a certain syntax with UTF-16 or PDFDocEncoding.
+Thus, data conversion is required to create correct bookmarks.
+convbkmk provides a function of
+the encoding conversion and formatting the bookmark data.
+
+More information is within the convbkmk.rb with the RD format.
diff --git a/Master/texmf-dist/scripts/uptex/convbkmk.rb b/Master/texmf-dist/scripts/convbkmk/convbkmk.rb
index 2c566fe6301..2c566fe6301 100755
--- a/Master/texmf-dist/scripts/uptex/convbkmk.rb
+++ b/Master/texmf-dist/scripts/convbkmk/convbkmk.rb
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 734b90e0756..11b59838420 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -131,7 +131,7 @@ my @TLP_working = qw(
     context-notes-zh-cn context-rst context-ruby
     context-simplefonts context-simpleslides
     context-transliterator context-typearea context-typescripts context-vim
-    contour contracard
+    contour contracard convbkmk
     cooking cookingsymbols cool coollist coolstr coolthms cooltooltips
     coordsys copyrightbox coseoul
     countriesofeurope counttexruns courier-scaled courseoutline coursepaper
@@ -292,7 +292,7 @@ my @TLP_working = qw(
     mathmode mathspec mathspic mattens maybemath mbenotes
     mcaption mceinleger mcite mciteplus
     mdframed mdputu mdsymbol mdwtools media9 meetingmins memdesign memexsupp
-    memoir MemoirChapStyles mentis
+    memoir MemoirChapStyles memory mentis
     menu menukeys
     metafont-beginners metago metalogo metaobj metaplot
     metapost-examples metatex metauml
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 39668eaf058..ed24118a9aa 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2340,6 +2340,7 @@ $standardxmt='\.xmt';
  'bibexport'		=> 'bibexport\.sh$',
  'bundledoc'		=> '(arlatex|bundledoc)$',
  'checkcites'		=> '\.lua$',
+ 'convbkmk'		=> '\.rb$',
  'ctanify'		=> '^ctanify$',
  'ctanupload'		=> '\.pl$',
  'de-macro'		=> 'de-macro',
diff --git a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
index d40b3828d65..f0d0be13d73 100644
--- a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
@@ -19,6 +19,7 @@ depend cjk-ko
 depend cjkpunct
 depend cjkutils
 depend cns
+depend convbkmk
 depend ctex
 depend ctex-faq
 depend dnp
diff --git a/Master/tlpkg/tlpsrc/convbkmk.tlpsrc b/Master/tlpkg/tlpsrc/convbkmk.tlpsrc
new file mode 100644
index 00000000000..8e5bc18b91c
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/convbkmk.tlpsrc
@@ -0,0 +1 @@
+binpattern f bin/${ARCH}/convbkmk
diff --git a/Master/tlpkg/tlpsrc/uptex.tlpsrc b/Master/tlpkg/tlpsrc/uptex.tlpsrc
index d953ba0a0f7..4e20ad0edd7 100644
--- a/Master/tlpkg/tlpsrc/uptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uptex.tlpsrc
@@ -1,6 +1,7 @@
 depend ptex
 depend hyph-utf8
 depend adobemapping
+depend convbkmk
 depend ipaex
 depend japanese
 depend japanese-otf
@@ -11,7 +12,7 @@ execute AddFormat name=euptex  engine=euptex options="*euptex.ini" \
 execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" \
                                patterns=language.dat
 execute addKanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map
-binpattern f bin/${ARCH}/convbkmk
+#
 binpattern f bin/${ARCH}/euptex
 binpattern f bin/${ARCH}/upbibtex
 binpattern f bin/${ARCH}/updvitype