From: Didier 'Ptitjes <ptitjes@free.fr>
Date: Thu, 15 Oct 2009 16:44:32 +0000 (+0200)
Subject: Content: Rename Highlighted to Run and prepare it for signatures
X-Git-Tag: 0.37.1~3^2~566
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=388635919840eb66b2efd6e52b074498f4771901;p=thirdparty%2Fvala.git

Content: Rename Highlighted to Run and prepare it for signatures
---

diff --git a/src/doclets/htmlhelpers/doclet/htmlrenderer.vala b/src/doclets/htmlhelpers/doclet/htmlrenderer.vala
index 50283a887..461b1d2bd 100755
--- a/src/doclets/htmlhelpers/doclet/htmlrenderer.vala
+++ b/src/doclets/htmlhelpers/doclet/htmlrenderer.vala
@@ -171,34 +171,6 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
 		_stream.printf ("</h%d>", element.level);
 	}
 
-	public override void visit_highlighted (Highlighted element) {
-		string tag = null;
-		switch (element.style) {
-		case Highlighted.Style.BOLD:
-			tag = "b";
-			break;
-		case Highlighted.Style.ITALIC:
-			tag = "i";
-			break;
-		case Highlighted.Style.UNDERLINED:
-			tag = "u";
-			break;
-		case Highlighted.Style.MONOSPACED:
-			tag = "code";
-			break;
-		case Highlighted.Style.STROKE:
-			tag = "stroke";
-			break;
-		}
-		if (tag != null) {
-			_stream.printf ("<%s>", tag);
-		}
-		element.accept_children (this);
-		if (tag != null) {
-			_stream.printf ("</%s>", tag);
-		}
-	}
-
 	public override void visit_link (Link element) {
 		var label = element.label;
 		_stream.printf ("<a href=\"%s\">%s</a>",
@@ -226,6 +198,34 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
 		_stream.printf ("</p>");
 	}
 
+	public override void visit_run (Run element) {
+		string tag = null;
+		switch (element.style) {
+		case Run.Style.BOLD:
+			tag = "b";
+			break;
+		case Run.Style.ITALIC:
+			tag = "i";
+			break;
+		case Run.Style.UNDERLINED:
+			tag = "u";
+			break;
+		case Run.Style.MONOSPACED:
+			tag = "code";
+			break;
+		case Run.Style.STROKE:
+			tag = "stroke";
+			break;
+		}
+		if (tag != null) {
+			_stream.printf ("<%s>", tag);
+		}
+		element.accept_children (this);
+		if (tag != null) {
+			_stream.printf ("</%s>", tag);
+		}
+	}
+
 	public override void visit_source_code (SourceCode element) {
 		_stream.printf ("<pre>");
 		_stream.printf (element.code);
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 76e2cdf58..e2f3e85d2 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -89,7 +89,6 @@ libvaladoc_la_VALASOURCES = \
 	content/contentvisitor.vala \
 	content/embedded.vala \
 	content/headline.vala \
-	content/highlighted.vala \
 	content/inline.vala \
 	content/inlinetaglet.vala \
 	content/inlinecontent.vala \
@@ -99,6 +98,7 @@ libvaladoc_la_VALASOURCES = \
 	content/page.vala \
 	content/paragraph.vala \
 	content/resourcelocator.vala \
+	content/run.vala \
 	content/sourcecode.vala \
 	content/styleattributes.vala \
 	content/symbollink.vala \
diff --git a/src/libvaladoc/content/contentfactory.vala b/src/libvaladoc/content/contentfactory.vala
index 2d83333d0..9d7c156d9 100755
--- a/src/libvaladoc/content/contentfactory.vala
+++ b/src/libvaladoc/content/contentfactory.vala
@@ -53,10 +53,6 @@ public class Valadoc.Content.ContentFactory : Object {
 		return (Headline) configure (new Headline ());
 	}
 
-	public Highlighted create_highlighted (Highlighted.Style style) {
-		return (Highlighted) configure (new Highlighted (style));
-	}
-
 	public Link create_link () {
 		return (Link) configure (new Link ());
 	}
@@ -77,6 +73,10 @@ public class Valadoc.Content.ContentFactory : Object {
 		return (Paragraph) configure (new Paragraph ());
 	}
 
+	public Run create_run (Run.Style style) {
+		return (Run) configure (new Run (style));
+	}
+
 	public SourceCode create_source_code () {
 		return (SourceCode) configure (new SourceCode ());
 	}
diff --git a/src/libvaladoc/content/contentvisitor.vala b/src/libvaladoc/content/contentvisitor.vala
index 2fb2fcc59..0fff17b88 100755
--- a/src/libvaladoc/content/contentvisitor.vala
+++ b/src/libvaladoc/content/contentvisitor.vala
@@ -35,9 +35,6 @@ public abstract class Valadoc.Content.ContentVisitor : Object {
 	public virtual void visit_headline (Headline element) {
 	}
 
-	public virtual void visit_highlighted (Highlighted element) {
-	}
-
 	public virtual void visit_link (Link element) {
 	}
 
@@ -56,6 +53,9 @@ public abstract class Valadoc.Content.ContentVisitor : Object {
 	public virtual void visit_page (Page element) {
 	}
 
+	public virtual void visit_run (Run element) {
+	}
+
 	public virtual void visit_source_code (SourceCode element) {
 	}
 
diff --git a/src/libvaladoc/content/highlighted.vala b/src/libvaladoc/content/run.vala
similarity index 87%
rename from src/libvaladoc/content/highlighted.vala
rename to src/libvaladoc/content/run.vala
index 3e4576a06..1728396c7 100755
--- a/src/libvaladoc/content/highlighted.vala
+++ b/src/libvaladoc/content/run.vala
@@ -1,4 +1,4 @@
-/* highlighted.vala
+/* run.vala
  *
  * Valadoc - a documentation tool for vala.
  * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
@@ -24,19 +24,22 @@
 using GLib;
 using Gee;
 
-public class Valadoc.Content.Highlighted : InlineContent, Inline {
+public class Valadoc.Content.Run : InlineContent, Inline {
 	public enum Style {
 		NONE,
 		BOLD,
 		ITALIC,
 		UNDERLINED,
 		MONOSPACED,
-		STROKE
+		STROKE,
+		LANG_KEYWORD,
+		LANG_LITERAL,
+		LANG_TYPE
 	}
 
 	public Style style { get; set; }
 
-	internal Highlighted (Style style) {
+	internal Run (Style style) {
 		base ();
 		_style = style;
 	}
@@ -47,6 +50,6 @@ public class Valadoc.Content.Highlighted : InlineContent, Inline {
 	}
 
 	public override void accept (ContentVisitor visitor) {
-		visitor.visit_highlighted (this);
+		visitor.visit_run (this);
 	}
 }
diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index 29144e5e8..68fd2fa3b 100644
--- a/src/libvaladoc/documentation/documentationparser.vala
+++ b/src/libvaladoc/documentation/documentationparser.vala
@@ -206,19 +206,19 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
 		Rule bold =
 			Rule.seq ({ TokenType.SINGLE_QUOTE_2, run, TokenType.SINGLE_QUOTE_2 })
 				.set_name ("Bold")
-				.set_start (() => { push (_factory.create_highlighted (Highlighted.Style.BOLD)); });
+				.set_start (() => { push (_factory.create_run (Run.Style.BOLD)); });
 		Rule italic =
 			Rule.seq ({ TokenType.SLASH_2, run, TokenType.SLASH_2 })
 				.set_name ("Italic")
-				.set_start (() => { push (_factory.create_highlighted (Highlighted.Style.ITALIC)); });
+				.set_start (() => { push (_factory.create_run (Run.Style.ITALIC)); });
 		Rule underlined =
 			Rule.seq ({ TokenType.UNDERSCORE_2, run, TokenType.UNDERSCORE_2 })
 				.set_name ("Underlined")
-				.set_start (() => { push (_factory.create_highlighted (Highlighted.Style.UNDERLINED)); });
+				.set_start (() => { push (_factory.create_run (Run.Style.UNDERLINED)); });
 		Rule monospace =
 			Rule.seq ({ TokenType.BACK_QUOTE, run, TokenType.BACK_QUOTE })
 				.set_name ("Monospace")
-				.set_start (() => { push (_factory.create_highlighted (Highlighted.Style.MONOSPACED)); });
+				.set_start (() => { push (_factory.create_run (Run.Style.MONOSPACED)); });
 
 		Rule embedded =
 			Rule.seq ({
diff --git a/src/libvaladoc/taglets/tagletinheritdoc.vala b/src/libvaladoc/taglets/tagletinheritdoc.vala
index 9280a51c6..cc1371a10 100755
--- a/src/libvaladoc/taglets/tagletinheritdoc.vala
+++ b/src/libvaladoc/taglets/tagletinheritdoc.vala
@@ -53,7 +53,7 @@ public class Valadoc.Taglets.InheritDoc : InlineTaglet {
 		if (_inherited != null) {
 			Paragraph inherited_paragraph = _inherited.documentation.content.get (0) as Paragraph;
 
-			Highlighted paragraph = new Highlighted (Highlighted.Style.NONE);
+			Run paragraph = new Run (Run.Style.NONE);
 			foreach (var element in inherited_paragraph.content) {
 				paragraph.content.add (element);
 			}