Moved Wrap and added note on maintenance

.gitignore

@@ -24,7 +24,6 @@
 
 # Ignore versioning
 /vendor
-/go.sum
 
 # Ignore profiling files
 *.profile

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).

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() {

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
+)

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=

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).

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

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).

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) {

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"
 )
 

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"
 )
 

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 <https://wraparound.github.io/> for more info.`
+Visit <https://github.com/eprovst/wrap> for more info.`
 
 // WrapCmd represents the base command when called without any subcommands
 var WrapCmd = &cobra.Command{

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))
 	},
 }
 

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).

pkg/html/css.go

@@ -3,7 +3,7 @@ package html
 /* Embedded CSS */
 
 const pageCSS = `/*!
-* Wraparound CSS
+* Wrap CSS
 * Copyright Evert Provoost.
 * Licensed under MIT.
 */

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

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

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.

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).

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.

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 */

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.

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

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

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

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

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).

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 {

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

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) {

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(),
 	})
 

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 {

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.

scripts/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleIconFile</key>
 	<string>wrapApp.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>io.github.wraparound</string>
+	<string>com.github.eprovst.wrap</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

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")

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