Skip to content

Commit

Permalink
Restore old "IsImplicitEnd" for "P" tag when "DisableBehaviorTagP = f…
Browse files Browse the repository at this point in the history 
…alse"
  • Loading branch information
@JonathanMagnan
JonathanMagnan committed Mar 18, 2019
1 parent c0ed830 commit d2e7582
Show file tree
Hide file tree
Showing 12 changed files with 60 additions and 52 deletions.
2 changes: 1 addition & 1 deletion src/HtmlAgilityPack.NETStandard1_3/HtmlAgilityPack.NETStandard1_3.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<PackageId>HtmlAgilityPack</PackageId>
<Version>1.10.1</Version>
<Version>1.10.2</Version>
<Authors>ZZZ Projects Inc.</Authors>
<Company>ZZZ Projects Inc.</Company>
<Product>Html Agility Pack</Product>
Expand Down
2 changes: 1 addition & 1 deletion src/HtmlAgilityPack.NETStandard2_0/HtmlAgilityPack.NETStandard2_0.csproj
View file
Expand Up @@ -12,7 +12,7 @@
<AssemblyName>HtmlAgilityPack</AssemblyName>
<RootNamespace>HtmlAgilityPack</RootNamespace>
<PackageId>HtmlAgilityPack</PackageId>
<Version>1.10.1</Version>
<Version>1.10.2</Version>
<Authors>ZZZ Projects Inc.</Authors>
<Company>ZZZ Projects Inc.</Company>
<Product>Html Agility Pack</Product>
Expand Down
6 changes: 3 additions & 3 deletions src/HtmlAgilityPack.Net20/Properties/AssemblyInfo.cs
View file
Expand Up @@ -26,10 +26,10 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(true)]
[assembly: Guid("643622ea-d2aa-4572-a2b2-6202b7fcd83f")]
[assembly: AssemblyVersion("1.10.1")]
[assembly: AssemblyVersion("1.10.2")]
#if !PocketPC
[assembly: AssemblyFileVersion("1.10.1")]
[assembly: AssemblyInformationalVersion("1.10.1")]
[assembly: AssemblyFileVersion("1.10.2")]
[assembly: AssemblyInformationalVersion("1.10.2")]
#if !SILVERLIGHT
[assembly: AllowPartiallyTrustedCallers]
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/HtmlAgilityPack.Net40-client/Properties/AssemblyInfo.cs
View file
Expand Up @@ -26,10 +26,10 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(true)]
[assembly: Guid("643622ea-d2aa-4572-a2b2-6202b7fcd83f")]
[assembly: AssemblyVersion("1.10.1")]
[assembly: AssemblyVersion("1.10.2")]
#if !PocketPC
[assembly: AssemblyFileVersion("1.10.1")]
[assembly: AssemblyInformationalVersion("1.10.1")]
[assembly: AssemblyFileVersion("1.10.2")]
[assembly: AssemblyInformationalVersion("1.10.2")]
#if !SILVERLIGHT
[assembly: AllowPartiallyTrustedCallers]
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/HtmlAgilityPack.Net40/Properties/AssemblyInfo.cs
View file
Expand Up @@ -26,10 +26,10 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(true)]
[assembly: Guid("643622ea-d2aa-4572-a2b2-6202b7fcd83f")]
[assembly: AssemblyVersion("1.10.1")]
[assembly: AssemblyVersion("1.10.2")]
#if !PocketPC
[assembly: AssemblyFileVersion("1.10.1")]
[assembly: AssemblyInformationalVersion("1.10.1")]
[assembly: AssemblyFileVersion("1.10.2")]
[assembly: AssemblyInformationalVersion("1.10.2")]
#if !SILVERLIGHT
[assembly: AllowPartiallyTrustedCallers]
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/HtmlAgilityPack.Net45/Properties/AssemblyInfo.cs
View file
Expand Up @@ -26,10 +26,10 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(true)]
[assembly: Guid("643622ea-d2aa-4572-a2b2-6202b7fcd83f")]
[assembly: AssemblyVersion("1.10.1")]
[assembly: AssemblyVersion("1.10.2")]
#if !PocketPC
[assembly: AssemblyFileVersion("1.10.1")]
[assembly: AssemblyInformationalVersion("1.10.1")]
[assembly: AssemblyFileVersion("1.10.2")]
[assembly: AssemblyInformationalVersion("1.10.2")]
#if !SILVERLIGHT
[assembly: AllowPartiallyTrustedCallers]
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/HtmlAgilityPack.NetCore45/Properties/AssemblyInfo.cs
View file
Expand Up @@ -26,10 +26,10 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(true)]
[assembly: Guid("643622ea-d2aa-4572-a2b2-6202b7fcd83f")]
[assembly: AssemblyVersion("1.10.1")]
[assembly: AssemblyVersion("1.10.2")]
#if !PocketPC
[assembly: AssemblyFileVersion("1.10.1")]
[assembly: AssemblyInformationalVersion("1.10.1")]
[assembly: AssemblyFileVersion("1.10.2")]
[assembly: AssemblyInformationalVersion("1.10.2")]
#if !SILVERLIGHT
[assembly: AllowPartiallyTrustedCallers]
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/HtmlAgilityPack.NetStandard1_6/HtmlAgilityPack.NetStandard1_6.csproj
View file
Expand Up @@ -12,7 +12,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>HtmlAgilityPack.snk</AssemblyOriginatorKeyFile>
<AssemblyName>HtmlAgilityPack</AssemblyName>
<Version>1.10.1</Version>
<Version>1.10.2</Version>
<Copyright>Copyright © ZZZ Projects Inc.</Copyright>
<Company>ZZZ Projects Inc.</Company>
<Product>Html Agility Pack</Product>
Expand Down
6 changes: 3 additions & 3 deletions src/HtmlAgilityPack.Portable-wp8/Properties/AssemblyInfo.cs
View file
Expand Up @@ -26,10 +26,10 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(true)]
[assembly: Guid("643622ea-d2aa-4572-a2b2-6202b7fcd83f")]
[assembly: AssemblyVersion("1.10.1")]
[assembly: AssemblyVersion("1.10.2")]
#if !PocketPC
[assembly: AssemblyFileVersion("1.10.1")]
[assembly: AssemblyInformationalVersion("1.10.1")]
[assembly: AssemblyFileVersion("1.10.2")]
[assembly: AssemblyInformationalVersion("1.10.2")]
#if !SILVERLIGHT
[assembly: AllowPartiallyTrustedCallers]
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/HtmlAgilityPack.Portable-wp81/Properties/AssemblyInfo.cs
View file
Expand Up @@ -26,10 +26,10 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(true)]
[assembly: Guid("643622ea-d2aa-4572-a2b2-6202b7fcd83f")]
[assembly: AssemblyVersion("1.10.1")]
[assembly: AssemblyVersion("1.10.2")]
#if !PocketPC
[assembly: AssemblyFileVersion("1.10.1")]
[assembly: AssemblyInformationalVersion("1.10.1")]
[assembly: AssemblyFileVersion("1.10.2")]
[assembly: AssemblyInformationalVersion("1.10.2")]
#if !SILVERLIGHT
[assembly: AllowPartiallyTrustedCallers]
#endif
Expand Down
60 changes: 34 additions & 26 deletions src/HtmlAgilityPack.Shared/HtmlDocument.cs
View file
Expand Up @@ -1795,32 +1795,40 @@ private bool IsParentImplicitEnd()
isImplicitEnd = nodeName == "li";
break;
case "p":
isImplicitEnd = nodeName == "address"
|| nodeName == "article"
|| nodeName == "aside"
|| nodeName == "blockquote"
|| nodeName == "dir"
|| nodeName == "div"
|| nodeName == "dl"
|| nodeName == "fieldset"
|| nodeName == "footer"
|| nodeName == "form"
|| nodeName == "h1"
|| nodeName == "h2"
|| nodeName == "h3"
|| nodeName == "h4"
|| nodeName == "h5"
|| nodeName == "h6"
|| nodeName == "header"
|| nodeName == "hr"
|| nodeName == "menu"
|| nodeName == "nav"
|| nodeName == "ol"
|| nodeName == "p"
|| nodeName == "pre"
|| nodeName == "section"
|| nodeName == "table"
|| nodeName == "ul";
if (DisableBehavaiorTagP)
{
isImplicitEnd = nodeName == "address"
|| nodeName == "article"
|| nodeName == "aside"
|| nodeName == "blockquote"
|| nodeName == "dir"
|| nodeName == "div"
|| nodeName == "dl"
|| nodeName == "fieldset"
|| nodeName == "footer"
|| nodeName == "form"
|| nodeName == "h1"
|| nodeName == "h2"
|| nodeName == "h3"
|| nodeName == "h4"
|| nodeName == "h5"
|| nodeName == "h6"
|| nodeName == "header"
|| nodeName == "hr"
|| nodeName == "menu"
|| nodeName == "nav"
|| nodeName == "ol"
|| nodeName == "p"
|| nodeName == "pre"
|| nodeName == "section"
|| nodeName == "table"
|| nodeName == "ul";
}
else
{
isImplicitEnd = nodeName == "p";
}

break;
case "option":
isImplicitEnd = nodeName == "option";
Expand Down
4 changes: 2 additions & 2 deletions src/HtmlAgilityPack.UAP10/Properties/AssemblyInfo.cs
View file
Expand Up @@ -23,6 +23,6 @@
// 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("1.10.1")]
[assembly: AssemblyFileVersion("1.10.1")]
[assembly: AssemblyVersion("1.10.2")]
[assembly: AssemblyFileVersion("1.10.2")]
[assembly: ComVisible(false)]

0 comments on commit d2e7582

Please sign in to comment.