From 5b3ff130cd5e4a3c29f468b0ac3f9b675096c7da Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Fri, 19 Oct 2012 21:45:45 +0200 Subject: reflect move l-dimen -> util-dim --- lualibs.dtx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lualibs.dtx') diff --git a/lualibs.dtx b/lualibs.dtx index 799c3df..cfdd15d 100644 --- a/lualibs.dtx +++ b/lualibs.dtx @@ -193,10 +193,9 @@ require("lualibs-md5") require("lualibs-dir") require("lualibs-unicode") require("lualibs-utils") -require("lualibs-dimen") +require("lualibs-util-dim") require("lualibs-url") require("lualibs-set") -require("lualibs-dimen") % \end{macrocode} % % \iffalse -- cgit v1.2.3 From 59cf0ae4a208ec4acd1d63229432f5eaaba00967 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Fri, 19 Oct 2012 21:55:19 +0200 Subject: reflect move l-utils -> util-mrg --- lualibs.dtx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lualibs.dtx') diff --git a/lualibs.dtx b/lualibs.dtx index cfdd15d..1fdd624 100644 --- a/lualibs.dtx +++ b/lualibs.dtx @@ -192,7 +192,7 @@ require("lualibs-file") require("lualibs-md5") require("lualibs-dir") require("lualibs-unicode") -require("lualibs-utils") +require("lualibs-util-mrg") require("lualibs-util-dim") require("lualibs-url") require("lualibs-set") -- cgit v1.2.3 From 013563d52aee465e2435a288e750276bdc236fbd Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Fri, 19 Oct 2012 22:07:39 +0200 Subject: reflect move l-aux -> util-tab.lua --- lualibs.dtx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lualibs.dtx') diff --git a/lualibs.dtx b/lualibs.dtx index 1fdd624..4d36dda 100644 --- a/lualibs.dtx +++ b/lualibs.dtx @@ -185,17 +185,17 @@ require("lualibs-boolean") require("lualibs-number") require("lualibs-math") require("lualibs-table") -require("lualibs-aux") require("lualibs-io") require("lualibs-os") require("lualibs-file") require("lualibs-md5") require("lualibs-dir") require("lualibs-unicode") -require("lualibs-util-mrg") -require("lualibs-util-dim") require("lualibs-url") require("lualibs-set") +require("lualibs-util-tab") +require("lualibs-util-mrg") +require("lualibs-util-dim") % \end{macrocode} % % \iffalse -- cgit v1.2.3 From e31f51cedf7e3f479a47b28bd86fa8bf887a86b4 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Fri, 19 Oct 2012 22:15:02 +0200 Subject: add util-lua util-sto --- lualibs.dtx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lualibs.dtx') diff --git a/lualibs.dtx b/lualibs.dtx index 4d36dda..1207b7f 100644 --- a/lualibs.dtx +++ b/lualibs.dtx @@ -193,9 +193,11 @@ require("lualibs-dir") require("lualibs-unicode") require("lualibs-url") require("lualibs-set") -require("lualibs-util-tab") +require("lualibs-util-lua") +require("lualibs-util-sto") require("lualibs-util-mrg") require("lualibs-util-dim") +require("lualibs-util-tab") % \end{macrocode} % % \iffalse -- cgit v1.2.3 From 11ed6e5dd8fde59f51ac7b1631235906fdcb08ee Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Fri, 19 Oct 2012 22:21:21 +0200 Subject: add util-str --- lualibs.dtx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lualibs.dtx') diff --git a/lualibs.dtx b/lualibs.dtx index 1207b7f..8f0d19c 100644 --- a/lualibs.dtx +++ b/lualibs.dtx @@ -193,10 +193,11 @@ require("lualibs-dir") require("lualibs-unicode") require("lualibs-url") require("lualibs-set") +require("lualibs-util-dim") require("lualibs-util-lua") -require("lualibs-util-sto") require("lualibs-util-mrg") -require("lualibs-util-dim") +require("lualibs-util-sto") +require("lualibs-util-str") require("lualibs-util-tab") % \end{macrocode} % -- cgit v1.2.3 From 1762bae45c50bf172313c08c004b8b22f1c48724 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Fri, 19 Oct 2012 22:30:20 +0200 Subject: add util-jsn --- lualibs.dtx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lualibs.dtx') diff --git a/lualibs.dtx b/lualibs.dtx index 8f0d19c..cc3142a 100644 --- a/lualibs.dtx +++ b/lualibs.dtx @@ -193,12 +193,13 @@ require("lualibs-dir") require("lualibs-unicode") require("lualibs-url") require("lualibs-set") -require("lualibs-util-dim") require("lualibs-util-lua") -require("lualibs-util-mrg") require("lualibs-util-sto") +require("lualibs-util-mrg") +require("lualibs-util-dim") require("lualibs-util-str") require("lualibs-util-tab") +require("lualibs-util-jsn") % \end{macrocode} % % \iffalse -- cgit v1.2.3 From 80e5c6eed03712ab06c068b5e22f1808b99f0616 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Fri, 19 Oct 2012 23:49:10 +0200 Subject: update doc --- lualibs.dtx | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 5 deletions(-) (limited to 'lualibs.dtx') diff --git a/lualibs.dtx b/lualibs.dtx index cc3142a..e38e89f 100644 --- a/lualibs.dtx +++ b/lualibs.dtx @@ -33,7 +33,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: lualibs 2011/01/20 v0.96 Lua additional functions.} +\Msg{* Package: lualibs 2012/10/19 v0.97 Lua additional functions.} \Msg{************************************************************************} \keepsilent @@ -90,7 +90,7 @@ and the derived file lualibs.lua. %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{lualibs.drv} - [2011/01/20 v0.96 Lua additional functions.] + [2012/10/19 v0.97 Lua additional functions.] \documentclass{ltxdoc} \EnableCrossrefs \CodelineIndex @@ -120,7 +120,7 @@ and the derived file lualibs.lua. % \GetFileInfo{lualibs.drv} % % \title{The \textsf{lualibs} package} -% \date{2011/01/20 v0.96} +% \date{2012/10/19 v0.97} % \author{Elie Roux \\ \texttt{elie.roux@telecom-bretagne.eu}} % % \maketitle @@ -151,6 +151,61 @@ and the derived file lualibs.lua. % initialize \textsf{kpse} library so that |require()| can find files under % TEXMF tree: |kpse.set_program_name("luatex")|. % +% \section{Files} +% +% The \textsf{lualibs} bundle contains files from two Con\TeX t Lua +% library categories: The generic auxiliary functions (original file prefix: +% |t-|) together form something close to a standard libary. Most of these are +% extensions of an existing namespace, like for instance |l-table.lua| which +% adds full-fledged serialization capabilities to the Lua table library. +% They were imported under the \textsf{lualibs}-prefix. +% (For a list see table~\ref{tab:extensions}.) +% +% \begin{table}[h] +% \centering +% \caption{Extensions of the Lua standard library.} +% \begin{tabular}{l l l} +% \textsf{lualibs} name & Con\TeX t name & content \\ +% \hline +% lualibs-string.lua & l-string.lua & string manipulation \\ +% lualibs-lpeg.lua & l-lpeg.lua & patterns \\ +% lualibs-boolean.lua & l-boolean.lua & boolean converter \\ +% lualibs-number.lua & l-number.lua & bit set \\ +% lualibs-math.lua & l-math.lua & math functions \\ +% lualibs-table.lua & l-table.lua & serialization, conversion \\ +% lualibs-io.lua & l-io.lua & reading and writing files \\ +% lualibs-os.lua & l-os.lua & platform specific code \\ +% lualibs-file.lua & l-file.lua & filesystem operations \\ +% lualibs-md5.lua & l-md5.lua & checksum functions \\ +% lualibs-dir.lua & l-dir.lua & directory handling \\ +% lualibs-unicode.lua & l-unicode.lua & utf and unicode \\ +% lualibs-url.lua & l-url.lua & url handling \\ +% lualibs-set.lua & l-set.lua & sets \\ +% \end{tabular} +% \label{tab:extensions} +% \end{table} +% +% The second category comprises a selection of files mostly from the +% utilities namespace (|util-|; cf. table~\ref{tab:utilities}). +% Their purpose is more specific and at times quite low-level. +% +% \begin{table}[h] +% \centering +% \caption{Utility functions.} +% \begin{tabular}{l l l} +% \textsf{lualibs} name & Con\TeX t name & content \\ +% \hline +% lualibs-util-lua.lua & util-lua.lua & operations on bytecode \\ +% lualibs-util-sto.lua & util-sto.lua & table allocation \\ +% lualibs-util-mrg.lua & util-mrg.lua & merging lua sources \\ +% lualibs-util-dim.lua & util-dim.lua & converters for dimensions \\ +% lualibs-util-str.lua & util-str.lua & extra string functions \\ +% lualibs-util-tab.lua & util-tab.lua & extra table functions \\ +% lualibs-util-jsn.lua & util-jsn.lua & conversion to and from json \\ +% \end{tabular} +% \label{tab:utilities} +% \end{table} +% % \pagebreak % \section{\texttt{lualibs.lua}} % @@ -163,8 +218,8 @@ module('lualibs', package.seeall) local lualibs_module = { name = "lualibs", - version = 0.96, - date = "2011/01/20", + version = 0.97, + date = "2012/10/19", description = "Lua additional functions.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux", copyright = "PRAGMA ADE / ConTeXt Development Team", -- cgit v1.2.3 From f7d3661b93321974c2e0a8583053e4fa4a8717f5 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 7 Apr 2013 19:53:52 +0200 Subject: update dtx for new loading sequence --- lualibs.dtx | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'lualibs.dtx') diff --git a/lualibs.dtx b/lualibs.dtx index e38e89f..dcb0e5a 100644 --- a/lualibs.dtx +++ b/lualibs.dtx @@ -155,7 +155,7 @@ and the derived file lualibs.lua. % % The \textsf{lualibs} bundle contains files from two Con\TeX t Lua % library categories: The generic auxiliary functions (original file prefix: -% |t-|) together form something close to a standard libary. Most of these are +% |l-|) together form something close to a standard libary. Most of these are % extensions of an existing namespace, like for instance |l-table.lua| which % adds full-fledged serialization capabilities to the Lua table library. % They were imported under the \textsf{lualibs}-prefix. @@ -165,22 +165,24 @@ and the derived file lualibs.lua. % \centering % \caption{Extensions of the Lua standard library.} % \begin{tabular}{l l l} -% \textsf{lualibs} name & Con\TeX t name & content \\ +% \textsf{lualibs} name & Con\TeX t name & content \\ % \hline -% lualibs-string.lua & l-string.lua & string manipulation \\ -% lualibs-lpeg.lua & l-lpeg.lua & patterns \\ -% lualibs-boolean.lua & l-boolean.lua & boolean converter \\ -% lualibs-number.lua & l-number.lua & bit set \\ -% lualibs-math.lua & l-math.lua & math functions \\ -% lualibs-table.lua & l-table.lua & serialization, conversion \\ -% lualibs-io.lua & l-io.lua & reading and writing files \\ -% lualibs-os.lua & l-os.lua & platform specific code \\ -% lualibs-file.lua & l-file.lua & filesystem operations \\ -% lualibs-md5.lua & l-md5.lua & checksum functions \\ -% lualibs-dir.lua & l-dir.lua & directory handling \\ -% lualibs-unicode.lua & l-unicode.lua & utf and unicode \\ -% lualibs-url.lua & l-url.lua & url handling \\ -% lualibs-set.lua & l-set.lua & sets \\ +% lualibs-lua.lua & l-lua.lua & compatibility, library paths \\ +% lualibs-lpeg.lua & l-lpeg.lua & patterns \\ +% lualibs-function.lua & l-function.lua & empty except for dummy \\ +% lualibs-string.lua & l-string.lua & string manipulation \\ +% lualibs-table.lua & l-table.lua & serialization, conversion \\ +% lualibs-boolean.lua & l-boolean.lua & boolean converter \\ +% lualibs-number.lua & l-number.lua & bit operations \\ +% lualibs-math.lua & l-math.lua & math functions \\ +% lualibs-io.lua & l-io.lua & reading and writing files \\ +% lualibs-os.lua & l-os.lua & platform specific code \\ +% lualibs-file.lua & l-file.lua & filesystem operations \\ +% lualibs-md5.lua & l-md5.lua & checksum functions \\ +% lualibs-dir.lua & l-dir.lua & directory handling \\ +% lualibs-unicode.lua & l-unicode.lua & utf and unicode \\ +% lualibs-url.lua & l-url.lua & url handling \\ +% lualibs-set.lua & l-set.lua & sets \\ % \end{tabular} % \label{tab:extensions} % \end{table} @@ -234,12 +236,14 @@ end % Load the modules. % % \begin{macrocode} -require("lualibs-string") +require("lualibs-lua") require("lualibs-lpeg") +require("lualibs-function") +require("lualibs-string") +require("lualibs-table") require("lualibs-boolean") require("lualibs-number") require("lualibs-math") -require("lualibs-table") require("lualibs-io") require("lualibs-os") require("lualibs-file") @@ -248,6 +252,7 @@ require("lualibs-dir") require("lualibs-unicode") require("lualibs-url") require("lualibs-set") + require("lualibs-util-lua") require("lualibs-util-sto") require("lualibs-util-mrg") -- cgit v1.2.3 From 170fbd1a07aaadace4b976f62e67572c53c8449b Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 7 Apr 2013 22:12:30 +0200 Subject: update dtx --- lualibs.dtx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lualibs.dtx') diff --git a/lualibs.dtx b/lualibs.dtx index dcb0e5a..e9a20a6 100644 --- a/lualibs.dtx +++ b/lualibs.dtx @@ -252,14 +252,14 @@ require("lualibs-dir") require("lualibs-unicode") require("lualibs-url") require("lualibs-set") - -require("lualibs-util-lua") -require("lualibs-util-sto") -require("lualibs-util-mrg") -require("lualibs-util-dim") require("lualibs-util-str") +--[[everything below apparently not required for the fontloader]] require("lualibs-util-tab") +require("lualibs-util-sto") +require("lualibs-util-dim") require("lualibs-util-jsn") +--require("lualibs-util-mrg")-- not required +require("lualibs-util-lua") % \end{macrocode} % % \iffalse -- cgit v1.2.3