Implements #93

Author: FransBouma

src/DocNet/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Docnet")]
-[assembly: AssemblyCopyright("Copyright ©2023 Frans Bouma")]
+[assembly: AssemblyCopyright("Copyright ©2025 Frans Bouma")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.16.6.0")]
-[assembly: AssemblyFileVersion("0.16.6")]
+[assembly: AssemblyVersion("0.16.7.0")]
+[assembly: AssemblyFileVersion("0.16.7")]

src/MarkdownDeep/Block.cs

@@ -61,6 +61,8 @@ internal enum BlockType
 		alert,			// Data is the alert type specified.
 		tab,			// Data is the tab header text.
 		tabs,			// children are the tabs.
+		font_awesome_brands,		// data is icon name
+		font_awesome_solid,		// data is icon name
 	}
 
 	class Block
@@ -395,6 +397,22 @@ internal void Render(Markdown m, StringBuilder b)
 						b.Append("\"></i>");
 					}
 					break;
+				case BlockType.font_awesome_brands:
+					if(m.DocNetMode)
+					{
+						b.Append("<i class=\"fa-brands fa-");
+						b.Append(this.Data as string ?? string.Empty);
+						b.Append("\"></i>");
+					}
+					break;
+				case BlockType.font_awesome_solid:
+					if(m.DocNetMode)
+					{
+						b.Append("<i class=\"fa-solid fa-");
+						b.Append(this.Data as string ?? string.Empty);
+						b.Append("\"></i>");
+					}
+					break;
 				case BlockType.alert:
 					if(m.DocNetMode)
 					{

src/MarkdownDeep/BlockProcessor.cs

@@ -1271,7 +1271,15 @@ private bool HandleDocNetExtension(Block b)
 			var initialStart = this.Position;
 			if(DoesMatch("@fa-"))
 			{
-				return HandleFontAwesomeExtension(b);
+				return HandleFontAwesomeExtension(b, BlockType.font_awesome);
+			}
+			if(DoesMatch("@fabrands-"))
+			{
+				return HandleFontAwesomeExtension(b, BlockType.font_awesome_brands);
+			}
+			if(DoesMatch("@fasolid-"))
+			{
+				return HandleFontAwesomeExtension(b, BlockType.font_awesome_solid);
 			}
 			// first match @tabs, and then @tab, as both are handled by this processor.
 			if(DoesMatch("@tabs"))
@@ -1553,7 +1561,7 @@ private bool HandleSnippetExtension(Block b)
         /// </summary>
         /// <param name="b">The b.</param>
         /// <returns></returns>
-        private bool HandleFontAwesomeExtension(Block b)
+        private bool HandleFontAwesomeExtension(Block b, BlockType typeofBlock = BlockType.font_awesome)
 		{
 			string iconName = string.Empty;
 			int newPosition = this.Position;
@@ -1562,7 +1570,7 @@ private bool HandleFontAwesomeExtension(Block b)
 				return false;
 			}
 			this.Position = newPosition;
-			b.BlockType = BlockType.font_awesome;
+			b.BlockType = typeofBlock;
 			b.Data = iconName;
 			return true;
 		}

src/MarkdownDeep/SpanFormatter.cs

@@ -267,6 +267,18 @@ private void Render(StringBuilder sb, string str)
 						sb.Append(str, t.startOffset, t.length);
 						sb.Append("\"></i>");
 						break;
+					
+					case TokenType.font_awesome_brands:
+						sb.Append("<i class=\"fa-brands fa-");
+						sb.Append(str, t.startOffset, t.length);
+						sb.Append("\"></i>");
+						break;
+
+					case TokenType.font_awesome_solid:
+						sb.Append("<i class=\"fa-solid fa-");
+						sb.Append(str, t.startOffset, t.length);
+						sb.Append("\"></i>");
+						break;
 				}
 
 				FreeToken(t);
@@ -489,6 +501,30 @@ public void Tokenize(string str, int start, int len)
 									this.Position = newPosition;
 								}
 							}
+							if(this.DoesMatch("@fabrands-"))
+							{
+								// expect FontAwesome brands v6.
+								string iconName = string.Empty;
+								int newPosition = 0;
+								if(Utils.SkipFontAwesome(this.Input, this.Position, out newPosition, out iconName))
+								{
+									// token should be just the iconname, so adjust position specification to that.
+									token = CreateToken(TokenType.font_awesome_brands, newPosition - iconName.Length, iconName.Length);
+									this.Position = newPosition;
+								}
+							}
+							if(this.DoesMatch("@fasolid-"))
+							{
+								// expect FontAwesome solid v6.
+								string iconName = string.Empty;
+								int newPosition = 0;
+								if(Utils.SkipFontAwesome(this.Input, this.Position, out newPosition, out iconName))
+								{
+									// token should be just the iconname, so adjust position specification to that.
+									token = CreateToken(TokenType.font_awesome_solid, newPosition - iconName.Length, iconName.Length);
+									this.Position = newPosition;
+								}
+							}
 						}
 						break;
 				}

src/MarkdownDeep/Token.cs

@@ -55,6 +55,8 @@ internal enum TokenType
 
 		// DocNet Extensions
 		font_awesome,	// <i class="fa fa-name"></i>
+		font_awesome_brands,	// <i class="fa-brands fa-name"></i>
+		font_awesome_solid,		// <i class="fa-solid fa-name"></i>
 	}
 
 	// Token

src/MarkdownDeep/Utils.cs

@@ -562,12 +562,11 @@ public static bool SkipFontAwesome(string str, int currentPos, out int newPos, o
 			var scanner = new StringScanner(str, currentPos);
 			// skip '@'
 			scanner.SkipForward(1);
-			if(!scanner.DoesMatch("fa-"))
+			if(!MatchAnyAndSkip(scanner, new List<string>() { "fa-", "fabrands-", "fasolid-" }))
 			{
-				// not a font awesome specification
+				// nothing matches
 				return false;
 			}
-			scanner.SkipForward(3);
 			iconName = string.Empty;
 			if(!scanner.SkipIdentifier(ref iconName, dashIsValidChar:true))
 			{
@@ -582,5 +581,33 @@ public static bool SkipFontAwesome(string str, int currentPos, out int newPos, o
 			newPos = scanner.Position;
 			return true;
 		}
+
+
+		/// <summary>
+		/// Tries to match any of the strings passed in at the current scanner position. If matched it'll skip the matched string on the scanner and return true,
+		/// otherwise it won't skip and false
+		/// </summary>
+		/// <param name="scanner"></param>
+		/// <param name="toMatch"></param>
+		/// <returns></returns>
+		private static bool MatchAnyAndSkip(StringScanner scanner, List<string> toMatch)
+		{
+			int toSkip = 0;
+			foreach(string s in toMatch)
+			{
+				if(scanner.DoesMatch(s))
+				{
+					toSkip = s.Length;
+					break;
+				}
+			}
+
+			if(toSkip == 0)
+			{
+				return false;
+			}
+			scanner.SkipForward(toSkip);
+			return true;
+		}
 	}
 }

src/MarkdownDeepTests/testfiles/docnetmode/FontAwesome(DocNetMode).html

@@ -6,6 +6,10 @@
 
 <i class="fa fa-arrow-right"></i><i class="fa fa-arrow-right"></i><i class="fa fa-arrow-right"></i><i class="fa fa-arrow-right"></i>
 
+<i class="fa-solid fa-arrow-right"></i><i class="fa-solid fa-arrow-right"></i><i class="fa-solid fa-arrow-right"></i><i class="fa-solid fa-arrow-right"></i><p>a <i class="fa-solid fa-arrow-right"></i></p>
+
 <i class="fa fa-github"></i><i class="fa fa-github"></i><i class="fa fa-github"></i><p>a <i class="fa fa-github"></i></p>
 
+<i class="fa-brands fa-github"></i><i class="fa-brands fa-github"></i><i class="fa-brands fa-github"></i><p>a <i class="fa-brands fa-github"></i></p>
+
 <p>post</p>

src/MarkdownDeepTests/testfiles/docnetmode/FontAwesome(DocNetMode).txt

@@ -12,11 +12,29 @@ this is a @fa-arrow-right right arrow!
 
    @fa-arrow-right	@fa-arrow-right
 
+@fasolid-arrow-right
+
+ @fasolid-arrow-right
+
+   @fasolid-arrow-right
+
+   @fasolid-arrow-right	@fasolid-arrow-right
+
+a @fasolid-arrow-right
+
 @fa-github
 
  @fa-github
   @fa-github
 
 a @fa-github
+
+@fabrands-github
+
+ @fabrands-github
+  @fabrands-github
+
+a @fabrands-github
+
 
 post