summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-05-12 06:29:18 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-05-12 06:29:18 +0000
commit7b7a4f28fef102ade5c33a9dc00b683e6fda4e4f (patch)
tree0ce690820327f925a40711a6e2b4f3294a723883 /Build
parent5f80830b8f3df6507ef208ea9b18a0e048dd84cf (diff)
more pTeX tests
git-svn-id: svn://tug.org/texlive/trunk@18204 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/configure54
-rwxr-xr-xBuild/source/libs/configure14
-rw-r--r--Build/source/m4/kpse-setup.m418
-rwxr-xr-xBuild/source/texk/configure14
-rw-r--r--Build/source/texk/web2c/Makefile.in79
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am5
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/nissya.test16
-rw-r--r--Build/source/texk/web2c/ptexdir/tests/nissya.bst2197
-rw-r--r--Build/source/texk/web2c/ptexdir/tests/nissya_bib.aux60
-rw-r--r--Build/source/texk/web2c/ptexdir/tests/sample.bib131
-rwxr-xr-xBuild/source/utils/configure14
12 files changed, 2507 insertions, 102 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 06d5f478dff..8be03ebfeff 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -3811,22 +3811,20 @@ case $enable_native_texlive_build in #(
enable_native_texlive_build=yes
ac_configure_args="$ac_configure_args '--enable-native-texlive-build'" ;;
esac
-if test "x$enable_native_texlive_build" = xyes; then
- case $enable_multiplatform in #(
+case $enable_multiplatform in #(
yes | no) :
: ;; #(
*) :
- enable_multiplatform=yes
- ac_configure_args="$ac_configure_args '--enable-multiplatform'" ;;
+ enable_multiplatform=$enable_native_texlive_build
+ ac_configure_args="$ac_configure_args '--enable-multiplatform=$enable_native_texlive_build'" ;;
esac
- case $enable_cxx_runtime_hack in #(
+case $enable_cxx_runtime_hack in #(
yes | no) :
: ;; #(
*) :
- enable_cxx_runtime_hack=yes
- ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;;
+ enable_cxx_runtime_hack=$enable_native_texlive_build
+ ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack=$enable_native_texlive_build'" ;;
esac
-fi
case $enable_libtool_hack in #(
yes | no) :
: ;; #(
@@ -7047,13 +7045,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7050: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:7048: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7053: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:7051: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7056: output\"" >&5)
+ (eval echo "\"\$as_me:7054: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -8255,7 +8253,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8258 "configure"' > conftest.$ac_ext
+ echo '#line 8256 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10312,11 +10310,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10315: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10313: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10319: \$? = $ac_status" >&5
+ echo "$as_me:10317: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10651,11 +10649,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10654: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10652: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10658: \$? = $ac_status" >&5
+ echo "$as_me:10656: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10756,11 +10754,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10759: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10757: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10763: \$? = $ac_status" >&5
+ echo "$as_me:10761: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10811,11 +10809,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10814: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10812: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10818: \$? = $ac_status" >&5
+ echo "$as_me:10816: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13178,7 +13176,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13181 "configure"
+#line 13179 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13274,7 +13272,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13277 "configure"
+#line 13275 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17761,11 +17759,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17764: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17762: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17768: \$? = $ac_status" >&5
+ echo "$as_me:17766: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17860,11 +17858,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17863: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17861: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17867: \$? = $ac_status" >&5
+ echo "$as_me:17865: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17912,11 +17910,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17915: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17913: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17919: \$? = $ac_status" >&5
+ echo "$as_me:17917: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 3dabecaf583..33a5e9486eb 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -3006,22 +3006,20 @@ case $enable_native_texlive_build in #(
enable_native_texlive_build=yes
ac_configure_args="$ac_configure_args '--enable-native-texlive-build'" ;;
esac
-if test "x$enable_native_texlive_build" = xyes; then
- case $enable_multiplatform in #(
+case $enable_multiplatform in #(
yes | no) :
: ;; #(
*) :
- enable_multiplatform=yes
- ac_configure_args="$ac_configure_args '--enable-multiplatform'" ;;
+ enable_multiplatform=$enable_native_texlive_build
+ ac_configure_args="$ac_configure_args '--enable-multiplatform=$enable_native_texlive_build'" ;;
esac
- case $enable_cxx_runtime_hack in #(
+case $enable_cxx_runtime_hack in #(
yes | no) :
: ;; #(
*) :
- enable_cxx_runtime_hack=yes
- ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;;
+ enable_cxx_runtime_hack=$enable_native_texlive_build
+ ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack=$enable_native_texlive_build'" ;;
esac
-fi
case $enable_libtool_hack in #(
yes | no) :
: ;; #(
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index bd8c2ccda0b..8116b410f68 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -31,16 +31,14 @@ AS_CASE([$enable_native_texlive_build],
[yes | no], [:],
[enable_native_texlive_build=yes
ac_configure_args="$ac_configure_args '--enable-native-texlive-build'"])
-if test "x$enable_native_texlive_build" = xyes; then
- AS_CASE([$enable_multiplatform],
- [yes | no], [:],
- [enable_multiplatform=yes
- ac_configure_args="$ac_configure_args '--enable-multiplatform'"])
- AS_CASE([$enable_cxx_runtime_hack],
- [yes | no], [:],
- [enable_cxx_runtime_hack=yes
- ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'"])
-fi
+AS_CASE([$enable_multiplatform],
+ [yes | no], [:],
+ [enable_multiplatform=$enable_native_texlive_build
+ ac_configure_args="$ac_configure_args '--enable-multiplatform=$enable_native_texlive_build'"])
+AS_CASE([$enable_cxx_runtime_hack],
+ [yes | no], [:],
+ [enable_cxx_runtime_hack=$enable_native_texlive_build
+ ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack=$enable_native_texlive_build'"])
AS_CASE([$enable_libtool_hack],
[yes | no], [:],
[AS_CASE([$host_os],
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index c5e6051240f..53f973bc350 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -3027,22 +3027,20 @@ case $enable_native_texlive_build in #(
enable_native_texlive_build=yes
ac_configure_args="$ac_configure_args '--enable-native-texlive-build'" ;;
esac
-if test "x$enable_native_texlive_build" = xyes; then
- case $enable_multiplatform in #(
+case $enable_multiplatform in #(
yes | no) :
: ;; #(
*) :
- enable_multiplatform=yes
- ac_configure_args="$ac_configure_args '--enable-multiplatform'" ;;
+ enable_multiplatform=$enable_native_texlive_build
+ ac_configure_args="$ac_configure_args '--enable-multiplatform=$enable_native_texlive_build'" ;;
esac
- case $enable_cxx_runtime_hack in #(
+case $enable_cxx_runtime_hack in #(
yes | no) :
: ;; #(
*) :
- enable_cxx_runtime_hack=yes
- ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;;
+ enable_cxx_runtime_hack=$enable_native_texlive_build
+ ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack=$enable_native_texlive_build'" ;;
esac
-fi
case $enable_libtool_hack in #(
yes | no) :
: ;; #(
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index bb88e6f2739..5e967d74692 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1228,23 +1228,24 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h triptrap-sh \
ptexdir/pdvitype.ch ptexdir/ppltotf.ch ptexdir/ptftopl.ch \
ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis ptexdir/ChangeLog \
ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \
- tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \
- ptexdir/tests/goth10.tfm ptexdir/tests/sample.dvi \
- ptexdir/tests/min10.pl ptexdir/tests/min10.tfm \
- ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm \
- ptexdir/ptrip.diffs ptexdir/Files ptexdir/pbibtex.defines \
- ptexdir/ptex.mk ptexdir/ptex-base.ch.orig \
- ptexdir/ptex-include.ch ptexdir/ptexhelp.h ptexdir/reautoconf \
- $(pdftex_ch_srcs) etexdir/etex.ch pdftexdir/pdftex.defines \
- pdftexdir/pdftex.h pdftexdir/pdftexextra.in \
- pdftexdir/ChangeLog pdftexdir/NEWS pdftexdir/README \
- pdftexdir/change-files.txt pdftexdir/pdftex.mak \
- pdftexdir/pdftex.mk pdftexdir/regex/COPYING.LIB \
- pdftexdir/regex/README luatexdir/ptexlib.h \
- luatexdir/getluatexsvnversion.sh luatexdir/lua51/Makefile \
- luatexdir/lua51/liolib.c luatexdir/lua51/lua.c \
- luatexdir/lua51/luac.c luatexdir/lua51/print.c \
- luatexdir/luasocket/src/socket_lua.c \
+ ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \
+ ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \
+ tests/memdata3.bst ptexdir/tests/goth10.tfm \
+ ptexdir/tests/sample.dvi ptexdir/tests/min10.pl \
+ ptexdir/tests/min10.tfm ptexdir/tests/tmin10.pl \
+ ptexdir/tests/tmin10.tfm ptexdir/ptrip.diffs ptexdir/Files \
+ ptexdir/pbibtex.defines ptexdir/ptex.mk \
+ ptexdir/ptex-base.ch.orig ptexdir/ptex-include.ch \
+ ptexdir/ptexhelp.h ptexdir/reautoconf $(pdftex_ch_srcs) \
+ etexdir/etex.ch pdftexdir/pdftex.defines pdftexdir/pdftex.h \
+ pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \
+ pdftexdir/README pdftexdir/change-files.txt \
+ pdftexdir/pdftex.mak pdftexdir/pdftex.mk \
+ pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
+ luatexdir/ptexlib.h luatexdir/getluatexsvnversion.sh \
+ luatexdir/lua51/Makefile luatexdir/lua51/liolib.c \
+ luatexdir/lua51/lua.c luatexdir/lua51/luac.c \
+ luatexdir/lua51/print.c luatexdir/luasocket/src/socket_lua.c \
luatexdir/luasocket/src/ftp_lua.c \
luatexdir/luasocket/src/http_lua.c \
luatexdir/luasocket/src/smtp_lua.c \
@@ -1410,27 +1411,27 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
$(pweb_programs:=.c) $(pweb_programs:=.h) $(pweb_programs:=.p) \
$(pweb_programs:=-web2c) $(pweb_programs:=.web) \
$(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \
- ptex.pool ptex-tangle ptexdir/ptex.version tests/xexampl.aux \
- tests/xexampl.bbl tests/xexampl.blg tests/memtest* \
- tests/xstory.dvityp tests/xpagenum.typ tests/xcmr10.tfm \
- tests/xcmr10.pl tests/xsample.typ tests/x*min10.* ptrip.diffs \
- $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \
- pdftex.pool pdftex-tangle pdftexdir/pdftex.version \
- pdftexdir/etex.version $(nodist_libluatex_a_SOURCES) \
- $(nodist_xetex_SOURCES) xetex.web xetex-web2c xetex.p \
- xetex.pool xetex-tangle xetexdir/etex.version \
- xetexdir/xetex.version $(omegaware_programs:=.c) \
- $(omegaware_programs:=.h) $(omegaware_programs:=.p) \
- $(omegaware_programs:=-web2c) omegaware/tests/xlevel1.ofm \
- omegaware/tests/xlevel1.opl ofont*vf omegaware/tests/xofont* \
- omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
- omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
- omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
- cftest.p omegaware/tests/xrepeated.* \
- omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
- omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
- $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
- aleph.pool aleph-tangle
+ ptex.pool ptex-tangle ptexdir/ptex.version tests/nissya_bib.* \
+ tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg \
+ tests/memtest* tests/xstory.dvityp tests/xpagenum.typ \
+ tests/xcmr10.tfm tests/xcmr10.pl tests/xsample.typ \
+ tests/x*min10.* ptrip.diffs $(nodist_pdftex_SOURCES) pdftex.ch \
+ pdftex-web2c pdftex.p pdftex.pool pdftex-tangle \
+ pdftexdir/pdftex.version pdftexdir/etex.version \
+ $(nodist_libluatex_a_SOURCES) $(nodist_xetex_SOURCES) \
+ xetex.web xetex-web2c xetex.p xetex.pool xetex-tangle \
+ xetexdir/etex.version xetexdir/xetex.version \
+ $(omegaware_programs:=.c) $(omegaware_programs:=.h) \
+ $(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
+ omegaware/tests/xlevel1.ofm omegaware/tests/xlevel1.opl \
+ ofont*vf omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
+ omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
+ omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
+ omegaware/tests/xOCherokee.* cftest.p \
+ omegaware/tests/xrepeated.* omegaware/tests/specialhex.ofm \
+ omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
+ omegaware/tests/xspecialhex.* $(nodist_aleph_SOURCES) \
+ aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
CLEANFILES =
TRIPTRAP = $(am__append_6) $(am__append_9) $(am__append_15) \
$(am__append_19) $(am__append_24)
@@ -1632,7 +1633,7 @@ ptex_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
ptexdir/ppltotf.test ptexdir/ptftopl.test ptexdir/ptrip.test \
ptexdir/pbibtex-openout-test.pl \
ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \
- ptexdir/sample.test ptexdir/yokotate.test
+ ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test
pproglib = lib/libp.a
ptex_CPPFLAGS = $(ptex_cppflags)
ptex_CFLAGS = $(WARNING_CFLAGS)
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index cb2f802cf4e..fe47255862c 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-11 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * nissya.test (new): Shell script for pBibTeX test using kanji.
+ * tests/nissya_bib.aux, tests/nissya.bst, tests/sample.bib
+ (new): Test data for nissya.test from Akira.
+ * am/ptex.am: Add the new test.
+
2010-05-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdvitype.ch: Treat kanji chars for put[1-4] as for set[1-4].
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 281fc749e69..b253e1eebef 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -120,7 +120,7 @@ pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
ptex_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
-ptex_tests += ptexdir/pbibtex-mem.test
+ptex_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
## pDVItype
##
@@ -191,6 +191,9 @@ endif PTEX
## Test data and results
##
+## ptexdir/nissya.test
+EXTRA_DIST += ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst ptexdir/tests/sample.bib
+DISTCLEANFILES += tests/nissya_bib.*
## ptexdir/pbibtex.test
DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg
## ptexdir/pbibtex-mem.test
diff --git a/Build/source/texk/web2c/ptexdir/nissya.test b/Build/source/texk/web2c/ptexdir/nissya.test
new file mode 100755
index 00000000000..9275fd983b4
--- /dev/null
+++ b/Build/source/texk/web2c/ptexdir/nissya.test
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+# Using data sent by Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+test -d tests || mkdir -p tests
+
+cp $srcdir/ptexdir/tests/nissya_bib.aux tests/nissya_bib.aux
+
+TEXMFCNF=$srcdir/../kpathsea \
+ BSTINPUTS=$srcdir/ptexdir/tests \
+ BIBINPUTS=$srcdir/ptexdir/tests \
+ ./pbibtex tests/nissya_bib || exit 1
+
diff --git a/Build/source/texk/web2c/ptexdir/tests/nissya.bst b/Build/source/texk/web2c/ptexdir/tests/nissya.bst
new file mode 100644
index 00000000000..b2b1d420b5e
--- /dev/null
+++ b/Build/source/texk/web2c/ptexdir/tests/nissya.bst
@@ -0,0 +1,2197 @@
+%-----------------------------------------------------------------------------%
+% nissya.bst: 『社会学評論』用 BibTeX style file.
+%
+% 飯田修さんによって作成された jpolisci.bst ファイルが、武田史郎さんによって経
+% 済学用に書き換えられ、さらにそれを樋口耕一が『社会学評論』用に書き換えたのが
+% このファイルです。
+%
+% 使い方などは、同梱の説明書(PDF)をまずご覧下さい。
+%
+% なお、どうしても文献リストに「編」ではなく「編著」と出力したい場合は、文献DB
+% を作成する際、「editor」フィールドと「hentyo」フィールドに同じ名前を入力して
+% 下さい。
+%
+% 以下は元の jecon.bst のヘッダー部分です.
+%-----------------------------------------------------------------------------%
+%
+% jecon.bst: 経済学用 BibTeX style file.
+%
+% これは,飯田修さんによって作成された jpolisci.bst ファイルを経済学用に
+% 武田史郎 <zbc08106@park.zero.ad.jp> が改変したものです.
+%
+% First-written: <2002/11/03>
+% Time-stamp: <2003-01-03 21:52:21 Shiro Takeda>
+% Version 1.4
+% $Id: nissya.bst,v 1.31 2005/02/18 19:23:10 ko-ichi Exp $
+%
+% 元の jpolisci.bst の著作権は飯田さんにあります.
+% ぼくが改変した部分の著作権はどうでもいいです.好きなように扱ってくださ
+% い.
+%
+% オリジナルの jpolisci.bst は,
+% <http://www.bol.ucla.edu/~oiida/jpolisci/> で入手することができます.
+%
+% ぼくが改変した部分は主にプログラム中のコメント行の部分です.コメント行
+% の部分 (とその周り) を見れば,どう変えたかわかると思います.
+%
+% コメント,要望は Shiro Takeda <zbc08106@park.zero.ad.jp> まで.
+%
+% 以下は元の jpolisci.bst のヘッダー部分です.
+%
+% JPOLISCI: a bibliography style for papers in political sicence
+% and other fields that cite Japanese literature.
+% Vertical writing (tate-gaki) compatible.
+
+ % Version 20000910 for JBibTeX versions 0.30 or later,
+ % and pLaTeX2e or later.
+ % Copyright (C) 2000, all rights reserved.
+ %
+ % This file was derived from jbtxbst.doc.
+ %
+ % Copying of this file is authorized only if either
+ % (1) you make absolutely no changes to your copy, including name, or
+ % (2) if you do make changes, you name it something other than
+ % jbtxbst.doc, jplain.bst, junsrt.bst, jalpha.bst, jabbrv.bst,
+ % tipsj.bst, jipsj.bst, tieice.bst, jname.bst, jorsj.bst, jglsj.bst,
+ % seg.bst, jpolisci.bst.
+ %
+ % This restriction helps ensure that all standard styles are identical.
+ % The file jbtxbst.doc has the documentation for this style.
+ %
+
+ % Author:
+ %
+ % 飯田修 Osamu Iida
+ % email: oiida@newmail.net
+ % URL : http://www.bol.ucla.edu/~oiida/jpolisci/ (in Japanese)
+ %
+ % Bug reports, technical suggestions and any other comments
+ % will be appreciated.
+ %
+
+ % Acknowledgement:
+ %
+ % The following files were referred to while creating this file:
+ %
+ % jglsj.bst (by 千葉智章 Tomoaki Chiba)
+ % Function "format.lab.name" in jpolisci.bst derived from
+ % it with small modifications only. The author appreciates it.
+ %
+ % seg.bst (by Martin Karrenbach)
+ % A method for making two sorts of labels is based on this
+ % file's feats.
+ %
+ % jalpha.bst (by 松井正一 Shoichi Matsui)
+ % jpolisci.bst principally owes its functionality to it.
+ %
+ % 藤田眞作『続 LaTeX2e 階梯・縦組編』(アジソン・ウェスレイ、1998 年)。
+ %
+ % Friends in BBSes at IR-web <http://pws.prserv.net/oi/ -- now
+ % obsolete> and KH's Web Site <http://home.att.ne.jp/wind/polisci/>
+ % gave me titles of Japanese political science journals which are
+ % included in MACROs.
+
+ % This file is distributed with absolutely no warranty.
+ % The author doesn't assume any kind of responsibility for
+ % any inconvenience caused by using this file.
+
+ % Last modified: 2000/12/05
+
+%------------------%
+% 下準備・・・ %
+%------------------%
+
+ENTRY { address author booktitle chapter edition editor howpublished
+ institution journal key month note number organization pages publisher
+ school series title type volume year yomi jauthor jkanyaku jtitle
+ jpublisher jyear hentyo}
+
+ { is.kanji.entry field.used is.honyaku }
+
+ { label label2 label3 label4 label.pure extra.label sort.label extra.label.bysame }
+
+
+INTEGERS { output.state before.all mid.sentence after.sentence after.block }
+
+FUNCTION {not}
+{ { #0 }
+ { #1 }
+ if$
+}
+
+FUNCTION {and}
+{ 'skip$
+ { pop$ #0 }
+ if$
+}
+
+FUNCTION {or}
+{ { pop$ #1 }
+ 'skip$
+ if$
+}
+
+FUNCTION {init.state.consts}
+{ #0 'before.all :=
+ #1 'mid.sentence :=
+ #2 'after.sentence :=
+ #3 'after.block :=
+}
+
+STRINGS { s t u str.p.start str.p.end str.a str.b str.c str.last.author}
+
+FUNCTION {add.kanji.period}
+{
+ add.period$ duplicate$
+ #-1 #1 substring$ "." =
+ {#-2 global.max$ substring$ "." *}
+ 'skip$
+ if$
+}
+
+%----------------%
+% 出力系関数 %
+%----------------%
+
+FUNCTION {output.bibitem}
+{ newline$
+ "\nissyaitem[" write$
+ label3 write$
+ "]{" write$
+ label.pure write$
+ "}{" write$
+ label2 write$
+ "}{" write$
+ label4 write$
+ "}{" write$
+ label write$
+ "}{" write$
+ cite$ write$
+ "}" write$
+ newline$
+ ""
+ before.all 'output.state :=
+}
+
+FUNCTION {output.nonnull}
+{ 's :=
+ output.state mid.sentence =
+ {
+ is.kanji.entry
+ { write$ }
+% { " " * write$ }
+ { "" * write$ }
+ if$
+ }
+ {
+ output.state after.block =
+ {
+ is.kanji.entry
+ {add.kanji.period write$}
+ {add.period$ write$}
+ if$
+ "" write$
+ }
+ {
+ output.state before.all =
+ 'write$
+ {
+ is.kanji.entry
+ { add.kanji.period write$ }
+ { add.period$ " " * write$ }
+ if$
+ }
+ if$
+ }
+ if$
+ mid.sentence 'output.state :=
+ }
+ if$
+ s
+}
+
+FUNCTION {output}
+{ duplicate$ empty$
+ 'pop$
+ 'output.nonnull
+ if$
+}
+
+FUNCTION {output.check}
+{ 't :=
+ duplicate$ empty$
+ { pop$ "empty " t * " in " * cite$ * warning$ }
+ 'output.nonnull
+ if$
+}
+
+FUNCTION {fin.entry}
+{
+ is.kanji.entry
+ {is.honyaku
+ 'skip$
+ {add.kanji.period}
+ if$}
+ {is.honyaku
+ 'skip$
+ {add.period$}
+ if$}
+ if$
+ write$
+ newline$
+}
+
+FUNCTION {new.block}
+{ output.state before.all =
+ 'skip$
+ { after.block 'output.state := }
+ if$
+}
+
+FUNCTION {new.sentence}
+{ output.state after.block =
+ 'skip$
+ { output.state before.all =
+ 'skip$
+ { after.sentence 'output.state := }
+ if$
+ }
+ if$
+}
+
+FUNCTION {new.block.checka}
+{ empty$
+ 'skip$
+ 'new.block
+ if$
+}
+
+FUNCTION {new.block.checkb}
+{ empty$
+ swap$ empty$
+ and
+ 'skip$
+ 'new.block
+ if$
+}
+
+FUNCTION {new.sentence.checka}
+{ empty$
+ 'skip$
+ 'new.sentence
+ if$
+}
+
+FUNCTION {new.sentence.checkb}
+{ empty$
+ swap$ empty$
+ and
+ 'skip$
+ 'new.sentence
+ if$
+}
+
+FUNCTION {field.or.null}
+{ duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+}
+
+FUNCTION {emphasize}
+{ duplicate$ empty$
+ { pop$ "" }
+% { duplicate$ is.kanji.str$
+ { duplicate$ is.kanji.str$ is.kanji.entry or
+ { "『" swap$ * "』" * }
+ {
+% add.period$
+ "{\em " swap$ * ",} " *
+ }
+ if$
+ }
+ if$
+}
+
+%--------------------------%
+% 著者名を整形する関数 %
+%--------------------------%
+
+INTEGERS { nameptr namesleft numnames }
+FUNCTION {format.names}
+{ 's :=
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+
+ { namesleft #0 > }
+ {
+ s nameptr "{ff}{ll}" format.name$ is.kanji.str$
+ {s nameptr "{ff}{ll}" format.name$ 't :=}
+ { nameptr #1 >
+%%% { s nameptr "{ff~}{vv~}{ll}{, jj}" format.name$ 't :=}
+%%% { s nameptr "{ll,}{~ff}{~vv}{, jj}" format.name$ 't :=}
+ { s nameptr "{f.~}{v~}{ll}{, jj}" format.name$ 't :=}
+ { s nameptr "{ll}{,~f.}{v}{, jj}" format.name$ 't :=}
+ if$
+ }
+ if$
+
+ nameptr #1 >
+ { namesleft #1 >
+ { s is.kanji.str$
+ { "・" * t * }
+ { ", " * t * }
+ if$
+ }
+ {
+ t "others" =
+ {
+ s is.kanji.str$
+ { "ほか" * }
+ { " et~al." *}
+ if$
+ }
+ {
+ s is.kanji.str$
+ {"・" * t * }
+ {
+ numnames #2 =
+ { " \& " * }
+ { ", \& " *}
+ if$
+ t *
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ 't
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+FUNCTION {format.names.ed}
+{ 's :=
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+
+ { namesleft #0 > }
+ {
+ s nameptr "{ff}{ll}" format.name$ is.kanji.str$
+ {s nameptr "{ff}{ll}" format.name$ 't :=}
+%%% { s nameptr "{ff~}{vv~}{ll}{, jj}" format.name$ 't :=}
+ { s nameptr "{f.~}{v~}{ll}{, jj}" format.name$ 't :=}
+ if$
+ nameptr #1 >
+ { namesleft #1 >
+ { s is.kanji.str$
+ { "・" * t * }
+ { ", " * t * }
+ if$
+ }
+ {
+ t "others" =
+ {
+ s is.kanji.str$
+ { "ほか" * }
+ { " et~al." *}
+ if$
+ }
+ {
+ s is.kanji.str$
+ {"・" * t * }
+ {
+ numnames #2 =
+ { " \& " * }
+ { ", \& " *}
+ if$
+ t *
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ 't
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+
+FUNCTION {format.authors}
+{ author empty$
+ { "" }
+ {
+ extra.label.bysame "bysame" =
+ {"\bysame "}
+ { author format.names }
+ if$
+ }
+ if$
+}
+
+INTEGERS {bysame.check}
+FUNCTION {format.editors}
+{ editor empty$
+ { "" }
+ {
+ #0 'bysame.check :=
+ type$ "incollection" =
+ type$ "inbook" =
+ or
+ { editor format.names.ed }
+ {
+ extra.label.bysame "bysame" =
+ {
+ #1 'bysame.check :=
+ "\bysame "
+ }
+ { editor format.names }
+ if$
+ }
+ if$
+
+ hentyo empty$
+ {"編" 't :=}
+ {
+ editor hentyo =
+ {"編著" 't :=}
+ {"編" 't :=}
+ if$
+ }
+ if$
+
+ #1 bysame.check =
+ { "" *}
+ {
+ editor num.names$ #1 >
+ {
+ editor is.kanji.str$
+ {t * }
+ { " eds." * }
+ if$
+ }
+ {
+ editor is.kanji.str$
+ {t *}
+ { " ed." * }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+%----------------------%
+% その他の整形関数 %
+%----------------------%
+
+
+FUNCTION {format.title}
+{ title empty$
+ { "" }
+ { title is.kanji.str$
+ { "「" title * "」" * }
+ { " ``" title * ",'' " * }
+% title add.period$
+% " ``" swap$ * "'' " *
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.misc.title}
+{ title empty$
+ { "" }
+ { title is.kanji.str$
+ { "「" title * "」" * }
+ { " ``" title * ",'' " *
+ }
+ if$
+ }
+ if$
+}
+
+INTEGERS { start.or.end }
+FUNCTION {n.dashify}
+{
+ 't :=
+ ""
+ % 初ページ, 終ページの初期化
+ #0 'start.or.end :=
+ "" 'str.p.start :=
+ "" 'str.p.end :=
+ % 初ページ, 終ページの取得
+ { t empty$ not }
+ { t #1 #1 substring$ "-" =
+ {
+ #1 'start.or.end :=
+ t #2 global.max$ substring$ 't :=
+ }
+ { start.or.end
+ {
+ str.p.end t #1 #1 substring$ * 'str.p.end :=
+ t #2 global.max$ substring$ 't :=
+ }
+ {
+ str.p.start t #1 #1 substring$ * 'str.p.start :=
+ t #2 global.max$ substring$ 't :=
+ }
+ if$
+ }
+ if$
+ }
+ while$
+% str.p.start * "--" * str.p.end * % そのまま書き出す場合
+ % ページ数の記載を省略(後ろのページ数は前のページ数と異なる桁だけ表記)
+ str.p.start text.length$ str.p.end text.length$ =
+ {
+ str.p.start 'str.a :=
+ str.p.end 'str.b :=
+ { str.a empty$ not }
+ { str.a #1 #1 substring$ str.b #1 #1 substring$ =
+ {
+ str.a #2 global.max$ substring$ 'str.a :=
+ str.b #2 global.max$ substring$ 'str.b :=
+ }
+ {
+ str.b 'str.p.end :=
+ "" 'str.a :=
+ }
+ if$
+ }
+ while$
+ }
+ { skip$ }
+ if$
+ start.or.end #1 =
+ {str.p.start * "--" * str.p.end *}
+ { str.p.start * }
+ if$
+}
+
+FUNCTION {format.date}
+{ year empty$
+ { month empty$
+ { "" }
+ { "there's a month but no year or yyear in " cite$ * warning$
+ }
+ if$
+ }
+ { is.kanji.entry
+ { extra.label empty$
+ { ", ~" year * extra.label * ", " * }
+ { ", ~" year * "" * extra.label * ", " * }
+% { " (\kanji " year * extra.label * ") " * }
+% { " (\kanji " year * "\rensuji{" * extra.label * "}) " * }
+ if$
+ }
+ { ",\hspace{.3em}" year * extra.label * ", " * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.btitle}
+{ title emphasize
+}
+
+FUNCTION {tie.or.space.connect}
+{ duplicate$ text.length$ #3 <
+ { "~" }
+ { " " }
+ if$
+ swap$ * *
+}
+
+FUNCTION {either.or.check}
+{ empty$ 'pop$
+ {"can't use both " swap$ * " fields in " * cite$ * warning$ }
+ if$
+}
+
+FUNCTION {format.bvolume}
+{ volume empty$
+ { "" }
+ { volume is.kanji.str$
+ { "第" volume * "巻, " *}
+ { is.kanji.entry
+ {"第 " volume * "巻, " *}
+% {"第\kanji " volume * "巻、" *}
+ {"Vol." volume tie.or.space.connect}
+ if$
+ }
+ if$
+ series empty$
+ 'skip$
+ { series is.kanji.str$
+ { series ", " * swap$ * }
+ { " of " * series emphasize * }
+ if$
+ }
+ if$
+ "volume and number" number either.or.check
+ }
+ if$
+}
+
+FUNCTION {format.number.series}
+{ volume empty$
+ { number empty$
+ { series field.or.null }
+ { number is.kanji.str$
+ { " 第" number * "号, " * }
+ {"No." number tie.or.space.connect}
+ if$
+ series empty$
+ { "there's a number but no series in " cite$ * warning$ }
+ { series is.kanji.str$
+ { series ", " * swap$ * }
+ { " in " * series * }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ { "" }
+ if$
+}
+
+FUNCTION {format.edition}
+{ edition empty$
+ { "" }
+ { edition is.kanji.str$
+ { ", 第" edition * "版" * }
+% { "、第" edition * "版、" * }
+ { is.kanji.entry
+ {", 第" edition * "版" *}
+% {"、第" edition * "版、" *}
+ { output.state mid.sentence =
+ { edition "l" change.case$ ". edition" * }
+ { edition "t" change.case$ ". edition" * }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+INTEGERS { multiresult }
+
+FUNCTION {multi.page.check}
+{ 't :=
+ #0 'multiresult :=
+ { multiresult not
+ t empty$ not
+ and
+ }
+ { t #1 #1 substring$
+ duplicate$ "-" =
+ swap$ duplicate$ "," =
+ swap$ "+" =
+ or or
+ { #1 'multiresult := }
+ { t #2 global.max$ substring$ 't := }
+ if$
+ }
+ while$
+ multiresult
+}
+
+FUNCTION {format.pages}
+{ pages empty$
+ { "" }
+ { pages is.kanji.str$
+% { pages "頁" * }
+ { pages "" * }
+ { is.kanji.entry
+ { pages multi.page.check
+% { "" pages n.dashify * "頁" * }
+ { "" pages n.dashify * "" * }
+% { "" pages n.dashify * "頁" * }
+ { "" pages n.dashify * "" * }
+ if$
+ }
+ { pages multi.page.check
+% { "pp." pages n.dashify tie.or.space.connect }
+ { "" pages n.dashify tie.or.space.connect }
+% { "p." pages tie.or.space.connect }
+ { "" pages tie.or.space.connect }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.vol.num.pages}
+{ volume empty$
+ {"" *}
+ { "" volume * }
+ if$
+ number empty$
+ {"" *}
+ { "(" * number * ")" * }
+ if$
+ pages empty$
+ 'skip$
+ { duplicate$ empty$
+ { pop$ format.pages }
+ {
+% is.kanji.entry
+% {":" * format.pages *}
+% {
+ ": " * format.pages *
+% }
+% if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.chapter.pages}
+{ chapter empty$
+ 'format.pages
+ { type empty$
+ { chapter is.kanji.str$
+ { "" }
+ { is.kanji.entry
+ {"章"}
+ {"ch."}
+ if$
+ }
+ if$
+ }
+ { type "l" change.case$ }
+ if$
+ chapter is.kanji.str$ not is.kanji.entry and
+ {"第 " chapter * swap$ *}
+% {"第\kanji " chapter * swap$ *}
+ { chapter is.kanji.str$ is.kanji.entry and
+ {"第" chapter * "章" * * }
+ {chapter tie.or.space.connect}
+ if$
+ }
+ if$
+ pages empty$
+ 'skip$
+ { is.kanji.entry
+ { ", " * format.pages * }
+ { ", " * format.pages * }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.in.ed.booktitle}
+{ booktitle empty$
+ { "" }
+ { editor empty$
+ { booktitle is.kanji.str$
+ { " " booktitle emphasize * }
+ { " " booktitle emphasize * }
+ if$
+ }
+ { booktitle is.kanji.str$
+ { "" format.editors * booktitle emphasize * }
+ { " " format.editors * ", " * booktitle emphasize * }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.address}
+{ address empty$
+ { "" }
+ { is.kanji.entry
+ { address ":" * }
+ { address ": " * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {empty.misc.check}
+{ author empty$ title empty$ howpublished empty$
+ month empty$ year empty$ note empty$
+ and and and and and
+ key empty$ not and
+ { "all relevant fields are empty in " cite$ * warning$ }
+ 'skip$
+ if$
+}
+
+FUNCTION {format.thesis.type}
+{ type empty$
+ 'skip$
+ { pop$
+ type "t" change.case$
+ }
+ if$
+}
+
+FUNCTION {format.tr.number}
+{ type empty$
+ { "Technical Report" }
+ 'type
+ if$
+ number empty$
+ { "t" change.case$ }
+ { number tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.article.crossref}
+{ key empty$
+ { journal empty$
+ { "need key or journal for " cite$ * " to crossref " * crossref *
+ warning$
+ ""
+ }
+ { title is.kanji.str$
+ { "『" journal * "』" * }
+ { " {\em " journal * "\/} " * }
+ if$
+ }
+ if$
+ }
+ { title is.kanji.str$
+ { " " key * }
+ { " " key * }
+ if$
+ }
+ if$
+ " \cite{" * crossref * "}" *
+}
+
+FUNCTION {format.crossref.editor}
+{ editor format.names.ed }
+
+FUNCTION {format.book.crossref}
+{ volume empty$
+ { "empty volume in " cite$ * "'s crossref of " * crossref * warning$
+ title is.kanji.str$
+ {" "} {" "} if$
+ }
+ { volume is.kanji.str$
+ { volume }
+ { is.kanji.entry
+ {"第 " volume * "巻" *}
+% {"第\kanji " volume * "巻" *}
+ {"Vol." volume tie.or.space.connect " of " * }
+ if$
+ }
+ if$
+ }
+ if$
+ editor empty$
+ editor field.or.null author field.or.null =
+ or
+ { key empty$
+ { series empty$
+ { "need editor, key, or series for " cite$ * " to crossref " *
+ crossref * warning$
+ "" *
+ }
+ { series is.kanji.str$
+ { "『" series * "』, " * swap$ * }
+ { "{\em " * series * "\/} " * }
+ if$
+ }
+ if$
+ }
+ { key * }
+ if$
+ }
+ { format.crossref.editor * }
+ if$
+ " \cite{" * crossref * "}" *
+}
+
+FUNCTION {format.incoll.inproc.crossref}
+{ editor empty$
+ editor field.or.null author field.or.null =
+ or
+ { key empty$
+ { booktitle empty$
+ { "need editor, key, or booktitle for " cite$ * " to crossref " *
+ crossref * warning$
+ ""
+ }
+ { booktitle is.kanji.str$
+ { booktitle emphasize }
+ {" {\em " booktitle * "\/} " * }
+ if$
+ }
+ if$
+ }
+ { "" key * }
+ if$
+ }
+ {
+ "" format.crossref.editor *
+ is.kanji.entry
+ {
+ hentyo empty$
+ { "編 " * }
+ { "編著 " * }
+ if$
+ }
+ {
+ editor num.names$ #1 >
+ {" eds., " *}
+ {" ed., " *}
+ if$
+ }
+ if$
+ booktitle is.kanji.str$
+ { booktitle emphasize * ", " *}
+ {
+ " {\em " *
+ booktitle *
+ "},\/ " *
+ }
+% {" {\em " booktitle * "\/} " * }
+ if$
+ address empty$
+ {"" *}
+ {address * ": " *}
+ if$
+ publisher empty$
+ {"" * }
+ {publisher *}
+ if$
+ is.kanji.entry
+ {", ~" *}
+ {", " * }
+ if$
+ }
+ if$
+% " \cite{" * crossref * "}" *
+}
+
+FUNCTION {format.in.period}
+{ is.kanji.entry
+ { ", ~" * }
+ { ", " * }
+ if$
+}
+
+FUNCTION {format.hoyakusho}
+{
+ jauthor empty$ % is.honyaku変数のセット
+ jkanyaku empty$ % fin.entry時にこの変数を参照し、
+ jtitle empty$ % ピリオドを付与を制御
+ jpublisher empty$
+ jyear empty$
+ and and and and
+ 'skip$
+ { #1 'is.honyaku := }
+ if$
+
+ jauthor empty$
+ jkanyaku empty$
+ jtitle empty$
+ jpublisher empty$
+ jyear empty$
+ and and and and
+ { "" }
+ { add.period$
+ jyear empty$
+ { "(" * }
+ { "(=" * jyear * ", " * }
+ if$
+ jauthor empty$
+ { jkanyaku empty$
+ { "" * }
+ { jkanyaku format.names
+ "監訳" *
+ }
+ if$
+ }
+ { jauthor format.names
+ "訳" *
+ }
+ if$
+ jtitle empty$
+ { "" * }
+ { jtitle emphasize * }
+ if$
+ jpublisher empty$
+ { "" * }
+ { jpublisher * }
+ if$
+% jyear empty$
+% { "" * }
+% { jyear is.kanji.str$
+% { jyear * "年" * }
+% { "" * jyear * "年" * }
+% if$
+% }
+% if$
+% add.kanji.period
+% "(=" swap$ * ")" *
+% add.kanji.period
+ ".~)" *
+ }
+ if$
+}
+
+FUNCTION {format.book.pages}
+{ pages empty$
+ { "" }
+ { pages is.kanji.str$
+ { pages "" * }
+ { is.kanji.entry
+ { " " pages * }
+ { "" pages *}
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {article}
+{ output.bibitem
+ format.authors "author" output.check
+ format.date "year" output.check
+ format.title "title" output.check
+ crossref missing$
+ { journal emphasize "journal" output.check
+ format.vol.num.pages output
+ }
+ { format.article.crossref output.nonnull
+ format.pages output
+ }
+ if$
+ new.block
+ note output
+ fin.entry
+}
+
+%--------------------------------%
+% 文献タイプ名と同名の関数群 %
+%--------------------------------%
+
+FUNCTION {book}
+{ output.bibitem
+ author empty$
+ { format.editors "author and editor" output.check }
+ { format.authors output.nonnull
+ crossref missing$
+ { "author and editor" editor either.or.check }
+ 'skip$
+ if$
+ }
+ if$
+
+ format.date "year" output.check
+ format.btitle "title" output.check
+ crossref missing$
+ { format.bvolume output
+ format.number.series output
+ format.address output
+ publisher "publisher" output.check
+ }
+ { format.book.crossref output.nonnull
+ }
+ if$
+ format.edition output
+ format.book.pages output
+ format.hoyakusho output
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {booklet}
+{ output.bibitem
+ format.authors output
+ format.date output
+ format.misc.title "title" output.check
+ howpublished output
+ address output
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {inbook}
+{ output.bibitem
+ author empty$
+ { format.editors "author and editor" output.check }
+ { format.authors output.nonnull
+ crossref missing$
+ { "author and editor" editor either.or.check }
+ 'skip$
+ if$
+ }
+ if$
+ format.date "year" output.check
+ format.btitle "title" output.check
+ crossref missing$
+ { format.bvolume output
+ format.chapter.pages "chapter and pages" output.check
+ format.number.series output
+ format.address output
+ publisher "publisher" output.check
+ }
+ { format.chapter.pages "chapter and pages" output.check
+ format.book.crossref output.nonnull
+ }
+ if$
+ format.edition output
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {incollection}
+{ output.bibitem
+ format.authors "author" output.check
+ format.date "year" output.check
+ format.title "title" output.check
+ crossref missing$
+ { format.in.ed.booktitle "booktitle" output.check
+ format.bvolume output
+ format.number.series output
+ format.address output
+ publisher empty$
+ { ", ~" }
+ { publisher format.in.period }
+ if$
+ output.nonnull
+ format.edition output
+ format.chapter.pages output
+ }
+ { format.incoll.inproc.crossref output.nonnull
+ format.chapter.pages output
+ }
+ if$
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {inproceedings}
+{ output.bibitem
+ format.authors "author" output.check
+ format.date "year" output.check
+ format.title "title" output.check
+ crossref missing$
+ { format.in.ed.booktitle "booktitle" output.check
+ format.bvolume output
+ format.number.series output
+ address empty$
+ { organization publisher new.sentence.checkb
+ organization output
+ publisher output
+ }
+ { address output.nonnull
+ organization output
+ publisher output
+ }
+ if$
+ }
+ { format.incoll.inproc.crossref output.nonnull
+ format.pages output
+ }
+ if$
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {conference} { inproceedings }
+
+FUNCTION {manual}
+{ output.bibitem
+ author empty$
+ { organization empty$
+ 'skip$
+ { organization output.nonnull
+ address output
+ }
+ if$
+ }
+ { format.authors output.nonnull }
+ if$
+ format.date output
+ format.btitle "title" output.check
+ author empty$
+ { organization empty$
+ { address new.block.checka
+ address output
+ }
+ 'skip$
+ if$
+ }
+ { organization address new.block.checkb
+ organization output
+ address output
+ }
+ if$
+ format.edition output
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {mastersthesis}
+{ output.bibitem
+ format.authors "author" output.check
+ format.date "year" output.check
+ format.title "title" output.check
+% "Master's thesis" format.thesis.type output.nonnull
+ school "school" output.check
+ school is.kanji.str$
+ {"修士論文" format.thesis.type output.nonnull}
+ {"Master's thesis" format.thesis.type output.nonnull}
+ if$
+ address output
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {phdthesis}
+{ output.bibitem
+ format.authors "author" output.check
+ format.date "year" output.check
+ format.title "title" output.check
+% format.phd
+% format.thesis.type output.nonnull
+ school "school" output.check
+ school is.kanji.str$
+ {"博士論文" format.thesis.type output.nonnull}
+ {"Ph.D. dissertation" format.thesis.type output.nonnull}
+ if$
+ address output
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {misc}
+{ output.bibitem
+ format.authors output
+ format.date output
+ format.misc.title output
+ howpublished output
+% new.block
+ note output
+ fin.entry
+ empty.misc.check
+}
+
+FUNCTION {proceedings}
+{ output.bibitem
+ editor empty$
+ { organization output }
+ { format.editors output.nonnull }
+ if$
+ format.date "year" output.check
+ format.btitle "title" output.check
+ format.bvolume output
+ format.number.series output
+ address empty$
+ { editor empty$
+ { publisher new.sentence.checka }
+ { organization publisher new.sentence.checkb
+ organization output
+ }
+ if$
+ publisher output
+ }
+ { format.address output.nonnull
+ editor empty$
+ 'skip$
+ { organization output }
+ if$
+ publisher output
+ }
+ if$
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {techreport}
+{ output.bibitem
+ format.authors "author" output.check
+ format.date "year" output.check
+ format.title "title" output.check
+ format.tr.number output.nonnull
+ institution "institution" output.check
+ address output
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {unpublished}
+{ output.bibitem
+ format.authors "author" output.check
+ format.date output
+ format.title "title" output.check
+ note "note" output.check
+ fin.entry
+}
+
+FUNCTION {default.type} { misc }
+
+MACRO {jan} {"January"}
+
+MACRO {feb} {"February"}
+
+MACRO {mar} {"March"}
+
+MACRO {apr} {"April"}
+
+MACRO {may} {"May"}
+
+MACRO {jun} {"June"}
+
+MACRO {jul} {"July"}
+
+MACRO {aug} {"August"}
+
+MACRO {sep} {"September"}
+
+MACRO {oct} {"October"}
+
+MACRO {nov} {"November"}
+
+MACRO {dec} {"December"}
+
+READ
+
+FUNCTION {set.is.kanji.entry}
+{
+ author field.or.null is.kanji.str$
+ title field.or.null is.kanji.str$ or
+ editor field.or.null is.kanji.str$ or
+ journal field.or.null is.kanji.str$ or
+ booktitle field.or.null is.kanji.str$ or
+ series field.or.null is.kanji.str$ or
+ 'is.kanji.entry :=
+}
+
+ITERATE {set.is.kanji.entry}
+
+INTEGERS { author.field editor.field organization.field title.field key.field }
+
+FUNCTION {init.field.constants}
+{ #0 'author.field :=
+ #1 'editor.field :=
+ #2 'organization.field :=
+ #3 'title.field :=
+ #4 'key.field :=
+}
+
+EXECUTE {init.field.constants}
+
+FUNCTION {sortify}
+{ purify$
+ "l" change.case$
+}
+
+INTEGERS { len }
+
+FUNCTION {chop.word}
+{ 's :=
+ 'len :=
+ s #1 len substring$ =
+ { s len #1 + global.max$ substring$ }
+ 's
+ if$
+}
+
+INTEGERS { et.al.char.used }
+
+FUNCTION {initialize.et.al.char.used}
+{ #0 'et.al.char.used :=
+}
+
+EXECUTE {initialize.et.al.char.used}
+
+%----------------------------%
+% 著者名ラベルの整形関数 %
+%----------------------------%
+
+FUNCTION {format.lab.names}
+{ 's :=
+ s num.names$ 'numnames :=
+ numnames #2 > % 3人以上の場合
+ { s is.kanji.str$
+ { s #1 "{ff}" format.name$ 't :=
+ t empty$
+ { s #1 "{ll}" format.name$}
+ { s #1 "{ff}" format.name$}
+ if$
+ "ほか" * }
+ { s #1 "{ll}" format.name$
+ " et~al." * }
+ if$
+ }
+ { numnames #2 = % 2人の場合
+ { s is.kanji.str$ % 漢字著者の場合
+ { s #1 "{ff}{vv}{ll}{jj}" format.name$ 't := % 1人め
+ t is.kanji.str$
+ {
+ s #1 "{ff}" format.name$ 't :=
+ t empty$
+ { s #1 "{ll}" format.name$}
+ { s #1 "{ff}" format.name$}
+ if$
+ }
+ { s #1 "{ll}" format.name$}
+ if$
+ s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =% 2人目
+ {"ほか" *}
+ { "・" *
+ s #2 "{ff}{vv}{ll}{jj}" format.name$ 't :=
+ t is.kanji.str$
+ {
+ s #2 "{ff}" format.name$ 't :=
+ t empty$
+ { s #2 "{ll}" format.name$ *}
+ { s #2 "{ff}" format.name$ *}
+ if$
+ }
+ {s #2 "{ll}" format.name$ *}
+ if$
+ }
+ if$
+ }
+ { s #1 "{ll}" format.name$
+ s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ { " et~al." * }
+ { " \& " *
+ s #2 "{ll}" format.name$ *}
+ if$
+ }
+ if$
+ }
+ { s is.kanji.str$
+ { s #1 "{ff}" format.name$ 't :=
+ t empty$
+ { s #1 "{ll}" format.name$}
+ { s #1 "{ff}" format.name$}
+ if$
+ }
+ { s #1 "{ll}" format.name$ }
+ if$
+ }
+ if$
+ }
+ if$
+ author empty$
+ {
+ is.kanji.entry
+ {"編" * }
+ { numnames #1 >
+ {" eds." *}
+ {" ed." *}
+ if$
+ }
+ if$
+ }
+ 'skip$
+ if$
+}
+
+FUNCTION {format.lab.names.full}
+{ 's :=
+ "" 't :=
+ s num.names$ 'numnames :=
+ numnames #2 >
+ {
+ s is.kanji.str$
+ {
+ s #1 "{ff}{ll}" format.name$
+ "ほか" *
+ }
+ {
+ s #1 "{ll,}{~f.}{v}{, jj}" format.name$
+ " et~al." *
+ }
+ if$
+ }
+ {
+ numnames #2 =
+ {
+ s is.kanji.str$
+ {
+ s #1 "{ff}{ll}" format.name$
+ s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ { "ほか" * }
+ {
+ "・" *
+ s #2 "{ff}{ll}" format.name$ *
+ }
+ if$
+ }
+ {
+ s #1 "{ll,}{~f.}{v}{, jj}" format.name$
+ s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ {
+ " et~al." *
+ }
+ {
+ " \& " *
+ s #2 "{ll,}{~f.}{v}{, jj}" format.name$ *
+ }
+ if$
+ }
+ if$
+ }
+ {
+ s is.kanji.str$
+ { s #1 "{ff}{ll}" format.name$ }
+ { s #1 "{ll,}{~f.}{v}{, jj}" format.name$ }
+ if$
+ }
+ if$
+ }
+ if$
+ author empty$
+ {
+ is.kanji.entry
+ {"編" * }
+ { numnames #1 >
+ {" eds." *}
+ {" ed." *}
+ if$
+ }
+ if$
+ }
+ 'skip$
+ if$
+}
+
+INTEGERS {is.making.pure}
+STRINGS {hoka.kh}
+FUNCTION {format.lab.names.full.ff}
+{'s :=
+ "" 't :=
+ is.making.pure #2 =
+ {"" 'hoka.kh :=}
+ {
+ s is.kanji.str$
+ {"ほか" 'hoka.kh :=}
+ {" et~al." 'hoka.kh :=}
+ if$
+ }
+ if$
+ s num.names$ 'numnames :=
+ numnames #2 >
+ {
+ s is.kanji.str$
+ {
+ s #1 "{ff}{ll}" format.name$
+ hoka.kh *
+ }
+ {
+%%% s #1 "{ff~}{vv~}{ll}{, jj}" format.name$
+ s #1 "{f.~}{v~}{ll}{, jj}" format.name$
+ hoka.kh *
+ }
+ if$
+ }
+ {
+ numnames #2 =
+ {
+ s is.kanji.str$
+ {
+ s #1 "{ff}{ll}" format.name$
+ s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ { t hoka.kh * 't :=}
+ {
+ t "・" * 't :=
+ t s #2 "{ff}{ll}" format.name$ * 't :=
+ }
+ if$
+ t *
+ }
+ {
+%%% s #1 "{ff~}{vv~}{ll}{, jj}" format.name$
+ s #1 "{f.~}{v~}{ll}{, jj}" format.name$
+ s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ {
+ hoka.kh *
+ }
+ {
+ " \& " *
+%%% s #2 "{ff~}{vv~}{ll}{, jj}" format.name$ *
+ s #2 "{f.~}{v~}{ll}{, jj}" format.name$ *
+ }
+ if$
+ }
+ if$
+ }
+ {
+ s is.kanji.str$
+ { s #1 "{ff}{ll}" format.name$ }
+%%% { s #1 "{ff~}{vv~}{ll}{, jj}" format.name$ }
+ { s #1 "{f.~}{v~}{ll}{, jj}" format.name$ }
+ if$
+ }
+ if$
+ }
+ if$
+
+ is.making.pure #2 =
+ 'skip$
+ {
+ author empty$
+ {
+ is.kanji.entry
+ {"編" * }
+ { numnames #1 >
+ {" eds." *}
+ {" ed." *}
+ if$
+ }
+ if$
+ }
+ 'skip$
+ if$
+ }
+ if$
+
+}
+
+FUNCTION {author.key.label}
+{ author empty$
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
+ { author format.lab.names }
+ if$
+}
+
+FUNCTION {author.key.label.full}
+{
+ author empty$
+ {
+ key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
+ { author format.lab.names.full }
+ if$
+}
+
+FUNCTION {author.key.label.full.ff}
+{
+ author empty$
+ {
+ key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
+ { author format.lab.names.full.ff }
+ if$
+}
+
+FUNCTION {author.editor.key.label}
+{ author empty$
+ { editor empty$
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
+ { editor format.lab.names }
+ if$
+ }
+ { author format.lab.names }
+ if$
+}
+
+FUNCTION {author.editor.key.label.full}
+{ author empty$
+ { editor empty$
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
+ { editor format.lab.names.full }
+ if$
+ }
+ { author format.lab.names.full }
+ if$
+}
+
+FUNCTION {author.editor.key.label.full.ff}
+{ author empty$
+ { editor empty$
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
+ { editor format.lab.names.full.ff }
+ if$
+ }
+ { author format.lab.names.full.ff }
+ if$
+}
+
+
+FUNCTION {author.key.organization.label}
+{ author empty$
+ { key empty$
+ { organization empty$
+ { cite$ #1 #3 substring$ }
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ if$
+ }
+ { key #3 text.prefix$ }
+ if$
+ }
+ { author format.lab.names }
+ if$
+}
+
+FUNCTION {editor.key.organization.label}
+{ editor empty$
+ { key empty$
+ { organization empty$
+ { cite$ #1 #3 substring$ }
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ if$
+ }
+ { key #3 text.prefix$ }
+ if$
+ }
+ { editor format.lab.names }
+ if$
+}
+
+FUNCTION {calc.label}
+{ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.key.label
+ { type$ "proceedings" =
+ 'editor.key.organization.label
+ { type$ "manual" =
+ 'author.key.organization.label
+ 'author.key.label
+ if$
+ }
+ if$
+ }
+ if$
+ duplicate$
+ "" swap$ *
+ "" year *
+ 'label :=
+ % 翻訳書対策
+ jyear empty$
+ 'skip$
+ {
+ label "=" jyear * * 'label :=
+ }
+ if$
+ pop$
+}
+
+FUNCTION {calc.label2}
+{
+ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.key.label.full
+ {
+ type$ "proceedings" =
+ 'editor.key.organization.label
+ { type$ "manual" =
+ 'author.key.organization.label
+ 'author.key.label.full
+ if$
+ }
+ if$
+ }
+ if$
+ duplicate$
+ "" swap$ *
+ 'label2 :=
+ sortify label sortify label2 * 'sort.label :=
+ pop$
+}
+
+FUNCTION {calc.label3}
+{ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.key.label
+ { type$ "proceedings" =
+ 'editor.key.organization.label
+ { type$ "manual" =
+ 'author.key.organization.label
+ 'author.key.label
+ if$
+ }
+ if$
+ }
+ if$
+ duplicate$
+ "" swap$ *
+ 'label3 :=
+ pop$
+}
+
+FUNCTION {calc.label4}
+{
+ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.key.label.full.ff
+ {
+ type$ "proceedings" =
+ 'editor.key.organization.label
+ { type$ "manual" =
+ 'author.key.organization.label
+ 'author.key.label.full.ff
+ if$
+ }
+ if$
+ }
+ if$
+ duplicate$
+ "" swap$ *
+ 'label4 :=
+ label4 purify$ 'label.pure :=
+ pop$
+}
+
+FUNCTION {calc.label.pure}
+{
+ #2 'is.making.pure :=
+ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.key.label.full.ff
+ {
+ type$ "proceedings" =
+ 'editor.key.organization.label
+ { type$ "manual" =
+ 'author.key.organization.label
+ 'author.key.label.full.ff
+ if$
+ }
+ if$
+ }
+ if$
+ duplicate$
+ "" swap$ *
+ 't :=
+ t purify$ 'label.pure :=
+ pop$
+ #1 'is.making.pure :=
+}
+
+FUNCTION {sort.format.names}
+{
+ 's :=
+ yomi empty$
+ 'skip$
+ { yomi 's := }
+ if$
+ ""
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ { namesleft #0 > }
+ {
+ nameptr #1 >
+ { ", " * }
+ 'skip$
+ if$
+ s nameptr "{vv{ } }{ll{ }}{ ff{ }}{ jj{ }}" format.name$ 't :=
+ nameptr numnames = t "others" = and
+ { s is.kanji.str$
+ {"ほか" * }
+ {" et~al." *}
+ if$
+ }
+ { t sortify * }
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+
+FUNCTION {sort.format.title}
+{ 't :=
+ "A " #2
+ "An " #3
+ "The " #4 t chop.word
+ chop.word
+ chop.word
+ sortify
+ #1 global.max$ substring$
+}
+
+FUNCTION {author.sort}
+{ author empty$
+ { key empty$
+ { "to sort, need author or key in " cite$ * warning$ "" }
+ { key sortify }
+ if$
+ }
+ { author sort.format.names }
+ if$
+}
+
+FUNCTION {author.editor.sort}
+{ author empty$
+ { editor empty$
+ { key empty$
+ { "to sort, need author, editor, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { editor sort.format.names }
+ if$
+ }
+ { author sort.format.names }
+ if$
+}
+
+FUNCTION {author.organization.sort}
+{ author empty$
+ { organization empty$
+ { key empty$
+ { "to sort, need author, organization, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { "The " #4 organization chop.word sortify }
+ if$
+ }
+ { author sort.format.names }
+ if$
+}
+
+FUNCTION {editor.organization.sort}
+{ editor empty$
+ { organization empty$
+ { key empty$
+ { "to sort, need editor, organization, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { "The " #4 organization chop.word sortify }
+ if$
+ }
+ { editor sort.format.names }
+ if$
+}
+
+FUNCTION {presort}
+{ calc.label
+ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.sort
+ {
+ type$ "proceedings" =
+ 'editor.organization.sort
+ {
+ type$ "manual" =
+ 'author.organization.sort
+ 'author.sort
+ if$
+ }
+ if$
+ }
+ if$
+ 't :=
+ pop$
+ author empty$
+ {t " 2 " * 't :=}
+ {t " 1 " * 't :=}
+ if$
+ t " " * 't :=
+ t year field.or.null sortify * 't :=
+ t " " * 't :=
+ t title field.or.null sort.format.title * 't :=
+ t 'sort.key$ :=
+}
+
+FUNCTION {presort2}
+{ calc.label2 }
+
+FUNCTION {presort3}
+{ calc.label3 }
+
+FUNCTION {presort4}
+{ calc.label4 }
+
+FUNCTION {presort5}
+{ calc.label.pure }
+
+ITERATE {presort}
+ITERATE {presort2}
+ITERATE {presort3}
+ITERATE {presort4}
+ITERATE {presort5}
+
+SORT
+
+STRINGS { longest.label last.sort.label next.extra prev.author this.author}
+
+INTEGERS { longest.label.width last.extra.num }
+
+FUNCTION {initialize.longest.label}
+{ "" 'longest.label :=
+ #0 int.to.chr$ 'last.sort.label :=
+ "" 'next.extra :=
+ #0 'longest.label.width :=
+ #0 'last.extra.num :=
+ "" 'this.author :=
+}
+
+% sort.labelが前回のものと同一であれば、extra.labelをセット
+% authorが前回のものと同一であれば、extra.label.bysameをセット
+
+FUNCTION {forward.pass}
+{ last.sort.label sort.label =
+ { last.extra.num #1 + 'last.extra.num :=
+ last.extra.num int.to.chr$ 'extra.label :=
+ }
+ { "a" chr.to.int$ 'last.extra.num :=
+ "" 'extra.label :=
+ sort.label 'last.sort.label :=
+ }
+ if$
+
+ author empty$
+ { editor empty$
+ { "" }
+ 'format.editors
+ if$
+ }
+ 'format.authors
+ if$
+ 'this.author :=
+
+% format.names 'this.author :=
+ this.author prev.author =
+ { "bysame" 'extra.label.bysame := }
+ { this.author "" =
+ { "abcxyz" }
+ 'this.author
+ if$
+ 'prev.author :=
+ }
+ if$
+}
+
+FUNCTION {reverse.pass}
+{ next.extra "b" =
+ { "a" 'extra.label := }
+ 'skip$
+ if$
+ extra.label empty$ not
+ { label "" * extra.label * "" * }
+ { label extra.label * "" * }
+ if$
+ "" field.or.null *
+ 'label :=
+ label width$ longest.label.width >
+ { label 'longest.label :=
+ label width$ 'longest.label.width :=
+ }
+ 'skip$
+ if$
+ extra.label 'next.extra :=
+}
+
+EXECUTE {initialize.longest.label}
+
+ITERATE {forward.pass}
+
+REVERSE {reverse.pass}
+
+FUNCTION{punctuation}
+{
+ "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" write$ newline$
+ "%" write$ newline$
+ "% This bbl file is created through nissya.bst" write$ newline$
+ "% nissya.bst is available at" write$ newline$
+ "% <http://hey.to/KO-ichi>" write$ newline$
+ "%" write$ newline$
+ "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" write$ newline$
+ newline$
+}
+
+EXECUTE {punctuation}
+
+FUNCTION {begin.bib}
+{ et.al.char.used
+ { "\newcommand{\etalchar}[1]{$^{#1}$}" write$ newline$ }
+ 'skip$
+ if$
+ preamble$ empty$
+ 'skip$
+ { preamble$ write$ newline$ }
+ if$
+ "\ifx\undefined\bysame" write$ newline$
+ "\newcommand{\bysame}{\rule[.5ex]{4zw}{.15pt}}"
+ write$ newline$
+ "\fi" write$ newline$
+ newline$
+ "\begin{thebibliography}{xx}" write$ newline$
+}
+
+EXECUTE {begin.bib}
+
+EXECUTE {init.state.consts}
+
+ITERATE {call.type$}
+
+FUNCTION {end.bib}
+{ newline$
+ "\end{thebibliography}" write$ newline$
+}
+
+EXECUTE {end.bib}
diff --git a/Build/source/texk/web2c/ptexdir/tests/nissya_bib.aux b/Build/source/texk/web2c/ptexdir/tests/nissya_bib.aux
new file mode 100644
index 00000000000..5e75effada0
--- /dev/null
+++ b/Build/source/texk/web2c/ptexdir/tests/nissya_bib.aux
@@ -0,0 +1,60 @@
+\relax
+\bibstyle{nissya}
+\@writefile{toc}{\contentsline {section}{\numberline {1}使い方}{1}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}概略}{1}}
+\citation{gms1}
+\citation{gms1}
+\citation{hgc1}
+\citation{hgc1}
+\citation{gms1}
+\citation{cmcjdb44}
+\citation{hgc3}
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.2}スタイルオプション: long}{2}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.3}引用・参照コマンド}{2}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.3.1}著者名(出版年)}{2}}
+\@writefile{lot}{\contentsline {table}{\numberline {1}{\ignorespaces 「著者名(出版年)」形式: citetコマンド}}{2}}
+\newlabel{citet}{{1}{2}}
+\citation{hgc1}
+\citation{kh2003}
+\citation{nsi2003}
+\citation{kwbt99}
+\citation{gms1}
+\citation{hgc1}
+\citation{cmcjdb44}
+\citation{kwbt1}
+\citation{hgc1}
+\citation{hgc3}
+\citation{kwbt99}
+\citation{fschr92j}
+\citation{nsi2003}
+\citation{fschr92j}
+\citation{kwbt}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.3.2}(著者名 出版年)}{3}}
+\@writefile{lot}{\contentsline {table}{\numberline {2}{\ignorespaces (著者名 出版年)形式: citepコマンド}}{3}}
+\newlabel{citep}{{2}{3}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.3.3}出版年のみ}{3}}
+\@writefile{lot}{\contentsline {table}{\numberline {3}{\ignorespaces 出版年のみ: citeyearコマンド}}{3}}
+\newlabel{citeyear}{{3}{3}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.3.4}引用・参照しないもの}{4}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.4}自動作成される文献リスト}{4}}
+\@writefile{toc}{\contentsline {section}{\numberline {2}ご使用にあたって}{4}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {2.1}既知の問題点}{4}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {2.2}更新履歴}{4}}
+\citation{netville2}
+\citation{Lonkila1995}
+\citation{jsrstyle}
+\bibdata{sample.bib}
+\bibcite{fschr92j}{{1}{1992=2000}{{Fischer}}{{Fischer,~C.~S.}}{{C.~S. Fischer}}{{C S Fischer}}}
+\bibcite{gms1}{{2}{1973}{{Granovetter}}{{Granovetter,~M.~S.}}{{M.~S. Granovetter}}{{M S Granovetter}}}
+\bibcite{hgc1}{{3}{2001}{{樋口}}{{樋口耕一}}{{樋口耕一}}{{樋口耕一}}}
+\bibcite{hgc3}{{4}{2003}{{樋口}}{{樋口耕一}}{{樋口耕一}}{{樋口耕一}}}
+\bibcite{kwbt1}{{5}{2001a}{{川端}}{{川端亮}}{{川端亮}}{{川端亮}}}
+\bibcite{kwbt}{{6}{2001b}{{川端}}{{川端亮}}{{川端亮}}{{川端亮}}}
+\bibcite{kwbt99}{{7}{1999}{{川端編}}{{川端亮編}}{{川端亮編}}{{川端亮}}}
+\bibcite{kh2003}{{8}{2003}{{川端・樋口}}{{川端亮・樋口耕一}}{{川端亮・樋口耕一}}{{川端亮・樋口耕一}}}
+\bibcite{Lonkila1995}{{9}{1995}{{Lonkila}}{{Lonkila,~M.}}{{M.~Lonkila}}{{M Lonkila}}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {2.3}著作権}{5}}
+\bibcite{nsi2003}{{10}{2003}{{直井ほか}}{{直井優ほか}}{{直井優ほか}}{{直井優}}}
+\bibcite{jsrstyle}{{11}{1999}{{日本社会学会編集委員会}}{{日本社会学会編集委員会}}{{日本社会学会編集委員会}}{{日本社会学会編集委員会}}}
+\bibcite{cmcjdb44}{{12}{1998}{{Wellman}}{{Wellman,~B.}}{{B.~Wellman}}{{B Wellman}}}
+\bibcite{netville2}{{13}{1999}{{Wellman \& Hampton}}{{Wellman,~B. \& Hampton,~K.~N.}}{{B.~Wellman \& K.~N. Hampton}}{{B Wellman K N Hampton}}}
diff --git a/Build/source/texk/web2c/ptexdir/tests/sample.bib b/Build/source/texk/web2c/ptexdir/tests/sample.bib
new file mode 100644
index 00000000000..35e5aca87b2
--- /dev/null
+++ b/Build/source/texk/web2c/ptexdir/tests/sample.bib
@@ -0,0 +1,131 @@
+@Article{nsi2003,
+ journal = {大阪大学大学院人間科学研究科紀要},
+ author = {直井 優 and 菅野 剛 and 岩渕 亜希子},
+ yomi = {naoiatsushisuganotsuyoshiiwabuchiakiko},
+ title = {情報化社会に関する全国調査(JIS2001)の概要},
+ year = {2003},
+ volume = {29},
+ pages = {23-66}
+}
+
+@Article{kh2003,
+ journal = {大阪大学大学院人間科学研究科紀要},
+ author = {川端 亮 and 樋口 耕一},
+ yomi = {kawabataakirahiguchikouichi},
+ title = {インターネットに対する人々の意識 ---自由回答の分析から},
+ year = {2003},
+ volume = {29},
+ pages = {163-181}
+}
+
+@Book{fschr92j,
+ author = {Fischer, Claude S.},
+ title = {America Calling: A Social History of the Telephone to 1940},
+ publisher = {University of California Press },
+ address = {California},
+ year = 1992,
+ jauthor = {吉見 俊哉 and 松田 美佐 and 片岡 みい子},
+ jtitle = {電話するアメリカ},
+ jpublisher = {NTT出版},
+ jyear = 2000
+}
+
+@Article{kwbt1,
+ yomi = {kawabataakira},
+ author = {川端 亮},
+ year = {2001},
+ title = {コンピュータ・コーディングによる宗教的ライフヒストリーの記述},
+ journal = {宗教と社会},
+ volume = {7},
+ pages = {133-154},
+}
+
+@Article{kwbt,
+ yomi = {kawabataakira},
+ author = {川端 亮},
+ year = {2001},
+ title = {コンピューターを用いた自由回答のコーティング},
+ journal = {社会情報},
+ publisher = {札幌学院大学社会情報学部},
+ volume = {10},
+ number = {1},
+ pages = {135-148},
+}
+
+@Book{kwbt99,
+ yomi = {kawabataakira},
+ hentyo = {川端 亮},
+ editor = {川端 亮},
+ year = 1999,
+ title = {非定型データのコーディング・システムとその利用},
+ booktitle = {非定型データのコーディング・システムとその利用},
+ publisher = {平成8年度〜10年度科学研究費補助金(基盤研究(A)(1))(課題番号 08551003)研究成果報告書,\hspace{.6em}大阪大学},
+}
+
+@Article{netville2,
+ author = {Wellman, B. and Hampton, K. N.},
+ year = {1999},
+ title = {Living Networked On and Offline},
+ journal = {Contemporary Sociology},
+ volume = {28},
+ number = {6},
+ pages = {648-655},
+}
+
+@Article{gms1,
+ author = {Granovetter, M. S.},
+ year = {1973},
+ title = {The Strength of Weak Ties},
+ journal = {American Journal of Sociology},
+ volume = {78},
+ pages = {1360-1380},
+}
+
+@Article{hgc1,
+ yomi = {higuchikouichi},
+ author = {樋口 耕一},
+ year = {2001},
+ title = {電子コミュニティにおけるメディア特性の影響 ---同期メディアと非同期メディア},
+ journal = {年報人間科学},
+ volume = {22},
+ pages = {91-106},
+}
+
+@Article{cmcjdb44,
+ author = {Wellman, B.},
+ year = {1998},
+ title = {A Computer Network is a Social Network},
+ journal = {SIGGROUP Bulletin},
+ volume = {19},
+ number = {3},
+ pages = {41-48},
+}
+
+@Article{hgc3,
+ yomi = {higuchikouichi},
+ author = {樋口 耕一},
+ year = {2003},
+ title = {コンピュータ・コーディングの実践},
+ journal = {年報人間科学},
+ volume = {24},
+ pages = {193-214},
+}
+
+@Incollection{Lonkila1995,
+ author = {Lonkila, M.},
+ year = 1995,
+ title = {Grounded Theory as an Emerging Paradigm for Computer-Assisted Qualitative Data Analysis},
+ editor = {Kelle, U.},
+ booktitle = {Computer-Aided Qualitative Analysis},
+ address = {London},
+ publisher = {Sage},
+ pages = {41-51},
+}
+
+@Misc{jsrstyle,
+ author = {日本社会学会編集委員会},
+ yomi = {nihonsyakaigakkaihennsyuiinkai},
+ year = {1999},
+ title = {社会学評論スタイルガイド},
+ note = {( http://wwwsoc.nii.ac.jp/jss/\\JSRstyle/JSRstyle.html \ 2003.6.27)}
+} \ No newline at end of file
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 9d3f2825ddf..9af3f902ea6 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -3004,22 +3004,20 @@ case $enable_native_texlive_build in #(
enable_native_texlive_build=yes
ac_configure_args="$ac_configure_args '--enable-native-texlive-build'" ;;
esac
-if test "x$enable_native_texlive_build" = xyes; then
- case $enable_multiplatform in #(
+case $enable_multiplatform in #(
yes | no) :
: ;; #(
*) :
- enable_multiplatform=yes
- ac_configure_args="$ac_configure_args '--enable-multiplatform'" ;;
+ enable_multiplatform=$enable_native_texlive_build
+ ac_configure_args="$ac_configure_args '--enable-multiplatform=$enable_native_texlive_build'" ;;
esac
- case $enable_cxx_runtime_hack in #(
+case $enable_cxx_runtime_hack in #(
yes | no) :
: ;; #(
*) :
- enable_cxx_runtime_hack=yes
- ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;;
+ enable_cxx_runtime_hack=$enable_native_texlive_build
+ ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack=$enable_native_texlive_build'" ;;
esac
-fi
case $enable_libtool_hack in #(
yes | no) :
: ;; #(