public
/
chroma-markdown
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: public:master
Branches Tags
public:master
public:v0.1.3
public:v0.1.2
public:v0.1.1
public:v0.1.0
..
compare: public:v0.1.2
Branches Tags
public:master
public:v0.1.3
public:v0.1.2
public:v0.1.1
public:v0.1.0

No commits in common. "master" and "v0.1.2" have entirely different histories.
master ... v0.1.2

1 changed files with 14 additions and 22 deletions
Show Stats Expand all files Collapse all files

16
main.go
View File

@ -88,7 +88,7 @@ func highlight(w io.Writer, source, lexer, style string) error {
return f.Format(w, s, it) return f.Format(w, s, it)
} }
const Version = "0.1.3" const Version = "0.1.2"
func main() { func main() {
css := flag.String("css", "", "Path to a CSS import to include at the beginning of the output") css := flag.String("css", "", "Path to a CSS import to include at the beginning of the output")
@ -119,7 +119,6 @@ func main() {
bs := bufio.NewScanner(r) bs := bufio.NewScanner(r)
lang := "" lang := ""
needCSS := false needCSS := false
cmark, lookErr := exec.LookPath("cmark-gfm")
for bs.Scan() { for bs.Scan() {
text := bs.Text() text := bs.Text()
trimmed := strings.TrimSpace(text) trimmed := strings.TrimSpace(text)
@ -142,12 +141,6 @@ func main() {
currentCodeBlock.WriteString(text) currentCodeBlock.WriteString(text)
currentCodeBlock.WriteByte('\n') currentCodeBlock.WriteByte('\n')
} else { } else {
/* If cmark is not installed then discount will be used, and we have to
* do some encoding ourselves. */
if lookErr != nil {
text = strings.Replace(text, "\\<", "&lt;", -1)
text = strings.Replace(text, "\\>", "&gt;", -1)
}
out.WriteString(text) out.WriteString(text)
out.WriteByte('\n') out.WriteByte('\n')
} }
@ -164,13 +157,12 @@ func main() {
checkError(writeErr, "writing data to temporary file") checkError(writeErr, "writing data to temporary file")
// shell out to markdown because of // shell out to markdown because of
// https://github.com/russross/blackfriday/issues/403 // https://github.com/russross/blackfriday/issues/403
var args []string cmark, lookErr := exec.LookPath("cmark")
args := []string{cmark, "--unsafe", f.Name()}
if lookErr != nil { if lookErr != nil {
cmark, lookErr = exec.LookPath("markdown") cmark, lookErr = exec.LookPath("markdown")
checkError(lookErr, "finding markdown binary") checkError(lookErr, "finding markdown binary")
args = []string{cmark, "-f", "smarty,pants", f.Name()} args = []string{cmark, f.Name()}
} else {
args = []string{cmark, "--smart", "--unsafe", "--extension", "table", f.Name()}
} }
execErr := localExec(cmark, args, []string{}) execErr := localExec(cmark, args, []string{})
checkError(execErr, "executing markdown binary") checkError(execErr, "executing markdown binary")