create-draft: Create correct cover and titlepage SVGs, and update cover and titlepage SVG styling

Author: acabal

build-images

@@ -21,13 +21,8 @@ def clean_inkscape_svg(filename, clean_path):
 		svg = regex.sub(r"<defs[^>]*?/>", "", svg, flags=regex.MULTILINE | regex.DOTALL)
 		svg = regex.sub(r"xmlns:(dc|cc|rdf)=\"[^\"]*?\"", "", svg, flags=regex.MULTILINE | regex.DOTALL)
 
-		# Inkscape includes font and letter-spacing info even though we've removed font information
-		svg = regex.sub(r"font-.+?:.+?([;\"])", "\\1", svg)
-		svg = regex.sub(r"text-anchor:.+?([;\"])", "\\1", svg)
-		svg = regex.sub(r"letter-spacing:.+?([;\"])", "\\1", svg)
-		svg = regex.sub(r";+", ";", svg)
-		svg = regex.sub(r" style=\";", " style=\"", svg)
-		svg = regex.sub(r" style=\"\"", "", svg)
+		# Inkscape includes CSS even though we've removed font information
+		svg = regex.sub(r" style=\".*?\"", "", svg)
 
 		file.seek(0)
 		file.write(svg)
@@ -113,16 +108,23 @@ def main():
 
 				# Embed cover.jpg
 				with open(dest_cover_svg_filename, "r+", encoding="utf-8") as file:
-					svg = file.read()
-
-					svg = regex.sub(r"xlink:href=\".*?cover\.jpg", "xlink:href=\"data:image/jpeg;base64," + source_cover_jpg_base64, svg, flags=regex.MULTILINE | regex.DOTALL)
+					svg = regex.sub(r"xlink:href=\".*?cover\.jpg", "xlink:href=\"data:image/jpeg;base64," + source_cover_jpg_base64, file.read(), flags=regex.MULTILINE | regex.DOTALL)
 
 					file.seek(0)
 					file.write(svg)
 					file.truncate()
 
 				clean_inkscape_svg(dest_cover_svg_filename, clean_path)
 
+				# For the cover we want to keep the path.title-box style, and add an additional
+				# style to color our new paths white
+				with open(dest_cover_svg_filename, "r+", encoding="utf-8") as file:
+					svg = regex.sub(r"<style.+?</style>", "<style type=\"text/css\">\n\t\tpath{\n\t\t\tfill: #fff;\n\t\t}\n\n\t\t.title-box{\n\t\t\tfill: #000;\n\t\t\tfill-opacity: .75;\n\t\t}\n\t</style>", file.read(), flags=regex.DOTALL)
+
+					file.seek(0)
+					file.write(svg)
+					file.truncate()
+
 				if args.verbose:
 					print(" OK")
 			else:
@@ -143,6 +145,14 @@ def main():
 
 			clean_inkscape_svg(dest_titlepage_svg_filename, clean_path)
 
+			# For the titlepage we want to remove all styles, since they are not used anymore
+			with open(dest_titlepage_svg_filename, "r+", encoding="utf-8") as file:
+				svg = regex.sub(r"<style.+?</style>[\n\t]+", "", file.read(), flags=regex.DOTALL)
+
+				file.seek(0)
+				file.write(svg)
+				file.truncate()
+
 			if args.verbose:
 				print(" OK")
 		else:

create-draft

@@ -7,40 +7,47 @@ from subprocess import call
 import requests
 import git
 import regex
+import unicodedata
 import se
 import se.formatting
 import se.epub
 from bs4 import BeautifulSoup, UnicodeDammit
 
-def calculate_titlepage_lines(str, ratio):
-	canvas_width = se.TITLEPAGE_WIDTH - (se.TITLEPAGE_HORIZONTAL_PADDING * 2)
-	output_words = []
+
+def get_word_widths(str, target_height):
+	words = []
 	for word in reversed(str.split()):
 		width = 0
 
 		for char in word:
-			width += (se.LEAGUE_SPARTAN_80_WIDTHS[char] / ratio) + se.TITLEPAGE_KERNING + se.TITLEPAGE_AVERAGE_SPACING
+			# Convert accented characters to unaccented characters
+			char = regex.sub(r"\p{M}", "", unicodedata.normalize("NFKD", char))
+			width += (se.LEAGUE_SPARTAN_100_WIDTHS[char] * target_height / 100) + se.LEAGUE_SPARTAN_KERNING + se.LEAGUE_SPARTAN_AVERAGE_SPACING
 
-		width = width - se.TITLEPAGE_KERNING - se.TITLEPAGE_AVERAGE_SPACING
+		width = width - se.LEAGUE_SPARTAN_KERNING - se.LEAGUE_SPARTAN_AVERAGE_SPACING
 
-		output_words.append({"word": word, "width": width})
+		words.append({"word": word, "width": width})
 
+	return words
+
+def calculate_titlepage_lines(str, target_height, canvas_width):
+	words = get_word_widths(str, target_height)
 	lines = []
 	current_line = ""
 	current_width = 0
-	canvas_width = se.TITLEPAGE_WIDTH - (se.TITLEPAGE_HORIZONTAL_PADDING * 2)
-	for word in output_words:
+
+	for word in words:
 		if current_width == 0:
-			current_width = current_width + word["width"]
+			current_width = word["width"]
 		else:
-			current_width = current_width + (se.LEAGUE_SPARTAN_80_WIDTHS[" "] / ratio) + word["width"]
+			current_width = current_width + (se.LEAGUE_SPARTAN_100_WIDTHS[" "] * target_height / 100) + word["width"]
 
 		if current_width < canvas_width:
 			current_line = word["word"] + " " + current_line
 		else:
 			lines.append(current_line.strip())
 			current_line = word["word"]
-			current_width = 0
+			current_width = word["width"]
 
 	lines.append(current_line.strip())
 
@@ -60,6 +67,7 @@ def generate_titlepage_svg(title, authors, contributors, title_string, templates
 	"""
 
 	svg = ""
+	canvas_width = se.TITLEPAGE_WIDTH - (se.TITLEPAGE_HORIZONTAL_PADDING * 2)
 
 	if not isinstance(authors, list):
 		authors = [authors]
@@ -68,27 +76,21 @@ def generate_titlepage_svg(title, authors, contributors, title_string, templates
 	with open(os.path.join(templates_path, "titlepage.svg" ), "r", encoding="utf-8") as file:
 		svg = file.read()
 
-	# Store the template <text> elements for later use
-	title_line_html = regex.search(r"<text.+?>TITLE LINE", svg)[0].replace("TITLE LINE", "")
-	author_line_html = regex.search(r"<text.+?>AUTHOR LINE", svg)[0].replace("AUTHOR LINE", "")
-	contributor_descriptor_html = regex.search(r"<text.+?>CONTRIBUTOR DESCRIPTOR", svg)[0].replace("CONTRIBUTOR DESCRIPTOR", "")
-	contributor_line_html = regex.search(r"<text.+?>CONTRIBUTOR LINE", svg)[0].replace("CONTRIBUTOR LINE", "")
-
 	# Remove the template text elements from the SVG source, we'll write out to it later
 	svg = regex.sub(r"\s*<text.+</svg>", "</svg>", svg, flags=regex.DOTALL).strip()
 
 	# Calculate the title lines
-	title_lines = calculate_titlepage_lines(title.upper(), 1)
+	title_lines = calculate_titlepage_lines(title.upper(), se.TITLEPAGE_TITLE_HEIGHT, canvas_width)
 
 	# Calculate the author lines
 	authors_lines = []
 	for author in authors:
-		authors_lines.append(calculate_titlepage_lines(author.upper(), se.TITLEPAGE_LEAGUE_SPARTAN_60_RATIO))
+		authors_lines.append(calculate_titlepage_lines(author.upper(), se.TITLEPAGE_AUTHOR_HEIGHT, canvas_width))
 
 	# Calculate the contributor lines
 	contributor_lines = []
 	for descriptor, contributor in contributors.items():
-		contributor_lines.append([descriptor, calculate_titlepage_lines(contributor.upper(), se.TITLEPAGE_LEAGUE_SPARTAN_40_RATIO)])
+		contributor_lines.append([descriptor, calculate_titlepage_lines(contributor.upper(), se.TITLEPAGE_CONTRIBUTOR_HEIGHT, canvas_width)])
 
 	# Construct the output
 	text_elements = ""
@@ -97,7 +99,7 @@ def generate_titlepage_svg(title, authors, contributors, title_string, templates
 	# Add the title
 	for line in title_lines:
 		y += se.TITLEPAGE_TITLE_HEIGHT
-		text_elements += "\t" + title_line_html.replace("y=\"\"", "y=\"{}\"".format(y))  + line + "</text>\n"
+		text_elements += "\t<text class=\"title\" x=\"700\" y=\"{:.0f}\">{}</text>\n".format(y, line)
 		y += se.TITLEPAGE_TITLE_MARGIN
 
 	y -= se.TITLEPAGE_TITLE_MARGIN
@@ -108,7 +110,7 @@ def generate_titlepage_svg(title, authors, contributors, title_string, templates
 	for author_lines in authors_lines:
 		for line in author_lines:
 			y += se.TITLEPAGE_AUTHOR_HEIGHT
-			text_elements += "\t" + author_line_html.replace("y=\"\"", "y=\"{}\"".format(y)) + line + "</text>\n"
+			text_elements += "\t<text class=\"author\" x=\"700\" y=\"{:.0f}\">{}</text>\n".format(y, line)
 			y += se.TITLEPAGE_AUTHOR_MARGIN
 
 	y -= se.TITLEPAGE_AUTHOR_MARGIN
@@ -118,26 +120,107 @@ def generate_titlepage_svg(title, authors, contributors, title_string, templates
 		y += se.TITLEPAGE_CONTRIBUTORS_SPACING
 		for contributor in contributor_lines:
 			y += se.TITLEPAGE_CONTRIBUTOR_DESCRIPTOR_HEIGHT
-			text_elements += "\t" + contributor_descriptor_html.replace("y=\"\"", "y=\"{}\"".format(y)) + contributor[0] + "</text>\n"
+			text_elements += "\t<text class=\"contributor-descriptor\" x=\"700\" y=\"{:.0f}\">{}</text>\n".format(y, contributor[0])
 			y += se.TITLEPAGE_CONTRIBUTOR_MARGIN
 
 			for person in contributor[1]:
 				y += se.TITLEPAGE_CONTRIBUTOR_HEIGHT
-				text_elements += "\t" + contributor_line_html.replace("y=\"\"", "y=\"{}\"".format(y)) + person + "</text>\n"
+				text_elements += "\t<text class=\"contributor\" x=\"700\" y=\"{:.0f}\">{}</text>\n".format(y, person)
 				y += se.TITLEPAGE_CONTRIBUTOR_MARGIN
 
 			y -= se.TITLEPAGE_CONTRIBUTOR_MARGIN
 
 			y += se.TITLEPAGE_CONTRIBUTOR_DESCRIPTOR_MARGIN
 
-		y -= se.TITLEPAGE_CONTRIBUTOR_DESCRIPTOR_MARGIN + se.TITLEPAGE_CONTRIBUTOR_MARGIN
+		y -= se.TITLEPAGE_CONTRIBUTOR_DESCRIPTOR_MARGIN
+	else:
+		# Remove unused CSS
+		svg = regex.sub(r"\n\t\t\.contributor-descriptor{.+?}\n", "", svg, flags=regex.DOTALL)
+		svg = regex.sub(r"\n\t\t\.contributor{.+?}\n", "", svg, flags=regex.DOTALL)
 
 	y += se.TITLEPAGE_VERTICAL_PADDING
 
-	svg = svg.replace("</title>", "</title>\n" + text_elements).replace("HEIGHT\"", "{}\"".format(y)).replace("TITLESTRING", title_string)
+	svg = svg.replace("</svg>", "\n" + text_elements + "</svg>").replace("TITLESTRING", title_string)
+	svg = regex.sub(r"viewBox=\".+?\"", "viewBox=\"0 0 1400 {:.0f}\"".format(y), svg)
 
 	return svg
 
+def generate_cover_svg(title, authors, title_string, templates_path):
+	svg = ""
+	canvas_width = se.COVER_TITLE_BOX_WIDTH - (se.COVER_TITLE_BOX_PADDING * 2)
+
+	if not isinstance(authors, list):
+		authors = [authors]
+
+	# Read our template SVG to get some values before we begin
+	with open(os.path.join(templates_path, "cover.svg" ), "r", encoding="utf-8") as file:
+		svg = file.read()
+
+	# Remove the template text elements from the SVG source, we'll write out to it later
+	svg = regex.sub(r"\s*<text.+</svg>", "</svg>", svg, flags=regex.DOTALL).strip()
+
+	# Calculate the title lines
+	title_height = se.COVER_TITLE_HEIGHT
+	title_class = "title"
+	title_lines = calculate_titlepage_lines(title.upper(), title_height, canvas_width)
+
+	if len(title_lines) > 2:
+		title_height = se.COVER_TITLE_SMALL_HEIGHT
+		title_class = "title-small"
+		title_lines = calculate_titlepage_lines(title.upper(), title_height, canvas_width)
+
+	if len(title_lines) > 2:
+		title_height = se.COVER_TITLE_XSMALL_HEIGHT
+		title_class = "title-xsmall"
+		title_lines = calculate_titlepage_lines(title.upper(), title_height, canvas_width)
+
+	# Calculate the author lines
+	authors_lines = []
+	for author in authors:
+		authors_lines.append(calculate_titlepage_lines(author.upper(), se.COVER_AUTHOR_HEIGHT, canvas_width))
+
+	# Construct the output
+	text_elements = ""
+	y = se.COVER_TITLE_BOX_Y + \
+		+ ((se.COVER_TITLE_BOX_HEIGHT \
+			- ( (len(title_lines) * title_height) \
+				+ ( (len(title_lines) - 1) * se.COVER_TITLE_MARGIN ) \
+				+ se.COVER_AUTHOR_SPACING \
+				+ (len(authors_lines) * se.COVER_AUTHOR_HEIGHT) \
+		)) / 2)
+
+	# Add the title
+	for line in title_lines:
+		y += title_height
+		text_elements += "\t<text class=\"{}\" x=\"700\" y=\"{:.0f}\">{}</text>\n".format(title_class, y, line)
+		y += se.COVER_TITLE_MARGIN
+
+	y -= se.COVER_TITLE_MARGIN
+
+	# Add the author(s)
+	y += se.COVER_AUTHOR_SPACING
+
+	for author_lines in authors_lines:
+		for line in author_lines:
+			y += se.COVER_AUTHOR_HEIGHT
+			text_elements += "\t<text class=\"author\" x=\"700\" y=\"{:.0f}\">{}</text>\n".format(y, line)
+			y += se.COVER_AUTHOR_MARGIN
+
+	y -= se.COVER_AUTHOR_MARGIN
+
+	# Remove unused CSS
+	if title_class != "title":
+		svg = regex.sub(r"\n\n\t\t\.title\{.+?\}", "", svg, flags=regex.DOTALL)
+
+	if title_class != "title-small":
+		svg = regex.sub(r"\n\n\t\t\.title-small\{.+?\}", "", svg, flags=regex.DOTALL)
+
+	if title_class != "title-xsmall":
+		svg = regex.sub(r"\n\n\t\t\.title-xsmall\{.+?\}", "", svg, flags=regex.DOTALL)
+
+	svg = svg.replace("</svg>", "\n" + text_elements + "</svg>").replace("TITLESTRING", title_string)
+
+	return svg
 
 def get_wikipedia_url(string, get_nacoaf_url=False):
 	# We try to get the Wikipedia URL by the subject by taking advantage of the fact that Wikipedia's special search will redirect you immediately
@@ -318,13 +401,7 @@ def main():
 	shutil.copy(os.path.normpath(templates_path + "/titlepage.xhtml"), os.path.normpath(repo_name + "/src/epub/text/"))
 	shutil.copy(os.path.normpath(templates_path + "/uncopyright.xhtml"), os.path.normpath(repo_name + "/src/epub/text/"))
 	shutil.copy(os.path.normpath(templates_path + "/titlepage.svg"), os.path.normpath(repo_name + "/images/"))
-
-	if len(args.title) < 15:
-		shutil.copy(os.path.normpath(templates_path + "/cover-short.svg"), os.path.normpath(repo_name + "/images/cover.svg"))
-	elif len(args.title) >= 30:
-		shutil.copy(os.path.normpath(templates_path + "/cover-long.svg"), os.path.normpath(repo_name + "/images/cover.svg"))
-	else:
-		shutil.copy(os.path.normpath(templates_path + "/cover.svg"), os.path.normpath(repo_name + "/images/cover.svg"))
+	shutil.copy(os.path.normpath(templates_path + "/cover.svg"), os.path.normpath(repo_name + "/images/cover.svg"))
 
 	# Try to find Wikipedia links if possible
 	author_wiki_url, author_nacoaf_url = get_wikipedia_url(args.author, True)
@@ -349,6 +426,11 @@ def main():
 	with open(os.path.join(repo_name, "images", "titlepage.svg"), "w") as file:
 		file.write(generate_titlepage_svg(args.title, args.author, contributors, title_string, templates_path))
 
+	# Create the cover SVG
+	with open(os.path.join(repo_name, "images", "cover.svg"), "w") as file:
+		authors = ["Rudolph Eric Raspe", "Willam Cervantes"]
+		file.write(generate_cover_svg(args.title, authors, title_string, templates_path))
+
 	if args.pg_url:
 		se.replace_in_file(os.path.normpath(repo_name + "/src/epub/text/imprint.xhtml"), "PGLINK", args.pg_url)
 
@@ -390,7 +472,6 @@ def main():
 		file.write(colophon_xhtml)
 		file.truncate()
 
-
 	with open(os.path.join(repo_name, "src", "epub", "content.opf"), "r+", encoding="utf-8") as file:
 		metadata_xhtml = file.read()
 

se/__init__.py

@@ -22,8 +22,17 @@
 SE_GENRES = ["Adventure", "Autobiography", "Biography", "Childrens", "Comedy", "Drama", "Fantasy", "Fiction", "Horror", "Memoir", "Mystery", "Nonfiction", "Philosophy", "Poetry", "Romance", "Satire", "Science Fiction", "Shorts", "Spirituality", "Tragedy", "Travel"]
 MESSAGE_TYPE_WARNING = 1
 MESSAGE_TYPE_ERROR = 2
-TITLEPAGE_KERNING = 5
-TITLEPAGE_AVERAGE_SPACING = 7 # Guess at average default spacing between letters
+COVER_TITLE_BOX_Y = 1620 # In px; note that in SVG, Y starts from the TOP of the image
+COVER_TITLE_BOX_HEIGHT = 430
+COVER_TITLE_BOX_WIDTH = 1300
+COVER_TITLE_BOX_PADDING = 100
+COVER_TITLE_MARGIN = 20
+COVER_TITLE_HEIGHT = 80
+COVER_TITLE_SMALL_HEIGHT = 60
+COVER_TITLE_XSMALL_HEIGHT = 50
+COVER_AUTHOR_SPACING = 60
+COVER_AUTHOR_HEIGHT = 40
+COVER_AUTHOR_MARGIN = 20
 TITLEPAGE_WIDTH = 1400
 TITLEPAGE_VERTICAL_PADDING = 50
 TITLEPAGE_HORIZONTAL_PADDING = 100
@@ -37,9 +46,9 @@
 TITLEPAGE_CONTRIBUTOR_HEIGHT = 40 # Height of each contributor line
 TITLEPAGE_CONTRIBUTOR_MARGIN = 20 # Space between contributor descriptor and contributor line, and between sequential contributor lines
 TITLEPAGE_CONTRIBUTOR_DESCRIPTOR_MARGIN = 80 # Space between last contributor line and next contributor descriptor (if more than one contributor descriptor)
-LEAGUE_SPARTAN_80_WIDTHS = {" ": 40, "A": 78.596, "B": 54.550, "C": 67.181, "D": 61.287, "E": 44.164, "F": 44.632, "G": 73.263, "H": 60.070, "I": 17.591, "J": 42.105, "K": 70.269, "L": 44.164, "M": 85.520, "N": 66.058, "O": 77.754, "P": 54.550, "Q": 79.064, "R": 63.532, "S": 58.105, "T": 54.269, "U": 60.257, "V": 78.596, "W": 107.696, "X": 81.029, "Y": 74.480, "Z": 68.959, ".": 21.427, ",": 21.427, "/": 52.865, "\\": 52.865, "-": 30.129, ":": 21.427, ";": 21.427, "’": 19.462, "!": 21.427, "?": 51.462, "&": 81.497, "0": 62.784, "1": 30.316, "2": 60.164, "3": 57.637, "4": 63.439, "5": 56.140, "6": 59.415, "7": 61.567, "8": 57.731, "9": 59.415}
-TITLEPAGE_LEAGUE_SPARTAN_60_RATIO = 1.333333
-TITLEPAGE_LEAGUE_SPARTAN_40_RATIO = 2
+LEAGUE_SPARTAN_KERNING = 5 # In px
+LEAGUE_SPARTAN_AVERAGE_SPACING = 7 # Guess at average default spacing between letters, in px
+LEAGUE_SPARTAN_100_WIDTHS = {" ": 40.0, "A": 98.245, "B": 68.1875, "C": 83.97625, "D": 76.60875, "E": 55.205, "F": 55.79, "G": 91.57875, "H": 75.0875, "I": 21.98875, "J": 52.631254, "K": 87.83625, "L": 55.205, "M": 106.9, "N": 82.5725, "O": 97.1925, "P": 68.1875, "Q": 98.83, "R": 79.41599, "S": 72.63125, "T": 67.83625, "U": 75.32125, "V": 98.245, "W": 134.62, "X": 101.28625, "Y": 93.1, "Z": 86.19875, ".": 26.78375, ",": 26.78375, "/": 66.08125, "\\": 66.08125, "-": 37.66125, ":": 26.78375, ";": 26.78375, "’": 24.3275, "!": 26.78375, "?": 64.3275, "&": 101.87125, "0": 78.48, "1": 37.895, "2": 75.205, "3": 72.04625, "4": 79.29875, "5": 70.175, "6": 74.26875, "7": 76.95875, "8": 72.16375, "9": 74.26875}
 
 class SeError(Exception):
 	pass