From: Florian Brosch Date: Fri, 7 Nov 2008 23:58:10 +0000 (+0000) Subject: - --force X-Git-Tag: 0.37.1~3^2~620 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=235f12344f98437e3a0b808237889545362ee605;p=thirdparty%2Fvala.git - --force - --force svn path=/trunk/; revision=14 --- diff --git a/src/doclets/devhelp/deps/style.css b/src/doclets/devhelp/deps/style.css index e74b1a52e..270f4f453 100644 --- a/src/doclets/devhelp/deps/style.css +++ b/src/doclets/devhelp/deps/style.css @@ -182,7 +182,181 @@ h3.main_title { - +.css_content_link_constant { + background-image:url(constant.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_namespace { + background-image:url(namespace.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_struct { + background-image:url(struct.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_interface { + background-image:url(interface.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_enum { + background-image:url(enum.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_errordomain { + background-image:url(errordomain.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_delegate { + background-image:url(delegate.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_signal { + background-image:url(signal.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_field { + background-image:url(field.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_enumvalue { + background-image:url(enumvalue.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_errorcode { + background-image:url(errorcode.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_class { + background-image:url(class.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_abstract_class { + background-image:url(abstractclass.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_property { + background-image:url(property.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_virtual_property { + background-image:url(property.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_abstract_property { + background-image:url(property.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_method { + background-image:url(method.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_static_method { + background-image:url(staticmethod.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_virtual_method { + background-image:url(method.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_abstract_method { + background-image:url( abstractmethod.png ); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_construction_method { + background-image:url(method.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} + +.main_inline_navigation_errorcode { + list-style-image:url(errorcode.png); +} +.main_inline_navigation_enumvalue { + list-style-image:url(enumvalue.png); +} .navi_abstract_class, .main_inline_navigation_abstract_class { list-style-image: url(abstractclass.png); } diff --git a/src/doclets/devhelp/taglets/link/taglet.vala b/src/doclets/devhelp/taglets/link/taglet.vala index 898779270..66a9f01ba 100644 --- a/src/doclets/devhelp/taglets/link/taglet.vala +++ b/src/doclets/devhelp/taglets/link/taglet.vala @@ -27,6 +27,7 @@ using Gee; public class LinkHtmlTaglet : InlineTaglet, HtmlHelper { private string content; private string path; + private string css; public Settings settings { construct set; @@ -45,6 +46,7 @@ public class LinkHtmlTaglet : InlineTaglet, HtmlHelper { } this.settings = settings; + this.css = get_html_content_link_css_class ( element ); this.path = this.get_html_link ( this.settings, element, me ); this.content = str; @@ -54,9 +56,9 @@ public class LinkHtmlTaglet : InlineTaglet, HtmlHelper { public override bool write ( void* res, int max, int index ) { if ( this.path == null ) - ((GLib.FileStream)res).printf ( "%s", this.content ); + ((GLib.FileStream)res).printf ( "%s", this.css, this.content ); else - ((GLib.FileStream)res).printf ( "%s", this.path, this.content ); + ((GLib.FileStream)res).printf ( "%s", this.css, this.path, this.content ); return true; } diff --git a/src/doclets/devhelp/taglets/see/taglet.vala b/src/doclets/devhelp/taglets/see/taglet.vala index 2ca210669..ab43d8a44 100644 --- a/src/doclets/devhelp/taglets/see/taglet.vala +++ b/src/doclets/devhelp/taglets/see/taglet.vala @@ -26,6 +26,7 @@ using Gee; public class SeeHtmlTaglet : MainTaglet, HtmlHelper { private string name; private string path; + private string css; public override int order { get { return 500; } @@ -77,7 +78,7 @@ public class SeeHtmlTaglet : MainTaglet, HtmlHelper { this.settings = settings; - + this.css = get_html_inline_navigation_link_css_class ( element ); this.path = this.get_html_link ( this.settings, element, me ); this.name = element.full_name(); return true; @@ -86,7 +87,7 @@ public class SeeHtmlTaglet : MainTaglet, HtmlHelper { public override bool write ( void* ptr, int max, int index ) { weak GLib.FileStream file = (GLib.FileStream)ptr; - file.printf ( "\t
  • %s
    • \n", css_see_list, this.path, this.name ); + file.printf ( "\t
  • %s
    • \n", this.css, this.path, this.name ); return true; } } diff --git a/src/doclets/html/deps/main.css b/src/doclets/html/deps/main.css index 433472f83..7a74e8b60 100644 --- a/src/doclets/html/deps/main.css +++ b/src/doclets/html/deps/main.css @@ -167,6 +167,183 @@ h3.main_title { + +.main_inline_navigation_errorcode { + list-style-image:url(errorcode.png); +} +.main_inline_navigation_enumvalue { + list-style-image:url(enumvalue.png); +} +.css_content_link_constant { + background-image:url(constant.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_namespace { + background-image:url(namespace.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_struct { + background-image:url(struct.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_interface { + background-image:url(interface.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_enum { + background-image:url(enum.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_errordomain { + background-image:url(errordomain.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_delegate { + background-image:url(delegate.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_signal { + background-image:url(signal.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_field { + background-image:url(field.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_enumvalue { + background-image:url(enumvalue.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_errorcode { + background-image:url(errorcode.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_class { + background-image:url(class.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_abstract_class { + background-image:url(abstractclass.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_property { + background-image:url(property.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_virtual_property { + background-image:url(property.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_abstract_property { + background-image:url(property.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_method { + background-image:url(method.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_static_method { + background-image:url(staticmethod.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_virtual_method { + background-image:url(method.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_abstract_method { + background-image:url( abstractmethod.png ); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} +.css_content_link_construction_method { + background-image:url(method.png); + display:inline-block; + padding-right:17px; + background-repeat:no-repeat; + background-position:center right; + border:0px; +} + + .main_inline_navigation_virtual_property { list-style-image: url(property.png); } @@ -180,7 +357,6 @@ h3.main_title { list-style-image: url(property.png); } - .navi_abstract_class, .main_inline_navigation_abstract_class { list-style-image: url(abstractclass.png); } @@ -244,9 +420,10 @@ h3.main_title { .navi_package, .main_inline_navigation_package { list-style-image: url(package.png); } - .main_inline_navigation_constant, .navi_constant { list-style-image: url(constant.png); + text-decoration: none; + color: #214b87; } diff --git a/src/doclets/html/linkhelper/helper.vala b/src/doclets/html/linkhelper/helper.vala index 831edb85e..dcf237144 100755 --- a/src/doclets/html/linkhelper/helper.vala +++ b/src/doclets/html/linkhelper/helper.vala @@ -20,6 +20,8 @@ using GLib; + + public interface Valadoc.LinkHelper { protected string get_html_top_link ( Valadoc.Basic? postag ) { if ( postag == null ) diff --git a/src/doclets/html/taglets/link/taglet.vala b/src/doclets/html/taglets/link/taglet.vala index 70f20c387..3c7216aa5 100644 --- a/src/doclets/html/taglets/link/taglet.vala +++ b/src/doclets/html/taglets/link/taglet.vala @@ -28,6 +28,7 @@ using Gee; public class LinkHtmlTaglet : InlineTaglet, LinkHelper { private string content; private string path; + private string css; public Settings settings { construct set; @@ -47,15 +48,16 @@ public class LinkHtmlTaglet : InlineTaglet, LinkHelper { this.settings = settings; this.path = this.get_html_link ( settings, element, me ); + this.css = get_html_content_link_css_class ( element ); this.content = element.full_name (); return true; } public override bool write ( void* res, int max, int index ) { if ( this.path == null ) - ((GLib.FileStream)res).printf ( "%s", this.content ); + ((GLib.FileStream)res).printf ( "%s", this.css, this.content ); else - ((GLib.FileStream)res).printf ( "%s", this.path, this.content ); + ((GLib.FileStream)res).printf ( "%s", this.path, this.css, this.content ); return true; } diff --git a/src/doclets/html/taglets/see/taglet.vala b/src/doclets/html/taglets/see/taglet.vala index 896a2394e..0e7fc735b 100644 --- a/src/doclets/html/taglets/see/taglet.vala +++ b/src/doclets/html/taglets/see/taglet.vala @@ -26,6 +26,7 @@ using Gee; public class SeeHtmlTaglet : MainTaglet, Valadoc.LinkHelper { private string name; private string path; + private string css; public override int order { get { return 500; } @@ -76,6 +77,7 @@ public class SeeHtmlTaglet : MainTaglet, Valadoc.LinkHelper { } this.settings = settings; + this.css = get_html_inline_navigation_link_css_class ( element ); this.path = this.get_html_link ( settings, element, me ); this.name = element.full_name (); return true; @@ -85,9 +87,9 @@ public class SeeHtmlTaglet : MainTaglet, Valadoc.LinkHelper { weak GLib.FileStream file = (GLib.FileStream)ptr; if ( this.path == null ) - file.printf ( "\t
  • %s
    • \n", css_see_list, this.name ); + file.printf ( "\t
  • %s
    • \n", this.css, this.name ); else - file.printf ( "\t
  • %s
    • \n", css_see_list, this.path, this.name ); + file.printf ( "\t
  • %s
    • \n", this.css, this.path, this.name ); return true; } diff --git a/src/doclets/htmlhelpers/htmlhelpers.vala b/src/doclets/htmlhelpers/htmlhelpers.vala index 5afa10b5a..0e8395b6e 100644 --- a/src/doclets/htmlhelpers/htmlhelpers.vala +++ b/src/doclets/htmlhelpers/htmlhelpers.vala @@ -4,8 +4,13 @@ using GLib; +namespace Valadoc { + public const string css_inline_navigation = "main_inline_navigation"; +public const string css_inline_navigation_errorcode = "main_inline_navigation_errorcode"; +public const string css_inline_navigation_enumvalue = "main_inline_navigation_enumvalue"; + public const string css_inline_navigation_property = "main_inline_navigation_property"; public const string css_inline_navigation_virtual_property = "main_inline_navigation_virtual_property"; public const string css_inline_navigation_abstract_property = "main_inline_navigation_abstract_property"; @@ -104,9 +109,163 @@ public const string css_style_body = "site_body"; +public const string css_content_link_constant = "css_content_link_constant"; +public const string css_content_link_namespace = "css_content_link_namespace"; +public const string css_content_link_struct = "css_content_link_struct"; +public const string css_content_link_interface = "css_content_link_interface"; +public const string css_content_link_enum = "css_content_link_enum"; +public const string css_content_link_errordomain = "css_content_link_errordomain"; +public const string css_content_link_delegate = "css_content_link_delegate"; +public const string css_content_link_signal = "css_content_link_signal"; +public const string css_content_link_field = "css_content_link_field"; +public const string css_content_link_enumvalue = "css_content_link_enumvalue"; +public const string css_content_link_errorcode = "css_content_link_errorcode"; + +public const string css_content_link_class = "css_content_link_class"; +public const string css_content_link_abstract_class = "css_content_link_abstract_class"; + +public const string css_content_link_property = "css_content_link_property"; +public const string css_content_link_virtual_property = "css_content_link_virtual_property"; +public const string css_content_link_abstract_property = "css_content_link_abstract_property"; + +public const string css_content_link_method = "css_content_link_method"; +public const string css_content_link_static_method = "css_content_link_static_method"; +public const string css_content_link_virtual_method = "css_content_link_virtual_method"; +public const string css_content_link_abstract_method = "css_content_link_abstract_method"; +public const string css_content_link_construction_method = "css_content_link_construction_method"; + + +public string get_html_content_link_css_class ( Valadoc.Basic element ) { + if ( element is Namespace ) { + return css_content_link_namespace; + } + else if ( element is Struct ) { + return css_content_link_struct; + } + else if ( element is Interface ) { + return css_content_link_interface; + } + else if ( element is Class ) { + if ( ((Class)element).is_abstract ) + return css_content_link_abstract_class; + else + return css_content_link_class; + } + else if ( element is Enum ) { + return css_content_link_enum; + } + else if ( element is ErrorDomain ) { + return css_content_link_errordomain; + } + else if ( element is Delegate ) { + return css_content_link_delegate; + } + else if ( element is Method ) { + if ( ((Method)element).is_constructor ) + return css_content_link_construction_method; + else if ( ((Method)element).is_abstract ) + return css_content_link_abstract_method; + else if ( ((Method)element).is_override || ((Method)element).is_override ) + return css_content_link_virtual_method; + else if ( ((Method)element).is_static ) + return css_content_link_static_method; + else + return css_content_link_method; + } + else if ( element is Signal ) { + return css_content_link_signal; + } + else if ( element is Property ) { + if ( ((Property)element).is_virtual || ((Property)element).is_override ) + return css_content_link_virtual_property; + else if ( ((Property)element).is_abstract ) + return css_content_link_abstract_property; + else + return css_content_link_property; + } + else if ( element is Field ) { + return css_content_link_field; + } + else if ( element is Constant ) { + return css_content_link_constant; + } + else if ( element is EnumValue ) { + return css_content_link_enumvalue; + } + else if ( element is ErrorCode ) { + return css_content_link_errorcode; + } + return ""; +} + +public string get_html_inline_navigation_link_css_class ( Valadoc.Basic element ) { + if ( element is Namespace ) { + } + else if ( element is Struct ) { + return css_inline_navigation_struct; + } + else if ( element is Interface ) { + return css_inline_navigation_interface; + } + else if ( element is Class ) { + return (((Class)element).is_abstract)? css_inline_navigation_abstract_class : css_inline_navigation_class; + } + else if ( element is Enum ) { + return css_inline_navigation_enum; + } + else if ( element is ErrorDomain ) { + return css_inline_navigation_errordomain; + } + else if ( element is Delegate ) { + return css_inline_navigation_delegate; + } + else if ( element is Method ) { + if ( ((Method)element).is_static ) + return css_inline_navigation_static_method; + else if ( ((Method)element).is_static ) + return css_inline_navigation_static_method; + else if ( ((Method)element).is_constructor ) + return css_inline_navigation_construction_method; + else if ( ((Method)element).is_abstract ) + return css_inline_navigation_abstract_method; + else if ( ((Method)element).is_virtual || ((Method)element).is_override ) + return css_inline_navigation_virtual_method; + else + return css_inline_navigation_method; + } + else if ( element is Signal ) { + return css_inline_navigation_signal; + } + else if ( element is Property ) { + if ( ((Property)element).is_virtual || ((Property)element).is_override ) + return css_inline_navigation_virtual_property; + else if ( ((Property)element).is_abstract ) + return css_inline_navigation_abstract_property; + else + return css_inline_navigation_property; + } + else if ( element is Field ) { + return css_inline_navigation_fields; + } + else if ( element is Constant ) { + return css_inline_navigation_constant; + } + else if ( element is EnumValue ) { + return css_inline_navigation_enumvalue; + } + else if ( element is ErrorCode ) { + return css_inline_navigation_errorcode; + } + return ""; +} + + +} + + public abstract class Valadoc.BasicHtmlLanglet : Valadoc.Langlet { public Valadoc.Settings settings { construct set; @@ -1411,17 +1570,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Methods:

    \n", css_title ); file.printf ( "\n" ); } @@ -1440,7 +1589,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Static Methods:

    \n", css_title ); file.printf ( "\n" ); } @@ -1559,7 +1708,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Constants:

    \n", css_title ); file.printf ( "\n" ); } @@ -1571,7 +1720,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Enums:

    \n", css_title ); file.printf ( "\n" ); } @@ -1583,7 +1732,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Errordomains:

    \n", css_title ); file.printf ( "\n" ); } @@ -1595,7 +1744,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Construction Methods:

    \n", css_title ); file.printf ( "\n" ); } @@ -1625,7 +1774,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Fields:

    \n", css_title ); file.printf ( "\n" ); } @@ -1637,15 +1786,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Properties:

    \n", css_title ); file.printf ( "\n" ); } @@ -1657,7 +1798,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Signals:

    \n", css_title ); file.printf ( "\n" ); } @@ -1677,7 +1818,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { name = subcl.name; } - file.printf ( "\t
  • %s
    • \n", (subcl.is_abstract)? css_inline_navigation_abstract_class : css_inline_navigation_class, css_navi_link, this.get_link(subcl, (mself == null)? clh : mself), name ); + file.printf ( "\t
  • %s
    • \n", get_html_inline_navigation_link_css_class (subcl), css_navi_link, this.get_link(subcl, (mself == null)? clh : mself), name ); } file.puts ( "\n" ); } @@ -1689,7 +1830,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Interfaces:

    \n", css_title ); file.printf ( "\n" ); } @@ -1701,7 +1842,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Delegates:

    \n", css_title ); file.printf ( "\n" ); } @@ -1713,7 +1854,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet { file.printf ( "

    Structs:

    \n", css_title ); file.printf ( "\n" ); } diff --git a/src/doclets/valadoc.org/taglets/link/taglet.vala b/src/doclets/valadoc.org/taglets/link/taglet.vala index 8d417c7da..8dab2c404 100644 --- a/src/doclets/valadoc.org/taglets/link/taglet.vala +++ b/src/doclets/valadoc.org/taglets/link/taglet.vala @@ -27,6 +27,7 @@ using Gee; public class LinkHtmlTaglet : InlineTaglet, LinkHelper { private string content; private string path; + private string css; public Settings settings { construct set; @@ -45,6 +46,7 @@ public class LinkHtmlTaglet : InlineTaglet, LinkHelper { } this.settings = settings; + this.css = get_html_content_link_css_class ( element ); this.path = this.get_html_link ( settings, element ); this.content = element.full_name (); return true; @@ -53,9 +55,9 @@ public class LinkHtmlTaglet : InlineTaglet, LinkHelper { public override bool write ( void* res, int max, int index ) { if ( this.path == null ) - ((GLib.FileStream)res).printf ( "%s", this.content ); + ((GLib.FileStream)res).printf ( "%s", this.css, this.content ); else - ((GLib.FileStream)res).printf ( "%s", this.path, this.content ); + ((GLib.FileStream)res).printf ( "%s", this.css, this.path, this.content ); return true; } diff --git a/src/doclets/valadoc.org/taglets/see/taglet.vala b/src/doclets/valadoc.org/taglets/see/taglet.vala index 7cecf1e26..b8f31c542 100644 --- a/src/doclets/valadoc.org/taglets/see/taglet.vala +++ b/src/doclets/valadoc.org/taglets/see/taglet.vala @@ -26,6 +26,7 @@ using Gee; public class SeeHtmlTaglet : MainTaglet, LinkHelper { private string name; private string path; + private string css; public override int order { get { return 500; } @@ -76,6 +77,7 @@ public class SeeHtmlTaglet : MainTaglet, LinkHelper { } this.settings = settings; + this.css = get_html_inline_navigation_link_css_class ( element ); this.path = this.get_html_link ( settings, element ); this.name = element.full_name (); return true; @@ -84,7 +86,7 @@ public class SeeHtmlTaglet : MainTaglet, LinkHelper { public override bool write ( void* ptr, int max, int index ) { weak GLib.FileStream file = (GLib.FileStream)ptr; - file.printf ( "\t
  • %s
    • \n", css_see_list, this.path, this.name ); + file.printf ( "\t
  • %s
    • \n", this.css, this.path, this.name ); return true; } } diff --git a/src/libvaladoc/doctree.vala b/src/libvaladoc/doctree.vala index 15d5cf431..e51c8df39 100755 --- a/src/libvaladoc/doctree.vala +++ b/src/libvaladoc/doctree.vala @@ -112,6 +112,7 @@ public Valadoc.Class glib_error = null; public enum CommentContext { + NAMESPACE, ERRORDOMAIN, ENUMVALUE, ERRORCODE, @@ -4154,6 +4155,8 @@ public class Valadoc.Namespace : Basic, MethodHandler, FieldHandler, NamespaceHa // internal public void parse_comments ( Valadoc.Parser docparser ) { + //this.parse_comment_helper ( docparser, CommentContext.NAMESPACE ); + this.parse_enum_comments ( docparser ); this.parse_field_comments ( docparser ); this.parse_class_comments ( docparser ); diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala index dfe78c56d..b94f306d1 100755 --- a/src/valadoc/valadoc.vala +++ b/src/valadoc/valadoc.vala @@ -36,7 +36,6 @@ public class ValaDoc : Object { private static string pkg_name = null; private static string pkg_version = null; - private static bool add_documentation = false; private static bool add_inherited = false; private static bool _protected = false; private static bool with_deps = false; @@ -48,6 +47,7 @@ public class ValaDoc : Object { private static bool non_null_experimental = false; private static bool disable_non_null = false; private static bool disable_checking; + private static bool force = false; [NoArrayLength ()] @@ -89,6 +89,7 @@ public class ValaDoc : Object { { "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 } }; @@ -507,17 +508,6 @@ public class ValaDoc : Object { } } - - // add some random checks here - // Gee.HashMap taglets = this.get_taglets ( ); - - //Gee.HashMap taglets - // = new Gee.HashMap(GLib.str_hash, GLib.str_equal); - - - ////////////////// parse + errorreporter >>>>>>>>>>>>>>>>> - - Reporter reporter = new Reporter(); GLib.Type strtag; @@ -545,17 +535,6 @@ public class ValaDoc : Object { if ( reporter.errors > 0 ) return quit (); - -/* //////////////////////////// XML ////////////////////////// - if ( xmlsource != null ) { - var xml = new MergeExternalDocumentation ( doctree ); - bool tmp = xml.parse ( xmlsource ); - if ( tmp == false ) { - stderr.printf ( "Can't load XML-File.\n" ); - return 1; - } - } -*/ doctree.parse_comments ( docparser ); if ( reporter.errors > 0 ) return 1; @@ -573,6 +552,37 @@ public class ValaDoc : Object { return quit (); } + private static bool remove_directory ( string rpath ) { + try { + GLib.Dir dir = GLib.Dir.open ( rpath ); //throws GLib.FileError + if ( dir == null ) + return false; + + for ( weak string entry = dir.read_name(); entry != null ; entry = dir.read_name() ) { + string path = rpath + entry; + + bool is_dir = GLib.FileUtils.test ( path, GLib.FileTest.IS_DIR ); + if ( is_dir == true ) { + bool tmp = remove_directory ( path ); + if ( tmp == false ) { + stderr.printf ( "Error: Can't remove directory %s.\n", path ); + return false; + } + } + else { + int tmp = GLib.FileUtils.unlink ( path ); + if ( tmp > 0 ) { + stderr.printf ( "Error: Can't remove file %s.\n", path ); + return false; + } + } + } + } + finally {} + + return true; + } + static int main ( string[] args ) { try { var opt_context = new OptionContext ("- Vala Documentation Tool"); @@ -605,8 +615,11 @@ public class ValaDoc : Object { directory += "/"; } - if ( !add_documentation ) { - if ( FileUtils.test ( directory, FileTest.EXISTS ) ) { + if ( FileUtils.test ( directory, FileTest.EXISTS ) ) { + if ( force == true ) { + remove_directory ( directory ); + } + else { stderr.printf ("File already exists.\n"); return -1; }