PR #48 match changes for djot.js 3.0.1

Makefile

@@ -32,7 +32,7 @@ test_html_ut:
 		ln -fs ../../../modules/djot.js/test/$$f tests/html-ut/ut/djot_js_$$f; \
 	done
 	cargo test -p test-html-ut
-	cargo test -p test-html-ut -- --ignored 2>/dev/null | grep -q 'test result: FAILED. 0 passed'
+	cargo test -p test-html-ut -- --ignored 2>/dev/null | grep -qE 'test result: .* 0 passed'
 
 .PHONY: test_html_ref
 test_html_ref:
@@ -42,7 +42,7 @@ test_html_ref:
 		ln -fs ../../modules/djot.js/bench/$$f tests/html-ref/$$dst; \
 	done
 	cargo test -p test-html-ref
-	cargo test -p test-html-ref -- --ignored 2>/dev/null | grep -q 'test result: FAILED. 0 passed'
+	cargo test -p test-html-ut -- --ignored 2>/dev/null | grep -qE 'test result: .* 0 passed'
 
 .PHONY: bench
 bench:

src/attr.rs

@@ -463,6 +463,7 @@ impl State {
                 _ => Invalid,
             },
             Comment if c == b'%' => Whitespace,
+            Comment if c == b'}' => Done,
             Comment => Comment,
             ClassFirst if is_name(c) => Class,
             ClassFirst => Invalid,
@@ -557,8 +558,10 @@ mod test {
 
     #[test]
     fn comment() {
+        test_attr!("{%}");
         test_attr!("{%%}");
         test_attr!("{ % abc % }");
+        test_attr!("{ .some_class % #some_id }", ("class", "some_class"));
         test_attr!(
             "{ .some_class % abc % #some_id}",
             ("class", "some_class"),

src/html.rs

@@ -376,13 +376,13 @@ impl<'s> Writer<'s> {
                 }
             }
             Event::Symbol(sym) => write!(out, ":{}:", sym)?,
-            Event::LeftSingleQuote => out.write_str("&lsquo;")?,
-            Event::RightSingleQuote => out.write_str("&rsquo;")?,
-            Event::LeftDoubleQuote => out.write_str("&ldquo;")?,
-            Event::RightDoubleQuote => out.write_str("&rdquo;")?,
-            Event::Ellipsis => out.write_str("&hellip;")?,
-            Event::EnDash => out.write_str("&ndash;")?,
-            Event::EmDash => out.write_str("&mdash;")?,
+            Event::LeftSingleQuote => out.write_str("‘")?,
+            Event::RightSingleQuote => out.write_str("’")?,
+            Event::LeftDoubleQuote => out.write_str("“")?,
+            Event::RightDoubleQuote => out.write_str("”")?,
+            Event::Ellipsis => out.write_str("…")?,
+            Event::EnDash => out.write_str("–")?,
+            Event::EmDash => out.write_str("—")?,
             Event::NonBreakingSpace => out.write_str("&nbsp;")?,
             Event::Hardbreak => out.write_str("<br>\n")?,
             Event::Softbreak => out.write_char('\n')?,
@@ -434,7 +434,7 @@ impl<'s> Writer<'s> {
                 }
                 write!(
                     out,
-                    r##"<a href="#fnref{}" role="doc-backlink">↩︎︎</a></p>"##,
+                    "<a href=\"#fnref{}\" role=\"doc-backlink\">\u{21A9}\u{FE0E}</a></p>",
                     number,
                 )?;
 

tests/html-ref/skip

@@ -1,2 +0,0 @@
-block_list_flat:large list marker number
-inline_links_flat:space before img, img attrs order

tests/html-ut/skip

@@ -3,6 +3,7 @@
 f4f22fc:attribute key class order
 ae6fc15:bugged left/right quote
 168469a:bugged left/right quote
+2fa94d1:bugged left/right quote
 e1f5b5e:untrimmed whitespace before linebreak
 07888f3:div close within raw block
 8423412:heading id conflict with existing id

tests/html-ut/ut/footnotes.test

@@ -11,13 +11,13 @@ Footnote references may appear within a footnote.
 <hr>
 <ol>
 <li id="fn1">
-<p>a<a id="fnref2" href="#fn2" role="doc-noteref"><sup>2</sup></a><a id="fnref3" href="#fn3" role="doc-noteref"><sup>3</sup></a><a href="#fnref1" role="doc-backlink">↩︎︎</a></p>
+<p>a<a id="fnref2" href="#fn2" role="doc-noteref"><sup>2</sup></a><a id="fnref3" href="#fn3" role="doc-noteref"><sup>3</sup></a><a href="#fnref1" role="doc-backlink">↩︎</a></p>
 </li>
 <li id="fn2">
-<p>b<a href="#fnref2" role="doc-backlink">↩︎︎</a></p>
+<p>b<a href="#fnref2" role="doc-backlink">↩︎</a></p>
 </li>
 <li id="fn3">
-<p><a href="#fnref3" role="doc-backlink">↩︎︎</a></p>
+<p><a href="#fnref3" role="doc-backlink">↩︎</a></p>
 </li>
 </ol>
 </section>
@@ -48,10 +48,10 @@ Footnotes may appear within footnotes.
 <hr>
 <ol>
 <li id="fn1">
-<p>inner<a href="#fnref1" role="doc-backlink">↩︎︎</a></p>
+<p>inner<a href="#fnref1" role="doc-backlink">↩︎</a></p>
 </li>
 <li id="fn2">
-<p><a href="#fnref2" role="doc-backlink">↩︎︎</a></p>
+<p><a href="#fnref2" role="doc-backlink">↩︎</a></p>
 </li>
 </ol>
 </section>