[minor] adding "no_page_map" configuration, freebsd releases and updating all dependencies to go1.23.5.

Author: rupor-github

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.23.5'
 
       - name: Build everything
         run: task release

Taskfile.yaml

@@ -109,7 +109,7 @@ tasks:
     deps: [generate-project-version, get-dictionaries, get-sentences]
     cmds:
       - mkdir -p '{{.REL_BUILD_DIR}}'
-      - for: [linux-amd64, linux-arm64, linux-386, darwin-amd64, darwin-arm64, windows-amd64-.exe, windows-arm64-.exe, windows-386-.exe]
+      - for: [linux-amd64, linux-arm64, linux-386, darwin-amd64, darwin-arm64, freebsd-amd64, freebsd-arm64, windows-amd64-.exe, windows-arm64-.exe, windows-386-.exe]
         task: release-for-platform-{{with $arch := split "-" .ITEM}}{{$arch._0}}{{end}}
         vars:
           GOOS: '{{with $arch := split "-" .ITEM}}{{$arch._0}}{{end}}'
@@ -183,6 +183,25 @@ tasks:
     status:
       - test -f '{{.REL_NAME}}.zip'
 
+  release-for-platform-freebsd:
+    internal: true
+    desc: Builds release for specified platform
+    requires:
+      vars: [GOOS, GOARCH, SUFFIX]
+    label: release-for-platform-darwin-{{.GOOS}}-{{.GOARCH}}
+    vars:
+      BUILD_DIR: '{{.REL_BUILD_DIR}}_{{.GOOS}}_{{.GOARCH}}'
+      REL_NAME: '{{.REL_BUILD_DIR}}/fb2c-{{.GOOS}}-{{.GOARCH}}'
+    cmds:
+      - mkdir -p {{.BUILD_DIR}}
+      - defer: rm -rf {{.BUILD_DIR}}
+      - task: go-build
+        vars: {GOOS: '{{.GOOS}}', GOARCH: '{{.GOARCH}}', FLAGS: 'release', PACKAGE: './cmd/fb2c', TARGET: '{{.BUILD_DIR}}/fb2c{{.SUFFIX}}'}
+      - echo "{{.TATN}}Archiving release \"{{.REL_NAME}}.zip\"{{.TOFF}}"
+      - 7z a -r -bd -bso0 -tzip {{.REL_NAME}} ./{{.BUILD_DIR}}/*
+    status:
+      - test -f '{{.REL_NAME}}.zip'
+
   generate-enums:
     internal: true
     desc: Generates fmt.Stringer interfaces for specified enum types
@@ -348,6 +367,7 @@ tasks:
     vars:
       GO_VER: '{{default "" (regexFind "[0-9]+\\.[0-9]+\\.?[0-9]*[-a-zA-Z0-9+]*" (env "CUR_PROJECT_TYPE"))}}'
     cmds:
+      - GOOS=freebsd go mod tidy{{if .GO_VER}} -go={{.GO_VER}}{{end}} {{.CLI_ARGS}}
       - GOOS=linux go mod tidy{{if .GO_VER}} -go={{.GO_VER}}{{end}} {{.CLI_ARGS}}
       - GOOS=darwin go mod tidy{{if .GO_VER}} -go={{.GO_VER}}{{end}} {{.CLI_ARGS}}
       - GOOS=windows go mod tidy{{if .GO_VER}} -go={{.GO_VER}}{{end}} {{.CLI_ARGS}}

config/cfg.go

@@ -140,6 +140,7 @@ type Doc struct {
 	FileNameFormat        string   `json:"file_name_format"`
 	FileNameTransliterate bool     `json:"file_name_transliterate"`
 	FixZip                bool     `json:"fix_zip_format"`
+	NoPageMap             bool     `json:"no_page_map"`
 	//
 	DropCaps struct {
 		Create        bool   `json:"create"`

config/os_linux.go renamed to config/os_unix.go

@@ -1,4 +1,4 @@
-//go:build linux
+//go:build linux || freebsd
 
 package config
 

go.mod

@@ -1,6 +1,6 @@
 module fb2converter
 
-go 1.23.4
+go 1.23.5
 
 require (
 	dario.cat/mergo v1.0.1
@@ -14,7 +14,7 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/google/uuid v1.6.0
-	github.com/gosimple/slug v1.14.0
+	github.com/gosimple/slug v1.15.0
 	github.com/h2non/filetype v1.1.3
 	github.com/hashicorp/hcl v1.0.0
 	github.com/hidez8891/zip v1.11.0
@@ -23,11 +23,11 @@ require (
 	github.com/urfave/cli/v2 v2.27.5
 	go.uber.org/zap v1.27.0
 	golang.org/x/image v0.23.0
-	golang.org/x/net v0.33.0
-	golang.org/x/sys v0.28.0
-	golang.org/x/term v0.27.0
+	golang.org/x/net v0.34.0
+	golang.org/x/sys v0.29.0
+	golang.org/x/term v0.28.0
 	golang.org/x/text v0.21.0
-	golang.org/x/tools v0.28.0
+	golang.org/x/tools v0.29.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	honnef.co/go/tools v0.5.1
 )

go.sum

@@ -32,8 +32,8 @@ github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8
 github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gosimple/slug v1.14.0 h1:RtTL/71mJNDfpUbCOmnf/XFkzKRtD6wL6Uy+3akm4Es=
-github.com/gosimple/slug v1.14.0/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ=
+github.com/gosimple/slug v1.15.0 h1:wRZHsRrRcs6b0XnxMUBM6WK1U1Vg5B0R7VkIf1Xzobo=
+github.com/gosimple/slug v1.15.0/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ=
 github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o=
 github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
 github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=
@@ -74,20 +74,20 @@ golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
 golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
 golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
 golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
-golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
+golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
+golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

processor/generate.go

@@ -395,6 +395,10 @@ func (p *Processor) prepareStylesheet() error {
 // generatePagemap creates epub page map.
 func (p *Processor) generatePagemap() error {
 
+	if p.noPages {
+		return nil
+	}
+
 	p.env.Log.Debug("Generating page map - start")
 	defer func(start time.Time) {
 		p.env.Log.Debug("Generating page map - done", zap.Duration("elapsed", time.Since(start)))
@@ -534,7 +538,12 @@ func (p *Processor) generateOPF() error {
 
 	// Spine generation
 
-	spine := to.AddNext("spine", attr("toc", "ncx"), attr("page-map", "page-map"))
+	var spine *etree.Element
+	if p.noPages {
+		spine = to.AddNext("spine", attr("toc", "ncx"))
+	} else {
+		spine = to.AddNext("spine", attr("toc", "ncx"), attr("page-map", "page-map"))
+	}
 
 	for _, f := range p.Book.Files {
 		id := f.id

processor/process.go

@@ -71,6 +71,7 @@ type Processor struct {
 	notesMode      NotesFmt
 	tocPlacement   TOCPlacement
 	tocType        TOCType
+	noPages        bool
 	kindlePageMap  APNXGeneration
 	stampPlacement StampPlacement
 	coverResize    CoverProcessing
@@ -126,6 +127,11 @@ func NewFB2(r io.Reader, unknownEncoding bool, src, dst string, nodirs, stk, ove
 			apnx = APNXNone
 		}
 	}
+	if env.Cfg.Doc.NoPageMap && apnx != APNXNone {
+		env.Log.Warn("APNX generation option requested but no page map is generated, turning off")
+		apnx = APNXNone
+	}
+
 	var stamp StampPlacement
 	if len(env.Cfg.Doc.Cover.Placement) > 0 {
 		stamp = ParseStampPlacementString(env.Cfg.Doc.Cover.Placement)
@@ -153,6 +159,7 @@ func NewFB2(r io.Reader, unknownEncoding bool, src, dst string, nodirs, stk, ove
 		notesMode:         notes,
 		tocType:           toct,
 		tocPlacement:      place,
+		noPages:           env.Cfg.Doc.NoPageMap,
 		kindlePageMap:     apnx,
 		stampPlacement:    stamp,
 		coverResize:       resize,

processor/xhtml.go

@@ -262,7 +262,7 @@ func (p *Processor) doTextTransformations(text string, breakable, tail bool) str
 	return text
 }
 
-// formatText inserts page markers (for page map), kobo spans (if necessary) and hyphenates words if requested.
+// formatText inserts page markers (for page map) if requested, kobo spans (if necessary) and hyphenates words if requested.
 func (p *Processor) formatText(in string, breakable, tail bool, to *etree.Element) {
 
 	in = p.doTextTransformations(in, breakable, tail)
@@ -276,6 +276,8 @@ func (p *Processor) formatText(in string, breakable, tail bool, to *etree.Elemen
 		kobo                = p.format == OKepub
 	)
 
+	insertMarkers = insertMarkers && !p.noPages
+
 	bufWriteString := func(text string, kobo bool) {
 		if kobo {
 			p.ctx().sentence++

static/configuration.toml

@@ -131,6 +131,10 @@
 	#---- NOTE: this setting may conflict with document transforms
 	# ignore_nonbreakable_space = false
 
+	#---- When set no page maps will be generated in epub and no page markers inserted anywhere.
+	#---- this in turn will disable apnx generation for kindle based formats
+	# no_page_map = false
+
 	#---- To generate epub page map we use very rough text processing, controlling approximate page size in Unicode code points
 	# characters_per_page = 2300