Skip to content

Commit

Permalink
newpaint: update rich.Text to support start / end of specials so they…
Browse files Browse the repository at this point in the history 
… can contain formatted spans within them. update html parsing accordingly.
  • Loading branch information
@rcoreilly
rcoreilly committed Feb 5, 2025
1 parent 34334ed commit 4852b4a
Show file tree
Hide file tree
Showing 9 changed files with 408 additions and 287 deletions.
277 changes: 37 additions & 240 deletions text/htmltext/html.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,36 +70,48 @@ func HTMLToRich(str []byte, sty *rich.Style, cssProps map[string]any) (rich.Text
case xml.StartElement:
fs := rich.NewStyle() // new style for new element
*fs = *fstack.Peek()
atStart := curSp.Len() == 0
if nextIsParaStart && atStart {
fs.Decoration.SetFlag(true, rich.ParagraphStart)
}
nextIsParaStart = false
nm := strings.ToLower(se.Name.Local)
insertText := []rune{}
special := rich.Nothing
linkURL := ""
if !fs.SetFromHTMLTag(nm) {
switch nm {
case "a":
special = rich.Link
fs.SetFillColor(colors.ToUniform(colors.Scheme.Primary.Base))
fs.Decoration.SetFlag(true, rich.Underline)
for _, attr := range se.Attr {
if attr.Name.Local == "href" {
fs.SetLink(attr.Value)
linkURL = attr.Value
}
}
case "span":
case "span": // todo: , "pre"
// just uses properties
case "q":
atStart := curSp.Len() == 0
if nextIsParaStart && atStart {
fs.Decoration.SetFlag(true, rich.ParagraphStart)
}
nextIsParaStart = false
insertText = []rune{'“'}
special = rich.Quote
case "math":
special = rich.Math
case "sup":
special = rich.Super
fs.Size = 0.8
case "sub":
special = rich.Sub
fs.Size = 0.8
case "dfn":
// no default styling
case "bdo":
// bidirectional override..
// todo: bidirectional override..
case "p":
// todo: detect <p> at end of paragraph only
fs.Decoration.SetFlag(true, rich.ParagraphStart)
nextIsParaStart = true // todo: redundant?
case "br":
insertText = []rune{'\n'}
curSp = rich.NewText(fs, []rune{'\n'}) // br is standalone: do it!
spstack.Push(curSp)
nextIsParaStart = false
default:
err := fmt.Errorf("%q tag not recognized", nm)
Expand Down Expand Up @@ -132,17 +144,27 @@ func HTMLToRich(str []byte, sty *rich.Style, cssProps map[string]any) (rich.Text
if curSp.Len() == 0 && len(spstack) > 0 { // we started something but added nothing to it.
spstack.Pop()
}
curSp = rich.NewText(fs, insertText)
if special != rich.Nothing {
ss := *fs // key about specials: make a new one-off style so special doesn't repeat
ss.Special = special
if special == rich.Link {
ss.URL = linkURL
}
curSp = rich.NewText(&ss, insertText)
} else {
curSp = rich.NewText(fs, insertText)
}
spstack.Push(curSp)
case xml.EndElement:
switch se.Name.Local {
case "p":
curSp.AddRunes([]rune{'\n'})
nextIsParaStart = true
case "br":
curSp.AddRunes([]rune{'\n'}) // todo: different char?
curSp.AddRunes([]rune{'\n'})
nextIsParaStart = false
case "q":
curSp.AddRunes([]rune{'”'})
case "a", "q", "math", "sub", "sup": // important: any special must be ended!
curSp.EndSpecial()
}

if len(fstack) > 0 {
Expand All @@ -168,231 +190,6 @@ func HTMLToRich(str []byte, sty *rich.Style, cssProps map[string]any) (rich.Text
return rich.Join(spstack...), errors.Join(errs...)
}

/*
// SetHTMLPre sets preformatted HTML-styled text by decoding all standard
// inline HTML text style formatting tags in the string and sets the
// per-character font information appropriately, using given font style info.
// Only basic styling tags, including <span> elements with style parameters
// (including class names) are decoded. Whitespace is decoded as-is,
// including LF \n etc, except in WhiteSpacePreLine case which only preserves LF's
func (tr *Text) SetHTMLPre(str []byte, font *rich.FontRender, txtSty *rich.Text, ctxt *units.Context, cssAgg map[string]any) {
// errstr := "core.Text SetHTMLPre"
sz := len(str)
tr.Spans = make([]Span, 1)
tr.Links = nil
if sz == 0 {
return
}
curSp := &(tr.Spans[0])
initsz := min(sz, 1020)
curSp.Init(initsz)
font.Font = OpenFont(font, ctxt)
nextIsParaStart := false
curLinkIndex := -1 // if currently processing an <a> link element
fstack := make([]*rich.FontRender, 1, 10)
fstack[0] = font
tagstack := make([]string, 0, 10)
tmpbuf := make([]byte, 0, 1020)
bidx := 0
curTag := ""
for bidx < sz {
cb := str[bidx]
ftag := ""
if cb == '<' && sz > bidx+1 {
eidx := bytes.Index(str[bidx+1:], []byte(">"))
if eidx > 0 {
ftag = string(str[bidx+1 : bidx+1+eidx])
bidx += eidx + 2
} else { // get past <
curf := fstack[len(fstack)-1]
curSp.AppendString(string(str[bidx:bidx+1]), curf.Face.Face, curf.Color, curf.Background, curf.Decoration, font, ctxt)
bidx++
}
}
if ftag != "" {
if ftag[0] == '/' {
etag := strings.ToLower(ftag[1:])
// fmt.Printf("%v etag: %v\n", bidx, etag)
if etag == "pre" {
continue // ignore
}
if etag != curTag {
// log.Printf("%v end tag: %v doesn't match current tag: %v for string\n%v\n", errstr, etag, curTag, string(str))
}
switch etag {
// case "p":
// tr.Spans = append(tr.Spans, Span{})
// curSp = &(tr.Spans[len(tr.Spans)-1])
// nextIsParaStart = true
// case "br":
// tr.Spans = append(tr.Spans, Span{})
// curSp = &(tr.Spans[len(tr.Spans)-1])
case "q":
curf := fstack[len(fstack)-1]
curSp.AppendRune('”', curf.Face.Face, curf.Color, curf.Background, curf.Decoration)
case "a":
if curLinkIndex >= 0 && curLinkIndex < len(tr.Links) {
tl := &tr.Links[curLinkIndex]
tl.EndSpan = len(tr.Spans) - 1
tl.EndIndex = len(curSp.Text)
curLinkIndex = -1
}
}
if len(fstack) > 1 { // pop at end
fstack = fstack[:len(fstack)-1]
}
tslen := len(tagstack)
if tslen > 1 {
curTag = tagstack[tslen-2]
tagstack = tagstack[:tslen-1]
} else if tslen == 1 {
curTag = ""
tagstack = tagstack[:0]
}
} else { // start tag
parts := strings.Split(ftag, " ")
stag := strings.ToLower(strings.TrimSpace(parts[0]))
// fmt.Printf("%v stag: %v\n", bidx, stag)
attrs := parts[1:]
attr := strings.Split(strings.Join(attrs, " "), "=")
nattr := len(attr) / 2
curf := fstack[len(fstack)-1]
fs := *curf
curLinkIndex = -1
if !SetHTMLSimpleTag(stag, &fs, ctxt, cssAgg) {
switch stag {
case "a":
fs.Color = colors.Scheme.Primary.Base
fs.SetDecoration(rich.Underline)
curLinkIndex = len(tr.Links)
tl := &TextLink{StartSpan: len(tr.Spans) - 1, StartIndex: len(curSp.Text)}
if nattr > 0 {
sprop := make(map[string]any, len(parts)-1)
tl.Properties = sprop
for ai := 0; ai < nattr; ai++ {
nm := strings.TrimSpace(attr[ai*2])
vl := strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(attr[ai*2+1]), `"`), `"`)
if nm == "href" {
tl.URL = vl
}
sprop[nm] = vl
}
}
tr.Links = append(tr.Links, *tl)
case "span":
// just uses properties
case "q":
curf := fstack[len(fstack)-1]
atStart := len(curSp.Text) == 0
curSp.AppendRune('“', curf.Face.Face, curf.Color, curf.Background, curf.Decoration)
if nextIsParaStart && atStart {
curSp.SetNewPara()
}
nextIsParaStart = false
case "dfn":
// no default styling
case "bdo":
// bidirectional override..
// case "p":
// if len(curSp.Text) > 0 {
// // fmt.Printf("para start: '%v'\n", string(curSp.Text))
// tr.Spans = append(tr.Spans, Span{})
// curSp = &(tr.Spans[len(tr.Spans)-1])
// }
// nextIsParaStart = true
// case "br":
case "pre":
continue // ignore
default:
// log.Printf("%v tag not recognized: %v for string\n%v\n", errstr, stag, string(str))
// just ignore it and format as is, for pre case!
// todo: need to include
}
}
if nattr > 0 { // attr
sprop := make(map[string]any, nattr)
for ai := 0; ai < nattr; ai++ {
nm := strings.TrimSpace(attr[ai*2])
vl := strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(attr[ai*2+1]), `"`), `"`)
// fmt.Printf("nm: %v val: %v\n", nm, vl)
switch nm {
case "style":
rich.SetStylePropertiesXML(vl, &sprop)
case "class":
if cssAgg != nil {
clnm := "." + vl
if aggp, ok := rich.SubProperties(cssAgg, clnm); ok {
fs.SetStyleProperties(nil, aggp, nil)
fs.Font = OpenFont(&fs, ctxt)
}
}
default:
sprop[nm] = vl
}
}
fs.SetStyleProperties(nil, sprop, nil)
fs.Font = OpenFont(&fs, ctxt)
}
if cssAgg != nil {
FontStyleCSS(&fs, stag, cssAgg, ctxt, nil)
}
fstack = append(fstack, &fs)
curTag = stag
tagstack = append(tagstack, curTag)
}
} else { // raw chars
// todo: deal with WhiteSpacePreLine -- trim out non-LF ws
curf := fstack[len(fstack)-1]
// atStart := len(curSp.Text) == 0
tmpbuf := tmpbuf[0:0]
didNl := false
aggloop:
for ; bidx < sz; bidx++ {
nb := str[bidx] // re-gets cb so it can be processed here..
switch nb {
case '<':
if (bidx > 0 && str[bidx-1] == '<') || sz == bidx+1 {
tmpbuf = append(tmpbuf, nb)
didNl = false
} else {
didNl = false
break aggloop
}
case '\n': // todo absorb other line endings
unestr := html.UnescapeString(string(tmpbuf))
curSp.AppendString(unestr, curf.Face.Face, curf.Color, curf.Background, curf.Decoration, font, ctxt)
tmpbuf = tmpbuf[0:0]
tr.Spans = append(tr.Spans, Span{})
curSp = &(tr.Spans[len(tr.Spans)-1])
didNl = true
default:
didNl = false
tmpbuf = append(tmpbuf, nb)
}
}
if !didNl {
unestr := html.UnescapeString(string(tmpbuf))
// fmt.Printf("%v added: %v\n", bidx, unestr)
curSp.AppendString(unestr, curf.Face.Face, curf.Color, curf.Background, curf.Decoration, font, ctxt)
if curLinkIndex >= 0 && curLinkIndex < len(tr.Links) {
tl := &tr.Links[curLinkIndex]
tl.Label = unestr
}
}
}
}
}
*/

// SubProperties returns a properties map[string]any from given key tag
// of given properties map, if the key exists and the value is a sub props map.
// Otherwise returns nil, false
Expand Down
Loading

0 comments on commit 4852b4a

Please sign in to comment.