Embedded: Search images relative to the file

diff --git a/src/libvaladoc/content/blockcontent.vala b/src/libvaladoc/content/blockcontent.vala
index e46617797867eb1eafa42d46f19cd9fca4c0425a..d3d8a984ab5a86dd58427c3ba2188efd1197226f 100755 (executable)
--- a/src/libvaladoc/content/blockcontent.vala
+++ b/src/libvaladoc/content/blockcontent.vala
@@ -1,6 +1,7 @@
 /* blockcontent.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -34,9 +35,9 @@ public abstract class Valadoc.Content.BlockContent : ContentElement {
        public override void configure (Settings settings, ResourceLocator locator) {
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                foreach (Block element in _content) {
-                       element.check (api_root, container, reporter, settings);
+                       element.check (api_root, container, file_path, reporter, settings);
                }
        }
 

diff --git a/src/libvaladoc/content/comment.vala b/src/libvaladoc/content/comment.vala
index 6978b8f1172033e320a7a706bcb59c6cb8f4eafa..0c6f4496fe97e98bdffb6b875dd7a26d2370e3bc 100755 (executable)
--- a/src/libvaladoc/content/comment.vala
+++ b/src/libvaladoc/content/comment.vala
@@ -1,6 +1,7 @@
 /* comment.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,11 +37,11 @@ public class Valadoc.Content.Comment : BlockContent {
        public override void configure (Settings settings, ResourceLocator locator) {
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
-               base.check (api_root, container, reporter, settings);
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
+               base.check (api_root, container, file_path, reporter, settings);
 
                foreach (Taglet element in _taglets) {
-                       element.check (api_root, container, reporter, settings);
+                       element.check (api_root, container, file_path, reporter, settings);
                }
        }
 

diff --git a/src/libvaladoc/content/contentelement.vala b/src/libvaladoc/content/contentelement.vala
index 427cf660719b4bc7ff402bf8019b2d597ac28a33..be15e5bbddcbbac758b2fe1d3d335a1e2698c995 100755 (executable)
--- a/src/libvaladoc/content/contentelement.vala
+++ b/src/libvaladoc/content/contentelement.vala
@@ -1,6 +1,7 @@
 /* contentelement.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,7 +29,7 @@ public abstract class Valadoc.Content.ContentElement : Object {
        public virtual void configure (Settings settings, ResourceLocator locator) {
        }
 
-       public abstract void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings);
+       public abstract void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings);
 
        public abstract void accept (ContentVisitor visitor);
 

diff --git a/src/libvaladoc/content/contentfactory.vala b/src/libvaladoc/content/contentfactory.vala
index 19cf41be21ea4b05f396131e384ba80657746fb3..dda8a876362e726cf1cd9f852a76cd755ff00267 100755 (executable)
--- a/src/libvaladoc/content/contentfactory.vala
+++ b/src/libvaladoc/content/contentfactory.vala
@@ -1,6 +1,7 @@
 /* contentfactory.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/libvaladoc/content/contentvisitor.vala b/src/libvaladoc/content/contentvisitor.vala
index 3eb3a4b3d4ce57f3290931b8bcdf7247fbab0805..d1b14c45383c37fcc60e92ca15ea9d9273238290 100755 (executable)
--- a/src/libvaladoc/content/contentvisitor.vala
+++ b/src/libvaladoc/content/contentvisitor.vala
@@ -1,6 +1,7 @@
 /* contentvisitor.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/libvaladoc/content/embedded.vala b/src/libvaladoc/content/embedded.vala
index f158800aaee933b0f28f14c84b6da6d98ee13729..b8f422258971f856cc02ec192634d17a064faa8e 100755 (executable)
--- a/src/libvaladoc/content/embedded.vala
+++ b/src/libvaladoc/content/embedded.vala
@@ -1,6 +1,7 @@
 /* embedded.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -42,7 +43,18 @@ public class Valadoc.Content.Embedded : ContentElement, Inline, StyleAttributes
                _locator = locator;
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
+               // search relative to our file
+               if (!Path.is_absolute (url)) {
+                       string relative_to_file = Path.build_path (Path.DIR_SEPARATOR_S, Path.get_dirname (file_path), url);
+                       if (FileUtils.test (relative_to_file, FileTest.EXISTS | FileTest.IS_REGULAR)) {
+                               url = (owned) relative_to_file;
+                               package = container.package;
+                               return ;
+                       }
+               }
+
+               // search relative to the current directory / absoulte path
                if (!FileUtils.test (url, FileTest.EXISTS | FileTest.IS_REGULAR)) {
                        reporter.simple_error ("%s does not exist", url);
                } else {

diff --git a/src/libvaladoc/content/headline.vala b/src/libvaladoc/content/headline.vala
index c7fcb29ce9f055a50867894765032d519e743500..36b19c23b04074f95f7894b4708e22039270c520 100755 (executable)
--- a/src/libvaladoc/content/headline.vala
+++ b/src/libvaladoc/content/headline.vala
@@ -1,6 +1,7 @@
 /* headline.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31,12 +32,12 @@ public class Valadoc.Content.Headline : Block, InlineContent {
                _level = 0;
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // TODO report error if level == 0 ?
                // TODO: content.size == 0?
 
                // Check inline content
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/content/inlinecontent.vala b/src/libvaladoc/content/inlinecontent.vala
index 389c66b96b8b9913b138c8469a84662d51880275..119f0569d82841624f0ada0bb0214c7aa11d9723 100755 (executable)
--- a/src/libvaladoc/content/inlinecontent.vala
+++ b/src/libvaladoc/content/inlinecontent.vala
@@ -1,6 +1,7 @@
 /* inlinecontent.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -35,9 +36,9 @@ public abstract class Valadoc.Content.InlineContent : ContentElement {
        internal InlineContent () {
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                foreach (Inline element in _content) {
-                       element.check (api_root, container, reporter, settings);
+                       element.check (api_root, container, file_path, reporter, settings);
                }
        }
 

diff --git a/src/libvaladoc/content/inlinetaglet.vala b/src/libvaladoc/content/inlinetaglet.vala
index 813bcf339071f33e4cbb21845355b4b20eabf792..151395095f75a1c453197fe5d34f0a67e4aff849 100755 (executable)
--- a/src/libvaladoc/content/inlinetaglet.vala
+++ b/src/libvaladoc/content/inlinetaglet.vala
@@ -1,6 +1,7 @@
 /* taglet.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -48,9 +49,9 @@ public abstract class Valadoc.Content.InlineTaglet : ContentElement, Taglet, Inl
                this.locator = locator;
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                ContentElement element = get_content ();
-               element.check (api_root, container, reporter, settings);
+               element.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/content/link.vala b/src/libvaladoc/content/link.vala
index e114e9694716fc71388053affdc5a3c7ee0c6adc..e2648981ad52decdec07420b73dd1d2b028630fe 100755 (executable)
--- a/src/libvaladoc/content/link.vala
+++ b/src/libvaladoc/content/link.vala
@@ -1,6 +1,7 @@
 /* link.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -33,7 +34,7 @@ public class Valadoc.Content.Link : InlineContent, Inline {
        public override void configure (Settings settings, ResourceLocator locator) {
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                //TODO: check url
        }
 

diff --git a/src/libvaladoc/content/list.vala b/src/libvaladoc/content/list.vala
index c7bae59a85f7c5dbdac820231af6ee670fd15b5d..e55489fe1e157364923f8dcb07847281e7b8d773 100755 (executable)
--- a/src/libvaladoc/content/list.vala
+++ b/src/libvaladoc/content/list.vala
@@ -1,6 +1,7 @@
 /* list.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -108,10 +109,10 @@ public class Valadoc.Content.List : ContentElement, Block {
                _items = new ArrayList<ListItem> ();
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // Check individual list items
                foreach (ListItem element in _items) {
-                       element.check (api_root, container, reporter, settings);
+                       element.check (api_root, container, file_path, reporter, settings);
                }
        }
 

diff --git a/src/libvaladoc/content/listitem.vala b/src/libvaladoc/content/listitem.vala
index f6907964e8ff6573376e6a740d892d6cc9c1128f..ef5f589f7c66f8ff12f7bc82101f67e0c12aa9d6 100755 (executable)
--- a/src/libvaladoc/content/listitem.vala
+++ b/src/libvaladoc/content/listitem.vala
@@ -1,6 +1,7 @@
 /* listitem.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,12 +31,12 @@ public class Valadoc.Content.ListItem : InlineContent {
                base ();
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // Check inline content
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
 
                if (sub_list != null) {
-                       sub_list.check (api_root, container, reporter, settings);
+                       sub_list.check (api_root, container, file_path, reporter, settings);
                }
        }
 

diff --git a/src/libvaladoc/content/note.vala b/src/libvaladoc/content/note.vala
index d2b16c557c9379db8cd240eb68b7f33195148809..40bb93019820b8b62e33cc217a8765d52e9774b5 100755 (executable)
--- a/src/libvaladoc/content/note.vala
+++ b/src/libvaladoc/content/note.vala
@@ -1,6 +1,7 @@
 /* note.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,9 +29,9 @@ public class Valadoc.Content.Note : BlockContent, Block {
                base ();
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // Check inline content
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/content/paragraph.vala b/src/libvaladoc/content/paragraph.vala
index 8f89b48b37ead6d443749a867f4ef2325ab61edb..4998952d408624f4fac01b3755d432092596064f 100755 (executable)
--- a/src/libvaladoc/content/paragraph.vala
+++ b/src/libvaladoc/content/paragraph.vala
@@ -1,6 +1,7 @@
 /* paragraph.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -32,9 +33,9 @@ public class Valadoc.Content.Paragraph : InlineContent, Block, StyleAttributes {
                base ();
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // Check inline content
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/content/run.vala b/src/libvaladoc/content/run.vala
index 519b424fe27f264219c57ecd0547af56418a19b2..146d9c29e268aec6a26be80680e2a47f24b06e0d 100755 (executable)
--- a/src/libvaladoc/content/run.vala
+++ b/src/libvaladoc/content/run.vala
@@ -1,6 +1,7 @@
 /* run.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -117,9 +118,9 @@ public class Valadoc.Content.Run : InlineContent, Inline {
                _style = style;
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // Check inline content
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/content/sourcecode.vala b/src/libvaladoc/content/sourcecode.vala
index fb2bd625e9a47780fad569a925b9bbe85531c5fd..338d23b24fd6dcd12510552b92752f4a5efbf13b 100755 (executable)
--- a/src/libvaladoc/content/sourcecode.vala
+++ b/src/libvaladoc/content/sourcecode.vala
@@ -1,6 +1,7 @@
 /* sourcecode.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -64,7 +65,7 @@ public class Valadoc.Content.SourceCode : ContentElement, Inline{
                _language = Language.VALA;
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/content/symbollink.vala b/src/libvaladoc/content/symbollink.vala
index ef52b301017e7b95ca273daff10a64d901165428..aff9476e2639f799bc7a2d15e3d8a3cafae5d4aa 100755 (executable)
--- a/src/libvaladoc/content/symbollink.vala
+++ b/src/libvaladoc/content/symbollink.vala
@@ -1,6 +1,7 @@
 /* symbollink.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,7 +37,7 @@ public class Valadoc.Content.SymbolLink : ContentElement, Inline {
        public override void configure (Settings settings, ResourceLocator locator) {
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/content/table.vala b/src/libvaladoc/content/table.vala
index dc232ae2086ddbffe3e0c9c0050cc868e7fed3e3..17fa589e8b4ceea3006de45231fa0ca7e22baf0f 100755 (executable)
--- a/src/libvaladoc/content/table.vala
+++ b/src/libvaladoc/content/table.vala
@@ -1,6 +1,7 @@
 /* table.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -33,12 +34,12 @@ public class Valadoc.Content.Table : ContentElement, Block {
                _rows = new ArrayList<TableRow> ();
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // Check the table consistency in term of row/column number
 
                // Check individual rows
                foreach (var row in _rows) {
-                       row.check (api_root, container, reporter, settings);
+                       row.check (api_root, container, file_path, reporter, settings);
                }
        }
 

diff --git a/src/libvaladoc/content/tablecell.vala b/src/libvaladoc/content/tablecell.vala
index 01e732f090a662c3379f24f7f97303ead08e52b4..733aad1ca622e87b195b128af7a77650e704cc08 100755 (executable)
--- a/src/libvaladoc/content/tablecell.vala
+++ b/src/libvaladoc/content/tablecell.vala
@@ -1,6 +1,7 @@
 /* tablecell.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,9 +37,9 @@ public class Valadoc.Content.TableCell : InlineContent, StyleAttributes {
                _rowspan = 1;
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // Check inline content
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/content/tablerow.vala b/src/libvaladoc/content/tablerow.vala
index 943c95f646d5faa76750b148ba9b4d1925eb8f0b..5cd59fd4bb9542adf88bfd3b3c85549a4845616c 100755 (executable)
--- a/src/libvaladoc/content/tablerow.vala
+++ b/src/libvaladoc/content/tablerow.vala
@@ -1,6 +1,7 @@
 /* tablerow.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -33,10 +34,10 @@ public class Valadoc.Content.TableRow : ContentElement {
                _cells = new ArrayList<TableCell> ();
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // Check individual cells
                foreach (var cell in _cells) {
-                       cell.check (api_root, container, reporter, settings);
+                       cell.check (api_root, container, file_path, reporter, settings);
                }
        }
 

diff --git a/src/libvaladoc/content/text.vala b/src/libvaladoc/content/text.vala
index 2b147235d52a41c49ac24e7be1a47fcb37f88a0f..6d3877e87e0100e5bda7976228099c293f4f7d2f 100755 (executable)
--- a/src/libvaladoc/content/text.vala
+++ b/src/libvaladoc/content/text.vala
@@ -1,6 +1,7 @@
 /* text.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,7 +37,7 @@ public class Valadoc.Content.Text : ContentElement, Inline {
                }
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/content/warning.vala b/src/libvaladoc/content/warning.vala
index e848c43f3068c3b25e55a8e033b97ec752b1594e..3ab9b3c7365d24e0978a9d3234af70efd7c0927b 100755 (executable)
--- a/src/libvaladoc/content/warning.vala
+++ b/src/libvaladoc/content/warning.vala
@@ -1,6 +1,7 @@
 /* warning.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,9 +29,9 @@ public class Valadoc.Content.Warning : BlockContent, Block {
                base ();
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // Check inline content
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/content/wikilink.vala b/src/libvaladoc/content/wikilink.vala
index e88bc18f7198bc7cf9f9f40f4ded7bb89f8cdd45..e08719f6ab27475e49bce6a79e1e0203c0054570 100755 (executable)
--- a/src/libvaladoc/content/wikilink.vala
+++ b/src/libvaladoc/content/wikilink.vala
@@ -1,6 +1,7 @@
 /* link.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -34,7 +35,7 @@ public class Valadoc.Content.WikiLink : InlineContent, Inline {
        public override void configure (Settings settings, ResourceLocator locator) {
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                page = api_root.wikitree.search (name);
                if (page == null) {
                        reporter.simple_warning ("%s does not exist".printf (name));

diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index f4a9667cd1e0e29d6d97462a78561abccca0eb19..5fa736a5a6096c46bf09f42a78d8d326a0775467 100755 (executable)
--- a/src/libvaladoc/documentation/documentationparser.vala
+++ b/src/libvaladoc/documentation/documentationparser.vala
@@ -1,6 +1,7 @@
 /* documentationparser.vala
  *
- * Copyright (C) 2008-2011 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -76,7 +77,7 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
        public Comment? parse_comment_str (Api.Node element, string content, string filename, int first_line, int first_column) {
                try {
                        Comment doc_comment = parse_comment (content, filename, first_line, first_column);
-                       doc_comment.check (_tree, element, _reporter, _settings);
+                       doc_comment.check (_tree, element, filename, _reporter, _settings);
                        return doc_comment;
                } catch (ParserError error) {
                        return null;
@@ -94,7 +95,7 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
 
                try {
                        Page documentation = parse_wiki (page.documentation_str, page.get_filename ());
-                       documentation.check (_tree, pkg, _reporter, _settings);
+                       documentation.check (_tree, pkg, page.path, _reporter, _settings);
                        return documentation;
                } catch (ParserError error) {
                        return null;

diff --git a/src/libvaladoc/documentation/gtkdoccommentparser.vala b/src/libvaladoc/documentation/gtkdoccommentparser.vala
index 574e65fabb2c0919bbd1cd6df35d15289f7cf5fd..b1486069d4f945d525733c637455ae388af17ef6 100644 (file)
--- a/src/libvaladoc/documentation/gtkdoccommentparser.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentparser.vala
@@ -1,6 +1,6 @@
 /* gtkcommentparser.vala
  *
- * Copyright (C) 2011  Florian Brosch
+ * Copyright (C) 2011-2012  Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -260,7 +260,7 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
                        first = false;
                }
 
-               comment.check (tree, element, reporter, settings);
+               comment.check (tree, element, gir_comment.file.relative_path, reporter, settings);
                return comment;
        }
 

diff --git a/src/libvaladoc/taglets/tagletdeprecated.vala b/src/libvaladoc/taglets/tagletdeprecated.vala
index f51adc174fae305557acb6d0105a457dc5f8d37a..468f6ec55f15dc5d0371c3d5f672347e3ede9e7a 100755 (executable)
--- a/src/libvaladoc/taglets/tagletdeprecated.vala
+++ b/src/libvaladoc/taglets/tagletdeprecated.vala
@@ -1,6 +1,7 @@
 /* tagletdeprecated.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,8 +29,8 @@ public class Valadoc.Taglets.Deprecated : InlineContent, Taglet, Block {
                return run_rule;
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
-               base.check (api_root, container, reporter, settings);
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/taglets/tagletinheritdoc.vala b/src/libvaladoc/taglets/tagletinheritdoc.vala
index 329db68696ca2aaea7a6674843611a395b1e144f..653a448a10f31927ca5e5df137f0a694a08900fc 100755 (executable)
--- a/src/libvaladoc/taglets/tagletinheritdoc.vala
+++ b/src/libvaladoc/taglets/tagletinheritdoc.vala
@@ -1,6 +1,7 @@
 /* tagletinheritdoc.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,7 +31,7 @@ public class Valadoc.Taglets.InheritDoc : InlineTaglet {
                return null;
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // TODO Check that the container is an override of an abstract symbol
                // Also retrieve that abstract symbol _inherited
 

diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala
index 3ebb6de3eb692bfc9a641c7157ea1f9430d3e689..cbe8dc499e0e2dabac22d20e4df512e09531a538 100755 (executable)
--- a/src/libvaladoc/taglets/tagletlink.vala
+++ b/src/libvaladoc/taglets/tagletlink.vala
@@ -1,6 +1,7 @@
 /* taglet.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -50,7 +51,7 @@ public class Valadoc.Taglets.Link : InlineTaglet {
                });
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                if (symbol_name.has_prefix ("c::")) {
                        _symbol_name = _symbol_name.substring (3);
                        _symbol = api_root.search_symbol_cstr (container, symbol_name);
@@ -75,7 +76,7 @@ public class Valadoc.Taglets.Link : InlineTaglet {
                        reporter.simple_warning ("%s: %s does not exist", container.get_full_name (), symbol_name);
                }
 
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override ContentElement produce_content () {

diff --git a/src/libvaladoc/taglets/tagletparam.vala b/src/libvaladoc/taglets/tagletparam.vala
index 6dfb235ef2208d8363f68dedde56dcded10cca81..bbff4030b54b8480aab269851e0004c7aa7e5f12 100755 (executable)
--- a/src/libvaladoc/taglets/tagletparam.vala
+++ b/src/libvaladoc/taglets/tagletparam.vala
@@ -1,6 +1,7 @@
 /* taglet.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -40,7 +41,7 @@ public class Valadoc.Taglets.Param : InlineContent, Taglet, Block {
        }
 
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // Check for the existence of such a parameter
                this.parameter = null;
 
@@ -72,7 +73,7 @@ public class Valadoc.Taglets.Param : InlineContent, Taglet, Block {
                        reporter.simple_warning ("%s: Unknown parameter `%s'", container.get_full_name (), parameter_name);
                }
 
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/taglets/tagletreturn.vala b/src/libvaladoc/taglets/tagletreturn.vala
index a4beee0c6a4f0c49798fc65f4cd7b3dac4cf9487..5a2797737cfeaca5fc0cbe6ed90509f060beb071 100755 (executable)
--- a/src/libvaladoc/taglets/tagletreturn.vala
+++ b/src/libvaladoc/taglets/tagletreturn.vala
@@ -1,6 +1,7 @@
 /* taglet.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,10 +30,10 @@ public class Valadoc.Taglets.Return : InlineContent, Taglet, Block {
                return run_rule;
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                // TODO check for the existence of a return type
 
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/taglets/tagletsee.vala b/src/libvaladoc/taglets/tagletsee.vala
index 68ed636ed65cec28838a99afae5167f10269c776..895e3c2a22d7a9f92e6af7ecfa5c397941a105ba 100755 (executable)
--- a/src/libvaladoc/taglets/tagletsee.vala
+++ b/src/libvaladoc/taglets/tagletsee.vala
@@ -1,6 +1,7 @@
 /* tagletsee.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -38,7 +39,7 @@ public class Valadoc.Taglets.See : ContentElement, Taglet, Block {
                });
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                if (symbol_name.has_prefix ("c::")) {
                        symbol_name = symbol_name.substring (3);
                        symbol = api_root.search_symbol_cstr (container, symbol_name);

diff --git a/src/libvaladoc/taglets/tagletsince.vala b/src/libvaladoc/taglets/tagletsince.vala
index 5b68ecfe828731f6ee0f72668be7b85a7fa57424..49acafbc0d8958199db340e83fde079a890e7c40 100755 (executable)
--- a/src/libvaladoc/taglets/tagletsince.vala
+++ b/src/libvaladoc/taglets/tagletsince.vala
@@ -1,6 +1,7 @@
 /* tagletsince.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -37,7 +38,7 @@ public class Valadoc.Taglets.Since : ContentElement, Taglet, Block {
                });
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
        }
 
        public override void accept (ContentVisitor visitor) {

diff --git a/src/libvaladoc/taglets/tagletthrows.vala b/src/libvaladoc/taglets/tagletthrows.vala
index b592f6ca1e76c725a3108e30ef2172843c054822..547fbc7ca6ed254a93f8425d92424368191febc4 100755 (executable)
--- a/src/libvaladoc/taglets/tagletthrows.vala
+++ b/src/libvaladoc/taglets/tagletthrows.vala
@@ -1,6 +1,7 @@
 /* tagletthrows.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -35,14 +36,14 @@ public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block {
                });
        }
 
-       public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+       public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
                error_domain = api_root.search_symbol_str (container, error_domain_name);
                if (error_domain == null) {
                        // TODO use ContentElement's source reference
                        reporter.simple_error ("%s does not exist", error_domain_name);
                }
 
-               base.check (api_root, container, reporter, settings);
+               base.check (api_root, container, file_path, reporter, settings);
        }
 
        public override void accept (ContentVisitor visitor) {