diff options
Diffstat (limited to 'manual')
| -rwxr-xr-x | manual/2html | 7 | ||||
| -rw-r--r-- | manual/manual.of | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/manual/2html b/manual/2html index 243f3f22..23f37ac6 100755 --- a/manual/2html +++ b/manual/2html | |||
| @@ -58,7 +58,7 @@ end | |||
| 58 | 58 | ||
| 59 | local function compose (f,g) | 59 | local function compose (f,g) |
| 60 | assert(f and g) | 60 | assert(f and g) |
| 61 | return function (s) return g(f(s)) end | 61 | return function (...) return g(f(...)) end |
| 62 | end | 62 | end |
| 63 | 63 | ||
| 64 | local function concat (f, g) | 64 | local function concat (f, g) |
| @@ -395,9 +395,10 @@ APIEntry = function (e) | |||
| 395 | local apiicmd, ne = string.match(e, "^(.-</span>)(.*)") | 395 | local apiicmd, ne = string.match(e, "^(.-</span>)(.*)") |
| 396 | --io.stderr:write(e) | 396 | --io.stderr:write(e) |
| 397 | if not apiicmd then | 397 | if not apiicmd then |
| 398 | return antipara(Tag.hr() .. Tag.h3(a)) .. Tag.pre(h) .. e | 398 | return antipara(Tag.hr() .. Tag.h3(a)) .. Tag.pre(h, {class="api"}) .. e |
| 399 | else | 399 | else |
| 400 | return antipara(Tag.hr() .. Tag.h3(a)) .. apiicmd .. Tag.pre(h) .. ne | 400 | return antipara(Tag.hr() .. Tag.h3(a)) .. apiicmd .. |
| 401 | Tag.pre(h, {class="api"}) .. ne | ||
| 401 | end | 402 | end |
| 402 | end, | 403 | end, |
| 403 | 404 | ||
diff --git a/manual/manual.of b/manual/manual.of index 426ad453..e2d1a651 100644 --- a/manual/manual.of +++ b/manual/manual.of | |||
| @@ -1728,7 +1728,7 @@ global X <const>, _G | |||
| 1728 | X = 1 -- ERROR | 1728 | X = 1 -- ERROR |
| 1729 | _ENV.X = 1 -- Ok | 1729 | _ENV.X = 1 -- Ok |
| 1730 | _G.print(X) -- Ok | 1730 | _G.print(X) -- Ok |
| 1731 | foo() -- 'foo' can freely change any global | 1731 | foo() -- 'foo' can freely change any global |
| 1732 | } | 1732 | } |
| 1733 | 1733 | ||
| 1734 | A chunk is also a block @see{chunks}, | 1734 | A chunk is also a block @see{chunks}, |
| @@ -6071,6 +6071,14 @@ In both cases, | |||
| 6071 | the function pushes onto the stack the final value associated | 6071 | the function pushes onto the stack the final value associated |
| 6072 | with @id{tname} in the registry. | 6072 | with @id{tname} in the registry. |
| 6073 | 6073 | ||
| 6074 | Usage note: Beware the use of the return value of this function to | ||
| 6075 | conditionally initializes the new metatable | ||
| 6076 | (e.g., by adding metamethods to it). | ||
| 6077 | If the initialization raises an error, | ||
| 6078 | the metatable will not be properly initialized, | ||
| 6079 | but a subsequent execution of that code will detect that the | ||
| 6080 | metatable already exists and then skip the initialization. | ||
| 6081 | |||
| 6074 | } | 6082 | } |
| 6075 | 6083 | ||
| 6076 | @APIEntry{lua_State *luaL_newstate (void);| | 6084 | @APIEntry{lua_State *luaL_newstate (void);| |
