summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-30 18:16:23 +0000
committerKarl Berry <karl@freefriends.org>2011-09-30 18:16:23 +0000
commit5a1f9d77f917c0302c0bfef9b45658a9d1ca83da (patch)
tree25c481dcb87e7bd06588e87b6647eb72c7864a20 /Build/source/texk
parentbe62200a7e0420b4a11f6cbca5848f9ea5666c93 (diff)
new (biblio) formats .ris and .bltxml per philkime
git-svn-id: svn://tug.org/texlive/trunk@24156 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog8
-rw-r--r--Build/source/texk/kpathsea/doc/kpathsea.info58
-rw-r--r--Build/source/texk/kpathsea/doc/kpathsea.texi4
-rw-r--r--Build/source/texk/kpathsea/tex-file.c15
-rw-r--r--Build/source/texk/kpathsea/texmf.cnf4
-rw-r--r--Build/source/texk/kpathsea/types.h2
6 files changed, 61 insertions, 30 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 6863de9bda5..6a7144c402d 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-30 Karl Berry <karl@tug.org>
+
+ * types.h (kpse_{ris,bltxml}_format): new types.
+ * tex-file.c ({RIS,BLTXML}_ENVS): new defines.
+ (kpse_init_format): initialize them.
+ * texmf.cnf ({RIS,BLTXML}INPUTS): new definitions.
+ Request from Phil Kime, tex-k 25 Sep 2011 16:46:07.
+
2011-08-28 Karl Berry <karl@tug.org>
* texmf.cnf (LUAINPUTS.lualatex, LUAINPUTS.dvilualatex): new defns.
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info
index 26e2ed72832..cf43bb35583 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.info
+++ b/Build/source/texk/kpathsea/doc/kpathsea.info
@@ -2607,6 +2607,8 @@ filename, and returns the first file found.
mlbib: .mlbib .bib
mlbst: .mlbst .bst
clua: .dll .so
+ ris: .ris
+ bltxml: .bltxml
This option and `--path' are mutually exclusive.
@@ -3606,28 +3608,28 @@ Index
(line 38)
* --help: Standard options. (line 8)
* --interactive: Path searching options.
- (line 118)
+ (line 120)
* --mktex=FILETYPE: Path searching options.
- (line 123)
+ (line 125)
* --mode=STRING: Path searching options.
- (line 129)
+ (line 131)
* --must-exist: Path searching options.
- (line 134)
+ (line 136)
* --no-mktex=FILETYPE: Path searching options.
- (line 123)
+ (line 125)
* --path=STRING: Path searching options.
- (line 139)
+ (line 141)
* --progname=NAME: Path searching options.
- (line 148)
+ (line 150)
* --safe-in-name=NAME: Path searching options.
- (line 154)
+ (line 156)
* --safe-out-name=NAME: Path searching options.
- (line 154)
+ (line 156)
* --show-path=NAME: Auxiliary tasks. (line 41)
* --srcdir, for building multiple architectures: configure scenarios.
(line 18)
* --subdir=STRING: Path searching options.
- (line 160)
+ (line 162)
* --var-value=VARIABLE: Auxiliary tasks. (line 12)
* --version: Standard options. (line 11)
* --with options: configure options. (line 16)
@@ -4100,7 +4102,7 @@ Index
* installation, simple: Simple installation. (line 6)
* installing files: Installing files. (line 6)
* interactive query: Path searching options.
- (line 118)
+ (line 120)
* interface, not frozen: Introduction. (line 27)
* introduction: Introduction. (line 6)
* kdebug:: Debugging. (line 105)
@@ -4740,22 +4742,22 @@ Node: Filename aliases100803
Node: Database format101981
Node: Invoking kpsewhich102994
Node: Path searching options103940
-Node: Specially-recognized files112111
-Node: Auxiliary tasks113467
-Node: Standard options115292
-Node: TeX support115648
-Node: Supported file formats116939
-Node: File lookup124493
-Node: Glyph lookup126242
-Node: Basic glyph lookup127366
-Node: Fontmap128245
-Node: Fallback font130862
-Node: Suppressing warnings131775
-Node: Programming132880
-Node: Programming overview133393
-Node: Calling sequence136087
-Node: Program-specific files142610
-Node: Programming with config files143633
-Node: Index144945
+Node: Specially-recognized files112157
+Node: Auxiliary tasks113513
+Node: Standard options115338
+Node: TeX support115694
+Node: Supported file formats116985
+Node: File lookup124539
+Node: Glyph lookup126288
+Node: Basic glyph lookup127412
+Node: Fontmap128291
+Node: Fallback font130908
+Node: Suppressing warnings131821
+Node: Programming132926
+Node: Programming overview133439
+Node: Calling sequence136133
+Node: Program-specific files142656
+Node: Programming with config files143679
+Node: Index144991

End Tag Table
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.texi b/Build/source/texk/kpathsea/doc/kpathsea.texi
index 14a97a6fdde..1ade291e716 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.texi
+++ b/Build/source/texk/kpathsea/doc/kpathsea.texi
@@ -3,7 +3,7 @@
@settitle Kpathsea: A library for path searching
@set version 6.0.1
-@set month-year April 2011
+@set month-year September 2011
@copying
This file documents the Kpathsea library for path searching.
@@ -1183,6 +1183,8 @@ cid maps: .cid .cidmap
mlbib: .mlbib .bib
mlbst: .mlbst .bst
clua: .dll .so
+ris: .ris
+bltxml: .bltxml
@end example
This option and @samp{--path} are mutually exclusive.
diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c
index 293bca1b729..0cb119721bf 100644
--- a/Build/source/texk/kpathsea/tex-file.c
+++ b/Build/source/texk/kpathsea/tex-file.c
@@ -1,6 +1,7 @@
/* tex-file.c: high-level file searching by format.
- Copyright 1993, 1994, 1995, 1996, 1997, 2007, 2008, 2009, 2010, 2011 Karl Berry.
+ Copyright 1993, 1994, 1995, 1996, 1997, 2007, 2008, 2009, 2010, 2011
+ Karl Berry.
Copyright 1998-2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -91,6 +92,8 @@
#define MLBIB_ENVS "MLBIBINPUTS", BIB_ENVS
#define MLBST_ENVS "MLBSTINPUTS", BST_ENVS
#define CLUA_ENVS "CLUAINPUTS"
+#define RIS_ENVS "RISINPUTS"
+#define BLTXML_ENVS "BLTXMLINPUTS"
/* The compiled-in default list, DEFAULT_FONT_SIZES, is intended to be
set from the command line (presumably via the Makefile). */
@@ -806,6 +809,16 @@ kpathsea_init_format (kpathsea kpse, kpse_file_format_type format)
SUFFIXES (CLUA_SUFFIXES);
FMT_INFO.suffix_search_only = true;
break;
+ case kpse_ris_format:
+ INIT_FORMAT ("ris", DEFAULT_RISINPUTS, RIS_ENVS);
+ SUFFIXES (".ris");
+ FMT_INFO.suffix_search_only = true;
+ break;
+ case kpse_bltxml_format:
+ INIT_FORMAT ("bltxml", DEFAULT_BLTXMLINPUTS, BLTXML_ENVS);
+ SUFFIXES (".bltxml");
+ FMT_INFO.suffix_search_only = true;
+ break;
default:
LIB_FATAL1 ("kpse_init_format: Unknown format %d", format);
}
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 73eee4d7c36..49aa187ea0e 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -303,6 +303,10 @@ BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
+% .ris and .bltxml bibliography formats.
+RISINPUTS = .;$TEXMF/bibtex/ris//
+BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
+
% MFT style files.
MFTINPUTS = .;$TEXMF/mft//
diff --git a/Build/source/texk/kpathsea/types.h b/Build/source/texk/kpathsea/types.h
index 68e3c967d93..c00229d6739 100644
--- a/Build/source/texk/kpathsea/types.h
+++ b/Build/source/texk/kpathsea/types.h
@@ -141,6 +141,8 @@ typedef enum
kpse_mlbib_format,
kpse_mlbst_format,
kpse_clua_format,
+ kpse_ris_format,
+ kpse_bltxml_format,
kpse_last_format /* one past last index */
} kpse_file_format_type;