Merge pull request #190 from anthonyfok/add-flag-for-smart-dashes

Add HTML_SMARTYPANTS_DASHES for toggling smart dashes

html.go

@@ -39,7 +39,8 @@ const (
 	HTML_USE_XHTML                             // generate XHTML output instead of HTML
 	HTML_USE_SMARTYPANTS                       // enable smart punctuation substitutions
 	HTML_SMARTYPANTS_FRACTIONS                 // enable smart fractions (with HTML_USE_SMARTYPANTS)
-	HTML_SMARTYPANTS_LATEX_DASHES              // enable LaTeX-style dashes (with HTML_USE_SMARTYPANTS)
+	HTML_SMARTYPANTS_DASHES                    // enable smart dashes (with HTML_USE_SMARTYPANTS)
+	HTML_SMARTYPANTS_LATEX_DASHES              // enable LaTeX-style dashes (with HTML_USE_SMARTYPANTS and HTML_SMARTYPANTS_DASHES)
 	HTML_SMARTYPANTS_ANGLED_QUOTES             // enable angled double quotes (with HTML_USE_SMARTYPANTS) for double quotes rendering
 	HTML_FOOTNOTE_RETURN_LINKS                 // generate a link at the end of a footnote to return to the source
 )

markdown.go

@@ -50,6 +50,7 @@ const (
 		HTML_USE_XHTML |
 		HTML_USE_SMARTYPANTS |
 		HTML_SMARTYPANTS_FRACTIONS |
+		HTML_SMARTYPANTS_DASHES |
 		HTML_SMARTYPANTS_LATEX_DASHES
 
 	commonExtensions = 0 |

smartypants.go

@@ -378,10 +378,12 @@ func smartypants(flags int) *smartypantsRenderer {
 	}
 	r['\''] = smartSingleQuote
 	r['('] = smartParens
-	if flags&HTML_SMARTYPANTS_LATEX_DASHES == 0 {
-		r['-'] = smartDash
-	} else {
-		r['-'] = smartDashLatex
+	if flags&HTML_SMARTYPANTS_DASHES != 0 {
+		if flags&HTML_SMARTYPANTS_LATEX_DASHES == 0 {
+			r['-'] = smartDash
+		} else {
+			r['-'] = smartDashLatex
+		}
 	}
 	r['.'] = smartPeriod
 	if flags&HTML_SMARTYPANTS_FRACTIONS == 0 {