p/sklad
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: p:e56482d73f6d8f8f46096ca980ac9e6dcd7b8300
Branches Tags
p:master
..
compare: p:master
Branches Tags
p:master

9 Commits
e56482d73f ... master

Author SHA1 Message Date
Přemysl Eric Janouch
9db00dd64c Fix die-cut label printing
All checks were successful
Alpine 3.21 Success
Details
2025-05-01 15:57:59 +02:00
Přemysl Eric Janouch
3832ca749f README.adoc: circumvent an issue with libasciidoc
All checks were successful
Alpine 3.19 Success
Details
2022-05-01 18:18:31 +02:00
Přemysl Eric Janouch
f37c194ab8 Bump Go modules to 1.17 2021-08-19 05:35:58 +02:00
Přemysl Eric Janouch
269e6514df Add support for printing on red/black tapes 
My QL-800 refuses to print black only on a red/black tape.

I really don't like the added `rb` function parameter.
It would be best to be able to recognize such tapes, however
nothing of the sort is documented in official Brother documentation.

makeBitmapData{,RB} also look like they could be simplified further.
 2021-06-10 02:37:14 +02:00
Přemysl Eric Janouch
9734cdd16e bdf: make it possible to set the drawing colour 
Intended for red and black tapes.
 2021-06-09 23:18:06 +02:00
Přemysl Eric Janouch
8215b59834 Update dependencies 
Somehow we have got rid of a lot of indirect nonsense.
 2021-06-08 03:44:07 +02:00
Přemysl Eric Janouch
6fc00ba3dd Name change 2020-10-10 14:19:35 +02:00
Přemysl Eric Janouch
93b29a5346 sklad: close the DB FD once finished reading 
Fixes a resource leak.
 2020-10-10 14:18:22 +02:00
Přemysl Janouch
696ea89530 label-tool: respect font ascent and descent 
Also try to load the values from the BDF font file.
 2019-04-26 11:40:43 +02:00
14 changed files with 155 additions and 151 deletions
Expand all files Collapse all files

2
LICENSE
View File

@@ -1,4 +1,4 @@
Copyright (c) 2019, Přemysl Janouch <p@janouch.name> Copyright (c) 2019 - 2021, Přemysl Eric Janouch <p@janouch.name>
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted. purpose with or without fee is hereby granted.

1
README.adoc
View File

@@ -19,6 +19,7 @@ Runtime dependencies: Linux, a Brother QL label printer connected over USB
$ go get -u https://janouch.name/sklad/cmd/sklad $ go get -u https://janouch.name/sklad/cmd/sklad
You will need to bootstrap the database by writing a minimal 'db.json': You will need to bootstrap the database by writing a minimal 'db.json':
.... ....
{ {
"Password": "login-password", "Password": "login-password",

34
bdf/bdf.go
View File

@@ -49,6 +49,8 @@ func (g *glyph) At(x, y int) color.Color {
// Font represents a particular bitmap font. // Font represents a particular bitmap font.
type Font struct { type Font struct {
Name string Name string
Ascent int // needn't be present in the font
Descent int // needn't be present in the font
glyphs map[rune]glyph glyphs map[rune]glyph
fallback glyph fallback glyph
} }
@@ -64,11 +66,13 @@ func (f *Font) FindGlyph(r rune) (glyph, bool) {
// DrawString draws the specified text string onto dst horizontally along // DrawString draws the specified text string onto dst horizontally along
// the baseline starting at dp, using black color. // the baseline starting at dp, using black color.
func (f *Font) DrawString(dst draw.Image, dp image.Point, s string) { func (f *Font) DrawString(dst draw.Image, dp image.Point,
color color.Color, s string) {
src := image.NewUniform(color)
for _, r := range s { for _, r := range s {
g, _ := f.FindGlyph(r) g, _ := f.FindGlyph(r)
draw.DrawMask(dst, g.bounds.Add(dp), draw.DrawMask(dst, g.bounds.Add(dp),
image.Black, image.ZP, &g, g.bounds.Min, draw.Over) src, image.ZP, &g, g.bounds.Min, draw.Over)
dp.X += g.advance dp.X += g.advance
} }
} }
@@ -192,17 +196,23 @@ func (p *bdfParser) readLine() bool {
return true return true
} }
func (p *bdfParser) readCharEncoding() int { func (p *bdfParser) readIntegerArgument() int {
if len(p.tokens) < 2 { if len(p.tokens) < 2 {
panic("insufficient arguments") panic("insufficient arguments")
} }
if i, err := strconv.Atoi(p.tokens[1]); err != nil { if i, err := strconv.Atoi(p.tokens[1]); err != nil {
panic(err) panic(err)
} else { } else {
return i // Some fonts even use -1 for things outside the encoding. return i
} }
} }
// Some fonts even use -1 for things outside the encoding.
func (p *bdfParser) readCharEncoding() int { return p.readIntegerArgument() }
// XXX: Ignoring vertical advance since we only expect purely horizontal fonts.
func (p *bdfParser) readDwidth() int { return p.readIntegerArgument() }
func (p *bdfParser) parseProperties() { func (p *bdfParser) parseProperties() {
// The wording in the specification suggests that the argument // The wording in the specification suggests that the argument
// with the number of properties to follow isn't reliable. // with the number of properties to follow isn't reliable.
@@ -210,22 +220,14 @@ func (p *bdfParser) parseProperties() {
switch p.tokens[0] { switch p.tokens[0] {
case "DEFAULT_CHAR": case "DEFAULT_CHAR":
p.defaultChar = p.readCharEncoding() p.defaultChar = p.readCharEncoding()
case "FONT_ASCENT":
p.font.Ascent = p.readIntegerArgument()
case "FONT_DESCENT":
p.font.Descent = p.readIntegerArgument()
} }
} }
} }
// XXX: Ignoring vertical advance since we only expect purely horizontal fonts.
func (p *bdfParser) readDwidth() int {
if len(p.tokens) < 2 {
panic("insufficient arguments")
}
if i, err := strconv.Atoi(p.tokens[1]); err != nil {
panic(err)
} else {
return i
}
}
func (p *bdfParser) readBBX() image.Rectangle { func (p *bdfParser) readBBX() image.Rectangle {
if len(p.tokens) < 5 { if len(p.tokens) < 5 {
panic("insufficient arguments") panic("insufficient arguments")

3
cmd/bdf-preview/main.go
View File

@@ -3,6 +3,7 @@ package main
import ( import (
"html/template" "html/template"
"image" "image"
"image/color"
"image/draw" "image/draw"
"image/png" "image/png"
"log" "log"
@@ -82,7 +83,7 @@ func main() {
img := image.NewRGBA(super) img := image.NewRGBA(super)
draw.Draw(img, super, image.White, image.ZP, draw.Src) draw.Draw(img, super, image.White, image.ZP, draw.Src)
font.DrawString(img, image.ZP, font.Name) font.DrawString(img, image.ZP, color.Black, font.Name)
fonts[filename] = fontItem{Font: font, Preview: img} fonts[filename] = fontItem{Font: font, Preview: img}
} }

3
cmd/bdf-sample/main.go
View File

@@ -2,6 +2,7 @@ package main
import ( import (
"image" "image"
"image/color"
"image/draw" "image/draw"
"image/png" "image/png"
"log" "log"
@@ -26,7 +27,7 @@ func main() {
img := image.NewRGBA(super) img := image.NewRGBA(super)
draw.Draw(img, super, image.White, image.ZP, draw.Src) draw.Draw(img, super, image.White, image.ZP, draw.Src)
font.DrawString(img, image.ZP, font.Name) font.DrawString(img, image.ZP, color.Black, font.Name)
fo, err := os.Create("out.png") fo, err := os.Create("out.png")
if err != nil { if err != nil {

5
cmd/label-tool/main.go
View File

@@ -4,6 +4,7 @@ import (
"errors" "errors"
"html/template" "html/template"
"image" "image"
"image/color"
"image/draw" "image/draw"
"image/png" "image/png"
"log" "log"
@@ -210,7 +211,7 @@ func handle(w http.ResponseWriter, r *http.Request) {
font.Font, params.Text, mediaInfo.PrintAreaPins, params.Scale) font.Font, params.Text, mediaInfo.PrintAreaPins, params.Scale)
} }
if r.FormValue("print") != "" { if r.FormValue("print") != "" {
if err := printer.Print(img); err != nil { if err := printer.Print(img, false); err != nil {
log.Println("print error:", err) log.Println("print error:", err)
} }
} }
@@ -260,7 +261,7 @@ func main() {
img := image.NewRGBA(super) img := image.NewRGBA(super)
draw.Draw(img, super, image.White, image.ZP, draw.Src) draw.Draw(img, super, image.White, image.ZP, draw.Src)
font.DrawString(img, image.ZP, font.Name) font.DrawString(img, image.ZP, color.Black, font.Name)
fonts = append(fonts, &fontItem{Path: path, Font: font, Preview: img}) fonts = append(fonts, &fontItem{Path: path, Font: font, Preview: img})
} }

3
cmd/ql-print/main.go
View File

@@ -17,6 +17,7 @@ import (
var scale = flag.Int("scale", 1, "integer upscaling") var scale = flag.Int("scale", 1, "integer upscaling")
var rotate = flag.Bool("rotate", false, "print sideways") var rotate = flag.Bool("rotate", false, "print sideways")
var redblack = flag.Bool("redblack", false, "red and black print")
func main() { func main() {
flag.Usage = func() { flag.Usage = func() {
@@ -82,7 +83,7 @@ func main() {
log.Fatalln("the image is too high,", dy, ">", mi.PrintAreaLength, "pt") log.Fatalln("the image is too high,", dy, ">", mi.PrintAreaLength, "pt")
} }
if err := p.Print(img); err != nil { if err := p.Print(img, *redblack); err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
} }

1
cmd/sklad/db.go
View File

@@ -298,6 +298,7 @@ func loadDatabase() error {
if err != nil { if err != nil {
return err return err
} }
defer dbFile.Close()
if err := json.NewDecoder(dbFile).Decode(&db); err != nil { if err := json.NewDecoder(dbFile).Decode(&db); err != nil {
return err return err
} }

2
cmd/sklad/main.go
View File

@@ -309,7 +309,7 @@ func printLabel(id string) error {
} }
return printer.Print(&imgutil.LeftRotate{Image: label.GenLabelForHeight( return printer.Print(&imgutil.LeftRotate{Image: label.GenLabelForHeight(
labelFont, id, mediaInfo.PrintAreaPins, db.BDFScale)}) labelFont, id, mediaInfo.PrintAreaPins, db.BDFScale)}, false)
} }
func handleLabel(w http.ResponseWriter, r *http.Request) { func handleLabel(w http.ResponseWriter, r *http.Request) {

27
go.mod
View File

@@ -1,28 +1,5 @@
module janouch.name/sklad module janouch.name/sklad
go 1.12 go 1.17
require ( require github.com/boombuler/barcode v1.0.1
github.com/boombuler/barcode v1.0.0
github.com/cosiner/argv v0.0.1 // indirect
github.com/cpuguy83/go-md2man v1.0.10 // indirect
github.com/go-delve/delve v1.2.0 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/mattn/go-colorable v0.1.1 // indirect
github.com/mattn/go-isatty v0.0.7 // indirect
github.com/mattn/go-runewidth v0.0.4 // indirect
github.com/peterh/liner v1.1.0 // indirect
github.com/pkg/profile v1.3.0 // indirect
github.com/russross/blackfriday v2.0.0+incompatible // indirect
github.com/sirupsen/logrus v1.4.1 // indirect
github.com/spf13/cobra v0.0.3 // indirect
github.com/spf13/pflag v1.0.3 // indirect
github.com/stretchr/objx v0.2.0 // indirect
golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c // indirect
golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a // indirect
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 // indirect
golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 // indirect
golang.org/x/tools v0.0.0-20190411180116-681f9ce8ac52 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
gopkg.in/yaml.v2 v2.2.2 // indirect
)

72
go.sum
View File

@@ -1,70 +1,2 @@
github.com/boombuler/barcode v1.0.0 h1:s1TvRnXwL2xJRaccrdcBQMZxq6X7DvsMogtmJeHDdrc= github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=
github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
github.com/cosiner/argv v0.0.0-20170225145430-13bacc38a0a5/go.mod h1:p/NrK5tF6ICIly4qwEDsf6VDirFiWWz0FenfYBwJaKQ=
github.com/cosiner/argv v0.0.1 h1:2iAFN+sWPktbZ4tvxm33Ei8VY66FPCxdOxpncUGpAXE=
github.com/cosiner/argv v0.0.1/go.mod h1:p/NrK5tF6ICIly4qwEDsf6VDirFiWWz0FenfYBwJaKQ=
github.com/cpuguy83/go-md2man v1.0.8/go.mod h1:N6JayAiVKtlHSnuTCeuLSQVs75hb8q+dYQLjr7cDsKY=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-delve/delve v1.2.0 h1:uwGyfYO0WsWqbnDWvxCBKOr2qFLpii3tLxwM+fTJs70=
github.com/go-delve/delve v1.2.0/go.mod h1:yP+LD36s/ud5nm4lsQY0TwNhYu2PAwk6xItz+442j74=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/mattn/go-colorable v0.0.0-20170327083344-ded68f7a9561/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
github.com/peterh/liner v1.1.0 h1:f+aAedNJA6uk7+6rXsYBnhdo4Xux7ESLe+kcuVUF5os=
github.com/peterh/liner v1.1.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
github.com/pkg/profile v0.0.0-20170413231811-06b906832ed0/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
github.com/pkg/profile v1.3.0/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/russross/blackfriday v0.0.0-20180428102519-11635eb403ff/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/sirupsen/logrus v0.0.0-20180523074243-ea8897e79973/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/spf13/cobra v0.0.0-20170417170307-b6cb39589372/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/pflag v0.0.0-20170417173400-9e4c21054fa1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
golang.org/x/arch v0.0.0-20171004143515-077ac972c2e4/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8=
golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c h1:Rx/HTKi09myZ25t1SOlDHmHOy/mKxNAcu0hP1oPX9qM=
golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4=
golang.org/x/crypto v0.0.0-20180614174826-fd5f17ee7299/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20180614134839-8883426083c0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 h1:aBlRBZoCuZNRDClvfkDoklQqdLzBaA3uViASg2z2p24=
golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20181120060634-fc4f04983f62/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190411180116-681f9ce8ac52/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.0.0-20170407172122-cd8b52f8269e/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

43
label/label.go
View File

@@ -2,6 +2,7 @@ package label
import ( import (
"image" "image"
"image/color"
"image/draw" "image/draw"
"strings" "strings"
@@ -19,7 +20,7 @@ func GenLabelForHeight(font *bdf.Font,
textRect, _ := font.BoundString(text) textRect, _ := font.BoundString(text)
textImg := image.NewRGBA(textRect) textImg := image.NewRGBA(textRect)
draw.Draw(textImg, textRect, image.White, image.ZP, draw.Src) draw.Draw(textImg, textRect, image.White, image.ZP, draw.Src)
font.DrawString(textImg, image.ZP, text) font.DrawString(textImg, image.ZP, color.Black, text)
scaledTextImg := imgutil.Scale{Image: textImg, Scale: scale} scaledTextImg := imgutil.Scale{Image: textImg, Scale: scale}
scaledTextRect := scaledTextImg.Bounds() scaledTextRect := scaledTextImg.Bounds()
@@ -51,6 +52,13 @@ func GenLabelForHeight(font *bdf.Font,
return combinedImg return combinedImg
} }
func max(a, b int) int {
if a > b {
return a
}
return b
}
func GenLabelForWidth(font *bdf.Font, func GenLabelForWidth(font *bdf.Font,
text string, width, scale int) image.Image { text string, width, scale int) image.Image {
var lines []string var lines []string
@@ -58,30 +66,43 @@ func GenLabelForWidth(font *bdf.Font,
lines = append(lines, strings.TrimSuffix(line, "\r")) lines = append(lines, strings.TrimSuffix(line, "\r"))
} }
height := 0 // Respect font ascent and descent so that there are gaps between lines.
var rects []image.Rectangle rects := make([]image.Rectangle, len(lines))
for _, line := range lines { jumps := make([]int, len(lines))
for i, line := range lines {
r, _ := font.BoundString(line) r, _ := font.BoundString(line)
rects = append(rects, r) rects[i] = r
height += r.Dy() * scale
if i > 0 {
deficitD := font.Descent - rects[i-1].Max.Y
jumps[i] += max(0, deficitD)
deficitA := font.Ascent - (-r.Min.Y)
jumps[i] += max(0, deficitA)
}
} }
imgRect := image.Rect(0, 0, width, height) height := 0
for i := range lines {
height += jumps[i] + rects[i].Dy()
}
imgRect := image.Rect(0, 0, width, height*scale)
img := image.NewRGBA(imgRect) img := image.NewRGBA(imgRect)
draw.Draw(img, imgRect, image.White, image.ZP, draw.Src) draw.Draw(img, imgRect, image.White, image.ZP, draw.Src)
y := 0 y := 0
for i := 0; i < len(lines); i++ { for i, line := range lines {
textImg := image.NewRGBA(rects[i]) textImg := image.NewRGBA(rects[i])
draw.Draw(textImg, rects[i], image.White, image.ZP, draw.Src) draw.Draw(textImg, rects[i], image.White, image.ZP, draw.Src)
font.DrawString(textImg, image.ZP, lines[i]) font.DrawString(textImg, image.ZP, color.Black, line)
scaledImg := imgutil.Scale{Image: textImg, Scale: scale} scaledImg := imgutil.Scale{Image: textImg, Scale: scale}
scaledRect := scaledImg.Bounds() scaledRect := scaledImg.Bounds()
target := image.Rect(0, y, imgRect.Max.X, imgRect.Max.Y) y += jumps[i]
target := image.Rect(0, y*scale, imgRect.Max.X, imgRect.Max.Y)
draw.Draw(img, target, &scaledImg, scaledRect.Min, draw.Src) draw.Draw(img, target, &scaledImg, scaledRect.Min, draw.Src)
y += scaledRect.Dy() y += rects[i].Dy()
} }
return img return img
} }

106
ql/ql.go
View File

@@ -120,9 +120,67 @@ const (
printPins = printBytes * 8 printPins = printBytes * 8
) )
// pack packs a bool array into a byte array for the printer to print out.
func pack(data [printPins]bool, out *[]byte) {
for i := 0; i < printBytes; i++ {
var b byte
for j := 0; j < 8; j++ {
b <<= 1
if data[i*8+j] {
b |= 1
}
}
*out = append(*out, b)
}
}
// makeBitmapDataRB converts an image to the printer's red-black raster format.
func makeBitmapDataRB(src image.Image, margin, length int) []byte {
data, bounds := []byte{}, src.Bounds()
if bounds.Dy() > length {
bounds.Max.Y = bounds.Min.Y + length
}
if bounds.Dx() > printPins-margin {
bounds.Max.X = bounds.Min.X + printPins
}
redcells, blackcells := [printPins]bool{}, [printPins]bool{}
for y := bounds.Min.Y; y < bounds.Max.Y; y++ {
length--
// The graphics needs to be inverted horizontally, iterating backwards.
offset := margin
for x := bounds.Max.X - 1; x >= bounds.Min.X; x-- {
r, g, b, a := src.At(x, y).RGBA()
redcells[offset] = r >= 0xc000 && g < 0x4000 && b < 0x4000 &&
a >= 0x8000
blackcells[offset] = r < 0x4000 && g < 0x4000 && b < 0x4000 &&
a >= 0x8000
offset++
}
data = append(data, 'w', 0x01, printBytes)
pack(blackcells, &data)
data = append(data, 'w', 0x02, printBytes)
pack(redcells, &data)
}
for ; length > 0; length-- {
data = append(data, 'w', 0x01, printBytes)
data = append(data, make([]byte, printBytes)...)
data = append(data, 'w', 0x02, printBytes)
data = append(data, make([]byte, printBytes)...)
}
return data
}
// makeBitmapData converts an image to the printer's raster format. // makeBitmapData converts an image to the printer's raster format.
func makeBitmapData(src image.Image, margin, length int) (data []byte) { func makeBitmapData(src image.Image, rb bool, margin, length int) []byte {
bounds := src.Bounds() // It's a necessary nuisance, so just copy and paste.
if rb {
return makeBitmapDataRB(src, margin, length)
}
data, bounds := []byte{}, src.Bounds()
if bounds.Dy() > length { if bounds.Dy() > length {
bounds.Max.Y = bounds.Min.Y + length bounds.Max.Y = bounds.Min.Y + length
} }
@@ -138,30 +196,24 @@ func makeBitmapData(src image.Image, margin, length int) (data []byte) {
offset := margin offset := margin
for x := bounds.Max.X - 1; x >= bounds.Min.X; x-- { for x := bounds.Max.X - 1; x >= bounds.Min.X; x-- {
r, g, b, a := src.At(x, y).RGBA() r, g, b, a := src.At(x, y).RGBA()
pixels[offset] = r == 0 && g == 0 && b == 0 && a >= 0x8000 pixels[offset] = r < 0x4000 && g < 0x4000 && b < 0x4000 &&
a >= 0x8000
offset++ offset++
} }
data = append(data, 'g', 0x00, printBytes) data = append(data, 'g', 0x00, printBytes)
for i := 0; i < printBytes; i++ { pack(pixels, &data)
var b byte
for j := 0; j < 8; j++ {
b <<= 1
if pixels[i*8+j] {
b |= 1
}
}
data = append(data, b)
}
} }
for ; length > 0; length-- { for ; length > 0; length-- {
data = append(data, 'g', 0x00, printBytes) data = append(data, 'g', 0x00, printBytes)
data = append(data, make([]byte, printBytes)...) data = append(data, make([]byte, printBytes)...)
} }
return return data
} }
func makePrintData(status *Status, image image.Image) (data []byte) { // XXX: It would be preferrable to know for certain if this is a red-black tape,
// because the printer refuses to print on a mismatch.
func makePrintData(status *Status, image image.Image, rb bool) (data []byte) {
mediaInfo := GetMediaInfo( mediaInfo := GetMediaInfo(
status.MediaWidthMM(), status.MediaWidthMM(),
status.MediaLengthMM(), status.MediaLengthMM(),
@@ -188,8 +240,17 @@ func makePrintData(status *Status, image image.Image) (data []byte) {
mediaType = byte(0x0b) mediaType = byte(0x0b)
} }
data = append(data, 0x1b, 0x69, 0x7a, 0x02|0x04|0x40|0x80, mediaType, const (
byte(status.MediaWidthMM()), byte(status.MediaLengthMM()), flagValidMediaType = 0x02
flagValidMediaWidth = 0x04
flagValidMediaLength = 0x08
flagPriorityToQuality = 0x40
flagRecoveryAlwaysOn = 0x80
)
data = append(data, 0x1b, 0x69, 0x7a, flagValidMediaType|
flagValidMediaWidth|flagValidMediaLength|
flagPriorityToQuality|flagRecoveryAlwaysOn,
mediaType, byte(status.MediaWidthMM()), byte(status.MediaLengthMM()),
byte(dy), byte(dy>>8), byte(dy>>16), byte(dy>>24), 0, 0x00) byte(dy), byte(dy>>8), byte(dy>>16), byte(dy>>24), 0, 0x00)
// Auto cut, each 1 label. // Auto cut, each 1 label.
@@ -198,9 +259,13 @@ func makePrintData(status *Status, image image.Image) (data []byte) {
// Cut at end (though it's the default). // Cut at end (though it's the default).
// Not sure what it means, doesn't seem to have any effect to turn it off. // Not sure what it means, doesn't seem to have any effect to turn it off.
data = append(data, 0x1b, 0x69, 0x4b, 0x08) if rb {
data = append(data, 0x1b, 0x69, 0x4b, 0x08|0x01)
} else {
data = append(data, 0x1b, 0x69, 0x4b, 0x08)
}
if status.MediaLengthMM() != 0 { if status.MediaLengthMM() == 0 {
// 3mm margins along the direction of feed. 0x23 = 35 dots, the minimum. // 3mm margins along the direction of feed. 0x23 = 35 dots, the minimum.
data = append(data, 0x1b, 0x69, 0x64, 0x23, 0x00) data = append(data, 0x1b, 0x69, 0x64, 0x23, 0x00)
} else { } else {
@@ -213,7 +278,8 @@ func makePrintData(status *Status, image image.Image) (data []byte) {
data = append(data, 0x4d, 0x00) data = append(data, 0x4d, 0x00)
// The graphics data itself. // The graphics data itself.
data = append(data, makeBitmapData(image, mediaInfo.SideMarginPins, dy)...) bitmapData := makeBitmapData(image, rb, mediaInfo.SideMarginPins, dy)
data = append(data, bitmapData...)
// Print command with feeding. // Print command with feeding.
return append(data, 0x1a) return append(data, 0x1a)

4
ql/ql_linux.go
View File

@@ -172,8 +172,8 @@ var errErrorOccurred = errors.New("error occurred")
var errUnexpectedStatus = errors.New("unexpected status") var errUnexpectedStatus = errors.New("unexpected status")
var errUnknownMedia = errors.New("unknown media") var errUnknownMedia = errors.New("unknown media")
func (p *Printer) Print(image image.Image) error { func (p *Printer) Print(image image.Image, rb bool) error {
data := makePrintData(p.LastStatus, image) data := makePrintData(p.LastStatus, image, rb)
if data == nil { if data == nil {
return errUnknownMedia return errUnknownMedia
} }