diff --git a/.gitignore b/.gitignore index 87179b1..a892776 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ # Ignore versioning /vendor -/go.sum # Ignore profiling files *.profile diff --git a/README.md b/README.md index 7ba1620..5b4a858 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ Wrap ==== +**NOTE: This program is currently not actively maintained, it seems to +work fine, but use at your own risk.** + A Fountain/Wrap export tool, with some extras... ## Overview @@ -13,20 +16,19 @@ supporting normal Fountain files. All this in a FOSS package that you can use straight from the commandline. -Learn more [here](https://wraparound.github.io/). - ## Installation +**NOTE: This program is currently not actively maintained, it seems to +work fine, but use at your own risk.** -[![Get it from the Snap -Store](https://snapcraft.io/static/images/badges/en/snap-store-white.svg)](https://snapcraft.io/wrap) +[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-white.svg)](https://snapcraft.io/wrap) Wrap is available on Windows, macOS and most major Linux distributions. Download the [latest -release](https://github.com/Wraparound/wrap/releases/latest). +release](https://github.com/eprovst/wrap/releases/latest). ## Experience any issues? -Most common issues are listed in the [FAQ](https://github.com/Wraparound/wrap/wiki/FAQ) -and on the [wiki](https://github.com/Wraparound/wrap/wiki). +Most common issues are listed in the [FAQ](https://github.com/eprovst/wrap/wiki/FAQ) +and on the [wiki](https://github.com/eprovst/wrap/wiki). If you suspect it's a bug or have any suggestions: visit the [issues -page](https://github.com/Wraparound/wrap/issues). +page](https://github.com/eprovst/wrap/issues). diff --git a/cmd/wrap/main.go b/cmd/wrap/main.go index a76806b..e465466 100644 --- a/cmd/wrap/main.go +++ b/cmd/wrap/main.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/Wraparound/wrap/pkg/cli" + "github.com/eprovst/wrap/pkg/cli" ) func main() { diff --git a/go.mod b/go.mod index 8dea38e..52f0e9a 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,16 @@ -module github.com/Wraparound/wrap +module github.com/eprovst/wrap + +go 1.19 require ( - github.com/flopp/go-findfont v0.0.0-20201103071330-d960cd9a3075 - github.com/signintech/gopdf v0.9.12 - github.com/spf13/cobra v1.1.1 + github.com/flopp/go-findfont v0.1.0 + github.com/signintech/gopdf v0.19.0 + github.com/spf13/cobra v1.7.0 ) -go 1.14 +require ( + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/phpdave11/gofpdi v1.0.14-0.20211212211723-1f10f9844311 // indirect + github.com/pkg/errors v0.8.1 // indirect + github.com/spf13/pflag v1.0.5 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..ec49fd1 --- /dev/null +++ b/go.sum @@ -0,0 +1,18 @@ +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU= +github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/phpdave11/gofpdi v1.0.14-0.20211212211723-1f10f9844311 h1:zyWXQ6vu27ETMpYsEMAsisQ+GqJ4e1TPvSNfdOPF0no= +github.com/phpdave11/gofpdi v1.0.14-0.20211212211723-1f10f9844311/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/signintech/gopdf v0.19.0 h1:NcAGaKeAE++naiJvV77+fpVRWfxEDvcsCGPnErfVlas= +github.com/signintech/gopdf v0.19.0/go.mod h1:wrLtZoWaRNrS4hphED0oflFoa6IWkOu6M3nJjm4VbO4= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/ast/README.md b/pkg/ast/README.md index 6d732ec..e870130 100644 --- a/pkg/ast/README.md +++ b/pkg/ast/README.md @@ -1,6 +1,6 @@ -# Wraparound AST +# Wrap AST This repository defines the datastructures used internally by both the parser and the export modules to represent the screen- or stageplay. -For more information see the [wiki](https://github.com/Wraparound/wrap/wiki) or if there is a bug you would like to report -or an idea to suggest you can do that [here](https://github.com/Wraparound/wrap/issues). +For more information see the [wiki](https://github.com/eprovst/wrap/wiki) or if there is a bug you would like to report +or an idea to suggest you can do that [here](https://github.com/eprovst/wrap/issues). diff --git a/pkg/ast/types.go b/pkg/ast/types.go index 9ec3d8f..1ea8a7e 100644 --- a/pkg/ast/types.go +++ b/pkg/ast/types.go @@ -5,7 +5,7 @@ import ( "strings" "unicode/utf8" - "github.com/Wraparound/wrap/pkg/languages" + "github.com/eprovst/wrap/pkg/languages" ) /* This file defines all the types used by the parser diff --git a/pkg/cli/README.md b/pkg/cli/README.md index 54b416f..958dc42 100644 --- a/pkg/cli/README.md +++ b/pkg/cli/README.md @@ -1,5 +1,5 @@ -# Wraparound CLI +# Wrap CLI CLI for Wrap. -For more information see the [wiki](https://github.com/Wraparound/wrap/wiki) or if there is a bug you would like to report -or an idea to suggest you can do that [here](https://github.com/Wraparound/wrap/issues). +For more information see the [wiki](https://github.com/eprovst/wrap/wiki) or if there is a bug you would like to report +or an idea to suggest you can do that [here](https://github.com/eprovst/wrap/issues). diff --git a/pkg/cli/export.go b/pkg/cli/export.go index 768efce..6f79b08 100644 --- a/pkg/cli/export.go +++ b/pkg/cli/export.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/Wraparound/wrap/pkg/ast" - "github.com/Wraparound/wrap/pkg/parser" + "github.com/eprovst/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/parser" ) func export(args []string, targetExtention string, exportFunction func(*ast.Script, io.Writer) error) { diff --git a/pkg/cli/html.go b/pkg/cli/html.go index 9d1221a..ed55306 100644 --- a/pkg/cli/html.go +++ b/pkg/cli/html.go @@ -3,8 +3,8 @@ package cli import ( "io" - "github.com/Wraparound/wrap/pkg/ast" - "github.com/Wraparound/wrap/pkg/html" + "github.com/eprovst/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/html" "github.com/spf13/cobra" ) diff --git a/pkg/cli/pdf.go b/pkg/cli/pdf.go index efacfeb..ae680bb 100644 --- a/pkg/cli/pdf.go +++ b/pkg/cli/pdf.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/Wraparound/wrap/pkg/pdf" + "github.com/eprovst/wrap/pkg/pdf" "github.com/spf13/cobra" ) diff --git a/pkg/cli/root.go b/pkg/cli/root.go index 5e91dbe..10704c6 100644 --- a/pkg/cli/root.go +++ b/pkg/cli/root.go @@ -8,7 +8,7 @@ var longDescription = `Wrap is an open source command line tool that is able to convert Fountain and Wrap files into a correctly formatted screen- or stageplay as an HTML or a PDF. -Visit for more info.` +Visit for more info.` // WrapCmd represents the base command when called without any subcommands var WrapCmd = &cobra.Command{ diff --git a/pkg/cli/version.go b/pkg/cli/version.go index 0fc3378..7a00b82 100644 --- a/pkg/cli/version.go +++ b/pkg/cli/version.go @@ -13,7 +13,7 @@ var versionCmd = &cobra.Command{ Short: "show version information for Wrap", Long: longDescription, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Wrap v0.3.1 on " + strings.Title(runtime.GOOS)) + fmt.Println("Wrap v0.3.2 on " + strings.Title(runtime.GOOS)) }, } diff --git a/pkg/html/README.md b/pkg/html/README.md index 58e5e10..d43b317 100644 --- a/pkg/html/README.md +++ b/pkg/html/README.md @@ -1,5 +1,5 @@ -# Wraparound HTML -HTML Export for Wrap, uses [Wraparound CSS](https://github.com/Wraparound/css) to bring your sreen- or stageplay to the browser. +# Wrap HTML +HTML Export for Wrap to bring your sreen- or stageplay to the browser. -For more information see the [wiki](https://github.com/Wraparound/wrap/wiki) or if there is a bug you would like to report -or an idea to suggest you can do that [here](https://github.com/Wraparound/wrap/issues). +For more information see the [wiki](https://github.com/eprovst/wrap/wiki) or if there is a bug you would like to report +or an idea to suggest you can do that [here](https://github.com/eprovst/wrap/issues). diff --git a/pkg/html/css.go b/pkg/html/css.go index 2424435..a0c91b3 100644 --- a/pkg/html/css.go +++ b/pkg/html/css.go @@ -3,7 +3,7 @@ package html /* Embedded CSS */ const pageCSS = `/*! -* Wraparound CSS +* Wrap CSS * Copyright Evert Provoost. * Licensed under MIT. */ diff --git a/pkg/html/files.go b/pkg/html/files.go index daca659..b97fa06 100644 --- a/pkg/html/files.go +++ b/pkg/html/files.go @@ -4,7 +4,7 @@ import ( "bufio" "os" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) // MakeHTML writes the output of WriteHTML() to a file diff --git a/pkg/html/html.go b/pkg/html/html.go index 55baf86..e4ccf98 100644 --- a/pkg/html/html.go +++ b/pkg/html/html.go @@ -5,7 +5,7 @@ import ( "io" "strings" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) // Production makes the export module add scene numbers diff --git a/pkg/html/lines.go b/pkg/html/lines.go index d51a396..8126643 100644 --- a/pkg/html/lines.go +++ b/pkg/html/lines.go @@ -5,7 +5,7 @@ import ( "io" "strings" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) // Indent keeps track of the current indent level. diff --git a/pkg/languages/README.md b/pkg/languages/README.md index f77586a..65907d3 100644 --- a/pkg/languages/README.md +++ b/pkg/languages/README.md @@ -1,5 +1,5 @@ -# Wraparound Languages +# Wrap Languages Adds support for multiple languages to Wrap. -For more information see the [wiki](https://github.com/Wraparound/wrap/wiki) or if there is a bug you would like to report -or an idea to suggest you can do that [here](https://github.com/Wraparound/wrap/issues). +For more information see the [wiki](https://github.com/eprovst/wrap/wiki) or if there is a bug you would like to report +or an idea to suggest you can do that [here](https://github.com/eprovst/wrap/issues). diff --git a/pkg/linewrap/linewrap.go b/pkg/linewrap/linewrap.go index cfaa09b..9dfe181 100644 --- a/pkg/linewrap/linewrap.go +++ b/pkg/linewrap/linewrap.go @@ -3,7 +3,7 @@ package linewrap import ( "unicode" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) // WrapLine breaks line into lines of correct length. diff --git a/pkg/parser/fountain_test.go b/pkg/parser/fountain_test.go index 22b4a43..57c8890 100644 --- a/pkg/parser/fountain_test.go +++ b/pkg/parser/fountain_test.go @@ -3,7 +3,7 @@ package parser import ( "testing" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) /* FOUNTAIN MODE TESTS */ diff --git a/pkg/parser/inputhandling.go b/pkg/parser/inputhandling.go index 906e6d1..6d352ff 100644 --- a/pkg/parser/inputhandling.go +++ b/pkg/parser/inputhandling.go @@ -4,7 +4,7 @@ import ( "bytes" "os" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) // ParseFile parses directly from a file path. diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go index f2dcef2..0e2f124 100644 --- a/pkg/parser/parser.go +++ b/pkg/parser/parser.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/Wraparound/wrap/pkg/ast" - "github.com/Wraparound/wrap/pkg/languages" + "github.com/eprovst/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/languages" ) // UseWrapExtensions is a flag to show wheter diff --git a/pkg/parser/regression_test.go b/pkg/parser/regression_test.go index 599372a..a08e5f2 100644 --- a/pkg/parser/regression_test.go +++ b/pkg/parser/regression_test.go @@ -3,7 +3,7 @@ package parser import ( "testing" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) // Bug found and example given by Paul W. Rankin diff --git a/pkg/parser/testutils_test.go b/pkg/parser/testutils_test.go index 5b64dd7..a7ea89a 100644 --- a/pkg/parser/testutils_test.go +++ b/pkg/parser/testutils_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) const debug = true diff --git a/pkg/parser/texthandling.go b/pkg/parser/texthandling.go index 35fdfbe..f145cde 100644 --- a/pkg/parser/texthandling.go +++ b/pkg/parser/texthandling.go @@ -3,7 +3,7 @@ package parser import ( "strings" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) type ipKind byte diff --git a/pkg/pdf/README.md b/pkg/pdf/README.md index 45f534c..5e35a15 100644 --- a/pkg/pdf/README.md +++ b/pkg/pdf/README.md @@ -1,5 +1,5 @@ -# Wraparound PDF +# Wrap PDF PDF export for Wrap. -For more information see the [wiki](https://github.com/Wraparound/wrap/wiki) or if there is a bug you would like to report -or an idea to suggest you can do that [here](https://github.com/Wraparound/wrap/issues). +For more information see the [wiki](https://github.com/eprovst/wrap/wiki) or if there is a bug you would like to report +or an idea to suggest you can do that [here](https://github.com/eprovst/wrap/issues). diff --git a/pkg/pdf/cellifying.go b/pkg/pdf/cellifying.go index e3f85c3..66b3ffe 100644 --- a/pkg/pdf/cellifying.go +++ b/pkg/pdf/cellifying.go @@ -3,8 +3,8 @@ package pdf import ( "strings" - "github.com/Wraparound/wrap/pkg/ast" - "github.com/Wraparound/wrap/pkg/linewrap" + "github.com/eprovst/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/linewrap" ) type styledLine struct { diff --git a/pkg/pdf/files.go b/pkg/pdf/files.go index d4723aa..a40d675 100644 --- a/pkg/pdf/files.go +++ b/pkg/pdf/files.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) // MakePDF writes the PDF to a file diff --git a/pkg/pdf/pagination.go b/pkg/pdf/pagination.go index fd7fccc..99d8d05 100644 --- a/pkg/pdf/pagination.go +++ b/pkg/pdf/pagination.go @@ -3,7 +3,7 @@ package pdf import ( "strconv" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) func addLines(lines []styledLine) { diff --git a/pkg/pdf/pdf.go b/pkg/pdf/pdf.go index 91dd00c..620cc7f 100644 --- a/pkg/pdf/pdf.go +++ b/pkg/pdf/pdf.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/Wraparound/wrap/pkg/ast" - "github.com/Wraparound/wrap/pkg/languages" + "github.com/eprovst/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/languages" "github.com/signintech/gopdf" ) @@ -121,7 +121,7 @@ func buildPDF(script *ast.Script) (*gopdf.GoPdf, error) { Title: title, Author: ast.LinesToString(authors), Creator: "Wrap", - Producer: "Wraparound PDF", + Producer: "Wrap PDF", CreationDate: time.Now(), }) diff --git a/pkg/pdf/sectionize.go b/pkg/pdf/sectionize.go index 23a2e3a..1781ae5 100644 --- a/pkg/pdf/sectionize.go +++ b/pkg/pdf/sectionize.go @@ -1,7 +1,7 @@ package pdf import ( - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) type aSection struct { diff --git a/pkg/pdf/styling.go b/pkg/pdf/styling.go index eba73f2..a593d39 100644 --- a/pkg/pdf/styling.go +++ b/pkg/pdf/styling.go @@ -3,7 +3,7 @@ package pdf import ( "strings" - "github.com/Wraparound/wrap/pkg/ast" + "github.com/eprovst/wrap/pkg/ast" ) // This file contains tools for theming. diff --git a/scripts/Info.plist b/scripts/Info.plist index a737b4b..8692927 100644 --- a/scripts/Info.plist +++ b/scripts/Info.plist @@ -7,7 +7,7 @@ CFBundleIconFile wrapApp.icns CFBundleIdentifier - io.github.wraparound + com.github.eprovst.wrap CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/scripts/generate_completions.go b/scripts/generate_completions.go index 57e40cc..8dd603f 100644 --- a/scripts/generate_completions.go +++ b/scripts/generate_completions.go @@ -1,6 +1,6 @@ package main -import "github.com/Wraparound/wrap/pkg/cli" +import "github.com/eprovst/wrap/pkg/cli" func main() { cli.WrapCmd.GenBashCompletionFile("bash-complete.sh") diff --git a/scripts/installer.nsi b/scripts/installer.nsi index 7e38031..c06bf9e 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -6,7 +6,7 @@ Unicode True Name "${Name}" Outfile "../dist/${Name}_Win64_nightly.exe" RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on) -InstallDir "$ProgramFiles64\Wraparound\${Name}" +InstallDir "$ProgramFiles64\${Name}" !define MUI_ICON "../assets/wrap/wrap.ico" !include LogicLib.nsh diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index b37232b..19a8074 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: wrap -version: "v0.3.1" +version: "v0.3.2" summary: A Fountain export tool with some extra's... description: Wrap is a parser/exporter for the Fountain format which also adds some extensions to said format. base: core18 @@ -9,8 +9,8 @@ confinement: strict parts: wrap-cli: plugin: go - go-importpath: github.com/Wraparound/wrap - go-packages: [github.com/Wraparound/wrap/cmd/wrap] + go-importpath: github.com/eprovst/wrap + go-packages: [github.com/eprovst/wrap/cmd/wrap] go-buildtags: [ldflags '-s -w'] apps: