X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=doc%2Freference%2Freference.xml;h=cd2344821a3ae73408cd894867c03b4075628db1;hb=bcbccfdf9fca3f3970771f9d0ce25d7221e2904e;hp=844bad61a0c47f32acdb2934b9b50da2990b53cc;hpb=ff2b086d176f8b2323bfd73fb4830cd237b7fa6c;p=org.ibex.core.git

diff --git a/doc/reference/reference.xml b/doc/reference/reference.xml
index 844bad6..cd23448 100644
--- a/doc/reference/reference.xml
+++ b/doc/reference/reference.xml
@@ -240,6 +240,7 @@
 
   <section title="Static Code">
 
+v v v v v v v
     If the root [[&lt;ibex&gt;]] element contains any non-whitespace
     text content, this text is interpreted as JavaScript code and is
     executed the first time the template is referenced.  This code is
@@ -255,6 +256,28 @@
       and written) from both static scripts as well as instance
       scripts in a particular template. FIXME
       </definition>
+*************
+v v v v v v v
+    If the root <t>&lt;ibex&gt;</t> element contains any non-whitespace
+    text content, this text is interpreted as JavaScript code and is
+    executed the first time the template is referenced.  This code is
+    executed in a fresh scope containing two predefined properties:
+  
+    <definition term="ibex">
+      The Ibex Object (described in <ref section="The Ibex Object"/>)
+      </definition>
+  
+    <definition term="static">
+      A reference to this template's <i>static object</i>, which is
+      initially <t>null</t>.  The static object can be accessed (read
+      and written) from both static scripts as well as instance
+      scripts in a particular template. FIXME
+      </definition>
+*************
+<!-- _______________________________________________________________________ -->
+<section title="Layout and Rendering">
+^ ^ ^ ^ ^ ^ ^
+^ ^ ^ ^ ^ ^ ^
 
     </section>
   
@@ -402,8 +425,6 @@
 <!-- ----------------------------------------------------------------------- -->
 <section title="Layout and Rendering">
 
-    <section title="Visual Components">
-  
       Each box occupies a rectangular region on the surface.  The visual
       appearance of a surface is created by rendering each box in its tree.
       Unless the [[clip]] attribute is [[false]], each box will
@@ -459,9 +480,6 @@
       These eight components plus the size of a box fully specify its
       appearance.  Every single box you see in Ibex is drawn only on the
       basis of these components and its size.
-    </section>  
-
-    <section title="Size and Position">
 
       The size and position of every box is determined by its
       properties, its childrens' sizes, and its parent's size and
@@ -495,8 +513,6 @@
       resizing the surface at all.  However, not all platforms give Ibex
       enough control to do this.
       
-      <image url="alignmentpoint.pdf" caption="The effect of alignment points on layout" width="3in"/>
-
     <heading title="The alignment point"/>
   
       When talking about positioning, we will often refer to the
@@ -547,9 +563,6 @@
           <ui:box id="4" />
           <ui:box id="5" colspan="2" />
       </ui:box>
-
-
-
       </pre>
       
       </section>
@@ -582,7 +595,14 @@
 
     <section title="Placing">
   
-      <section title="Packed Boxes">
+      <heading title="Non-Packed Boxes"/>
+
+      Each non-packed box is transformed according to the parent's
+      [[transform]] property and then positioned so that its alignment
+      point is [[(child.x, child.y)]] pixels from the corresponding
+      edge/corner/center of its parent.
+
+      <heading title="Packed Boxes"/>
 
       Ibex formulates a set of constraints for placing a box's
       **packed** children as follows:
@@ -615,14 +635,6 @@
       does not (due to [[maxwidth]] or minimum width constraints), the
       box's will be placed so that its alignment point coincides with
       the alignment point of that rectangle of cells.
-      </section>
-
-      <section title="Non-Packed Boxes">
-      Each non-packed box is transformed according to the parent's
-      [[transform]] property and then positioned so that its alignment
-      point is [[(child.x, child.y)]] pixels from the corresponding
-      edge/corner/center of its parent.
-      </section>
 
   </section>
   
@@ -663,8 +675,7 @@
     </list>
     
     </section>
-
-  </section>
+</section>
 
 <!-- ----------------------------------------------------------------------- -->
 <section title="Box Properties">