[valadoc] - true, false, null tags
- From: Florian Brosch <flobrosch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [valadoc] - true, false, null tags
- Date: Wed, 16 Sep 2009 17:49:30 +0000 (UTC)
commit 7cdce6cf33d045e2c465f852c14c75fd8dff0ff1
Author: Florian Brosch <flo brosch gmail com>
Date: Tue Sep 15 02:41:02 2009 +0200
- true, false, null tags
configure.in | 24 ++
src/doclets/htmlhelpers/deps/style.css | 5 +
src/doclets/htmlhelpers/deps/wikistyle.css | 5 +
src/doclets/htmlhelpers/doclet/globals.vala | 1 +
src/doclets/htmlhelpers/taglets/Makefile.am | 27 +-
.../htmlhelpers/taglets/constants/taglet.vala | 45 +++
src/doclets/valadoc.org/Makefile.am | 1 +
src/doclets/valadoc.org/doclet/Makefile.am | 2 +-
src/doclets/valadoc.org/taglets/Makefile.am | 27 ++
src/doclets/valadoc.org/taglets/bold/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/center/Makefile.am | 55 +++
.../valadoc.org/taglets/constants/Makefile.am | 56 +++
.../valadoc.org/taglets/constants/taglet.vala | 45 +++
.../valadoc.org/taglets/headline/Makefile.am | 55 +++
src/doclets/valadoc.org/taglets/image/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/italic/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/link/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/list/Makefile.am | 54 +++
.../valadoc.org/taglets/listelement/Makefile.am | 54 +++
.../valadoc.org/taglets/notification/Makefile.am | 54 +++
.../valadoc.org/taglets/parameter/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/return/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/right/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/see/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/since/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/source/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/string/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/table/Makefile.am | 54 +++
.../valadoc.org/taglets/tablecell/Makefile.am | 54 +++
src/doclets/valadoc.org/taglets/throws/Makefile.am | 54 +++
.../valadoc.org/taglets/typelink/Makefile.am | 54 +++
.../valadoc.org/taglets/underline/Makefile.am | 54 +++
src/libvaladoc/doctree.vala | 4 +
src/libvaladoc/moduleloader.vala | 5 +-
src/libvaladoc/parser.vala | 409 +++++++++++---------
35 files changed, 1598 insertions(+), 194 deletions(-)
---
diff --git a/configure.in b/configure.in
index f76e937..1b98a5c 100644
--- a/configure.in
+++ b/configure.in
@@ -77,6 +77,7 @@ AC_CONFIG_FILES([Makefile
src/doclets/htmlhelpers/taglets/Makefile
src/doclets/htmlhelpers/taglets/see/Makefile
src/doclets/htmlhelpers/taglets/link/Makefile
+ src/doclets/htmlhelpers/taglets/constants/Makefile
src/doclets/htmlhelpers/taglets/list/Makefile
src/doclets/htmlhelpers/taglets/bold/Makefile
src/doclets/htmlhelpers/taglets/since/Makefile
@@ -100,6 +101,29 @@ AC_CONFIG_FILES([Makefile
src/doclets/htm/doclet/Makefile
src/doclets/valadoc.org/Makefile
src/doclets/valadoc.org/doclet/Makefile
+ src/doclets/valadoc.org/taglets/Makefile
+ src/doclets/valadoc.org/taglets/see/Makefile
+ src/doclets/valadoc.org/taglets/link/Makefile
+ src/doclets/valadoc.org/taglets/constants/Makefile
+ src/doclets/valadoc.org/taglets/list/Makefile
+ src/doclets/valadoc.org/taglets/bold/Makefile
+ src/doclets/valadoc.org/taglets/since/Makefile
+ src/doclets/valadoc.org/taglets/table/Makefile
+ src/doclets/valadoc.org/taglets/right/Makefile
+ src/doclets/valadoc.org/taglets/image/Makefile
+ src/doclets/valadoc.org/taglets/throws/Makefile
+ src/doclets/valadoc.org/taglets/string/Makefile
+ src/doclets/valadoc.org/taglets/center/Makefile
+ src/doclets/valadoc.org/taglets/italic/Makefile
+ src/doclets/valadoc.org/taglets/return/Makefile
+ src/doclets/valadoc.org/taglets/source/Makefile
+ src/doclets/valadoc.org/taglets/headline/Makefile
+ src/doclets/valadoc.org/taglets/typelink/Makefile
+ src/doclets/valadoc.org/taglets/underline/Makefile
+ src/doclets/valadoc.org/taglets/parameter/Makefile
+ src/doclets/valadoc.org/taglets/tablecell/Makefile
+ src/doclets/valadoc.org/taglets/listelement/Makefile
+ src/doclets/valadoc.org/taglets/notification/Makefile
src/doclets/devhelp/Makefile
src/doclets/devhelp/doclet/Makefile
src/valadoc/Makefile])
diff --git a/src/doclets/htmlhelpers/deps/style.css b/src/doclets/htmlhelpers/deps/style.css
index 61d0ba8..660fe25 100644
--- a/src/doclets/htmlhelpers/deps/style.css
+++ b/src/doclets/htmlhelpers/deps/style.css
@@ -495,3 +495,8 @@ a.navi_link:hover, a.external_link:hover {
.main_inline_navigation {
}
+.css_content_literal {
+ font: monospace;
+ color: #ff01ff;
+}
+
diff --git a/src/doclets/htmlhelpers/deps/wikistyle.css b/src/doclets/htmlhelpers/deps/wikistyle.css
index 3f8a2c3..fb01851 100644
--- a/src/doclets/htmlhelpers/deps/wikistyle.css
+++ b/src/doclets/htmlhelpers/deps/wikistyle.css
@@ -485,3 +485,8 @@ a.navi_link:hover, a.external_link:hover {
.main_inline_navigation {
}
+.css_content_literal {
+ font: monospace;
+ color: #ff01ff;
+}
+
diff --git a/src/doclets/htmlhelpers/doclet/globals.vala b/src/doclets/htmlhelpers/doclet/globals.vala
index 72ecb30..e930b07 100755
--- a/src/doclets/htmlhelpers/doclet/globals.vala
+++ b/src/doclets/htmlhelpers/doclet/globals.vala
@@ -132,6 +132,7 @@ namespace Valadoc.Html {
public const string css_content_link_virtual_method = "css_content_link_virtual_method";
public const string css_content_link_abstract_method = "css_content_link_abstract_method";
public const string css_content_link_construction_method = "css_content_link_construction_method";
+ public const string css_content_literal = "css_content_literal";
public delegate string? HtmlLink (Settings settings, Documented element, Documented? pos);
diff --git a/src/doclets/htmlhelpers/taglets/Makefile.am b/src/doclets/htmlhelpers/taglets/Makefile.am
index 92d340f..b97a836 100644
--- a/src/doclets/htmlhelpers/taglets/Makefile.am
+++ b/src/doclets/htmlhelpers/taglets/Makefile.am
@@ -2,25 +2,26 @@ NULL =
SUBDIRS = \
- typelink \
- tablecell \
+ bold \
center \
+ constants \
+ headline \
image \
italic \
- bold \
+ link \
+ list \
+ listelement \
+ notification \
+ parameter \
+ return \
right \
see \
+ since \
+ source \
+ string \
table \
+ tablecell \
throws \
- string \
- list \
- return \
- source \
- parameter \
- listelement \
- notification \
+ typelink \
underline \
- since \
- link \
- headline \
$(NULL)
diff --git a/src/doclets/htmlhelpers/taglets/constants/taglet.vala b/src/doclets/htmlhelpers/taglets/constants/taglet.vala
new file mode 100755
index 0000000..df71288
--- /dev/null
+++ b/src/doclets/htmlhelpers/taglets/constants/taglet.vala
@@ -0,0 +1,45 @@
+/*
+ * 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 GLib;
+using Gee;
+
+
+public class Valadoc.Html.CodeConstantDocElement : Valadoc.CodeConstantDocElement {
+ private string constant;
+
+ public override bool parse (string constant) {
+ this.constant = constant;
+ return true;
+ }
+
+ public override bool write (void* res, int max, int index) {
+ weak GLib.FileStream file = (GLib.FileStream)res;
+ file.printf ("<font class=\"%s\">%s</font>", css_content_literal, this.constant);
+ return true;
+ }
+}
+
+
+[ModuleInit]
+public GLib.Type register_plugin (Gee.HashMap<string, Type> taglets) {
+ return typeof (Valadoc.Html.CodeConstantDocElement);
+}
+
diff --git a/src/doclets/valadoc.org/Makefile.am b/src/doclets/valadoc.org/Makefile.am
old mode 100644
new mode 100755
index c835b12..5861f4c
--- a/src/doclets/valadoc.org/Makefile.am
+++ b/src/doclets/valadoc.org/Makefile.am
@@ -11,6 +11,7 @@ NULL =
SUBDIRS = \
doclet \
+ taglets \
$(NULL)
diff --git a/src/doclets/valadoc.org/doclet/Makefile.am b/src/doclets/valadoc.org/doclet/Makefile.am
old mode 100644
new mode 100755
index 0545451..965a704
--- a/src/doclets/valadoc.org/doclet/Makefile.am
+++ b/src/doclets/valadoc.org/doclet/Makefile.am
@@ -12,7 +12,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
libdoclet.vala.stamp: $(libdoclet_VALASOURCES)
- $(VALAC) -C --vapidir ../../htmlhelpers/html/ --pkg htmlwriter-1.0 --vapidir ../../htmlhelpers/languages/ --pkg apiwriter-1.0 --pkg valadoc-1.0 --basedir . --save-temps $^
+ $(VALAC) -C --vapidir ../../htmlhelpers/html/ --pkg htmlwriter-1.0 --vapidir ../../htmlhelpers/languages/ --pkg apiwriter-1.0 --vapidir ../../../vapi/ --pkg valadoc-1.0 --basedir . --save-temps $^
touch $@
diff --git a/src/doclets/valadoc.org/taglets/Makefile.am b/src/doclets/valadoc.org/taglets/Makefile.am
new file mode 100755
index 0000000..743eca2
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/Makefile.am
@@ -0,0 +1,27 @@
+NULL =
+
+
+SUBDIRS = \
+ typelink \
+ tablecell \
+ center \
+ constants \
+ image \
+ italic \
+ bold \
+ right \
+ see \
+ table \
+ throws \
+ string \
+ list \
+ return \
+ source \
+ parameter \
+ listelement \
+ notification \
+ underline \
+ since \
+ link \
+ headline \
+ $(NULL)
diff --git a/src/doclets/valadoc.org/taglets/bold/Makefile.am b/src/doclets/valadoc.org/taglets/bold/Makefile.am
new file mode 100755
index 0000000..294cfd8
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/bold/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletbold.vala.stamp
+
+
+tagletbolddir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletbold_LTLIBRARIES = \
+ libtagletbold.la \
+ $(NULL)
+
+
+libtagletbold_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletbold_la_SOURCES = \
+ libtagletbold.vala.stamp \
+ $(libtagletbold_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletbold.vala.stamp: $(libtagletbold_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletbold_la_LDFLAGS = -module -avoid-version
+
+
+libtagletbold_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletbold_la_VALASOURCES) libtagletbold.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletbold_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/center/Makefile.am b/src/doclets/valadoc.org/taglets/center/Makefile.am
new file mode 100755
index 0000000..3d51f0a
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/center/Makefile.am
@@ -0,0 +1,55 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../doclet/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletcenter.vala.stamp
+
+
+tagletcenterdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletcenter_LTLIBRARIES = \
+ libtagletcenter.la \
+ $(NULL)
+
+
+libtagletcenter_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletcenter_la_SOURCES = \
+ libtagletcenter.vala.stamp \
+ $(libtagletcenter_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletcenter.vala.stamp: $(libtagletcenter_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletcenter_la_LDFLAGS = -module -avoid-version
+
+
+libtagletcenter_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletcenter_la_VALASOURCES) libtagletcenter.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletcenter_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/constants/Makefile.am b/src/doclets/valadoc.org/taglets/constants/Makefile.am
new file mode 100755
index 0000000..10a4ee7
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/constants/Makefile.am
@@ -0,0 +1,56 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../doclet/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletcodeconstant.vala.stamp
+
+
+tagletcodeconstantdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletcodeconstant_LTLIBRARIES = \
+ libtagletcodeconstant.la \
+ $(NULL)
+
+
+libtagletcodeconstant_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletcodeconstant_la_SOURCES = \
+ libtagletcodeconstant.vala.stamp \
+ $(libtagletcodeconstant_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletcodeconstant.vala.stamp: $(libtagletcodeconstant_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --vapidir ../../doclet/ --basedir . $^
+ touch $@
+
+
+libtagletcodeconstant_la_LDFLAGS = -module -avoid-version
+
+
+libtagletcodeconstant_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBGVC_LIBS) \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletcodeconstant_la_VALASOURCES) libtagletcodeconstant.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletcodeconstant_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/constants/taglet.vala b/src/doclets/valadoc.org/taglets/constants/taglet.vala
new file mode 100755
index 0000000..0e2fa62
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/constants/taglet.vala
@@ -0,0 +1,45 @@
+/*
+ * 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 GLib;
+using Gee;
+
+
+public class Valadoc.Html.CodeConstantDocElement : Valadoc.CodeConstantDocElement {
+ private string constant;
+
+ public override bool parse (string constant) {
+ this.constant = constant;
+ return true;
+ }
+
+ public override bool write (void* res, int max, int index) {
+ weak GLib.FileStream file = (GLib.FileStream)res;
+ file.puts (this.constant);
+ return true;
+ }
+}
+
+
+[ModuleInit]
+public GLib.Type register_plugin (Gee.HashMap<string, Type> taglets) {
+ return typeof (Valadoc.Html.CodeConstantDocElement);
+}
+
diff --git a/src/doclets/valadoc.org/taglets/headline/Makefile.am b/src/doclets/valadoc.org/taglets/headline/Makefile.am
new file mode 100755
index 0000000..1b9dfac
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/headline/Makefile.am
@@ -0,0 +1,55 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ -I ../../doclet/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletheadline.vala.stamp
+
+
+tagletheadlinedir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletheadline_LTLIBRARIES = \
+ libtagletheadline.la \
+ $(NULL)
+
+
+libtagletheadline_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletheadline_la_SOURCES = \
+ libtagletheadline.vala.stamp \
+ $(libtagletheadline_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletheadline.vala.stamp: $(libtagletheadline_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletheadline_la_LDFLAGS = -module -avoid-version
+
+
+libtagletheadline_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletheadline_la_VALASOURCES) libtagletheadline.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletheadline_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/image/Makefile.am b/src/doclets/valadoc.org/taglets/image/Makefile.am
new file mode 100755
index 0000000..3f07136
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/image/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletimage.vala.stamp
+
+
+tagletimagedir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletimage_LTLIBRARIES = \
+ libtagletimage.la \
+ $(NULL)
+
+
+libtagletimage_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletimage_la_SOURCES = \
+ libtagletimage.vala.stamp \
+ $(libtagletimage_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletimage.vala.stamp: $(libtagletimage_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --pkg gdk-pixbuf-2.0 --basedir . $^
+ touch $@
+
+
+libtagletimage_la_LDFLAGS = -module -avoid-version
+
+
+libtagletimage_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletimage_la_VALASOURCES) libtagletimage.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletimage_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/italic/Makefile.am b/src/doclets/valadoc.org/taglets/italic/Makefile.am
new file mode 100755
index 0000000..b36caaa
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/italic/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletitalic.vala.stamp
+
+
+tagletitalicdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletitalic_LTLIBRARIES = \
+ libtagletitalic.la \
+ $(NULL)
+
+
+libtagletitalic_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletitalic_la_SOURCES = \
+ libtagletitalic.vala.stamp \
+ $(libtagletitalic_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletitalic.vala.stamp: $(libtagletitalic_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletitalic_la_LDFLAGS = -module -avoid-version
+
+
+libtagletitalic_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletitalic_la_VALASOURCES) libtagletitalic.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletitalic_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/link/Makefile.am b/src/doclets/valadoc.org/taglets/link/Makefile.am
new file mode 100755
index 0000000..80e0aaa
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/link/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletlink.vala.stamp
+
+
+tagletlinkdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletlink_LTLIBRARIES = \
+ libtagletlink.la \
+ $(NULL)
+
+
+libtagletlink_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletlink_la_SOURCES = \
+ libtagletlink.vala.stamp \
+ $(libtagletlink_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletlink.vala.stamp: $(libtagletlink_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletlink_la_LDFLAGS = -module -avoid-version
+
+
+libtagletlink_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletlink_la_VALASOURCES) libtagletlink.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletlink_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/list/Makefile.am b/src/doclets/valadoc.org/taglets/list/Makefile.am
new file mode 100755
index 0000000..efcfa19
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/list/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletlist.vala.stamp
+
+
+tagletlistdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletlist_LTLIBRARIES = \
+ libtagletlist.la \
+ $(NULL)
+
+
+libtagletlist_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletlist_la_SOURCES = \
+ libtagletlist.vala.stamp \
+ $(libtagletlist_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletlist.vala.stamp: $(libtagletlist_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletlist_la_LDFLAGS = -module -avoid-version
+
+
+libtagletlist_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletlist_la_VALASOURCES) libtagletlist.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletlist_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/listelement/Makefile.am b/src/doclets/valadoc.org/taglets/listelement/Makefile.am
new file mode 100755
index 0000000..ae3aa7a
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/listelement/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletlistelement.vala.stamp
+
+
+tagletlistelementdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletlistelement_LTLIBRARIES = \
+ libtagletlistelement.la \
+ $(NULL)
+
+
+libtagletlistelement_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletlistelement_la_SOURCES = \
+ libtagletlistelement.vala.stamp \
+ $(libtagletlistelement_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletlistelement.vala.stamp: $(libtagletlistelement_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletlistelement_la_LDFLAGS = -module -avoid-version
+
+
+libtagletlistelement_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletlistelement_la_VALASOURCES) libtagletlistelement.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletlistelement_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/notification/Makefile.am b/src/doclets/valadoc.org/taglets/notification/Makefile.am
new file mode 100755
index 0000000..4e0b572
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/notification/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletnotification.vala.stamp
+
+
+tagletnotificationdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletnotification_LTLIBRARIES = \
+ libtagletnotification.la \
+ $(NULL)
+
+
+libtagletnotification_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletnotification_la_SOURCES = \
+ libtagletnotification.vala.stamp \
+ $(libtagletnotification_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletnotification.vala.stamp: $(libtagletnotification_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletnotification_la_LDFLAGS = -module -avoid-version
+
+
+libtagletnotification_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletnotification_la_VALASOURCES) libtagletnotification.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletnotification_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/parameter/Makefile.am b/src/doclets/valadoc.org/taglets/parameter/Makefile.am
new file mode 100755
index 0000000..f8b8445
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/parameter/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletparameter.vala.stamp
+
+
+tagletparameterdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletparameter_LTLIBRARIES = \
+ libtagletparameter.la \
+ $(NULL)
+
+
+libtagletparameter_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletparameter_la_SOURCES = \
+ libtagletparameter.vala.stamp \
+ $(libtagletparameter_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletparameter.vala.stamp: $(libtagletparameter_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletparameter_la_LDFLAGS = -module -avoid-version
+
+
+libtagletparameter_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletparameter_la_VALASOURCES) libtagletparameter.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletparameter_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/return/Makefile.am b/src/doclets/valadoc.org/taglets/return/Makefile.am
new file mode 100755
index 0000000..082d197
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/return/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletreturn.vala.stamp
+
+
+tagletreturndir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletreturn_LTLIBRARIES = \
+ libtagletreturn.la \
+ $(NULL)
+
+
+libtagletreturn_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletreturn_la_SOURCES = \
+ libtagletreturn.vala.stamp \
+ $(libtagletreturn_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletreturn.vala.stamp: $(libtagletreturn_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletreturn_la_LDFLAGS = -module -avoid-version
+
+
+libtagletreturn_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletreturn_la_VALASOURCES) libtagletreturn.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletreturn_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/right/Makefile.am b/src/doclets/valadoc.org/taglets/right/Makefile.am
new file mode 100755
index 0000000..b5e9bb3
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/right/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletright.vala.stamp
+
+
+tagletrightdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletright_LTLIBRARIES = \
+ libtagletright.la \
+ $(NULL)
+
+
+libtagletright_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletright_la_SOURCES = \
+ libtagletright.vala.stamp \
+ $(libtagletright_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletright.vala.stamp: $(libtagletright_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletright_la_LDFLAGS = -module -avoid-version
+
+
+libtagletright_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletright_la_VALASOURCES) libtagletright.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletright_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/see/Makefile.am b/src/doclets/valadoc.org/taglets/see/Makefile.am
new file mode 100755
index 0000000..8f02cf5
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/see/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletsee.vala.stamp
+
+
+tagletseedir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletsee_LTLIBRARIES = \
+ libtagletsee.la \
+ $(NULL)
+
+
+libtagletsee_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletsee_la_SOURCES = \
+ libtagletsee.vala.stamp \
+ $(libtagletsee_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletsee.vala.stamp: $(libtagletsee_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletsee_la_LDFLAGS = -module -avoid-version
+
+
+libtagletsee_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletsee_la_VALASOURCES) libtagletsee.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletsee_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/since/Makefile.am b/src/doclets/valadoc.org/taglets/since/Makefile.am
new file mode 100755
index 0000000..27fda4e
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/since/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletsince.vala.stamp
+
+
+tagletsincedir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletsince_LTLIBRARIES = \
+ libtagletsince.la \
+ $(NULL)
+
+
+libtagletsince_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletsince_la_SOURCES = \
+ libtagletsince.vala.stamp \
+ $(libtagletsince_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletsince.vala.stamp: $(libtagletsince_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletsince_la_LDFLAGS = -module -avoid-version
+
+
+libtagletsince_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletsince_la_VALASOURCES) libtagletsince.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletsince_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/source/Makefile.am b/src/doclets/valadoc.org/taglets/source/Makefile.am
new file mode 100755
index 0000000..22cc7a0
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/source/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletsource.vala.stamp
+
+
+tagletsourcedir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletsource_LTLIBRARIES = \
+ libtagletsource.la \
+ $(NULL)
+
+
+libtagletsource_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletsource_la_SOURCES = \
+ libtagletsource.vala.stamp \
+ $(libtagletsource_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletsource.vala.stamp: $(libtagletsource_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletsource_la_LDFLAGS = -module -avoid-version
+
+
+libtagletsource_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletsource_la_VALASOURCES) libtagletsource.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletsource_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/string/Makefile.am b/src/doclets/valadoc.org/taglets/string/Makefile.am
new file mode 100755
index 0000000..72669fc
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/string/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletstring.vala.stamp
+
+
+tagletstringdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletstring_LTLIBRARIES = \
+ libtagletstring.la \
+ $(NULL)
+
+
+libtagletstring_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletstring_la_SOURCES = \
+ libtagletstring.vala.stamp \
+ $(libtagletstring_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletstring.vala.stamp: $(libtagletstring_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletstring_la_LDFLAGS = -module -avoid-version
+
+
+libtagletstring_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletstring_la_VALASOURCES) libtagletstring.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletstring_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/table/Makefile.am b/src/doclets/valadoc.org/taglets/table/Makefile.am
new file mode 100755
index 0000000..4b6e967
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/table/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtaglettable.vala.stamp
+
+
+taglettabledir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+taglettable_LTLIBRARIES = \
+ libtaglettable.la \
+ $(NULL)
+
+
+libtaglettable_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtaglettable_la_SOURCES = \
+ libtaglettable.vala.stamp \
+ $(libtaglettable_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtaglettable.vala.stamp: $(libtaglettable_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtaglettable_la_LDFLAGS = -module -avoid-version
+
+
+libtaglettable_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtaglettable_la_VALASOURCES) libtaglettable.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtaglettable_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/tablecell/Makefile.am b/src/doclets/valadoc.org/taglets/tablecell/Makefile.am
new file mode 100755
index 0000000..fce51c0
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/tablecell/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtaglettablecell.vala.stamp
+
+
+taglettablecelldir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+taglettablecell_LTLIBRARIES = \
+ libtaglettablecell.la \
+ $(NULL)
+
+
+libtaglettablecell_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtaglettablecell_la_SOURCES = \
+ libtaglettablecell.vala.stamp \
+ $(libtaglettablecell_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtaglettablecell.vala.stamp: $(libtaglettablecell_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtaglettablecell_la_LDFLAGS = -module -avoid-version
+
+
+libtaglettablecell_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtaglettablecell_la_VALASOURCES) libtaglettablecell.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtaglettablecell_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/throws/Makefile.am b/src/doclets/valadoc.org/taglets/throws/Makefile.am
new file mode 100755
index 0000000..a0c2e19
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/throws/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletthrows.vala.stamp
+
+
+tagletthrowsdir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletthrows_LTLIBRARIES = \
+ libtagletthrows.la \
+ $(NULL)
+
+
+libtagletthrows_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletthrows_la_SOURCES = \
+ libtagletthrows.vala.stamp \
+ $(libtagletthrows_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletthrows.vala.stamp: $(libtagletthrows_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletthrows_la_LDFLAGS = -module -avoid-version
+
+
+libtagletthrows_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletthrows_la_VALASOURCES) libtagletthrows.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletthrows_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/typelink/Makefile.am b/src/doclets/valadoc.org/taglets/typelink/Makefile.am
new file mode 100755
index 0000000..d59ba13
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/typelink/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtaglettypelink.vala.stamp
+
+
+taglettypelinkdir = $(libdir)/valadoc/plugins/valadoc.org/taglets
+
+
+taglettypelink_LTLIBRARIES = \
+ libtaglettypelink.la \
+ $(NULL)
+
+
+libtaglettypelink_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtaglettypelink_la_SOURCES = \
+ libtaglettypelink.vala.stamp \
+ $(libtaglettypelink_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtaglettypelink.vala.stamp: $(libtaglettypelink_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtaglettypelink_la_LDFLAGS = -module -avoid-version
+
+
+libtaglettypelink_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtaglettypelink_la_VALASOURCES) libtaglettypelink.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtaglettypelink_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/doclets/valadoc.org/taglets/underline/Makefile.am b/src/doclets/valadoc.org/taglets/underline/Makefile.am
new file mode 100755
index 0000000..47ebee5
--- /dev/null
+++ b/src/doclets/valadoc.org/taglets/underline/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+
+AM_CFLAGS = -g \
+ -I ../../../../libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBVALA_CFLAGS) \
+ $(NULL)
+
+
+BUILT_SOURCES = libtagletunderline.vala.stamp
+
+
+tagletunderlinedir = $(libdir)/valadoc/plugins/valadoc.org/taglets/
+
+
+tagletunderline_LTLIBRARIES = \
+ libtagletunderline.la \
+ $(NULL)
+
+
+libtagletunderline_la_VALASOURCES = \
+ taglet.vala \
+ $(NULL)
+
+
+libtagletunderline_la_SOURCES = \
+ libtagletunderline.vala.stamp \
+ $(libtagletunderline_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
+
+libtagletunderline.vala.stamp: $(libtagletunderline_la_VALASOURCES)
+ $(VALAC) -C --vapidir ../../../../vapi --pkg valadoc-1.0 --basedir . $^
+ touch $@
+
+
+libtagletunderline_la_LDFLAGS = -module -avoid-version
+
+
+libtagletunderline_la_LIBADD = \
+ ../../../../libvaladoc/libvaladoc.la \
+ $(LIBVALA_LIBS) \
+ $(GLIB_LIBS) \
+ $(NULL)
+
+
+EXTRA_DIST = $(libtagletunderline_la_VALASOURCES) libtagletunderline.vala.stamp
+
+
+MAINTAINERCLEANFILES = \
+ $(libtagletunderline_la_VALASOURCES:.vala=.c) \
+ $(NULL)
+
diff --git a/src/libvaladoc/doctree.vala b/src/libvaladoc/doctree.vala
index d60bdcc..6648711 100755
--- a/src/libvaladoc/doctree.vala
+++ b/src/libvaladoc/doctree.vala
@@ -71,6 +71,10 @@ public abstract class Valadoc.InlineTaglet : Taglet {
public abstract string to_string ();
}
+public abstract class Valadoc.CodeConstantDocElement : Valadoc.DocElement {
+ public abstract bool parse (string constant);
+}
+
public abstract class Valadoc.MainTaglet : Taglet {
// remove
protected string? get_data_type (DocumentedElement me) {
diff --git a/src/libvaladoc/moduleloader.vala b/src/libvaladoc/moduleloader.vala
index bba118f..98f2c06 100755
--- a/src/libvaladoc/moduleloader.vala
+++ b/src/libvaladoc/moduleloader.vala
@@ -28,6 +28,7 @@ public static delegate GLib.Type Valadoc.TagletRegisterFunction ( Gee.HashMap<st
public class Valadoc.ModuleLoader : Object {
public Gee.HashMap< string, GLib.Type > taglets;
+ public GLib.Type codeconstanttag;
public GLib.Type underlinedtag;
public GLib.Type headlinetag;
public GLib.Type notifictag;
@@ -41,7 +42,6 @@ public class Valadoc.ModuleLoader : Object {
public GLib.Type srctag;
public GLib.Type imgtag;
public GLib.Type boldtag;
-
public GLib.Type tabletag;
public GLib.Type celltag;
@@ -155,6 +155,9 @@ public class Valadoc.ModuleLoader : Object {
case "libtagletheadline":
this.headlinetag = type;
break;
+ case "libtagletcodeconstant":
+ this.codeconstanttag = type;
+ break;
}
modules.add ( module );
}
diff --git a/src/libvaladoc/parser.vala b/src/libvaladoc/parser.vala
index d073f8e..4c3c9ef 100755
--- a/src/libvaladoc/parser.vala
+++ b/src/libvaladoc/parser.vala
@@ -43,72 +43,72 @@ public class Valadoc.Parser : Object {
{ ErrorLevel.ERROR, "Taglet is not allowed in this context" }
};
- private void printr ( ErrorNumber errno, string filename, string str, long strlen, long line, long linestartpos, long pos, long len ) {
- this.printr_custom ( errmsg[(int)errno].lvl, filename, str, strlen, line, linestartpos, pos, len, errmsg[(int)errno].msg );
+ private void printr (ErrorNumber errno, string filename, string str, long strlen, long line, long linestartpos, long pos, long len) {
+ this.printr_custom (errmsg[(int)errno].lvl, filename, str, strlen, line, linestartpos, pos, len, errmsg[(int)errno].msg);
}
- private void printr_custom ( ErrorLevel errlvl, string filename, string str, long strlen, long line, long linestartpos, long pos, long len, string errmsg ) {
- if ( this.settings.verbose == false && errlvl == ErrorLevel.ASSUMPTION ) {
- return ;
+ private void printr_custom (ErrorLevel errlvl, string filename, string str, long strlen, long line, long linestartpos, long pos, long len, string errmsg) {
+ if (this.settings.verbose == false && errlvl == ErrorLevel.ASSUMPTION) {
+ return;
}
- weak string linestr = str.offset( linestartpos );
+ weak string linestr = str.offset(linestartpos);
if (linestr[0] == '\r') {
linestr = linestr.offset(1);
// linestartpos++;
len--;
}
- if ( linestr[0] == '\n' ) {
+ if (linestr[0] == '\n') {
linestr = linestr.offset(1);
// linestartpos++;
len--;
}
- weak string end = linestr.chr( -1, '\n' );
+ weak string end = linestr.chr(-1, '\n');
long linelen = (end == null)? (long)linestr.len() : linestr.pointer_to_offset(end);
long underlinestartpos = pos-linestartpos;
long underlineendpos = underlinestartpos+((len == -1)?(linelen-(pos-linestartpos)):len);
- if ( errlvl == ErrorLevel.ERROR ) {
- this.err.error ( filename, line, underlinestartpos, /*pos-linestartpos*/ underlineendpos, linestr.ndup(linelen), errmsg );
+ if (errlvl == ErrorLevel.ERROR) {
+ this.err.error (filename, line, underlinestartpos, /*pos-linestartpos*/ underlineendpos, linestr.ndup(linelen), errmsg);
}
else {
- this.err.warning ( filename, line, underlinestartpos, /*pos-linestartpos*/ underlineendpos, linestr.ndup(linelen), errmsg );
+ this.err.warning (filename, line, underlinestartpos, /*pos-linestartpos*/ underlineendpos, linestr.ndup(linelen), errmsg);
}
}
/* == helpers == */
- private StringTaglet create_string_taglet (string str, long strlen, ref long startpos, long pos, long lpos, StringBuilder buf ) {
+ private StringTaglet create_string_taglet (string str, long strlen, ref long startpos, long pos, long lpos, StringBuilder buf) {
buf.append_len (str.offset(startpos), lpos-startpos);
- StringTaglet strtag = (StringTaglet)GLib.Object.new ( this.modules.strtag );
- strtag.parse ( buf.str );
- buf.erase ( 0, -1 );
+ StringTaglet strtag = (StringTaglet)GLib.Object.new (this.modules.strtag);
+ strtag.parse (buf.str);
+ buf.erase (0, -1);
startpos = pos+1;
return strtag;
}
- private void prepend_string_taglet (string str, long strlen, Gee.ArrayList<DocElement> content, ref long startpos, long pos, long lpos, StringBuilder buf ) {
- StringTaglet strtag = this.create_string_taglet (str, strlen, ref startpos, pos, lpos, buf );
+ private void prepend_string_taglet (string str, long strlen, Gee.ArrayList<DocElement> content, ref long startpos, long pos, long lpos, StringBuilder buf) {
+ StringTaglet strtag = this.create_string_taglet (str, strlen, ref startpos, pos, lpos, buf);
content.insert (content.size-1, strtag);
}
private void append_string_taglet (string str, long strlen, Gee.ArrayList<DocElement> content, ref long startpos, long pos, long lpos, StringBuilder buf ) {
- StringTaglet strtag = this.create_string_taglet ( str, strlen, ref startpos, pos, lpos, buf );
- content.add ( strtag );
+ StringTaglet strtag = this.create_string_taglet (str, strlen, ref startpos, pos, lpos, buf);
+ content.add (strtag);
}
/* == rules: == */
- private bool skip_deadzone_pos ( string str, long strlen, ref long pos, ref long line, ref long linestartpos, bool wikimode ) {
+ private bool skip_deadzone_pos (string str, long strlen, ref long pos, ref long line, ref long linestartpos, bool wikimode) {
linestartpos=pos;
- for ( pos++; str[pos]==' '||str[pos]=='\t' ; pos++ );
+ for (pos++; str[pos]==' '||str[pos]=='\t' ; pos++);
line++;
- if ( wikimode == false ) {
- if ( str[pos]=='*' ) {
+ if (wikimode == false) {
+ if (str[pos]=='*') {
linestartpos = pos;
return true;
}
@@ -118,25 +118,25 @@ public class Valadoc.Parser : Object {
return true;
}
- private bool parse_newline_pos ( string str, long strlen, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode ) {
- if ( str[npos] == '\n' ) {
+ private bool parse_newline_pos (string str, long strlen, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode) {
+ if (str[npos] == '\n') {
return this.skip_deadzone_pos (str, strlen, ref npos, ref nline, ref nnewlinepos, wikimode);
}
return false;
}
- private bool parse_linebreak_pos ( string str, long strlen, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode) {
- if ( str[npos] == '\\' ) {
+ private bool parse_linebreak_pos (string str, long strlen, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode) {
+ if (str[npos] == '\\') {
long newlinepos = nnewlinepos;
long line = nline;
long pos = npos;
long mpos = pos+1;
- for ( ; str[mpos]==' '||str[mpos]=='\t' ; mpos++ );
- if ( str[mpos]=='\r' )
+ for (; str[mpos]==' '||str[mpos]=='\t' ; mpos++);
+ if (str[mpos]=='\r')
mpos++;
- if ( str[mpos]=='\n' ) {
+ if (str[mpos]=='\n') {
pos = mpos;
if (this.skip_deadzone_pos (str, strlen, ref pos, ref line, ref newlinepos, wikimode)) {
nnewlinepos = newlinepos;
@@ -162,8 +162,8 @@ public class Valadoc.Parser : Object {
return str.substring (startpos, pos-startpos);
}
- private bool parse_inline_taglet_pos ( Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode ) {
- if ( str[npos] != '{' ) {
+ private bool parse_inline_taglet_pos (Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode) {
+ if (str[npos] != '{') {
return false;
}
@@ -178,13 +178,13 @@ public class Valadoc.Parser : Object {
}
if(this.parse_linebreak_pos(str, strlen, ref pos, ref line, ref newlinepos, wikimode)) {
- continue ;
+ continue;
}
return false;
}
- if ( str[pos]!='@' ) {
+ if (str[pos]!='@') {
return false;
}
@@ -194,25 +194,25 @@ public class Valadoc.Parser : Object {
pos++;
string keyword = this.parse_taglet_name (curelement, str, strlen, ref pos, line, newlinepos, npos, true);
- if ( keyword == null ) {
+ if (keyword == null) {
return false;
}
- if ( !this.modules.taglets.contains(keyword) ) {
- this.printr ( ErrorNumber.UNKNOWN_TAGLET, curelement.get_filename (), str, strlen, line, newlinepos, keywordstartpos, keyword.len()+1 );
+ if ( !this.modules.taglets.contains(keyword)) {
+ this.printr (ErrorNumber.UNKNOWN_TAGLET, curelement.get_filename (), str, strlen, line, newlinepos, keywordstartpos, keyword.len()+1);
return false;
}
- Taglet taglet = (Taglet)GLib.Object.new ( this.modules.taglets.get (keyword) );
- if ( taglet is InlineTaglet == false) {
- this.printr ( ErrorNumber.CONTEXT, curelement.get_filename (), str, strlen, line, newlinepos, keywordstartpos, keyword.len()+1 );
+ Taglet taglet = (Taglet)GLib.Object.new (this.modules.taglets.get (keyword));
+ if (taglet is InlineTaglet == false) {
+ this.printr (ErrorNumber.CONTEXT, curelement.get_filename (), str, strlen, line, newlinepos, keywordstartpos, keyword.len()+1);
return false;
}
- for ( ; str[pos]==' '||str[pos]=='\t'; pos++ );
- if ( str[pos]=='\0' ) {
- this.printr ( ErrorNumber.OPEN_TAG, curelement.get_filename (), str, strlen, line, newlinepos, npos, -1 );
+ for (; str[pos]==' '||str[pos]=='\t'; pos++);
+ if (str[pos]=='\0' ) {
+ this.printr (ErrorNumber.OPEN_TAG, curelement.get_filename (), str, strlen, line, newlinepos, npos, -1);
return false;
}
@@ -222,25 +222,25 @@ public class Valadoc.Parser : Object {
for ( ;str[pos]!='}'; pos++ ) {
long looppos = pos;
if(this.parse_linebreak_pos(str, strlen, ref pos, ref line, ref newlinepos, wikimode)) {
- strcontent.append ( str.substring ( contentstartpos, looppos-contentstartpos) );
+ strcontent.append (str.substring ( contentstartpos, looppos-contentstartpos));
contentstartpos = pos+1;
}
- else if ( str[pos]=='\0'||str[pos]=='\n' ) {
- this.printr ( ErrorNumber.OPEN_TAG, curelement.get_filename (), str, strlen, line, newlinepos, npos, -1 );
+ else if (str[pos]=='\0'||str[pos]=='\n') {
+ this.printr (ErrorNumber.OPEN_TAG, curelement.get_filename (), str, strlen, line, newlinepos, npos, -1);
return false;
}
}
- strcontent.append ( str.substring ( contentstartpos, pos-contentstartpos ) );
+ strcontent.append (str.substring (contentstartpos, pos-contentstartpos));
ErrorLevel errlvl = ErrorLevel.ASSUMPTION;
string? errmsg;
- if( !((InlineTaglet)taglet).parse ( this.settings, this.tree, curelement, strcontent.str, ref errlvl, out errmsg ) ) {
- this.printr_custom ( errlvl, curelement.get_filename (), str, strlen, keywordline, keywordnewlinepos, keywordstartpos, keyword.len()+1, errmsg );
+ if( !((InlineTaglet)taglet).parse (this.settings, this.tree, curelement, strcontent.str, ref errlvl, out errmsg)) {
+ this.printr_custom (errlvl, curelement.get_filename (), str, strlen, keywordline, keywordnewlinepos, keywordstartpos, keyword.len()+1, errmsg);
}
- content.add ( taglet );
+ content.add (taglet);
nnewlinepos = newlinepos;
nline = line;
@@ -248,39 +248,39 @@ public class Valadoc.Parser : Object {
return true;
}
- private bool parse_align_pos (Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long pos, ref long line, ref long newlinepos, ref long space, bool wikimode ) {
- if ( this.parse_align_helper (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, wikimode, this.modules.righttag, "))" ) ) {
+ private bool parse_align_pos (Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long pos, ref long line, ref long newlinepos, ref long space, bool wikimode) {
+ if ( this.parse_align_helper (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, wikimode, this.modules.righttag, "))")) {
return true;
}
- if ( this.parse_align_helper (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, wikimode, this.modules.centertag, ")(" ) ) {
+ if ( this.parse_align_helper (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, wikimode, this.modules.centertag, ")(" )) {
return true;
}
return false;
}
- private bool parse_highlighting_pos (Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long pos, ref long line, ref long newlinepos, bool wikimode ) {
- if ( this.parse_bold_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode) ) {
+ private bool parse_highlighting_pos (Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long pos, ref long line, ref long newlinepos, bool wikimode) {
+ if (this.parse_bold_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode)) {
return true;
}
- else if ( this.parse_italic_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode) ) {
+ else if (this.parse_italic_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode)) {
return true;
}
- else if ( this.parse_underline_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode) ) {
+ else if (this.parse_underline_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode)) {
return true;
}
return false;
}
- private bool parse_align_helper ( Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long nline, ref long nnewlinepos, ref long space, bool wikimode, GLib.Type tagtype, string tag ) {
+ private bool parse_align_helper (Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long nline, ref long nnewlinepos, ref long space, bool wikimode, GLib.Type tagtype, string tag) {
long newlinepos = nnewlinepos;
long line = nline;
long pos = npos;
- if ( !str.offset(pos).has_prefix(tag) )
+ if (!str.offset(pos).has_prefix(tag))
return false;
- for ( ; str[pos]==' '||str[pos]=='\t'; pos++ );
+ for (; str[pos]==' '||str[pos]=='\t'; pos++);
Gee.ArrayList<DocElement> subcontent = new Gee.ArrayList<DocElement> ();
StringBuilder buf = new StringBuilder ();
@@ -288,7 +288,7 @@ public class Valadoc.Parser : Object {
long lpos = startpos;
- for (; pos<strlen; pos++ ) {
+ for (; pos<strlen; pos++) {
lpos = pos;
if (this.parse_linebreak_pos(str, strlen, ref pos, ref line, ref newlinepos, wikimode)) {
buf.append_len (str.offset(startpos), lpos-startpos);
@@ -307,18 +307,21 @@ public class Valadoc.Parser : Object {
else if (this.parse_inline_taglet_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos, wikimode)) {
this.prepend_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf );
}
- else if ( this.parse_url_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos) ) {
+ else if (this.parse_url_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos)) {
this.prepend_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf );
}
- else if ( this.parse_img_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos) ) {
+ else if (this.parse_img_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos)) {
this.prepend_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf );
}
- else if ( this.parse_highlighting_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos, wikimode) ) {
- this.prepend_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf );
+ else if (this.parse_code_constant_pos (str, strlen, subcontent, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
+ }
+ else if (this.parse_highlighting_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos, wikimode)) {
+ this.prepend_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf);
}
}
- this.append_string_taglet ( str, strlen, subcontent, ref startpos, pos, lpos, buf );
+ this.append_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf);
for (space=++pos;str[pos]==' '||str[pos]=='\t';pos++);
space = pos-space;
@@ -327,9 +330,9 @@ public class Valadoc.Parser : Object {
nline = nline;
npos = pos-1;
- ContentPositionDocElement aligntag = (ContentPositionDocElement)GLib.Object.new ( tagtype );
- aligntag.parse ( subcontent );
- content.add ( aligntag );
+ ContentPositionDocElement aligntag = (ContentPositionDocElement)GLib.Object.new (tagtype);
+ aligntag.parse (subcontent);
+ content.add (aligntag);
return true;
}
@@ -400,9 +403,9 @@ public class Valadoc.Parser : Object {
else if ( this.parse_url_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos) ) {
this.prepend_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf );
}
- //else if ( this.parse_img_pos (subcontent, ref pos, ref line, ref newlinepos) ) {
- // this.prepend_string_taglet ( subcontent, ref startpos, pos, lpos, buf );
- //}
+ else if (this.parse_code_constant_pos (str, strlen, subcontent, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
+ }
else if ( this.parse_highlighting_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos, wikimode) ) {
this.prepend_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf );
}
@@ -471,9 +474,9 @@ public class Valadoc.Parser : Object {
return this.parse_highlighting_helper_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos, wikimode, this.modules.underlinedtag, "__" );
}
- private bool parse_highlighting_helper_pos (Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode, GLib.Type tagtype, string markup ) {
- weak string strpos = str.offset( npos );
- if ( !strpos.has_prefix( markup ) ) {
+ private bool parse_highlighting_helper_pos (Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode, GLib.Type tagtype, string markup) {
+ weak string strpos = str.offset(npos);
+ if (!strpos.has_prefix(markup)) {
return false;
}
@@ -485,14 +488,13 @@ public class Valadoc.Parser : Object {
long newlinepos = nnewlinepos;
long line = nline;
-
- for ( ; pos<strlen ; pos++ ) {
+ for (; pos<strlen ; pos++) {
long lpos = pos;
- if ( str.offset(pos).has_prefix(markup) ) {
- this.append_string_taglet ( str, strlen, subcontent, ref startpos, pos, lpos, buf );
- HighlightedDocElement htag = (HighlightedDocElement)GLib.Object.new ( tagtype );
- htag.parse ( subcontent );
- content.add ( htag );
+ if (str.offset(pos).has_prefix(markup)) {
+ this.append_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf);
+ HighlightedDocElement htag = (HighlightedDocElement)GLib.Object.new (tagtype);
+ htag.parse (subcontent);
+ content.add (htag);
nnewlinepos = newlinepos;
npos = startpos;
@@ -500,21 +502,24 @@ public class Valadoc.Parser : Object {
return true;
}
- if ( this.parse_highlighting_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos, wikimode) ) {
- this.prepend_string_taglet ( str, strlen, subcontent, ref startpos, pos, lpos, buf );
+ if (this.parse_highlighting_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos, wikimode)) {
+ this.prepend_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf);
}
else if (this.parse_linebreak_pos(str, strlen, ref pos, ref line, ref newlinepos, wikimode)) {
buf.append_len (str.offset(startpos), lpos-startpos);
startpos=pos+1;
continue;
}
- else if ( this.parse_url_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos) ) {
- this.prepend_string_taglet ( str, strlen, subcontent, ref startpos, pos, lpos, buf );
+ else if (this.parse_code_constant_pos (str, strlen, subcontent, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
+ }
+ else if ( this.parse_url_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf);
}
else if (this.parse_inline_taglet_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos, wikimode)) {
- this.prepend_string_taglet ( str, strlen, subcontent, ref startpos, pos, lpos, buf );
+ this.prepend_string_taglet (str, strlen, subcontent, ref startpos, pos, lpos, buf);
}
- else if ( str[pos]=='\n' ) {
+ else if (str[pos]=='\n') {
break;
}
}
@@ -522,37 +527,40 @@ public class Valadoc.Parser : Object {
return false;
}
- private bool parse_short_desc_pos (DocumentedElement curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long line, ref long newlinepos, ref long space, bool wikimode ) {
+ private bool parse_short_desc_pos (DocumentedElement curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long line, ref long newlinepos, ref long space, bool wikimode) {
StringBuilder buf = new StringBuilder ();
long startpos = npos;
long lpos = npos;
- for (; npos < strlen ; npos++ ) {
+ for (; npos < strlen ; npos++) {
lpos = npos;
- if (this.parse_linebreak_pos (str, strlen, ref npos, ref line, ref newlinepos, wikimode) ) {
+ if (this.parse_linebreak_pos (str, strlen, ref npos, ref line, ref newlinepos, wikimode)) {
buf.append_len (str.offset(startpos), lpos-startpos);
startpos=npos+1;
continue;
}
- if (this.parse_newline_pos ( str, strlen, ref npos, ref line, ref newlinepos, wikimode)) {
+ if (this.parse_newline_pos (str, strlen, ref npos, ref line, ref newlinepos, wikimode)) {
npos++;
break;
}
if (this.parse_inline_taglet_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos, wikimode)) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, npos, lpos, buf );
+ this.prepend_string_taglet (str, strlen, content, ref startpos, npos, lpos, buf);
}
- else if ( this.parse_url_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos ) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, npos, lpos, buf );
+ else if (this.parse_url_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, npos, lpos, buf);
}
- else if ( this.parse_highlighting_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos, wikimode) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, npos, lpos, buf );
+ else if (this.parse_code_constant_pos (str, strlen, subcontent, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
+ }
+ else if (this.parse_highlighting_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos, wikimode)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, npos, lpos, buf);
}
}
- this.append_string_taglet ( str, strlen, content, ref startpos, lpos, lpos, buf );
- for ( ; str[npos]==' '||str[npos]=='\t' ; npos++, space++ );
+ this.append_string_taglet (str, strlen, content, ref startpos, lpos, lpos, buf);
+ for (; str[npos]==' '||str[npos]=='\t' ; npos++, space++);
return true;
}
@@ -564,8 +572,8 @@ public class Valadoc.Parser : Object {
return url.has_prefix("http://") || url.has_prefix("http://") || (url.has_prefix("/")&&url.has_suffix(".valadoc"));
}
- private bool parse_url_pos ( Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long rpos, ref long nline, ref long newlinepos ) {
- if ( !str.offset(rpos).has_prefix ("[[") )
+ private bool parse_url_pos (Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long rpos, ref long nline, ref long newlinepos) {
+ if (!str.offset(rpos).has_prefix ("[["))
return false;
@@ -574,23 +582,23 @@ public class Valadoc.Parser : Object {
long urlend = -1;
long line = nline;
- for ( ; pos<strlen ; pos++ ) {
- switch ( str[pos] ) {
+ for (; pos<strlen ; pos++) {
+ switch (str[pos]) {
case '|':
urlend= pos;
break;
case ']':
if (str[pos+1]==']') {
- string url = str.substring ( rpos+2, ((urlend==-1)? pos : urlend)-rpos-2 );
- if ( !this.check_url (url) ) {
- this.printr ( ErrorNumber.INVALID_LINK, curelement.get_filename (), str, strlen, nline, newlinepos, rpos+2, pos-rpos-2 );
+ string url = str.substring (rpos+2, ((urlend==-1)? pos : urlend)-rpos-2);
+ if ( !this.check_url (url)) {
+ this.printr (ErrorNumber.INVALID_LINK, curelement.get_filename (), str, strlen, nline, newlinepos, rpos+2, pos-rpos-2);
return false;
}
- string urldesc = (urlend==-1)? url : str.substring( urlend+1, pos-urlend-1 );
- LinkDocElement linktag = (LinkDocElement)GLib.Object.new ( this.modules.linktag );
- linktag.parse ( this.settings, this.tree, curelement, url, urldesc );
- content.add ( linktag );
+ string urldesc = (urlend==-1)? url : str.substring(urlend+1, pos-urlend-1);
+ LinkDocElement linktag = (LinkDocElement)GLib.Object.new (this.modules.linktag);
+ linktag.parse (this.settings, this.tree, curelement, url, urldesc);
+ content.add (linktag);
nline = line;
rpos = pos+1;
@@ -598,11 +606,11 @@ public class Valadoc.Parser : Object {
}
break;
case '\n':
- this.printr ( ErrorNumber.OPEN_TAG, curelement.get_filename (), str, strlen, nline, newlinepos, rpos, -1 );
+ this.printr (ErrorNumber.OPEN_TAG, curelement.get_filename (), str, strlen, nline, newlinepos, rpos, -1);
return false;
}
}
- this.printr ( ErrorNumber.OPEN_TAG, curelement.get_filename (), str, strlen, nline, newlinepos, rpos, -1 );
+ this.printr (ErrorNumber.OPEN_TAG, curelement.get_filename (), str, strlen, nline, newlinepos, rpos, -1);
return false;
}
@@ -720,6 +728,9 @@ public class Valadoc.Parser : Object {
else if ( this.parse_url_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos ) ) {
this.prepend_string_taglet ( str, strlen, subcontent, ref startpos, pos, lpos, buf );
}
+ else if (this.parse_code_constant_pos (str, strlen, subcontent, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
+ }
else if ( this.parse_highlighting_pos (curelement, str, strlen, subcontent, ref pos, ref line, ref newlinepos, wikimode) ) {
this.prepend_string_taglet ( str, strlen, subcontent, ref startpos, pos, lpos, buf );
}
@@ -768,7 +779,7 @@ public class Valadoc.Parser : Object {
return true;
}
- private long get_table_cell_attributes_error_len ( string str, long strlen, long startpos ) {
+ private long get_table_cell_attributes_error_len (string str, long strlen, long startpos) {
weak string strstartpos = str.offset(startpos);
weak string? endposstr = strstartpos.chr (-1, '>');
@@ -779,11 +790,11 @@ public class Valadoc.Parser : Object {
long cellend = (cellendstr == null)? long.MAX : strstartpos.pointer_to_offset(cellendstr);
long lineend = (lineendstr == null)? long.MAX : strstartpos.pointer_to_offset(lineendstr);
- return long.min(long.min( long.min( cellend, lineend), endpos), strlen-startpos);
+ return long.min(long.min(long.min(cellend, lineend), endpos), strlen-startpos);
}
private bool parse_table_cell_attributes (Documented curelement, string str, long strlen, ref long npos, long line, long newlinepos, out TextPosition vpos, out TextVerticalPosition hpos, out int hwidth, out int vwidth, out int color) {
- if ( str[npos] != '<' ) {
+ if (str[npos] != '<') {
return false;
}
@@ -794,22 +805,22 @@ public class Valadoc.Parser : Object {
color = -1;
- for ( long pos = npos+1; pos < strlen; pos++ ) {
- switch ( str[pos] ) {
+ for (long pos = npos+1; pos < strlen; pos++) {
+ switch (str[pos]) {
case '-':
- if ( !this.extract_decimal ( str, strlen, ref pos, out hwidth ) ) {
- this.printr ( ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos) );
+ if (!this.extract_decimal (str, strlen, ref pos, out hwidth)) {
+ this.printr (ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos));
return false;
}
break;
case '|':
- if ( !this.extract_decimal ( str, strlen, ref pos, out vwidth ) ) {
- this.printr ( ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos) );
+ if (!this.extract_decimal (str, strlen, ref pos, out vwidth )) {
+ this.printr (ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos));
return false;
}
break;
case ')':
- switch ( str[pos+1] ) {
+ switch (str[pos+1]) {
case '(':
vpos = TextPosition.CENTER;
pos++;
@@ -819,13 +830,13 @@ public class Valadoc.Parser : Object {
pos++;
break;
default:
- this.printr ( ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos) );
+ this.printr (ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos));
return false;
}
break;
case '#':
- if ( !this.extract_color(str, strlen, ref pos, out color) ) {
- this.printr ( ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos) );
+ if (!this.extract_color(str, strlen, ref pos, out color)) {
+ this.printr (ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos));
return false;
}
break;
@@ -843,16 +854,16 @@ public class Valadoc.Parser : Object {
case ' ':
break;
default:
- this.printr ( ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos) );
+ this.printr (ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos));
return false;
}
}
- this.printr ( ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos) );
+ this.printr (ErrorNumber.TABLE_CELL_ATTRIBUTES, curelement.get_filename (), str, strlen, line, newlinepos, npos, this.get_table_cell_attributes_error_len (str, strlen, npos));
return false;
}
- private bool parse_table_cell ( Documented curelement, string str, long strlen, Gee.ArrayList<TableCellDocElement> cells, ref long pos, ref long line, ref long newlinepos, bool wikimode ) {
- if ( !str.offset(pos).has_prefix("||") ) {
+ private bool parse_table_cell (Documented curelement, string str, long strlen, Gee.ArrayList<TableCellDocElement> cells, ref long pos, ref long line, ref long newlinepos, bool wikimode) {
+ if (!str.offset(pos).has_prefix("||")) {
return false;
}
@@ -873,39 +884,42 @@ public class Valadoc.Parser : Object {
this.parse_table_cell_attributes (curelement, str, strlen, ref pos, line, newlinepos, out vpos, out hpos, out hwidth, out vwidth, out color);
- for ( long startpos = pos; pos < strlen ; pos++ ) {
+ for (long startpos = pos; pos < strlen ; pos++) {
lpos = pos;
- if ( str.offset(pos).has_prefix("||") ) {
- this.append_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ if (str.offset(pos).has_prefix("||")) {
+ this.append_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf);
- TableCellDocElement celltag = (TableCellDocElement)GLib.Object.new ( this.modules.celltag );
- celltag.parse ( vpos, hpos, hwidth, vwidth, content );
+ TableCellDocElement celltag = (TableCellDocElement)GLib.Object.new (this.modules.celltag);
+ celltag.parse ( vpos, hpos, hwidth, vwidth, content);
cells.add ( celltag );
return true;
}
- else if (this.parse_linebreak_pos (str, strlen, ref pos, ref line, ref newlinepos, wikimode) ) {
+ else if (this.parse_linebreak_pos (str, strlen, ref pos, ref line, ref newlinepos, wikimode)) {
buf.append_len (str.offset(startpos), lpos-startpos);
startpos=pos+1;
}
- else if (this.parse_inline_taglet_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode )) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if (this.parse_inline_taglet_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode)) {
+ this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf);
startpos=pos+1;
}
- else if ( this.parse_url_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos ) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if (this.parse_code_constant_pos (str, strlen, content, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
}
- else if ( this.parse_img_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos ) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if (this.parse_url_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
}
- else if ( this.parse_highlighting_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if (this.parse_img_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
+ }
+ else if (this.parse_highlighting_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
}
else if (this.parse_newline_pos (str, strlen, ref pos, ref line, ref newlinepos, wikimode)) {
- this.printr ( ErrorNumber.TABLE_CELL, curelement.get_filename (), str, strlen, cellstartline, cellstartnewlinepos, cellstartpos, -1 );
+ this.printr (ErrorNumber.TABLE_CELL, curelement.get_filename (), str, strlen, cellstartline, cellstartnewlinepos, cellstartpos, -1);
return false;
}
}
- this.printr ( ErrorNumber.TABLE_CELL, curelement.get_filename (), str, strlen, cellstartline, cellstartnewlinepos, cellstartpos, -1 );
+ this.printr (ErrorNumber.TABLE_CELL, curelement.get_filename (), str, strlen, cellstartline, cellstartnewlinepos, cellstartpos, -1);
return false;
}
@@ -1067,7 +1081,7 @@ public class Valadoc.Parser : Object {
return counter > 0;
}
- private bool parse_headline_pos ( string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long nline, ref long nnewlinepos, ref long space, bool wikimode ) {
+ private bool parse_headline_pos (string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long nline, ref long nnewlinepos, ref long space, bool wikimode) {
weak string startstr = str.offset(npos);
if ( !startstr.has_prefix("==") ) {
return false;
@@ -1182,6 +1196,9 @@ public class Valadoc.Parser : Object {
if (this.parse_inline_taglet_pos (wikipage, str, strlen, content, ref pos, ref line, ref newlinepos, true)) {
this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
}
+ else if (this.parse_code_constant_pos (str, strlen, content, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
+ }
else if ( this.parse_url_pos (wikipage, str, strlen, content, ref pos, ref line, ref newlinepos) ) {
this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
}
@@ -1199,21 +1216,21 @@ public class Valadoc.Parser : Object {
return wikipage;
}
- public DocumentationTree? parse ( DocumentedElement self ) {
+ public DocumentationTree? parse (DocumentedElement self) {
if (self.vcomment == null) {
return null;
}
weak string str = self.vcomment.content;
- if ( str == null ) {
+ if (str == null) {
return null;
}
- if ( str[0]!='*' ) {
+ if (str[0]!='*') {
return null;
}
- if ( self.documentation != null ) {
+ if (self.documentation != null) {
return self.documentation;
}
@@ -1226,15 +1243,15 @@ public class Valadoc.Parser : Object {
long line = 0;
long pos = 0;
- if (!this.skip_header_pos ( str, strlen, ref pos, ref line, ref newlinepos, false )) {
+ if (!this.skip_header_pos ( str, strlen, ref pos, ref line, ref newlinepos, false)) {
return null;
}
- if(!this.parse_short_desc_pos(self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, false )) {
+ if(!this.parse_short_desc_pos(self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, false)) {
return null;
}
- doctree.add_brief ( content );
+ doctree.add_brief (content);
StringBuilder buf = new StringBuilder ();
long startpos = pos; //+1
@@ -1244,9 +1261,9 @@ public class Valadoc.Parser : Object {
content = new Gee.ArrayList<DocElement> ();
- for ( ; pos<strlen ; pos++ ) {
+ for (; pos<strlen ; pos++) {
lpos = pos;
- if ( this.parse_linebreak_pos (str, strlen, ref pos, ref line, ref newlinepos, false) ) {
+ if (this.parse_linebreak_pos (str, strlen, ref pos, ref line, ref newlinepos, false)) {
buf.append_len (str.offset(startpos), lpos-startpos);
startpos = pos+1;
continue;
@@ -1261,54 +1278,57 @@ public class Valadoc.Parser : Object {
continue;
}
- if ( linestart == pos ) {
- if ( this.parse_source_pos ( self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, false) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ if (linestart == pos) {
+ if (this.parse_source_pos (self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, false)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
linestart = startpos = pos+1;
continue ;
}
- else if ( this.parse_notification_pos ( self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, false ) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if (this.parse_notification_pos (self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, false)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
linestart = startpos = pos+1;
continue ;
}
- else if ( this.parse_align_pos( self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, false ) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if ( this.parse_align_pos(self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, false)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
linestart = startpos = pos+1;
continue ;
}
- else if ( this.parse_list_pos (self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, ref linestart, false) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if (this.parse_list_pos (self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, ref linestart, false)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
linestart = startpos = pos+1;
continue ;
}
- else if ( str[pos] == '@' && !str[pos].isspace() ) {
+ else if (str[pos] == '@' && !str[pos].isspace()) {
Gee.ArrayList<MainTaglet> taglets = new Gee.ArrayList<MainTaglet>();
- this.parse_taglet ( self, str, strlen, taglets, ref pos, ref line, ref newlinepos, ref space, ref depth, false );
- this.append_string_taglet ( str, strlen, content, ref startpos, strlen-1, lpos, buf );
- doctree.add_description ( content );
+ this.parse_taglet (self, str, strlen, taglets, ref pos, ref line, ref newlinepos, ref space, ref depth, false);
+ this.append_string_taglet (str, strlen, content, ref startpos, strlen-1, lpos, buf);
+ doctree.add_description (content);
doctree.add_taglets (taglets);
return doctree;
}
- else if ( this.parse_table ( self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, false ) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if (this.parse_table ( self, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, false)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
linestart = startpos = pos+1;
- continue ;
+ continue;
}
}
- if (this.parse_inline_taglet_pos ( self, str, strlen, content, ref pos, ref line, ref newlinepos, false )) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ if (this.parse_inline_taglet_pos (self, str, strlen, content, ref pos, ref line, ref newlinepos, false)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
}
- else if ( this.parse_url_pos ( self, str, strlen, content, ref pos, ref line, ref newlinepos ) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if (this.parse_url_pos (self, str, strlen, content, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
}
- else if ( this.parse_img_pos ( self, str, strlen, content, ref pos, ref line, ref newlinepos ) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if (this.parse_code_constant_pos (str, strlen, content, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
}
- else if ( this.parse_highlighting_pos ( self, str, strlen, content, ref pos, ref line, ref newlinepos, false ) ) {
- this.prepend_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf );
+ else if (this.parse_img_pos (self, str, strlen, content, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
+ }
+ else if (this.parse_highlighting_pos (self, str, strlen, content, ref pos, ref line, ref newlinepos, false)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
}
}
@@ -1426,6 +1446,9 @@ public class Valadoc.Parser : Object {
else if (this.parse_inline_taglet_pos ( curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode)) {
this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
}
+ else if ( this.parse_code_constant_pos (str, strlen, content, ref pos, ref line, ref newlinepos)) {
+ this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
+ }
else if ( this.parse_url_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos)) {
this.prepend_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf);
}
@@ -1448,6 +1471,34 @@ public class Valadoc.Parser : Object {
npos = pos;
return true;
}
+
+ private bool parse_code_constant_pos (string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long nline, ref long newlinepos) {
+ weak string startstr = str.offset(npos);
+ CodeConstantDocElement? tag = null;
+
+ if (startstr.has_prefix("{{{null}}}") ) {
+ tag = (CodeConstantDocElement)GLib.Object.new (this.modules.codeconstanttag);
+ tag.parse ("null");
+ content.add (tag);
+ npos += 9;
+ return true;
+ }
+ else if (startstr.has_prefix("{{{true}}}") ) {
+ tag = (CodeConstantDocElement)GLib.Object.new (this.modules.codeconstanttag);
+ tag.parse ("true");
+ content.add (tag);
+ npos += 9;
+ return true;
+ }
+ else if (startstr.has_prefix("{{{false}}}") ) {
+ tag = (CodeConstantDocElement)GLib.Object.new (this.modules.codeconstanttag);
+ tag.parse ("false");
+ content.add (tag);
+ npos += 10;
+ return true;
+ }
+ return false;
+ }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]