From: Klaatu <klaatu@member.fsf.org>
Date: Tue, 14 Mar 2017 06:38:55 +0000 (+0000)
Subject: Freeway Warrior (fw) 1 epub build. Font fixes. OFL Carlito font. CSS update for fw... 
X-Git-Tag: 20180215~109
X-Git-Url: http://git.projectaon.org/?a=commitdiff_plain;h=136c029d5ac24456b74498f504ad487b1243670a;p=project-aon.git

Freeway Warrior (fw) 1 epub build. Font fixes. OFL Carlito font. CSS update for fw. Cover art for fw.


git-svn-id: https://projectaon.org/data/trunk@2589 f6f3e2d7-ff33-0410-aaf5-b4bee2cdac11
---

diff --git a/common/epub/01hh/Makefile b/common/epub/01hh/Makefile
new file mode 100644
index 0000000..278f890
--- /dev/null
+++ b/common/epub/01hh/Makefile
@@ -0,0 +1,13 @@
+# Makefile for a Project Aon Book
+
+# Series (lw = LoneWolf, gs = GreyStar...)
+SERIES=fw
+# Sub-series (kai, magnakai, grandmaster, neworder, shianti (Grey Star))
+SUBSERIES=''
+# Book name
+BASENAME=$(shell basename $(CURDIR))
+# Language of the file
+BLANG := en
+
+# The rest is common for all books
+include ../Makefile.common
diff --git a/common/epub/Makefile.common b/common/epub/Makefile.common
index 8a61c48..eda9023 100644
--- a/common/epub/Makefile.common
+++ b/common/epub/Makefile.common
@@ -40,7 +40,7 @@ XSLFILES=$(RELXSLDIR)/epub-opf-metadata.xsl $(RELXSLDIR)/epub-xhtml.xsl  \
 # Generate the ePub file from the XML file
 epub: $(EPUB)
 $(AONROOTDIR)/$(BLANG)/epub/$(SERIES)/$(BASENAME)/$(EPUB): $(XMLFILE) $(EPUBSCRIPT) $(XSLFILES)
-	cd $(AONROOTDIR) && perl $(EPUBSCRIPT) --language=$(BLANG) --font-files=$(AONROOTDIR)/fontfiles/ $(BASENAME) 
+	cd $(AONROOTDIR) && perl $(EPUBSCRIPT) --language=$(BLANG) --font-files=$(AONROOTDIR)/common/fonts/ $(BASENAME) 
 
 $(EPUB): $(AONROOTDIR)/$(BLANG)/epub/$(SERIES)/$(BASENAME)/$(EPUB)
 	cp -p $(AONROOTDIR)/$(BLANG)/epub/$(SERIES)/$(BASENAME)/$(EPUB) .
diff --git a/common/fonts/Carlito-Bold.ttf b/common/fonts/Carlito-Bold.ttf
new file mode 100644
index 0000000..b29a590
Binary files /dev/null and b/common/fonts/Carlito-Bold.ttf differ
diff --git a/common/fonts/Carlito-BoldItalic.ttf b/common/fonts/Carlito-BoldItalic.ttf
new file mode 100644
index 0000000..0eaa04e
Binary files /dev/null and b/common/fonts/Carlito-BoldItalic.ttf differ
diff --git a/common/fonts/Carlito-Italic.ttf b/common/fonts/Carlito-Italic.ttf
new file mode 100644
index 0000000..64df01e
Binary files /dev/null and b/common/fonts/Carlito-Italic.ttf differ
diff --git a/common/fonts/Carlito-Regular.ttf b/common/fonts/Carlito-Regular.ttf
new file mode 100644
index 0000000..6b7e0e3
Binary files /dev/null and b/common/fonts/Carlito-Regular.ttf differ
diff --git a/common/fonts/LICENSE b/common/fonts/LICENSE
new file mode 100644
index 0000000..e999b31
--- /dev/null
+++ b/common/fonts/LICENSE
@@ -0,0 +1,95 @@
+Copyright (c) 2010-2013 by tyPoland Lukasz Dziedzic with Reserved Font Name "Carlito".
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1 as shown below.
+
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+
+PREAMBLE The goals of the Open Font License (OFL) are to stimulate
+worldwide development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to provide
+a free and open framework in which fonts may be shared and improved in
+partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves.
+The fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works.  The fonts and derivatives,
+however, cannot be released under any other type of license.  The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such.
+This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components
+as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting ? in part or in whole ?
+any of the components of the Original Version, by changing formats or
+by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer
+or other person who contributed to the Font Software.
+
+
+PERMISSION & CONDITIONS
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,in
+   Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the
+   corresponding Copyright Holder. This restriction only applies to the
+   primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must
+   be distributed entirely under this license, and must not be distributed
+   under any other license. The requirement for fonts to remain under
+   this license does not apply to any document created using the Font
+   Software.
+
+
+ 
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+ 
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.
+
diff --git a/common/scripts/gbtoepub.pl b/common/scripts/gbtoepub.pl
index 810b5e6..d8cb66f 100755
--- a/common/scripts/gbtoepub.pl
+++ b/common/scripts/gbtoepub.pl
@@ -17,7 +17,8 @@ my $TAR        = qx{which tar};
 my $ZIP        = qx{which zip};
 my $BZIP2      = qx{which bzip2};
 my $JAVA       = qx{which java};
-my $XALAN_JAR  = '/usr/share/java/xalan2.jar';
+#my $XALAN_JAR  = '/usr/share/java/xalan2.jar';
+my $XALAN_JAR  = '/usr/share/ant/lib/xalan.jar';
 my $RM         = qx{which rm};
 my $CHMOD      = qx{which chmod};
 
@@ -64,7 +65,7 @@ my $ncxXSL       = 'common/xsl/epub-ncx.xsl';
 my $epubXSL      = 'common/xsl/epub-xhtml.xsl';
 my $metadataXSL  = 'common/xsl/epub-opf-metadata.xsl';
 my $spineXSL     = 'common/xsl/epub-opf-spine.xsl';
-my $fontFiles    = "$ENV{'HOME'}${FILENAME_SEPARATOR}souvenir";
+my $fontFiles    = "common/fonts";
 my $language     = 'en';
 
 my $verbose = 0;
@@ -233,7 +234,7 @@ foreach my $cssTemplate (split( /:/, $rulesHash{'csst'} )) {
 unless( -e $fontFiles && -d $fontFiles ) {
     die "$PROGRAM_NAME: font files directory does not exist or is not a directory \"$fontFiles\": $!\n";
 }
-print qx{$CP $fontFiles${FILENAME_SEPARATOR}*.otf $outPath{'oebps'}};
+print qx{$CP $fontFiles${FILENAME_SEPARATOR}*tf $outPath{'oebps'}};
 
 ### write NCX file
 
diff --git a/en/.publisher/style/freewaywarrior-compatible/main.csst b/en/.publisher/style/freewaywarrior-compatible/main.csst
index f174e61..8362609 100644
--- a/en/.publisher/style/freewaywarrior-compatible/main.csst
+++ b/en/.publisher/style/freewaywarrior-compatible/main.csst
@@ -3,7 +3,7 @@
 html, body {
  background-color: %%background-color%%;
  color: %%text-color%%;
- font-family: Calibiri, "Lucida Grande", Verdana, Trebuchet, Arial, Helvetica, sans-serif;
+ font-family: Carlito,Calibri, "Lucida Grande", Verdana, Trebuchet, Arial, Helvetica, sans-serif;
 }
 
 #title {
diff --git a/en/.publisher/style/freewaywarrior/main.csst b/en/.publisher/style/freewaywarrior/main.csst
index da538c7..1427180 100644
--- a/en/.publisher/style/freewaywarrior/main.csst
+++ b/en/.publisher/style/freewaywarrior/main.csst
@@ -3,7 +3,7 @@
 html, body {
  background-color: %%background-color%%;
  color: %%text-color%%;
- font-family: Calibiri, "Lucida Grande", Verdana, Trebuchet, Arial, Helvetica, sans-serif;
+ font-family: Carlito,Calibri, "Lucida Grande", Verdana, Trebuchet, Arial, Helvetica, sans-serif;
 }
 
 #title {
diff --git a/en/jpeg/fw/01hh/skins/ebook/cover.jpg b/en/jpeg/fw/01hh/skins/ebook/cover.jpg
new file mode 100644
index 0000000..ba0701e
Binary files /dev/null and b/en/jpeg/fw/01hh/skins/ebook/cover.jpg differ
diff --git a/en/xml/01hh.xml b/en/xml/01hh.xml
index 06325fc..9ca7c0b 100644
--- a/en/xml/01hh.xml
+++ b/en/xml/01hh.xml
@@ -114,6 +114,11 @@
           <line>Neil McGrory</line>
           <line>Mark Baumann</line>
          </dd>
+	 <dt>Conversion</dt>
+	 <dd>
+	   <line>Klaatu Einzelg<ch.auml/>nger (Highway
+	   Holocaust)</line>
+	 </dd>
         <!-- <dt>PDF Layout</dt>
          <dd></dd> -->
         <dt>Coordination</dt>