Solving bug of error resolution "ul ol+li{fill:#000000;font-family:ZW…

Source/External/ExCSS/Model/Enumerations.cs

@@ -124,7 +124,8 @@ internal enum GrammarSegment
         Colon,
         Comma,
         Semicolon,
-        Whitespace
+        Whitespace,
+        PlusSign
     }
 
     public enum RuleType

Source/External/ExCSS/Model/Values/TermList.cs

@@ -52,6 +52,11 @@ public void AddSeparator(TermSeparator termSeparator)
                         AddSeparator(GrammarSegment.Whitespace);
                         break;
                     }
+                case (TermSeparator.PlusSign):
+                    {
+                        AddSeparator(GrammarSegment.PlusSign);
+                        break;
+                    }
             }
         }
 
@@ -103,6 +108,10 @@ public override string ToString()
                         builder.Append(",");
                         break;
 
+                    case GrammarSegment.PlusSign:
+                        builder.Append("+");
+                        break;
+
                     default:
                         throw new NotImplementedException();
                 }
@@ -117,7 +126,8 @@ public override string ToString()
         public enum TermSeparator
         {
             Comma,
-            Space
+            Space,
+            PlusSign
         }
 
         internal void SetLastTerm(Term term)

Source/External/ExCSS/Parser.Blocks.cs

@@ -534,6 +534,11 @@ private bool ParseValueDelimiter(DelimiterBlock token)
                     _isFraction = true;
                     return true;
 
+                case Specification.PlusSign:
+                    _terms.AddSeparator(TermList.TermSeparator.PlusSign);
+                    SetParsingContext(ParsingContext.InValuePool);
+                    return true;
+
                 default:
                     return false;
             }

Source/Svg.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp2.2;net35;net452;net472</TargetFrameworks>
     <PackageLicenseExpression>MS-PL</PackageLicenseExpression>
@@ -78,12 +78,12 @@
     <Title>Svg for .Net Core 2.2</Title>
     <DefineConstants>$(DefineConstants);NETCORE;NETCORE22</DefineConstants>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <Title>Svg for .Net Standard 2.0</Title>
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD20</DefineConstants>
   </PropertyGroup>
-  
+
   <ItemGroup Condition="'$(TargetFramework)'=='net35'">
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -140,12 +140,12 @@
   </ItemGroup>
 
   <!-- Mac specific include -->
-  
+
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
     <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
   </ItemGroup>
- 
-  
+
+
   <ItemGroup>
     <Compile Remove=".\External\ExCSS\Parser.generated.cs" />
     <Compile Remove=".\External\ExCSS\ParserX.cs" />

Source/SvgDocument.cs

@@ -27,6 +27,8 @@ public class SvgDocument : SvgFragment, ITypeDescriptorContext
         private SvgElementIdManager _idManager;
 
         private Dictionary<string, IEnumerable<SvgFontFace>> _fontDefns = null;
+        private PrivateFontCollection _privateFonts = null;
+        private IList<FontFaceRule> _fontFaceDirectives = null;
 
         private static int GetSystemDpi()
         {
@@ -36,7 +38,7 @@ private static int GetSystemDpi()
             isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 #else
             var platform = Environment.OSVersion.Platform;
-            isWindows = platform == PlatformID.Win32NT; 
+            isWindows = platform == PlatformID.Win32NT;
 #endif
 
             if (isWindows)
@@ -74,6 +76,33 @@ group f by f.FontFamily into family
             }
             return _fontDefns;
         }
+        internal FontFamily[] PrivateFontDefns()
+        {
+            if (_privateFonts == null)
+            {
+                _privateFonts = new PrivateFontCollection();
+                if (_fontFaceDirectives != null)
+                {
+                    foreach (var item in _fontFaceDirectives)
+                    {
+                        try
+                        {
+                            var bytes = downBytes(item.Src, this.BaseUri);
+
+                            IntPtr MeAdd = Marshal.AllocHGlobal(bytes.Length);
+                            Marshal.Copy(bytes, 0, MeAdd, bytes.Length);
+                            _privateFonts.AddMemoryFont(MeAdd, bytes.Length);
+                        }
+                        catch (Exception ex)
+                        {
+                            Trace.TraceWarning(ex.Message);
+                        }
+                    }
+                }
+            }
+            return _privateFonts.Families;
+        }
+
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SvgDocument"/> class.
@@ -182,15 +211,15 @@ public virtual TSvgElement GetElementById<TSvgElement>(string id) where TSvgElem
         /// <returns>Boolean whether the system is capable of using GDI+</returns>
         public static bool SystemIsGdiPlusCapable()
         {
-            try 
+            try
             {
                 EnsureSystemIsGdiPlusCapable();
             }
-            catch(SvgGdiPlusCannotBeLoadedException)
+            catch (SvgGdiPlusCannotBeLoadedException)
             {
                 return false;
             }
-            catch(Exception)
+            catch (Exception)
             {
                 //If somehow another type of exception is raised by the ensure function we will let it bubble up, since that might indicate other issues/problems
                 throw;
@@ -218,7 +247,7 @@ public static void EnsureSystemIsGdiPlusCapable()
                     throw new SvgGdiPlusCannotBeLoadedException(e);
                 }
                 //If the Matrix creation is causing another type of exception we should just raise that one
-                throw;   
+                throw;
             }
         }
 
@@ -482,12 +511,21 @@ public static SvgDocument Open(string path)
                         }
                     }
                 }
+
+                svgDocument._fontFaceDirectives = sheet.FontFaceDirectives;
             }
 
             svgDocument?.FlushStyles(true);
             return svgDocument;
         }
-
+        private static byte[] downBytes(string url, Uri baseUri)
+        {
+            var urlString = Utility.GetUrlString(url);
+            var uri = new Uri(urlString, UriKind.RelativeOrAbsolute);
+            if (!uri.IsAbsoluteUri && baseUri != null)
+                uri = new Uri(baseUri, uri);
+            return Utility.GetBytesFromUri(uri)?.DataBytes;
+        }
         /// <summary>
         /// Opens an SVG document from the specified <see cref="XmlDocument"/>.
         /// </summary>