danog/blackfriday
1
0
Fork 0
mirror of https://github.com/danog/blackfriday.git synced 2024-12-11 08:59:38 +01:00
Code Issues Projects Releases Wiki Activity

options to supress tab expansion or to expand tabs to 8 spaces instead of 4

Browse Source
This commit is contained in:
Russ Ross 2011-06-28 10:58:10 -06:00
parent 2f839dc39a
commit 2a18706ca4
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block.go
View File

@ -981,7 +981,10 @@ func blockListItem(out *bytes.Buffer, rndr *render, data []byte, flags *int) int
pre = i pre = i
if data[beg] == '\t' { if data[beg] == '\t' {
i = 1 i = 1
pre = TAB_SIZE pre = TAB_SIZE_DEFAULT
if rndr.flags&EXTENSION_TAB_SIZE_EIGHT != 0 {
pre = TAB_SIZE_EIGHT
}
} }
chunk := data[beg+i : end] chunk := data[beg+i : end]

28
markdown.go
View File

@ -31,6 +31,8 @@ const (
EXTENSION_LAX_HTML_BLOCKS EXTENSION_LAX_HTML_BLOCKS
EXTENSION_SPACE_HEADERS EXTENSION_SPACE_HEADERS
EXTENSION_HARD_LINE_BREAK EXTENSION_HARD_LINE_BREAK
EXTENSION_NO_EXPAND_TABS
EXTENSION_TAB_SIZE_EIGHT
) )
// These are the possible flag values for the link renderer. // These are the possible flag values for the link renderer.
@ -61,7 +63,10 @@ const (
) )
// The size of a tab stop. // The size of a tab stop.
const TAB_SIZE = 4 const (
TAB_SIZE_DEFAULT = 4
TAB_SIZE_EIGHT = 8
)
// These are the tags that are recognized as HTML block tags. // These are the tags that are recognized as HTML block tags.
// Any of these can be included in markdown text without special escaping. // Any of these can be included in markdown text without special escaping.
@ -210,6 +215,10 @@ func Markdown(input []byte, renderer *Renderer, extensions uint32) []byte {
// - copy everything else // - copy everything else
func FirstPass(rndr *render, input []byte) []byte { func FirstPass(rndr *render, input []byte) []byte {
var out bytes.Buffer var out bytes.Buffer
tab_size := TAB_SIZE_DEFAULT
if rndr.flags&EXTENSION_TAB_SIZE_EIGHT != 0 {
tab_size = TAB_SIZE_EIGHT
}
beg, end := 0, 0 beg, end := 0, 0
for beg < len(input) { // iterate over lines for beg < len(input) { // iterate over lines
if end = isReference(rndr, input[beg:]); end > 0 { if end = isReference(rndr, input[beg:]); end > 0 {
@ -222,10 +231,13 @@ func FirstPass(rndr *render, input []byte) []byte {
// add the line body if present // add the line body if present
if end > beg { if end > beg {
expandTabs(&out, input[beg:end]) if rndr.flags&EXTENSION_NO_EXPAND_TABS == 0 {
} else { expandTabs(&out, input[beg:end], tab_size)
out.WriteByte('\n') } else {
out.Write(input[beg:end])
}
} }
out.WriteByte('\n')
if end < len(input) && input[end] == '\r' { if end < len(input) && input[end] == '\r' {
end++ end++
@ -449,7 +461,7 @@ func isalnum(c byte) bool {
// Replace tab characters with spaces, aligning to the next TAB_SIZE column. // Replace tab characters with spaces, aligning to the next TAB_SIZE column.
// always ends output with a newline // always ends output with a newline
func expandTabs(out *bytes.Buffer, line []byte) { func expandTabs(out *bytes.Buffer, line []byte, tab_size int) {
// first, check for common cases: no tabs, or only tabs at beginning of line // first, check for common cases: no tabs, or only tabs at beginning of line
i, prefix := 0, 0 i, prefix := 0, 0
slowcase := false slowcase := false
@ -466,11 +478,10 @@ func expandTabs(out *bytes.Buffer, line []byte) {
// no need to decode runes if all tabs are at the beginning of the line // no need to decode runes if all tabs are at the beginning of the line
if !slowcase { if !slowcase {
for i = 0; i < prefix*TAB_SIZE; i++ { for i = 0; i < prefix*tab_size; i++ {
out.WriteByte(' ') out.WriteByte(' ')
} }
out.Write(line[prefix:]) out.Write(line[prefix:])
out.WriteByte('\n')
return return
} }
@ -497,12 +508,11 @@ func expandTabs(out *bytes.Buffer, line []byte) {
for { for {
out.WriteByte(' ') out.WriteByte(' ')
column++ column++
if column%TAB_SIZE == 0 { if column%tab_size == 0 {
break break
} }
} }
i++ i++
} }
out.WriteByte('\n')
} }