Merge pull request #157 from lee-m/page-rules-issues

@page rule parsing fixes
TylerBrinks · Jul 6, 2023 · c85b2cb · c85b2cb
2 parents e818a49 + 86e6b73
commit c85b2cb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/ExCSS.Tests/Cases.cs b/src/ExCSS.Tests/Cases.cs
@@ -1081,5 +1081,16 @@ public void StylesheetIncludeUnknownDeclarationsWithKnownPropertyShouldNotUseUnk
 
             Assert.IsNotType<UnknownProperty>(((StyleRule)document.Rules[0]).Style.Children.First());
         }
+
+        [Theory]
+        [InlineData("@page { margin-bottom: 5pt; margin-top: 5pt }", "@page {margin-bottom: 5pt; margin-top: 5pt; }")]
+        [InlineData("@page :left { margin-bottom: 5pt; margin-top: 5pt }", "@page :left {margin-bottom: 5pt; margin-top: 5pt; }")]
+        public void PageRuleCSSOutput(string input, string expected)
+        {
+            var parser = new StylesheetParser();
+            var document = parser.Parse(input);
+
+            Assert.Equal(expected, document.ToCss());
+        }
     }
 }
diff --git a/src/ExCSS/Parser/StylesheetComposer.cs b/src/ExCSS/Parser/StylesheetComposer.cs
@@ -253,7 +253,6 @@ public Rule CreatePage(Token current)
                 // e.g. @page :left{...}
                 rule.Selector = CreatePageSelector(ref token);
                 ParseComments(ref token);
-                token = NextToken();
             }
 
             if (token.Type == TokenType.CurlyBracketOpen)
@@ -478,6 +477,9 @@ private PageSelector CreatePageSelector(ref Token token)
                 // Add the pseudo class selector
                 token = NextToken();
                 selector = token.Type == TokenType.Ident ? new PageSelector(token.Data) : new PageSelector();
+
+                //Skip past the pseudo class identifier
+                token = NextToken();
             }
             else
             {

diff --git a/src/ExCSS/Rules/PageRule.cs b/src/ExCSS/Rules/PageRule.cs
@@ -16,7 +16,7 @@ internal PageRule(StylesheetParser parser)
 
         public override void ToCss(TextWriter writer, IStyleFormatter formatter)
         {
-            writer.Write(formatter.Rule("@page", SelectorText, "{"));
+            writer.Write(formatter.Rule("@page", Selector == null ? "" : SelectorText, "{"));
 
             Style.ToCss(writer, formatter);