1.1 --- a/doc-docbook/src/Makefile Thu Mar 04 13:01:53 2004 +0000
1.2 +++ b/doc-docbook/src/Makefile Thu Mar 04 13:08:17 2004 +0000
1.3 @@ -3,7 +3,7 @@
1.4 .PHONY: html dvi ps pdf tex dist
1.5
1.6 html:
1.7 - docbook2html -o html -d etik-ol-html.dsl xml/etik-ol.xml
1.8 + docbook2html -o ../html -d etik-ol-html.dsl xml/etik-ol.xml
1.9
1.10 dvi:
1.11 docbook2dvi -o .. xml/etik-ol.xml
2.1 --- a/doc-docbook/src/etik-ol-html.dsl Thu Mar 04 13:01:53 2004 +0000
2.2 +++ b/doc-docbook/src/etik-ol-html.dsl Thu Mar 04 13:08:17 2004 +0000
2.3 @@ -6,8 +6,25 @@
2.4 <style-specification use="docbook">
2.5 <style-specification-body>
2.6
2.7 +(define x "25")
2.8 +(define nnl (named-node-list-names (attributes current-node)))
2.9 +(define attributumok (attributes current-node))
2.10 +
2.11 +
2.12 (element etik:class
2.13 - (process-children))
2.14 + (make sequence
2.15 + (if (attribute-string "id")
2.16 + (make element gi: "A"
2.17 + attributes: (list (list "NAME" (attribute-string "id")))
2.18 + (empty-sosofo))
2.19 + (empty-sosofo))
2.20 +
2.21 +
2.22 + (if (attribute-string "xreflabel") (empty-sosofo)
2.23 + ( literal "ures xreflabel"))
2.24 +
2.25 +;; (toc-entry (current-node))
2.26 + (process-children)))
2.27
2.28 (element (etik:class etik:name)
2.29 (make element gi: "H2"
2.30 @@ -95,11 +112,61 @@
2.31 (make element gi: "TH" (literal "Description"))
2.32 (process-children)))))
2.33
2.34 +(element (etik:class etik:prot_members)
2.35 + (make sequence
2.36 + (make element gi: "H3"
2.37 + (literal "Protected members"))
2.38 + (make element gi: "TABLE"
2.39 + attributes: (list
2.40 + (list "CELLSPACING" "1")
2.41 + (list "BORDER" "1"))
2.42 + (make element gi: "TR"
2.43 + (make element gi: "TH" (literal "Name"))
2.44 + (make element gi: "TH" (literal "Where defined"))
2.45 + (make element gi: "TH" (literal "Description"))
2.46 + (process-children)))))
2.47 +
2.48 +(element (etik:prot_members etik:member)
2.49 + (make element gi: "TR"
2.50 + (process-children)))
2.51 +
2.52 +(element (etik:class etik:priv_members)
2.53 + (make sequence
2.54 + (make element gi: "H3"
2.55 + (literal "Private members"))
2.56 + (make element gi: "TABLE"
2.57 + attributes: (list
2.58 + (list "CELLSPACING" "1")
2.59 + (list "BORDER" "1"))
2.60 + (make element gi: "TR"
2.61 + (make element gi: "TH" (literal "Name"))
2.62 + (make element gi: "TH" (literal "Where defined"))
2.63 + (make element gi: "TH" (literal "Description"))
2.64 + (process-children)))))
2.65 +
2.66 +(element (etik:priv_members etik:member)
2.67 + (make element gi: "TR"
2.68 + (process-children)))
2.69 +
2.70 (element (etik:example etik:code)
2.71 ($verbatim-display$
2.72 #f ;; mivel indentaljon
2.73 #f)) ;; legyen-e sorszamozas
2.74
2.75 +(element (etik:class etik:notes)
2.76 + (make sequence
2.77 + (make element gi: "H3"
2.78 + (literal "Notes"))
2.79 + (make element gi: "P"
2.80 + (process-children))))
2.81 +
2.82 +(element (etik:class etik:category)
2.83 + (make sequence
2.84 + (make element gi: "H3"
2.85 + (literal "Category"))
2.86 + (make element gi: "P"
2.87 + (process-children))))
2.88 +
2.89
2.90 </style-specification-body>
2.91 </style-specification>
3.1 --- a/doc-docbook/src/etik-ol.dtd Thu Mar 04 13:01:53 2004 +0000
3.2 +++ b/doc-docbook/src/etik-ol.dtd Thu Mar 04 13:08:17 2004 +0000
3.3 @@ -6,7 +6,8 @@
3.4 <!ENTITY % local.sect3.class "|etik:class">
3.5
3.6 <!-- load DocBook -->
3.7 -<!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN">
3.8 +<!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
3.9 + "docbook/dtd/4.2/docbookx.dtd">
3.10 %DocBookDTD;
3.11
3.12
3.13 @@ -14,18 +15,26 @@
3.14 etik:name,
3.15 etik:category?,
3.16 etik:description,
3.17 - etik:example,
3.18 + etik:example?,
3.19 etik:definition,
3.20 etik:template_params?,
3.21 etik:members?,
3.22 - etik:notes*)>
3.23 + etik:prot_members?,
3.24 + etik:priv_members?,
3.25 + etik:notes?)>
3.26 +
3.27 +<!ATTLIST etik:class
3.28 + %common.attrib;
3.29 + %label.attrib;
3.30 +>
3.31 +
3.32 <!ELEMENT etik:name (#PCDATA)*>
3.33 <!ELEMENT etik:category (#PCDATA|xref)*>
3.34 <!ELEMENT etik:description (#PCDATA|para|xref)*>
3.35 <!ELEMENT etik:example (#PCDATA|para|programlisting|xref|etik:code)*>
3.36
3.37
3.38 -<!ELEMENT etik:code CDATA>
3.39 +<!ELEMENT etik:code (#PCDATA)*>
3.40
3.41 <!ELEMENT etik:definition (#PCDATA|xref)*>
3.42
3.43 @@ -36,22 +45,24 @@
3.44 etik:templ_requirement,
3.45 etik:templ_default)>
3.46
3.47 -<!ELEMENT etik:templ_name CDATA>
3.48 +<!ELEMENT etik:templ_name (#PCDATA)*>
3.49 <!ELEMENT etik:templ_description (#PCDATA|xref)*>
3.50 <!ELEMENT etik:templ_requirement (#PCDATA|xref)*>
3.51 <!ELEMENT etik:templ_default (#PCDATA|xref)*>
3.52
3.53 <!ELEMENT etik:members (etik:member)+>
3.54 +<!ELEMENT etik:prot_members (etik:member)+>
3.55 +<!ELEMENT etik:priv_members (etik:member)+>
3.56 <!ELEMENT etik:member (etik:m_name,
3.57 etik:m_where_def,
3.58 etik:m_description)>
3.59
3.60
3.61 -<!ELEMENT etik:m_name CDATA>
3.62 +<!ELEMENT etik:m_name (#PCDATA)*>
3.63 <!ELEMENT etik:m_where_def (#PCDATA|xref)*>
3.64 <!ELEMENT etik:m_description (#PCDATA|xref)*>
3.65
3.66 -<!ELEMENT etik:notes (#PCDATA|para|xref)*>
3.67 +<!ELEMENT etik:notes (#PCDATA|para|xref|orderedlist|itemizedlist)*>
3.68
3.69
3.70
4.1 --- a/doc-docbook/src/xml/graph-classes.xml Thu Mar 04 13:01:53 2004 +0000
4.2 +++ b/doc-docbook/src/xml/graph-classes.xml Thu Mar 04 13:08:17 2004 +0000
4.3 @@ -4,9 +4,14 @@
4.4 <para>Valami leiras mondjuk a hierarchiarol, vagy barmi altalanos, ha kell.
4.5 </para>
4.6
4.7 + <section>
4.8 + <title>Pelda osztaly</title>
4.9 &osztaly-forma;
4.10 + </section>
4.11 + <section>
4.12 + <title>Masik</title>
4.13 &search_iterator;
4.14 -
4.15 + </section>
4.16
4.17 </chapter>
4.18
5.1 --- a/doc-docbook/src/xml/osztaly-forma.xml Thu Mar 04 13:01:53 2004 +0000
5.2 +++ b/doc-docbook/src/xml/osztaly-forma.xml Thu Mar 04 13:08:17 2004 +0000
5.3 @@ -1,4 +1,4 @@
5.4 -<etik:class id="haho">
5.5 +<etik:class id="haho" xreflabel="Példa osztály">
5.6 <etik:name>
5.7 Osztály neve
5.8 </etik:name>
5.9 @@ -14,7 +14,7 @@
5.10 <para>
5.11 A description-be kerülhet új bekezdés is többek között.
5.12 </para>
5.13 - <xref linkend="haho"/>
5.14 + Egy link: <xref linkend="haho"/>
5.15 </etik:description>
5.16
5.17 <etik:example>
6.1 --- a/doc-docbook/src/xml/search_iterator.xml Thu Mar 04 13:01:53 2004 +0000
6.2 +++ b/doc-docbook/src/xml/search_iterator.xml Thu Mar 04 13:08:17 2004 +0000
6.3 @@ -35,10 +35,9 @@
6.4 </programlisting>
6.5
6.6 Vigyázat, a programlisting mód parsolt, és minden <![CDATA[<]]>-t értelmez!
6.7 -Előnye, hogy lehet bele linkeket csinálni, de talán kényelmesebb egy LaTeX-szerű
6.8 -verbatim-mód, ezt valósítja meg az <![CDATA[<etik:code>]]> element.
6.9
6.10 <etik:code>
6.11 +<![CDATA[
6.12 int _i=1;
6.13 int _ii=1;
6.14 ListGraph::EdgeMap<int> my_edge_property(G);
6.15 @@ -46,6 +45,7 @@
6.16 my_edge_property.set(i, _i);
6.17 _i*=_ii; ++_ii;
6.18 }
6.19 +]]>
6.20 </etik:code>
6.21 </etik:example>
6.22