summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/luatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-24 21:47:53 +0000
committerKarl Berry <karl@freefriends.org>2013-07-24 21:47:53 +0000
commit42402bd9b4a14a3cc7c774c866fda4e419b9a4ee (patch)
tree33c0f31fffd538789552de57988c635997391606 /Master/texmf-dist/source/luatex
parent2ca350121961af1d06876475b5c661ebc41993e6 (diff)
lualibs (24jul13)
git-svn-id: svn://tug.org/texlive/trunk@31280 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/luatex')
-rw-r--r--Master/texmf-dist/source/luatex/lualibs/Makefile15
-rw-r--r--Master/texmf-dist/source/luatex/lualibs/lualibs.dtx21
2 files changed, 22 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/luatex/lualibs/Makefile b/Master/texmf-dist/source/luatex/lualibs/Makefile
index 6916f1ed1aa..556e56f1399 100644
--- a/Master/texmf-dist/source/luatex/lualibs/Makefile
+++ b/Master/texmf-dist/source/luatex/lualibs/Makefile
@@ -23,13 +23,14 @@ SRCFILES = $(DTX) $(SRC_TEX) Makefile $(SCRIPTS)
# The following definitions should be equivalent
# ALL_FILES = $(RUNFILES) $(DOCFILES) $(SRCFILES)
-ALL_FILES = $(GENERATED) $(SOURCE)
+ALL_FILES = $(SOURCE) $(filter-out $(SOURCE),$(GENERATED))
# Installation locations
FORMAT = luatex
RUNDIR = $(TEXMFROOT)/tex/$(FORMAT)/$(NAME)
DOCDIR = $(TEXMFROOT)/doc/$(FORMAT)/$(NAME)
SRCDIR = $(TEXMFROOT)/source/$(FORMAT)/$(NAME)
+DISTDIR = ./lualibs
TEXMFROOT = ./texmf
CTAN_ZIP = $(NAME).zip
@@ -54,7 +55,7 @@ check: $(TESTSCRIPT)
news: $(DIFFSCRIPT)
@texlua $(DIFFSCRIPT)
-.PHONY: all doc unpack ctan tds world
+.PHONY: all doc unpack ctan tds world check news
%.pdf: %.dtx
$(DO_PDFLATEX)
@@ -68,10 +69,16 @@ news: $(DIFFSCRIPT)
$(UNPACKED): lualibs.dtx
$(DO_TEX)
-$(CTAN_ZIP): $(SOURCE) $(COMPILED) $(GENERATED) $(TDS_ZIP)
+define make-ctandir
+@rm -r $(DISTDIR)
+@mkdir $(DISTDIR) && cp $(ALL_FILES) $(DISTDIR)
+endef
+
+$(CTAN_ZIP): $(ALL_FILES) $(TDS_ZIP)
@echo "Making $@ for CTAN upload."
@$(RM) -- $@
- @zip -9 $@ $^ >/dev/null
+ $(make-ctandir)
+ @zip -r -9 $@ $(DISTDIR) $(TDS_ZIP) >/dev/null
define run-install
@mkdir -p $(RUNDIR) && cp $(RUNFILES) $(RUNDIR)
diff --git a/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx b/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx
index f2edf918fdf..629856432a0 100644
--- a/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx
+++ b/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx
@@ -5,13 +5,14 @@
% See ConTeXt's mreadme.pdf for the license.
%
% This work consists of the main source file lualibs.dtx
-% and the derived file lualibs.lua.
+% and the derived files lualibs.lua, lualibs-basic.lua,
+% and lualibs-extended.lua.
%
% Unpacking:
% tex lualibs.dtx
%
% Documentation:
-% pdflatex lualibs.dtx
+% lualatex lualibs.dtx
%
% The class ltxdoc loads the configuration file ltxdoc.cfg
% if available. Here you can specify further options, e.g.
@@ -33,7 +34,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: lualibs 2013/05/18 v2.00 Lua additional functions.}
+\Msg{* Package: lualibs 2013/07/23 v2.0c Lua additional functions.}
\Msg{************************************************************************}
\keepsilent
@@ -44,7 +45,7 @@
\preamble
This is a generated file.
-Copyright (C) 2009 by PRAGMA ADE / ConTeXt Development Team
+Copyright (C) 2009--2013 by PRAGMA ADE / ConTeXt Development Team
See ConTeXt's mreadme.pdf for the license.
@@ -86,7 +87,7 @@ and the derived file lualibs.lua.
\Msg{* To finish the installation you have to move the following}
\Msg{* files into a directory searched by TeX:}
\Msg{*}
-\Msg{* lualibs.lua}
+\Msg{* lualibs.lua, lualibs-basic.lua, lualibs-extended.lua}
\Msg{*}
\Msg{* Happy TeXing!}
\Msg{*}
@@ -100,7 +101,7 @@ and the derived file lualibs.lua.
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{lualibs.drv}
- [2013/05/18 v2.00 Lua Libraries.]
+ [2013/07/23 v2.0c Lua Libraries.]
\documentclass{ltxdoc}
\usepackage{fancyvrb,xspace}
\usepackage[x11names]{xcolor}
@@ -201,7 +202,7 @@ and the derived file lualibs.lua.
% \GetFileInfo{lualibs.drv}
%
% \title{The \identifier{lualibs} package}
-% \date{2013/05/18 v2.00}
+% \date{2013/07/23 v2.0c}
% \author{Élie Roux · \email{elie.roux@telecom-bretagne.eu}\\
% Philipp Gesang · \email{philipp.gesang@alumni.uni-heidelberg.de}}
%
@@ -417,7 +418,7 @@ lualibs = lualibs or { }
lualibs.module_info = {
name = "lualibs",
version = 2.00,
- date = "2013/05/18",
+ date = "2013/07/23",
description = "ConTeXt Lua standard libraries.",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang",
copyright = "PRAGMA ADE / ConTeXt Development Team",
@@ -558,7 +559,7 @@ local loadmodule = lualibs.loadmodule
local lualibs_basic_module = {
name = "lualibs-basic",
version = 2.00,
- date = "2013/05/18",
+ date = "2013/07/23",
description = "ConTeXt Lua libraries -- basic collection.",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang",
copyright = "PRAGMA ADE / ConTeXt Development Team",
@@ -639,7 +640,7 @@ lualibs = lualibs or { }
local lualibs_extended_module = {
name = "lualibs-extended",
version = 2.00,
- date = "2013/05/18",
+ date = "2013/07/23",
description = "ConTeXt Lua libraries -- extended collection.",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang",
copyright = "PRAGMA ADE / ConTeXt Development Team",