luabibentry (26sep13)

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

7 files changed, 27 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/lualatex/luabibentry/News b/Master/texmf-dist/doc/lualatex/luabibentry/News
index df3891e601d..dac29cbb37f 100644
--- a/Master/texmf-dist/doc/lualatex/luabibentry/News
+++ b/Master/texmf-dist/doc/lualatex/luabibentry/News
@@ -1,2 +1,6 @@
-2011/06/27

- * Initial version

+2012/02/02 - v0.1a
+ * luabibentry.lua is now found in the lua search path.
+   * Replaced dofile by require as suggested by Ulrike Fischer.
+
+2011/06/27 - v0.1
+ * Initial version
diff --git a/Master/texmf-dist/doc/lualatex/luabibentry/README b/Master/texmf-dist/doc/lualatex/luabibentry/README
index 123b353ea35..b7f1c914fe4 100644
--- a/Master/texmf-dist/doc/lualatex/luabibentry/README
+++ b/Master/texmf-dist/doc/lualatex/luabibentry/README
@@ -1,11 +1,11 @@
-LuaLaTeX package luaindex v0.1, 2001-06-27.
-Copyright (c) Oliver Kopp, 2011
+LuaLaTeX package luabibentry v0.1a, 2012-02-02.
+Copyright (c) Oliver Kopp, 2012
 
 Summary
 -------
-luabibentry is a reimplementation of bibentry.sty by Patrick W.\ Daly. It
-provides the command \bibentry{<BibTeXKey>} to print the bibliographic entry in
-the main document.
+luabibentry is a reimplementation of bibentry.sty by Patrick W. Daly.
+It provides the command \bibentry{<BibTeXKey>} to print the 
+bibliographic entry in the main document.
 
 
 Generating the package
diff --git a/Master/texmf-dist/doc/lualatex/luabibentry/luabibentry.pdf b/Master/texmf-dist/doc/lualatex/luabibentry/luabibentry.pdf
index bc2d16f64ac..f5084e107eb 100644
--- a/Master/texmf-dist/doc/lualatex/luabibentry/luabibentry.pdf
+++ b/Master/texmf-dist/doc/lualatex/luabibentry/luabibentry.pdf
diff --git a/Master/texmf-dist/source/lualatex/luabibentry/Makefile b/Master/texmf-dist/source/lualatex/luabibentry/Makefile
index 42b91bd3e3c..6de822e6982 100644
--- a/Master/texmf-dist/source/lualatex/luabibentry/Makefile
+++ b/Master/texmf-dist/source/lualatex/luabibentry/Makefile
@@ -24,7 +24,7 @@ DOCFILES = $(DOC) README News
 RUNFILES = $(STY) $(LUA)
 ALL      = $(SRCFILES) $(DOCFILES) $(RUNFILES)
 
-TEXMFROOT = ./texmf
+#TEXMFROOT = ./texmf
 RUNDIR    = $(TEXMFROOT)/tex/$(FORMAT)/$(NAME)
 DOCDIR    = $(TEXMFROOT)/doc/$(FORMAT)/$(NAME)
 SRCDIR    = $(TEXMFROOT)/source/$(FORMAT)/$(NAME)
diff --git a/Master/texmf-dist/source/lualatex/luabibentry/luabibentry.dtx b/Master/texmf-dist/source/lualatex/luabibentry/luabibentry.dtx
index 86b0ebce806..55db6496d7d 100644
--- a/Master/texmf-dist/source/lualatex/luabibentry/luabibentry.dtx
+++ b/Master/texmf-dist/source/lualatex/luabibentry/luabibentry.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 % ==========================================================================
-% luabibentry.dtx v0.1, 2011/06/27
-% Copyright (c) Oliver Kopp, 2011
+% luabibentry.dtx v0.1a, 2012/02/02
+% Copyright (c) Oliver Kopp, 2012
 %
 % This file is part of the LuaLaTex package `luabibentry'.
 % 
@@ -41,7 +41,7 @@
 \obeyspaces\obeylines
 \global\def\preambletext{
 \space
-Copyright (c) 2011 by Oliver Kopp <oliver.kopp.googlemail.com>
+Copyright (c) 2012 by Oliver Kopp <oliver.kopp.googlemail.com>
 
 This file was generated from file(s) of luabibentry distribution.
 -----------------------------------------------------------------
@@ -134,13 +134,13 @@ In case an entry is not found "?" is output
 %<package>\ProvidesPackage{luabibentry}
 %<driver>\ProvidesFile{luaindex.dtx}
 %<*driver|package>
-[2011/06/27 v0.1 LuaLaTeX Package to place bibliography entries in text]
+[2012/02/02 v0.1a LuaLaTeX Package to place bibliography entries in text]
 %</driver|package>
 %<lua>if (luatexbase and (luatexbase.provides_module)) then
 %<lua>   luatexbase.provides_module({
 %<lua>      name = "luabibentry",
-%<lua>      date = "2011/06/27",
-%<lua>      version = "0.1",
+%<lua>      date = "2012/02/02",
+%<lua>      version = "0.1a",
 %<lua>      description = "LuaLaTeX Package to Place Bibliography Entries in Text",
 %<lua>      author = "Oliver Kopp",
 %<lua>      licence = "LPPL v1.3c or later"
@@ -161,7 +161,7 @@ In case an entry is not found "?" is output
   The \texttt{luabibentry} package
 }
 %\date{\fileversion} %currently doesn't work
-\date{Version 0.1 as of 2011/06/27}
+\date{Version 0.1a as of 2012/02/02}
 \author{Oliver Kopp\thanks{oliver.kopp%
 @%
 googlemail%
@@ -175,6 +175,7 @@ com}}
 %\fi^^A meta-comment
 %
 % \changes{v0.1}{2011/06/27}{start of new package}
+% \changes{v0.1a}{2012/02/02}{fixed lua code to use `require' instead of `dofile'.}
 %
 % \begin{abstract}
 %   Typically, bibliographic entries are put at the end of a document. This 
@@ -373,7 +374,7 @@ end
 %
 % Load the lua module:
 %    \begin{macrocode}
-\directlua{dofile("luabibentry.lua")}
+\directlua{require("luabibentry.lua")}
 %    \end{macrocode}
 %
 % Interface to the lua module:
diff --git a/Master/texmf-dist/tex/lualatex/luabibentry/luabibentry.lua b/Master/texmf-dist/tex/lualatex/luabibentry/luabibentry.lua
index 8fdceb2c8a7..f64069be634 100644
--- a/Master/texmf-dist/tex/lualatex/luabibentry/luabibentry.lua
+++ b/Master/texmf-dist/tex/lualatex/luabibentry/luabibentry.lua
@@ -6,7 +6,7 @@
 ---
 --- luabibentry.dtx  (with options: `lua')
 ---  
---- Copyright (c) 2011 by Oliver Kopp <oliver.kopp.googlemail.com>
+--- Copyright (c) 2012 by Oliver Kopp <oliver.kopp.googlemail.com>
 --- 
 --- This file was generated from file(s) of luabibentry distribution.
 --- -----------------------------------------------------------------
@@ -29,8 +29,8 @@
 if (luatexbase and (luatexbase.provides_module)) then
    luatexbase.provides_module({
       name = "luabibentry",
-      date = "2011/06/27",
-      version = "0.1",
+      date = "2012/02/02",
+      version = "0.1a",
       description = "LuaLaTeX Package to Place Bibliography Entries in Text",
       author = "Oliver Kopp",
       licence = "LPPL v1.3c or later"
diff --git a/Master/texmf-dist/tex/lualatex/luabibentry/luabibentry.sty b/Master/texmf-dist/tex/lualatex/luabibentry/luabibentry.sty
index 263e59ec5d5..025f8067978 100644
--- a/Master/texmf-dist/tex/lualatex/luabibentry/luabibentry.sty
+++ b/Master/texmf-dist/tex/lualatex/luabibentry/luabibentry.sty
@@ -8,7 +8,7 @@
 %% 
 %% 
 %%  
-%% Copyright (c) 2011 by Oliver Kopp <oliver.kopp.googlemail.com>
+%% Copyright (c) 2012 by Oliver Kopp <oliver.kopp.googlemail.com>
 %% 
 %% This file was generated from file(s) of luabibentry distribution.
 %% -----------------------------------------------------------------
@@ -38,7 +38,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{luabibentry}
-[2011/06/27 v0.1 LuaLaTeX Package to place bibliography entries in text]
+[2012/02/02 v0.1a LuaLaTeX Package to place bibliography entries in text]
 
 \RequirePackage{ifluatex}
 \ifluatex\else
@@ -48,7 +48,7 @@
     See documentation of `luabibentry' for further information.}%
   \expandafter\expandafter\expandafter\csname endinput\endcsname
 \fi
-\directlua{dofile("luabibentry.lua")}
+\directlua{require("luabibentry.lua")}
 \newcommand{\setupbibentry}[1]{\directlua{luabibentry.builddata{"#1.bbl"}}}
 \newcommand{\bibentry}[1]{\nocite{#1}\directlua{luabibentry.bibentry{"#1"}}}
 \endinput