From 811a8560dd5fddf345dd8aae38f8d6ff8b18d150 Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <binki@gentoo.org>
Date: Sun, 12 Jul 2015 21:05:42 +0000
Subject: [PATCH 1/7] Convert --with-dl to runtime flags for issue #124.

Instead of specifying `./configure.sh --with-dl=both`, specify
`-fdlextra` or `MKD_DLEXTRA` at runtime.
---
 Plan9/README.md | 11 +++--------
 configure.sh    | 16 ++++++----------
 flags.c         |  2 ++
 markdown.1      | 10 +++++++++-
 markdown.c      | 31 +++++++++++++++----------------
 markdown.h      |  2 ++
 mkdio.h.in      |  3 +++
 pgm_options.c   |  4 +++-
 tests/dl.t      | 46 ++++++++++++++++++++++++++++------------------
 version.c.in    | 11 -----------
 10 files changed, 71 insertions(+), 65 deletions(-)

diff --git a/Plan9/README.md b/Plan9/README.md
index 342a93e1..b0ec8e3e 100644
--- a/Plan9/README.md
+++ b/Plan9/README.md
@@ -1,17 +1,15 @@
 # *Discount* Markdown compiler on Plan 9
 
 ## Build
-    % CONFIG='--with-dl=both' mk config
+    % CONFIG='--with-tabstops=7' mk config
     % mk test
     % mk install
     % markdown -V
-    markdown: discount X.Y.Z DL=BOTH
+    markdown: discount X.Y.Z TAB=7
 
 ### Configuration
-To select features and extensions, `--with-dl=both` may be replaced by zero or more of:
+To select features and extensions, `--with-tabstops=7` may be replaced by zero or more of:
 
-* `--enable-dl-tag`:  Enable the definition list tag extension with the default (`discount`) tag style
-* `--with-dl=`*tagstyle*:  Set the tags that define `<dl>`s to *tagstyle*. *Tagstyle* must be one of `discount`, `extra`, or `both`. Implies `--enable-dl-tag`.
 * `--enable-pandoc-header`:  Use pandoc-style header blocks
 * `--enable-superscript`:  `A^B` becomes A<sup>B</sup>
 * `--enable-amalloc`:  Enable memory allocation debugging
@@ -33,6 +31,3 @@ Installation is optional.  Plan 9 binaries are statically linked.
     * `install.progs`:  Extra programs.  *makepage* writes complete XHTML
 documents, rather than fragments.  *mkd2html* is similar, but produces
 HTML.
-
-3. `CONFIG`, the argument list given to `../configure.sh`, must contain at least `--with-dl=both` to produce a binary that
-passes `../discount/tests/dl.t`.
diff --git a/configure.sh b/configure.sh
index bc73383a..ef0307dd 100755
--- a/configure.sh
+++ b/configure.sh
@@ -9,7 +9,6 @@
 #
 ac_help='--enable-amalloc	Enable memory allocation debugging
 --with-tabstops=N	Set tabstops to N characters (default is 4)
---with-dl=X		Use Discount, Extra, or Both types of definition list
 --with-id-anchor	Use id= anchors for table-of-contents links
 --with-github-tags	Allow `_` and `-` in <> tags
 --with-fenced-code	Allow fenced code blocks
@@ -48,15 +47,12 @@ TARGET=markdown
 
 AC_INIT $TARGET
 
-__DL=`echo "$WITH_DL" | $AC_UPPERCASE`
-
-case "$__DL" in
-EXTRA)         AC_DEFINE 'USE_EXTRA_DL' 1 ;;
-DISCOUNT|1|"") AC_DEFINE 'USE_DISCOUNT_DL' 1 ;;
-BOTH)          AC_DEFINE 'USE_EXTRA_DL' 1
-	       AC_DEFINE 'USE_DISCOUNT_DL' 1 ;;
-*)             AC_FAIL "Unknown value <$WITH_DL> for --with-dl (want 'discount', 'extra', or 'both')" ;;
-esac
+for banned_with in dl; do
+    banned_with_variable_ref=\$WITH_`echo "$banned_with" | $AC_UPPERCASE`
+    if [ "`eval echo "$banned_with_variable_ref"`" ]; then
+	AC_FAIL "Invalid option: --with-$banned_with. Please use a runtime flag to configure this feature."
+    fi
+done
 
 test "$WITH_FENCED_CODE" && AC_DEFINE "WITH_FENCED_CODE" 1
 test "$WITH_ID_ANCHOR" && AC_DEFINE 'WITH_ID_ANCHOR' 1
diff --git a/flags.c b/flags.c
index cc1c589a..cda0f0f8 100644
--- a/flags.c
+++ b/flags.c
@@ -30,6 +30,8 @@ static struct flagnames flagnames[] = {
     { MKD_NODLIST,        "!DLIST" },
     { MKD_EXTRA_FOOTNOTE, "FOOTNOTE" },
     { MKD_NOSTYLE,        "!STYLE" },
+    { MKD_NODLDISCOUNT,   "!DLDISCOUNT" },
+    { MKD_DLEXTRA,        "DLEXTRA" },
 };
 #define NR(x)	(sizeof x/sizeof x[0])
 
diff --git a/markdown.1 b/markdown.1
index 60ad8c61..0fd0703b 100644
--- a/markdown.1
+++ b/markdown.1
@@ -106,7 +106,15 @@ blocks.
 .It Ar alphalist
 Allow alphabetic lists.
 .It Ar definitionlist
-Allow definition lists.
+Allow definition lists at all (default). Use
+.Em dldiscount
+and
+.Em dlextra
+to control which syntaxes are respected.
+.It Ar dldiscount
+Enable discount-style definition lists (default).
+.It Ar dlextra
+Enable extra-style definition lists (not default). Both styles may be enabled simultaneously.
 .It Ar footnote
 Allow markdown extra-style footnotes.
 .It Ar styles
diff --git a/markdown.c b/markdown.c
index f43f5144..7f5b8448 100644
--- a/markdown.c
+++ b/markdown.c
@@ -434,10 +434,11 @@ end_of_block(Line *t)
 
 
 static Line*
-is_discount_dt(Line *t, int *clip)
+is_discount_dt(Line *t, int *clip, DWORD flags)
 {
-#if USE_DISCOUNT_DL
-    if ( t && t->next
+    if ( !(flags & MKD_NODLDISCOUNT)
+	   && t
+	   && t->next
 	   && (S(t->text) > 2)
 	   && (t->dle == 0)
 	   && (T(t->text)[0] == '=')
@@ -447,9 +448,8 @@ is_discount_dt(Line *t, int *clip)
 	    return t;
 	}
 	else
-	    return is_discount_dt(t->next, clip);
+	    return is_discount_dt(t->next, clip, flags);
     }
-#endif
     return 0;
 }
 
@@ -463,11 +463,11 @@ is_extra_dd(Line *t)
 
 
 static Line*
-is_extra_dt(Line *t, int *clip)
+is_extra_dt(Line *t, int *clip, DWORD flags)
 {
-#if USE_EXTRA_DL
-    
-    if ( t && t->next && S(t->text) && T(t->text)[0] != '='
+    if ( flags & MKD_DLEXTRA
+	   && t
+	   && t->next && S(t->text) && T(t->text)[0] != '='
 		      && T(t->text)[S(t->text)-1] != '=') {
 	Line *x;
     
@@ -479,25 +479,24 @@ is_extra_dt(Line *t, int *clip)
 	    return t;
 	}
 	
-	if ( x=is_extra_dt(t->next, clip) )
+	if ( x=is_extra_dt(t->next, clip, flags) )
 	    return x;
     }
-#endif
     return 0;
 }
 
 
 static Line*
-isdefinition(Line *t, int *clip, int *kind)
+isdefinition(Line *t, int *clip, int *kind, DWORD flags)
 {
     Line *ret;
 
     *kind = 1;
-    if ( ret = is_discount_dt(t,clip) )
+    if ( ret = is_discount_dt(t,clip,flags) )
 	return ret;
 
     *kind=2;
-    return is_extra_dt(t,clip);
+    return is_extra_dt(t,clip,flags);
 }
 
 
@@ -510,7 +509,7 @@ islist(Line *t, int *clip, DWORD flags, int *list_type)
     if ( end_of_block(t) )
 	return 0;
 
-    if ( !(flags & (MKD_NODLIST|MKD_STRICT)) && isdefinition(t,clip,list_type) )
+    if ( !(flags & (MKD_NODLIST|MKD_STRICT)) && isdefinition(t,clip,list_type,flags) )
 	return DL;
 
     if ( strchr("*-+", T(t->text)[t->dle]) && isspace(T(t->text)[t->dle+1]) ) {
@@ -902,7 +901,7 @@ definition_block(Paragraph *top, int clip, MMIOT *f, int kind)
 
     while (( labels = q )) {
 
-	if ( (q = isdefinition(labels, &z, &kind)) == 0 )
+	if ( (q = isdefinition(labels, &z, &kind, f->flags)) == 0 )
 	    break;
 
 	if ( (text = skipempty(q->next)) == 0 )
diff --git a/markdown.h b/markdown.h
index 8edd3024..34439fee 100644
--- a/markdown.h
+++ b/markdown.h
@@ -129,6 +129,8 @@ typedef struct mmiot {
 #define MKD_NODLIST	0x00100000
 #define MKD_EXTRA_FOOTNOTE 0x00200000
 #define MKD_NOSTYLE	0x00400000
+#define MKD_NODLDISCOUNT 0x00800000
+#define	MKD_DLEXTRA	0x01000000
 #define IS_LABEL	0x08000000
 #define USER_FLAGS	0x0FFFFFFF
 #define INPUT_MASK	(MKD_NOHEADER|MKD_TABSTOP)
diff --git a/mkdio.h.in b/mkdio.h.in
index 2527b8ef..4408cef9 100644
--- a/mkdio.h.in
+++ b/mkdio.h.in
@@ -106,6 +106,9 @@ void mkd_ref_prefix(MMIOT*, char*);
 #define MKD_NODLIST	0x00100000	/* forbid definition lists */
 #define MKD_EXTRA_FOOTNOTE 0x00200000	/* enable markdown extra-style footnotes */
 #define MKD_NOSTYLE	0x00400000	/* don't extract <style> blocks */
+#define MKD_NODLDISCOUNT 0x00800000	/* disable discount-style definition lists */
+#define	MKD_DLEXTRA	0x01000000	/* enable extra-style definition lists */
+
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
 /* special flags for mkd_in() and mkd_string()
diff --git a/pgm_options.c b/pgm_options.c
index 161917e7..f4d1de0f 100644
--- a/pgm_options.c
+++ b/pgm_options.c
@@ -25,7 +25,7 @@ static struct _opt {
     char *name;
     char *desc;
     int off;
-    int skip;
+    int skip; /* this opt is a synonym */
     int sayenable;
     mkd_flag_t flag;
 } opts[] = {
@@ -55,6 +55,8 @@ static struct _opt {
     { "footnotes",     "markdown extra footnotes",   0, 0, 1, MKD_EXTRA_FOOTNOTE },
     { "footnote",      "markdown extra footnotes",   0, 1, 1, MKD_EXTRA_FOOTNOTE },
     { "style",         "extract style blocks",       1, 0, 1, MKD_NOSTYLE },
+    { "dldiscount",    "discount-style definition lists", 1, 0, 1, MKD_NODLDISCOUNT },
+    { "dlextra",       "extra-style definition lists", 0, 0, 1, MKD_DLEXTRA },
 } ;
 
 #define NR(x)	(sizeof x / sizeof x[0])
diff --git a/tests/dl.t b/tests/dl.t
index 5465a81e..c59088d6 100644
--- a/tests/dl.t
+++ b/tests/dl.t
@@ -2,10 +2,6 @@
 
 title "definition lists"
 
-eval `./markdown -V | tr ' ' '\n' | grep '^DL='`
-
-DL=${DL:-BOTH}
-
 rc=0
 MARKDOWN_FLAGS=
 
@@ -22,11 +18,11 @@ RSLT='<dl>
 <dd>eh?</dd>
 </dl>'
 
-if [ "$DL" = "DISCOUNT" -o "$DL" = "BOTH" ]; then
-    try -fdefinitionlist '=tag= generates definition lists' "$SRC" "$RSLT"
+# discount style
+try -fdefinitionlist '=tag= generates definition lists' "$SRC" "$RSLT"
 
-	try 'one item with two =tags=' \
-	    '=this=
+try 'one item with two =tags=' \
+    '=this=
 =is=
     A test, eh?' \
 	    '<dl>
@@ -35,16 +31,14 @@ if [ "$DL" = "DISCOUNT" -o "$DL" = "BOTH" ]; then
 <dd>A test, eh?</dd>
 </dl>'
 
-
-	try -fnodefinitionlist '=tag= does nothing' "$SRC" \
-	    '<p>=this=
+# extra style
+try -fnodefinitionlist,dlextra '=tag= does nothing' "$SRC" \
+    '<p>=this=
     is an ugly
 =test=
     eh?</p>'
-fi
 
-if [ "$DL" = "EXTRA" -o "$DL" = "BOTH" ]; then
-    try 'markdown extra-style definition lists' \
+try -fdlextra 'markdown extra-style definition lists' \
 'foo
 : bar' \
 '<dl>
@@ -52,7 +46,7 @@ if [ "$DL" = "EXTRA" -o "$DL" = "BOTH" ]; then
 <dd>bar</dd>
 </dl>'
 
-    try '... with two <dt>s in a row' \
+try -fdlextra '... with two <dt>s in a row' \
 'foo
 bar
 : baz' \
@@ -62,7 +56,7 @@ bar
 <dd>baz</dd>
 </dl>'
 
-    try '... with two <dd>s in a row' \
+try -fdlextra '... with two <dd>s in a row' \
 'foo
 : bar
 : baz' \
@@ -72,7 +66,7 @@ bar
 <dd>baz</dd>
 </dl>'
 
-    try '... with blanks between list items' \
+try -fdlextra '... with blanks between list items' \
 'foo
 : bar
 
@@ -85,7 +79,23 @@ zip
 <dd>zap</dd>
 </dl>'
 
-fi
+# Hmm, redundancy...
+SRC='foo
+: bar
+
+=this=
+    is ugly'
+RSLT='<p>foo
+: bar</p>
+
+<p>=this=
+    is ugly</p>'
+try -fnodldiscount '... with definitionlists enabled but all styles disabled' \
+"$SRC" \
+"$RSLT"
+try -fnodefinitionlist,dldiscount,dlextra '... with definitionlists disabled but all styles enabled' \
+    "$SRC" \
+    "$RSLT"
 
 summary $0
 exit $rc
diff --git a/version.c.in b/version.c.in
index aaa07221..f36b4b86 100644
--- a/version.c.in
+++ b/version.c.in
@@ -7,17 +7,6 @@ char markdown_version[] = VERSION
 #if USE_AMALLOC
 		" DEBUG"
 #endif
-#if USE_DISCOUNT_DL
-# if USE_EXTRA_DL
-		" DL=BOTH"
-# else
-		" DL=DISCOUNT"
-# endif
-#elif USE_EXTRA_DL
-		" DL=EXTRA"
-#else
-		" DL=NONE"
-#endif
 #if WITH_ID_ANCHOR
 		" ID-ANCHOR"
 #endif

From ebd35260638bae5606e1516b69363b76d00f26f3 Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <binki@gentoo.org>
Date: Sun, 12 Jul 2015 21:55:45 +0000
Subject: [PATCH 2/7] Fix manpage documentation on -fstyle and MKD_NOSTYLE.

---
 markdown.1 | 2 +-
 markdown.3 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/markdown.1 b/markdown.1
index 0fd0703b..cde8745e 100644
--- a/markdown.1
+++ b/markdown.1
@@ -117,7 +117,7 @@ Enable discount-style definition lists (default).
 Enable extra-style definition lists (not default). Both styles may be enabled simultaneously.
 .It Ar footnote
 Allow markdown extra-style footnotes.
-.It Ar styles
+.It Ar style
 Extract <style> blocks from the output.
 .El
 .Pp
diff --git a/markdown.3 b/markdown.3
index 497b4e7e..c516a561 100644
--- a/markdown.3
+++ b/markdown.3
@@ -106,6 +106,8 @@ Forbid alphabetic lists.
 Forbid definition lists.
 .It Ar MKD_EXTRA_FOOTNOTE
 Enable markdown extra-style footnotes.
+.It Ar MKD_NOSTYLE
+Do not extract (omit) <style/> blocks from the output.
 .El
 .Sh RETURN VALUES
 .Fn markdown

From 06f029eb7dc484d8ba8505bdbef9038f3b27219d Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <binki@gentoo.org>
Date: Sun, 12 Jul 2015 21:58:21 +0000
Subject: [PATCH 3/7] Add documentation runtime definition list style API
 flags.

I missed this manpage earlier.
---
 markdown.3 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/markdown.3 b/markdown.3
index c516a561..fe8aac41 100644
--- a/markdown.3
+++ b/markdown.3
@@ -104,6 +104,10 @@ blocks.
 Forbid alphabetic lists.
 .It Ar MKD_NODLIST
 Forbid definition lists.
+.It Ar MKD_NODLDISCOUNT
+Disable the discount definition list syntax style.
+.It Ar MKD_DLEXTRA
+Enable the extra definition list syntax style.
 .It Ar MKD_EXTRA_FOOTNOTE
 Enable markdown extra-style footnotes.
 .It Ar MKD_NOSTYLE

From 088b5ab628fb9dafa6b1d77fa3af3429b29d78d1 Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <binki@gentoo.org>
Date: Mon, 13 Jul 2015 00:16:08 +0000
Subject: [PATCH 4/7] Convert --with-fenced-code to runtime flag for issue
 #124.

This change is more invasive and difficult for me as not all existing
preprocessor directives directly translate to `if () {}`.

Instead of passing `--with-fenced-code` to `configure.sh`, now use
`MKD_FENCEDCODE` or `-ffencedcode`.

The output of `markdown -VV` will now display `FENCEDCODE` if the
feature is enabled and `!FENCEDCODE` if it is disabled rather than
displaying `FENCED-CODE` if the feature is enabled.
---
 configure.sh  |  6 ++--
 flags.c       |  1 +
 markdown.1    |  2 ++
 markdown.3    |  2 ++
 markdown.c    | 80 +++++++++++++++++++++++++--------------------------
 markdown.h    |  1 +
 mkdio.h.in    |  1 +
 pgm_options.c |  1 +
 tests/code.t  | 63 ++++++++++++++++++++++++++++------------
 version.c.in  |  3 --
 10 files changed, 94 insertions(+), 66 deletions(-)

diff --git a/configure.sh b/configure.sh
index ef0307dd..17e98ae2 100755
--- a/configure.sh
+++ b/configure.sh
@@ -11,7 +11,6 @@ ac_help='--enable-amalloc	Enable memory allocation debugging
 --with-tabstops=N	Set tabstops to N characters (default is 4)
 --with-id-anchor	Use id= anchors for table-of-contents links
 --with-github-tags	Allow `_` and `-` in <> tags
---with-fenced-code	Allow fenced code blocks
 --with-urlencoded-anchor	Use url-encoded chars to multibyte chars in toc links
 --enable-all-features	Turn on all stable optional features
 --shared		Build shared libraries (default is static)'
@@ -47,14 +46,13 @@ TARGET=markdown
 
 AC_INIT $TARGET
 
-for banned_with in dl; do
-    banned_with_variable_ref=\$WITH_`echo "$banned_with" | $AC_UPPERCASE`
+for banned_with in dl fenced-code; do
+    banned_with_variable_ref=\$WITH_`echo "$banned_with" | $AC_UPPERCASE | tr - _`
     if [ "`eval echo "$banned_with_variable_ref"`" ]; then
 	AC_FAIL "Invalid option: --with-$banned_with. Please use a runtime flag to configure this feature."
     fi
 done
 
-test "$WITH_FENCED_CODE" && AC_DEFINE "WITH_FENCED_CODE" 1
 test "$WITH_ID_ANCHOR" && AC_DEFINE 'WITH_ID_ANCHOR' 1
 test "$WITH_GITHUB_TAGS" && AC_DEFINE 'WITH_GITHUB_TAGS' 1
 test "$WITH_URLENCODED_ANCHOR" && AC_DEFINE 'WITH_URLENCODED_ANCHOR' 1
diff --git a/flags.c b/flags.c
index cda0f0f8..cb7221aa 100644
--- a/flags.c
+++ b/flags.c
@@ -32,6 +32,7 @@ static struct flagnames flagnames[] = {
     { MKD_NOSTYLE,        "!STYLE" },
     { MKD_NODLDISCOUNT,   "!DLDISCOUNT" },
     { MKD_DLEXTRA,        "DLEXTRA" },
+    { MKD_FENCEDCODE,     "FENCEDCODE" },
 };
 #define NR(x)	(sizeof x/sizeof x[0])
 
diff --git a/markdown.1 b/markdown.1
index cde8745e..bdbcc1af 100644
--- a/markdown.1
+++ b/markdown.1
@@ -119,6 +119,8 @@ Enable extra-style definition lists (not default). Both styles may be enabled si
 Allow markdown extra-style footnotes.
 .It Ar style
 Extract <style> blocks from the output.
+.It Ar fencedcode
+Allow fenced code blocks (not default).
 .El
 .Pp
 As an example, the option
diff --git a/markdown.3 b/markdown.3
index fe8aac41..71831c7a 100644
--- a/markdown.3
+++ b/markdown.3
@@ -112,6 +112,8 @@ Enable the extra definition list syntax style.
 Enable markdown extra-style footnotes.
 .It Ar MKD_NOSTYLE
 Do not extract (omit) <style/> blocks from the output.
+.It Ar MKD_FENCEDCODE
+Allow fenced code blocks.
 .El
 .Sh RETURN VALUES
 .Fn markdown
diff --git a/markdown.c b/markdown.c
index 7f5b8448..91234554 100644
--- a/markdown.c
+++ b/markdown.c
@@ -178,20 +178,16 @@ splitline(Line *t, int cutpoint)
 
 #define UNCHECK(l) ((l)->flags &= ~CHECKED)
 
-#ifdef WITH_FENCED_CODE
-# define UNLESS_FENCED(t) if (fenced) { \
+#define UNLESS_FENCED(t) if (fenced) { \
     other = 1; l->count += (c == ' ' ? 0 : -1); \
   } else { t; }
-#else
-# define UNLESS_FENCED(t) t;
-#endif
 
 /*
  * walk a line, seeing if it's any of half a dozen interesting regular
  * types.
  */
 static void
-checkline(Line *l)
+checkline(Line *l, DWORD flags)
 {
     int eol, i;
     int dashes = 0, spaces = 0,
@@ -210,6 +206,7 @@ checkline(Line *l)
 
     for (i=l->dle; i<eol; i++) {
 	register int c = T(l->text)[i];
+	int is_fence_char = 0;
 
 	if ( c != ' ' ) l->count++;
 
@@ -219,14 +216,20 @@ checkline(Line *l)
 	case '=':  equals = 1; break;
 	case '_':  UNLESS_FENCED(underscores = 1); break;
 	case '*':  stars = 1; break;
-#if WITH_FENCED_CODE
-	case '~':  if (other) return; fenced = 1; tildes = 1; break;
-	case '`':  if (other) return; fenced = 1; backticks = 1; break;
-#endif
 	default:
-    other = 1;
-    l->count--;
-    if (!fenced) return;
+	    if (flags & MKD_FENCEDCODE) {
+		switch (c) {
+		case '~':  if (other) return; is_fence_char = 1; tildes = 1; break;
+		case '`':  if (other) return; is_fence_char = 1; backticks = 1; break;
+		}
+		if (is_fence_char) {
+		    fenced = 1;
+		    break;
+		}
+	    }
+	    other = 1;
+	    l->count--;
+	    if (!fenced) return;
 	}
     }
 
@@ -242,10 +245,8 @@ checkline(Line *l)
     if ( stars || underscores ) { l->kind = chk_hr; }
     else if ( dashes ) { l->kind = chk_dash; }
     else if ( equals ) { l->kind = chk_equal; }
-#if WITH_FENCED_CODE
     else if ( tildes ) { l->kind = chk_tilde; }
     else if ( backticks ) { l->kind = chk_backtick; }
-#endif
 }
 
 
@@ -372,10 +373,10 @@ iscode(Line *t)
 
 
 static inline int
-ishr(Line *t)
+ishr(Line *t, DWORD flags)
 {
     if ( ! (t->flags & CHECKED) )
-	checkline(t);
+	checkline(t, flags);
 
     if ( t->count > 2 )
 	return t->kind == chk_hr || t->kind == chk_dash || t->kind == chk_equal;
@@ -384,7 +385,7 @@ ishr(Line *t)
 
 
 static int
-issetext(Line *t, int *htyp)
+issetext(Line *t, int *htyp, DWORD flags)
 {
     Line *n;
     
@@ -394,7 +395,7 @@ issetext(Line *t, int *htyp)
 
     if ( (n = t->next) ) {
 	if ( !(n->flags & CHECKED) )
-	    checkline(n);
+	    checkline(n, flags);
 
 	if ( n->kind == chk_dash || n->kind == chk_equal ) {
 	    *htyp = SETEXT;
@@ -406,7 +407,7 @@ issetext(Line *t, int *htyp)
 
 
 static int
-ishdr(Line *t, int *htyp)
+ishdr(Line *t, int *htyp, DWORD flags)
 {
     /* ANY leading `#`'s make this into an ETX header
      */
@@ -417,19 +418,19 @@ ishdr(Line *t, int *htyp)
 
     /* And if not, maybe it's a SETEXT header instead
      */
-    return issetext(t, htyp);
+    return issetext(t, htyp, flags);
 }
 
 
 static inline int
-end_of_block(Line *t)
+end_of_block(Line *t, DWORD flags)
 {
     int dummy;
     
     if ( !t )
 	return 0;
 	
-    return ( (S(t->text) <= t->dle) || ishr(t) || ishdr(t, &dummy) );
+    return ( (S(t->text) <= t->dle) || ishr(t, flags) || ishdr(t, &dummy, flags) );
 }
 
 
@@ -471,7 +472,7 @@ is_extra_dt(Line *t, int *clip, DWORD flags)
 		      && T(t->text)[S(t->text)-1] != '=') {
 	Line *x;
     
-	if ( iscode(t) || end_of_block(t) )
+	if ( iscode(t) || end_of_block(t, flags) )
 	    return 0;
 
 	if ( (x = skipempty(t->next)) && is_extra_dd(x) ) {
@@ -506,7 +507,7 @@ islist(Line *t, int *clip, DWORD flags, int *list_type)
     int i, j;
     char *q;
     
-    if ( end_of_block(t) )
+    if ( end_of_block(t, flags) )
 	return 0;
 
     if ( !(flags & (MKD_NODLIST|MKD_STRICT)) && isdefinition(t,clip,list_type,flags) )
@@ -614,12 +615,14 @@ codeblock(Paragraph *p)
 }
 
 
-#ifdef WITH_FENCED_CODE
 static int
-iscodefence(Line *r, int size, line_type kind)
+iscodefence(Line *r, int size, line_type kind, DWORD flags)
 {
+    if ( !(flags & MKD_FENCEDCODE) )
+	return 0;
+
     if ( !(r->flags & CHECKED) )
-	checkline(r);
+	checkline(r, flags);
 
     if ( kind )
 	return (r->kind == kind) && (r->count >= size);
@@ -628,7 +631,7 @@ iscodefence(Line *r, int size, line_type kind)
 }
 
 static Paragraph *
-fencedcodeblock(ParagraphRoot *d, Line **ptr)
+fencedcodeblock(ParagraphRoot *d, Line **ptr, DWORD flags)
 {
     Line *first, *r;
     Paragraph *ret;
@@ -637,14 +640,14 @@ fencedcodeblock(ParagraphRoot *d, Line **ptr)
     
     /* don't allow zero-length code fences
      */
-    if ( (first->next == 0) || iscodefence(first->next, first->count, 0) )
+    if ( (first->next == 0) || iscodefence(first->next, first->count, 0, flags) )
 	return 0;
 
     /* find the closing fence, discard the fences,
      * return a Paragraph with the contents
      */
     for ( r = first; r && r->next; r = r->next )
-	if ( iscodefence(r->next, first->count, first->kind) ) {
+	if ( iscodefence(r->next, first->count, first->kind, flags) ) {
 	    (*ptr) = r->next->next;
 	    ret = Pp(d, first->next, CODE);
       if (S(first->text) - first->count > 0) {
@@ -662,7 +665,6 @@ fencedcodeblock(ParagraphRoot *d, Line **ptr)
 	}
     return 0;
 }
-#endif
 
 
 static int
@@ -688,7 +690,7 @@ endoftextblock(Line *t, int toplevelblock, DWORD flags)
 {
     int z;
 
-    if ( end_of_block(t) || isquote(t) )
+    if ( end_of_block(t, flags) || isquote(t) )
 	return 1;
 
     /* HORRIBLE STANDARDS KLUDGES:
@@ -877,9 +879,9 @@ listitem(Paragraph *p, int indent, DWORD flags, linefn check)
 	    indent = clip ? clip : 2;
 	}
 
-	if ( (q->dle < indent) && (ishr(q) || islist(q,&z,flags,&z)
+	if ( (q->dle < indent) && (ishr(q,flags) || islist(q,&z,flags,&z)
 					   || (check && (*check)(q)))
-			       && !issetext(q,&z) ) {
+			       && !issetext(q,&z,flags) ) {
 	    q = t->next;
 	    t->next = 0;
 	    return q;
@@ -1253,11 +1255,9 @@ compile(Line *ptr, int toplevel, MMIOT *f)
 	    
 	    ptr = codeblock(p);
 	}
-#if WITH_FENCED_CODE
-	else if ( iscodefence(ptr,3,0) && (p=fencedcodeblock(&d, &ptr)) )
+	else if ( iscodefence(ptr,3,0,f->flags) && (p=fencedcodeblock(&d, &ptr, f->flags)) )
 	    /* yay, it's already done */ ;
-#endif
-	else if ( ishr(ptr) ) {
+	else if ( ishr(ptr, f->flags) ) {
 	    p = Pp(&d, 0, HR);
 	    r = ptr;
 	    ptr = ptr->next;
@@ -1279,7 +1279,7 @@ compile(Line *ptr, int toplevel, MMIOT *f)
 	    p->down = compile(p->text, 1, f);
 	    p->text = 0;
 	}
-	else if ( ishdr(ptr, &hdr_type) ) {
+	else if ( ishdr(ptr, &hdr_type, f->flags) ) {
 	    p = Pp(&d, ptr, HDR);
 	    ptr = headerblock(p, hdr_type);
 	}
diff --git a/markdown.h b/markdown.h
index 34439fee..b8d17397 100644
--- a/markdown.h
+++ b/markdown.h
@@ -131,6 +131,7 @@ typedef struct mmiot {
 #define MKD_NOSTYLE	0x00400000
 #define MKD_NODLDISCOUNT 0x00800000
 #define	MKD_DLEXTRA	0x01000000
+#define MKD_FENCEDCODE	0x02000000
 #define IS_LABEL	0x08000000
 #define USER_FLAGS	0x0FFFFFFF
 #define INPUT_MASK	(MKD_NOHEADER|MKD_TABSTOP)
diff --git a/mkdio.h.in b/mkdio.h.in
index 4408cef9..46ebe064 100644
--- a/mkdio.h.in
+++ b/mkdio.h.in
@@ -108,6 +108,7 @@ void mkd_ref_prefix(MMIOT*, char*);
 #define MKD_NOSTYLE	0x00400000	/* don't extract <style> blocks */
 #define MKD_NODLDISCOUNT 0x00800000	/* disable discount-style definition lists */
 #define	MKD_DLEXTRA	0x01000000	/* enable extra-style definition lists */
+#define MKD_FENCEDCODE	0x02000000	/* enabled fenced code blocks */
 
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
diff --git a/pgm_options.c b/pgm_options.c
index f4d1de0f..3dad63b6 100644
--- a/pgm_options.c
+++ b/pgm_options.c
@@ -57,6 +57,7 @@ static struct _opt {
     { "style",         "extract style blocks",       1, 0, 1, MKD_NOSTYLE },
     { "dldiscount",    "discount-style definition lists", 1, 0, 1, MKD_NODLDISCOUNT },
     { "dlextra",       "extra-style definition lists", 0, 0, 1, MKD_DLEXTRA },
+    { "fencedcode",    "fenced code blocks",         0, 0, 1, MKD_FENCEDCODE },
 } ;
 
 #define NR(x)	(sizeof x / sizeof x[0])
diff --git a/tests/code.t b/tests/code.t
index 889a6974..82a4b4ff 100644
--- a/tests/code.t
+++ b/tests/code.t
@@ -31,9 +31,36 @@ try 'backslashes in code(1)' '    printf "%s: \n", $1;' \
 try 'backslashes in code(2)' '`printf "%s: \n", $1;`' \
 '<p><code>printf "%s: \n", $1;</code></p>'
 
-if ./markdown -V | grep FENCED-CODE >/dev/null; then
+try 'fenced code disabled backtick' \
+'```
+
+unrecognized code!
+```' \
+'<p>```</p>
+
+<p>unrecognized code!
+```</p>'
+
+# no <pre/> proves it’s the inline variant of `code` delimitation
+try 'fenced code disabled backtick as inline code' \
+'```
+inline code?
+```' \
+'<p><code>
+inline code?
+</code></p>'
 
-try 'fenced code block with blank lines' \
+try 'fenced code disabled tilde' \
+'~~~
+
+unrecognized code!
+~~~' \
+'<p>~~~</p>
+
+<p>unrecognized code!
+~~~</p>'
+
+try -ffencedcode 'fenced code block with blank lines' \
 '~~~
 code!
 
@@ -44,14 +71,14 @@ still code!
 still code!
 </code></pre>'
 
-try 'fenced code block' \
+try  -ffencedcode 'fenced code block' \
 '~~~
 code!
 ~~~' \
     '<pre><code>code!
 </code></pre>'
 
-try 'fenced code block in list' \
+try  -ffencedcode 'fenced code block in list' \
 '1. ~~~
 code block
 ~~~' \
@@ -60,20 +87,20 @@ code block
 </code></pre></li>
 </ol>'
 
-try 'fenced code block in blockquote' \
+try  -ffencedcode 'fenced code block in blockquote' \
 '>~~~
 code
 ~~~' \
 '<blockquote><pre><code>code
 </code></pre></blockquote>'
 
-try 'unterminated fenced code block' \
+try  -ffencedcode 'unterminated fenced code block' \
 '~~~
 code' \
 '<p>~~~
 code</p>'
 
-try 'fenced code block with tildes' \
+try  -ffencedcode 'fenced code block with tildes' \
 '~~~~~
 ~~~
 code with tildes
@@ -84,7 +111,7 @@ code with tildes
 ~~~
 </code></pre>'
 
-try 'paragraph with trailing fenced block' \
+try  -ffencedcode 'paragraph with trailing fenced block' \
 'text text text
 text text text
 ~~~
@@ -96,14 +123,14 @@ text text text
 code code code?
 ~~~</p>'
 
-try 'fenced code blocks with backtick delimiters' \
+try  -ffencedcode 'fenced code blocks with backtick delimiters' \
 '```
 code
 ```' \
 '<pre><code>code
 </code></pre>'
 
-try 'fenced code block with mismatched delimters' \
+try  -ffencedcode 'fenced code block with mismatched delimters' \
 '```
 code
 ~~~' \
@@ -111,56 +138,54 @@ code
 code
 ~~~</p>'
 
-try 'fenced code block with lang attribute' \
+try  -ffencedcode 'fenced code block with lang attribute' \
 '```lang
 code
 ```' \
 '<pre><code class="lang">code
 </code></pre>'
 
-try 'fenced code block with lang-name attribute' \
+try  -ffencedcode 'fenced code block with lang-name attribute' \
 '```lang-name
 code
 ```' \
 '<pre><code class="lang-name">code
 </code></pre>'
 
-try 'fenced code block with lang_name attribute' \
+try  -ffencedcode 'fenced code block with lang_name attribute' \
 '```lang_name
 code
 ```' \
 '<pre><code class="lang_name">code
 </code></pre>'
 
-try 'fenced code block with lang attribute and space' \
+try  -ffencedcode 'fenced code block with lang attribute and space' \
 '``` lang
 code
 ```' \
 '<pre><code class="lang">code
 </code></pre>'
 
-try 'fenced code block with lang attribute and multiple spaces' \
+try  -ffencedcode 'fenced code block with lang attribute and multiple spaces' \
 '```       lang
 code
 ```' \
 '<pre><code class="lang">code
 </code></pre>'
 
-try 'fenced code block with lang-name attribute and space' \
+try  -ffencedcode 'fenced code block with lang-name attribute and space' \
 '``` lang-name
 code
 ```' \
 '<pre><code class="lang-name">code
 </code></pre>'
 
-try 'fenced code block with lang_name attribute and space' \
+try  -ffencedcode 'fenced code block with lang_name attribute and space' \
 '``` lang_name
 code
 ```' \
 '<pre><code class="lang_name">code
 </code></pre>'
 
-fi
-
 summary $0
 exit $rc
diff --git a/version.c.in b/version.c.in
index f36b4b86..a4664739 100644
--- a/version.c.in
+++ b/version.c.in
@@ -12,8 +12,5 @@ char markdown_version[] = VERSION
 #endif
 #if WITH_GITHUB_TAGS
 		" GITHUB-TAGS"
-#endif
-#if WITH_FENCED_CODE
-		" FENCED-CODE"
 #endif
 		;

From 2ff7c1f41b52921c3abea46ded8714b4fd9698b4 Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <binki@gentoo.org>
Date: Mon, 13 Jul 2015 00:32:32 +0000
Subject: [PATCH 5/7] Convert compiletime ID Anchor setting to runtime flag for
 issue #124.

Now specify flag `-fidanchor` or `MKD_IDANCHOR` instead of
`./configure.sh --with-id-anchor`. In `markdown -VV` displays as
`IDANCHOR` or `!IDANCHOR` rather than `ID-ANCHOR`.
---
 configure.sh  |  4 +---
 flags.c       |  1 +
 generate.c    | 38 +++++++++++++++++++-------------------
 markdown.1    |  2 ++
 markdown.3    |  2 ++
 markdown.h    |  1 +
 mkdio.h.in    |  1 +
 pgm_options.c |  1 +
 tests/toc.t   | 49 ++++++++++++++++++++++++-------------------------
 version.c.in  |  3 ---
 10 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/configure.sh b/configure.sh
index 17e98ae2..93c96a9c 100755
--- a/configure.sh
+++ b/configure.sh
@@ -9,7 +9,6 @@
 #
 ac_help='--enable-amalloc	Enable memory allocation debugging
 --with-tabstops=N	Set tabstops to N characters (default is 4)
---with-id-anchor	Use id= anchors for table-of-contents links
 --with-github-tags	Allow `_` and `-` in <> tags
 --with-urlencoded-anchor	Use url-encoded chars to multibyte chars in toc links
 --enable-all-features	Turn on all stable optional features
@@ -46,14 +45,13 @@ TARGET=markdown
 
 AC_INIT $TARGET
 
-for banned_with in dl fenced-code; do
+for banned_with in dl fenced-code id-anchor; do
     banned_with_variable_ref=\$WITH_`echo "$banned_with" | $AC_UPPERCASE | tr - _`
     if [ "`eval echo "$banned_with_variable_ref"`" ]; then
 	AC_FAIL "Invalid option: --with-$banned_with. Please use a runtime flag to configure this feature."
     fi
 done
 
-test "$WITH_ID_ANCHOR" && AC_DEFINE 'WITH_ID_ANCHOR' 1
 test "$WITH_GITHUB_TAGS" && AC_DEFINE 'WITH_GITHUB_TAGS' 1
 test "$WITH_URLENCODED_ANCHOR" && AC_DEFINE 'WITH_URLENCODED_ANCHOR' 1
 test "$DEBIAN_GLITCH" && AC_DEFINE 'DEBIAN_GLITCH' 1
diff --git a/flags.c b/flags.c
index cb7221aa..53717d54 100644
--- a/flags.c
+++ b/flags.c
@@ -33,6 +33,7 @@ static struct flagnames flagnames[] = {
     { MKD_NODLDISCOUNT,   "!DLDISCOUNT" },
     { MKD_DLEXTRA,        "DLEXTRA" },
     { MKD_FENCEDCODE,     "FENCEDCODE" },
+    { MKD_IDANCHOR,       "IDANCHOR" },
 };
 #define NR(x)	(sizeof x/sizeof x[0])
 
diff --git a/generate.c b/generate.c
index 6573fc49..a91949ea 100644
--- a/generate.c
+++ b/generate.c
@@ -1426,26 +1426,26 @@ text(MMIOT *f)
 static void
 printheader(Paragraph *pp, MMIOT *f)
 {
-#if WITH_ID_ANCHOR
-    Qprintf(f, "<h%d", pp->hnumber);
-    if ( f->flags & MKD_TOC ) {
-	Qstring(" id=\"", f);
-	mkd_string_to_anchor(T(pp->text->text),
-			     S(pp->text->text),
-			     (mkd_sta_function_t)Qchar, f, 1);
-	Qchar('"', f);
-    }
-    Qchar('>', f);
-#else
-    if ( f->flags & MKD_TOC ) {
-	Qstring("<a name=\"", f);
-	mkd_string_to_anchor(T(pp->text->text),
-			     S(pp->text->text),
-			     (mkd_sta_function_t)Qchar, f, 1);
-	Qstring("\"></a>\n", f);
+    if ( f->flags & MKD_IDANCHOR ) {
+	Qprintf(f, "<h%d", pp->hnumber);
+	if ( f->flags & MKD_TOC ) {
+	    Qstring(" id=\"", f);
+	    mkd_string_to_anchor(T(pp->text->text),
+				 S(pp->text->text),
+				 (mkd_sta_function_t)Qchar, f, 1);
+	    Qchar('"', f);
+	}
+	Qchar('>', f);
+    } else {
+	if ( f->flags & MKD_TOC ) {
+	    Qstring("<a name=\"", f);
+	    mkd_string_to_anchor(T(pp->text->text),
+				 S(pp->text->text),
+				 (mkd_sta_function_t)Qchar, f, 1);
+	    Qstring("\"></a>\n", f);
+	}
+	Qprintf(f, "<h%d>", pp->hnumber);
     }
-    Qprintf(f, "<h%d>", pp->hnumber);
-#endif
     push(T(pp->text->text), S(pp->text->text), f);
     text(f);
     Qprintf(f, "</h%d>", pp->hnumber);
diff --git a/markdown.1 b/markdown.1
index bdbcc1af..b31ab096 100644
--- a/markdown.1
+++ b/markdown.1
@@ -121,6 +121,8 @@ Allow markdown extra-style footnotes.
 Extract <style> blocks from the output.
 .It Ar fencedcode
 Allow fenced code blocks (not default).
+.It Ar idanchor
+Use id= anchors for table-of-contents links instead of <a name=/> (not default).
 .El
 .Pp
 As an example, the option
diff --git a/markdown.3 b/markdown.3
index 71831c7a..9e9ac5c5 100644
--- a/markdown.3
+++ b/markdown.3
@@ -114,6 +114,8 @@ Enable markdown extra-style footnotes.
 Do not extract (omit) <style/> blocks from the output.
 .It Ar MKD_FENCEDCODE
 Allow fenced code blocks.
+.It Ar MKD_IDANCHOR
+Use id= anchors instead of <a name=/> for table-of-contents links.
 .El
 .Sh RETURN VALUES
 .Fn markdown
diff --git a/markdown.h b/markdown.h
index b8d17397..51ed602c 100644
--- a/markdown.h
+++ b/markdown.h
@@ -132,6 +132,7 @@ typedef struct mmiot {
 #define MKD_NODLDISCOUNT 0x00800000
 #define	MKD_DLEXTRA	0x01000000
 #define MKD_FENCEDCODE	0x02000000
+#define MKD_IDANCHOR	0x04000000
 #define IS_LABEL	0x08000000
 #define USER_FLAGS	0x0FFFFFFF
 #define INPUT_MASK	(MKD_NOHEADER|MKD_TABSTOP)
diff --git a/mkdio.h.in b/mkdio.h.in
index 46ebe064..51ba87fe 100644
--- a/mkdio.h.in
+++ b/mkdio.h.in
@@ -109,6 +109,7 @@ void mkd_ref_prefix(MMIOT*, char*);
 #define MKD_NODLDISCOUNT 0x00800000	/* disable discount-style definition lists */
 #define	MKD_DLEXTRA	0x01000000	/* enable extra-style definition lists */
 #define MKD_FENCEDCODE	0x02000000	/* enabled fenced code blocks */
+#define MKD_IDANCHOR	0x04000000	/* use id= anchors for TOC links */
 
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
diff --git a/pgm_options.c b/pgm_options.c
index 3dad63b6..d25bfe5a 100644
--- a/pgm_options.c
+++ b/pgm_options.c
@@ -58,6 +58,7 @@ static struct _opt {
     { "dldiscount",    "discount-style definition lists", 1, 0, 1, MKD_NODLDISCOUNT },
     { "dlextra",       "extra-style definition lists", 0, 0, 1, MKD_DLEXTRA },
     { "fencedcode",    "fenced code blocks",         0, 0, 1, MKD_FENCEDCODE },
+    { "idanchor",      "id= anchors in TOC",         0, 0, 1, MKD_IDANCHOR },
 } ;
 
 #define NR(x)	(sizeof x / sizeof x[0])
diff --git a/tests/toc.t b/tests/toc.t
index 7f6057af..59f39129 100644
--- a/tests/toc.t
+++ b/tests/toc.t
@@ -4,14 +4,13 @@
 rc=0
 MARKDOWN_FLAGS=
 
-if ./markdown -V | grep ID-ANCHOR >/dev/null; then
-    # old-style; uses id= tag (and collides
-    # with #-style css)
-
-    title "(old) table-of-contents support"
-    
-    try '-T -ftoc' 'table of contents' \
-    '#H1
+# old-style; uses id= tag (and collides
+# with #-style css)
+
+title "(old) table-of-contents support"
+
+try -fidanchor '-T -ftoc' 'table of contents' \
+'#H1
 hi' \
 '<ul>
  <li><a href="#H1">H1</a></li>
@@ -20,8 +19,8 @@ hi' \
 
 <p>hi</p>'
 
-    try '-T -ftoc' 'toc item with link' \
-    '##[H2](H2) here' \
+try -fidanchor '-T -ftoc' 'toc item with link' \
+'##[H2](H2) here' \
 '<ul>
  <li>
  <ul>
@@ -31,21 +30,22 @@ hi' \
 </ul>
 <h2 id="H2.here"><a href="H2">H2</a> here</h2>'  
 
-    try '-T -ftoc' 'toc item with non-alpha start' \
-    '#1 header' \
+try -fidanchor '-T -ftoc' 'toc item with non-alpha start' \
+'#1 header' \
 '<ul>
  <li><a href="#L1.header">1 header</a></li>
 </ul>
 <h1 id="L1.header">1 header</h1>'
 
-else
-    # new-style; uses a (depreciated) name=
-    # inside a null <a> tag
-    
-    title "(new) table-of-contents support"
-    
-    try '-T -ftoc' 'table of contents' \
-    '#H1
+summary $0
+
+# new-style; uses a (depreciated) name=
+# inside a null <a> tag
+
+title "(new) table-of-contents support"
+
+try '-T -ftoc' 'table of contents' \
+'#H1
 hi' \
 '<ul>
  <li><a href="#H1">H1</a></li>
@@ -55,8 +55,8 @@ hi' \
 
 <p>hi</p>'
 
-    try '-T -ftoc' 'toc item with link' \
-    '##[H2](H2) here' \
+try '-T -ftoc' 'toc item with link' \
+'##[H2](H2) here' \
 '<ul>
  <li>
  <ul>
@@ -67,14 +67,13 @@ hi' \
 <a name="H2.here"></a>
 <h2><a href="H2">H2</a> here</h2>'  
 
-    try '-T -ftoc' 'toc item with non-alpha start' \
-    '#1 header' \
+try '-T -ftoc' 'toc item with non-alpha start' \
+'#1 header' \
 '<ul>
  <li><a href="#L1.header">1 header</a></li>
 </ul>
 <a name="L1.header"></a>
 <h1>1 header</h1>'
-fi
 
 summary $0
 exit $rc
diff --git a/version.c.in b/version.c.in
index a4664739..1166419a 100644
--- a/version.c.in
+++ b/version.c.in
@@ -7,9 +7,6 @@ char markdown_version[] = VERSION
 #if USE_AMALLOC
 		" DEBUG"
 #endif
-#if WITH_ID_ANCHOR
-		" ID-ANCHOR"
-#endif
 #if WITH_GITHUB_TAGS
 		" GITHUB-TAGS"
 #endif

From 5790b66a4aaca06dd1e7e058bbe45c0b307bd5fb Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <binki@gentoo.org>
Date: Mon, 13 Jul 2015 01:50:46 +0000
Subject: [PATCH 6/7] Make githubtags configurable at runtime for issue #124.

Instead of `./configure.sh --with-github-tags`, specify `-fgithubtags`
or `MKD_GITHUBTAGS`. Shows up in `markdown -VV` as `GITHUBTAGS`
instead of `GITHUB-TAGS` now.
---
 configure.sh       |  4 +---
 flags.c            |  1 +
 generate.c         |  8 +++-----
 markdown.1         |  2 ++
 markdown.3         |  2 ++
 markdown.h         |  5 +++--
 mkdio.h.in         |  1 +
 pgm_options.c      |  1 +
 tests/githubtags.t | 23 +++++++++++++++++++++++
 version.c.in       |  3 ---
 10 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 tests/githubtags.t

diff --git a/configure.sh b/configure.sh
index 93c96a9c..964b1204 100755
--- a/configure.sh
+++ b/configure.sh
@@ -9,7 +9,6 @@
 #
 ac_help='--enable-amalloc	Enable memory allocation debugging
 --with-tabstops=N	Set tabstops to N characters (default is 4)
---with-github-tags	Allow `_` and `-` in <> tags
 --with-urlencoded-anchor	Use url-encoded chars to multibyte chars in toc links
 --enable-all-features	Turn on all stable optional features
 --shared		Build shared libraries (default is static)'
@@ -45,14 +44,13 @@ TARGET=markdown
 
 AC_INIT $TARGET
 
-for banned_with in dl fenced-code id-anchor; do
+for banned_with in dl fenced-code id-anchor github-tags; do
     banned_with_variable_ref=\$WITH_`echo "$banned_with" | $AC_UPPERCASE | tr - _`
     if [ "`eval echo "$banned_with_variable_ref"`" ]; then
 	AC_FAIL "Invalid option: --with-$banned_with. Please use a runtime flag to configure this feature."
     fi
 done
 
-test "$WITH_GITHUB_TAGS" && AC_DEFINE 'WITH_GITHUB_TAGS' 1
 test "$WITH_URLENCODED_ANCHOR" && AC_DEFINE 'WITH_URLENCODED_ANCHOR' 1
 test "$DEBIAN_GLITCH" && AC_DEFINE 'DEBIAN_GLITCH' 1
 
diff --git a/flags.c b/flags.c
index 53717d54..3b12797e 100644
--- a/flags.c
+++ b/flags.c
@@ -34,6 +34,7 @@ static struct flagnames flagnames[] = {
     { MKD_DLEXTRA,        "DLEXTRA" },
     { MKD_FENCEDCODE,     "FENCEDCODE" },
     { MKD_IDANCHOR,       "IDANCHOR" },
+    { MKD_GITHUBTAGS,     "GITHUBTAGS" },
 };
 #define NR(x)	(sizeof x/sizeof x[0])
 
diff --git a/generate.c b/generate.c
index a91949ea..888eeea8 100644
--- a/generate.c
+++ b/generate.c
@@ -1009,11 +1009,9 @@ maybe_tag_or_link(MMIOT *f)
 	}
 	else if ( isspace(c) )
 	    break;
-#if WITH_GITHUB_TAGS
-	else if ( ! (c == '/' || c == '-' || c == '_' || isalnum(c) ) )
-#else
-	else if ( ! (c == '/' || isalnum(c) ) )
-#endif
+	else if ( ! (c == '/'
+		     || (f->flags & MKD_GITHUBTAGS && (c == '-' || c == '_'))
+		     || isalnum(c) ) )
 	    maybetag=0;
     }
 
diff --git a/markdown.1 b/markdown.1
index b31ab096..eded7f49 100644
--- a/markdown.1
+++ b/markdown.1
@@ -123,6 +123,8 @@ Extract <style> blocks from the output.
 Allow fenced code blocks (not default).
 .It Ar idanchor
 Use id= anchors for table-of-contents links instead of <a name=/> (not default).
+.It Ar githubtags
+Allow underscore and dash in passed through element names (not default).
 .El
 .Pp
 As an example, the option
diff --git a/markdown.3 b/markdown.3
index 9e9ac5c5..f60fc62a 100644
--- a/markdown.3
+++ b/markdown.3
@@ -116,6 +116,8 @@ Do not extract (omit) <style/> blocks from the output.
 Allow fenced code blocks.
 .It Ar MKD_IDANCHOR
 Use id= anchors instead of <a name=/> for table-of-contents links.
+.It Ar MKD_GITHUBTAGS
+Allow underscore and dash in passed through element names.
 .El
 .Sh RETURN VALUES
 .Fn markdown
diff --git a/markdown.h b/markdown.h
index 51ed602c..6cfcc3d2 100644
--- a/markdown.h
+++ b/markdown.h
@@ -133,8 +133,9 @@ typedef struct mmiot {
 #define	MKD_DLEXTRA	0x01000000
 #define MKD_FENCEDCODE	0x02000000
 #define MKD_IDANCHOR	0x04000000
-#define IS_LABEL	0x08000000
-#define USER_FLAGS	0x0FFFFFFF
+#define MKD_GITHUBTAGS	0x08000000
+#define IS_LABEL	0x40000000
+#define USER_FLAGS	0x7FFFFFFF
 #define INPUT_MASK	(MKD_NOHEADER|MKD_TABSTOP)
 
     Callback_data *cb;
diff --git a/mkdio.h.in b/mkdio.h.in
index 51ba87fe..0899af1f 100644
--- a/mkdio.h.in
+++ b/mkdio.h.in
@@ -110,6 +110,7 @@ void mkd_ref_prefix(MMIOT*, char*);
 #define	MKD_DLEXTRA	0x01000000	/* enable extra-style definition lists */
 #define MKD_FENCEDCODE	0x02000000	/* enabled fenced code blocks */
 #define MKD_IDANCHOR	0x04000000	/* use id= anchors for TOC links */
+#define MKD_GITHUBTAGS	0x08000000	/* allow dash and underscore in element names */
 
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
diff --git a/pgm_options.c b/pgm_options.c
index d25bfe5a..8a66c163 100644
--- a/pgm_options.c
+++ b/pgm_options.c
@@ -59,6 +59,7 @@ static struct _opt {
     { "dlextra",       "extra-style definition lists", 0, 0, 1, MKD_DLEXTRA },
     { "fencedcode",    "fenced code blocks",         0, 0, 1, MKD_FENCEDCODE },
     { "idanchor",      "id= anchors in TOC",         0, 0, 1, MKD_IDANCHOR },
+    { "githubtags",    "permit - and _ in element names", 0, 0, 0, MKD_GITHUBTAGS },
 } ;
 
 #define NR(x)	(sizeof x / sizeof x[0])
diff --git a/tests/githubtags.t b/tests/githubtags.t
new file mode 100644
index 00000000..6990a661
--- /dev/null
+++ b/tests/githubtags.t
@@ -0,0 +1,23 @@
+. tests/functions.sh
+
+title "github tags"
+
+rc=0
+MARKDOWN_FLAGS=
+
+SRC='<element-name>content</element-name>'
+
+try 'github tags disabled by default' \
+"$SRC" \
+'<p>&lt;element-name>content&lt;/element-name></p>'
+
+try -fgithubtags 'github tags' \
+"$SRC" \
+'<p><element-name>content</element-name></p>'
+
+try 'normal tags pass through' \
+'<a>sdf</a>' \
+'<p><a>sdf</a></p>'
+
+summary $0
+exit $rc
diff --git a/version.c.in b/version.c.in
index 1166419a..718df784 100644
--- a/version.c.in
+++ b/version.c.in
@@ -6,8 +6,5 @@ char markdown_version[] = VERSION
 #endif
 #if USE_AMALLOC
 		" DEBUG"
-#endif
-#if WITH_GITHUB_TAGS
-		" GITHUB-TAGS"
 #endif
 		;

From 5da3388382fe73366d3afa4a1245aee62f49d54c Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <binki@gentoo.org>
Date: Mon, 13 Jul 2015 02:42:17 +0000
Subject: [PATCH 7/7] Convert urlencodedanchor to a runtime flag for issue
 #124.

Instead of `./configure.sh --with-urlencoded-anchor`, now use
`-furlencodedanchor` or `MKD_URLENCODEDANCHOR`.
---
 configure.sh  |  4 +---
 flags.c       |  1 +
 generate.c    |  4 ++--
 markdown.1    |  2 ++
 markdown.3    |  2 ++
 markdown.h    |  7 ++++---
 mkdio.c       | 20 ++++++++------------
 mkdio.h.in    |  1 +
 pgm_options.c |  1 +
 tests/toc.t   |  9 +++++++++
 toc.c         |  4 ++--
 11 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/configure.sh b/configure.sh
index 964b1204..9c72a053 100755
--- a/configure.sh
+++ b/configure.sh
@@ -9,7 +9,6 @@
 #
 ac_help='--enable-amalloc	Enable memory allocation debugging
 --with-tabstops=N	Set tabstops to N characters (default is 4)
---with-urlencoded-anchor	Use url-encoded chars to multibyte chars in toc links
 --enable-all-features	Turn on all stable optional features
 --shared		Build shared libraries (default is static)'
 
@@ -44,14 +43,13 @@ TARGET=markdown
 
 AC_INIT $TARGET
 
-for banned_with in dl fenced-code id-anchor github-tags; do
+for banned_with in dl fenced-code id-anchor github-tags urlencoded-anchor; do
     banned_with_variable_ref=\$WITH_`echo "$banned_with" | $AC_UPPERCASE | tr - _`
     if [ "`eval echo "$banned_with_variable_ref"`" ]; then
 	AC_FAIL "Invalid option: --with-$banned_with. Please use a runtime flag to configure this feature."
     fi
 done
 
-test "$WITH_URLENCODED_ANCHOR" && AC_DEFINE 'WITH_URLENCODED_ANCHOR' 1
 test "$DEBIAN_GLITCH" && AC_DEFINE 'DEBIAN_GLITCH' 1
 
 AC_PROG_CC
diff --git a/flags.c b/flags.c
index 3b12797e..0bd146d8 100644
--- a/flags.c
+++ b/flags.c
@@ -35,6 +35,7 @@ static struct flagnames flagnames[] = {
     { MKD_FENCEDCODE,     "FENCEDCODE" },
     { MKD_IDANCHOR,       "IDANCHOR" },
     { MKD_GITHUBTAGS,     "GITHUBTAGS" },
+    { MKD_URLENCODEDANCHOR, "URLENCODEDANCHOR" },
 };
 #define NR(x)	(sizeof x/sizeof x[0])
 
diff --git a/generate.c b/generate.c
index 888eeea8..2bef56eb 100644
--- a/generate.c
+++ b/generate.c
@@ -1430,7 +1430,7 @@ printheader(Paragraph *pp, MMIOT *f)
 	    Qstring(" id=\"", f);
 	    mkd_string_to_anchor(T(pp->text->text),
 				 S(pp->text->text),
-				 (mkd_sta_function_t)Qchar, f, 1);
+				 (mkd_sta_function_t)Qchar, f, 1, f->flags);
 	    Qchar('"', f);
 	}
 	Qchar('>', f);
@@ -1439,7 +1439,7 @@ printheader(Paragraph *pp, MMIOT *f)
 	    Qstring("<a name=\"", f);
 	    mkd_string_to_anchor(T(pp->text->text),
 				 S(pp->text->text),
-				 (mkd_sta_function_t)Qchar, f, 1);
+				 (mkd_sta_function_t)Qchar, f, 1, f->flags);
 	    Qstring("\"></a>\n", f);
 	}
 	Qprintf(f, "<h%d>", pp->hnumber);
diff --git a/markdown.1 b/markdown.1
index eded7f49..481a3e1e 100644
--- a/markdown.1
+++ b/markdown.1
@@ -125,6 +125,8 @@ Allow fenced code blocks (not default).
 Use id= anchors for table-of-contents links instead of <a name=/> (not default).
 .It Ar githubtags
 Allow underscore and dash in passed through element names (not default).
+.It Ar urlencodedanchor
+Use url-encoded chars for multibyte and nonalphanumeric chars rather than dots in toc links.
 .El
 .Pp
 As an example, the option
diff --git a/markdown.3 b/markdown.3
index f60fc62a..02286074 100644
--- a/markdown.3
+++ b/markdown.3
@@ -118,6 +118,8 @@ Allow fenced code blocks.
 Use id= anchors instead of <a name=/> for table-of-contents links.
 .It Ar MKD_GITHUBTAGS
 Allow underscore and dash in passed through element names.
+.It Ar MKD_URLENCODEDANCHOR
+Use url-encoded chars for multibyte and nonalphanumeric chars rather than dots in toc links.
 .El
 .Sh RETURN VALUES
 .Fn markdown
diff --git a/markdown.h b/markdown.h
index 6cfcc3d2..8c6d7097 100644
--- a/markdown.h
+++ b/markdown.h
@@ -134,8 +134,9 @@ typedef struct mmiot {
 #define MKD_FENCEDCODE	0x02000000
 #define MKD_IDANCHOR	0x04000000
 #define MKD_GITHUBTAGS	0x08000000
-#define IS_LABEL	0x40000000
-#define USER_FLAGS	0x7FFFFFFF
+#define MKD_URLENCODEDANCHOR 0x10000000
+#define IS_LABEL	0x20000000
+#define USER_FLAGS	0x3FFFFFFF
 #define INPUT_MASK	(MKD_NOHEADER|MKD_TABSTOP)
 
     Callback_data *cb;
@@ -195,7 +196,7 @@ extern int  mkd_generateline(char *, int, FILE*, DWORD);
 extern void mkd_basename(Document*, char *);
 
 typedef int (*mkd_sta_function_t)(const int,const void*);
-extern void mkd_string_to_anchor(char*,int, mkd_sta_function_t, void*, int);
+extern void mkd_string_to_anchor(char*,int, mkd_sta_function_t, void*, int, DWORD);
 
 extern Document *mkd_in(FILE *, DWORD);
 extern Document *mkd_string(const char*,int, DWORD);
diff --git a/mkdio.c b/mkdio.c
index fd6105df..765c659a 100644
--- a/mkdio.c
+++ b/mkdio.c
@@ -213,37 +213,33 @@ markdown(Document *document, FILE *out, int flags)
  */
 void
 mkd_string_to_anchor(char *s, int len, mkd_sta_function_t outchar,
-				       void *out, int labelformat)
+				       void *out, int labelformat,
+				       DWORD flags)
 {
-#if WITH_URLENCODED_ANCHOR
     static const unsigned char hexchars[] = "0123456789abcdef";
-#endif
     unsigned char c;
 
     int i, size;
     char *line;
 
     size = mkd_line(s, len, &line, IS_LABEL);
-    
-#if !WITH_URLENCODED_ANCHOR
-    if ( labelformat && (size>0) && !isalpha(line[0]) )
+
+    if ( !(flags & MKD_URLENCODEDANCHOR)
+	 && labelformat
+	 && (size>0) && !isalpha(line[0]) )
 	(*outchar)('L',out);
-#endif
     for ( i=0; i < size ; i++ ) {
 	c = line[i];
 	if ( labelformat ) {
 	    if ( isalnum(c) || (c == '_') || (c == ':') || (c == '-') || (c == '.' ) )
 		(*outchar)(c, out);
-	    else
-#if WITH_URLENCODED_ANCHOR
-	    {
+	    else if ( flags & MKD_URLENCODEDANCHOR ) {
 		(*outchar)('%', out);
 		(*outchar)(hexchars[c >> 4 & 0xf], out);
 		(*outchar)(hexchars[c      & 0xf], out);
 	    }
-#else
+	    else
 		(*outchar)('.', out);
-#endif
 	}
 	else
 	    (*outchar)(c,out);
diff --git a/mkdio.h.in b/mkdio.h.in
index 0899af1f..ffd82fb5 100644
--- a/mkdio.h.in
+++ b/mkdio.h.in
@@ -111,6 +111,7 @@ void mkd_ref_prefix(MMIOT*, char*);
 #define MKD_FENCEDCODE	0x02000000	/* enabled fenced code blocks */
 #define MKD_IDANCHOR	0x04000000	/* use id= anchors for TOC links */
 #define MKD_GITHUBTAGS	0x08000000	/* allow dash and underscore in element names */
+#define MKD_URLENCODEDANCHOR 0x10000000 /* urlencode non-identifier chars instead of replacing with dots */
 
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
diff --git a/pgm_options.c b/pgm_options.c
index 8a66c163..c64515c3 100644
--- a/pgm_options.c
+++ b/pgm_options.c
@@ -60,6 +60,7 @@ static struct _opt {
     { "fencedcode",    "fenced code blocks",         0, 0, 1, MKD_FENCEDCODE },
     { "idanchor",      "id= anchors in TOC",         0, 0, 1, MKD_IDANCHOR },
     { "githubtags",    "permit - and _ in element names", 0, 0, 0, MKD_GITHUBTAGS },
+    { "urlencodedanchor", "urlencode special chars in TOC links", 0, 0, 0, MKD_URLENCODEDANCHOR },
 } ;
 
 #define NR(x)	(sizeof x / sizeof x[0])
diff --git a/tests/toc.t b/tests/toc.t
index 59f39129..2fc2628c 100644
--- a/tests/toc.t
+++ b/tests/toc.t
@@ -75,5 +75,14 @@ try '-T -ftoc' 'toc item with non-alpha start' \
 <a name="L1.header"></a>
 <h1>1 header</h1>'
 
+# Be sure to save toc.t as UTF-8.
+try '-T -ftoc,urlencodedanchor' 'urlencoded multibyte chars' \
+'#It’s an apostrophe' \
+'<ul>
+ <li><a href="#It%e2%80%99s%20an%20apostrophe">It’s an apostrophe</a></li>
+</ul>
+<a name="It%e2%80%99s%20an%20apostrophe"></a>
+<h1>It’s an apostrophe</h1>'
+
 summary $0
 exit $rc
diff --git a/toc.c b/toc.c
index 8037e360..885b3dfb 100644
--- a/toc.c
+++ b/toc.c
@@ -62,11 +62,11 @@ mkd_toc(Document *p, char **doc)
 		    Csprintf(&res, "%*s<li><a href=\"#", srcp->hnumber, "");
 		    mkd_string_to_anchor(T(srcp->text->text),
 					 S(srcp->text->text),
-					 (mkd_sta_function_t)Csputc, &res,1);
+					 (mkd_sta_function_t)Csputc, &res,1,p->ctx->flags);
 		    Csprintf(&res, "\">");
 		    mkd_string_to_anchor(T(srcp->text->text),
 					 S(srcp->text->text),
-					 (mkd_sta_function_t)Csputc, &res,0);
+					 (mkd_sta_function_t)Csputc, &res,0,p->ctx->flags);
 		    Csprintf(&res, "</a>");
 
 		    first = 0;