add some style to our guides ;)

diff --git a/docs/adk15ProgGuideDB/annotations.xml b/docs/adk15ProgGuideDB/annotations.xml
index 83f3311d73e24b828fda83cde90913a596c3852a..2cde28bef75d5eca0b89e5fd12842ab1e6d5a688 100644 (file)
--- a/docs/adk15ProgGuideDB/annotations.xml
+++ b/docs/adk15ProgGuideDB/annotations.xml
@@ -341,47 +341,65 @@
       
       <para>Some examples of annotation patterns follow:</para>    
 
-      <programlisting><![CDATA[
-      @Immutable
-      ]]></programlisting>
-
-      <para>Matches any annotated element which has an annotation of 
-      type <literal>Immutable</literal>.</para>
-
-      <programlisting><![CDATA[
-      !@Persistent
-      ]]></programlisting>
+       <variablelist>
 
-      <para>Matches any annotated element which does not have an annotation of 
-      type <literal>Persistent</literal>.</para>
-
-      <programlisting><![CDATA[
-      @Foo @Goo
-      ]]></programlisting>
-
-      <para>Matches any annotated element which has both an annotation of type <literal>Foo</literal> and
-      an annotation of type <literal>Goo</literal>.</para>
+        <varlistentry>
+          <term>@Immutable</term>
+          <listitem>
+            <para>
+               Matches any annotated element which has an annotation of 
+                       type <literal>Immutable</literal>.
+            </para>
+          </listitem>
+        </varlistentry>
 
-      <programlisting><![CDATA[
-      @(Foo || Goo)
-      ]]></programlisting>
+        <varlistentry>
+          <term>!@Persistent</term>
+          <listitem>
+            <para>
+                               Matches any annotated element which does not have an annotation of 
+                       type <literal>Persistent</literal>.
+            </para>
+          </listitem>
+        </varlistentry>
 
-      <para>Matches any annotated element which has either an annotation of a type matching
-      the type pattern <literal>(Foo || Goo)</literal>. 
-      In other words, an annotated element with either an
-      annotation of type <literal>Foo</literal> or
-      an annotation of type <literal>Goo</literal> (or both). (The parenthesis are required in this example).
-      </para>
+        <varlistentry>
+          <term>@Foo @Goo</term>
+          <listitem>
+            <para>
+                               Matches any annotated element which has both an annotation of type <literal>Foo</literal> and
+                       an annotation of type <literal>Goo</literal>.
+            </para>
+          </listitem>
+        </varlistentry>
 
-      <programlisting><![CDATA[
-      @(org.xyz..*)
-      ]]></programlisting>
+        <varlistentry>
+          <term>@(Foo || Goo)</term>
+          <listitem>
+            <para>
+                                 Matches any annotated element which has either an annotation of a type matching
+                             the type pattern <literal>(Foo || Goo)</literal>. 
+                             In other words, an annotated element with either an
+                             annotation of type <literal>Foo</literal> or
+                             an annotation of type <literal>Goo</literal> (or both). (The parenthesis are required in this example).
+            </para>
+          </listitem>
+        </varlistentry>
 
-      <para>Matches any annotated element which has either an annotation of a type matching
-      the type pattern <literal>(org.xyz..*)</literal>. 
-      In other words, an annotated element with an annotation that is declared in the
-      org.xyz package or a sub-package. (The parenthesis are required in this example).</para>
+        <varlistentry>
+          <term>@(org.xyz..*)</term>
+          <listitem>
+            <para>
+                     Matches any annotated element which has either an annotation of a type matching
+                     the type pattern <literal>(org.xyz..*)</literal>. 
+                     In other words, an annotated element with an annotation that is declared in the
+                     org.xyz package or a sub-package. (The parenthesis are required in this example).
+            </para>
+          </listitem>
+        </varlistentry>
 
+       </variablelist>
+    
   </sect2>
   
   <sect2>
@@ -425,64 +443,83 @@
                patterns:
        </para>
 
-     <programlisting><![CDATA[
-     (@Immutable *)
-     ]]></programlisting>
+  <variablelist>
 
-     <para>Matches any type with an <literal>@Immutable</literal> annotation.</para>
+        <varlistentry>
+          <term>(@Immutable *)</term>
+          <listitem>
+            <para>
+               Matches any type with an <literal>@Immutable</literal> annotation.
+            </para>
+          </listitem>
+        </varlistentry>
 
-     <programlisting><![CDATA[
-     (!@Immutable *)
-     ]]></programlisting>
+        <varlistentry>
+          <term>(!@Immutable *)</term>
+          <listitem>
+            <para>
+               Matches any type which does not have an <literal>@Immutable</literal> annotation.
+            </para>
+          </listitem>
+        </varlistentry>
 
-     <para>Matches any type which does not have an <literal>@Immutable</literal> annotation.</para>
+        <varlistentry>
+          <term>  (@Immutable (org.xyz.* || org.abc.*))</term>
+          <listitem>
+            <para>
+               Matches any type in the <literal>org.xyz</literal> or <literal>org.abc</literal>
+                           packages with the <literal>@Immutable</literal> annotation.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>((@Immutable Foo+) || Goo)</term>
+          <listitem>
+            <para>
+               Matches a type <literal>Foo</literal> or any of its subtypes, which have the <literal>@Immutable</literal>
+                       annotation, or a type <literal>Goo</literal>.
+            </para>
+          </listitem>
+        </varlistentry>
 
-     <programlisting><![CDATA[
-     (@Immutable (org.xyz.* || org.abc.*))
-     ]]></programlisting>
+        <varlistentry>
+          <term>((@(Immutable || NonPersistent) org.xyz..*)</term>
+          <listitem>
+            <para>
+               Matches any type in a package beginning with the prefix <literal>org.xyz</literal>,
+                       which has either the <literal>@Immutable</literal> annotation or the
+                       <literal>@NonPersistent</literal> annotation.                   
+            </para>
+          </listitem>
+        </varlistentry>
 
-     <para>Matches any type in the <literal>org.xyz</literal> or <literal>org.abc</literal>
-     packages with the <literal>@Immutable</literal> annotation.</para>
+        <varlistentry>
+          <term>(@Immutable @NonPersistent org.xyz..*)</term>
+          <listitem>
+            <para>
+                Matches any type in a package beginning with the prefix <literal>org.xyz</literal>,
+                            which has both an <literal>@Immutable</literal> annotation and an
+                            <literal>@NonPersistent</literal> annotation.
+            </para>
+          </listitem>
+        </varlistentry>
 
-     <programlisting><![CDATA[
-     ((@Immutable Foo+) || Goo)
-     ]]></programlisting>
+        <varlistentry>
+          <term>  (@(@Inherited *) org.xyz..*)</term>
+          <listitem>
+            <para>
+               Matches any type in a package beginning with the prefix <literal>org.xyz</literal>,
+                            which has an inheritable annotation. The annotation pattern 
+                            <literal>@(@Inherited *)</literal> matches any annotation of a type matching the
+                            type pattern <literal>@Inherited *</literal>, which in turn matches any type with the
+                            <literal>@Inherited</literal> annotation.
+            </para>
+          </listitem>
+        </varlistentry>
 
-     <para>Matches a type <literal>Foo</literal> or any of its subtypes, which have the <literal>@Immutable</literal>
-     annotation, or a type <literal>Goo</literal>.</para>
-     
-     <programlisting><![CDATA[
-     ((@(Immutable || NonPersistent) org.xyz..*)
-     ]]></programlisting>
-
-     <para>
-     Matches any type in a package beginning with the prefix <literal>org.xyz</literal>,
-     which has either the <literal>@Immutable</literal> annotation or the
-     <literal>@NonPersistent</literal> annotation.
-     </para>
-
-     <programlisting><![CDATA[
-     (@Immutable @NonPersistent org.xyz..*)
-     ]]></programlisting>
-
-     <para>
-     Matches any type in a package beginning with the prefix <literal>org.xyz</literal>,
-     which has both an <literal>@Immutable</literal> annotation and an
-     <literal>@NonPersistent</literal> annotation.
-     </para>
-     
-     <programlisting><![CDATA[
-     (@(@Inherited *) org.xyz..*)
-     ]]></programlisting>
-
-     <para>
-     Matches any type in a package beginning with the prefix <literal>org.xyz</literal>,
-     which has an inheritable annotation. The annotation pattern 
-     <literal>@(@Inherited *)</literal> matches any annotation of a type matching the
-     type pattern <literal>@Inherited *</literal>, which in turn matches any type with the
-     <literal>@Inherited</literal> annotation.
-     </para>
-     
+  </variablelist>
+       
   </sect2>
   
   <sect2 id="signaturePatterns" xreflabel="Signature Patterns">

diff --git a/docs/adk15ProgGuideDB/aspectj-docs.css b/docs/adk15ProgGuideDB/aspectj-docs.css
new file mode 100644 (file)
index 0000000..3f58ddb
--- /dev/null
+++ b/docs/adk15ProgGuideDB/aspectj-docs.css
@@ -0,0 +1,83 @@
+body { 
+  font-family: "Lucida Grande", "Trebuchet MS", sans-serif;
+  line-height: 1.1em;
+ }
+
+h2 { 
+     font-size: 130%; 
+     font-weight: bold ; 
+     line-height: 16px;
+     color: #FFFFFF;
+     background-color: #0080C0;
+     padding: 5px;
+}
+
+h3 { 
+     font-size: 110%; 
+     font-weight: bold ; 
+     line-height: 14px;
+     color: #FFFFFF;
+     background-color: orange;
+     padding: 5px;
+}
+
+tt { 
+  font-size: 120%;
+  color: #0080C0;
+ }
+
+tt tt { 
+  font-size: 100%;
+ }
+
+.programlisting {
+  padding-top: 5px; 
+  border: 2px solid #ccc;
+  background: #eee;
+  font-size: 120%;
+  color: #111199;
+
+ }
+
+.term { 
+  color: #111199;
+ }
+
+.variablelist dd { 
+  margin-left: 18px;
+  padding-left: 20px;
+  background: url(dd_arrow.gif) no-repeat 0 2px;
+ }
+
+.toc dt { 
+  font-size: 110%;
+  padding-bottom: 0px;
+  margin-bottom: 5px;
+ }
+
+.toc dl dd dt { 
+  font-size: 100%;
+ }
+
+.toc dt { 
+  font-size: 100%
+  margin-bottom: 0;
+ }
+
+.informaltable table { 
+  margin-left: 5%;
+ }
+
+.informaltable th { 
+  background-color: orange;
+  padding: 1px;
+ }
+
+ul li { 
+  line-height: 1.2em; 
+ }
+
+.keyword { 
+  font-weight: bold;
+  color: purple;
+ }
\ No newline at end of file

diff --git a/docs/adk15ProgGuideDB/dd_arrow.gif b/docs/adk15ProgGuideDB/dd_arrow.gif
new file mode 100644 (file)
index 0000000..a16b34c
Binary files /dev/null and b/docs/adk15ProgGuideDB/dd_arrow.gif differ

diff --git a/docs/adk15ProgGuideDB/reflection.xml b/docs/adk15ProgGuideDB/reflection.xml
index a412ab86e41878ee58a954b563a93d917a9856a0..9afde22c4423885f1fc83d6d486a507eafaf0b48 100644 (file)
--- a/docs/adk15ProgGuideDB/reflection.xml
+++ b/docs/adk15ProgGuideDB/reflection.xml
@@ -2,5 +2,18 @@
 
   <title>New Reflection Interfaces</title>
   
+  <para>
+      AspectJ 5 provides support for runtime reflection of aspect types. The class <literal>Aspect</literal> is
+      analogous to the Java class <literal>Class</literal> and provides access to the members of an aspect. 
+  </para>
+  
+   <sect1 id="reflection_api">
+    <title>The Aspect Class</title>
+       <para>
+           
+       </para>
+       
+  </sect1>
+  
 </chapter>
 

diff --git a/docs/build.xml b/docs/build.xml
index 814a7f6d00b370b40943a99454d23279b0295197..9dff6c8366f83508046fbae70121fd6478299ede 100644 (file)
--- a/docs/build.xml
+++ b/docs/build.xml
@@ -269,6 +269,8 @@
         <antcall target="build-guide">
             <param name="guide.dir" value="progGuideDB" />
             <param name="guide.name" value="progguide" />
+                 <param name="xml-html-copy"
+                           value="dd_arrow.gif,aspects.gif,figureUML.gif,overview.gif,telecom.gif,aspectj-docs.css"/>       
         </antcall>
     </target>
 
@@ -276,6 +278,8 @@
         <antcall target="build-guide">
             <param name="guide.dir" value="adk15ProgGuideDB" />
             <param name="guide.name" value="adk15notebook" />
+                   <param name="xml-html-copy"
+                   value="dd_arrow.gif,aspectj-docs.css"/>       
         </antcall>
     </target>
 
@@ -298,7 +302,7 @@
 
         <antcall target="build-guide">
             <param name="xml-html-copy"
-                   value="ajbrowser-building.gif,ajbrowser-options.gif,${include.devguide.icons}"
+                   value="dd_arrow.gif,aspectj-docs.css,ajbrowser-building.gif,ajbrowser-options.gif,${include.devguide.icons}"
             />
             <param name="guide.dir" value="devGuideDB" />
             <param name="guide.name" value="devguide" />

diff --git a/docs/devGuideDB/aspectj-docs.css b/docs/devGuideDB/aspectj-docs.css
new file mode 100644 (file)
index 0000000..3f58ddb
--- /dev/null
+++ b/docs/devGuideDB/aspectj-docs.css
@@ -0,0 +1,83 @@
+body { 
+  font-family: "Lucida Grande", "Trebuchet MS", sans-serif;
+  line-height: 1.1em;
+ }
+
+h2 { 
+     font-size: 130%; 
+     font-weight: bold ; 
+     line-height: 16px;
+     color: #FFFFFF;
+     background-color: #0080C0;
+     padding: 5px;
+}
+
+h3 { 
+     font-size: 110%; 
+     font-weight: bold ; 
+     line-height: 14px;
+     color: #FFFFFF;
+     background-color: orange;
+     padding: 5px;
+}
+
+tt { 
+  font-size: 120%;
+  color: #0080C0;
+ }
+
+tt tt { 
+  font-size: 100%;
+ }
+
+.programlisting {
+  padding-top: 5px; 
+  border: 2px solid #ccc;
+  background: #eee;
+  font-size: 120%;
+  color: #111199;
+
+ }
+
+.term { 
+  color: #111199;
+ }
+
+.variablelist dd { 
+  margin-left: 18px;
+  padding-left: 20px;
+  background: url(dd_arrow.gif) no-repeat 0 2px;
+ }
+
+.toc dt { 
+  font-size: 110%;
+  padding-bottom: 0px;
+  margin-bottom: 5px;
+ }
+
+.toc dl dd dt { 
+  font-size: 100%;
+ }
+
+.toc dt { 
+  font-size: 100%
+  margin-bottom: 0;
+ }
+
+.informaltable table { 
+  margin-left: 5%;
+ }
+
+.informaltable th { 
+  background-color: orange;
+  padding: 1px;
+ }
+
+ul li { 
+  line-height: 1.2em; 
+ }
+
+.keyword { 
+  font-weight: bold;
+  color: purple;
+ }
\ No newline at end of file

diff --git a/docs/devGuideDB/dd_arrow.gif b/docs/devGuideDB/dd_arrow.gif
new file mode 100644 (file)
index 0000000..a16b34c
Binary files /dev/null and b/docs/devGuideDB/dd_arrow.gif differ

diff --git a/docs/progGuideDB/aspectj-docs.css b/docs/progGuideDB/aspectj-docs.css
new file mode 100644 (file)
index 0000000..3f58ddb
--- /dev/null
+++ b/docs/progGuideDB/aspectj-docs.css
@@ -0,0 +1,83 @@
+body { 
+  font-family: "Lucida Grande", "Trebuchet MS", sans-serif;
+  line-height: 1.1em;
+ }
+
+h2 { 
+     font-size: 130%; 
+     font-weight: bold ; 
+     line-height: 16px;
+     color: #FFFFFF;
+     background-color: #0080C0;
+     padding: 5px;
+}
+
+h3 { 
+     font-size: 110%; 
+     font-weight: bold ; 
+     line-height: 14px;
+     color: #FFFFFF;
+     background-color: orange;
+     padding: 5px;
+}
+
+tt { 
+  font-size: 120%;
+  color: #0080C0;
+ }
+
+tt tt { 
+  font-size: 100%;
+ }
+
+.programlisting {
+  padding-top: 5px; 
+  border: 2px solid #ccc;
+  background: #eee;
+  font-size: 120%;
+  color: #111199;
+
+ }
+
+.term { 
+  color: #111199;
+ }
+
+.variablelist dd { 
+  margin-left: 18px;
+  padding-left: 20px;
+  background: url(dd_arrow.gif) no-repeat 0 2px;
+ }
+
+.toc dt { 
+  font-size: 110%;
+  padding-bottom: 0px;
+  margin-bottom: 5px;
+ }
+
+.toc dl dd dt { 
+  font-size: 100%;
+ }
+
+.toc dt { 
+  font-size: 100%
+  margin-bottom: 0;
+ }
+
+.informaltable table { 
+  margin-left: 5%;
+ }
+
+.informaltable th { 
+  background-color: orange;
+  padding: 1px;
+ }
+
+ul li { 
+  line-height: 1.2em; 
+ }
+
+.keyword { 
+  font-weight: bold;
+  color: purple;
+ }
\ No newline at end of file

diff --git a/docs/progGuideDB/dd_arrow.gif b/docs/progGuideDB/dd_arrow.gif
new file mode 100644 (file)
index 0000000..a16b34c
Binary files /dev/null and b/docs/progGuideDB/dd_arrow.gif differ

diff --git a/docs/progGuideDB/semantics.xml b/docs/progGuideDB/semantics.xml
index b04f5a9aa159c01c49f061c66d9a4270340aeb39..cf5740fde6c22e94bb9eb4624710ddf4a2787c58 100644 (file)
--- a/docs/progGuideDB/semantics.xml
+++ b/docs/progGuideDB/semantics.xml
@@ -209,14 +209,15 @@
 
     <informaltable frame="1">
       <tgroup cols="4" align="left">
-        <tbody valign="top">
+        <thead valign="top">
           <row>
             <entry><emphasis role="bold">Join Point</emphasis></entry>
             <entry><emphasis role="bold">Current Object</emphasis></entry>
             <entry><emphasis role="bold">Target Object</emphasis></entry>
             <entry><emphasis role="bold">Arguments</emphasis></entry>
           </row>
-
+       </thead>   
+       <tbody>
           <row>
             <entry>Method Call</entry>
             <entry>executing object*</entry>

diff --git a/lib/docbook/docbook-xsl/html/param.xsl b/lib/docbook/docbook-xsl/html/param.xsl
index 4851478a7b10ab3a9896b566a0a635dc14c6e412..9bffb49669fac80ea0ffa78d474bdd841c189142 100644 (file)
--- a/lib/docbook/docbook-xsl/html/param.xsl
+++ b/lib/docbook/docbook-xsl/html/param.xsl
@@ -86,7 +86,7 @@ is suppressed.
 </doc:param>\r
 \r
 <!-- ==================================================================== -->\r
-<xsl:param name="html.stylesheet" select="''" doc:type='string'/>\r
+<xsl:param name="html.stylesheet" doc:type='string'>aspectj-docs.css</xsl:param>\r
 \r
 <doc:param name="html.stylesheet" xmlns="">\r
 <refpurpose>Name of the stylesheet to use in the generated HTML</refpurpose>\r