aboutsummaryrefslogtreecommitdiff
path: root/hswg
diff options
context:
space:
mode:
authorPřemysl Eric Janouch <p@janouch.name>2021-06-29 03:15:41 +0200
committerPřemysl Eric Janouch <p@janouch.name>2021-06-29 04:14:47 +0200
commit61083027a3beed1996761b05625a4a87cf90e607 (patch)
treef8d59425bf9422103b881c86aeb4df2047dee1f1 /hswg
parent5b432fcc0bdee654b225ca2b47cc505e8fb1cf12 (diff)
downloadhaven-61083027a3beed1996761b05625a4a87cf90e607.tar.gz
haven-61083027a3beed1996761b05625a4a87cf90e607.tar.xz
haven-61083027a3beed1996761b05625a4a87cf90e607.zip
hswg: split out asciidoc.go
Diffstat (limited to 'hswg')
-rw-r--r--hswg/asciidoc.go54
-rw-r--r--hswg/main.go48
2 files changed, 54 insertions, 48 deletions
diff --git a/hswg/asciidoc.go b/hswg/asciidoc.go
new file mode 100644
index 0000000..f193784
--- /dev/null
+++ b/hswg/asciidoc.go
@@ -0,0 +1,54 @@
+package main
+
+import (
+ "bytes"
+ "io"
+ "strings"
+ "unicode"
+ "unicode/utf8"
+)
+
+// isTitle returns the title level if the lines seem to form a title,
+// zero otherwise. Input lines may inclide trailing newlines.
+func isTitle(line1, line2 []byte) int {
+ // This is a very naïve method, we should target graphemes (thus at least
+ // NFC normalize the lines first) and account for wide characters.
+ diff := utf8.RuneCount(line1) - utf8.RuneCount(line2)
+ if len(line2) < 2 || diff < -1 || diff > 1 {
+ return 0
+ }
+
+ // "Don't be fooled by back-to-back delimited blocks."
+ // Still gets fooled by other things, though.
+ if bytes.IndexFunc(line1, func(r rune) bool {
+ return unicode.IsLetter(r) || unicode.IsNumber(r)
+ }) < 0 {
+ return 0
+ }
+
+ // The underline must be homogenous.
+ for _, r := range bytes.TrimRight(line2, "\r\n") {
+ if r != line2[0] {
+ return 0
+ }
+ }
+ return 1 + strings.IndexByte("=-~^+", line2[0])
+}
+
+func writeLine(w *io.PipeWriter, cur, next []byte) []byte {
+ if level := isTitle(cur, next); level > 0 {
+ w.Write(append(bytes.Repeat([]byte{'='}, level), ' '))
+ next = nil
+ }
+ w.Write(cur)
+ return next
+}
+
+// ConvertTitles converts AsciiDoc two-line (underlined) titles to single-line.
+func ConvertTitles(w *io.PipeWriter, input []byte) {
+ var last []byte
+ for _, cur := range bytes.SplitAfter(input, []byte{'\n'}) {
+ last = writeLine(w, last, cur)
+ }
+ writeLine(w, last, nil)
+}
diff --git a/hswg/main.go b/hswg/main.go
index 7854bf5..56be51b 100644
--- a/hswg/main.go
+++ b/hswg/main.go
@@ -16,11 +16,8 @@ import (
"path/filepath"
"regexp"
"sort"
- "strings"
"syscall"
"time"
- "unicode"
- "unicode/utf8"
"github.com/bytesparadise/libasciidoc/pkg/configuration"
"github.com/bytesparadise/libasciidoc/pkg/parser"
@@ -30,51 +27,6 @@ import (
"github.com/bytesparadise/libasciidoc/pkg/validator"
)
-// isTitle returns the title level if the lines seem to form a title,
-// zero otherwise. Input lines may inclide trailing newlines.
-func isTitle(line1, line2 []byte) int {
- // This is a very naïve method, we should target graphemes (thus at least
- // NFC normalize the lines first) and account for wide characters.
- diff := utf8.RuneCount(line1) - utf8.RuneCount(line2)
- if len(line2) < 2 || diff < -1 || diff > 1 {
- return 0
- }
-
- // "Don't be fooled by back-to-back delimited blocks."
- // Still gets fooled by other things, though.
- if bytes.IndexFunc(line1, func(r rune) bool {
- return unicode.IsLetter(r) || unicode.IsNumber(r)
- }) < 0 {
- return 0
- }
-
- // The underline must be homogenous.
- for _, r := range bytes.TrimRight(line2, "\r\n") {
- if r != line2[0] {
- return 0
- }
- }
- return 1 + strings.IndexByte("=-~^+", line2[0])
-}
-
-func writeLine(w *io.PipeWriter, cur, next []byte) []byte {
- if level := isTitle(cur, next); level > 0 {
- w.Write(append(bytes.Repeat([]byte{'='}, level), ' '))
- next = nil
- }
- w.Write(cur)
- return next
-}
-
-// ConvertTitles converts AsciiDoc two-line (underlined) titles to single-line.
-func ConvertTitles(w *io.PipeWriter, input []byte) {
- var last []byte
- for _, cur := range bytes.SplitAfter(input, []byte{'\n'}) {
- last = writeLine(w, last, cur)
- }
- writeLine(w, last, nil)
-}
-
// Metadata contains select metadata about a rendered document.
type Metadata struct {
types.Metadata