valadoc r28 - in trunk: . src/doclets src/doclets/devhelp src/doclets/devhelp/deps src/doclets/devhelp/doclet src/doclets/devhelp/linkhelper src/doclets/devhelp/taglets/bold src/doclets/devhelp/taglets/cell src/doclets/devhelp/taglets/center src/doclets/devhelp/taglets/image src/doclets/devhelp/taglets/italic src/doclets/devhelp/taglets/link src/doclets/devhelp/taglets/list src/doclets/devhelp/taglets/listelement src/doclets/devhelp/taglets/notification src/doclets/devhelp/taglets/parameter src/doclets/devhelp/taglets/return src/doclets/devhelp/taglets/right src/doclets/devhelp/taglets/see src/doclets/devhelp/taglets/source src/doclets/devhelp/taglets/string src/doclets/devhelp/taglets/table src/doclets/devhelp/taglets/throws src/doclets/devhelp/taglets/underline src/doclets/devhelp/taglets/version src/doclets/devhelp/taglets/wikilink src/doclets/htm src/doclets/htm/deps src/doclets/htm/doclet src/doclets/htm/taglets src/doclets/htm/taglets/bold src/doclets/htm/tagle ts/cell src/doclets/htm/taglets/center src/doclets/htm/taglets/image src/doclets/htm/taglets/italic src/doclets/htm/taglets/link src/doclets/htm/taglets/list src/doclets/htm/taglets/listelement src/doclets/htm/taglets/notification src/doclets/htm/taglets/parameter src/doclets/htm/taglets/return src/doclets/htm/taglets/right src/doclets/htm/taglets/see src/doclets/htm/taglets/source src/doclets/htm/taglets/string src/doclets/htm/taglets/table src/doclets/htm/taglets/throws src/doclets/htm/taglets/underline src/doclets/htm/taglets/version src/doclets/htm/taglets/wikilink src/doclets/html src/doclets/htmlhelpers src/libvaladoc src/valadoc src/vapi
- From: flobrosch svn gnome org
- To: svn-commits-list gnome org
- Subject: valadoc r28 - in trunk: . src/doclets src/doclets/devhelp src/doclets/devhelp/deps src/doclets/devhelp/doclet src/doclets/devhelp/linkhelper src/doclets/devhelp/taglets/bold src/doclets/devhelp/taglets/cell src/doclets/devhelp/taglets/center src/doclets/devhelp/taglets/image src/doclets/devhelp/taglets/italic src/doclets/devhelp/taglets/link src/doclets/devhelp/taglets/list src/doclets/devhelp/taglets/listelement src/doclets/devhelp/taglets/notification src/doclets/devhelp/taglets/parameter src/doclets/devhelp/taglets/return src/doclets/devhelp/taglets/right src/doclets/devhelp/taglets/see src/doclets/devhelp/taglets/source src/doclets/devhelp/taglets/string src/doclets/devhelp/taglets/table src/doclets/devhelp/taglets/throws src/doclets/devhelp/taglets/underline src/doclets/devhelp/taglets/version src/doclets/devhelp/taglets/wikilink src/doclets/htm src/doclets/htm/deps src/doclets/htm/doclet src/doclets/htm/taglets src/doclets/htm/taglets/bold src/doclets/htm/tagle ts/cell src/doclets/htm/taglets/center src/doclets/htm/taglets/image src/doclets/htm/taglets/italic src/doclets/htm/taglets/link src/doclets/htm/taglets/list src/doclets/htm/taglets/listelement src/doclets/htm/taglets/notification src/doclets/htm/taglets/parameter src/doclets/htm/taglets/return src/doclets/htm/taglets/right src/doclets/htm/taglets/see src/doclets/htm/taglets/source src/doclets/htm/taglets/string src/doclets/htm/taglets/table src/doclets/htm/taglets/throws src/doclets/htm/taglets/underline src/doclets/htm/taglets/version src/doclets/htm/taglets/wikilink src/doclets/html src/doclets/htmlhelpers src/libvaladoc src/valadoc src/vapi
- Date: Wed, 28 Jan 2009 02:37:06 +0000 (UTC)
Author: flobrosch
Date: Wed Jan 28 02:37:06 2009
New Revision: 28
URL: http://svn.gnome.org/viewvc/valadoc?rev=28&view=rev
Log:
- new html-doclet (based on devhelp-doclet)
- cleanups (rm linkhelpers, mysql-vapi)
- new icons (Frederik Zipp)
- valac-0.5.6
Added:
trunk/src/doclets/devhelp/deps/abstractproperty.png (contents, props changed)
trunk/src/doclets/devhelp/deps/constructor.png (contents, props changed)
trunk/src/doclets/devhelp/deps/virtualmethod.png (contents, props changed)
trunk/src/doclets/devhelp/deps/virtualproperty.png (contents, props changed)
trunk/src/doclets/devhelp/deps/warning.png (contents, props changed)
trunk/src/doclets/htm/
trunk/src/doclets/htm/Makefile.am
trunk/src/doclets/htm/deps/
trunk/src/doclets/htm/deps/Makefile.am
trunk/src/doclets/htm/deps/abstractclass.png (contents, props changed)
trunk/src/doclets/htm/deps/abstractmethod.png (contents, props changed)
trunk/src/doclets/htm/deps/abstractproperty.png (contents, props changed)
trunk/src/doclets/htm/deps/class.png (contents, props changed)
trunk/src/doclets/htm/deps/constant.png (contents, props changed)
trunk/src/doclets/htm/deps/constructor.png (contents, props changed)
trunk/src/doclets/htm/deps/delegate.png (contents, props changed)
trunk/src/doclets/htm/deps/enum.png (contents, props changed)
trunk/src/doclets/htm/deps/errordomain.png (contents, props changed)
trunk/src/doclets/htm/deps/field.png (contents, props changed)
trunk/src/doclets/htm/deps/interface.png (contents, props changed)
trunk/src/doclets/htm/deps/method.png (contents, props changed)
trunk/src/doclets/htm/deps/namespace.png (contents, props changed)
trunk/src/doclets/htm/deps/package.png (contents, props changed)
trunk/src/doclets/htm/deps/packages.png (contents, props changed)
trunk/src/doclets/htm/deps/property.png (contents, props changed)
trunk/src/doclets/htm/deps/signal.png (contents, props changed)
trunk/src/doclets/htm/deps/staticmethod.png (contents, props changed)
trunk/src/doclets/htm/deps/struct.png (contents, props changed)
trunk/src/doclets/htm/deps/style.css
trunk/src/doclets/htm/deps/virtualmethod.png (contents, props changed)
trunk/src/doclets/htm/deps/virtualproperty.png (contents, props changed)
trunk/src/doclets/htm/deps/warning.png (contents, props changed)
trunk/src/doclets/htm/doclet/
trunk/src/doclets/htm/doclet/Makefile.am
trunk/src/doclets/htm/doclet/docletconfig.vapi
trunk/src/doclets/htm/doclet/template.vala
trunk/src/doclets/htm/taglets/
trunk/src/doclets/htm/taglets/Makefile.am
trunk/src/doclets/htm/taglets/bold/
trunk/src/doclets/htm/taglets/bold/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/bold/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/cell/
trunk/src/doclets/htm/taglets/cell/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/cell/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/center/
trunk/src/doclets/htm/taglets/center/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/center/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/image/
trunk/src/doclets/htm/taglets/image/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/image/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/italic/
trunk/src/doclets/htm/taglets/italic/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/italic/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/link/
trunk/src/doclets/htm/taglets/link/Makefile.am
trunk/src/doclets/htm/taglets/link/taglet.vala
trunk/src/doclets/htm/taglets/list/
trunk/src/doclets/htm/taglets/list/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/list/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/listelement/
trunk/src/doclets/htm/taglets/listelement/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/listelement/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/notification/
trunk/src/doclets/htm/taglets/notification/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/notification/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/parameter/
trunk/src/doclets/htm/taglets/parameter/Makefile.am
trunk/src/doclets/htm/taglets/parameter/taglet.vala
trunk/src/doclets/htm/taglets/return/
trunk/src/doclets/htm/taglets/return/Makefile.am
trunk/src/doclets/htm/taglets/return/taglet.vala
trunk/src/doclets/htm/taglets/right/
trunk/src/doclets/htm/taglets/right/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/right/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/see/
trunk/src/doclets/htm/taglets/see/Makefile.am
trunk/src/doclets/htm/taglets/see/taglet.vala
trunk/src/doclets/htm/taglets/source/
trunk/src/doclets/htm/taglets/source/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/source/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/string/
trunk/src/doclets/htm/taglets/string/Makefile.am
trunk/src/doclets/htm/taglets/string/taglet.vala
trunk/src/doclets/htm/taglets/table/
trunk/src/doclets/htm/taglets/table/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/table/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/throws/
trunk/src/doclets/htm/taglets/throws/Makefile.am
trunk/src/doclets/htm/taglets/throws/taglet.vala
trunk/src/doclets/htm/taglets/underline/
trunk/src/doclets/htm/taglets/underline/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/underline/taglet.vala (contents, props changed)
trunk/src/doclets/htm/taglets/version/
trunk/src/doclets/htm/taglets/version/Makefile.am
trunk/src/doclets/htm/taglets/version/taglet.vala
trunk/src/doclets/htm/taglets/wikilink/
trunk/src/doclets/htm/taglets/wikilink/Makefile.am (contents, props changed)
trunk/src/doclets/htm/taglets/wikilink/taglet.vala (contents, props changed)
Removed:
trunk/src/doclets/devhelp/linkhelper/
trunk/src/doclets/html/
trunk/src/libvaladoc/old_doctree.vala
trunk/src/vapi/mysql.vapi
Modified:
trunk/configure.in
trunk/src/doclets/Makefile.am
trunk/src/doclets/devhelp/Makefile.am
trunk/src/doclets/devhelp/deps/Makefile.am
trunk/src/doclets/devhelp/deps/constant.png
trunk/src/doclets/devhelp/deps/style.css
trunk/src/doclets/devhelp/doclet/Makefile.am
trunk/src/doclets/devhelp/doclet/template.vala
trunk/src/doclets/devhelp/taglets/bold/Makefile.am
trunk/src/doclets/devhelp/taglets/cell/Makefile.am
trunk/src/doclets/devhelp/taglets/center/Makefile.am
trunk/src/doclets/devhelp/taglets/image/Makefile.am
trunk/src/doclets/devhelp/taglets/italic/Makefile.am
trunk/src/doclets/devhelp/taglets/link/Makefile.am
trunk/src/doclets/devhelp/taglets/link/taglet.vala
trunk/src/doclets/devhelp/taglets/list/Makefile.am
trunk/src/doclets/devhelp/taglets/listelement/Makefile.am
trunk/src/doclets/devhelp/taglets/notification/Makefile.am
trunk/src/doclets/devhelp/taglets/parameter/Makefile.am
trunk/src/doclets/devhelp/taglets/parameter/taglet.vala
trunk/src/doclets/devhelp/taglets/return/Makefile.am
trunk/src/doclets/devhelp/taglets/right/Makefile.am
trunk/src/doclets/devhelp/taglets/see/Makefile.am
trunk/src/doclets/devhelp/taglets/see/taglet.vala
trunk/src/doclets/devhelp/taglets/source/Makefile.am
trunk/src/doclets/devhelp/taglets/string/Makefile.am
trunk/src/doclets/devhelp/taglets/table/Makefile.am
trunk/src/doclets/devhelp/taglets/throws/Makefile.am
trunk/src/doclets/devhelp/taglets/underline/Makefile.am
trunk/src/doclets/devhelp/taglets/version/Makefile.am
trunk/src/doclets/devhelp/taglets/wikilink/Makefile.am
trunk/src/doclets/htmlhelpers/Makefile.am
trunk/src/doclets/htmlhelpers/htmlhelpers.vala
trunk/src/libvaladoc/Makefile.am
trunk/src/libvaladoc/doctree.vala
trunk/src/libvaladoc/drawer.vala
trunk/src/libvaladoc/parser.vala
trunk/src/valadoc/valadoc.vala
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Wed Jan 28 02:37:06 2009
@@ -74,31 +74,30 @@
src/vapi/Makefile
src/doclets/Makefile
src/doclets/htmlhelpers/Makefile
- src/doclets/html/Makefile
- src/doclets/html/linkhelper/Makefile
- src/doclets/html/doclet/Makefile
- src/doclets/html/deps/Makefile
- src/doclets/html/taglets/Makefile
- src/doclets/html/taglets/parameter/Makefile
- src/doclets/html/taglets/version/Makefile
- src/doclets/html/taglets/throws/Makefile
- src/doclets/html/taglets/return/Makefile
- src/doclets/html/taglets/string/Makefile
- src/doclets/html/taglets/wikilink/Makefile
- src/doclets/html/taglets/image/Makefile
- src/doclets/html/taglets/link/Makefile
- src/doclets/html/taglets/center/Makefile
- src/doclets/html/taglets/right/Makefile
- src/doclets/html/taglets/italic/Makefile
- src/doclets/html/taglets/source/Makefile
- src/doclets/html/taglets/bold/Makefile
- src/doclets/html/taglets/underline/Makefile
- src/doclets/html/taglets/notification/Makefile
- src/doclets/html/taglets/see/Makefile
- src/doclets/html/taglets/table/Makefile
- src/doclets/html/taglets/list/Makefile
- src/doclets/html/taglets/listelement/Makefile
- src/doclets/html/taglets/cell/Makefile
+ src/doclets/htm/Makefile
+ src/doclets/htm/doclet/Makefile
+ src/doclets/htm/deps/Makefile
+ src/doclets/htm/taglets/Makefile
+ src/doclets/htm/taglets/parameter/Makefile
+ src/doclets/htm/taglets/version/Makefile
+ src/doclets/htm/taglets/throws/Makefile
+ src/doclets/htm/taglets/return/Makefile
+ src/doclets/htm/taglets/string/Makefile
+ src/doclets/htm/taglets/wikilink/Makefile
+ src/doclets/htm/taglets/image/Makefile
+ src/doclets/htm/taglets/link/Makefile
+ src/doclets/htm/taglets/center/Makefile
+ src/doclets/htm/taglets/right/Makefile
+ src/doclets/htm/taglets/italic/Makefile
+ src/doclets/htm/taglets/source/Makefile
+ src/doclets/htm/taglets/bold/Makefile
+ src/doclets/htm/taglets/underline/Makefile
+ src/doclets/htm/taglets/notification/Makefile
+ src/doclets/htm/taglets/see/Makefile
+ src/doclets/htm/taglets/table/Makefile
+ src/doclets/htm/taglets/list/Makefile
+ src/doclets/htm/taglets/listelement/Makefile
+ src/doclets/htm/taglets/cell/Makefile
src/doclets/valadoc.org/Makefile
src/doclets/valadoc.org/doclet/Makefile
src/doclets/devhelp/Makefile
@@ -115,7 +114,6 @@
src/doclets/devhelp/taglets/cell/Makefile
src/doclets/devhelp/taglets/source/Makefile
src/doclets/devhelp/deps/Makefile
- src/doclets/devhelp/linkhelper/Makefile
src/doclets/devhelp/doclet/Makefile
src/doclets/devhelp/taglets/Makefile
src/doclets/devhelp/taglets/parameter/Makefile
Modified: trunk/src/doclets/Makefile.am
==============================================================================
--- trunk/src/doclets/Makefile.am (original)
+++ trunk/src/doclets/Makefile.am Wed Jan 28 02:37:06 2009
@@ -5,7 +5,7 @@
SUBDIRS = \
htmlhelpers \
- html \
+ htm \
devhelp \
valadoc.org \
$(NULL)
Modified: trunk/src/doclets/devhelp/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/Makefile.am (original)
+++ trunk/src/doclets/devhelp/Makefile.am Wed Jan 28 02:37:06 2009
@@ -4,7 +4,6 @@
SUBDIRS = \
- linkhelper \
doclet \
taglets \
deps \
Modified: trunk/src/doclets/devhelp/deps/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/deps/Makefile.am (original)
+++ trunk/src/doclets/devhelp/deps/Makefile.am Wed Jan 28 02:37:06 2009
@@ -4,10 +4,11 @@
vapidir = $(libdir)/valadoc/plugins/devhelp/deps/
-dist_vapi_DATA = \
- abstractclass.png \
- abstractmethod.png \
- staticmethod.png \
+dist_vapi_DATA = \
+ warning.png \
+ abstractclass.png \
+ abstractmethod.png \
+ staticmethod.png \
style.css \
class.png \
interface.png \
@@ -23,6 +24,10 @@
field.png \
package.png \
struct.png \
+ abstractproperty.png \
+ constructor.png \
+ virtualmethod.png \
+ virtualproperty.png \
$(NULL)
dist_noinst_DATA = \
Added: trunk/src/doclets/devhelp/deps/abstractproperty.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/doclets/devhelp/deps/constant.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/doclets/devhelp/deps/constructor.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/doclets/devhelp/deps/style.css
==============================================================================
--- trunk/src/doclets/devhelp/deps/style.css (original)
+++ trunk/src/doclets/devhelp/deps/style.css Wed Jan 28 02:37:06 2009
@@ -1,13 +1,10 @@
ul.external_link {
}
-
.main_optional_parameter {
font-style: italic;
}
-
-
.main_diagram {
display: block;
margin: 0px auto;
@@ -15,22 +12,51 @@
}
.site_navi {
- text-align: right;;
+ text-align: right;
}
-
-div.cms_message {
+.main_notification {
+ padding-right: 10px;
+ padding-left: 60px;
+ padding-bottom: 5px;
+ padding-top: 5px;
+ border-color: #aaaaff;
+ background-color: #eeeeff;
+ border-style: solid;
+ border-width: 1px;
+ margin: 10px;
+ min-height: 48px;
+ background-position: 6px 0.5em;
+ background-repeat: no-repeat;
+ background-image: url(warning.png);
}
+.main_sourcesample {
+ padding-right: 10px;
+ padding-left: 5px;
+ padding-bottom: 5px;
+ padding-top: 5px;
+ margin: 10px;
-input {
border-color: #aaaaff;
+ background-color: #eeeeff;
border-style: solid;
border-width: 1px;
}
+input {
+ border-color: #aaaaff;
+ border-style: solid;
+ border-width: 1px;
+}
-
+.main_table {
+ border-collapse: collapse;
+ border: 1px solid #aaaaff;
+ background: #eeeeff;
+ margin-right:auto;
+ margin-left:auto;
+}
.site_header {
font-size: 25px;
@@ -168,16 +194,16 @@
.main_inline_navigation_virtual_property {
- list-style-image: url(property.png);
+ list-style-image: url(virtualproperty.png);
}
.main_inline_navigation_abstract_property {
- list-style-image: url(property.png);
+ list-style-image: url(abstractproperty.png);
}
.navi_abstract_prop {
- list-style-image: url(property.png);
+ list-style-image: url(abstractproperty.png);
}
.navi_virtual_prop {
- list-style-image: url(property.png);
+ list-style-image: url(virtualproperty.png);
}
@@ -295,7 +321,7 @@
border:0px;
}
.css_content_link_virtual_property {
- background-image:url(property.png);
+ background-image:url(virtualproperty.png);
display:inline-block;
padding-right:17px;
background-repeat:no-repeat;
@@ -303,7 +329,7 @@
border:0px;
}
.css_content_link_abstract_property {
- background-image:url(property.png);
+ background-image:url(abstractproperty.png);
display:inline-block;
padding-right:17px;
background-repeat:no-repeat;
@@ -327,7 +353,7 @@
border:0px;
}
.css_content_link_virtual_method {
- background-image:url(method.png);
+ background-image:url(virtualmethod.png);
display:inline-block;
padding-right:17px;
background-repeat:no-repeat;
@@ -343,7 +369,7 @@
border:0px;
}
.css_content_link_construction_method {
- background-image:url(method.png);
+ background-image:url(constructor.png);
display:inline-block;
padding-right:17px;
background-repeat:no-repeat;
@@ -351,6 +377,9 @@
border:0px;
}
+.main_inline_navigation_virtual_method {
+ list-style-image:url(virtualmethod.png);
+}
.main_inline_navigation_errorcode {
list-style-image:url(errorcode.png);
}
@@ -364,60 +393,63 @@
list-style-image: url( abstractmethod.png );
}
.navi_construction_method, .main_list_m, .main_inline_navigation_construction_method {
- list-style-image: url(method.png);
+ list-style-image: url(constructor.png);
}
.navi_static_method, .main_inline_navigation_static_method {
list-style-image: url(staticmethod.png);
}
.navi_package_index, .main_inline_navigation_package {
- list-style-image: url(packages.png)
+ list-style-image: url(packages.png);
}
.main_navi_enval {
- list-style-image: url(enumvalue.png)
+ list-style-image: url(enumvalue.png);
}
.main_navi_errdomcode {
- list-style-image: url(errorcode.png)
+ list-style-image: url(errorcode.png);
}
.navi_error_domain, .main_list_errdom, .main_inline_navigation_errordomain {
- list-style-image: url(errordomain.png)
+ list-style-image: url(errordomain.png);
}
.navi_namespace, .main_list_ns, .main_inline_navigation_namespace {
- list-style-image: url(namespace.png)
+ list-style-image: url(namespace.png);
}
.navi_method, .main_inline_navigation_method {
- list-style-image: url(method.png)
+ list-style-image: url(method.png);
+}
+.navi_virtual_method {
+ list-style-image: url(virtualmethod.png);
}
.navi_struct, .main_list_stru, .main_inline_navigation_struct {
- list-style-image: url(struct.png)
+ list-style-image: url(struct.png);
}
.navi_iface, .main_navigation_interface, .main_list_iface {
- list-style-image: url(interface.png)
+ list-style-image: url(interface.png);
}
.navi_field, .main_inline_navigation_fields, .main_list_field {
- list-style-image: url(field.png)
+ list-style-image: url(field.png);
}
.navi_class, .main_inline_navigation_class, .main_list_cl {
- list-style-image: url(class.png)
+ list-style-image: url(class.png);
}
.navi_enum, .main_list_en, .main_inline_navigation_enum {
- list-style-image: url(enum.png)
+ list-style-image: url(enum.png);
}
.navi_prop, .main_inline_navigation_property, .main_list_prop {
- list-style-image: url(property.png)
+ list-style-image: url(property.png);
}
.navi_del, .main_list_del, .main_inline_navigation_delegate {
- list-style-image: url(delegate.png)
+ list-style-image: url(delegate.png);
}
.navi_sig, .main_inline_navigation_signal, .main_list_sig {
- list-style-image: url(signal.png)
+ list-style-image: url(signal.png);
}
.navi_package, .main_inline_navigation_package {
- list-style-image: url(package.png)
+ list-style-image: url(package.png);
}
.main_inline_navigation_constant, .navi_constant {
- list-style-image: url(constant.png)
+ list-style-image: url(constant.png);
}
@@ -438,9 +470,6 @@
margin-bottom: 5px;
}
-
-
-
a.navi_link, a.external_link {
text-decoration: none;
color: #214b87;
@@ -448,12 +477,8 @@
a.navi_link:hover, a.external_link:hover {
text-decoration: underline;
-# color: #ff0000;
}
-
-
-
.main_see_list {
}
Added: trunk/src/doclets/devhelp/deps/virtualmethod.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/devhelp/deps/virtualproperty.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/devhelp/deps/warning.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/doclets/devhelp/doclet/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/doclet/Makefile.am (original)
+++ trunk/src/doclets/devhelp/doclet/Makefile.am Wed Jan 28 02:37:06 2009
@@ -12,7 +12,7 @@
libdoclet.vala.stamp: $(libdoclet_VALASOURCES)
- $(VALAC) -C --vapidir ../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --pkg valadoc-1.0 --vapidir ../linkhelper --pkg libxml-2.0 --pkg libhtmlhelper-1.0 --vapidir . --pkg docletconfig --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --pkg valadoc-1.0 --pkg libxml-2.0 --vapidir . --pkg docletconfig --basedir . $^
touch $@
@@ -35,7 +35,6 @@
-DPACKAGE_PLUGINDIR=\"$(libdir)/valadoc/plugins/devhelp/\" \
-I ../../../libvaladoc/ \
-I ../../htmlhelpers/ \
- -I ../linkhelper/ \
-I ../ \
$(GLIB_CFLAGS) \
$(LIBXML2_CFLAGS) \
@@ -49,7 +48,6 @@
libdoclet_la_LIBADD = \
../../../libvaladoc/libvaladoc.la \
../../htmlhelpers/libhtmlhelpers.la \
- ../linkhelper/libhtmlhelper.la \
$(LIBXML2_LIBS) \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
Modified: trunk/src/doclets/devhelp/doclet/template.vala
==============================================================================
--- trunk/src/doclets/devhelp/doclet/template.vala (original)
+++ trunk/src/doclets/devhelp/doclet/template.vala Wed Jan 28 02:37:06 2009
@@ -25,9 +25,9 @@
-public class Valadoc.LangletIndex : Valadoc.BasicHtmlLanglet, Valadoc.HtmlHelper {
+public class Valadoc.LangletIndex : Valadoc.BasicHtmlLanglet {
protected override string get_link ( DocumentedElement element, DocumentedElement? pos ) {
- return this.get_html_link ( this.settings, element, pos );
+ return get_html_link ( this.settings, element, pos );
}
public LangletIndex ( Settings settings ) {
@@ -146,14 +146,11 @@
-public class Valadoc.HtmlDoclet : Valadoc.BasicHtmlDoclet, Valadoc.HtmlHelper {
- private string package_dir_name = "";
+public class Valadoc.HtmlDoclet : Valadoc.BasicHtmlDoclet {
+ private const string css_path = "style.css";
+ private string package_dir_name = ""; // remove
private DevhelpFormat devhelp;
- protected override string get_link ( DocumentedElement p1, DocumentedElement? p2 ) {
- return this.get_html_link ( this.settings, p1, p2 );
- }
-
private string get_path ( DocumentedElement element ) {
return element.full_name () + ".html";
}
@@ -162,19 +159,6 @@
return this.settings.get_real_path ( ) + "/" + this.package_dir_name + "/" + element.full_name () + ".html";
}
- protected override string get_img_path ( DocumentedElement element ) {
- return "img/" + element.full_name () + ".png";
- }
-
- protected override string get_img_real_path ( DocumentedElement element ) {
- return this.settings.get_real_path ( ) + "/" + this.package_dir_name + "/" + "img/" + element.full_name () + ".png";
- }
-
- public Valadoc.Settings settings {
- construct set;
- protected get;
- }
-
public override void initialisation ( Settings settings, Tree tree ) {
this.settings = settings;
@@ -202,7 +186,7 @@
this.devhelp = new DevhelpFormat ( pkg_name, "" );
GLib.FileStream ifile = GLib.FileStream.open ( path + "index.htm", "w" );
- this.write_file_header ( ifile, "style.css", pkg_name );
+ this.write_file_header ( ifile, this.css_path, pkg_name );
this.write_file_content ( ifile, file, file );
this.write_file_footer ( ifile );
ifile = null;
@@ -217,7 +201,7 @@
string path = this.get_path ( ns );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w" );
- this.write_file_header ( file, "style.css", ns.full_name() );
+ this.write_file_header ( file, this.css_path, ns.full_name() );
this.write_namespace_content ( file, ns, ns );
this.write_file_footer ( file );
file = null;
@@ -264,7 +248,7 @@
this.devhelp.add_keyword ( KeywordType.INTERFACE, iface.name, path );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", iface.full_name() );
+ this.write_file_header ( file, this.css_path, iface.full_name() );
this.write_interface_content ( file, iface, iface );
this.write_file_footer ( file );
file = null;
@@ -293,7 +277,7 @@
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", cl.full_name() );
+ this.write_file_header ( file, this.css_path, cl.full_name() );
this.write_class_content ( file, cl, cl );
this.write_file_footer ( file );
file = null;
@@ -316,7 +300,7 @@
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", stru.full_name() );
+ this.write_file_header ( file, this.css_path, stru.full_name() );
this.write_struct_content ( file, stru, stru );
this.write_file_footer ( file );
@@ -333,7 +317,7 @@
this.devhelp.add_chapter ( errdom.name, path );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", errdom.full_name() );
+ this.write_file_header ( file, this.css_path, errdom.full_name() );
this.write_error_domain_content ( file, errdom, errdom );
this.write_file_footer ( file );
file = null;
@@ -350,7 +334,7 @@
this.devhelp.add_chapter ( en.name, path );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", en.full_name() );
+ this.write_file_header ( file, this.css_path, en.full_name() );
this.write_enum_content ( file, en, en );
this.write_file_footer ( file );
file = null;
@@ -364,7 +348,7 @@
this.devhelp.add_chapter ( prop.name, path );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", prop.full_name() );
+ this.write_file_header ( file, this.css_path, prop.full_name() );
this.write_property_content ( file, prop );
this.write_file_footer ( file );
file = null;
@@ -378,7 +362,7 @@
this.devhelp.add_chapter ( constant.name, path );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", constant.full_name() );
+ this.write_file_header ( file, this.css_path, constant.full_name() );
this.write_constant_content ( file, constant, parent );
this.write_file_footer ( file );
file = null;
@@ -392,7 +376,7 @@
this.devhelp.add_chapter ( field.name, path );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", field.full_name() );
+ this.write_file_header ( file, this.css_path, field.full_name() );
this.write_field_content ( file, field, parent );
this.write_file_footer ( file );
file = null;
@@ -412,7 +396,7 @@
this.devhelp.add_chapter ( del.name, path );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", del.full_name() );
+ this.write_file_header ( file, this.css_path, del.full_name() );
this.write_delegate_content ( file, del );
this.write_file_footer ( file );
file = null;
@@ -426,7 +410,7 @@
this.devhelp.add_chapter ( sig.name, path );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", sig.full_name() );
+ this.write_file_header ( file, this.css_path, sig.full_name() );
write_signal_content ( file, sig );
this.write_file_footer ( file );
file = null;
@@ -440,7 +424,7 @@
this.devhelp.add_chapter ( m.name, path );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
- this.write_file_header ( file, "style.css", m.full_name() );
+ this.write_file_header ( file, this.css_path, m.full_name() );
this.write_method_content ( file, m, parent );
this.write_file_footer ( file );
file = null;
Modified: trunk/src/doclets/devhelp/taglets/bold/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/bold/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/bold/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletbold.vala.stamp: $(libtagletbold_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletbold_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/cell/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/cell/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/cell/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtaglettablecell.vala.stamp: $(libtaglettablecell_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtaglettablecell_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/center/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/center/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/center/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletcenter.vala.stamp: $(libtagletcenter_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletcenter_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/image/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/image/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/image/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,13 +11,13 @@
libtagletimage.vala.stamp: $(libtagletimage_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
-tagletimagedir = $(libdir)/valadoc/plugins/template/taglets/
+tagletimagedir = $(libdir)/valadoc/plugins/devhelp/taglets/
tagletimage_LTLIBRARIES = libtagletimage.la
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletimage_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/italic/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/italic/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/italic/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletitalic.vala.stamp: $(libtagletitalic_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletitalic_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/link/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/link/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/link/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletparameter.vala.stamp: $(libtagletparameter_VALASOURCES)
- $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletparameter_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/link/taglet.vala
==============================================================================
--- trunk/src/doclets/devhelp/taglets/link/taglet.vala (original)
+++ trunk/src/doclets/devhelp/taglets/link/taglet.vala Wed Jan 28 02:37:06 2009
@@ -19,21 +19,33 @@
using Valadoc;
using GLib;
-using Vala;
using Gee;
-
-using Valadoc;
-using GLib;
-using Vala;
-using Gee;
+public class Valadoc.LinkHtmlTaglet : Valadoc.LinkHtmlHelperTaglet {
+ protected override string? get_link ( Settings settings, Tree tree, DocumentedElement element, DocumentedElement? pos ) {
+ return get_html_link ( settings, element, pos );
+ }
+
+ public override string to_string () {
+ return to_string_imp ( );
+ }
+
+ public override bool write ( void* res, int max, int index ) {
+ return write_imp ( res, max, index );
+ }
+
+ public override bool parse ( Settings settings, Tree tree, DocumentedElement me, string content, out string[] errmsg ) {
+ return this.parse_imp ( settings, tree, me, content, out errmsg );
+ }
+}
[ModuleInit]
public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
- GLib.Type type = typeof ( ParameterHtmlTaglet );
- taglets.set ( "param", type );
+ GLib.Type type = typeof ( LinkHtmlTaglet );
+ taglets.set ( "link", type );
return type;
}
+
Modified: trunk/src/doclets/devhelp/taglets/list/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/list/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/list/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletlist.vala.stamp: $(libtagletlist_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletlist_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/listelement/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/listelement/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/listelement/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletlistelement.vala.stamp: $(libtagletlistelement_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletlistelement_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/notification/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/notification/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/notification/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletnotification.vala.stamp: $(libtagletnotification_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletnotification_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/parameter/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/parameter/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/parameter/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletparameter.vala.stamp: $(libtagletparameter_VALASOURCES)
- $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletparameter_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/parameter/taglet.vala
==============================================================================
--- trunk/src/doclets/devhelp/taglets/parameter/taglet.vala (original)
+++ trunk/src/doclets/devhelp/taglets/parameter/taglet.vala Wed Jan 28 02:37:06 2009
@@ -23,13 +23,6 @@
using Gee;
-
-using Valadoc;
-using GLib;
-using Vala;
-using Gee;
-
-
[ModuleInit]
public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
GLib.Type type = typeof ( ParameterHtmlTaglet );
Modified: trunk/src/doclets/devhelp/taglets/return/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/return/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/return/Makefile.am Wed Jan 28 02:37:06 2009
@@ -2,30 +2,30 @@
-libtagletXXXX_VALASOURCES = \
+libtagletreturn_VALASOURCES = \
taglet.vala \
$(NULL)
-BUILT_SOURCES = libtagletXXXX.vala.stamp
+BUILT_SOURCES = libtagletreturn.vala.stamp
-libtagletXXXX.vala.stamp: $(libtagletXXXX_VALASOURCES)
- $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+libtagletreturn.vala.stamp: $(libtagletreturn_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
touch $@
-tagletXXXXdir = $(libdir)/valadoc/plugins/devhelp/taglets/
+tagletreturndir = $(libdir)/valadoc/plugins/devhelp/taglets/
-tagletXXXX_LTLIBRARIES = libtagletXXXX.la
+tagletreturn_LTLIBRARIES = libtagletreturn.la
-libtagletXXXX_la_SOURCES = \
- libtagletXXXX.vala.stamp \
- $(libtagletXXXX_VALASOURCES:.vala=.c) \
- $(libtagletXXXX_VALASOURCES:.vala=.h) \
+libtagletreturn_la_SOURCES = \
+ libtagletreturn.vala.stamp \
+ $(libtagletreturn_VALASOURCES:.vala=.c) \
+ $(libtagletreturn_VALASOURCES:.vala=.h) \
$(NULL)
@@ -33,20 +33,18 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
$(NULL)
-libtagletXXXX_la_LDFLAGS = -module -avoid-version
+libtagletreturn_la_LDFLAGS = -module -avoid-version
-libtagletXXXX_la_LIBADD = \
+libtagletreturn_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
@@ -54,4 +52,4 @@
-EXTRA_DIST = $(libtagletXXXX_VALASOURCES) libtagletXXXX.vala.stamp
+EXTRA_DIST = $(libtagletreturn_VALASOURCES) libtagletreturn.vala.stamp
Modified: trunk/src/doclets/devhelp/taglets/right/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/right/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/right/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletright.vala.stamp: $(libtagletright_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletright_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/see/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/see/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/see/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletsee.vala.stamp: $(libtagletsee_VALASOURCES)
- $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletsee_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/see/taglet.vala
==============================================================================
--- trunk/src/doclets/devhelp/taglets/see/taglet.vala (original)
+++ trunk/src/doclets/devhelp/taglets/see/taglet.vala Wed Jan 28 02:37:06 2009
@@ -24,9 +24,9 @@
-public class Valadoc.SeeDevhelpTaglet : SeeHtmlHelperTaglet, HtmlHelper {
+public class Valadoc.SeeDevhelpTaglet : SeeHtmlHelperTaglet {
protected override string? get_link ( Settings settings, Tree tree, DocumentedElement element, DocumentedElement? pos ) {
- return this.get_html_link ( settings, element, pos );
+ return get_html_link ( settings, element, pos );
}
public override bool write_block_start ( void* ptr ) {
Modified: trunk/src/doclets/devhelp/taglets/source/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/source/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/source/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletsrcsample.vala.stamp: $(libtagletsrcsample_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletsrcsample_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/string/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/string/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/string/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletstring.vala.stamp: $(libtagletstring_VALASOURCES)
- $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletstring_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/table/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/table/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/table/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtaglettable.vala.stamp: $(libtaglettable_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtaglettable_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/throws/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/throws/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/throws/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libexceptionparameter.vala.stamp: $(libexceptionparameter_VALASOURCES)
- $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libexceptionparameter_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/underline/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/underline/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/underline/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletunderline.vala.stamp: $(libtagletunderline_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -32,7 +32,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -45,7 +44,6 @@
libtagletunderline_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/version/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/version/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/version/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletversion.vala.stamp: $(libtagletversion_VALASOURCES)
- $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletversion_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Modified: trunk/src/doclets/devhelp/taglets/wikilink/Makefile.am
==============================================================================
--- trunk/src/doclets/devhelp/taglets/wikilink/Makefile.am (original)
+++ trunk/src/doclets/devhelp/taglets/wikilink/Makefile.am Wed Jan 28 02:37:06 2009
@@ -11,7 +11,7 @@
libtagletwikilink.vala.stamp: $(libtagletwikilink_VALASOURCES)
- $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
touch $@
@@ -33,7 +33,6 @@
AM_CFLAGS = -g \
-I ../../../../libvaladoc/ \
-I ../../../htmlhelpers/ \
- -I ../../linkhelper/ \
-I ../../ \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
@@ -46,7 +45,6 @@
libtagletwikilink_la_LIBADD = \
../../../../libvaladoc/libvaladoc.la \
../../../htmlhelpers/libhtmlhelpers.la \
- ../../linkhelper/libhtmlhelper.la \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(NULL)
Added: trunk/src/doclets/htm/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,12 @@
+# src/Makefile.am
+
+NULL =
+
+
+SUBDIRS = \
+ doclet \
+ taglets \
+ deps \
+ $(NULL)
+
+
Added: trunk/src/doclets/htm/deps/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/deps/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,37 @@
+NULL =
+
+
+vapidir = $(libdir)/valadoc/plugins/html/deps/
+
+
+dist_vapi_DATA = \
+ warning.png \
+ abstractclass.png \
+ abstractmethod.png \
+ staticmethod.png \
+ style.css \
+ class.png \
+ interface.png \
+ packages.png \
+ constant.png \
+ method.png \
+ property.png \
+ delegate.png \
+ errordomain.png \
+ namespace.png \
+ signal.png \
+ enum.png \
+ field.png \
+ package.png \
+ struct.png \
+ abstractproperty.png \
+ constructor.png \
+ virtualmethod.png \
+ virtualproperty.png \
+ $(NULL)
+
+dist_noinst_DATA = \
+ $(NULL)
+
+
+
Added: trunk/src/doclets/htm/deps/abstractclass.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/abstractmethod.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/abstractproperty.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/class.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/constant.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/constructor.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/delegate.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/enum.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/errordomain.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/field.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/interface.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/method.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/namespace.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/package.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/packages.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/property.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/signal.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/staticmethod.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/struct.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/style.css
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/deps/style.css Wed Jan 28 02:37:06 2009
@@ -0,0 +1,497 @@
+ul.external_link {
+}
+
+.main_optional_parameter {
+ font-style: italic;
+}
+
+.main_diagram {
+ display: block;
+ margin: 0px auto;
+ width: 100px;
+}
+
+.site_navi {
+ text-align: right;
+}
+
+.main_notification {
+ padding-right: 10px;
+ padding-left: 60px;
+ padding-bottom: 5px;
+ padding-top: 5px;
+ border-color: #aaaaff;
+ background-color: #eeeeff;
+ border-style: solid;
+ border-width: 1px;
+ margin: 10px;
+ min-height: 48px;
+ background-position: 6px 0.5em;
+ background-repeat: no-repeat;
+ background-image: url(warning.png);
+}
+
+.main_table {
+ border-collapse: collapse;
+ border: 1px solid #aaaaff;
+ background: #eeeeff;
+ margin-right:auto;
+ margin-left:auto;
+}
+
+.main_sourcesample {
+ padding-right: 10px;
+ padding-left: 5px;
+ padding-bottom: 5px;
+ padding-top: 5px;
+ margin: 10px;
+
+ border-color: #aaaaff;
+ background-color: #eeeeff;
+ border-style: solid;
+ border-width: 1px;
+}
+
+
+input {
+ border-color: #aaaaff;
+ border-style: solid;
+ border-width: 1px;
+}
+
+
+
+
+.site_header {
+ font-size: 25px;
+ padding-bottom: 10px;
+ padding-top: 10px;
+ background-color: #aaaaff;
+ width: 100%;
+}
+
+
+div {
+ font-family:'Verdana';
+ font-size: 12;
+}
+
+
+.site_title {
+ text-align: left;
+ font-size: 40;
+}
+
+div.site_foother {
+ text-align: center;
+ background-color: #aaaaff;
+ padding-bottom: 5px;
+ padding-top: 5px;
+ width: 100%;
+ clear: left;
+}
+
+
+div.site_body {
+ font-size: 10;
+}
+
+
+div.site_navigation {
+ float: left;
+
+ width: 240px;
+ border-color: #aaaaff;
+ border-style: solid;
+ border-width: 1px;
+ background-color: #eeeeff;
+}
+
+
+.site_content {
+ font-size: 10px;
+ margin-left: 250px;
+ margin-right: 5px;
+ text-align: left;
+}
+
+
+.main_other_type {
+ text-decoration: none;
+ font-style: italic;
+ color: #000000;
+}
+
+.main_basic_type {
+ text-decoration: none;
+ font-weight: bold;
+ color: #2e8b57;
+}
+
+.main_keyword {
+ text-decoration: none;
+ font-weight: bold;
+ color: #a52a2a;
+}
+
+
+div.main_code_definition {
+ padding-right: 10px;
+ padding-left: 10px;
+ padding-bottom: 5px;
+ padding-top: 5px;
+
+ font: monospace;
+ font-size: 10;
+ border-color: #aaaaff;
+ background-color: #eeeeff;
+ border-style: solid;
+ border-width: 1px;
+ margin: 10px;
+}
+
+
+
+
+
+h1.main_title {
+ font-size: 20px;
+ margin-bottom: 0px;
+}
+
+h2.main_title {
+ margin-bottom: 0px;
+}
+
+h3.main_title {
+ margin-bottom: 0px;
+}
+
+.main_hr {
+ border: 0;
+ color: #aaaaff;
+ background-color: #aaaaff;
+ height: 1px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
+
+
+.main_parameter_table_text, .main_errordomain_table_text, .main_enum_table_text {
+}
+
+.main_parameter_table_name, .main_errordomain_table_name, .main_enum_table_name {
+ vertical-align: top;
+ text-align: right;
+ font-weight: bold;
+ width: 120px;
+ padding-right: 10px;
+}
+
+.main_parameter_table, .main_errordomain_table, .main_enum_table {
+ margin-weight: 20px;
+ margin-left: 20px;
+}
+
+
+
+
+.main_inline_navigation_virtual_property {
+ list-style-image: url(virtualproperty.png);
+}
+.main_inline_navigation_abstract_property {
+ list-style-image: url(abstractproperty.png);
+}
+.navi_abstract_prop {
+ list-style-image: url(abstractproperty.png);
+}
+.navi_virtual_prop {
+ list-style-image: url(virtualproperty.png);
+}
+
+
+
+.css_content_link_constant {
+ background-image:url(constant.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_namespace {
+ background-image:url(namespace.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_struct {
+ background-image:url(struct.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_interface {
+ background-image:url(interface.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_enum {
+ background-image:url(enum.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_errordomain {
+ background-image:url(errordomain.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_delegate {
+ background-image:url(delegate.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_signal {
+ background-image:url(signal.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_field {
+ background-image:url(field.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_enumvalue {
+ background-image:url(enumvalue.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_errorcode {
+ background-image:url(errorcode.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_class {
+ background-image:url(class.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_abstract_class {
+ background-image:url(abstractclass.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_property {
+ background-image:url(property.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_virtual_property {
+ background-image:url(virtualproperty.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_abstract_property {
+ background-image:url(abstractproperty.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_method {
+ background-image:url(method.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_static_method {
+ background-image:url(staticmethod.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_virtual_method {
+ background-image:url(virtualmethod.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_abstract_method {
+ background-image:url(abstractmethod.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+.css_content_link_construction_method {
+ background-image:url(constructor.png);
+ display:inline-block;
+ padding-right:17px;
+ background-repeat:no-repeat;
+ background-position:center right;
+ border:0px;
+}
+
+.main_inline_navigation_virtual_method {
+ list-style-image:url(virtualmethod.png);
+}
+.main_inline_navigation_errorcode {
+ list-style-image:url(errorcode.png);
+}
+.main_inline_navigation_enumvalue {
+ list-style-image:url(enumvalue.png);
+}
+.navi_abstract_class, .main_inline_navigation_abstract_class {
+ list-style-image: url(abstractclass.png);
+}
+.main_inline_navigation_abstract_method, .navi_abstract_method {
+ list-style-image: url( abstractmethod.png );
+}
+.navi_construction_method, .main_list_m, .main_inline_navigation_construction_method {
+ list-style-image: url(constructor.png);
+}
+.navi_static_method, .main_inline_navigation_static_method {
+ list-style-image: url(staticmethod.png);
+}
+
+.navi_package_index, .main_inline_navigation_package {
+ list-style-image: url(packages.png);
+}
+.navi_virtual_method {
+ list-style-image: url(virtualmethod.png);
+}
+.main_navi_enval {
+ list-style-image: url(enumvalue.png);
+}
+.main_navi_errdomcode {
+ list-style-image: url(errorcode.png);
+}
+.navi_error_domain, .main_list_errdom, .main_inline_navigation_errordomain {
+ list-style-image: url(errordomain.png);
+}
+.navi_namespace, .main_list_ns, .main_inline_navigation_namespace {
+ list-style-image: url(namespace.png);
+}
+.navi_method, .main_inline_navigation_method {
+ list-style-image: url(method.png);
+}
+.navi_struct, .main_list_stru, .main_inline_navigation_struct {
+ list-style-image: url(struct.png);
+}
+.navi_iface, .main_navigation_interface, .main_list_iface {
+ list-style-image: url(interface.png);
+}
+.navi_field, .main_inline_navigation_fields, .main_list_field {
+ list-style-image: url(field.png);
+}
+.navi_class, .main_inline_navigation_class, .main_list_cl {
+ list-style-image: url(class.png);
+}
+.navi_enum, .main_list_en, .main_inline_navigation_enum {
+ list-style-image: url(enum.png);
+}
+.navi_prop, .main_inline_navigation_property, .main_list_prop {
+ list-style-image: url(property.png);
+}
+.navi_del, .main_list_del, .main_inline_navigation_delegate {
+ list-style-image: url(delegate.png);
+}
+.navi_sig, .main_inline_navigation_signal, .main_list_sig {
+ list-style-image: url(signal.png);
+}
+.navi_package, .main_inline_navigation_package {
+ list-style-image: url(package.png);
+}
+
+.main_inline_navigation_constant, .navi_constant {
+ list-style-image: url(constant.png);
+}
+
+
+.navi_main {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ padding-left: 30px;
+}
+
+.navi_hr {
+ border: 0;
+ color: #aaaaff;
+ background-color: #aaaaff;
+ height: 1px;
+ margin-left: 10px;
+ margin-right: 10px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
+
+
+
+a.navi_link, a.external_link {
+ text-decoration: none;
+ color: #214b87;
+}
+
+a.navi_link:hover, a.external_link:hover {
+ text-decoration: underline;
+}
+
+
+
+
+.main_see_list {
+}
+
+.main_inline_navigation {
+}
+
Added: trunk/src/doclets/htm/deps/virtualmethod.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/virtualproperty.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/deps/warning.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/doclets/htm/doclet/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/doclet/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,59 @@
+# src/Makefile.am
+
+
+
+
+libdoclet_VALASOURCES = \
+ template.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libdoclet.vala.stamp
+
+
+libdoclet.vala.stamp: $(libdoclet_VALASOURCES)
+ $(VALAC) -C --vapidir ../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --pkg valadoc-1.0 --pkg libxml-2.0 --vapidir . --pkg docletconfig --basedir . $^
+ touch $@
+
+
+
+
+docletdir = $(libdir)/valadoc/plugins/html/
+
+doclet_LTLIBRARIES = libdoclet.la
+
+
+libdoclet_la_SOURCES = \
+ libdoclet.vala.stamp \
+ $(libdoclet_VALASOURCES:.vala=.c) \
+ $(libdoclet_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -DPACKAGE_PLUGINDIR=\"$(libdir)/valadoc/plugins/html/\" \
+ -I ../../../libvaladoc/ \
+ -I ../../htmlhelpers/ \
+ -I ../ \
+ $(GLIB_CFLAGS) \
+ $(LIBXML2_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libdoclet_la_LDFLAGS = -module -avoid-version
+
+
+libdoclet_la_LIBADD = \
+ ../../../libvaladoc/libvaladoc.la \
+ ../../htmlhelpers/libhtmlhelpers.la \
+ $(LIBXML2_LIBS) \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libdoclet_VALASOURCES) libdoclet.vala.stamp
Added: trunk/src/doclets/htm/doclet/docletconfig.vapi
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/doclet/docletconfig.vapi Wed Jan 28 02:37:06 2009
@@ -0,0 +1,7 @@
+
+
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "")]
+namespace Config {
+ [CCode (cname = "PACKAGE_PLUGINDIR")]
+ public const string doclet_path;
+}
Added: trunk/src/doclets/htm/doclet/template.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/doclet/template.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,285 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+using Valadoc;
+using GLib;
+using Xml;
+using Gee;
+
+
+
+public class Valadoc.LangletIndex : Valadoc.BasicHtmlLanglet {
+ protected override string get_link ( DocumentedElement element, DocumentedElement? pos ) {
+ return get_html_link ( this.settings, element, pos );
+ }
+
+ public LangletIndex ( Settings settings ) {
+ base ( settings );
+ }
+}
+
+
+
+
+
+public class Valadoc.HtmlDoclet : Valadoc.BasicHtmlDoclet {
+ private const string css_path_package = "style.css";
+ private const string css_path = "../style.css";
+ private string package_dir_name = ""; // remove
+
+ private string get_real_path ( DocumentedElement element ) {
+ return GLib.Path.build_filename ( this.settings.get_real_path ( ), element.package.name, element.full_name () + ".html" );
+ }
+
+ public override void initialisation ( Settings settings, Tree tree ) {
+ this.settings = settings;
+
+ var rt = DirUtils.create ( this.settings.path, 0777 );
+ copy_directory ( GLib.Path.build_filename ( Config.doclet_path, "deps" ), this.settings.path );
+ rt = DirUtils.create ( this.settings.path + settings.pkg_name, 0777 );
+
+ GLib.FileStream file = GLib.FileStream.open ( GLib.Path.build_filename ( this.settings.path, "index.html" ), "w" );
+ this.write_file_header ( file, this.css_path_package, this.settings.pkg_name );
+ this.write_navi_packages ( file, tree );
+ this.write_packages_content ( file, tree );
+ this.write_file_footer ( file );
+ file = null;
+
+
+ this.langlet = new Valadoc.LangletIndex ( settings );
+
+ Gee.ReadOnlyCollection<Package> packages = tree.get_package_list ();
+ foreach ( Package pkg in packages ) {
+ pkg.visit ( this );
+ }
+ }
+
+ public override void visit_package ( Package file ) {
+ string pkg_name = file.name;
+ string path = GLib.Path.build_filename ( this.settings.path, pkg_name );
+ this.package_dir_name = pkg_name;
+
+ var rt = DirUtils.create ( path, 0777 );
+ rt = DirUtils.create ( GLib.Path.build_filename ( path, "img" ), 0777 );
+
+ GLib.FileStream ifile = GLib.FileStream.open ( GLib.Path.build_filename ( path, "index.htm" ), "w" );
+ this.write_file_header ( ifile, this.css_path, pkg_name );
+ this.write_navi_file ( ifile, file, file );
+ this.write_file_content ( ifile, file, file );
+ this.write_file_footer ( ifile );
+ ifile = null;
+
+ file.visit_namespaces ( this );
+ }
+
+ public override void visit_namespace ( Namespace ns ) {
+ string rpath = this.get_real_path ( ns );
+
+ if ( ns.name != null ) {
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w" );
+ this.write_file_header ( file, this.css_path, ns.full_name() );
+ this.write_navi_namespace ( file, ns );
+ this.write_namespace_content ( file, ns, ns );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ // file:
+ ns.visit_namespaces ( this );
+ ns.visit_classes ( this );
+ ns.visit_interfaces ( this );
+ ns.visit_structs ( this );
+ ns.visit_enums ( this );
+ ns.visit_error_domains ( this );
+ ns.visit_delegates ( this );
+ ns.visit_methods ( this );
+ ns.visit_fields ( this );
+ ns.visit_constants ( this );
+ }
+
+ public override void visit_interface ( Interface iface ) {
+ string rpath = this.get_real_path ( iface );
+
+ iface.visit_classes ( this );
+ iface.visit_structs ( this );
+ iface.visit_delegates ( this );
+ iface.visit_methods ( this );
+ iface.visit_signals ( this );
+ iface.visit_properties ( this );
+ iface.visit_fields ( this );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, iface.full_name() );
+ this.write_navi_interface ( file, iface, iface );
+ this.write_interface_content ( file, iface, iface );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void visit_class ( Class cl ) {
+ string rpath = this.get_real_path ( cl );
+
+ cl.visit_construction_methods ( this );
+ cl.visit_classes ( this );
+ cl.visit_structs ( this );
+ cl.visit_enums ( this );
+ cl.visit_delegates ( this );
+ cl.visit_methods ( this );
+ cl.visit_signals ( this );
+ cl.visit_properties ( this );
+ cl.visit_fields ( this );
+ cl.visit_constants ( this );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, cl.full_name() );
+ this.write_navi_class ( file, cl, cl );
+ this.write_class_content ( file, cl, cl );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void visit_struct ( Struct stru ) {
+ string rpath = this.get_real_path ( stru );
+
+ stru.visit_construction_methods ( this );
+ stru.visit_methods ( this );
+ stru.visit_fields ( this );
+ stru.visit_constants ( this );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, stru.full_name() );
+ this.write_navi_struct ( file, stru, stru );
+ this.write_struct_content ( file, stru, stru );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void visit_error_domain ( ErrorDomain errdom ) {
+ string rpath = this.get_real_path ( errdom );
+
+ errdom.visit_methods ( this );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, errdom.full_name() );
+ this.write_navi_error_domain ( file, errdom, errdom );
+ this.write_error_domain_content ( file, errdom, errdom );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void visit_enum ( Enum en ) {
+ string rpath = this.get_real_path ( en );
+
+ en.visit_enum_values ( this );
+ en.visit_methods ( this );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, en.full_name() );
+ this.write_navi_enum ( file, en, en );
+ this.write_enum_content ( file, en, en );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void visit_property ( Property prop ) {
+ string rpath = this.get_real_path ( prop );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, prop.full_name() );
+ this.write_navi_property ( file, prop );
+ this.write_property_content ( file, prop );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void visit_constant ( Constant constant, ConstantHandler parent ) {
+ string rpath = this.get_real_path ( constant );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, constant.full_name() );
+ this.write_navi_constant ( file, constant );
+ this.write_constant_content ( file, constant, parent );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void visit_field ( Field field, FieldHandler parent ) {
+ string rpath = this.get_real_path ( field );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, field.full_name() );
+ this.write_navi_field ( file, field );
+ this.write_field_content ( file, field, parent );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void visit_error_code ( ErrorCode errcode ) {
+ }
+
+ public override void visit_enum_value ( EnumValue enval ) {
+ }
+
+ public override void visit_delegate ( Delegate del ) {
+ string rpath = this.get_real_path ( del );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, del.full_name() );
+ this.write_navi_delegate ( file, del );
+ this.write_delegate_content ( file, del );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void visit_signal ( Signal sig ) {
+ string rpath = this.get_real_path ( sig );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, sig.full_name() );
+ this.write_navi_signal ( file, sig );
+ write_signal_content ( file, sig );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void visit_method ( Method m, Valadoc.MethodHandler parent ) {
+ string rpath = this.get_real_path ( m );
+
+ GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
+ this.write_file_header ( file, this.css_path, m.full_name() );
+ this.write_navi_method ( file, m );
+ this.write_method_content ( file, m, parent );
+ this.write_file_footer ( file );
+ file = null;
+ }
+
+ public override void cleanups () {
+ }
+}
+
+
+
+
+
+[ModuleInit]
+public Type register_plugin ( ) {
+ return typeof ( Valadoc.HtmlDoclet );
+}
+
Added: trunk/src/doclets/htm/taglets/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,29 @@
+# src/Makefile.am
+
+NULL =
+
+
+SUBDIRS = \
+ image \
+ see \
+ link \
+ center \
+ right \
+ italic \
+ bold \
+ source \
+ underline \
+ return \
+ string \
+ throws \
+ notification\
+ version \
+ table \
+ cell \
+ list \
+ listelement\
+ parameter \
+ wikilink \
+ $(NULL)
+
+
Added: trunk/src/doclets/htm/taglets/bold/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/bold/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletbold_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletbold.vala.stamp
+
+
+libtagletbold.vala.stamp: $(libtagletbold_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletbolddir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletbold_LTLIBRARIES = libtagletbold.la
+
+
+libtagletbold_la_SOURCES = \
+ libtagletbold.vala.stamp \
+ $(libtagletbold_VALASOURCES:.vala=.c) \
+ $(libtagletbold_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletbold_la_LDFLAGS = -module -avoid-version
+
+
+libtagletbold_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletbold_VALASOURCES) libtagletbold.vala.stamp
Added: trunk/src/doclets/htm/taglets/bold/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/bold/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( BoldHtmlHelperDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/cell/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/cell/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtaglettablecell_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtaglettablecell.vala.stamp
+
+
+libtaglettablecell.vala.stamp: $(libtaglettablecell_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+taglettablecelldir = $(libdir)/valadoc/plugins/html/taglets/
+
+taglettablecell_LTLIBRARIES = libtaglettablecell.la
+
+
+libtaglettablecell_la_SOURCES = \
+ libtaglettablecell.vala.stamp \
+ $(libtaglettablecell_VALASOURCES:.vala=.c) \
+ $(libtaglettablecell_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtaglettablecell_la_LDFLAGS = -module -avoid-version
+
+
+libtaglettablecell_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtaglettablecell_VALASOURCES) libtaglettablecell.vala.stamp
Added: trunk/src/doclets/htm/taglets/cell/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/cell/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( TableCellHtmlHelperDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/center/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/center/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletcenter_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletcenter.vala.stamp
+
+
+libtagletcenter.vala.stamp: $(libtagletcenter_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletcenterdir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletcenter_LTLIBRARIES = libtagletcenter.la
+
+
+libtagletcenter_la_SOURCES = \
+ libtagletcenter.vala.stamp \
+ $(libtagletcenter_VALASOURCES:.vala=.c) \
+ $(libtagletcenter_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletcenter_la_LDFLAGS = -module -avoid-version
+
+
+libtagletcenter_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletcenter_VALASOURCES) libtagletcenter.vala.stamp
Added: trunk/src/doclets/htm/taglets/center/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/center/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( CenterHtmlHelperDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/image/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/image/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletimage_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletimage.vala.stamp
+
+
+libtagletimage.vala.stamp: $(libtagletimage_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletimagedir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletimage_LTLIBRARIES = libtagletimage.la
+
+
+libtagletimage_la_SOURCES = \
+ libtagletimage.vala.stamp \
+ $(libtagletimage_VALASOURCES:.vala=.c) \
+ $(libtagletimage_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletimage_la_LDFLAGS = -module -avoid-version
+
+
+libtagletimage_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletimage_VALASOURCES) libtagletimage.vala.stamp
Added: trunk/src/doclets/htm/taglets/image/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/image/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( ImageHtmlHelperDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/italic/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/italic/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletitalic_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletitalic.vala.stamp
+
+
+libtagletitalic.vala.stamp: $(libtagletitalic_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletitalicdir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletitalic_LTLIBRARIES = libtagletitalic.la
+
+
+libtagletitalic_la_SOURCES = \
+ libtagletitalic.vala.stamp \
+ $(libtagletitalic_VALASOURCES:.vala=.c) \
+ $(libtagletitalic_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletitalic_la_LDFLAGS = -module -avoid-version
+
+
+libtagletitalic_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletitalic_VALASOURCES) libtagletitalic.vala.stamp
Added: trunk/src/doclets/htm/taglets/italic/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/italic/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( ItalicHtmlHelperDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/link/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/link/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletlink_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletlink.vala.stamp
+
+
+libtagletlink.vala.stamp: $(libtagletlink_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletlinkdir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletlink_LTLIBRARIES = libtagletlink.la
+
+
+libtagletlink_la_SOURCES = \
+ libtagletlink.vala.stamp \
+ $(libtagletlink_VALASOURCES:.vala=.c) \
+ $(libtagletlink_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletlink_la_LDFLAGS = -module -avoid-version
+
+
+libtagletlink_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletlink_VALASOURCES) libtagletlink.vala.stamp
Added: trunk/src/doclets/htm/taglets/link/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/link/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,54 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+public class Valadoc.LinkHtmlTaglet : Valadoc.LinkHtmlHelperTaglet {
+ protected override string? get_link ( Settings settings, Tree tree, DocumentedElement element, DocumentedElement? pos ) {
+ return get_html_link ( settings, element, pos );
+ }
+
+ public override string to_string () {
+ return to_string_imp ( );
+ }
+
+ public override bool write ( void* res, int max, int index ) {
+ return write_imp ( res, max, index );
+ }
+
+ public override bool parse ( Settings settings, Tree tree, DocumentedElement me, string content, out string[] errmsg ) {
+ return this.parse_imp ( settings, tree, me, content, out errmsg );
+ }
+}
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ GLib.Type type = typeof ( LinkHtmlTaglet );
+ taglets.set ( "link", type );
+ return type;
+}
+
+
+
Added: trunk/src/doclets/htm/taglets/list/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/list/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletlist_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletlist.vala.stamp
+
+
+libtagletlist.vala.stamp: $(libtagletlist_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletlistdir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletlist_LTLIBRARIES = libtagletlist.la
+
+
+libtagletlist_la_SOURCES = \
+ libtagletlist.vala.stamp \
+ $(libtagletlist_VALASOURCES:.vala=.c) \
+ $(libtagletlist_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletlist_la_LDFLAGS = -module -avoid-version
+
+
+libtagletlist_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletlist_VALASOURCES) libtagletlist.vala.stamp
Added: trunk/src/doclets/htm/taglets/list/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/list/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,34 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( ListHtmlHelperDocElement );
+}
+
+
+
Added: trunk/src/doclets/htm/taglets/listelement/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/listelement/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletlistelement_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletlistelement.vala.stamp
+
+
+libtagletlistelement.vala.stamp: $(libtagletlistelement_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletimagedir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletimage_LTLIBRARIES = libtagletlistelement.la
+
+
+libtagletlistelement_la_SOURCES = \
+ libtagletlistelement.vala.stamp \
+ $(libtagletlistelement_VALASOURCES:.vala=.c) \
+ $(libtagletlistelement_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletlistelement_la_LDFLAGS = -module -avoid-version
+
+
+libtagletlistelement_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletlistelement_VALASOURCES) libtagletlistelement.vala.stamp
Added: trunk/src/doclets/htm/taglets/listelement/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/listelement/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( ListHtmlHelperEntryDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/notification/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/notification/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletnotification_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletnotification.vala.stamp
+
+
+libtagletnotification.vala.stamp: $(libtagletnotification_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . --save-temps $^
+ touch $@
+
+
+
+
+tagletnotificationdir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletnotification_LTLIBRARIES = libtagletnotification.la
+
+
+libtagletnotification_la_SOURCES = \
+ libtagletnotification.vala.stamp \
+ $(libtagletnotification_VALASOURCES:.vala=.c) \
+ $(libtagletnotification_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletnotification_la_LDFLAGS = -module -avoid-version
+
+
+libtagletnotification_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletnotification_VALASOURCES) libtagletnotification.vala.stamp
Added: trunk/src/doclets/htm/taglets/notification/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/notification/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( NotificationHtmlHelperDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/parameter/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/parameter/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletparameter_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletparameter.vala.stamp
+
+
+libtagletparameter.vala.stamp: $(libtagletparameter_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletparameterdir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletparameter_LTLIBRARIES = libtagletparameter.la
+
+
+libtagletparameter_la_SOURCES = \
+ libtagletparameter.vala.stamp \
+ $(libtagletparameter_VALASOURCES:.vala=.c) \
+ $(libtagletparameter_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletparameter_la_LDFLAGS = -module -avoid-version
+
+
+libtagletparameter_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletparameter_VALASOURCES) libtagletparameter.vala.stamp
Added: trunk/src/doclets/htm/taglets/parameter/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/parameter/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,32 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ GLib.Type type = typeof ( ParameterHtmlTaglet );
+ taglets.set ( "param", type );
+ return type;
+}
+
Added: trunk/src/doclets/htm/taglets/return/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/return/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletreturn_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletreturn.vala.stamp
+
+
+libtagletreturn.vala.stamp: $(libtagletreturn_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletXXXXdir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletXXXX_LTLIBRARIES = libtagletreturn.la
+
+
+libtagletreturn_la_SOURCES = \
+ libtagletreturn.vala.stamp \
+ $(libtagletreturn_VALASOURCES:.vala=.c) \
+ $(libtagletreturn_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletreturn_la_LDFLAGS = -module -avoid-version
+
+
+libtagletreturn_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletreturn_VALASOURCES) libtagletreturn.vala.stamp
Added: trunk/src/doclets/htm/taglets/return/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/return/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,34 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ GLib.Type type = typeof ( ReturnHtmlTaglet );
+ taglets.set ( "return", type );
+ return type;
+}
+
Added: trunk/src/doclets/htm/taglets/right/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/right/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletright_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletright.vala.stamp
+
+
+libtagletright.vala.stamp: $(libtagletright_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletrightdir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletright_LTLIBRARIES = libtagletright.la
+
+
+libtagletright_la_SOURCES = \
+ libtagletright.vala.stamp \
+ $(libtagletright_VALASOURCES:.vala=.c) \
+ $(libtagletright_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletright_la_LDFLAGS = -module -avoid-version
+
+
+libtagletright_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletright_VALASOURCES) libtagletright.vala.stamp
Added: trunk/src/doclets/htm/taglets/right/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/right/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( RightAlignedHtmlHelperDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/see/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/see/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletsee_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletsee.vala.stamp
+
+
+libtagletsee.vala.stamp: $(libtagletsee_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletseedir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletsee_LTLIBRARIES = libtagletsee.la
+
+
+libtagletsee_la_SOURCES = \
+ libtagletsee.vala.stamp \
+ $(libtagletsee_VALASOURCES:.vala=.c) \
+ $(libtagletsee_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletsee_la_LDFLAGS = -module -avoid-version
+
+
+libtagletsee_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletsee_VALASOURCES) libtagletsee.vala.stamp
Added: trunk/src/doclets/htm/taglets/see/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/see/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,58 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+public class Valadoc.SeeDevhelpTaglet : SeeHtmlHelperTaglet {
+ protected override string? get_link ( Settings settings, Tree tree, DocumentedElement element, DocumentedElement? pos ) {
+ return get_html_link ( settings, element, pos );
+ }
+
+ public override bool write_block_start ( void* ptr ) {
+ return this.write_block_start_imp ( ptr );
+ }
+
+ public override bool write_block_end ( void* res ) {
+ return this.write_block_end_imp ( res );
+ }
+
+ public override bool write ( void* res, int max, int index ) {
+ return this.write_imp ( res, max, index );
+ }
+
+ public override bool parse ( Settings settings, Tree tree, DocumentedElement me, Gee.Collection<DocElement> content, out string[] errmsg ) {
+ return this.parse_imp ( settings, tree, me, content, out errmsg );
+ }
+}
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ GLib.Type type = typeof ( SeeDevhelpTaglet );
+ taglets.set ( "see", type );
+ return type;
+}
+
Added: trunk/src/doclets/htm/taglets/source/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/source/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletsrcsample_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletsrcsample.vala.stamp
+
+
+libtagletsrcsample.vala.stamp: $(libtagletsrcsample_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletsrcsampledir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletsrcsample_LTLIBRARIES = libtagletsrcsample.la
+
+
+libtagletsrcsample_la_SOURCES = \
+ libtagletsrcsample.vala.stamp \
+ $(libtagletsrcsample_VALASOURCES:.vala=.c) \
+ $(libtagletsrcsample_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletsrcsample_la_LDFLAGS = -module -avoid-version
+
+
+libtagletsrcsample_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletsrcsample_VALASOURCES) libtagletsrcsample.vala.stamp
Added: trunk/src/doclets/htm/taglets/source/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/source/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( SourceCodeHtmlHelerDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/string/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/string/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletstring_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletstring.vala.stamp
+
+
+libtagletstring.vala.stamp: $(libtagletstring_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletstringdir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletstring_LTLIBRARIES = libtagletstring.la
+
+
+libtagletstring_la_SOURCES = \
+ libtagletstring.vala.stamp \
+ $(libtagletstring_VALASOURCES:.vala=.c) \
+ $(libtagletstring_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletstring_la_LDFLAGS = -module -avoid-version
+
+
+libtagletstring_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletstring_VALASOURCES) libtagletstring.vala.stamp
Added: trunk/src/doclets/htm/taglets/string/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/string/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,37 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ GLib.Type type = typeof ( StringHtmlTaglet );
+ taglets.set ( "", type );
+ return type;
+}
+
+
+
Added: trunk/src/doclets/htm/taglets/table/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/table/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtaglettable_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtaglettable.vala.stamp
+
+
+libtaglettable.vala.stamp: $(libtaglettable_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletimagedir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletimage_LTLIBRARIES = libtaglettable.la
+
+
+libtaglettable_la_SOURCES = \
+ libtaglettable.vala.stamp \
+ $(libtaglettable_VALASOURCES:.vala=.c) \
+ $(libtaglettable_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtaglettable_la_LDFLAGS = -module -avoid-version
+
+
+libtaglettable_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtaglettable_VALASOURCES) libtaglettable.vala.stamp
Added: trunk/src/doclets/htm/taglets/table/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/table/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( TableHtmlHelperDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/throws/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/throws/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libexceptionparameter_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libexceptionparameter.vala.stamp
+
+
+libexceptionparameter.vala.stamp: $(libexceptionparameter_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../htmlhelpers --pkg libhtmlhelpers-1.0 --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+
+
+exceptionparameterdir = $(libdir)/valadoc/plugins/html/taglets/
+
+exceptionparameter_LTLIBRARIES = libexceptionparameter.la
+
+
+libexceptionparameter_la_SOURCES = \
+ libexceptionparameter.vala.stamp \
+ $(libexceptionparameter_VALASOURCES:.vala=.c) \
+ $(libexceptionparameter_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libexceptionparameter_la_LDFLAGS = -module -avoid-version
+
+
+libexceptionparameter_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libexceptionparameter_VALASOURCES) libexceptionparameter.vala.stamp
Added: trunk/src/doclets/htm/taglets/throws/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/throws/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,34 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ GLib.Type type = typeof ( ExceptionHtmlTaglet );
+ taglets.set ( "throws", type );
+ return type;
+}
+
+
Added: trunk/src/doclets/htm/taglets/underline/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/underline/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,54 @@
+# src/Makefile.am
+
+
+
+libtagletunderline_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletunderline.vala.stamp
+
+
+libtagletunderline.vala.stamp: $(libtagletunderline_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+tagletunderlinedir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletunderline_LTLIBRARIES = libtagletunderline.la
+
+
+libtagletunderline_la_SOURCES = \
+ libtagletunderline.vala.stamp \
+ $(libtagletunderline_VALASOURCES:.vala=.c) \
+ $(libtagletunderline_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletunderline_la_LDFLAGS = -module -avoid-version
+
+
+libtagletunderline_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletunderline_VALASOURCES) libtagletunderline.vala.stamp
Added: trunk/src/doclets/htm/taglets/underline/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/underline/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( UnderlinedHtmlHelperDocElement );
+}
+
+
Added: trunk/src/doclets/htm/taglets/version/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/version/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletversion_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletversion.vala.stamp
+
+
+libtagletversion.vala.stamp: $(libtagletversion_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../htmlhelpers --vapidir ../../../../vapi --pkg valadoc-1.0 --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletversiondir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletversion_LTLIBRARIES = libtagletversion.la
+
+
+libtagletversion_la_SOURCES = \
+ libtagletversion.vala.stamp \
+ $(libtagletversion_VALASOURCES:.vala=.c) \
+ $(libtagletversion_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletversion_la_LDFLAGS = -module -avoid-version
+
+
+libtagletversion_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletversion_VALASOURCES) libtagletversion.vala.stamp
Added: trunk/src/doclets/htm/taglets/version/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/version/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,36 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ GLib.Type type = typeof ( SinceHtmlTaglet );
+ taglets.set ( "since", type );
+ return type;
+}
+
+
+
Added: trunk/src/doclets/htm/taglets/wikilink/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/wikilink/Makefile.am Wed Jan 28 02:37:06 2009
@@ -0,0 +1,55 @@
+# src/Makefile.am
+
+
+
+libtagletwikilink_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletwikilink.vala.stamp
+
+
+libtagletwikilink.vala.stamp: $(libtagletwikilink_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --basedir . $^
+ touch $@
+
+
+
+
+tagletwikilinkdir = $(libdir)/valadoc/plugins/html/taglets/
+
+tagletwikilink_LTLIBRARIES = libtagletwikilink.la
+
+
+libtagletwikilink_la_SOURCES = \
+ libtagletwikilink.vala.stamp \
+ $(libtagletwikilink_VALASOURCES:.vala=.c) \
+ $(libtagletwikilink_VALASOURCES:.vala=.h) \
+ $(NULL)
+
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../../htmlhelpers/ \
+ -I ../../ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+libtagletwikilink_la_LDFLAGS = -module -avoid-version
+
+
+libtagletwikilink_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ ../../../htmlhelpers/libhtmlhelpers.la \
+ $(GLIB_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletwikilink_VALASOURCES) libtagletwikilink.vala.stamp
Added: trunk/src/doclets/htm/taglets/wikilink/taglet.vala
==============================================================================
--- (empty file)
+++ trunk/src/doclets/htm/taglets/wikilink/taglet.vala Wed Jan 28 02:37:06 2009
@@ -0,0 +1,33 @@
+/*
+ * Valadoc - a documentation tool for vala.
+ * Copyright (C) 2008 Florian Brosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
+
+
+
+
+[ModuleInit]
+public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
+ return typeof ( LinkHtmlHelperDocElement );
+}
+
+
Modified: trunk/src/doclets/htmlhelpers/Makefile.am
==============================================================================
--- trunk/src/doclets/htmlhelpers/Makefile.am (original)
+++ trunk/src/doclets/htmlhelpers/Makefile.am Wed Jan 28 02:37:06 2009
@@ -29,6 +29,7 @@
AM_CFLAGS = \
-I ../../libvaladoc/ \
+ $(LIBGVC_CFLAGS) \
$(LIBVALA_CFLAGS) \
$(GLIB_CFLAGS) \
$(NULL)
@@ -36,6 +37,7 @@
libhtmlhelper_la_LIBADD = \
../../libvaladoc/libvaladoc.la \
+ $(LIBGVC_LIBS) \
$(LIBVALA_LIBS) \
$(GLIB_LIBS) \
$(NULL)
Modified: trunk/src/doclets/htmlhelpers/htmlhelpers.vala
==============================================================================
--- trunk/src/doclets/htmlhelpers/htmlhelpers.vala (original)
+++ trunk/src/doclets/htmlhelpers/htmlhelpers.vala Wed Jan 28 02:37:06 2009
@@ -5,272 +5,279 @@
namespace Valadoc {
+ public const string css_inline_navigation = "main_inline_navigation";
+ public const string css_inline_navigation_errorcode = "main_inline_navigation_errorcode";
+ public const string css_inline_navigation_enumvalue = "main_inline_navigation_enumvalue";
+ public const string css_inline_navigation_property = "main_inline_navigation_property";
+ public const string css_inline_navigation_virtual_property = "main_inline_navigation_virtual_property";
+ public const string css_inline_navigation_abstract_property = "main_inline_navigation_abstract_property";
+ public const string css_inline_navigation_method = "main_inline_navigation_method";
+ public const string css_inline_navigation_static_method = "main_inline_navigation_static_method";
+ public const string css_inline_navigation_virtual_method = "main_inline_navigation_virtual_method";
+ public const string css_inline_navigation_abstract_method = "main_inline_navigation_abstract_method";
+ public const string css_inline_navigation_construction_method = "main_inline_navigation_construction_method";
+ public const string css_inline_navigation_brief_description = "main_inline_navigation_brief_description";
+ public const string css_inline_navigation_signal = "main_inline_navigation_signal";
+ public const string css_inline_navigation_fields = "main_inline_navigation_fields";
+ public const string css_inline_navigation_abstract_class = "main_inline_navigation_abstract_class";
+ public const string css_inline_navigation_class = "main_inline_navigation_class";
+ public const string css_inline_navigation_enum = "main_inline_navigation_enum";
+ public const string css_inline_navigation_struct = "main_inline_navigation_struct";
+ public const string css_inline_navigation_delegate = "main_inline_navigation_delegate";
+ public const string css_inline_navigation_constant = "main_inline_navigation_constant";
+ public const string css_inline_navigation_namespace = "main_inline_navigation_namespace";
+ public const string css_inline_navigation_package = "main_inline_navigation_package";
+ public const string css_inline_navigation_interface = "main_navigation_interface";
+ public const string css_inline_navigation_errordomain = "main_inline_navigation_errordomain";
+ public const string css_site_header = "site_header";
+ public const string css_navi_package_index = "navi_package_index";
+ public const string css_navi_package = "navi_package";
+ public const string css_navi_creation_method = "navi_creation_method";
+ public const string css_navi_error_domain = "navi_error_domain";
+ public const string css_navi_namespace = "navi_namespace";
+ public const string css_navi_abstract_method = "navi_abstract_method";
+ public const string css_navi_virtual_method = "navi_virtual_method";
+ public const string css_navi_static_method = "navi_static_method";
+ public const string css_navi_construction_method = "navi_construction_method";
+ public const string css_navi_method = "navi_method";
+ public const string css_navi_struct = "navi_struct";
+ public const string css_navi_iface = "navi_iface";
+ public const string css_navi_field = "navi_field";
+ public const string css_navi_class = "navi_class";
+ public const string css_navi_abstract_class = "navi_abstract_class";
+ public const string css_navi_enum = "navi_enum";
+ public const string css_navi_link = "navi_link";
+ public const string css_navi_constant = "navi_constant";
+ public const string css_navi_prop = "navi_prop";
+ public const string css_navi_abstract_prop = "navi_abstract_prop";
+ public const string css_navi_virtual_prop = "navi_virtual_prop";
+ public const string css_navi_del = "navi_del";
+ public const string css_navi_sig = "navi_sig";
+ public const string css_navi = "navi_main";
+ public const string css_navi_enval = "main_navi_enval";
+ public const string css_navi_errdomcode = "main_navi_errdomcode";
+ public const string css_navi_hr = "navi_hr";
+ public const string css_errordomain_table_name = "main_errordomain_table_name";
+ public const string css_errordomain_table_text = "main_errordomain_table_text";
+ public const string css_errordomain_table = "main_errordomain_table";
+ public const string css_enum_table_name = "main_enum_table_name";
+ public const string css_enum_table_text = "main_enum_table_text";
+ public const string css_enum_table = "main_enum_table";
+ public const string css_diagram = "main_diagram";
+ public const string css_see_list = "main_see_list";
+ public const string css_wiki_table = "main_table";
+ public const string css_notification_area = "main_notification";
+ public const string css_source_sample = "main_sourcesample";
+ public const string css_exception_table = "main_parameter_table";
+ public const string css_parameter_table_text = "main_parameter_table_text";
+ public const string css_parameter_table_name = "main_parameter_table_name";
+ public const string css_parameter_table = "main_parameter_table";
+ public const string css_title = "main_title";
+ public const string css_other_type = "main_other_type";
+ public const string css_basic_type = "main_basic_type";
+ public const string css_keyword = "main_keyword";
+ public const string css_optional_parameter = "main_optional_parameter";
+ public const string css_code_definition = "main_code_definition";
+ public const string css_headline_hr = "main_hr";
+ public const string css_hr = "main_hr";
+ public const string css_list_errdom = "main_list_errdom";
+ public const string css_list_en = "main_list_en";
+ public const string css_list_ns = "main_list_ns";
+ public const string css_list_cl = "main_list_cl";
+ public const string css_list_iface = "main_list_iface";
+ public const string css_list_stru = "main_list_stru";
+ public const string css_list_field = "main_list_field";
+ public const string css_list_prop = "main_list_prop";
+ public const string css_list_del = "main_list_del";
+ public const string css_list_sig = "main_list_sig";
+ public const string css_list_m = "main_list_m";
+ public const string css_style_navigation = "site_navigation";
+ public const string css_style_content = "site_content";
+ public const string css_style_body = "site_body";
+ public const string css_content_link_constant = "css_content_link_constant";
+ public const string css_content_link_namespace = "css_content_link_namespace";
+ public const string css_content_link_struct = "css_content_link_struct";
+ public const string css_content_link_interface = "css_content_link_interface";
+ public const string css_content_link_enum = "css_content_link_enum";
+ public const string css_content_link_errordomain = "css_content_link_errordomain";
+ public const string css_content_link_delegate = "css_content_link_delegate";
+ public const string css_content_link_signal = "css_content_link_signal";
+ public const string css_content_link_field = "css_content_link_field";
+ public const string css_content_link_enumvalue = "css_content_link_enumvalue";
+ public const string css_content_link_errorcode = "css_content_link_errorcode";
+ public const string css_content_link_class = "css_content_link_class";
+ public const string css_content_link_abstract_class = "css_content_link_abstract_class";
+ public const string css_content_link_property = "css_content_link_property";
+ public const string css_content_link_virtual_property = "css_content_link_virtual_property";
+ public const string css_content_link_abstract_property = "css_content_link_abstract_property";
+ public const string css_content_link_method = "css_content_link_method";
+ public const string css_content_link_static_method = "css_content_link_static_method";
+ public const string css_content_link_virtual_method = "css_content_link_virtual_method";
+ public const string css_content_link_abstract_method = "css_content_link_abstract_method";
+ public const string css_content_link_construction_method = "css_content_link_construction_method";
+
+
+ public string? get_html_link ( Settings settings, DocumentedElement element, DocumentedElement? pos ) {
+ if ( element is Package ) {
+ return ( ((Package)element).is_visitor_accessible() == true )? ((pos == null)? "" : "../") + element.name + "/index.htm" : null;
+ }
+
+ if ( element is Visitable ) {
+ if ( ((Visitable)element).is_visitor_accessible () == false )
+ return null;
-public const string css_inline_navigation = "main_inline_navigation";
-
-public const string css_inline_navigation_errorcode = "main_inline_navigation_errorcode";
-public const string css_inline_navigation_enumvalue = "main_inline_navigation_enumvalue";
-
-public const string css_inline_navigation_property = "main_inline_navigation_property";
-public const string css_inline_navigation_virtual_property = "main_inline_navigation_virtual_property";
-public const string css_inline_navigation_abstract_property = "main_inline_navigation_abstract_property";
-
-public const string css_inline_navigation_method = "main_inline_navigation_method";
-public const string css_inline_navigation_static_method = "main_inline_navigation_static_method";
-public const string css_inline_navigation_virtual_method = "main_inline_navigation_virtual_method";
-public const string css_inline_navigation_abstract_method = "main_inline_navigation_abstract_method";
-public const string css_inline_navigation_construction_method = "main_inline_navigation_construction_method";
-
-
-
-public const string css_inline_navigation_brief_description = "main_inline_navigation_brief_description";
-
-public const string css_inline_navigation_signal = "main_inline_navigation_signal";
-public const string css_inline_navigation_fields = "main_inline_navigation_fields";
-public const string css_inline_navigation_abstract_class = "main_inline_navigation_abstract_class";
-public const string css_inline_navigation_class = "main_inline_navigation_class";
-public const string css_inline_navigation_enum = "main_inline_navigation_enum";
-public const string css_inline_navigation_struct = "main_inline_navigation_struct";
-public const string css_inline_navigation_delegate = "main_inline_navigation_delegate";
-public const string css_inline_navigation_constant = "main_inline_navigation_constant";
-public const string css_inline_navigation_namespace = "main_inline_navigation_namespace";
-public const string css_inline_navigation_package = "main_inline_navigation_package";
-public const string css_inline_navigation_interface = "main_navigation_interface";
-public const string css_inline_navigation_errordomain = "main_inline_navigation_errordomain";
-
-public const string css_site_header = "site_header";
-
-public const string css_navi_package_index = "navi_package_index";
-public const string css_navi_package = "navi_package";
-
-public const string css_navi_creation_method = "navi_creation_method";
-
-public const string css_navi_error_domain = "navi_error_domain";
-public const string css_navi_namespace = "navi_namespace";
-public const string css_navi_abstract_method = "navi_abstract_method";
-public const string css_navi_virtual_method = "navi_virtual_method";
-public const string css_navi_static_method = "navi_static_method";
-public const string css_navi_construction_method = "navi_construction_method";
-public const string css_navi_method = "navi_method";
-public const string css_navi_struct = "navi_struct";
-public const string css_navi_iface = "navi_iface";
-public const string css_navi_field = "navi_field";
-public const string css_navi_class = "navi_class";
-public const string css_navi_abstract_class = "navi_abstract_class";
-public const string css_navi_enum = "navi_enum";
-public const string css_navi_link = "navi_link";
-public const string css_navi_constant = "navi_constant";
-public const string css_navi_prop = "navi_prop";
-public const string css_navi_abstract_prop = "navi_abstract_prop";
-public const string css_navi_virtual_prop = "navi_virtual_prop";
-public const string css_navi_del = "navi_del";
-public const string css_navi_sig = "navi_sig";
-public const string css_navi = "navi_main";
-public const string css_navi_enval = "main_navi_enval";
-public const string css_navi_errdomcode = "main_navi_errdomcode";
-public const string css_navi_hr = "navi_hr";
-
-public const string css_errordomain_table_name = "main_errordomain_table_name";
-public const string css_errordomain_table_text = "main_errordomain_table_text";
-public const string css_errordomain_table = "main_errordomain_table";
-
-
-public const string css_enum_table_name = "main_enum_table_name";
-public const string css_enum_table_text = "main_enum_table_text";
-public const string css_enum_table = "main_enum_table";
-
-public const string css_diagram = "main_diagram";
-public const string css_see_list = "main_see_list";
-public const string css_exception_table = "main_parameter_table";
-public const string css_parameter_table_text = "main_parameter_table_text";
-public const string css_parameter_table_name = "main_parameter_table_name";
-public const string css_parameter_table = "main_parameter_table";
-public const string css_title = "main_title";
-public const string css_other_type = "main_other_type";
-public const string css_basic_type = "main_basic_type";
-public const string css_keyword = "main_keyword";
-public const string css_optional_parameter = "main_optional_parameter";
-public const string css_code_definition = "main_code_definition";
-public const string css_headline_hr = "main_hr";
-public const string css_hr = "main_hr";
-public const string css_list_errdom = "main_list_errdom";
-public const string css_list_en = "main_list_en";
-public const string css_list_ns = "main_list_ns";
-public const string css_list_cl = "main_list_cl";
-public const string css_list_iface = "main_list_iface";
-public const string css_list_stru = "main_list_stru";
-public const string css_list_field = "main_list_field";
-public const string css_list_prop = "main_list_prop";
-public const string css_list_del = "main_list_del";
-public const string css_list_sig = "main_list_sig";
-public const string css_list_m = "main_list_m";
-
-public const string css_style_navigation = "site_navigation";
-public const string css_style_content = "site_content";
-public const string css_style_body = "site_body";
-
-
+ if ( element.package.is_visitor_accessible () == false )
+ return null;
+ }
+ string prefix = "";
+ string tmp = "";
+
+ if ( element != pos ) {
+ prefix = "../" + element.package.name;
+ }
+ if ( element is Valadoc.EnumValue || element is Valadoc.ErrorCode ) {
+ tmp = "#" + element.name;
+ element = (DocumentedElement)element.parent;
+ }
-public const string css_content_link_constant = "css_content_link_constant";
-public const string css_content_link_namespace = "css_content_link_namespace";
-public const string css_content_link_struct = "css_content_link_struct";
-public const string css_content_link_interface = "css_content_link_interface";
-public const string css_content_link_enum = "css_content_link_enum";
-public const string css_content_link_errordomain = "css_content_link_errordomain";
-public const string css_content_link_delegate = "css_content_link_delegate";
-public const string css_content_link_signal = "css_content_link_signal";
-public const string css_content_link_field = "css_content_link_field";
-public const string css_content_link_enumvalue = "css_content_link_enumvalue";
-public const string css_content_link_errorcode = "css_content_link_errorcode";
-
-public const string css_content_link_class = "css_content_link_class";
-public const string css_content_link_abstract_class = "css_content_link_abstract_class";
-
-public const string css_content_link_property = "css_content_link_property";
-public const string css_content_link_virtual_property = "css_content_link_virtual_property";
-public const string css_content_link_abstract_property = "css_content_link_abstract_property";
-
-public const string css_content_link_method = "css_content_link_method";
-public const string css_content_link_static_method = "css_content_link_static_method";
-public const string css_content_link_virtual_method = "css_content_link_virtual_method";
-public const string css_content_link_abstract_method = "css_content_link_abstract_method";
-public const string css_content_link_construction_method = "css_content_link_construction_method";
-
-
-public string get_html_content_link_css_class ( Valadoc.Basic element ) {
- if ( element is Namespace ) {
- return css_content_link_namespace;
- }
- else if ( element is Struct ) {
- return css_content_link_struct;
- }
- else if ( element is Interface ) {
- return css_content_link_interface;
- }
- else if ( element is Class ) {
- if ( ((Class)element).is_abstract )
- return css_content_link_abstract_class;
- else
- return css_content_link_class;
- }
- else if ( element is Enum ) {
- return css_content_link_enum;
- }
- else if ( element is ErrorDomain ) {
- return css_content_link_errordomain;
- }
- else if ( element is Delegate ) {
- return css_content_link_delegate;
- }
- else if ( element is Method ) {
- if ( ((Method)element).is_constructor )
- return css_content_link_construction_method;
- else if ( ((Method)element).is_abstract )
- return css_content_link_abstract_method;
- else if ( ((Method)element).is_override || ((Method)element).is_override )
- return css_content_link_virtual_method;
- else if ( ((Method)element).is_static )
- return css_content_link_static_method;
- else
- return css_content_link_method;
- }
- else if ( element is Signal ) {
- return css_content_link_signal;
- }
- else if ( element is Property ) {
- if ( ((Property)element).is_virtual || ((Property)element).is_override )
- return css_content_link_virtual_property;
- else if ( ((Property)element).is_abstract )
- return css_content_link_abstract_property;
- else
- return css_content_link_property;
- }
- else if ( element is Field ) {
- return css_content_link_field;
+ return prefix + "/" + element.full_name () + ".html" + tmp;
}
- else if ( element is Constant ) {
- return css_content_link_constant;
- }
- else if ( element is EnumValue ) {
- return css_content_link_enumvalue;
- }
- else if ( element is ErrorCode ) {
- return css_content_link_errorcode;
- }
- return "";
-}
-
-
-
-public string get_html_inline_navigation_link_css_class ( Valadoc.Basic element ) {
- if ( element is Namespace ) {
- }
- else if ( element is Struct ) {
- return css_inline_navigation_struct;
- }
- else if ( element is Interface ) {
- return css_inline_navigation_interface;
- }
- else if ( element is Class ) {
- return (((Class)element).is_abstract)? css_inline_navigation_abstract_class : css_inline_navigation_class;
- }
- else if ( element is Enum ) {
- return css_inline_navigation_enum;
- }
- else if ( element is ErrorDomain ) {
- return css_inline_navigation_errordomain;
- }
- else if ( element is Delegate ) {
- return css_inline_navigation_delegate;
- }
- else if ( element is Method ) {
- if ( ((Method)element).is_static )
- return css_inline_navigation_static_method;
- else if ( ((Method)element).is_static )
- return css_inline_navigation_static_method;
- else if ( ((Method)element).is_constructor )
- return css_inline_navigation_construction_method;
- else if ( ((Method)element).is_abstract )
- return css_inline_navigation_abstract_method;
- else if ( ((Method)element).is_virtual || ((Method)element).is_override )
- return css_inline_navigation_virtual_method;
- else
- return css_inline_navigation_method;
- }
- else if ( element is Signal ) {
- return css_inline_navigation_signal;
- }
- else if ( element is Property ) {
- if ( ((Property)element).is_virtual || ((Property)element).is_override )
- return css_inline_navigation_virtual_property;
- else if ( ((Property)element).is_abstract )
- return css_inline_navigation_abstract_property;
- else
- return css_inline_navigation_property;
- }
- else if ( element is Field ) {
- return css_inline_navigation_fields;
- }
- else if ( element is Constant ) {
- return css_inline_navigation_constant;
- }
- else if ( element is EnumValue ) {
- return css_inline_navigation_enumvalue;
+ public string get_html_content_link_css_class ( Valadoc.Basic element ) {
+ if ( element is Namespace ) {
+ return css_content_link_namespace;
+ }
+ else if ( element is Struct ) {
+ return css_content_link_struct;
+ }
+ else if ( element is Interface ) {
+ return css_content_link_interface;
+ }
+ else if ( element is Class ) {
+ if ( ((Class)element).is_abstract )
+ return css_content_link_abstract_class;
+ else
+ return css_content_link_class;
+ }
+ else if ( element is Enum ) {
+ return css_content_link_enum;
+ }
+ else if ( element is ErrorDomain ) {
+ return css_content_link_errordomain;
+ }
+ else if ( element is Delegate ) {
+ return css_content_link_delegate;
+ }
+ else if ( element is Method ) {
+ if ( ((Method)element).is_constructor )
+ return css_content_link_construction_method;
+ else if ( ((Method)element).is_abstract )
+ return css_content_link_abstract_method;
+ else if ( ((Method)element).is_override || ((Method)element).is_override )
+ return css_content_link_virtual_method;
+ else if ( ((Method)element).is_static )
+ return css_content_link_static_method;
+ else
+ return css_content_link_method;
+ }
+ else if ( element is Signal ) {
+ return css_content_link_signal;
+ }
+ else if ( element is Property ) {
+ if ( ((Property)element).is_virtual || ((Property)element).is_override )
+ return css_content_link_virtual_property;
+ else if ( ((Property)element).is_abstract )
+ return css_content_link_abstract_property;
+ else
+ return css_content_link_property;
+ }
+ else if ( element is Field ) {
+ return css_content_link_field;
+ }
+ else if ( element is Constant ) {
+ return css_content_link_constant;
+ }
+ else if ( element is EnumValue ) {
+ return css_content_link_enumvalue;
+ }
+ else if ( element is ErrorCode ) {
+ return css_content_link_errorcode;
+ }
+ return "";
}
- else if ( element is ErrorCode ) {
- return css_inline_navigation_errorcode;
+
+ public string get_html_inline_navigation_link_css_class ( Valadoc.Basic element ) {
+ if ( element is Namespace ) {
+ return css_inline_navigation_namespace;
+ }
+ else if ( element is Struct ) {
+ return css_inline_navigation_struct;
+ }
+ else if ( element is Interface ) {
+ return css_inline_navigation_interface;
+ }
+ else if ( element is Class ) {
+ return (((Class)element).is_abstract)? css_inline_navigation_abstract_class : css_inline_navigation_class;
+ }
+ else if ( element is Enum ) {
+ return css_inline_navigation_enum;
+ }
+ else if ( element is ErrorDomain ) {
+ return css_inline_navigation_errordomain;
+ }
+ else if ( element is Delegate ) {
+ return css_inline_navigation_delegate;
+ }
+ else if ( element is Method ) {
+ if ( ((Method)element).is_static )
+ return css_inline_navigation_static_method;
+ else if ( ((Method)element).is_static )
+ return css_inline_navigation_static_method;
+ else if ( ((Method)element).is_constructor )
+ return css_inline_navigation_construction_method;
+ else if ( ((Method)element).is_abstract )
+ return css_inline_navigation_abstract_method;
+ else if ( ((Method)element).is_virtual || ((Method)element).is_override )
+ return css_inline_navigation_virtual_method;
+ else
+ return css_inline_navigation_method;
+ }
+ else if ( element is Signal ) {
+ return css_inline_navigation_signal;
+ }
+ else if ( element is Property ) {
+ if ( ((Property)element).is_virtual || ((Property)element).is_override )
+ return css_inline_navigation_virtual_property;
+ else if ( ((Property)element).is_abstract )
+ return css_inline_navigation_abstract_property;
+ else
+ return css_inline_navigation_property;
+ }
+ else if ( element is Field ) {
+ return css_inline_navigation_fields;
+ }
+ else if ( element is Constant ) {
+ return css_inline_navigation_constant;
+ }
+ else if ( element is EnumValue ) {
+ return css_inline_navigation_enumvalue;
+ }
+ else if ( element is ErrorCode ) {
+ return css_inline_navigation_errorcode;
+ }
+ else if ( element is Package ) {
+ return css_inline_navigation_package;
+ }
+ return "";
}
- return "";
-}
}
-/* ---- **/
+
public abstract class Valadoc.SeeHtmlHelperTaglet : MainTaglet {
public override int order { get { return 400; } }
private string name;
@@ -717,10 +724,6 @@
}
-/* ---- **/
-
-
-
public abstract class Valadoc.BasicHtmlLanglet : Valadoc.Langlet {
public Valadoc.Settings settings {
@@ -1394,7 +1397,7 @@
public override bool write ( void* res, int max, int index ) {
weak GLib.FileStream file = (GLib.FileStream)res;
- file.puts ( "<table border=\"1\"\n" );
+ file.printf ( "<table border=\"1\" class=\"%s\">\n", css_wiki_table );
foreach ( Gee.ArrayList<TableCellDocElement> row in this.cells ) {
int _max = row.size;
int _index = 0;
@@ -1427,7 +1430,7 @@
int _max = this.content.size;
int _index = 0;
- file.printf ( "\n<div>\n" );
+ file.printf ( "\n<div class=\"%s\">\n", css_notification_area );
foreach ( DocElement element in this.content ) {
element.write ( res, _max, _index );
@@ -1451,9 +1454,9 @@
public override bool write ( void* res, int max, int index ) {
weak GLib.FileStream file = (GLib.FileStream)res;
- file.puts ( "<pre>" );
+ file.printf ( "\n<div class=\"%s\">\n\t<pre>", css_source_sample );
file.puts ( src );
- file.puts ( "</pre>" );
+ file.puts ( "<pre>\n</div>" );
return true;
}
}
@@ -1575,28 +1578,43 @@
public class Valadoc.ImageHtmlHelperDocElement : ImageDocElement {
- protected ImageDocElementPosition position;
- protected string path;
+ private ImageDocElementPosition position;
+ private static uint counter = 0;
+
+ private string htmlpath;
+ private string npath;
+ private string path;
public override bool parse ( Settings settings, Tree tree, DocumentedElement me, string# path, ImageDocElementPosition pos ) {
+ if ( GLib.FileUtils.test ( path, GLib.FileTest.EXISTS | GLib.FileTest.IS_REGULAR ) == false )
+ return false;
+
+ weak string? dotpos = path.rchr ( -1, '.' );
+ this.htmlpath = GLib.Path.build_filename ( "img", "%u%s".printf ( this.counter++, (dotpos == null)? "" : dotpos.ndup ( dotpos.size() ) ) );
+ this.npath = realpath ( GLib.Path.build_filename ( settings.path, me.package.name, this.htmlpath ) );
+ this.path = realpath ( path );
+
this.position = pos;
- this.path = #path;
return true;
}
public override bool write ( void* res, int max, int index ) {
+ bool tmp = copy_file ( this.path, this.npath );
+ if ( tmp == false )
+ return false;
+
switch ( this.position ) {
case ImageDocElementPosition.NEUTRAL:
- ((GLib.FileStream)res).printf ( "<img src=\"%s\" />", this.path );
+ ((GLib.FileStream)res).printf ( "<img src=\"%s\" />", this.htmlpath );
break;
case ImageDocElementPosition.MIDDLE:
- ((GLib.FileStream)res).printf ( "<img src=\"%s\" align=\"middle\"/>", this.path );
+ ((GLib.FileStream)res).printf ( "<img src=\"%s\" align=\"middle\"/>", this.htmlpath );
break;
case ImageDocElementPosition.RIGHT:
- ((GLib.FileStream)res).printf ( "<img src=\"%s\" align=\"right\"/>", this.path );
+ ((GLib.FileStream)res).printf ( "<img src=\"%s\" align=\"right\"/>", this.htmlpath );
break;
case ImageDocElementPosition.LEFT:
- ((GLib.FileStream)res).printf ( "<img src=\"%s\" align=\"left\" />", this.path );
+ ((GLib.FileStream)res).printf ( "<img src=\"%s\" align=\"left\" />", this.htmlpath );
break;
}
return true;
@@ -1631,9 +1649,11 @@
public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
protected Valadoc.Langlet langlet;
+ protected Settings settings;
- protected abstract string get_link ( DocumentedElement p1, DocumentedElement? p2 );
-
+ protected string? get_link ( DocumentedElement element, DocumentedElement? pos ) {
+ return get_html_link ( this.settings, element, pos );
+ }
// Navi:
protected void write_navi_entry_html_template ( GLib.FileStream file, string style, string content ) {
@@ -1707,20 +1727,11 @@
file.printf ( "<ul class=\"%s\">\n\t\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">Packages</a></li>\n</ul>\n<hr class=\"%s\">\n", css_navi, css_navi_package_index, css_navi_link, link, css_navi_hr );
}
- //FIXME: Basic pos => Basic? pos
- protected virtual void write_top_element ( GLib.FileStream file, DocumentedElement? pos ) {
- }
-
protected void write_top_elements ( GLib.FileStream file, DocumentedElement element, DocumentedElement? mself ) {
Gee.ArrayList<DocumentedElement> lst = new Gee.ArrayList<DocumentedElement> ();
DocumentedElement pos = element;
-// if ( mself == null )
-// mself = element;
-
-// string package_name = element.file.name;
-
- this.write_top_element ( file, mself );
+ this.write_top_element_template ( file, "../index.html" );
while ( pos != null ) {
lst.add ( pos );
@@ -1788,7 +1799,7 @@
this.write_navi_child_enums_without_childs ( file, ns, mself );
this.write_navi_child_error_domains_without_childs ( file, ns, mself );
this.write_navi_child_delegates ( file, ns, mself );
- this.write_navi_child_static_methods ( file, ns, mself ); // remove
+ this.write_navi_child_static_methods ( file, ns, mself );
this.write_navi_child_methods ( file, ns, mself );
this.write_navi_child_fields ( file, ns, mself );
this.write_navi_child_constants ( file, ns, mself );
@@ -1851,11 +1862,11 @@
file.printf ( "<ul class=\"%s\">\n", css_navi );
foreach ( EnumValue env in enum_values ) {
- this.write_navi_entry ( file, env, en, css_navi_enval, true ); // en => mself
+ this.write_navi_entry ( file, env, en, css_navi_enval, true );
}
this.write_navi_child_static_methods ( file, en, mself );
- this.write_navi_child_methods ( file, en, mself ); // remove
+ this.write_navi_child_methods ( file, en, mself );
file.puts ( "</ul>\n" );
}
@@ -1871,11 +1882,11 @@
file.printf ( "<ul class=\"%s\">\n", css_navi );
foreach ( ErrorCode ec in error_codes ) {
- this.write_navi_entry ( file, ec, errdom, css_navi_errdomcode, true ); // errdom => mself
+ this.write_navi_entry ( file, ec, errdom, css_navi_errdomcode, true );
}
this.write_navi_child_static_methods ( file, errdom, mself );
- this.write_navi_child_methods ( file, errdom, mself ); // remove
+ this.write_navi_child_methods ( file, errdom, mself );
file.puts ( "</ul>\n" );
}
@@ -2280,11 +2291,11 @@
int _max = brief.size;
int _index = 0;
- foreach ( DocElement element in brief ) {
- if ( element is InlineTaglet )
- file.puts ( ((InlineTaglet)element).to_string() );
+ foreach ( DocElement element2 in brief ) {
+ if ( element2 is InlineTaglet )
+ file.puts ( ((InlineTaglet)element2).to_string() );
else
- element.write ( file, _max, _index );
+ element2.write ( file, _max, _index );
_index++;
}
@@ -2307,6 +2318,38 @@
doctree.write_content ( file );
}
+ public void write_navi_packages_inline ( GLib.FileStream file, Tree tree ) {
+ file.printf ( "<ul class=\"%s\">\n", css_navi );
+ foreach ( Package pkg in tree.get_package_list() ) {
+ if ( pkg.is_visitor_accessible ( ) ) {
+ file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a>\n", get_html_inline_navigation_link_css_class (pkg), css_navi_link, this.get_link(pkg, null), pkg.name );
+ // brief description
+ file.puts ( "</li>\n" );
+ }
+ else {
+ file.printf ( "\t<li class=\"%s\">%s</a></li>\n", get_html_inline_navigation_link_css_class (pkg), pkg.name );
+ }
+ }
+ file.puts ( "</li>\n" );
+ }
+
+ public void write_navi_packages ( GLib.FileStream file, Tree tree ) {
+ file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_navigation );
+ this.write_navi_packages_inline ( file, tree );
+ file.puts ( "\t\t\t</div>\n" );
+ }
+
+ public void write_packages_content ( GLib.FileStream file, Tree tree ) {
+ file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
+ file.printf ( "\t\t\t\t<h1 class=\"%s\">Packages:</h1>\n", css_title );
+ file.printf ( "\t\t\t\t<hr class=\"%s\" />\n", css_headline_hr );
+ file.printf ( "\t\t\t\t<h2 class=\"%s\">Description:</h2>\n", css_title );
+ file.printf ( "\t\t\t\t<h2 class=\"%s\">Content:</h2>\n", css_title );
+ file.printf ( "\t\t\t\t<h3 class=\"%s\">Packages:</h2>\n", css_title );
+ this.write_navi_packages_inline ( file, tree );
+ file.puts ( "\t\t\t</div>\n" );
+ }
+
public void write_method_content ( GLib.FileStream file, Method m , Valadoc.MethodHandler parent ) {
string full_name = m.full_name ( );
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
@@ -2540,17 +2583,6 @@
return ;
file.printf ( "<h2 class=\"%s\">Dependencies:</h2>\n", css_title );
-
- /*
- string realimgpath = this.get_img_real_path ( package );
- string imgpath = this.get_img_path ( package );
-
- Diagrams.write_dependency_diagram ( package, realimgpath );
-
- / / image
- file.printf ( "<img cass=\"%s\" src=\"%s\"/>\n", css_diagram, imgpath );
- */
-
file.printf ( "<ul class=\"%s\">\n", css_inline_navigation );
foreach ( Package p in deps ) {
string link = this.get_link(p, mself);
@@ -2695,11 +2727,13 @@
file.puts ( "\t\t\t</div>\n" );
}
+ protected string get_img_path ( DocumentedElement element ) {
+ return "img/" + element.full_name () + ".png";
+ }
- protected abstract string get_img_real_path ( DocumentedElement element );
-
- protected abstract string get_img_path ( DocumentedElement element );
-
+ protected string get_img_real_path ( DocumentedElement element ) {
+ return this.settings.get_real_path ( ) + "/" + element.package.name + "/" + "img/" + element.full_name () + ".png";
+ }
protected void write_child_constants ( GLib.FileStream file, ConstantHandler ch, DocumentedElement? mself ) {
Gee.ReadOnlyCollection<Constant> constants = ch.get_constant_list ();
@@ -2721,7 +2755,7 @@
file.printf ( "<h3 class=\"%s\">Enums:</h3>\n", css_title );
file.printf ( "<ul class=\"%s\">\n", css_inline_navigation );
foreach ( Enum en in enums ) {
- file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", get_html_inline_navigation_link_css_class (en), css_navi_link, this.get_link(en, mself), en.name );
+ file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a>\n", get_html_inline_navigation_link_css_class (en), css_navi_link, this.get_link(en, mself), en.name );
this.write_brief_description ( file, en, mself );
file.printf ( "</li>\n" );
}
@@ -2912,7 +2946,6 @@
file.printf ( "\t\t\t\t<h1 class=\"%s\">%s:</h1>\n", css_title, f.name );
file.printf ( "\t\t\t\t<hr class=\"%s\" />\n", css_headline_hr );
file.printf ( "\t\t\t\t<h2 class=\"%s\">Description:</h2>\n", css_title );
-
file.printf ( "\n\t\t\t\t<h2 class=\"%s\">Content:</h2>\n", css_title );
this.write_child_namespaces ( file, f, mself );
@@ -2937,23 +2970,21 @@
protected void write_file_header ( GLib.FileStream file, string css, string? title ) {
+ file.puts ( "<?xml version=\"1.0\" encoding=\"utf-8\"?>" );
file.puts ( "<html>\n" );
file.puts ( "\t<head>\n" );
file.puts ( "\t\t<title>Vala Binding Reference</title>\n" );
file.printf ( "\t\t<link href=\"%s\" rel=\"stylesheet\" type=\"text/css\" />\n", css );
file.puts ( "\t</head>\n" );
file.puts ( "\t<body>\n\n" );
-
file.printf ( "\t<div class=\"%s\">\n", css_site_header );
file.printf ( "\t\t%s Reference Manual\n", (title == null)? "" : title );
file.puts ( "\t</div>\n\n" );
-
file.printf ( "\t\t<div class=\"%s\">\n", css_style_body );
}
protected void write_file_footer ( GLib.FileStream file ) {
file.puts ( "\t</div>\n" );
-
file.puts ( "\t<div style= \"clear: left\">\n" );
file.puts ( "\t\t<br />\n" );
file.puts ( "\t\t<div class=\"site_foother\">\n" );
Modified: trunk/src/libvaladoc/Makefile.am
==============================================================================
--- trunk/src/libvaladoc/Makefile.am (original)
+++ trunk/src/libvaladoc/Makefile.am Wed Jan 28 02:37:06 2009
@@ -43,20 +43,20 @@
AM_CFLAGS = \
+ $(LIBGVC_CFLAGS) \
$(LIBXML2_CFLAGS) \
$(GLIB_CFLAGS) \
$(LIBVALA_CFLAGS) \
$(GMODULE_CFLAGS) \
- $(LIBGVC_CFLAGS) \
$(NULL)
libvaladoc_la_LIBADD = \
+ $(LIBGVC_LIBS) \
$(LIBXML2_LIBS) \
$(GLIB_LIBS) \
$(LIBVALA_LIBS) \
$(GMODULE_LIBS) \
- $(LIBGVC_LIBS) \
$(NULL)
Modified: trunk/src/libvaladoc/doctree.vala
==============================================================================
--- trunk/src/libvaladoc/doctree.vala (original)
+++ trunk/src/libvaladoc/doctree.vala Wed Jan 28 02:37:06 2009
@@ -26,9 +26,14 @@
namespace Valadoc {
public bool copy_file ( string src, string dest ) {
GLib.FileStream fsrc = GLib.FileStream.open ( src, "rb" );
+ if ( fsrc == null ) {
+ return false;
+ }
+
GLib.FileStream fdest = GLib.FileStream.open ( dest, "wb" );
- if ( fsrc == null || fdest == null )
+ if ( fdest == null ) {
return false;
+ }
for ( int c = fsrc.getc() ; !fsrc.eof() ; c = fsrc.getc() ) {
fdest.putc ( (char)c );
@@ -271,12 +276,12 @@
}
// internal
- public virtual weak DocumentedElement? search_element ( string[] params, int pos ) {
+ public virtual DocumentedElement? search_element ( string[] params, int pos ) {
return null;
}
// internal
- public virtual weak DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> list, int pos ) {
+ public virtual DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> list, int pos ) {
return null;
}
}
@@ -294,7 +299,7 @@
}
}
- protected weak DocumentedElement? search_enum_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_enum_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
foreach ( Enum en in this.enums ) {
DocumentedElement element = en.search_element_vala ( params, pos+1 );
if ( element != null )
@@ -303,7 +308,7 @@
return null;
}
- protected weak DocumentedElement? search_enum ( string[] params, int pos ) {
+ protected DocumentedElement? search_enum ( string[] params, int pos ) {
foreach ( Enum en in this.enums ) {
DocumentedElement element = en.search_element ( params, pos+1 );
if ( element != null )
@@ -355,7 +360,7 @@
get;
}
- protected weak DocumentedElement? search_delegate_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_delegate_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos+1];
if ( velement is Vala.Delegate == false )
return null;
@@ -368,7 +373,7 @@
return null;
}
- protected weak DocumentedElement? search_delegate ( string[] params, int pos ) {
+ protected DocumentedElement? search_delegate ( string[] params, int pos ) {
pos++;
if ( params[pos+1] != null )
@@ -430,7 +435,7 @@
get;
}
- protected weak DocumentedElement? search_interface_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_interface_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
foreach ( Interface iface in this.interfaces ) {
DocumentedElement? element = iface.search_element_vala ( params, pos+1 );
if ( element != null )
@@ -439,7 +444,7 @@
return null;
}
- protected weak DocumentedElement? search_interface ( string[] params, int pos ) {
+ protected DocumentedElement? search_interface ( string[] params, int pos ) {
foreach ( Interface iface in this.interfaces ) {
DocumentedElement? element = iface.search_element ( params, pos+1 );
if ( element != null )
@@ -500,7 +505,7 @@
get;
}
- protected weak DocumentedElement? search_error_domain_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_error_domain_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
foreach ( ErrorDomain errdom in this.errdoms ) {
DocumentedElement? element = errdom.search_element_vala ( params, pos+1 );
if ( element != null )
@@ -509,7 +514,7 @@
return null;
}
- protected weak DocumentedElement? search_error_domain ( string[] params, int pos ) {
+ protected DocumentedElement? search_error_domain ( string[] params, int pos ) {
foreach ( ErrorDomain errdom in this.errdoms ) {
DocumentedElement? element = errdom.search_element ( params, pos+1 );
if ( element != null )
@@ -717,7 +722,7 @@
get;
}
- protected weak DocumentedElement? search_class_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_class_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
foreach ( Class cl in this.classes ) {
DocumentedElement? element = cl.search_element_vala ( params, pos+1 );
if ( element != null )
@@ -726,7 +731,7 @@
return null;
}
- protected weak DocumentedElement? search_class ( string[] params, int pos ) {
+ protected DocumentedElement? search_class ( string[] params, int pos ) {
foreach ( Class cl in this.classes ) {
DocumentedElement? element = cl.search_element ( params, pos+1 );
if ( element != null )
@@ -800,7 +805,7 @@
set;
}
- protected weak DocumentedElement? search_property_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_property_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos+1];
if ( velement is Vala.Property == false )
return null;
@@ -816,7 +821,7 @@
return null;
}
- protected weak DocumentedElement? search_property ( string[] params, int pos ) {
+ protected DocumentedElement? search_property ( string[] params, int pos ) {
pos++;
if ( params[pos+1] != null )
@@ -889,7 +894,7 @@
get;
}
- protected weak DocumentedElement? search_construction_method_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_construction_method_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos+1];
if ( velement is Vala.Method == false )
return null;
@@ -905,7 +910,7 @@
return null;
}
- protected weak DocumentedElement? search_construction_method ( string[] params, int pos ) {
+ protected DocumentedElement? search_construction_method ( string[] params, int pos ) {
pos++;
if ( params[pos+1] == null )
@@ -979,7 +984,7 @@
set;
}
- protected weak DocumentedElement? search_signal_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_signal_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos+1];
if ( velement is Vala.Signal == false )
return null;
@@ -995,7 +1000,7 @@
return null;
}
- protected weak DocumentedElement? search_signal ( string[] params, int pos ) {
+ protected DocumentedElement? search_signal ( string[] params, int pos ) {
pos++;
if ( params[pos+1] != null )
@@ -1058,7 +1063,7 @@
get;
}
- protected weak DocumentedElement? search_struct_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_struct_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
foreach ( Struct stru in this.structs ) {
DocumentedElement? element = stru.search_element_vala ( params, pos+1 );
if ( element != null )
@@ -1068,7 +1073,7 @@
}
- protected weak DocumentedElement? search_struct ( string[] params, int pos ) {
+ protected DocumentedElement? search_struct ( string[] params, int pos ) {
foreach ( Struct stru in this.structs ) {
DocumentedElement? element = stru.search_element ( params, pos+1 );
if ( element != null )
@@ -1223,7 +1228,7 @@
get;
}
- protected weak DocumentedElement? search_constant_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_constant_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos+1];
if ( velement is Vala.Constant == false )
return null;
@@ -1240,7 +1245,7 @@
}
// internal
- protected weak DocumentedElement? search_constant ( string[] params, int pos ) {
+ protected DocumentedElement? search_constant ( string[] params, int pos ) {
pos++;
if ( params[pos+1] != null )
@@ -1307,7 +1312,7 @@
get;
}
- protected weak DocumentedElement? search_field_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_field_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos+1];
if ( velement is Vala.Field == false )
return null;
@@ -1324,7 +1329,7 @@
}
// internal
- protected weak DocumentedElement? search_field ( string[] params, int pos ) {
+ protected DocumentedElement? search_field ( string[] params, int pos ) {
pos++;
if ( params[pos+1] != null )
@@ -1447,7 +1452,7 @@
get;
}
- protected weak DocumentedElement? search_method_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ protected DocumentedElement? search_method_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos+1];
if ( velement is Vala.Method == false )
return null;
@@ -1464,7 +1469,7 @@
}
// internal
- protected weak DocumentedElement? search_method ( string[] params, int pos ) {
+ protected DocumentedElement? search_method ( string[] params, int pos ) {
pos++;
if ( params[pos+1] != null )
@@ -2853,7 +2858,7 @@
}
// internal
- public override weak DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ public override DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos];
if ( velement is Vala.Class == false )
@@ -2903,7 +2908,7 @@
}
// internal
- public override weak DocumentedElement? search_element ( string[] params, int pos ) {
+ public override DocumentedElement? search_element ( string[] params, int pos ) {
if ( !(this.name == params[pos] || params[0] == "this") )
return null;
@@ -3202,7 +3207,7 @@
return ( this.verrdom == ver );
}
- private weak DocumentedElement? search_error_code ( string[] params, int pos ) {
+ private DocumentedElement? search_error_code ( string[] params, int pos ) {
pos++;
if ( params[pos+1] != null )
@@ -3215,7 +3220,7 @@
return null;
}
- private weak DocumentedElement? search_error_code_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ private DocumentedElement? search_error_code_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos+1];
if ( velement is Vala.ErrorCode == false )
return null;
@@ -3231,7 +3236,7 @@
return null;
}
- public override weak DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ public override DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos];
if ( velement is Vala.ErrorDomain == false )
@@ -3257,7 +3262,7 @@
}
// internal
- public override weak DocumentedElement? search_element ( string[] params, int pos ) {
+ public override DocumentedElement? search_element ( string[] params, int pos ) {
if ( this.name != params[pos] )
return null;
@@ -3343,7 +3348,7 @@
return this.venum.get_cname();
}
- private weak DocumentedElement? search_enum_value_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ private DocumentedElement? search_enum_value_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos+1];
if ( velement is Vala.EnumValue == false )
return null;
@@ -3359,7 +3364,7 @@
return null;
}
- private weak DocumentedElement? search_enum_value ( string[] params, int pos ) {
+ private DocumentedElement? search_enum_value ( string[] params, int pos ) {
pos++;
if ( params[pos+1] != null )
@@ -3372,7 +3377,7 @@
return null;
}
- public override weak DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ public override DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos];
if ( velement is Vala.Enum == false )
@@ -3398,7 +3403,7 @@
}
// internal
- public override weak DocumentedElement? search_element ( string[] params, int pos ) {
+ public override DocumentedElement? search_element ( string[] params, int pos ) {
if ( this.name != params[pos] )
return null;
@@ -3524,7 +3529,7 @@
get;
}
- public override weak DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ public override DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos];
if ( velement is Vala.Struct == false )
@@ -3557,7 +3562,7 @@
}
// internal
- public override weak DocumentedElement? search_element ( string[] params, int pos ) {
+ public override DocumentedElement? search_element ( string[] params, int pos ) {
if ( this.name != params[pos] )
return null;
@@ -3659,8 +3664,8 @@
this.set_field_type_references ( );
base.set_type_references ( );
- var lst = this.vstruct.get_base_types ();
- this.set_parent_references ( lst );
+// var lst = this.vstruct.get_base_types ();
+// this.set_parent_references ( lst );
}
}
@@ -3717,7 +3722,7 @@
protected get;
}
- public override weak DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ public override DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos];
if ( velement is Vala.Interface == false )
@@ -3761,7 +3766,7 @@
}
// internal
- public override weak DocumentedElement? search_element ( string[] params, int pos ) {
+ public override DocumentedElement? search_element ( string[] params, int pos ) {
if ( !(this.name == params[pos] || params[0] == "this") )
return null;
@@ -3954,7 +3959,7 @@
}
// interface
- private weak DocumentedElement? search_namespace ( string[] params, int pos ) {
+ private DocumentedElement? search_namespace ( string[] params, int pos ) {
foreach ( Namespace ns in this.namespaces ) {
DocumentedElement? element = ns.search_element ( params, pos+1 );
if ( element != null )
@@ -3964,7 +3969,7 @@
}
//interface
- private weak DocumentedElement? search_namespace_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ private DocumentedElement? search_namespace_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
foreach ( Namespace ns in this.namespaces ) {
DocumentedElement? element = ns.search_element_vala ( params, pos+1 );
if ( element != null )
@@ -3973,7 +3978,7 @@
return null;
}
- public override weak DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ public override DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
Vala.Symbol velement = params[pos];
if ( velement is Vala.Namespace == false )
@@ -4023,7 +4028,7 @@
}
// internal
- public override weak DocumentedElement? search_element ( string[] params, int pos ) {
+ public override DocumentedElement? search_element ( string[] params, int pos ) {
if ( this.name != params[pos] )
return null;
@@ -4248,7 +4253,7 @@
}
// internal
- public override weak DocumentedElement? search_element ( string[] params, int pos ) {
+ public override DocumentedElement? search_element ( string[] params, int pos ) {
foreach ( Namespace ns in this.namespaces ) {
DocumentedElement? element = ns.search_element ( params, pos );
if ( element != null )
@@ -4258,7 +4263,7 @@
}
// internal
- public override weak DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
+ public override DocumentedElement? search_element_vala ( Gee.ArrayList<Vala.Symbol> params, int pos ) {
foreach ( Namespace ns in this.namespaces ) {
DocumentedElement? element = ns.search_element_vala ( params, pos );
if ( element != null )
@@ -4334,7 +4339,6 @@
this.context.directory = context.basedir;
}
-// this.context.non_null = !disable_non_null || non_null_experimental;
this.context.non_null_experimental = non_null_experimental;
this.context.checking = !disable_checking;
@@ -4458,7 +4462,7 @@
doclet.initialisation ( this.settings, this );
}
- private weak DocumentedElement? search_symbol_in_type ( DocumentedElement element, string[] params, int params_offset = 0 ) {
+ private DocumentedElement? search_symbol_in_type ( DocumentedElement element, string[] params, int params_offset = 0 ) {
if ( !( element.parent is ContainerDataType || element.parent is Enum || element.parent is ErrorDomain ) )
return null;
@@ -4474,7 +4478,7 @@
return this.search_symbol_in_symbol ( (DocumentedElement)element.parent, params, 0 );
}
- private weak DocumentedElement? search_symbol_in_symbol ( DocumentedElement element, string[] params, int params_offset = 0 ) {
+ private DocumentedElement? search_symbol_in_symbol ( DocumentedElement element, string[] params, int params_offset = 0 ) {
if ( element is Class || element is Interface || element is Struct ) {
return element.search_element ( params, params_offset );
}
@@ -4487,7 +4491,7 @@
return null;
}
- private weak DocumentedElement? search_symbol_in_global_namespaces ( DocumentedElement? element, string[] params ) {
+ private DocumentedElement? search_symbol_in_global_namespaces ( DocumentedElement? element, string[] params ) {
int param_size = 0;
for ( param_size = 0; params[param_size] != null; param_size++ );
@@ -4499,23 +4503,23 @@
}
foreach ( Package pkg in this.packages ) {
- DocumentedElement? element = pkg.search_element ( global_params, 0 );
- if ( element != null )
- return element;
+ DocumentedElement? element2 = pkg.search_element ( global_params, 0 );
+ if ( element2 != null )
+ return element2;
}
return null;
}
- private weak DocumentedElement? search_symbol_in_namespaces ( DocumentedElement element, string[] params ) {
+ private DocumentedElement? search_symbol_in_namespaces ( DocumentedElement element, string[] params ) {
foreach ( Package pkg in this.packages ) {
- DocumentedElement? element = pkg.search_element ( params, 0 );
- if ( element != null )
- return element;
+ DocumentedElement? element2 = pkg.search_element ( params, 0 );
+ if ( element2 != null )
+ return element2;
}
return null;
}
- private weak DocumentedElement? search_element ( DocumentedElement? element, string[] params ) {
+ private DocumentedElement? search_element ( DocumentedElement? element, string[] params ) {
if ( element != null ) {
if ( params[0] == "this" ) {
return search_symbol_in_type ( element, params, 1 );
@@ -4538,7 +4542,7 @@
return null;
}
- public weak DocumentedElement? search_symbol_str ( DocumentedElement? element, string symname ) {
+ public DocumentedElement? search_symbol_str ( DocumentedElement? element, string symname ) {
string[] params = symname.split( ".", -1 );
int i = 0; while ( params[i] != null ) i++;
params.length = i;
@@ -4703,7 +4707,7 @@
}
// internal
- public weak DocumentedElement? search_vala_symbol ( Vala.Symbol? vnode ) {
+ public DocumentedElement? search_vala_symbol ( Vala.Symbol? vnode ) {
if ( vnode == null )
return null;
@@ -4719,7 +4723,7 @@
return null;
if ( params.size >= 2 ) {
- if ( params[1] is Vala.Namespace ) {
+ if ( params.get(1) is Vala.Namespace ) {
params.remove_at ( 0 );
}
}
Modified: trunk/src/libvaladoc/drawer.vala
==============================================================================
--- trunk/src/libvaladoc/drawer.vala (original)
+++ trunk/src/libvaladoc/drawer.vala Wed Jan 28 02:37:06 2009
@@ -45,8 +45,8 @@
if ( type is Struct == false )
break;
- weak Graphviz.Node stru = draw_struct ( g, (Struct)type, me );
- draw_struct_parents ( (Struct)type, g, stru );
+ weak Graphviz.Node stru2 = draw_struct ( g, (Struct)type, me );
+ draw_struct_parents ( (Struct)type, g, stru2 );
}
}
Modified: trunk/src/libvaladoc/parser.vala
==============================================================================
--- trunk/src/libvaladoc/parser.vala (original)
+++ trunk/src/libvaladoc/parser.vala Wed Jan 28 02:37:06 2009
@@ -1762,11 +1762,6 @@
}
}
- private bool check_image_path ( int startpos, GLib.StringBuilder buf ) {
- //this.error ( "invalid image path", startpos-this.pos );
- return true;
- }
-
private ImageDocElementPosition parse_image_position () {
int separatorpos = this.pos;
@@ -1804,12 +1799,12 @@
imgpos = parse_image_position ();
if ( str[pos+1] == '}' ) {
- bool tmp = check_image_path ( startpos+2, buf );
- if ( tmp == true ) {
- ImageDocElement img = (ImageDocElement)GLib.Object.new ( this.modules.imgtag );
- img.parse ( this.settings, tree, me, buf.str, imgpos );
- elements.add ( img );
+ ImageDocElement img = (ImageDocElement)GLib.Object.new ( this.modules.imgtag );
+ bool tmp = img.parse ( this.settings, tree, me, buf.str, imgpos );
+ if ( tmp == false ) {
+ this.error ( "image not found.", startpos-this.pos );
}
+ elements.add ( img );
pos++;
return ;
}
@@ -1917,7 +1912,7 @@
}
if ( this.str[this.pos+1] == ']' ) {
- bool tmp = check_image_path ( startpos, buf );
+ bool tmp = check_link_path ( startpos, buf );
if ( tmp == true && linkstat == true ) {
LinkDocElement linktag = (LinkDocElement)GLib.Object.new ( this.modules.linktag );
linktag.parse ( this.settings, tree, me, buf.str, txt );
Modified: trunk/src/valadoc/valadoc.vala
==============================================================================
--- trunk/src/valadoc/valadoc.vala (original)
+++ trunk/src/valadoc/valadoc.vala Wed Jan 28 02:37:06 2009
@@ -255,7 +255,7 @@
if ( pluginpath == null ) {
- pluginpath = Config.plugin_dir + "/template/";
+ pluginpath = Config.plugin_dir + "/html/";
}
else {
if ( !pluginpath.has_suffix ( "/" ) )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
