]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
wiki highlighting module loader
authorFlorian Brosch <flobrosch@src.gnome.org>
Wed, 24 Dec 2008 12:24:56 +0000 (12:24 +0000)
committerFlorian Brosch <flobrosch@src.gnome.org>
Wed, 24 Dec 2008 12:24:56 +0000 (12:24 +0000)
 * wiki highlighting
 * module loader

svn path=/trunk/; revision=24

63 files changed:
configure.in
src/doclets/devhelp/taglets/Makefile.am
src/doclets/devhelp/taglets/bold/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/bold/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/cell/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/cell/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/center/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/center/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/image/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/image/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/italic/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/italic/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/link/Makefile.am
src/doclets/devhelp/taglets/link/taglet.vala
src/doclets/devhelp/taglets/list/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/list/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/listelement/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/listelement/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/notification/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/notification/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/right/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/right/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/source/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/source/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/table/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/table/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/underline/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/underline/taglet.vala [new file with mode: 0755]
src/doclets/devhelp/taglets/wikilink/Makefile.am [new file with mode: 0755]
src/doclets/devhelp/taglets/wikilink/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/Makefile.am
src/doclets/html/taglets/bold/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/bold/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/cell/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/cell/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/center/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/center/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/image/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/image/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/italic/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/italic/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/list/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/list/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/listelement/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/listelement/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/notification/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/notification/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/right/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/right/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/source/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/source/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/string/Makefile.am
src/doclets/html/taglets/string/taglet.vala
src/doclets/html/taglets/table/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/table/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/underline/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/underline/taglet.vala [new file with mode: 0755]
src/doclets/html/taglets/wikilink/Makefile.am [new file with mode: 0755]
src/doclets/html/taglets/wikilink/taglet.vala [new file with mode: 0755]
src/doclets/htmlhelpers/htmlhelpers.vala
src/libvaladoc/parser.vala
src/valadoc/Makefile.am
src/valadoc/valadoc.vala

index eb5395eb5a4330507a2e4b7e80f2397910d948e3..578cdc6634758c45c24a1e87fd569fa4296aa625 100644 (file)
@@ -65,8 +65,21 @@ AC_CONFIG_FILES([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/valadoc.org/Makefile
                  src/doclets/valadoc.org/linkhelper/Makefile
                  src/doclets/valadoc.org/doclet/Makefile
@@ -79,6 +92,18 @@ AC_CONFIG_FILES([Makefile
                  src/doclets/valadoc.org/taglets/link/Makefile
                  src/doclets/valadoc.org/taglets/see/Makefile
                  src/doclets/devhelp/Makefile
+                 src/doclets/devhelp/taglets/image/Makefile
+                 src/doclets/devhelp/taglets/notification/Makefile
+                 src/doclets/devhelp/taglets/italic/Makefile
+                 src/doclets/devhelp/taglets/center/Makefile
+                 src/doclets/devhelp/taglets/right/Makefile
+                 src/doclets/devhelp/taglets/bold/Makefile
+                 src/doclets/devhelp/taglets/underline/Makefile
+                 src/doclets/devhelp/taglets/list/Makefile
+                 src/doclets/devhelp/taglets/listelement/Makefile
+                 src/doclets/devhelp/taglets/table/Makefile
+                 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
@@ -86,6 +111,7 @@ AC_CONFIG_FILES([Makefile
                  src/doclets/devhelp/taglets/parameter/Makefile
                  src/doclets/devhelp/taglets/version/Makefile
                  src/doclets/devhelp/taglets/throws/Makefile
+                 src/doclets/devhelp/taglets/wikilink/Makefile
                  src/doclets/devhelp/taglets/return/Makefile
                  src/doclets/devhelp/taglets/string/Makefile
                  src/doclets/devhelp/taglets/link/Makefile
index adb9f7d127293f5527430be2b588939c912496c5..c2056d401284531c994d375a7acc3a4d12e0ccad 100644 (file)
@@ -4,13 +4,26 @@ NULL =
 
 
 SUBDIRS =       \
+      image     \
       see       \
       link      \
+      center    \
+      right     \
+      italic    \
+      bold      \
+      source    \
+      underline \
       return    \
       string    \
       throws    \
+      notification\
       version   \
+      table     \
+      cell      \
+      list       \
+      listelement\
       parameter \
+      wikilink  \
       $(NULL)
 
 
diff --git a/src/doclets/devhelp/taglets/bold/Makefile.am b/src/doclets/devhelp/taglets/bold/Makefile.am
new file mode 100755 (executable)
index 0000000..e68a766
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletbolddir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletbold_la_LDFLAGS = -module -avoid-version
+
+
+libtagletbold_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletbold_VALASOURCES)  libtagletbold.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/bold/taglet.vala b/src/doclets/devhelp/taglets/bold/taglet.vala
new file mode 100755 (executable)
index 0000000..292153f
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/devhelp/taglets/cell/Makefile.am b/src/doclets/devhelp/taglets/cell/Makefile.am
new file mode 100755 (executable)
index 0000000..76b04a1
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+taglettablecelldir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtaglettablecell_la_LDFLAGS = -module -avoid-version
+
+
+libtaglettablecell_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtaglettablecell_VALASOURCES)  libtaglettablecell.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/cell/taglet.vala b/src/doclets/devhelp/taglets/cell/taglet.vala
new file mode 100755 (executable)
index 0000000..0031a9f
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/devhelp/taglets/center/Makefile.am b/src/doclets/devhelp/taglets/center/Makefile.am
new file mode 100755 (executable)
index 0000000..83ac7ab
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletcenterdir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletcenter_la_LDFLAGS = -module -avoid-version
+
+
+libtagletcenter_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletcenter_VALASOURCES)  libtagletcenter.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/center/taglet.vala b/src/doclets/devhelp/taglets/center/taglet.vala
new file mode 100755 (executable)
index 0000000..84f1c98
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/devhelp/taglets/image/Makefile.am b/src/doclets/devhelp/taglets/image/Makefile.am
new file mode 100755 (executable)
index 0000000..93677c6
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletimagedir = $(libdir)/valadoc/plugins/template/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletimage_la_LDFLAGS = -module -avoid-version
+
+
+libtagletimage_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletimage_VALASOURCES)  libtagletimage.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/image/taglet.vala b/src/doclets/devhelp/taglets/image/taglet.vala
new file mode 100755 (executable)
index 0000000..340d97a
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/devhelp/taglets/italic/Makefile.am b/src/doclets/devhelp/taglets/italic/Makefile.am
new file mode 100755 (executable)
index 0000000..de4c29f
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletitalicdir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletitalic_la_LDFLAGS = -module -avoid-version
+
+
+libtagletitalic_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletitalic_VALASOURCES)  libtagletitalic.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/italic/taglet.vala b/src/doclets/devhelp/taglets/italic/taglet.vala
new file mode 100755 (executable)
index 0000000..543845b
--- /dev/null
@@ -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 );
+}
+
+
index bd3eefc4929642ea1bae6eba74ff502081aab386..da02537fadeac648bdaedcfa0b7a84f4f8663d6b 100644 (file)
@@ -2,30 +2,30 @@
 
 
 
-libtagletlink_VALASOURCES = \
+libtagletparameter_VALASOURCES = \
        taglet.vala       \
        $(NULL)
 
 
-BUILT_SOURCES = libtagletlink.vala.stamp
+BUILT_SOURCES = libtagletparameter.vala.stamp
 
 
-libtagletlink.vala.stamp: $(libtagletlink_VALASOURCES)
+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 . --disable-non-null --save-temps $^
        touch $@
 
 
        
 
-tagletlinkdir = $(libdir)/valadoc/plugins/devhelp/taglets/
+tagletparameterdir = $(libdir)/valadoc/plugins/devhelp/taglets/
 
-tagletlink_LTLIBRARIES = libtagletlink.la
+tagletparameter_LTLIBRARIES = libtagletparameter.la
 
 
-libtagletlink_la_SOURCES =                \
-       libtagletlink.vala.stamp              \
-       $(libtagletlink_VALASOURCES:.vala=.c) \
-       $(libtagletlink_VALASOURCES:.vala=.h) \
+libtagletparameter_la_SOURCES =                \
+       libtagletparameter.vala.stamp              \
+       $(libtagletparameter_VALASOURCES:.vala=.c) \
+       $(libtagletparameter_VALASOURCES:.vala=.h) \
        $(NULL)
 
 
@@ -40,10 +40,10 @@ AM_CFLAGS =  -g               \
        $(NULL)
 
 
-libtagletlink_la_LDFLAGS = -module -avoid-version
+libtagletparameter_la_LDFLAGS = -module -avoid-version
 
 
-libtagletlink_la_LIBADD =                 \
+libtagletparameter_la_LIBADD =                 \
        ../../../../libvaladoc/libvaladoc.la \
        ../../../htmlhelpers/libhtmlhelpers.la \
        ../../linkhelper/libhtmlhelper.la    \
@@ -54,4 +54,4 @@ libtagletlink_la_LIBADD =                 \
 
 
 
-EXTRA_DIST = $(libtagletlink_VALASOURCES)  libtagletlink.vala.stamp 
+EXTRA_DIST = $(libtagletparameter_VALASOURCES)  libtagletparameter.vala.stamp 
index b25451237a24b66c3d13aabbbdb1080d8d90c768..deb1f6b85ea1f375a05e8617f935280f90cd6f83 100644 (file)
@@ -23,30 +23,17 @@ using Vala;
 using Gee;
 
 
-public class Valadoc.LinkDevhelpTaglet : Valadoc.LinkHtmlHelperTaglet, HtmlHelper {
-       protected override string? get_link ( Settings settings, Tree tree, Basic element, Basic? pos ) {
-               return this.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, Basic me, string content, out string[] errmsg ) {
-               return this.parse_imp ( settings, tree, me, content, out errmsg );
-       }
-}
+using Valadoc;
+using GLib;
+using Vala;
+using Gee;
 
 
 [ModuleInit]
 public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
-        GLib.Type type = typeof ( LinkDevhelpTaglet );
-               taglets.set ( "link", type );
+        GLib.Type type = typeof ( ParameterHtmlTaglet );
+               taglets.set ( "param", type );
                return type;
 }
 
-
diff --git a/src/doclets/devhelp/taglets/list/Makefile.am b/src/doclets/devhelp/taglets/list/Makefile.am
new file mode 100755 (executable)
index 0000000..e459923
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletlistdir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletlist_la_LDFLAGS = -module -avoid-version
+
+
+libtagletlist_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletlist_VALASOURCES)  libtagletlist.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/list/taglet.vala b/src/doclets/devhelp/taglets/list/taglet.vala
new file mode 100755 (executable)
index 0000000..1fde584
--- /dev/null
@@ -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 );
+}
+
+
+
diff --git a/src/doclets/devhelp/taglets/listelement/Makefile.am b/src/doclets/devhelp/taglets/listelement/Makefile.am
new file mode 100755 (executable)
index 0000000..d797618
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletimagedir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletlistelement_la_LDFLAGS = -module -avoid-version
+
+
+libtagletlistelement_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletlistelement_VALASOURCES)  libtagletlistelement.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/listelement/taglet.vala b/src/doclets/devhelp/taglets/listelement/taglet.vala
new file mode 100755 (executable)
index 0000000..9d7b010
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/devhelp/taglets/notification/Makefile.am b/src/doclets/devhelp/taglets/notification/Makefile.am
new file mode 100755 (executable)
index 0000000..dc65d01
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletnotificationdir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletnotification_la_LDFLAGS = -module -avoid-version
+
+
+libtagletnotification_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletnotification_VALASOURCES)  libtagletnotification.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/notification/taglet.vala b/src/doclets/devhelp/taglets/notification/taglet.vala
new file mode 100755 (executable)
index 0000000..6e2555f
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/devhelp/taglets/right/Makefile.am b/src/doclets/devhelp/taglets/right/Makefile.am
new file mode 100755 (executable)
index 0000000..99aab9d
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletrightdir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletright_la_LDFLAGS = -module -avoid-version
+
+
+libtagletright_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletright_VALASOURCES)  libtagletright.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/right/taglet.vala b/src/doclets/devhelp/taglets/right/taglet.vala
new file mode 100755 (executable)
index 0000000..b3e5c34
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/devhelp/taglets/source/Makefile.am b/src/doclets/devhelp/taglets/source/Makefile.am
new file mode 100755 (executable)
index 0000000..aae5d5b
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletsrcsampledir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletsrcsample_la_LDFLAGS = -module -avoid-version
+
+
+libtagletsrcsample_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletsrcsample_VALASOURCES)  libtagletsrcsample.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/source/taglet.vala b/src/doclets/devhelp/taglets/source/taglet.vala
new file mode 100755 (executable)
index 0000000..c370a97
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/devhelp/taglets/table/Makefile.am b/src/doclets/devhelp/taglets/table/Makefile.am
new file mode 100755 (executable)
index 0000000..154158b
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletimagedir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtaglettable_la_LDFLAGS = -module -avoid-version
+
+
+libtaglettable_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtaglettable_VALASOURCES)  libtaglettable.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/table/taglet.vala b/src/doclets/devhelp/taglets/table/taglet.vala
new file mode 100755 (executable)
index 0000000..2da2b44
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/devhelp/taglets/underline/Makefile.am b/src/doclets/devhelp/taglets/underline/Makefile.am
new file mode 100755 (executable)
index 0000000..f591aad
--- /dev/null
@@ -0,0 +1,56 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+tagletunderlinedir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletunderline_la_LDFLAGS = -module -avoid-version
+
+
+libtagletunderline_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletunderline_VALASOURCES)  libtagletunderline.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/underline/taglet.vala b/src/doclets/devhelp/taglets/underline/taglet.vala
new file mode 100755 (executable)
index 0000000..62058b6
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/devhelp/taglets/wikilink/Makefile.am b/src/doclets/devhelp/taglets/wikilink/Makefile.am
new file mode 100755 (executable)
index 0000000..3cc82ba
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletwikilinkdir = $(libdir)/valadoc/plugins/devhelp/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletwikilink_la_LDFLAGS = -module -avoid-version
+
+
+libtagletwikilink_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletwikilink_VALASOURCES)  libtagletwikilink.vala.stamp 
diff --git a/src/doclets/devhelp/taglets/wikilink/taglet.vala b/src/doclets/devhelp/taglets/wikilink/taglet.vala
new file mode 100755 (executable)
index 0000000..d9ec700
--- /dev/null
@@ -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 );
+}
+
+
index f83b62394a58f9bd821e9300ccc9844d1f100b28..2ef6ebed5c883a92cbbf21f5d913b057d45aa2c0 100644 (file)
@@ -6,21 +6,24 @@ NULL =
 SUBDIRS =       \
       see       \
       link      \
+      image     \
+      center    \
+      right     \
+      italic    \
+      underline \
       return    \
+      bold      \
+      source    \
+      notification\
+      table     \
+      cell      \
+      list       \
+      listelement\
       string    \
       throws    \
       version   \
       parameter \
+      wikilink  \
       $(NULL)
 
 
-
-#  -see
-#  -{link}
-#  -version
-#  -throws
-#  -return
-#  -param
-
-#@author name
-#@deprecated description
diff --git a/src/doclets/html/taglets/bold/Makefile.am b/src/doclets/html/taglets/bold/Makefile.am
new file mode 100755 (executable)
index 0000000..76c4dd7
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletbolddir = $(libdir)/valadoc/plugins/template/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletbold_la_LDFLAGS = -module -avoid-version
+
+
+libtagletbold_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletbold_VALASOURCES)  libtagletbold.vala.stamp 
diff --git a/src/doclets/html/taglets/bold/taglet.vala b/src/doclets/html/taglets/bold/taglet.vala
new file mode 100755 (executable)
index 0000000..292153f
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/html/taglets/cell/Makefile.am b/src/doclets/html/taglets/cell/Makefile.am
new file mode 100755 (executable)
index 0000000..b1b2a00
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+taglettablecelldir = $(libdir)/valadoc/plugins/template/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtaglettablecell_la_LDFLAGS = -module -avoid-version
+
+
+libtaglettablecell_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtaglettablecell_VALASOURCES)  libtaglettablecell.vala.stamp 
diff --git a/src/doclets/html/taglets/cell/taglet.vala b/src/doclets/html/taglets/cell/taglet.vala
new file mode 100755 (executable)
index 0000000..0031a9f
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/html/taglets/center/Makefile.am b/src/doclets/html/taglets/center/Makefile.am
new file mode 100755 (executable)
index 0000000..bb7bc7b
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletimagedir = $(libdir)/valadoc/plugins/template/taglets/
+
+tagletimage_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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletcenter_la_LDFLAGS = -module -avoid-version
+
+
+libtagletcenter_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletcenter_VALASOURCES)  libtagletcenter.vala.stamp 
diff --git a/src/doclets/html/taglets/center/taglet.vala b/src/doclets/html/taglets/center/taglet.vala
new file mode 100755 (executable)
index 0000000..84f1c98
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/html/taglets/image/Makefile.am b/src/doclets/html/taglets/image/Makefile.am
new file mode 100755 (executable)
index 0000000..93677c6
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletimagedir = $(libdir)/valadoc/plugins/template/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletimage_la_LDFLAGS = -module -avoid-version
+
+
+libtagletimage_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletimage_VALASOURCES)  libtagletimage.vala.stamp 
diff --git a/src/doclets/html/taglets/image/taglet.vala b/src/doclets/html/taglets/image/taglet.vala
new file mode 100755 (executable)
index 0000000..340d97a
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/html/taglets/italic/Makefile.am b/src/doclets/html/taglets/italic/Makefile.am
new file mode 100755 (executable)
index 0000000..781c270
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletitalicdir = $(libdir)/valadoc/plugins/template/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletitalic_la_LDFLAGS = -module -avoid-version
+
+
+libtagletitalic_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletitalic_VALASOURCES)  libtagletitalic.vala.stamp 
diff --git a/src/doclets/html/taglets/italic/taglet.vala b/src/doclets/html/taglets/italic/taglet.vala
new file mode 100755 (executable)
index 0000000..543845b
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/html/taglets/list/Makefile.am b/src/doclets/html/taglets/list/Makefile.am
new file mode 100755 (executable)
index 0000000..ad20832
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletimagedir = $(libdir)/valadoc/plugins/template/taglets/
+
+tagletimage_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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletlist_la_LDFLAGS = -module -avoid-version
+
+
+libtagletlist_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletlist_VALASOURCES)  libtagletlist.vala.stamp 
diff --git a/src/doclets/html/taglets/list/taglet.vala b/src/doclets/html/taglets/list/taglet.vala
new file mode 100755 (executable)
index 0000000..1fde584
--- /dev/null
@@ -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 );
+}
+
+
+
diff --git a/src/doclets/html/taglets/listelement/Makefile.am b/src/doclets/html/taglets/listelement/Makefile.am
new file mode 100755 (executable)
index 0000000..7e7d899
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletlistelementdir = $(libdir)/valadoc/plugins/template/taglets/
+
+tagletlistelement_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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletlistelement_la_LDFLAGS = -module -avoid-version
+
+
+libtagletlistelement_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletlistelement_VALASOURCES)  libtagletlistelement.vala.stamp 
diff --git a/src/doclets/html/taglets/listelement/taglet.vala b/src/doclets/html/taglets/listelement/taglet.vala
new file mode 100755 (executable)
index 0000000..9d7b010
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/html/taglets/notification/Makefile.am b/src/doclets/html/taglets/notification/Makefile.am
new file mode 100755 (executable)
index 0000000..1915414
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletnotificationdir = $(libdir)/valadoc/plugins/template/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletnotification_la_LDFLAGS = -module -avoid-version
+
+
+libtagletnotification_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletnotification_VALASOURCES)  libtagletnotification.vala.stamp 
diff --git a/src/doclets/html/taglets/notification/taglet.vala b/src/doclets/html/taglets/notification/taglet.vala
new file mode 100755 (executable)
index 0000000..6e2555f
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/html/taglets/right/Makefile.am b/src/doclets/html/taglets/right/Makefile.am
new file mode 100755 (executable)
index 0000000..bece739
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletrightdir = $(libdir)/valadoc/plugins/template/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletright_la_LDFLAGS = -module -avoid-version
+
+
+libtagletright_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletright_VALASOURCES)  libtagletright.vala.stamp 
diff --git a/src/doclets/html/taglets/right/taglet.vala b/src/doclets/html/taglets/right/taglet.vala
new file mode 100755 (executable)
index 0000000..b3e5c34
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/html/taglets/source/Makefile.am b/src/doclets/html/taglets/source/Makefile.am
new file mode 100755 (executable)
index 0000000..a1660fa
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletsrcsampledir = $(libdir)/valadoc/plugins/template/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletsrcsample_la_LDFLAGS = -module -avoid-version
+
+
+libtagletsrcsample_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletsrcsample_VALASOURCES)  libtagletsrcsample.vala.stamp 
diff --git a/src/doclets/html/taglets/source/taglet.vala b/src/doclets/html/taglets/source/taglet.vala
new file mode 100755 (executable)
index 0000000..c370a97
--- /dev/null
@@ -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 );
+}
+
+
index a2eba61426544c3308f69c7eab23da995ca4e5a4..972faf082250b577563f91fadb02c3c757f30c44 100644 (file)
@@ -2,30 +2,30 @@
 
 
 
-libtagletstring_VALASOURCES = \
+libexceptionparameter_VALASOURCES = \
        taglet.vala       \
        $(NULL)
 
 
-BUILT_SOURCES = libtagletstring.vala.stamp
+BUILT_SOURCES = libexceptionparameter.vala.stamp
 
 
-libtagletstring.vala.stamp: $(libtagletstring_VALASOURCES)
-       $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+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 . --disable-non-null --save-temps $^
        touch $@
 
 
        
 
-tagletstringdir = $(libdir)/valadoc/plugins/template/taglets/
+exceptionparameterdir = $(libdir)/valadoc/plugins/template/taglets/
 
-tagletstring_LTLIBRARIES = libtagletstring.la
+exceptionparameter_LTLIBRARIES = libexceptionparameter.la
 
 
-libtagletstring_la_SOURCES =                \
-       libtagletstring.vala.stamp              \
-       $(libtagletstring_VALASOURCES:.vala=.c) \
-       $(libtagletstring_VALASOURCES:.vala=.h) \
+libexceptionparameter_la_SOURCES =                \
+       libexceptionparameter.vala.stamp              \
+       $(libexceptionparameter_VALASOURCES:.vala=.c) \
+       $(libexceptionparameter_VALASOURCES:.vala=.h) \
        $(NULL)
 
 
@@ -40,10 +40,10 @@ AM_CFLAGS =  -g               \
        $(NULL)
 
 
-libtagletstring_la_LDFLAGS = -module -avoid-version
+libexceptionparameter_la_LDFLAGS = -module -avoid-version
 
 
-libtagletstring_la_LIBADD =                 \
+libexceptionparameter_la_LIBADD =                 \
        ../../../../libvaladoc/libvaladoc.la \
        ../../../htmlhelpers/libhtmlhelpers.la \
        ../../linkhelper/libhtmlhelper.la    \
@@ -54,4 +54,4 @@ libtagletstring_la_LIBADD =                 \
 
 
 
-EXTRA_DIST = $(libtagletstring_VALASOURCES)  libtagletstring.vala.stamp 
+EXTRA_DIST = $(libexceptionparameter_VALASOURCES)  libexceptionparameter.vala.stamp 
index f8daf5f6da81d4c3f44cb1f29f67285588f21b27..2a49d8577802827064b68a2c42e3dc8e624093ad 100644 (file)
@@ -24,12 +24,10 @@ using Gee;
 
 
 
-
 [ModuleInit]
 public GLib.Type register_plugin ( Gee.HashMap<string, Type> taglets ) {
-        GLib.Type type = typeof ( StringHtmlTaglet );
-               taglets.set ( "", type );
+        GLib.Type type = typeof ( ExceptionHtmlTaglet );
+               taglets.set ( "throws", type );
                return type;
 }
 
-
diff --git a/src/doclets/html/taglets/table/Makefile.am b/src/doclets/html/taglets/table/Makefile.am
new file mode 100755 (executable)
index 0000000..92314da
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+taglettabledir = $(libdir)/valadoc/plugins/template/taglets/
+
+taglettable_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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtaglettable_la_LDFLAGS = -module -avoid-version
+
+
+libtaglettable_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtaglettable_VALASOURCES)  libtaglettable.vala.stamp 
diff --git a/src/doclets/html/taglets/table/taglet.vala b/src/doclets/html/taglets/table/taglet.vala
new file mode 100755 (executable)
index 0000000..2da2b44
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/html/taglets/underline/Makefile.am b/src/doclets/html/taglets/underline/Makefile.am
new file mode 100755 (executable)
index 0000000..3baa293
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletunderlinedir = $(libdir)/valadoc/plugins/template/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletunderline_la_LDFLAGS = -module -avoid-version
+
+
+libtagletunderline_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletunderline_VALASOURCES)  libtagletunderline.vala.stamp 
diff --git a/src/doclets/html/taglets/underline/taglet.vala b/src/doclets/html/taglets/underline/taglet.vala
new file mode 100755 (executable)
index 0000000..62058b6
--- /dev/null
@@ -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 );
+}
+
+
diff --git a/src/doclets/html/taglets/wikilink/Makefile.am b/src/doclets/html/taglets/wikilink/Makefile.am
new file mode 100755 (executable)
index 0000000..143a24f
--- /dev/null
@@ -0,0 +1,57 @@
+# 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 ../../linkhelper --vapidir ../../../htmlhelpers/ --pkg libhtmlhelpers-1.0 --pkg libhtmlhelper-1.0 --basedir . --disable-non-null --save-temps $^
+       touch $@
+
+
+       
+
+tagletwikilinkdir = $(libdir)/valadoc/plugins/template/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 ../../linkhelper/         \
+       -I ../../                    \
+       $(GLIB_CFLAGS)               \
+       $(LIBVALA_CFLAGS)            \
+       $(NULL)
+
+
+libtagletwikilink_la_LDFLAGS = -module -avoid-version
+
+
+libtagletwikilink_la_LIBADD =                 \
+       ../../../../libvaladoc/libvaladoc.la   \
+       ../../../htmlhelpers/libhtmlhelpers.la \
+       ../../linkhelper/libhtmlhelper.la      \
+       $(GLIB_LIBS)                           \
+       $(LIBVALA_LIBS)                        \
+       $(NULL)
+
+
+
+
+EXTRA_DIST = $(libtagletwikilink_VALASOURCES)  libtagletwikilink.vala.stamp 
diff --git a/src/doclets/html/taglets/wikilink/taglet.vala b/src/doclets/html/taglets/wikilink/taglet.vala
new file mode 100755 (executable)
index 0000000..d9ec700
--- /dev/null
@@ -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 );
+}
+
+
index 5ddcfd3005b1953b566639b70f1ac39315023872..98ae52d28c44b327394bdda07e5551869e0a320e 100644 (file)
@@ -1209,6 +1209,421 @@ public abstract class Valadoc.BasicHtmlLanglet : Valadoc.Langlet {
 }
 
 
+public class Valadoc.UnderlinedHtmlHelperDocElement : UnderlinedDocElement {
+       private Gee.ArrayList<DocElement> content;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, Gee.ArrayList<DocElement> content ) {
+               this.content = content;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+               int _max = this.content.size;
+               int _index = 0;
+
+               file.printf ( "<u>" );
+
+               foreach ( DocElement element in this.content ) {
+                       element.write ( res, _max, _index );
+                       _index++;
+               }
+
+               file.printf ( "</u>" );
+               return true;
+       }
+}
+
+
+public class Valadoc.ListHtmlHelperEntryDocElement : ListEntryDocElement {
+       private Gee.ArrayList<DocElement> content;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, ListType type, Gee.ArrayList<DocElement> content ) {
+               this.content = content;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+               int _max = this.content.size;
+               int _index = 0;
+
+               file.printf ( "\t<li>" );
+
+               foreach ( DocElement element in this.content ) {
+                       element.write ( res, _max, _index );
+                       _index++;
+               }
+
+               file.printf ( "</li>\n" );
+
+               return true;
+       }
+}
+
+public class Valadoc.ListHtmlHelperDocElement : ListDocElement {
+       private Gee.ArrayList<ListEntryDocElement> entries;
+       private ListType type;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, ListType type, Gee.ArrayList<ListEntryDocElement> entries ) {
+               this.entries = entries;
+               this.type = type;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+               int _max = this.entries.size;
+               int _index = 0;
+
+               file.printf ( (this.type == ListType.UNSORTED)? "<ul>\n" : "<ol>\n" );
+
+               foreach ( ListEntryDocElement entry in this.entries ) {
+                       entry.write ( res, _max, _index );
+                       _index++;
+               }
+
+               file.printf ( (this.type == ListType.UNSORTED)? "</ul>\n" : "</ol>\n" );
+               return true;
+       }
+}
+
+
+
+public class Valadoc.LinkHtmlHelperDocElement : LinkDocElement {
+       protected ImageDocElementPosition position;
+       protected Gee.ArrayList<DocElement>? desc;
+       protected string path;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, string# path, Gee.ArrayList<DocElement>? desc ) {
+               this.path = #path;
+               this.desc = desc;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+
+               if ( this.desc == null ) {
+                       file.printf ( "<a href=\"%s\"/>%s<a>", this.path, this.path );
+               }
+               else {
+                       int _max = this.desc.size;
+                       int _index = 0;
+
+                       file.printf ( "<a href=\"%s\"/>", this.path );
+                       foreach ( DocElement element in this.desc ) {
+                               element.write ( res, _max, _index );
+                               _index++;
+                       }
+                       file.printf ( "<a>" );
+               }
+               return true;
+       }
+}
+
+
+
+
+public class Valadoc.TableCellHtmlHelperDocElement : TableCellDocElement {
+       private Gee.ArrayList<DocElement> content;
+       private TextVerticalPosition hpos;
+       private TextPosition pos;
+       private int dcells;
+       private int cells;
+       
+       public override void parse ( Settings settings, Tree tree, Basic me, TextPosition pos, TextVerticalPosition hpos, int cells, int dcells, Gee.ArrayList<DocElement> content ) {
+               this.content = content;
+               this.dcells = dcells;
+               this.cells = cells;
+               this.hpos = hpos;
+               this.pos = pos;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+               int _max = this.content.size;
+               int _index = 0;
+
+               GLib.StringBuilder td = new GLib.StringBuilder ( "\t\t<td" );
+               if ( this.cells != 1 ) {
+                       td.append ( " colspan=\"" );
+                       td.append ( this.cells.to_string() );
+                       td.append_unichar ( '\"' );
+               }
+
+               if ( this.dcells != 1 ) {
+                       td.append ( " rowspan=\"" );
+                       td.append ( this.dcells.to_string() );
+                       td.append_unichar ( '\"' );
+               }
+
+               switch ( this.pos ) {
+               case TextPosition.CENTER:
+                       td.append ( " align=\"center\"" );
+                       break;
+               case TextPosition.RIGHT:
+                       td.append ( " align=\"right\"" );
+                       break;
+               }
+
+               switch ( this.hpos ) {
+               case TextVerticalPosition.TOP:
+                       td.append ( " valign=\"top\"" );
+                       break;
+               case TextVerticalPosition.BOTTOM:
+                       td.append ( " valign=\"bottom\"" );
+                       break;
+               }
+
+               td.append_unichar ( '>' );
+
+               file.puts ( td.str );
+               foreach ( DocElement cell in this.content ) {
+                       cell.write ( res, _max, _index );
+                       _index++;
+               }
+               file.puts ( "</td>\n" );
+               return true;
+       }
+}
+
+
+public class Valadoc.TableHtmlHelperDocElement : TableDocElement {
+       private Gee.ArrayList<Gee.ArrayList<TableCellDocElement>> cells;
+
+       public override void parse ( Gee.ArrayList<Gee.ArrayList<TableCellDocElement>> cells ) {
+               this.cells = cells;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+
+               file.puts ( "<table border=\"1\"\n" );
+               foreach ( Gee.ArrayList<TableCellDocElement> row in this.cells ) {
+                       int _max = row.size;
+                       int _index = 0;
+
+                       file.puts ( "\t<tr>\n" );
+                       foreach ( TableCellDocElement cell in row ) {
+                               cell.write ( res, _max, _index );
+                               _index++;
+                       }
+                       file.puts ( "\t</tr>\n" );
+
+               }
+               file.puts ( "</table>\n" );
+               return true;
+       }
+}
+
+
+
+public class Valadoc.NotificationHtmlHelperDocElement : NotificationDocElement {
+       private Gee.ArrayList<DocElement> content;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, Gee.ArrayList<DocElement> content ) {
+               this.content = content;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+               int _max = this.content.size;
+               int _index = 0;
+
+               file.printf ( "\n<div>\n" );
+
+               foreach ( DocElement element in this.content ) {
+                       element.write ( res, _max, _index );
+                       _index++;
+               }
+
+               file.printf ( "\n</div>\n" );
+               return true;
+       }
+}
+
+public class Valadoc.SourceCodeHtmlHelerDocElement : SourceCodeDocElement {
+       public Language lang;
+       public string src;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, string# src, Language lang ) {
+               this.lang = lang;
+               this.src = #src;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+               file.puts ( "<pre>" );
+               file.puts ( src );
+               file.puts ( "</pre>" );
+               return true;
+       }
+}
+
+
+
+public class Valadoc.ItalicHtmlHelperDocElement : ItalicDocElement {
+       private Gee.ArrayList<DocElement> content;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, Gee.ArrayList<DocElement> content ) {
+               this.content = content;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+               int _max = this.content.size;
+               int _index = 0;
+
+               file.printf ( "<i>" );
+
+               foreach ( DocElement element in this.content ) {
+                       element.write ( res, _max, _index );
+                       _index++;
+               }
+
+               file.printf ( "</i>" );
+               return true;
+       }
+}
+
+
+public class Valadoc.BoldHtmlHelperDocElement : BoldDocElement {
+       private Gee.ArrayList<DocElement> content;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, Gee.ArrayList<DocElement> content ) {
+               this.content = content;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+               int _max = this.content.size;
+               int _index = 0;
+
+               file.printf ( "<b>" );
+
+               foreach ( DocElement element in this.content ) {
+                       element.write ( res, _max, _index );
+                       _index++;
+               }
+
+               file.printf ( "</b>" );
+               return true;
+       }
+}
+
+
+
+public class Valadoc.RightAlignedHtmlHelperDocElement : RightAlignedDocElement {
+       private Gee.ArrayList<DocElement> content;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, Gee.ArrayList<DocElement> content ) {
+               this.content = content;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+               int _max = this.content.size;
+               int _index = 0;
+
+               file.printf ( "<div align=\"right\">" );
+
+               foreach ( DocElement element in this.content ) {
+                       element.write ( res, _max, _index );
+                       _index++;
+               }
+
+               file.printf ( "</div>" );
+               return true;
+       }
+}
+
+
+
+
+
+public class Valadoc.CenterHtmlHelperDocElement : CenterDocElement {
+       private Gee.ArrayList<DocElement> content;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, Gee.ArrayList<DocElement> content ) {
+               this.content = content;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               weak GLib.FileStream file = (GLib.FileStream)res;
+               int _max = this.content.size;
+               int _index = 0;
+
+               file.printf ( "<center>" );
+
+               foreach ( DocElement element in this.content ) {
+                       element.write ( res, _max, _index );
+                       _index++;
+               }
+
+               file.printf ( "</center>" );
+               return true;
+       }
+}
+
+
+
+
+
+
+
+
+public class Valadoc.ImageHtmlHelperDocElement : ImageDocElement {
+       protected ImageDocElementPosition position;
+       protected string path;
+
+       public override bool parse ( Settings settings, Tree tree, Basic me, string# path, ImageDocElementPosition pos ) {
+               this.position = pos;
+               this.path = #path;
+               return true;
+       }
+
+       public override bool write ( void* res, int max, int index ) {
+               switch ( this.position ) {
+               case ImageDocElementPosition.NEUTRAL:
+                       ((GLib.FileStream)res).printf ( "<img src=\"%s\" />", this.path );
+                       break;
+               case ImageDocElementPosition.MIDDLE:
+                       ((GLib.FileStream)res).printf ( "<img src=\"%s\" align=\"middle\"/>", this.path );
+                       break;
+               case ImageDocElementPosition.RIGHT:
+                       ((GLib.FileStream)res).printf ( "<img src=\"%s\" align=\"right\"/>", this.path );
+                       break;
+               case ImageDocElementPosition.LEFT:
+                       ((GLib.FileStream)res).printf ( "<img src=\"%s\" align=\"left\" />", this.path );
+                       break;
+               }
+               return true;
+       }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1898,6 +2313,8 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                if ( brief.size > 0 ) {
                        doctree.write_brief ( file );
                }
+               file.printf ( "\n<br />\n" );
+               file.printf ( "\n<br />\n" );
                doctree.write_content ( file );
        }
 
index 2fabca9ae7bac8314a74df9fa81aedfbcdc58e3f..97cd011a210eb09dc87fd1c468f45291adf1a2f5 100644 (file)
@@ -87,6 +87,101 @@ public abstract class StringTaglet : Taglet {
        public abstract bool parse ( Settings settings, Tree tree, Basic me, string content );
 }
 
+public enum ImageDocElementPosition {
+       NEUTRAL,
+       MIDDLE,
+       RIGHT,
+       LEFT
+}
+
+public enum Language {
+       GENIE,
+       VALA,
+       C
+}
+
+public enum ListType {
+       UNSORTED,
+       SORTED
+}
+
+public abstract class ImageDocElement : DocElement {
+       public abstract bool parse ( Settings settings, Tree tree, Basic me, string# path, ImageDocElementPosition pos );
+}
+
+public abstract class LinkDocElement : DocElement {
+       public abstract bool parse ( Settings settings, Tree tree, Basic me, string# link, Gee.ArrayList<DocElement>? desc );
+}
+
+public abstract class SourceCodeDocElement : DocElement {
+       public abstract bool parse ( Settings settings, Tree tree, Basic me, string# src, Language lang );
+}
+
+public abstract class ListEntryDocElement : DocElement {
+       public abstract bool parse ( Settings settings, Tree tree, Basic me, ListType type, Gee.ArrayList<DocElement> content );
+}
+
+public abstract class ListDocElement : DocElement {
+       public abstract bool parse ( Settings settings, Tree tree, Basic me, ListType type, Gee.ArrayList<ListEntryDocElement> entries );
+}
+
+public abstract class NotificationDocElement : DocElement {
+       public abstract bool parse ( Settings settings, Tree tree, Basic me, Gee.ArrayList<DocElement> content );
+}
+
+
+public abstract class HighlightedDocElement : DocElement {
+       public abstract bool parse ( Settings settings, Tree tree, Basic me, Gee.ArrayList<DocElement> content );
+}
+
+public abstract class ItalicDocElement : HighlightedDocElement {
+}
+
+public abstract class BoldDocElement : HighlightedDocElement {
+}
+
+public abstract class UnderlinedDocElement : HighlightedDocElement {
+}
+
+public abstract class ContentPositionDocElement : DocElement {
+       public abstract bool parse ( Settings settings, Tree tree, Basic me, Gee.ArrayList<DocElement> content );
+}
+
+public abstract class CenterDocElement : ContentPositionDocElement {
+}
+
+public abstract class RightAlignedDocElement : ContentPositionDocElement {
+}
+
+
+public enum TextPosition {
+       LEFT,
+       RIGHT,
+       CENTER
+}
+
+public enum TextVerticalPosition {
+       TOP,
+       MIDDLE,
+       BOTTOM
+}
+
+
+
+public abstract class TableCellDocElement : DocElement {
+       public abstract void parse ( Settings settings, Tree tree, Basic me, TextPosition pos, TextVerticalPosition hpos, int size, int dsize, Gee.ArrayList<DocElement> content );
+}
+
+public abstract class TableDocElement : DocElement {
+       public abstract void parse ( Gee.ArrayList<Gee.ArrayList<TableCellDocElement>> cells );
+}
+
+
+
+
+
+
+
 
 
 
@@ -222,41 +317,167 @@ public class DocumentationTree : Object {
 
 
 
+public class ModuleLoader : Object {
+       public Gee.HashMap< string, GLib.Type > taglets;
+       public GLib.Type underlinedtag;
+       public GLib.Type notifictag;
+       public GLib.Type centertag;
+       public GLib.Type italictag;
+       public GLib.Type ulistetag;
+       public GLib.Type righttag;
+       public GLib.Type ulisttag;
+       public GLib.Type linktag;
+       public GLib.Type strtag;
+       public GLib.Type srctag;
+       public GLib.Type imgtag;
+       public GLib.Type boldtag;
+
+       public GLib.Type tabletag;
+       public GLib.Type celltag;
+
+       public Doclet doclet;
+
+       private Module docletmodule;
+       private Type doclettype;
+
+
+       public bool load ( string path ) {
+               bool tmp = this.load_doclet ( path );
+               if ( tmp == false )
+                       return false;
+
+               return this.load_taglets ( path );
+       }
+
+       public bool load_doclet ( string path ) {
+               void* function;
+
+               docletmodule = Module.open ( path + "/libdoclet.so", ModuleFlags.BIND_LAZY);
+               if (docletmodule == null) {
+                       return false;
+               }
+
+               docletmodule.symbol( "register_plugin", out function );
+               if ( function == null ) {
+                       return false;
+               }
+
+               Valadoc.DocletRegisterFunction doclet_register_function = (Valadoc.DocletRegisterFunction) function;
+               doclettype = doclet_register_function ( );
+               this.doclet = (Doclet)GLib.Object.new (doclettype);
+               return true;
+       }
+
+       public bool load_taglets ( string fulldirpath ) {
+               try {
+                       taglets = new Gee.HashMap<string, Type> ( GLib.str_hash, GLib.str_equal );
+                       Gee.ArrayList<Module*> modules = new Gee.ArrayList<weak Module*> ( );
+                       string pluginpath = fulldirpath + "taglets/";
+                       GLib.Dir dir = GLib.Dir.open ( pluginpath );
+                       void* function;
+
+                       for ( weak string entry = dir.read_name(); entry != null ; entry = dir.read_name() ) {
+                               if ( !( entry.has_suffix(".so") || entry.has_suffix(".dll") ) )
+                                       continue ;
+
+                               string tagletpath = pluginpath + "/" + entry;
+
+                               Module* module = Module.open ( tagletpath, ModuleFlags.BIND_LAZY);
+                               if (module == null) {
+                                       stderr.printf ( "Can't load plugin.\n" );
+                                       taglets = null;
+                                       return false;
+                               }
+
+                               module->symbol( "register_plugin", out function );
+                               Valadoc.TagletRegisterFunction tagletregisterfkt = (Valadoc.TagletRegisterFunction) function;
+
 
+                               GLib.Type type = tagletregisterfkt ( taglets );
 
+                               switch ( entry ) {
+                               case "libtagletstring.so":
+                                       this.strtag = type;
+                                       break;
+                               case "libtagletimage.so":
+                                       this.imgtag = type;
+                                       break;
+                               case "libtagletcenter.so":
+                                       this.centertag = type;
+                                       break;
+                               case "libtagletright.so":
+                                       this.righttag = type;
+                                       break;
+                               case "libtagletbold.so":
+                                       this.boldtag = type;
+                                       break;
+                               case "libtagletunderline.so":
+                                       this.underlinedtag = type;
+                                       break;
+                               case "libtagletitalic.so":
+                                       this.italictag = type;
+                                       break;
+                               case "libtagletsrcsample.so":
+                                       this.srctag = type;
+                                       break;
+                               case "libtagletnotification.so":
+                                       this.notifictag = type;
+                                       break;
+                               case "libtaglettable.so":
+                                       this.tabletag = type;
+                                       break;
+                               case "libtaglettablecell.so":
+                                       this.celltag = type;
+                                       break;
+                               case "libtagletwikilink.so":
+                                       this.linktag = type;
+                                       break;
+                               case "libtagletlist.so":
+                                       this.ulisttag = type;
+                                       break;
+                               case "libtagletlistelement.so":
+                                       this.ulistetag = type;
+                                       break;
+                               }
 
+                               modules.add ( module );
+                       }
+                       return true;
+               }
+               catch ( FileError err ) {
+                       stderr.printf ( "Can't load plugin.\n" );
+                       taglets = null;
+                       return false;
+               }
+       }
+}
 
 
 public class Parser {
-       private ErrorReporter err;
+       private ModuleLoader modules;
        private Settings settings;
+       private ErrorReporter err;
 
-       private int linestartpos;
+       private bool errflag = false;
 
+       private int linestartpos;
+       private int startline;
+       private int startpos;
        private int line;
        private int pos;
 
        private weak string filename;
-       private int startline = 0;
-       private int startpos = 0;
-
-       private bool run;
-
        private weak string str;
+       private bool run;
 
-       private bool errflag = false;
-
-       private Gee.HashMap< string, GLib.Type > taglets;
-       private GLib.Type strtag;
 
-       public Parser ( Settings settings, ErrorReporter reporter, GLib.Type strtag, Gee.HashMap< string, GLib.Type > taglets ) {
+       public Parser ( Settings settings, ErrorReporter reporter, ModuleLoader modules ) {
                this.settings = settings;
-               this.taglets = taglets;
-               this.strtag = strtag;
+               this.modules = modules;
                this.err = reporter;
        }
 
-       private inline string extract_line ( int starttag_linestartpos = -1 ) {
+       private string extract_line ( int starttag_linestartpos = -1 ) {
                if ( starttag_linestartpos == -1 )
                        starttag_linestartpos = this.linestartpos;
 
@@ -313,11 +534,13 @@ public class Parser {
                }
 
                if ( chr != '*' ) {
-                       this.error ( "syntax error - invalid body.", 1 );
+                       this.error ( "invalid body.", 1 );
                        this.run = false;
                }
+       }
 
-               chr = str[pos+1];
+       private void next_nonspace_char () {
+               unichar chr = this.str[this.pos+1];
 
                if ( chr == ' ' || chr == '\t' )
                        this.next_char ();
@@ -326,18 +549,18 @@ public class Parser {
        private void parse_escape ( GLib.StringBuilder buf ) {
                unichar chr = this.str[this.pos+1];
                switch ( chr ) {
-               case '@':
                case '}':
-               case '{':
+               case ']':
+               case '|':
                case '\\':
                        buf.append_unichar ( chr );
                        break;
                case '\0':
-                       this.error ( "syntax error - invalid escape sequence.", 1 );
+                       this.error ( "invalid escape sequence.", 1 );
                        this.run = false;
                        break;
                default:
-                       this.error ( "syntax error - invalid escape sequence.", 2 );
+                       this.error ( "invalid escape sequence.", 2 );
                        break;
                }
                this.pos++;
@@ -354,30 +577,30 @@ public class Parser {
        }
 
        private InlineTaglet? create_inline_taglet ( string name ) {
-               if ( this.taglets.contains ( name ) == false ) {
-                       this.error ( "error - taglet '%s' is not registered.\n".printf( name ), -(int)name.len()-1  );
+               if ( this.modules.taglets.contains ( name ) == false ) {
+                       this.error ( "taglet '%s' is not registered.\n".printf( name ), -(int)name.len()-1  );
                        return null;
                }
 
-               GLib.Type type = this.taglets.get ( name );
+               GLib.Type type = this.modules.taglets.get ( name );
                Taglet taglet = (Taglet)GLib.Object.new ( type );
                if ( taglet is InlineTaglet == false ) {
-                       this.error ( "context error - '%s' is not an inline taglet.\n".printf( name ), -(int)name.len()-1 );
+                       this.error ( "'%s' is not an inline taglet.\n".printf( name ), -(int)name.len()-1 );
                        return null;
                }               
                return (InlineTaglet)taglet;
        }
 
        private MainTaglet? create_main_taglet ( string name ) {
-               if ( this.taglets.contains ( name ) == false ) {
-                       this.error ( "error - taglet '%s' is not registered.\n".printf( name ), -(int)name.len()-1  );
+               if ( this.modules.taglets.contains ( name ) == false ) {
+                       this.error ( "taglet '%s' is not registered.\n".printf( name ), -(int)name.len()-1  );
                        return null;
                }
 
-               GLib.Type type = this.taglets.get ( name );
+               GLib.Type type = this.modules.taglets.get ( name );
                Taglet taglet = (Taglet)GLib.Object.new ( type );
                if ( taglet is MainTaglet == false ) {
-                       this.error ( "context error - '%s' is an inline taglet.\n".printf( name ), -(int)name.len()-1 );
+                       this.error ( "'%s' is an inline taglet.\n".printf( name ), -(int)name.len()-1 );
                        return null;
                }               
                return (MainTaglet)taglet;
@@ -414,10 +637,7 @@ public class Parser {
 
        private void append_main_taglet ( Tree tree, DocumentationTree dtree, Basic me, MainTaglet? curtag, int paragraph, string? curtagname, Gee.ArrayList<DocElement> content, int starttag_linestartpos, int starttag_startpos, int starttag_line, int starttag_pos ) {
                if ( curtag == null ) {
-                       if ( paragraph == 0 )
-                               dtree.add_brief ( content );
-                       else
-                               dtree.add_description ( content );
+                       dtree.add_description ( content );
                }
                else {
                        this.parse_main_taglet ( tree, me, content, curtag, (int)curtagname.length, starttag_linestartpos, starttag_startpos, starttag_line, starttag_pos );
@@ -426,7 +646,7 @@ public class Parser {
        }
 
        private StringTaglet create_string_taglet ( Tree tree, Basic? me, GLib.StringBuilder buf ) {
-               StringTaglet strtag = (StringTaglet)GLib.Object.new ( strtag );
+               StringTaglet strtag = (StringTaglet)GLib.Object.new ( this.modules.strtag );
                strtag.parse ( settings, tree, me, buf.str );
                buf.erase ( 0, -1 );
                return strtag;
@@ -440,6 +660,38 @@ public class Parser {
                content.add ( strtag );
        }
 
+       private int next_word_offset () {
+               weak string curstr = this.str.offset ( this.pos );
+               long offset = curstr.length;
+
+               weak string posstr = curstr.chr ( -1, ' ' );
+               if ( posstr != null ) {
+                       offset =  curstr.pointer_to_offset ( posstr ); 
+               }
+
+               posstr = curstr.chr ( -1, '\n' );
+               if ( posstr != null ) {
+                       offset = long.min ( offset, curstr.pointer_to_offset ( posstr ) );
+               }
+
+               posstr = curstr.chr ( -1, '\t' );
+               if ( posstr != null ) {
+                       offset = long.min ( offset, curstr.pointer_to_offset ( posstr ) );
+               }
+               return (int)offset;
+       }
+
+       private int next_line_offset () {
+               weak string curstr = this.str.offset ( this.pos );
+               long offset = curstr.length;
+
+               weak string posstr = curstr.chr ( -1, '\n' );
+               if ( posstr != null ) {
+                       offset =  curstr.pointer_to_offset ( posstr ); 
+               }
+               return (int)offset;
+       }
+
        private void parse_inline_taglets ( Tree tree, Basic me, Gee.ArrayList<DocElement> elements ) {
                this.pos++;
 
@@ -450,9 +702,9 @@ public class Parser {
                                continue;
                        case '\n':
                                this.skip_newline ();
+                               this.next_nonspace_char ();
                                continue;
                        case '\0':
-                               // error message
                                this.run = false;
                                return ;
                        default:
@@ -467,14 +719,13 @@ public class Parser {
                int starttag_pos = this.pos;
 
                if ( this.str[this.pos] != '@' ) {
-                       // fehlermeldung
+                       this.error ( "taglet name was expected.", this.next_word_offset () );
                        this.run = false;
                        return ;
                }
 
                GLib.StringBuilder buf = new GLib.StringBuilder ( );
                string name = this.parse_name ( );
-               // if ( name == "" ) => fehlermeldung
 
                InlineTaglet? taglet = this.create_inline_taglet ( name );
                if ( taglet == null ) {
@@ -491,6 +742,7 @@ public class Parser {
                                continue;
                        case '\n':
                                this.skip_newline ();
+                               this.next_nonspace_char ();
                                if ( buf.len > 0 && buf.str[buf.len-1] != ' ' ) {
                                        buf.append_unichar ( ' ' );
                                }
@@ -510,7 +762,9 @@ public class Parser {
                                continue ;
                        }
                }
-               //error - Missing closing '}' character for inline tag.
+
+
+               this.error ( "brackets are not closed.", 2, starttag_linestartpos, starttag_startpos, starttag_line, starttag_pos );
                this.run = false;
                return ;
        }
@@ -521,118 +775,1178 @@ public class Parser {
                return ( str[this.pos] == '\n' );
        }
 
-       public DocumentationTree? parse ( Tree tree, Basic me, string str ) {
+       private int parse_list_entry ( Tree tree, Basic me, ListType type, Gee.ArrayList<ListEntryDocElement> entries, GLib.Queue<int> queue, int deep, int prevdeep ) {
                Gee.ArrayList<DocElement> content = new Gee.ArrayList<DocElement> ();
                GLib.StringBuilder buf = new GLib.StringBuilder ( );
-               DocumentationTree dtree = new DocumentationTree ();
-               string curtagname = null;
-               MainTaglet curtag = null;
-
-               int starttag_linestartpos = 0;
-               int starttag_startpos = 0;
-               int starttag_line = 0;
-               int starttag_pos = 0;
-               int paragraph = 0;
-
-               this.filename = me.filename;
-
-               this.linestartpos = 0;
-               this.startpos = 0;
-               this.line = 0;
-               this.pos = 0;
-
-               this.run = true;
-               this.str = str;
-               this.line = 0;
 
-
-               bool tmp = this.skip_documentation_header ();
-               if ( tmp == false ) {
-                       this.error ( "syntax error - invalid documentation header.", 1 );
-                       return null;
+               unichar chr = this.str[this.pos];
+               if ( chr != '*' && chr != '#' ) {
+                       this.next_char ( );
+                       chr = this.str[this.pos];
                }
 
-               for ( ; str[pos] != '\0'; this.next_char ( ) ) {
-                       if ( this.run == false )
-                               break;
-
-                       switch ( str[pos] ) {
-                               case ' ':
-                               case '\t':
-                                       if ( buf.str[buf.len-1] != '\n' && buf.len > 0 && buf.str[buf.len-1] != ' ') {
-                                               buf.append_unichar ( ' ' );
-                                       }
-                                       break;
-                               case '\n':
-                                       this.skip_newline ();
+               if ( !(type == ListType.SORTED && chr == '#' || type == ListType.UNSORTED && chr == '*') ) {
+                       this.error ( "invalid list entry.", this.next_line_offset () );
+               }
 
-                                       if ( str[pos+1] == '\n' ) {
-                                               if ( paragraph == 0 ) {
-                                                       this.append_and_create_string_taglet ( content, tree, me, buf );
-                                                       this.append_main_taglet ( tree, dtree, me, curtag, paragraph, curtagname, content, starttag_linestartpos, starttag_startpos, starttag_line, starttag_pos );
-                                                       content = new Gee.ArrayList<DocElement> ();
-                                                       paragraph++;
-                                                       break;
-                                               }
-                                               buf.append_unichar ( '\n' );
-                                               paragraph++;
-                                               break ;
-                                       }
-                                       else if ( str[pos+1] == '@' ) {
-                                               pos++;
+               this.next_char ( );
 
-                                               int f_starttag_linestartpos = this.linestartpos;
-                                               int f_starttag_startpos = this.startpos;
-                                               int f_starttag_line = this.line;
-                                               int f_starttag_pos = this.pos;
+               for ( chr = this.str[this.pos]; chr != '\0'; chr = this.str[++this.pos] ) {
+                       switch ( chr ) {
+                       case '\t':
+                       case ' ':
+                               if ( buf.str[buf.len-1] != '\n' && buf.str[buf.len-1] != ' ') {
+                                       buf.append_unichar ( ' ' );
+                               }
+                               break;
+                       case '\n':
+                               this.skip_newline ();
+                               int  startpos = this.pos;
+                               this.next_nonspace_char ();
 
-                                               string name = this.parse_name ( );
-                                               if ( name == "" ) {
-                                                       buf.append_unichar ( '@' ); // Warning?
-                                                       break;
-                                               }
+                               if ( this.str[this.pos] == '\0' ) {
+                                       ListEntryDocElement lstel = (ListEntryDocElement)GLib.Object.new ( this.modules.ulistetag );
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       lstel.parse ( this.settings, tree, me, type, content );
+                                       entries.add ( lstel );
+                                       this.run = false;
+                                       return -2;
+                               }
 
-                                               this.append_and_create_string_taglet ( content, tree, me, buf );
-                                               this.append_main_taglet ( tree, dtree, me, curtag, paragraph, curtagname, content, starttag_linestartpos, starttag_startpos, starttag_line, starttag_pos );
-                                               paragraph++;
+                               unichar nchr = this.str[this.pos+1];
 
-                                               starttag_linestartpos = f_starttag_linestartpos;
-                                               starttag_startpos = f_starttag_startpos;
-                                               starttag_line = f_starttag_line;
-                                               starttag_pos = f_starttag_pos;
+                               switch ( nchr ) {
+                               case '\0':
+                                       ListEntryDocElement lstel = (ListEntryDocElement)GLib.Object.new ( this.modules.ulistetag );
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       lstel.parse ( this.settings, tree, me, type, content );
+                                       entries.add ( lstel );
+                                       this.run = false;
+                                       return -2;
+                               case '\n':
+                                       ListEntryDocElement lstel = (ListEntryDocElement)GLib.Object.new ( this.modules.ulistetag );
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       lstel.parse ( this.settings, tree, me, type, content );
+                                       entries.add ( lstel );
+                                       return -2;
+                               case '*':
+                               case '#':
+                                       int ndeep = this.pos-startpos + 1;
+
+                                       ListEntryDocElement lstel = (ListEntryDocElement)GLib.Object.new ( this.modules.ulistetag );
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       lstel.parse ( this.settings, tree, me, type, content );
+                                       entries.add ( lstel );
 
-                                               content = new Gee.ArrayList<DocElement> ();
-                                               curtag = create_main_taglet ( name );
-                                               curtagname = #name;
+                                       if ( ndeep > deep ) {
+                                               ndeep = this.parse_list ( tree, me, (nchr == '*')? ListType.UNSORTED : ListType.SORTED, content, queue, ndeep, deep );
                                        }
-                                       else if ( buf.str[buf.len-1] != '\n' && buf.len > 0 && buf.str[buf.len-1] != ' ') {
+                                       return ndeep;                           
+                               default:
+                                       if ( buf.len > 0 && buf.str[buf.len-1] != ' ') {
                                                buf.append_unichar ( ' ' );
                                        }
-
                                        break;
-                               case '{':
+                               }
+                               break;
+                       case '{':
+                               if ( str[pos+1] == '{' ) {
+                                       if ( str[pos+2] == '{' ) {
+                                               this.error ( "source samples are not allowed inside lists.", this.next_line_offset () );
+                                               this.run = false;
+                                               break;
+                                       }
                                        this.append_and_create_string_taglet ( content, tree, me, buf );
-                                       this.parse_inline_taglets ( tree, me, content );
+                                       this.parse_image ( tree, me, content );
                                        break;
-                               case '@':
-                                       // warning!
-                                       buf.append_unichar ( '@' );
+                               }
+                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                               this.parse_inline_taglets ( tree, me, content );
+                               break;
+                       case '[':
+                               if ( str[pos+1] == '[' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_link ( tree, me, content );
                                        break;
-                               case '\\':
-                                       this.parse_escape ( buf );
+                               }
+                               buf.append_unichar ( '[' );                                             
+                               break;
+                       case '+':
+                               if ( str[pos+1] == '+' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_bold_content ( tree, me, content );
                                        break;
-                               default:
-                                       buf.append_unichar ( str[pos] );
+                               }
+                               buf.append_unichar ( '+' );
+                               break;
+                       case '_':
+                               if ( str[pos+1] == '_' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_underlined_content ( tree, me, content );
+                                       break;
+                               }
+                               buf.append_unichar ( '_' );
+                               break;
+                       case '/':
+                               if ( str[pos+1] == '/' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_italic_content ( tree, me, content );
                                        break;
+                               }
+                               buf.append_unichar ( '/' );
+                               break;
+                       default:
+                               buf.append_unichar ( chr );
+                               break;
                        }
                }
+               ListEntryDocElement lstel = (ListEntryDocElement)GLib.Object.new ( this.modules.ulistetag );
+               this.append_and_create_string_taglet ( content, tree, me, buf );
+               lstel.parse ( this.settings, tree, me, type, content );
+               entries.add ( lstel );
+               this.run = false;
+               return -2;
+       }
 
-               if ( this.errflag == true )
-                       return null;
+       private int parse_list ( Tree tree, Basic me, ListType listtype, Gee.ArrayList<DocElement> content, GLib.Queue<int> stack, int deep, int prevdeep ) {
+               Gee.ArrayList<ListEntryDocElement> entries = new Gee.ArrayList<ListEntryDocElement> ();
+               unichar chr = this.str[this.pos];
+               int ndeep = -1;
 
-               this.append_and_create_string_taglet ( content, tree, me, buf );
-               this.append_main_taglet ( tree, dtree, me, curtag, paragraph, curtagname, content, starttag_linestartpos, starttag_startpos, starttag_line, starttag_pos );
-               return dtree;
+               if ( deep >= 0 )
+                       stack.push_head ( deep );
+
+               do {
+                       ndeep = this.parse_list_entry ( tree, me, listtype, entries, stack, deep, prevdeep );
+                       chr = this.str[++this.pos];
+               }
+               while ( chr != '\0' && chr != '\n' && ndeep == deep && this.run == true );
+
+
+               if ( stack.is_empty () == false && deep > ndeep && ndeep >= 0 ) {
+                       weak GLib.List<int> pos = stack.find ( ndeep );
+                       if ( pos == null ) {
+                               this.error ( "invalid list entry.", this.next_line_offset () );
+                               this.run = false;
+                       }
+               }
+
+               ListDocElement ltag = (ListDocElement)GLib.Object.new ( this.modules.ulisttag );
+               ltag.parse ( this.settings, tree, me, listtype, entries );
+               content.add ( ltag );
+
+               if ( deep >= 0 )
+                       stack.pop_head ( );
+
+               this.pos--;
+               return ndeep;
+       }
+
+       private void skip_whitespaces () {
+               for ( ; ; this.pos++  ) {
+                       unichar chr =  this.str[this.pos];
+                       switch ( chr ) {
+                       case '\0':
+                               this.run = false;
+                               return;
+                       case '\t':
+                       case ' ':
+                               break;
+                       default:
+                               return ;
+                       }
+               }
+       }
+
+       private int extract_number () {
+               weak string startstr = this.str.offset( this.pos );
+               weak string pos = startstr;
+               for ( unichar chr = pos.get_char (); chr >= '0' && chr <= '9' ; pos = pos.next_char (), chr = pos.get_char (), this.pos++ );
+
+               long len =  startstr.pointer_to_offset ( pos );
+               string numstr = startstr.ndup ( len );
+               return numstr.to_int();
+       }
+
+       private bool parse_cell_attribute ( ref TextPosition pos, ref TextVerticalPosition hpos, ref int size, ref int dsize ) {
+               weak string str = this.str.offset ( this.pos );
+               int startpos = this.pos;
+
+               if ( str.has_prefix ( ")(" ) ) {
+                       pos = TextPosition.CENTER;
+                       this.pos = this.pos + 2;
+               }
+               else if ( str.has_prefix ( "))" ) ) {
+                       pos = TextPosition.RIGHT;
+                       this.pos = this.pos + 2;
+               }
+               else if ( str.has_prefix ( "^" ) ) {
+                       hpos = TextVerticalPosition.TOP;
+                       this.pos++;
+               }
+               else if ( str.has_prefix ( "-" ) ) {
+                       this.pos++;
+                       this.skip_whitespaces ();
+                       size = this.extract_number ();
+               }
+               else if ( str.has_prefix ( "v" ) ) {
+                       this.pos++;
+                       this.skip_whitespaces ();
+                       dsize = this.extract_number ();
+               }
+               else {
+                       int offset = this.next_line_offset ();
+
+                       weak string posstr = str.chr ( -1, '>' );
+                       if ( posstr != null ) {
+                               offset = int.min ( offset, (int)str.pointer_to_offset ( posstr ) );
+                       }
+
+                       posstr = str.chr ( -1, '|' );
+                       if ( posstr != null ) {
+                               offset = int.min ( offset, (int)str.pointer_to_offset ( posstr ) );
+                       }
+
+                       this.error ( "invalid cell attribute.", offset );
+                       this.run = false;
+                       return false;
+               }
+
+               this.skip_whitespaces ();
+               unichar chr = this.str[this.pos];
+               if ( chr == '|' ) {
+                       return true;
+               }
+
+               if ( chr == '>' ) {
+                       return false;
+               }
+               this.error ( "invalid cell attributes.", 5 );
+               this.run = false;
+               return false;
+       }
+
+       private void parse_cell_attributes ( out TextPosition pos, out TextVerticalPosition hpos, out int size, out int dsize ) {
+               bool tmp = true;
+
+               hpos = TextVerticalPosition.MIDDLE;
+               pos = TextPosition.LEFT;
+               size = 1;
+
+               do {
+                       this.pos++;
+                       tmp = this.parse_cell_attribute ( ref pos, ref hpos, ref size, ref dsize );
+               } while ( tmp == true && this.run == true );
+       }
+
+       
+
+       private bool parse_row ( Tree tree, Basic me, Gee.ArrayList<Gee.ArrayList<TableCellDocElement>> rows ) {
+               Gee.ArrayList<TableCellDocElement> row = new Gee.ArrayList<TableCellDocElement> ();
+               Gee.ArrayList<DocElement> content = new Gee.ArrayList<DocElement> ();
+               GLib.StringBuilder buf = new GLib.StringBuilder ( );
+
+               this.skip_whitespaces ();
+               this.pos = this.pos+2;
+
+               TextVerticalPosition hpos = TextVerticalPosition.MIDDLE;
+               TextPosition pos = TextPosition.LEFT;
+               int dsize = 1;
+               int size = 1;
+
+               if ( this.str[this.pos] == '<' ) {
+                       this.parse_cell_attributes ( out pos, out hpos, out size, out dsize );
+               }
+
+               this.next_char ( );
+               for ( unichar chr = this.str[this.pos]; chr != '\0'; chr = this.str[++this.pos] ) {
+                       switch ( chr ) {
+                       case '\t':
+                       case ' ':
+                               if ( buf.str[buf.len-1] != '\n' && buf.str[buf.len-1] != ' ') {
+                                       buf.append_unichar ( ' ' );
+                               }
+                               break;
+                       case '|':
+                               unichar nchr = this.str[this.pos+1];
+                               switch ( nchr ) {
+                               case ']':
+                               case '|':
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       TableCellDocElement cell = (TableCellDocElement)GLib.Object.new ( this.modules.celltag );
+                                       cell.parse ( this.settings, tree, me, pos, hpos, size, dsize, content );
+                                       content = new Gee.ArrayList<DocElement> ();
+                                       row.add ( cell );
+
+                                       hpos = TextVerticalPosition.MIDDLE;
+                                       pos = TextPosition.LEFT;
+                                       dsize = 1;
+                                       size = 1;
+
+                                       if ( this.str[this.pos] == '<' ) {
+                                               this.parse_cell_attributes ( out pos, out hpos, out size, out dsize );
+                                       }
+
+                                       this.pos++;
+
+                                       if ( nchr == ']' ) {
+                                               this.pos++;
+                                               this.skip_whitespaces ();
+                                               rows.add ( row );
+                                               if ( this.str[this.pos] == '\0' ) {
+                                                       this.run = false;
+                                                       return false;
+                                               }
+
+                                               if ( this.str[this.pos] == '\n' ) {
+                                                       int newlinepos = this.pos;
+                                                       this.skip_newline ();
+                                                       this.pos++;
+                                                       this.skip_whitespaces ();
+
+                                                       if ( this.str[this.pos] == '[' && this.str[this.pos+1] == '|' ) {
+                                                               return true;
+                                                       }
+                                                       this.pos = newlinepos-1;
+                                               }
+
+                                               return false;
+                                       }
+                                       break;
+                               default:
+                                       buf.append_unichar ( chr );
+                                       break;
+                               }
+                               break;
+                       default:
+                               buf.append_unichar ( chr );
+                               break;
+                       }
+               }
+               this.run = false;
+               return false;
+       }
+
+       private void parse_table ( Tree tree, Basic me, Gee.ArrayList<DocElement> content ) {
+               Gee.ArrayList<Gee.ArrayList<TableCellDocElement>> rows = new Gee.ArrayList<Gee.ArrayList<TableCellDocElement>> ();
+               bool next = true;
+               this.pos++;
+
+               do {
+                       next = this.parse_row ( tree, me, rows );
+               }
+               while ( this.run == true && next == true );
+               TableDocElement table = (TableDocElement)GLib.Object.new ( this.modules.tabletag );
+               table.parse ( rows  );
+               content.add ( table );
+       }
+
+       private void parse_italic_content ( Tree tree, Basic me, Gee.ArrayList<DocElement> content, bool newline = true  ) {
+               this.parse_highlighted_content ( tree, me, this.modules.italictag, '/', content, newline );
+       }
+
+       private void parse_bold_content ( Tree tree, Basic me, Gee.ArrayList<DocElement> content, bool newline = true  ) {
+               this.parse_highlighted_content ( tree, me, this.modules.boldtag, '+', content, newline );
+       }
+
+       private void parse_underlined_content ( Tree tree, Basic me, Gee.ArrayList<DocElement> content, bool newline = true  ) {
+               this.parse_highlighted_content ( tree, me, this.modules.underlinedtag, '_', content, newline );
+       }
+
+       private void parse_highlighted_content ( Tree tree, Basic me, GLib.Type tagtype, unichar separator, Gee.ArrayList<DocElement> content2, bool newline = true  ) {
+               Gee.ArrayList<DocElement> content = new Gee.ArrayList<DocElement> ();
+               GLib.StringBuilder buf = new GLib.StringBuilder ( );
+               int starttag_linestartpos = this.linestartpos;
+               int starttag_startpos = this.startpos;
+               int starttag_line = this.line;
+               int starttag_pos = this.pos;
+               this.pos = this.pos+2;
+
+               for ( unichar chr = this.str[this.pos]; chr != '\0' ; chr = this.str[++this.pos] ) {
+                       if ( this.run == false ) {
+                               return ;
+                       }
+
+                       switch ( chr ) {
+                       case '\t':
+                       case ' ':
+                               if ( buf.str[buf.len-1] != '\n' && buf.str[buf.len-1] != ' ') {
+                                       buf.append_unichar ( ' ' );
+                               }
+                               break;
+                       case '\n':
+                               if ( newline == false ) {
+                                       this.error ( "newlines are not allowed.", this.next_line_offset () );
+                                       this.run = false;
+                                       return ;
+                               }
+                               this.skip_newline ();
+                               int reallinestartpos = this.pos;
+                               this.next_nonspace_char ();
+                               switch ( str[pos+1] ) {
+                               case '\n':
+                                       buf.append_unichar ( '\n' );
+                                       break ;
+                               case '#':
+                               case '*':
+                                       this.error ( "lists are not allowed inside highlighted content.", this.next_line_offset () );
+                                       break;
+                               case '@':
+                                       this.error ( "taglets are not allowed inside highlighted content.", this.next_line_offset () );
+                                       break;
+                               case ')':
+                                       unichar nnchr = str[pos+2];
+                                       if ( nnchr == ')' || nnchr == '(' ) {
+                                               this.error ( "error - text alignments are not allowed inside highlighted content.", this.next_line_offset () );
+                                       }
+                                       break;
+                               }
+                               break;
+                       case '{':
+                               if ( str[pos+1] == '{' ) {
+                                       if ( str[pos+2] == '{' ) {
+                                               this.error ( "code samples are not allowed inside highlighted content.", 3 );
+                                               this.run = false;
+                                               break;
+                                       }
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_image ( tree, me, content );
+                                       break;
+                               }
+                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                               this.parse_inline_taglets ( tree, me, content );
+                               break;
+                       case '[':
+                               weak string cpos = this.str.offset ( this.pos );
+                               if ( cpos.has_prefix( "[warning:" ) ) {
+                                       this.error ( "notifications are not allowed inside highlighted content.", this.next_line_offset () );
+                                       this.run = false;
+                                       break;
+                               }
+                               if ( str[pos+1] == '[' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_link ( tree, me, content );
+                                       break;
+                               }
+                               buf.append_unichar ( '[' );                                             
+                               break;
+                       default:
+                               unichar nchr = str[pos+1];
+                               if ( chr == separator ) {
+                                       if ( nchr == separator ) {
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               HighlightedDocElement element = (HighlightedDocElement)GLib.Object.new ( tagtype );
+                                               element.parse ( this.settings, tree, me, content );
+                                               content2.add ( element );
+                                               this.pos++;
+                                               return ;
+                                       }
+                                       buf.append_unichar ( separator );
+                                       break;
+                               }
+
+                               if ( nchr == chr ) {
+                                       switch ( nchr ) {
+                                       case '+':
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_bold_content ( tree, me, content );
+                                               continue;
+                                       case '_':
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_underlined_content ( tree, me, content );
+                                               continue;
+                                       case '/':
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_italic_content ( tree, me, content );
+                                               continue;
+                                       }
+                               }
+                               buf.append_unichar ( chr );
+                               break;
+                       }
+               }
+               this.error ( "tag is not closed.", 2, starttag_linestartpos, starttag_startpos, starttag_line, starttag_pos );
+               this.run = false;
+       }
+
+       private void parse_notification ( Tree tree, Basic me, Gee.ArrayList<DocElement> content2 ) {
+               Gee.ArrayList<DocElement> content = new Gee.ArrayList<DocElement> ();
+               GLib.StringBuilder buf = new GLib.StringBuilder ( );
+               int starttag_linestartpos = this.linestartpos;
+               int starttag_startpos = this.startpos;
+               int starttag_line = this.line;
+               int starttag_pos = this.pos;
+               this.pos = this.pos + 9;
+
+               for ( unichar chr = this.str[this.pos]; chr != '\0' ; chr = this.str[++this.pos] ) {
+                       switch ( chr ) {
+                       case ' ':
+                       case '\t':
+                               if ( buf.str[buf.len-1] != '\n' && buf.str[buf.len-1] != ' ') {
+                                       buf.append_unichar ( ' ' );
+                               }
+                               break;
+                       case '\n':
+                               this.skip_newline ();
+                               int reallinestartpos = this.pos;
+                               this.next_nonspace_char ();
+
+                               switch ( str[pos+1] ) {
+                               case '\n':
+                                       buf.append_unichar ( '\n' );
+                                       break ;
+                               case '#':
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_list ( tree, me, ListType.SORTED, content, new GLib.Queue<int> (), ++this.pos-reallinestartpos, -1 );
+                                       break;
+                               case '*':
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_list ( tree, me, ListType.UNSORTED, content, new GLib.Queue<int> (), ++this.pos-reallinestartpos, -1 );
+                                       break;
+                               case ')':
+                                       switch ( str[pos+2] ) {
+                                       case ')':
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_content_position ( tree, me, this.modules.righttag, content );
+                                               break;
+                                       case '(':
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_content_position ( tree, me, this.modules.centertag, content );
+                                               break;
+                                       }
+                                       break;
+                               default:
+                                       if ( buf.str[buf.len-1] != '\n' && buf.str[buf.len-1] != ' ') {
+                                               buf.append_unichar ( ' ' );
+                                       }
+                                       break;
+                               }
+                               break;
+                       case ']':
+                               this.append_and_create_string_taglet ( content, tree, me, buf );                                
+                               NotificationDocElement notification = (NotificationDocElement)GLib.Object.new ( this.modules.notifictag );
+                               notification.parse ( this.settings, tree, me, content );
+                               content2.add ( notification );
+                               return;
+                       case '[':
+                               if ( str[pos+1] == '[' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_link ( tree, me, content );
+                                       break;
+                               }
+                               buf.append_unichar ( '[' );                                             
+                               break;
+                       case '{':
+                               if ( str[pos+1] == '{' ) {
+                                       if ( str[pos+2] == '{' ) {
+                                               this.error ( "code blocks are not allowed inside notification areas.", 3 );
+                                               this.run = false;
+                                               return;
+                                       }
+                                       this.error ( "images are not allowed inside notification areas.", 2 );
+                                       this.run = false;
+                                       return;
+                               }
+                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                               this.parse_inline_taglets ( tree, me, content );
+                               break;
+                       case '+':
+                               if ( str[pos+1] == '+' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_bold_content ( tree, me, content );
+                                       break;
+                               }
+                               buf.append_unichar ( '+' );
+                               break;
+                       case '_':
+                               if ( str[pos+1] == '_' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_underlined_content ( tree, me, content );
+                                       break;
+                               }
+                               buf.append_unichar ( '_' );
+                               break;
+                       case '/':
+                               if ( str[pos+1] == '/' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_italic_content ( tree, me, content );
+                                       break;
+                               }
+                               buf.append_unichar ( '/' );
+                               break;
+                       default:
+                               buf.append_unichar ( str[pos] );
+                               break;
+                       }
+               }
+
+               this.error ( "warning-tag is not closed.", 2, starttag_linestartpos, starttag_startpos, starttag_line, starttag_pos );
+               this.run = false;
+       }
+
+       private void parse_content_position ( Tree tree, Basic me, GLib.Type postagtype, Gee.ArrayList<DocElement> content2 ) {
+               Gee.ArrayList<DocElement> content = new Gee.ArrayList<DocElement> ();
+               GLib.StringBuilder buf = new GLib.StringBuilder ( );
+               this.pos = this.pos + 3;
+
+               for ( unichar chr = this.str[this.pos]; chr != '\0' ; chr = this.str[++this.pos] ) {
+                       switch ( chr ) {
+                       case ' ':
+                       case '\t':
+                               if ( buf.str[buf.len-1] != '\n' && buf.str[buf.len-1] != ' ') {
+                                       buf.append_unichar ( ' ' );
+                               }
+                               break;
+                       case '\n':
+                               int newlinepos = this.pos;
+                               this.skip_newline ();
+                               int reallinestartpos = this.pos;
+                               this.next_nonspace_char ();
+
+                               switch (this.str[this.pos+1]) {
+                               case '\n':
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       ContentPositionDocElement postag = (ContentPositionDocElement)GLib.Object.new ( postagtype );
+                                       postag.parse ( this.settings, tree, me, content );
+                                       content2.add ( postag );
+                                       return ;
+                               case '[':
+                                       if ( str[pos+2] == '|' ) {
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_table ( tree, me, content );
+                                               break;
+                                       }
+                                       break;
+                               case '@':
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       ContentPositionDocElement postag = (ContentPositionDocElement)GLib.Object.new ( postagtype );
+                                       postag.parse ( this.settings, tree, me, content );
+                                       content2.add ( postag );
+                                       this.pos = newlinepos;
+                                       return ;
+                               case '#':
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_list ( tree, me, ListType.SORTED, content, new GLib.Queue<int> (), ++this.pos-reallinestartpos, -1 );
+                                       break;
+                               case '*':
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_list ( tree, me, ListType.UNSORTED, content, new GLib.Queue<int> (), ++this.pos-reallinestartpos, -1 );
+                                       break;
+                               }
+                               break;
+                       case '[':
+                               weak string cpos = this.str.offset ( this.pos );
+                               if ( cpos.has_prefix( "[warning:" ) ) {
+                                       this.error ( "notifications have a predefined position.", this.next_line_offset () );
+                                       this.run = false;
+                                       break;
+                               }
+                               if ( str[pos+1] == '[' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_link ( tree, me, content );
+                                       break;
+                               }
+                               buf.append_unichar ( '[' );                                             
+                               break;
+                       case '{':
+                               if ( str[pos+1] == '{' ) {
+                                       if ( str[pos+2] == '{' ) {
+                                               this.error ( "source samples have a predefined position.", this.next_line_offset () );
+                                               this.run = false;
+                                               break;
+                                       }
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_image ( tree, me, content );
+                                       break;
+                               }
+                               // inline taglet:
+                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                               this.parse_inline_taglets ( tree, me, content );
+                               break;
+                       case '+':
+                               if ( str[pos+1] == '+' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_bold_content ( tree, me, content );
+                                       break;
+                               }
+                               buf.append_unichar ( '+' );
+                               break;
+                       case '_':
+                               if ( str[pos+1] == '_' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_underlined_content ( tree, me, content );
+                                       break;
+                               }
+                               buf.append_unichar ( '_' );
+                               break;
+                       case '/':
+                               if ( str[pos+1] == '/' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_italic_content ( tree, me, content );
+                                       break;
+                               }
+                               buf.append_unichar ( '/' );
+                               break;
+                       default:
+                               buf.append_unichar ( str[pos] );
+                               break;
+                       }
+               }
+               ContentPositionDocElement postag = (ContentPositionDocElement)GLib.Object.new ( postagtype );
+               postag.parse ( this.settings, tree, me, content );
+               content2.add ( postag );
+               this.run = false;
+       }
+
+       private void parse_brief_description ( Tree tree, Basic me, DocumentationTree dtree ) {
+               Gee.ArrayList<DocElement> content = new Gee.ArrayList<DocElement> ();
+               GLib.StringBuilder buf = new GLib.StringBuilder ( );
+
+               for ( ; str[pos] != '\0'; this.next_char ( ) ) {
+                       switch ( str[pos] ) {
+                       case '\t':
+                       case ' ':
+                               if ( buf.str[buf.len-1] != '\n' && buf.str[buf.len-1] != ' ') {
+                                       buf.append_unichar ( ' ' );
+                               }
+                               break;
+                       case '\n':
+                               int linepos = this.pos;
+                               this.skip_newline ();
+                               this.next_nonspace_char ();
+
+                               if ( str[pos+1] == '\n' ||  str[pos] == '\0' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       dtree.add_brief ( content );
+                                       this.next_char ( );
+                                       return ;
+                               }
+                               break;
+                       default:
+                               buf.append_unichar ( str[pos] );
+                               break;
+                       }
+               }
+               this.append_and_create_string_taglet ( content, tree, me, buf );
+               dtree.add_brief ( content );
+               this.run = false;
+       }
+
+       public DocumentationTree? parse ( Tree tree, Basic me, string str ) {
+               Gee.ArrayList<DocElement> content = new Gee.ArrayList<DocElement> ();
+               GLib.StringBuilder buf = new GLib.StringBuilder ( );
+               DocumentationTree dtree = new DocumentationTree ();
+               string curtagname = null;
+               MainTaglet curtag = null;
+
+               int starttag_linestartpos = 0;
+               int starttag_startpos = 0;
+               int starttag_line = 0;
+               int starttag_pos = 0;
+               int paragraph = 0;
+
+               this.filename = me.filename;
+
+               this.linestartpos = 0;
+               this.startpos = 0;
+               this.line = 0;
+               this.pos = 0;
+
+               this.run = true;
+               this.str = str;
+               this.line = 0;
+
+
+               bool tmp = this.skip_documentation_header ();
+               if ( tmp == false ) {
+                       this.error ( "invalid documentation header.", 1 );
+                       return null;
+               }
+
+               this.parse_brief_description ( tree, me, dtree );
+               if ( this.run == false ) {
+                       return dtree;
+               }
+
+               for ( ; str[pos] != '\0'; this.next_char ( ) ) {
+                       if ( this.run == false )
+                               break;
+
+                       switch ( str[pos] ) {
+                               case '\0':
+                                       continue ;
+                               case '\t':
+                                       if ( buf.str[buf.len-1] != '\n' && buf.str[buf.len-1] != ' ') {
+                                               buf.append_unichar ( ' ' );
+                                       }
+                                       break;
+                               case '\n':
+                                       this.skip_newline ();
+                                       int reallinestartpos = this.pos;
+                                       this.next_nonspace_char ();
+
+                                       switch ( str[pos+1] ) {
+                                       case '\n':
+                                               buf.append_unichar ( '\n' );
+                                               paragraph++;
+                                               break ;
+                                       case '@':
+                                               pos++;
+
+                                               int f_starttag_linestartpos = this.linestartpos;
+                                               int f_starttag_startpos = this.startpos;
+                                               int f_starttag_line = this.line;
+                                               int f_starttag_pos = this.pos;
+
+                                               string name = this.parse_name ( );
+                                               if ( name == "" ) {
+                                                       buf.append_unichar ( '@' );
+                                                       break;
+                                               }
+
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.append_main_taglet ( tree, dtree, me, curtag, paragraph, curtagname, content, starttag_linestartpos, starttag_startpos, starttag_line, starttag_pos );
+                                               paragraph++;
+
+                                               starttag_linestartpos = f_starttag_linestartpos;
+                                               starttag_startpos = f_starttag_startpos;
+                                               starttag_line = f_starttag_line;
+                                               starttag_pos = f_starttag_pos;
+
+                                               content = new Gee.ArrayList<DocElement> ();
+                                               curtag = create_main_taglet ( name );
+                                               curtagname = #name;
+                                               break;
+                                       case '#':
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_list ( tree, me, ListType.SORTED, content, new GLib.Queue<int> (), ++this.pos-reallinestartpos, -1 );
+                                               break;
+                                       case '*':
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_list ( tree, me, ListType.UNSORTED, content, new GLib.Queue<int> (), ++this.pos-reallinestartpos, -1 );
+                                               break;
+                                       case '[':
+                                               if ( str[pos+2] == '|' ) {
+                                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                                       this.parse_table ( tree, me, content );
+                                                       break;
+                                               }
+                                               break;
+                                       case ')':
+                                               switch ( str[pos+2] ) {
+                                               case ')':
+                                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                                       this.parse_content_position ( tree, me, this.modules.righttag, content );
+                                                       break;
+                                               case '(':
+                                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                                       this.parse_content_position ( tree, me, this.modules.centertag, content );
+                                                       break;
+                                               }
+                                               break;
+                                       default:
+                                               if ( buf.str[buf.len-1] != '\n' && buf.str[buf.len-1] != ' ') {
+                                                       buf.append_unichar ( ' ' );
+                                               }
+                                               break;
+                                       }
+                                       break;
+                               case '{':
+                                       if ( str[pos+1] == '{' ) {
+                                               if ( str[pos+2] == '{' ) {
+                                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                                       this.parse_source_code ( tree, me, content );
+                                                       break;
+                                               }
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_image ( tree, me, content );
+                                               break;
+                                       }
+                                       // inline taglet:
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_inline_taglets ( tree, me, content );
+                                       break;
+                               case '+':
+                                       if ( str[pos+1] == '+' ) {
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_bold_content ( tree, me, content );
+                                               break;
+                                       }
+                                       buf.append_unichar ( '+' );
+                                       break;
+                               case '_':
+                                       if ( str[pos+1] == '_' ) {
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_underlined_content ( tree, me, content );
+                                               break;
+                                       }
+                                       buf.append_unichar ( '_' );
+                                       break;
+                               case '/':
+                                       if ( str[pos+1] == '/' ) {
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_italic_content ( tree, me, content );
+                                               break;
+                                       }
+                                       buf.append_unichar ( '/' );
+                                       break;
+                               case '[':
+                                       weak string cpos = this.str.offset ( this.pos );
+                                       if ( cpos.has_prefix( "[warning:" ) ) {
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_notification ( tree, me, content );
+                                               break;
+                                       }
+                                       if ( str[pos+1] == '[' ) {
+                                               this.append_and_create_string_taglet ( content, tree, me, buf );
+                                               this.parse_link ( tree, me, content );
+                                               break;
+                                       }
+                                       buf.append_unichar ( '[' );                                             
+                                       break;
+                               default:
+                                       buf.append_unichar ( str[pos] );
+                                       break;
+                       }
+               }
+
+               if ( this.errflag == true )
+                       return null;
+
+               this.append_and_create_string_taglet ( content, tree, me, buf );
+               this.append_main_taglet ( tree, dtree, me, curtag, paragraph, curtagname, content, starttag_linestartpos, starttag_startpos, starttag_line, starttag_pos );
+               return dtree;
+       }
+
+       private void parse_source_code ( Tree tree, Basic me, Gee.ArrayList<DocElement> elements ) {
+               GLib.StringBuilder buf = new GLib.StringBuilder ();     
+               Language lang = Language.VALA;
+               int startpos = this.pos;
+               this.pos = this.pos+3;
+
+               if ( this.str[this.pos] == '#' ) {
+                       string line = this.extract_line ( this.pos );
+                       this.pos = this.pos + (int)line.length + 1;
+                       switch ( line.strip () ) {
+                       case "genie":
+                               lang = Language.GENIE;
+                               break;
+                       case "vala":
+                               lang = Language.VALA;
+                               break;
+                       case "C":
+                               lang = Language.C;
+                               break;
+                       default:
+                               this.error ( "unknown language.", startpos-this.pos+3 );
+                               break;
+                       }
+                       this.skip_newline ();
+                       this.pos++;
+               }
+
+               for ( unichar chr = this.str[this.pos]; chr != '\0'; chr = this.str[++this.pos] ) {
+                       switch ( chr ) {
+                       case '}':
+                               if ( this.str[this.pos+1] == '}' && this.str[this.pos+2] == '}' ) {
+                                       SourceCodeDocElement src = (SourceCodeDocElement)GLib.Object.new ( this.modules.srctag );
+                                       src.parse ( this.settings, tree, me, buf.str, lang );
+                                       this.pos = this.pos+2;
+                                       elements.add ( src );
+                                       return;
+                               }
+                               buf.append_unichar ( '}' );
+                               break;
+                       case '\n':
+                               this.skip_newline ();
+                               buf.append_unichar ( '\n' );
+                               break;
+                       default:
+                               buf.append_unichar ( chr );
+                               break;
+                       }
+               }
+       }
+
+       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;
+
+               for ( unichar chr = this.str[this.pos]; chr != '\0' && chr != '\n' ; chr = this.str[++this.pos] ) {
+                       if ( chr == '}' ) {
+                               string postxt = this.str.offset(separatorpos+1).ndup ( pos-separatorpos-1 );
+                               switch ( postxt ) {
+                               case "middle":
+                                       return ImageDocElementPosition.MIDDLE;
+                               case "right":
+                                       return ImageDocElementPosition.RIGHT;
+                               case "left":
+                                       return ImageDocElementPosition.LEFT;
+                               default:
+                                       int len = separatorpos - pos + 1;
+                                       this.error ( "unknown position.", int.min (len, 1) );
+                                       return ImageDocElementPosition.NEUTRAL;
+                               }
+                       }
+               }
+               return ImageDocElementPosition.NEUTRAL;
+       }
+
+       private void parse_image ( Tree tree, Basic me, Gee.ArrayList<DocElement> elements ) {
+               GLib.StringBuilder buf = new GLib.StringBuilder ();
+               ImageDocElementPosition imgpos = ImageDocElementPosition.NEUTRAL;
+               int startpos = this.pos;
+               pos = pos+2;
+
+               for ( unichar chr = this.str[this.pos]; ; chr = this.str[++this.pos] ) {
+                       switch ( chr ) {
+                       case '|':
+                       case '}':
+                               if ( chr == '|' )
+                                       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 );
+                                       }
+                                       pos++;
+                                       return ;
+                               }
+                               continue;
+                       case '\\':
+                               this.parse_escape ( buf );
+                               continue;
+                       case '\0':
+                       case '\n':
+                               this.error ( "brackets are not closed.", startpos-this.pos );
+                               return;
+                       default:
+                               buf.append_unichar ( chr );
+                               continue ;
+                       }
+               }
+               this.error ( "brackets are not closed.", startpos-this.pos );
+               this.run = false;
+       }
+
+       private bool check_link_path ( int startpos, GLib.StringBuilder buf ) {
+               if ( buf.str.has_prefix ( "http://" ) || buf.str.has_prefix ( "/" ))
+                       return true;
+
+               this.error ( "invalid link", startpos-this.pos );
+               return false;
+       }
+
+       private Gee.ArrayList<DocElement>? parse_link_text ( Tree tree, Basic me, int startpos ) {
+               Gee.ArrayList<DocElement> content = new Gee.ArrayList<DocElement> ();
+               GLib.StringBuilder buf = new GLib.StringBuilder ();
+               int separatorpos = ++this.pos;
+
+               for ( unichar chr = this.str[this.pos]; chr != '\0' && chr != '\n' ; chr = this.str[++this.pos] ) {
+                       switch ( chr ) {
+                       case ']':
+                               if ( this.str[pos+1] == ']' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       if ( content.size == 0 ) {
+                                               int pos = separatorpos-this.pos;
+                                               this.error ( "invalid name", (pos == 0)? -1 : pos );
+                                               return null;
+                                       }
+                                       return content;
+                               }
+                               buf.append_unichar ( chr );
+                               break;
+                       case '\0':
+                       case '\n':
+                               this.run = false;
+                               return null;
+                       case '\t':
+                       case ' ':
+                               if ( buf.len > 0 && buf.str[buf.len-1] != ' ') {
+                                       buf.append_unichar ( ' ' );
+                               }
+                               break;
+                       case '+':
+                               if ( str[pos+1] == '+' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_bold_content ( tree, me, content, false );
+                                       break;
+                               }
+                               buf.append_unichar ( '+' );
+                               break;
+                       case '_':
+                               if ( str[pos+1] == '_' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_underlined_content ( tree, me, content, false );
+                                       break;
+                               }
+                               buf.append_unichar ( '_' );
+                               break;
+                       case '/':
+                               if ( str[pos+1] == '/' ) {
+                                       this.append_and_create_string_taglet ( content, tree, me, buf );
+                                       this.parse_italic_content ( tree, me, content, false );
+                                       break;
+                               }
+                               buf.append_unichar ( '/' );
+                               break;
+                       default:
+                               buf.append_unichar ( chr );
+                               break;
+                       }
+               }
+               this.run = false;
+               return null;
+       }
+
+       private void parse_link ( Tree tree, Basic me, Gee.ArrayList<DocElement> elements ) {
+               GLib.StringBuilder buf = new GLib.StringBuilder ();
+               int startpos = this.pos;
+               this.pos = this.pos+2;
+               for ( unichar chr = this.str[this.pos]; ; chr = this.str[++this.pos] ) {
+                       switch ( chr ) {
+                       case '|':
+                       case ']':
+                               bool linkstat = this.check_link_path ( startpos+2, buf );
+                               Gee.ArrayList<DocElement>? txt = null;
+
+                               if ( chr == '|' ) {
+                                       txt = parse_link_text ( tree, me, startpos );
+                               }
+
+                               if ( this.str[this.pos+1] == ']' ) {
+                                       bool tmp = check_image_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 );
+                                               elements.add ( linktag );
+                                       }
+                                       pos++;
+                                       return ;
+                               }
+                               buf.append_unichar ( ']' );
+                               continue;
+                       case '\\':
+                               this.parse_escape ( buf );
+                               continue;
+                       case '\0':
+                       case '\n':
+                               this.error ( "brackets are not closed.", startpos-this.pos );
+                               this.run = false;
+                               return;
+                       default:
+                               buf.append_unichar ( chr );
+                               continue ;
+                       }
+               }
        }
 
        public static bool is_documentation ( string cmnt ) {
index b04feb2490f1f680863dea8b2fa0d9e2e2c3fd77..6b9c94117c9abdc9407a6296481784c1190d2c84 100644 (file)
@@ -1,48 +1,16 @@
-# src/Makefile.am
-
 NULL =
 
+vapidir = $(datadir)/vala/vapi
 
-AM_CFLAGS =                             \
-       -DPACKAGE_DATADIR=\"$(libdir)/valadoc/plugins/\" \
-       -DPACKAGE_VERSION=\"$(VERSION)\"    \
-       -I ../libvaladoc/                   \
-       $(GLIB_CFLAGS)                      \
-       $(LIBVALA_CFLAGS)                   \
-       $(GMODULE_CFLAGS)                   \
-       $(LIBGVC_CFLAGS)                    \
-       $(NULL)
-
-
-
-
-bin_PROGRAMS = valadoc
+valadoc-1.0.vapi: ../libvaladoc/valadoc-1.0.vapi
+       cat ../libvaladoc/valadoc-1.0.vapi > valadoc-1.0.vapi
 
-BUILT_SOURCES = valadoc.vala.stamp
-
-valadoc_VALASOURCES = \
-       valadoc.vala      \
-    $(NULL)
-
-
-valadoc_SOURCES = \
-       $(valadoc_VALASOURCES:.vala=.c) \
-       $(valadoc_VALASOURCES:.vala=.h) \
+dist_vapi_DATA =     \
+       valadoc-1.0.vapi \
+       valadoc-1.0.deps \
        $(NULL)
 
-
-valadoc_LDADD =                 \
-       ../libvaladoc/libvaladoc.la \
-       $(GLIB_LIBS)                \
-       $(LIBVALA_LIBS)             \
-       $(GMODULE_LIBS)             \
-       $(LIBGVC_LIBS)              \
+dist_noinst_DATA = \
        $(NULL)
 
 
-valadoc.vala.stamp: $(libvaladoc_VALASOURCES)
-       $(VALAC) -C --pkg gmodule-2.0 --pkg config --vapidir ../vapi --pkg valadoc-1.0 --basedir $(top_srcdir)/src/valadoc/ valadoc.vala --disable-non-null --save-temps $^
-       touch $@
-
-EXTRA_DIST = $(valadoc_VALASOURCES)  valadoc.vala.stamp 
-
index fce976553fccb2a7dd7ebe74452ddbdca74be587..717d543d78163364cb0654b13258897005c513ce 100755 (executable)
@@ -56,11 +56,6 @@ public class ValaDoc : Object {
        [NoArrayLength ()]
        private static weak string[] tpackages;
 
-
-       private Module docletmodule;
-       private Type doclettype;
-
-
        private Gee.ArrayList<string> packages = new Gee.ArrayList<string>(); // remove
        private Gee.ArrayList<string> sources  = new Gee.ArrayList<string>(); // remove
 
@@ -69,14 +64,10 @@ public class ValaDoc : Object {
                { "vapidir", 0, 0, OptionArg.FILENAME_ARRAY, out vapi_directories,
                        "Look for package bindings in DIRECTORY", "DIRECTORY..." },
                { "pkg", 0, 0, OptionArg.STRING_ARRAY, out tpackages, "Include binding for PACKAGE", "PACKAGE..." },
-               //{ "library", 0, 0, OptionArg.STRING, out library, "Library name", "NAME" },
-               //{ "basedir", 'b', 0, OptionArg.FILENAME, out basedir, "Base source directory", "DIRECTORY" },
                { "directory", 'o', 0, OptionArg.FILENAME, out directory, "Output directory", "DIRECTORY" },
-//             { "package-name", 0, 0, OptionArg.FILENAME, out package_name, "Package name", "DIRECTORY" },
                { "protected", 0, 0, OptionArg.NONE, ref _protected, "Adds protected elements to documentation", null },
                { "private", 0, 0, OptionArg.NONE, ref _private, "Adds private elements to documentation", null },
                { "inherit", 0, 0, OptionArg.NONE, ref add_inherited, "Adds inherited elements to a class", null },
-//             { "extend", 0, 0, OptionArg.NONE, ref add_documentation, "Adds documentation to a given directory", null },
                { "deps", 0, 0, OptionArg.NONE, ref with_deps, "Adds packages to the documentation", null },
                { "disable-non-null", 0, 0, OptionArg.NONE, ref disable_non_null, "Disable non-null types", null },
                { "enable-non-null-experimental", 0, 0, OptionArg.NONE, ref non_null_experimental,
@@ -85,7 +76,6 @@ public class ValaDoc : Object {
                { "doclet", 0, 0, OptionArg.FILENAME, ref pluginpath, "plugin", "DIRECTORY" },
                { "package-name", 0, 0, OptionArg.STRING, ref pkg_name, "package name", "DIRECTORY" },
                { "package-version", 0, 0, OptionArg.STRING, ref pkg_version, "package version", "DIRECTORY" },
-//             { "xml", 0, 0, OptionArg.FILENAME, ref xmlsource, "xml", "DIRECTORY" },
                { "force", 0, 0, OptionArg.NONE, ref force, "force", null },
                { null }
        };
@@ -100,98 +90,7 @@ public class ValaDoc : Object {
                        return 1;
                }
        }
-/*
-       private bool add_package (CodeContext context, string pkg) {
-               if (context.has_package (pkg)) {
-                       // ignore multiple occurences of the same package
-                       return true;
-               }
-       
-               var package_path = context.get_package_path (pkg, vapi_directories);
-               
-               if (package_path == null) {
-                       return false;
-               }
-       
-               context.add_package (pkg);
-               
-               context.add_source_file (new SourceFile (context, package_path, true));
-               
-               var deps_filename = Path.build_filename (Path.get_dirname (package_path), "%s.deps".printf (pkg));
-               if (FileUtils.test (deps_filename, FileTest.EXISTS)) {
-                       try {
-                               string deps_content;
-                               ulong deps_len;
-                               FileUtils.get_contents (deps_filename, out deps_content, out deps_len);
-                               foreach (string dep in deps_content.split ("\n")) {
-                                       if (dep != "") {
-                                               if (!add_package (context, dep)) {
-                                                       Report.error (null, "%s, dependency of %s, not found in specified Vala API directories".printf (dep, pkg));
-                                               }
-                                       }
-                               }
-                       } catch (FileError e) {
-                               Report.error (null, "Unable to read dependency file: %s".printf (e.message));
-                       }
-               }
-               
-               return true;
-       }
-*/
-/*
-       private string? get_package_path (string pkg) {
-               if (FileUtils.test ( pkg, FileTest.EXISTS))
-                       return pkg;
-
-               string basename = "%s.vapi".printf (pkg);
-
-               if ( this.vapi_directories != null ) {
-                       foreach (string vapidir in this.vapi_directories ) {
-                               var filename = Path.build_filename (vapidir, basename);
-                               if (FileUtils.test (filename, FileTest.EXISTS)) {
-                                       return filename;
-                               }
-                       }
-               }
-
-               string filename = Path.build_filename ("/usr/local/share/vala/vapi", basename);
-               if (FileUtils.test (filename, FileTest.EXISTS)) {
-                       return filename;
-               }
-
-               filename = Path.build_filename ("/usr/share/vala/vapi", basename);
-               if (FileUtils.test (filename, FileTest.EXISTS)) {
-                       return filename;
-               }
-               return null;
-       }
 
-
-       private void add_files ( Vala.CodeContext context ) {
-               foreach ( string source in this.sources ) {
-                       if (FileUtils.test (source, FileTest.EXISTS)) {
-                               var rpath = realpath (source);
-                               if (source.has_suffix (".vala") || source.has_suffix (".gs") ) {
-                                       var source_file = new SourceFile (context, rpath, false);
-                                       source_file.add_using_directive (new UsingDirective (new UnresolvedSymbol (null, "GLib", null)));
-                                       context.add_source_file ( source_file );
-                               }
-                               else if (source.has_suffix (".vapi")) {
-                                       context.add_source_file (new SourceFile (context, rpath, true));
-                               }
-                               else if (source.has_suffix (".c")) {
-                                       context.add_c_source_file (rpath);
-                               }
-                               else {
-                                       Report.error (null, "%s is not a supported source file type.".printf (source));
-                               }
-                       }
-                       else {
-                               Report.error (null, "%s not found".printf (source));
-                       }
-               }
-       }
-*/
        // remove
        private Gee.ArrayList<string> sort_sources ( ) {
                var to_doc = new Gee.ArrayList<string>();
@@ -216,64 +115,7 @@ public class ValaDoc : Object {
 
                return to_doc;
        }
-
 /*
-       private static Gee.HashMap<string, Valadoc.TagletCreator> get_taglets ( ) {
-               Gee.HashMap<string, Valadoc.TagletCreator> taglets
-                       = new Gee.HashMap<string, Valadoc.TagletCreator>(GLib.str_hash, GLib.str_equal);
-               /*+
-               void* function;
-               Module module;
-               GLib.Dir dir;
-
-               string docletpath = realpath ( "plugins/html/taglets" );
-
-
-               try {
-                       dir = GLib.Dir.open ( docletpath ); // throws FileError;
-               }
-               finally {
-                       stdout.printf ( "Can't load plugin.\n" );
-               }
-
-               for ( weak string entry = dir.read_name(); entry != null ; entry = dir.read_name() ) {
-                       if ( !( entry.has_suffix(".so") || entry.has_suffix(".dll") ) )
-                               continue ;
-
-                       string tagletpath = docletpath + "/" + entry;
-
-                       module = Module.open ( tagletpath, ModuleFlags.BIND_LAZY);
-                       if (module == null) {
-                               stdout.printf ( "Can't load plugin.\n" );
-                               return taglets;
-                       }
-
-                       module.symbol( "register_plugin", out function );
-                       Valadoc.TagletRegisterFunction tagletregisterfkt = (Valadoc.TagletRegisterFunction) function;
-
-                       
-                       //Valadoc.TagletCreator creator;
-                       //string name;
-
-                       //Type type = tagletregisterfkt ( out name, out creator );
-                       
-
-                       Type type = tagletregisterfkt ( taglets );
-               }
-
-                       +/
-
-               /+
-               entries.set ( "", (Valadoc.TagletCreator)Valadoc.GlobalTaglet.create );
-               entries.set ( "see", (Valadoc.TagletCreator)Valadoc.SeeTaglet.create );
-               entries.set ( "link", (Valadoc.TagletCreator)Valadoc.LinkTaglet.create );
-               entries.set ( "param", (Valadoc.TagletCreator)Valadoc.ParameterTaglet.create );
-               entries.set ( "return", (Valadoc.TagletCreator)Valadoc.ReturnTaglet.create );
-               entries.set ( "throws", (Valadoc.TagletCreator)Valadoc.ExceptionTaglet.create );
-               +/
-               return taglets;
-       }
-*/
        private bool check_doclet_structure ( string realpath ) {
                bool tmp = FileUtils.test ( realpath, FileTest.IS_DIR );
                if ( tmp == false ) {
@@ -293,66 +135,7 @@ public class ValaDoc : Object {
 
                return true;
        }
-
-       private bool load_taglets ( string fulldirpath, out Gee.HashMap<string, Type>? taglets2, out Type strtag ) {
-               try {
-                       taglets2 = new Gee.HashMap<string, Type> ( GLib.str_hash, GLib.str_equal );
-                       Gee.ArrayList<Module*> modules = new Gee.ArrayList<weak Module*> ( );
-                       string pluginpath = fulldirpath + "taglets/";
-                       GLib.Dir dir = GLib.Dir.open ( pluginpath );
-                       void* function;
-
-                       for ( weak string entry = dir.read_name(); entry != null ; entry = dir.read_name() ) {
-                               if ( !( entry.has_suffix(".so") || entry.has_suffix(".dll") ) )
-                                       continue ;
-
-                               string tagletpath = pluginpath + "/" + entry;
-
-                               Module* module = Module.open ( tagletpath, ModuleFlags.BIND_LAZY);
-                               if (module == null) {
-                                       stdout.printf ( "Can't load plugin.\n" );
-                                       taglets2 = null;
-                                       return false;
-                               }
-
-                               module->symbol( "register_plugin", out function );
-                               Valadoc.TagletRegisterFunction tagletregisterfkt = (Valadoc.TagletRegisterFunction) function;
-
-
-                               GLib.Type type = tagletregisterfkt ( taglets2 );
-
-                               if ( entry == "libtagletstring.so" || entry == "libtagletstring.dll" )
-                                       strtag = type;
-
-                               modules.add ( module );
-                       }
-                       return true;
-               }
-               catch ( FileError err ) {
-                       stdout.printf ( "Can't load plugin. %s\n", pluginpath );
-                       taglets2 = null;
-                       return false;
-               }
-       }
-
-       private Doclet? load_doclet ( string path ) {
-               void* function;
-
-               docletmodule = Module.open ( path + "/libdoclet.so", ModuleFlags.BIND_LAZY);
-               if (docletmodule == null) {
-                       return null;
-               }
-
-               docletmodule.symbol( "register_plugin", out function );
-               if ( function == null ) {
-                       return null;
-               }
-
-               Valadoc.DocletRegisterFunction doclet_register_function = (Valadoc.DocletRegisterFunction) function;
-               doclettype = doclet_register_function ( );
-               return (Doclet)GLib.Object.new (doclettype);
-       }
-
+*/
        private static bool check_pkg_name () {
                if ( pkg_name == null )
                        return true;
@@ -385,7 +168,7 @@ public class ValaDoc : Object {
 
                settings.add_inherited = this.add_inherited;
 
-               settings.files = this.sort_sources ( ); /// <--- remove!
+//             settings.files = this.sort_sources ( ); /// <--- remove!
 
                settings._protected = this._protected;
                settings.with_deps = this.with_deps;
@@ -396,30 +179,14 @@ public class ValaDoc : Object {
                ErrorReporter reporter = new ErrorReporter();
 
                string fulldirpath = (pluginpath == null)? Config.plugin_dir : pluginpath;
-               bool tmp = this.check_doclet_structure ( pluginpath );
-
-               if ( tmp == false ) {
-                       Report.error (null, "failed to load plugin" );
-                       return quit ();
-               }
-
-
-               Gee.HashMap<string, Type> taglets;
-               GLib.Type strtag;
-
-               tmp = this.load_taglets ( fulldirpath, out taglets, out strtag );
+               ModuleLoader modules = new ModuleLoader ();
+               bool tmp = modules.load ( fulldirpath );
                if ( tmp == false ) {
                        Report.error (null, "failed to load plugin" );
                        return quit ();
                }
 
-               Valadoc.Doclet doclet = this.load_doclet ( fulldirpath );
-               if ( doclet == null ) {
-                       Report.error (null, "failed to load plugin" );
-                       return quit ();
-               }
-
-               Valadoc.Parser docparser = new Valadoc.Parser ( settings, reporter, strtag, taglets );
+               Valadoc.Parser docparser = new Valadoc.Parser ( settings, reporter, modules );
 
                Valadoc.Tree doctree = new Valadoc.Tree ( settings, non_null_experimental, disable_non_null, disable_checking, basedir, directory );
 
@@ -453,16 +220,6 @@ public class ValaDoc : Object {
                        this.tsources = null;
                }
 
-/*
-               if ( this.sources != null ) {
-                       this.add_files( context );
-                       this.sources = null;
-                       if (Report.get_errors () > 0) {
-                               return quit ();
-                       }
-               }
-*/
-
                if ( !doctree.create_tree( ) )
                        return quit ();
 
@@ -471,13 +228,10 @@ public class ValaDoc : Object {
                        return 1;
 
 
-               doclet.initialisation ( settings );
-
-               doctree.visit ( doclet );
-
-               doclet.cleanups ( );
+               modules.doclet.initialisation ( settings );
+               doctree.visit ( modules.doclet );
+               modules.doclet.cleanups ( );
 
-               doclet = null;
                settings = null;
                doctree = null;
                return quit ();