mirror of
https://github.com/danog/blackfriday.git
synced 2024-11-26 20:14:43 +01:00
updates for go 1
This commit is contained in:
Russ Ross
parent
6bc8c7a22b
commit
a5441fd99f
12
Makefile
12
Makefile
@ -1,12 +0,0 @@
|
||||
include $(GOROOT)/src/Make.inc
|
||||
|
||||
TARG=github.com/russross/blackfriday
|
||||
|
||||
GOFILES=markdown.go block.go inline.go html.go smartypants.go latex.go
|
||||
|
||||
all: package markdown
|
||||
|
||||
include $(GOROOT)/src/Make.pkg
|
||||
|
||||
markdown: package
|
||||
make -C example
|
||||
@ -1,12 +0,0 @@
|
||||
include $(GOROOT)/src/Make.inc
|
||||
|
||||
TARG=markdown
|
||||
|
||||
GOFILES=main.go
|
||||
|
||||
markdown: ../_obj/github.com/russross/blackfriday.a
|
||||
|
||||
GC += -I../_obj/
|
||||
LD += -L../_obj/
|
||||
|
||||
include $(GOROOT)/src/Make.cmd
|
||||
228
example/main.go
228
example/main.go
@ -1,228 +0,0 @@
|
||||
//
|
||||
// Blackfriday Markdown Processor
|
||||
// Available at http://github.com/russross/blackfriday
|
||||
//
|
||||
// Copyright © 2011 Russ Ross <russ@russross.com>.
|
||||
// Distributed under the Simplified BSD License.
|
||||
// See README.md for details.
|
||||
//
|
||||
|
||||
//
|
||||
//
|
||||
// Example front-end for command-line use
|
||||
//
|
||||
//
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"github.com/russross/blackfriday"
|
||||
"os"
|
||||
"runtime/pprof"
|
||||
"strings"
|
||||
)
|
||||
|
||||
const DEFAULT_TITLE = ""
|
||||
|
||||
func main() {
|
||||
// parse command-line options
|
||||
var page, toc, toconly, xhtml, latex, smartypants, latexdashes, fractions bool
|
||||
var css, cpuprofile string
|
||||
var repeat int
|
||||
flag.BoolVar(&page, "page", false,
|
||||
"Generate a standalone HTML page (implies -latex=false)")
|
||||
flag.BoolVar(&toc, "toc", false,
|
||||
"Generate a table of contents (implies -latex=false)")
|
||||
flag.BoolVar(&toconly, "toconly", false,
|
||||
"Generate a table of contents only (implies -toc)")
|
||||
flag.BoolVar(&xhtml, "xhtml", true,
|
||||
"Use XHTML-style tags in HTML output")
|
||||
flag.BoolVar(&latex, "latex", false,
|
||||
"Generate LaTeX output instead of HTML")
|
||||
flag.BoolVar(&smartypants, "smartypants", true,
|
||||
"Apply smartypants-style substitutions")
|
||||
flag.BoolVar(&latexdashes, "latexdashes", true,
|
||||
"Use LaTeX-style dash rules for smartypants")
|
||||
flag.BoolVar(&fractions, "fractions", true,
|
||||
"Use improved fraction rules for smartypants")
|
||||
flag.StringVar(&css, "css", "",
|
||||
"Link to a CSS stylesheet (implies -page)")
|
||||
flag.StringVar(&cpuprofile, "cpuprofile", "",
|
||||
"Write cpu profile to a file")
|
||||
flag.IntVar(&repeat, "repeat", 1,
|
||||
"Process the input multiple times (for benchmarking)")
|
||||
flag.Usage = func() {
|
||||
fmt.Fprintf(os.Stderr, "Blackfriday Markdown Processor v"+blackfriday.VERSION+
|
||||
"\nAvailable at http://github.com/russross/blackfriday\n\n"+
|
||||
"Copyright © 2011 Russ Ross <russ@russross.com>\n"+
|
||||
"Distributed under the Simplified BSD License\n"+
|
||||
"See website for details\n\n"+
|
||||
"Usage:\n"+
|
||||
" %s [options] [inputfile [outputfile]]\n\n"+
|
||||
"Options:\n",
|
||||
os.Args[0])
|
||||
flag.PrintDefaults()
|
||||
}
|
||||
flag.Parse()
|
||||
|
||||
// enforce implied options
|
||||
if css != "" {
|
||||
page = true
|
||||
}
|
||||
if page {
|
||||
latex = false
|
||||
}
|
||||
if toconly {
|
||||
toc = true
|
||||
}
|
||||
if toc {
|
||||
latex = false
|
||||
}
|
||||
|
||||
// turn on profiling?
|
||||
if cpuprofile != "" {
|
||||
f, err := os.Create(cpuprofile)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
}
|
||||
pprof.StartCPUProfile(f)
|
||||
defer pprof.StopCPUProfile()
|
||||
}
|
||||
|
||||
// read the input
|
||||
var input []byte
|
||||
var err os.Error
|
||||
args := flag.Args()
|
||||
switch len(args) {
|
||||
case 0:
|
||||
if input, err = ioutil.ReadAll(os.Stdin); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "Error reading from Stdin:", err)
|
||||
os.Exit(-1)
|
||||
}
|
||||
case 1, 2:
|
||||
if input, err = ioutil.ReadFile(args[0]); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "Error reading from", args[0], ":", err)
|
||||
os.Exit(-1)
|
||||
}
|
||||
default:
|
||||
flag.Usage()
|
||||
os.Exit(-1)
|
||||
}
|
||||
|
||||
// set up options
|
||||
extensions := 0
|
||||
extensions |= blackfriday.EXTENSION_NO_INTRA_EMPHASIS
|
||||
extensions |= blackfriday.EXTENSION_TABLES
|
||||
extensions |= blackfriday.EXTENSION_FENCED_CODE
|
||||
extensions |= blackfriday.EXTENSION_AUTOLINK
|
||||
extensions |= blackfriday.EXTENSION_STRIKETHROUGH
|
||||
extensions |= blackfriday.EXTENSION_SPACE_HEADERS
|
||||
|
||||
var renderer blackfriday.Renderer
|
||||
if latex {
|
||||
// render the data into LaTeX
|
||||
renderer = blackfriday.LatexRenderer(0)
|
||||
} else {
|
||||
// render the data into HTML
|
||||
htmlFlags := 0
|
||||
if xhtml {
|
||||
htmlFlags |= blackfriday.HTML_USE_XHTML
|
||||
}
|
||||
if smartypants {
|
||||
htmlFlags |= blackfriday.HTML_USE_SMARTYPANTS
|
||||
}
|
||||
if fractions {
|
||||
htmlFlags |= blackfriday.HTML_SMARTYPANTS_FRACTIONS
|
||||
}
|
||||
if latexdashes {
|
||||
htmlFlags |= blackfriday.HTML_SMARTYPANTS_LATEX_DASHES
|
||||
}
|
||||
title := ""
|
||||
if page {
|
||||
htmlFlags |= blackfriday.HTML_COMPLETE_PAGE
|
||||
title = getTitle(input)
|
||||
}
|
||||
if toconly {
|
||||
htmlFlags |= blackfriday.HTML_OMIT_CONTENTS
|
||||
}
|
||||
if toc {
|
||||
htmlFlags |= blackfriday.HTML_TOC
|
||||
}
|
||||
renderer = blackfriday.HtmlRenderer(htmlFlags, title, css)
|
||||
}
|
||||
|
||||
// parse and render
|
||||
var output []byte
|
||||
for i := 0; i < repeat; i++ {
|
||||
output = blackfriday.Markdown(input, renderer, extensions)
|
||||
}
|
||||
|
||||
// output the result
|
||||
var out *os.File
|
||||
if len(args) == 2 {
|
||||
if out, err = os.Create(args[1]); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error creating %s: %v", args[1], err)
|
||||
os.Exit(-1)
|
||||
}
|
||||
defer out.Close()
|
||||
} else {
|
||||
out = os.Stdout
|
||||
}
|
||||
|
||||
if _, err = out.Write(output); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "Error writing output:", err)
|
||||
os.Exit(-1)
|
||||
}
|
||||
}
|
||||
|
||||
// try to guess the title from the input buffer
|
||||
// just check if it starts with an <h1> element and use that
|
||||
func getTitle(input []byte) string {
|
||||
i := 0
|
||||
|
||||
// skip blank lines
|
||||
for i < len(input) && (input[i] == '\n' || input[i] == '\r') {
|
||||
i++
|
||||
}
|
||||
if i >= len(input) {
|
||||
return DEFAULT_TITLE
|
||||
}
|
||||
if input[i] == '\r' && i+1 < len(input) && input[i+1] == '\n' {
|
||||
i++
|
||||
}
|
||||
|
||||
// find the first line
|
||||
start := i
|
||||
for i < len(input) && input[i] != '\n' && input[i] != '\r' {
|
||||
i++
|
||||
}
|
||||
line1 := input[start:i]
|
||||
if input[i] == '\r' && i+1 < len(input) && input[i+1] == '\n' {
|
||||
i++
|
||||
}
|
||||
i++
|
||||
|
||||
// check for a prefix header
|
||||
if len(line1) >= 3 && line1[0] == '#' && (line1[1] == ' ' || line1[1] == '\t') {
|
||||
return strings.TrimSpace(string(line1[2:]))
|
||||
}
|
||||
|
||||
// check for an underlined header
|
||||
if i >= len(input) || input[i] != '=' {
|
||||
return DEFAULT_TITLE
|
||||
}
|
||||
for i < len(input) && input[i] == '=' {
|
||||
i++
|
||||
}
|
||||
for i < len(input) && (input[i] == ' ' || input[i] == '\t') {
|
||||
i++
|
||||
}
|
||||
if i >= len(input) || (input[i] != '\n' && input[i] != '\r') {
|
||||
return DEFAULT_TITLE
|
||||
}
|
||||
|
||||
return strings.TrimSpace(string(line1))
|
||||
}
|
||||
1
html.go
1
html.go
@ -261,7 +261,6 @@ func (options *Html) BlockCodeGithub(out *bytes.Buffer, text []byte, lang string
|
||||
out.WriteString("</code></pre>\n")
|
||||
}
|
||||
|
||||
|
||||
func (options *Html) BlockQuote(out *bytes.Buffer, text []byte) {
|
||||
doubleSpace(out)
|
||||
out.WriteString("<blockquote>\n")
|
||||
|
||||
1
latex.go
1
latex.go
@ -23,7 +23,6 @@ import (
|
||||
//
|
||||
// Do not create this directly, instead use the LatexRenderer function.
|
||||
type Latex struct {
|
||||
|
||||
}
|
||||
|
||||
// LatexRenderer creates and configures a Latex object, which
|
||||
|
||||
@ -20,7 +20,7 @@ package blackfriday
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"utf8"
|
||||
"unicode/utf8"
|
||||
)
|
||||
|
||||
const VERSION = "1.1"
|
||||
@ -163,7 +163,6 @@ type parser struct {
|
||||
insideLink bool
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
//
|
||||
// Public interface
|
||||
@ -326,7 +325,6 @@ func secondPass(p *parser, input []byte) []byte {
|
||||
return output.Bytes()
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Link references
|
||||
//
|
||||
@ -480,14 +478,12 @@ func isReference(p *parser, data []byte) int {
|
||||
return lineEnd
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
//
|
||||
// Miscellaneous helper functions
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
// Test if a character is a punctuation symbol.
|
||||
// Taken from a private function in regexp in the stdlib.
|
||||
func ispunct(c byte) bool {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user