Changeset 68 in code


Ignore:
Timestamp:
Sep 7, 2023, 4:52:43 PM (2 years ago)
Author:
Izuru Yakumo
Message:

bfchroma turned out to be a hassle

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

Location:
trunk
Files:
1 added
322 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r67 r68  
     1CGO = 0
    12DESTDIR ?=
    2 GOFLAGS ?= -v -ldflags "-w -X `go list`.Version=$(VERSION) -X `go list`.Commit=$(COMMIT)" -tags "static_build" -mod=vendor
     3GOFLAGS ?= -v -ldflags "-w -X `go list`.Version=$(VERSION) -X `go list`.Commit=$(COMMIT)" -mod=vendor -buildmode=exe
    34PREFIX ?= /usr/local
    45VERSION ?= `git describe --abbrev=0 --tags || echo "$VERSION"`
    … …  
    78
    89build:
    9         go build ${GOFLAGS} ./cmd/aya
     10        env CGO_ENABLED=${CGO} go build ${GOFLAGS} ./cmd/aya
    1011clean:
    1112        rm -f aya

  • trunk/README.md

    r66 r68  
    1212* Works well for blogs and generic static websites (landing pages etc)
    1313* Easy to learn
    14 * Code highlighting with [bfchroma](https://github.com/Depado/bfchroma)
    1514* Fast (duh!)
    1615
    1716## Installation
    1817
    19 Build it manually assuming you have Go installed:
     18Build it manually assuming you have Go (>=1.17) installed:
    2019
    2120        $ go install marisa.chaotic.ninja/aya/cmd/aya@latest
    … …  
    117116
    118117The software is distributed under the MIT license.
     118
     119---
     120
     121Ayaya~

  • trunk/aya.1

    r63 r68  
    3838.Nm
    3939is maintained by Izuru Yakumo
    40 .Aq Lk https://pub.chaotic.ninja/~yakumo_izuru/
     40.Aq Lk https://geidontei.chaotic.ninja/usr/yakumo_izuru/

  • trunk/cmd/aya/main.go

    r66 r68  
    2020        "github.com/eknkc/amber"
    2121        "github.com/yosssi/gcss"
    22         "github.com/Depado/bfchroma/v2"
    2322)
    2423
    … …  
    188187        }
    189188        v["content"] = string(blackfriday.Run([]byte(content),
    190                 blackfriday.WithExtensions(blackfriday.CommonExtensions|blackfriday.AutoHeadingIDs),blackfriday.WithRenderer(bfchroma.NewRenderer()),
     189                blackfriday.WithExtensions(blackfriday.CommonExtensions|blackfriday.AutoHeadingIDs),
    191190        ))
    192191        if w == nil {

  • trunk/go.mod

    r67 r68  
    44
    55require (
    6         github.com/Depado/bfchroma/v2 v2.0.0
    76        github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385
     7        github.com/kentaro-m/blackfriday-confluence v0.0.0-20220126124413-8e85477b49b3
    88        github.com/russross/blackfriday/v2 v2.1.0
    99        github.com/sirupsen/logrus v1.9.0
    … …  
    1212)
    1313
    14 require (
    15         github.com/alecthomas/chroma/v2 v2.3.0 // indirect
    16         github.com/dlclark/regexp2 v1.4.0 // indirect
    17         golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
    18 )
     14require golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect

  • trunk/go.sum

    r67 r68  
    1 github.com/Depado/bfchroma/v2 v2.0.0 h1:IRpN9BPkNwEpR6w1ectIcNWOuhDSLx+8f1pn83fzxx8=
    2 github.com/Depado/bfchroma/v2 v2.0.0/go.mod h1:wFwW/Pw8Tnd0irzgO9Zxtxgzp3aPS8qBWlyadxujxmw=
    3 github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs=
    4 github.com/alecthomas/chroma/v2 v2.3.0 h1:83xfxrnjv8eK+Cf8qZDzNo3PPF9IbTWHs7z28GY6D0U=
    5 github.com/alecthomas/chroma/v2 v2.3.0/go.mod h1:mZxeWZlxP2Dy+/8cBob2PYd8O2DwNAzave5AY7A2eQw=
    6 github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
    7 github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE=
    8 github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
    91github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
    102github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
    113github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
    12 github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
    13 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
    144github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o=
    155github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
     6github.com/kentaro-m/blackfriday-confluence v0.0.0-20220126124413-8e85477b49b3 h1:BCMUqjR9XyAWI5JVSJpQFQR1iYYHvwcVuapyqAAuHtE=
     7github.com/kentaro-m/blackfriday-confluence v0.0.0-20220126124413-8e85477b49b3/go.mod h1:zjuRVWzEu6vFREk0vbFj6P1pKji/mU73UpQ0MA9BOSo=
    168github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
    179github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
     10github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
    1811github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
    1912github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
     13github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
    2014github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
    2115github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
    2216github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
    23 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
     17github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
    2418github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
    25 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
    26 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
    27 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
    2819github.com/yosssi/gcss v0.1.0 h1:jRuino7qq7kqntBIhT+0xSUI5/sBgCA/zCQ1Tuzd6Gg=
    2920github.com/yosssi/gcss v0.1.0/go.mod h1:M3mTPOWZWjVROkXKZ2AiDzOBOXu2MqQeDXF/nKO44sI=
    … …  
    3425gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
    3526gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
     27gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
    3628gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
    37 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
    38 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

  • trunk/vendor/modules.txt

    r67 r68  
    1 # github.com/Depado/bfchroma/v2 v2.0.0
    2 ## explicit; go 1.18
    3 github.com/Depado/bfchroma/v2
    4 # github.com/alecthomas/chroma/v2 v2.3.0
    5 ## explicit; go 1.17
    6 github.com/alecthomas/chroma/v2
    7 github.com/alecthomas/chroma/v2/formatters/html
    8 github.com/alecthomas/chroma/v2/lexers
    9 github.com/alecthomas/chroma/v2/styles
    10 # github.com/dlclark/regexp2 v1.4.0
    11 ## explicit
    12 github.com/dlclark/regexp2
    13 github.com/dlclark/regexp2/syntax
    141# github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385
    152## explicit
    163github.com/eknkc/amber
    174github.com/eknkc/amber/parser
     5# github.com/kentaro-m/blackfriday-confluence v0.0.0-20220126124413-8e85477b49b3
     6## explicit; go 1.13
    187# github.com/russross/blackfriday/v2 v2.1.0
    198## explicit
Note: See TracChangeset for help on using the changeset viewer.