# HG changeset patch
# User beckerjc
# Date 1078405697 0
# Node ID 7309f1b3fc47478850f34d92fcba71dd4c6578c1
# Parent  37407947454f953de9afd89266f453153e424cab
.

diff -r 37407947454f -r 7309f1b3fc47 doc-docbook/src/Makefile
--- a/doc-docbook/src/Makefile	Thu Mar 04 13:01:53 2004 +0000
+++ b/doc-docbook/src/Makefile	Thu Mar 04 13:08:17 2004 +0000
@@ -3,7 +3,7 @@
 .PHONY: html dvi ps pdf tex dist
 
 html:
-	docbook2html -o html -d etik-ol-html.dsl xml/etik-ol.xml
+	docbook2html -o ../html -d etik-ol-html.dsl xml/etik-ol.xml
 
 dvi:
 	docbook2dvi -o .. xml/etik-ol.xml
diff -r 37407947454f -r 7309f1b3fc47 doc-docbook/src/etik-ol-html.dsl
--- a/doc-docbook/src/etik-ol-html.dsl	Thu Mar 04 13:01:53 2004 +0000
+++ b/doc-docbook/src/etik-ol-html.dsl	Thu Mar 04 13:08:17 2004 +0000
@@ -6,8 +6,25 @@
 <style-specification use="docbook">
 <style-specification-body>
 
+(define x "25")
+(define nnl (named-node-list-names (attributes current-node)))
+(define attributumok (attributes current-node))
+
+
 (element etik:class
-            (process-children))
+  (make sequence
+          (if (attribute-string "id")
+              (make element gi: "A"
+                    attributes: (list (list "NAME" (attribute-string "id")))
+                    (empty-sosofo))
+              (empty-sosofo))
+	  
+
+	  (if (attribute-string "xreflabel") (empty-sosofo)
+	      ( literal "ures xreflabel"))
+
+;;    (toc-entry (current-node))
+    (process-children)))
 
 (element (etik:class etik:name)
   (make element gi: "H2"
@@ -95,11 +112,61 @@
 	    (make element gi: "TH"  (literal "Description"))
 	    (process-children)))))
 
+(element (etik:class etik:prot_members)
+  (make sequence
+    (make element gi: "H3"
+	  (literal "Protected members"))
+    (make element gi: "TABLE"
+	  attributes: (list
+		       (list "CELLSPACING" "1")
+		       (list "BORDER" "1"))
+ 	  (make element gi: "TR"
+	    (make element gi: "TH"  (literal "Name"))
+	    (make element gi: "TH"  (literal "Where defined"))
+	    (make element gi: "TH"  (literal "Description"))
+	    (process-children)))))
+
+(element (etik:prot_members etik:member)  
+  (make element gi: "TR"
+	  (process-children)))
+
+(element (etik:class etik:priv_members)
+  (make sequence
+    (make element gi: "H3"
+	  (literal "Private members"))
+    (make element gi: "TABLE"
+	  attributes: (list
+		       (list "CELLSPACING" "1")
+		       (list "BORDER" "1"))
+ 	  (make element gi: "TR"
+	    (make element gi: "TH"  (literal "Name"))
+	    (make element gi: "TH"  (literal "Where defined"))
+	    (make element gi: "TH"  (literal "Description"))
+	    (process-children)))))
+
+(element (etik:priv_members etik:member)  
+  (make element gi: "TR"
+	  (process-children)))
+
 (element (etik:example etik:code)
   ($verbatim-display$
    #f   ;; mivel indentaljon
    #f)) ;; legyen-e sorszamozas
 
+(element (etik:class etik:notes)  
+  (make sequence
+    (make element gi: "H3"
+	  (literal "Notes"))
+    (make element gi: "P"
+	  (process-children))))
+
+(element (etik:class etik:category)
+  (make sequence
+    (make element gi: "H3"
+	  (literal "Category"))
+    (make element gi: "P"
+	  (process-children))))
+
 
 </style-specification-body>
 </style-specification>
diff -r 37407947454f -r 7309f1b3fc47 doc-docbook/src/etik-ol.dtd
--- a/doc-docbook/src/etik-ol.dtd	Thu Mar 04 13:01:53 2004 +0000
+++ b/doc-docbook/src/etik-ol.dtd	Thu Mar 04 13:08:17 2004 +0000
@@ -6,7 +6,8 @@
 <!ENTITY % local.sect3.class "|etik:class">
 
 <!-- load DocBook -->                               
-<!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN">
+<!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "docbook/dtd/4.2/docbookx.dtd">
 %DocBookDTD;
 
 
@@ -14,18 +15,26 @@
           etik:name,
           etik:category?,
           etik:description,
-          etik:example,
+          etik:example?,
           etik:definition,
           etik:template_params?,
           etik:members?,
-          etik:notes*)>
+          etik:prot_members?,
+          etik:priv_members?,
+          etik:notes?)>
+
+<!ATTLIST etik:class
+          %common.attrib;
+          %label.attrib;
+>
+
 <!ELEMENT etik:name           (#PCDATA)*>
 <!ELEMENT etik:category       (#PCDATA|xref)*>
 <!ELEMENT etik:description    (#PCDATA|para|xref)*>
 <!ELEMENT etik:example        (#PCDATA|para|programlisting|xref|etik:code)*>
 
 
-<!ELEMENT etik:code             CDATA>
+<!ELEMENT etik:code            (#PCDATA)*>
 
 <!ELEMENT etik:definition     (#PCDATA|xref)*>
 
@@ -36,22 +45,24 @@
                                 etik:templ_requirement,
                                 etik:templ_default)>
 
-<!ELEMENT etik:templ_name                  CDATA>
+<!ELEMENT etik:templ_name                  (#PCDATA)*>
 <!ELEMENT etik:templ_description           (#PCDATA|xref)*>
 <!ELEMENT etik:templ_requirement           (#PCDATA|xref)*>
 <!ELEMENT etik:templ_default               (#PCDATA|xref)*>
 
 <!ELEMENT etik:members  (etik:member)+>
+<!ELEMENT etik:prot_members  (etik:member)+>
+<!ELEMENT etik:priv_members  (etik:member)+>
 <!ELEMENT etik:member    (etik:m_name, 
                           etik:m_where_def,
                           etik:m_description)>
 
 
-<!ELEMENT etik:m_name                    CDATA>
+<!ELEMENT etik:m_name                    (#PCDATA)*>
 <!ELEMENT etik:m_where_def               (#PCDATA|xref)*>
 <!ELEMENT etik:m_description             (#PCDATA|xref)*>
 
-<!ELEMENT etik:notes                     (#PCDATA|para|xref)*>
+<!ELEMENT etik:notes                     (#PCDATA|para|xref|orderedlist|itemizedlist)*>
 
 
 
diff -r 37407947454f -r 7309f1b3fc47 doc-docbook/src/xml/graph-classes.xml
--- a/doc-docbook/src/xml/graph-classes.xml	Thu Mar 04 13:01:53 2004 +0000
+++ b/doc-docbook/src/xml/graph-classes.xml	Thu Mar 04 13:08:17 2004 +0000
@@ -4,9 +4,14 @@
   <para>Valami leiras mondjuk a hierarchiarol, vagy barmi altalanos, ha kell.
   </para>
 
+  <section>
+    <title>Pelda osztaly</title>
     &osztaly-forma;
+  </section>
+  <section>
+    <title>Masik</title>
     &search_iterator;
-
+  </section>
 
 </chapter>
 
diff -r 37407947454f -r 7309f1b3fc47 doc-docbook/src/xml/osztaly-forma.xml
--- a/doc-docbook/src/xml/osztaly-forma.xml	Thu Mar 04 13:01:53 2004 +0000
+++ b/doc-docbook/src/xml/osztaly-forma.xml	Thu Mar 04 13:08:17 2004 +0000
@@ -1,4 +1,4 @@
-<etik:class id="haho">
+<etik:class id="haho" xreflabel="Példa osztály">
   <etik:name> 
     Osztály neve
   </etik:name>
@@ -14,7 +14,7 @@
     <para>
       A description-be kerülhet új bekezdés is többek között.
     </para>
-    <xref linkend="haho"/>
+    Egy link: <xref linkend="haho"/>
   </etik:description>
 
   <etik:example>
diff -r 37407947454f -r 7309f1b3fc47 doc-docbook/src/xml/search_iterator.xml
--- a/doc-docbook/src/xml/search_iterator.xml	Thu Mar 04 13:01:53 2004 +0000
+++ b/doc-docbook/src/xml/search_iterator.xml	Thu Mar 04 13:08:17 2004 +0000
@@ -35,10 +35,9 @@
 </programlisting>
 
 Vigyázat, a programlisting mód parsolt, és minden <![CDATA[<]]>-t értelmez!
-Előnye, hogy lehet bele linkeket csinálni, de talán kényelmesebb egy LaTeX-szerű
-verbatim-mód, ezt valósítja meg az <![CDATA[<etik:code>]]> element.
 
 <etik:code>
+<![CDATA[
   int _i=1;
   int _ii=1;
   ListGraph::EdgeMap<int> my_edge_property(G);
@@ -46,6 +45,7 @@
     my_edge_property.set(i, _i);
     _i*=_ii; ++_ii;
   }
+]]>
 </etik:code>
 </etik:example>