From 1285f9a97c14116891c922b047594eb2175e5b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Drahos=CC=8C?= Date: Fri, 9 Mar 2012 15:29:03 +0100 Subject: Lua 5.1.5 update using official release package. --- COPYRIGHT | 2 +- Makefile | 2 +- README | 15 +---- dist.info | 2 +- doc/amazon.gif | Bin 797 -> 0 bytes doc/contents.html | 160 +++++++++++++++++++++++++++--------------------------- doc/lua.css | 48 +++++++++++++++- doc/manual.css | 15 ++++- doc/manual.html | 31 ++++++----- doc/readme.html | 4 +- etc/lua.pc | 2 +- src/Makefile | 2 +- src/lbaselib.c | 2 +- src/ldo.c | 3 +- src/lgc.c | 3 +- src/lparser.c | 4 +- src/lua.h | 8 +-- src/lvm.c | 3 +- 18 files changed, 176 insertions(+), 130 deletions(-) delete mode 100644 doc/amazon.gif diff --git a/COPYRIGHT b/COPYRIGHT index 3a53e74..a860268 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -9,7 +9,7 @@ For details and rationale, see http://www.lua.org/license.html . =============================================================================== -Copyright (C) 1994-2008 Lua.org, PUC-Rio. +Copyright (C) 1994-2012 Lua.org, PUC-Rio. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index 6e78f66..209a132 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ TO_MAN= lua.1 luac.1 # Lua version and release. V= 5.1 -R= 5.1.4 +R= 5.1.5 all: $(PLAT) diff --git a/README b/README index b028e7d..11b4dff 100644 --- a/README +++ b/README @@ -23,18 +23,9 @@ See HISTORY for a summary of changes since the last released version. * Installation ------------ - In the LuaDist distribution the default makefiles have been replaced with - CMake. To build Lua use the following approach. - > mkdir _build && cd_build - > ccmake .. # Set up configuration, alternatively use cmake-gui on Windows. - > cmake --build . --target install - - The default makefile should work too, you just need to edit src/luaconf.h.orig - and save it as src/luaconf.h. - - > make - - See INSTALL for detailed instructions with make. + Lua is implemented in pure ANSI C, and compiles unmodified in all known + platforms that have an ANSI C compiler. In most Unix-like platforms, simply + do "make" with a suitable target. See INSTALL for detailed instructions. * Origin ------ diff --git a/dist.info b/dist.info index 40ecbcb..6487ea6 100644 --- a/dist.info +++ b/dist.info @@ -1,7 +1,7 @@ --- This file is part of LuaDist project name = "lua" -version = "5.1.4" +version = "5.1.5" desc = "Lua is a powerful, fast, light-weight, embeddable scripting language." author = "Roberto Ierusalimschy, Waldemar Celes, Luiz Henrique de Figueiredo" diff --git a/doc/amazon.gif b/doc/amazon.gif deleted file mode 100644 index f2586d5..0000000 Binary files a/doc/amazon.gif and /dev/null differ diff --git a/doc/contents.html b/doc/contents.html index 8e58e18..3d83da9 100644 --- a/doc/contents.html +++ b/doc/contents.html @@ -3,11 +3,10 @@ Lua 5.1 Reference Manual - contents - + @@ -20,7 +19,13 @@ ul { Lua 5.1 Reference Manual -This is an online version of +

+The reference manual is the official definition of the Lua language. +For a complete introduction to Lua programming, see the book +Programming in Lua. + +

+This manual is also available as a book:

@@ -29,128 +34,119 @@ This is an online version of
by R. Ierusalimschy, L. H. de Figueiredo, W. Celes
Lua.org, August 2006
ISBN 85-903798-3-3 -
 -[Buy from Amazon]
-

-Buy a copy of this book and +

+Buy a copy +of this book and help to support the Lua project. -

-The reference manual is the official definition of the Lua language. -For a complete introduction to Lua programming, see the book -Programming in Lua.

- start · contents · index · -português -· -español +other versions

-Copyright © 2006-2008 Lua.org, PUC-Rio. +Copyright © 2006–2012 Lua.org, PUC-Rio. Freely available under the terms of the -Lua license. +Lua license. -

Contents

Index

@@ -160,6 +156,8 @@ Freely available under the terms of the

Lua functions

_G
_VERSION
+

+ assert
collectgarbage
dofile
@@ -487,12 +485,12 @@ Freely available under the terms of the

- + Last update: -Sat Jan 19 13:24:29 BRST 2008 +Mon Feb 13 18:53:32 BRST 2012 diff --git a/doc/lua.css b/doc/lua.css index 039cf11..7fafbb1 100644 --- a/doc/lua.css +++ b/doc/lua.css @@ -1,17 +1,37 @@ body { color: #000000 ; background-color: #FFFFFF ; - font-family: sans-serif ; + font-family: Helvetica, Arial, sans-serif ; text-align: justify ; - margin-right: 20px ; - margin-left: 20px ; + margin-right: 30px ; + margin-left: 30px ; } h1, h2, h3, h4 { + font-family: Verdana, Geneva, sans-serif ; font-weight: normal ; font-style: italic ; } +h2 { + padding-top: 0.4em ; + padding-bottom: 0.4em ; + padding-left: 30px ; + padding-right: 30px ; + margin-left: -30px ; + background-color: #E0E0FF ; +} + +h3 { + padding-left: 0.5em ; + border-left: solid #E0E0FF 1em ; +} + +table h3 { + padding-left: 0px ; + border-left: none ; +} + a:link { color: #000080 ; background-color: inherit ; @@ -39,3 +59,25 @@ hr { background-color: #a0a0a0 ; } +:target { + background-color: #F8F8F8 ; + padding: 8px ; + border: solid #a0a0a0 2px ; +} + +.footer { + color: gray ; + font-size: small ; +} + +input[type=text] { + border: solid #a0a0a0 2px ; + border-radius: 2em ; + -moz-border-radius: 2em ; + background-image: url('images/search.png') ; + background-repeat: no-repeat; + background-position: 4px center ; + padding-left: 20px ; + height: 2em ; +} + diff --git a/doc/manual.css b/doc/manual.css index eed5afd..b49b362 100644 --- a/doc/manual.css +++ b/doc/manual.css @@ -1,13 +1,24 @@ h3 code { font-family: inherit ; + font-size: inherit ; } -pre { - font-size: 105% ; +pre, code { + font-size: 12pt ; } span.apii { float: right ; font-family: inherit ; + font-style: normal ; + font-size: small ; + color: gray ; } +p+h1, ul+h1 { + padding-top: 0.4em ; + padding-bottom: 0.4em ; + padding-left: 30px ; + margin-left: -30px ; + background-color: #E0E0FF ; +} diff --git a/doc/manual.html b/doc/manual.html index f46f17c..4e41683 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,9 +19,9 @@ Lua 5.1 Reference Manual by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes

-Copyright © 2006-2008 Lua.org, PUC-Rio. +Copyright © 2006–2012 Lua.org, PUC-Rio. Freely available under the terms of the -Lua license. +Lua license.

@@ -29,11 +29,13 @@ Freely available under the terms of the contents · index +· +other versions

- + @@ -5645,7 +5647,7 @@ Currently, Lua has the following standard libraries: