Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/lua/dist/doc update docs after conflict resolution
details: https://anonhg.NetBSD.org/src/rev/77482261a9a7
branches: trunk
changeset: 340879:77482261a9a7
user: mbalmer <mbalmer%NetBSD.org@localhost>
date: Thu Oct 08 12:46:20 2015 +0000
description:
update docs after conflict resolution
diffstat:
external/mit/lua/dist/doc/contents.html | 37 +-
external/mit/lua/dist/doc/lua.css | 112 +++++---
external/mit/lua/dist/doc/manual.css | 14 +-
external/mit/lua/dist/doc/manual.html | 392 ++++++++++++++++---------------
external/mit/lua/dist/doc/readme.html | 36 +-
5 files changed, 312 insertions(+), 279 deletions(-)
diffs (truncated from 1411 to 300 lines):
diff -r a408964cbf46 -r 77482261a9a7 external/mit/lua/dist/doc/contents.html
--- a/external/mit/lua/dist/doc/contents.html Thu Oct 08 12:40:05 2015 +0000
+++ b/external/mit/lua/dist/doc/contents.html Thu Oct 08 12:46:20 2015 +0000
@@ -3,35 +3,34 @@
<HEAD>
<TITLE>Lua 5.3 Reference Manual - contents</TITLE>
<LINK REL="stylesheet" TYPE="text/css" HREF="lua.css">
+<LINK REL="stylesheet" TYPE="text/css" HREF="index.css">
<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
-<STYLE TYPE="text/css">
-ul {
- list-style-type: none ;
- list-style-position: outside ;
-}
-</STYLE>
</HEAD>
<BODY>
-<HR>
<H1>
-<A HREF="http://www.lua.org/";><IMG SRC="logo.gif" ALT="" BORDER=0></A>
+<A HREF="http://www.lua.org/";><IMG SRC="logo.gif" ALT="Lua"></A>
Lua 5.3 Reference Manual
</H1>
<P>
The reference manual is the official definition of the Lua language.
+<BR>
For a complete introduction to Lua programming, see the book
<A HREF="http://www.lua.org/pil/";>Programming in Lua</A>.
-<P>
+<DIV CLASS="menubar">
<A HREF="manual.html">start</A>
·
<A HREF="#contents">contents</A>
·
<A HREF="#index">index</A>
-<HR>
+·
+<A HREF="http://www.lua.org/manual/";>other versions</A>
+</DIV>
+
+<P>
<SMALL>
Copyright © 2015 Lua.org, PUC-Rio.
Freely available under the terms of the
@@ -39,7 +38,7 @@
</SMALL>
<H2><A NAME="contents">Contents</A></H2>
-<UL style="padding: 0">
+<UL CLASS="contents menubar">
<LI><A HREF="manual.html">1 – Introduction</A>
<P>
<LI><A HREF="manual.html#2">2 – Basic Concepts</A>
@@ -136,15 +135,14 @@
</UL>
<H2><A NAME="index">Index</A></H2>
-<TABLE WIDTH="100%">
-<TR VALIGN="top">
+<TABLE CLASS="menubar" WIDTH="100%">
+<TR>
<TD>
<H3><A NAME="functions">Lua functions</A></H3>
<P>
<A HREF="manual.html#6.1">basic</A><BR>
<A HREF="manual.html#pdf-_G">_G</A><BR>
<A HREF="manual.html#pdf-_VERSION">_VERSION</A><BR>
-
<A HREF="manual.html#pdf-assert">assert</A><BR>
<A HREF="manual.html#pdf-collectgarbage">collectgarbage</A><BR>
<A HREF="manual.html#pdf-dofile">dofile</A><BR>
@@ -321,6 +319,7 @@
<A HREF="manual.html#pdf-utf8.offset">utf8.offset</A><BR>
<H3><A NAME="env">environment<BR>variables</A></H3>
+<P>
<A HREF="manual.html#pdf-LUA_CPATH">LUA_CPATH</A><BR>
<A HREF="manual.html#pdf-LUA_CPATH_5_3">LUA_CPATH_5_3</A><BR>
<A HREF="manual.html#pdf-LUA_INIT">LUA_INIT</A><BR>
@@ -546,6 +545,7 @@
<A HREF="manual.html#pdf-luaopen_utf8">luaopen_utf8</A><BR>
<H3><A NAME="constants">constants</A></H3>
+<P>
<A HREF="manual.html#pdf-LUA_ERRERR">LUA_ERRERR</A><BR>
<A HREF="manual.html#pdf-LUA_ERRFILE">LUA_ERRFILE</A><BR>
<A HREF="manual.html#pdf-LUA_ERRGCMM">LUA_ERRGCMM</A><BR>
@@ -606,13 +606,12 @@
</TR>
</TABLE>
-<HR>
-<SMALL CLASS="footer">
+<P CLASS="footer">
Last update:
-Tue Dec 9 21:26:07 BRST 2014
-</SMALL>
+Wed Jun 3 08:27:30 BRT 2015
+</P>
<!--
-Last change: updated for Lua 5.3.0 (final)
+Last change: revised for Lua 5.3.1
-->
</BODY>
diff -r a408964cbf46 -r 77482261a9a7 external/mit/lua/dist/doc/lua.css
--- a/external/mit/lua/dist/doc/lua.css Thu Oct 08 12:40:05 2015 +0000
+++ b/external/mit/lua/dist/doc/lua.css Thu Oct 08 12:46:20 2015 +0000
@@ -3,86 +3,92 @@
}
body {
+ background-color: #FFFFFF ;
+ color: #000000 ;
+ font-family: Helvetica, Arial, sans-serif ;
+ text-align: justify ;
+ line-height: 1.25 ;
+ margin: 16px auto ;
+ padding: 32px ;
border: solid #a0a0a0 1px ;
border-radius: 20px ;
- padding: 26px ;
- margin: 16px ;
- color: #000000 ;
- background-color: #FFFFFF ;
- font-family: Helvetica, Arial, sans-serif ;
- text-align: justify ;
+ max-width: 70em ;
+ width: 90% ;
}
h1, h2, h3, h4 {
+ color: #000080 ;
font-family: Verdana, Geneva, sans-serif ;
font-weight: normal ;
font-style: normal ;
+ text-align: left ;
+}
+
+h1 {
+ font-size: 28pt ;
}
-h2 {
- padding-top: 0.4em ;
- padding-bottom: 0.4em ;
- padding-left: 0.8em ;
- padding-right: 0.8em ;
- background-color: #D0D0FF ;
- border-radius: 8px ;
- border: solid #a0a0a0 1px ;
+h1 img {
+ vertical-align: text-bottom ;
}
-h3 {
- padding-left: 0.5em ;
- border-left: solid #D0D0FF 1em ;
+h2:before {
+ content: "\2756" ;
+ padding-right: 0.5em ;
}
-table h3 {
- padding-left: 0px ;
- border-left: none ;
+a {
+ text-decoration: none ;
}
a:link {
color: #000080 ;
- background-color: inherit ;
- text-decoration: none ;
-}
-
-a:visited {
- background-color: inherit ;
- text-decoration: none ;
}
a:link:hover, a:visited:hover {
+ background-color: #D0D0FF ;
color: #000080 ;
- background-color: #D0D0FF ;
- border-radius: 4px;
+ border-radius: 4px ;
}
a:link:active, a:visited:active {
color: #FF0000 ;
}
-h1 a img {
- vertical-align: text-bottom ;
+div.menubar {
+ padding-bottom: 0.5em ;
+}
+
+p.menubar {
+ margin-left: 2.5em ;
+}
+
+.menubar a:hover {
+ margin: -3px -3px -3px -3px ;
+ padding: 3px 3px 3px 3px ;
+ border-radius: 4px ;
+}
+
+:target {
+ background-color: #F0F0F0 ;
+ margin: -8px ;
+ padding: 8px ;
+ border-radius: 8px ;
+ outline: none ;
}
hr {
- border: 0 ;
- height: 1px ;
- color: #a0a0a0 ;
- background-color: #a0a0a0 ;
display: none ;
}
table hr {
+ background-color: #a0a0a0 ;
+ color: #a0a0a0 ;
+ border: 0 ;
+ height: 1px ;
display: block ;
}
-:target {
- background-color: #F8F8F8 ;
- padding: 8px ;
- border: solid #a0a0a0 2px ;
- border-radius: 8px ;
-}
-
.footer {
color: gray ;
font-size: x-small ;
@@ -103,3 +109,25 @@
padding: 1em ;
border-radius: 8px ;
}
+
+td.gutter {
+ width: 4% ;
+}
+
+table.columns {
+ border: none ;
+ border-spacing: 0 ;
+ border-collapse: collapse ;
+}
+
+table.columns td {
+ vertical-align: top ;
+ padding: 0 ;
+ padding-bottom: 1em ;
+ text-align: justify ;
+ line-height: 1.25 ;
+}
+
+p.logos a:link:hover, p.logos a:visited:hover {
+ background-color: inherit ;
+}
diff -r a408964cbf46 -r 77482261a9a7 external/mit/lua/dist/doc/manual.css
--- a/external/mit/lua/dist/doc/manual.css Thu Oct 08 12:40:05 2015 +0000
+++ b/external/mit/lua/dist/doc/manual.css Thu Oct 08 12:46:20 2015 +0000
@@ -8,20 +8,14 @@
}
span.apii {
+ color: gray ;
float: right ;
font-family: inherit ;
font-style: normal ;
font-size: small ;
- color: gray ;
}
-p+h1, ul+h1 {
- font-style: normal ;
- padding-top: 0.4em ;
- padding-bottom: 0.4em ;
- padding-left: 16px ;
- margin-left: -16px ;
- background-color: #D0D0FF ;
- border-radius: 8px ;
- border: solid #000080 1px ;
+h2:before {
+ content: "" ;
+ padding-right: 0em ;
Home |
Main Index |
Thread Index |
Old Index