summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--narrative.md22
2 files changed, 22 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 042b143..c40b226 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ testjs: spec.txt
# perl runtests.pl js/markdown $<
benchjs:
- node js/bench.js
+ node js/bench.js ${BENCHINP}
$(PROG): $(SRCDIR)/main.c $(SRCDIR)/inlines.o $(SRCDIR)/blocks.o $(SRCDIR)/detab.o $(SRCDIR)/bstrlib.o $(SRCDIR)/scanners.o $(SRCDIR)/print.o $(SRCDIR)/html.o $(SRCDIR)/utf8.o
$(CC) $(LDFLAGS) -o $@ $^
@@ -62,10 +62,14 @@ fuzztest:
for i in `seq 1 10`; do \
time cat /dev/urandom | head -c 100000 | iconv -f latin1 -t utf-8 | $(PROG) >/dev/null; done
-update-site: README.html spec.html narrative.html
+update-site: spec.html narrative.html
cp spec.html _site/
cp narrative.html _site/index.html
cp -r js/* _site/js/
+ cd _site
+ git commit -a -m "Updated site for latest spec, narrative, js"
+ git push
+ cd ..
clean:
-rm test $(SRCDIR)/*.o $(SRCDIR)/scanners.c
diff --git a/narrative.md b/narrative.md
index 5c4a616..4330bdd 100644
--- a/narrative.md
+++ b/narrative.md
@@ -47,11 +47,14 @@ description.
There are only a few places where this spec says things that contradict
the canonical syntax description:
-- It allows all puncutation symbols to be backslash-escaped, not just
- the symbols with special meanings in markdown. I found that it was
- just too hard to remember which symbols could be escaped.
-
-- It introduces an alternative syntax for hard line breaks, a
+- It [allows all puncutation symbols to be
+ backslash-escaped](http://jgm.github.io/stmd/spec.html#backslash-escapes),
+ not just the symbols with special meanings in markdown. I found
+ that it was just too hard to remember which symbols could be
+ escaped.
+
+- It introduces an [alternative syntax for hard line
+ breaks](http://jgm.github.io/stmd/spec.html#hard-line-breaks)), a
backslash at the end of the line, supplementing the
two-spaces-at-the-end-of-line rule. This is motivated by persistent
complaints about the “invisible” nature of the two-space rule.
@@ -93,7 +96,7 @@ the canonical syntax description:
implementation flubs up.)
- The spec stipulates that two blank lines break out of all list
- contexts. This is an attempt to deal with issues that often come up
+ contexts. This is an attempt to deal with issues that often come up
when someone wants to have two adjacent lists, or a list followed by
an indented code block.
@@ -101,8 +104,15 @@ the canonical syntax description:
vice versa, starts a new list. I think that is almost always going
to be the writer's intent.
+- The number that begins an ordered list item may be followed by
+ either `.` or `)`. Changing the delimiter style starts a new
+ list.
+
- The start number of an ordered list is significant.
+- [Fenced code blocks](http://jgm.github.io/stmd/spec.html#fenced-code-blocks) are supported, delimited by either
+ backticks (` ``` `) or tildes (` ~~~ `).
+
In all of this, I have been guided by eight years experience writing
markdown implementations in several languages, including the first
markdown parser not based on regular expression substitutions