Make the new skin the default; normalize rules

diff --git a/common/scripts/gbtoxhtml-less-simple.pl b/common/scripts/gbtoxhtml-less-simple.pl
index feae705..8948e65 100755 (executable)
--- a/common/scripts/gbtoxhtml-less-simple.pl
+++ b/common/scripts/gbtoxhtml-less-simple.pl
@@ -65,7 +65,7 @@ while( $#ARGV > -1 ) {
 }
 
 if( $bookCode eq '' ) { die "Unspecified book code\n$USAGE"; }
 }
 
 if( $bookCode eq '' ) { die "Unspecified book code\n$USAGE"; }

-if( $metaFile eq '' ) { $metaFile = "$language/.publisher/rules/simple"; }
+if( $metaFile eq '' ) { $metaFile = "$language/.publisher/rules/dever"; }

 if( $bookXML eq '' ) { $bookXML = "$language/xml/$bookCode.xml"; }
 if( $xhtmlXSL eq '' ) { die "Unspecified XSL transformation file\n$USAGE"; }
 
 if( $bookXML eq '' ) { $bookXML = "$language/xml/$bookCode.xml"; }
 if( $xhtmlXSL eq '' ) { die "Unspecified XSL transformation file\n$USAGE"; }
 

diff --git a/common/scripts/gbtoxhtml-simple.pl b/common/scripts/gbtoxhtml-simple.pl
index 09dc2a5..ae5ad1d 100755 (executable)
--- a/common/scripts/gbtoxhtml-simple.pl
+++ b/common/scripts/gbtoxhtml-simple.pl
@@ -72,7 +72,7 @@ while( $#ARGV > -1 ) {
 }
 
 if( $bookCode eq '' ) { die "Unspecified book code\n$USAGE"; }
 }
 
 if( $bookCode eq '' ) { die "Unspecified book code\n$USAGE"; }

-if( $metaFile eq '' ) { $metaFile = "$language/.publisher/rules/standard"; }
+if( $metaFile eq '' ) { $metaFile = "$language/.publisher/rules/dever"; }

 if( $bookXML eq '' ) { $bookXML = "$language/xml/$bookCode.xml"; }
 if( $xhtmlXSL eq '' ) { die "Unspecified XSL transformation file\n$USAGE"; }
 
 if( $bookXML eq '' ) { $bookXML = "$language/xml/$bookCode.xml"; }
 if( $xhtmlXSL eq '' ) { die "Unspecified XSL transformation file\n$USAGE"; }
 

diff --git a/common/scripts/gbtoxhtml.pl b/common/scripts/gbtoxhtml.pl
index 2a4bd3d..fdf721a 100755 (executable)
--- a/common/scripts/gbtoxhtml.pl
+++ b/common/scripts/gbtoxhtml.pl
@@ -40,7 +40,7 @@ foreach (@BINARIES) {
 my $bookCode     = '';
 my $metaFile     = '';
 my $bookXML      = '';
 my $bookCode     = '';
 my $metaFile     = '';
 my $bookXML      = '';

-my $xhtmlXSL     = 'common/xsl/xhtml.xsl';
+my $xhtmlXSL     = 'common/xsl/xhtml-dever.xsl';

 my $language     = 'en';
 
 my $verbose = 0;
 my $language     = 'en';
 
 my $verbose = 0;


@@ -68,7 +68,7 @@ while( $#ARGV > -1 ) {
 }
 
 if( $bookCode eq '' ) { die "Unspecified book code\n$USAGE"; }
 }
 
 if( $bookCode eq '' ) { die "Unspecified book code\n$USAGE"; }

-if( $metaFile eq '' ) { $metaFile = "$language/.publisher/rules/standard"; }
+if( $metaFile eq '' ) { $metaFile = "$language/.publisher/rules/dever"; }

 if( $bookXML eq '' ) { $bookXML = "$language/xml/$bookCode.xml"; }
 if( $xhtmlXSL eq '' ) { die "Unspecified XSL transformation file\n$USAGE"; }
 
 if( $bookXML eq '' ) { $bookXML = "$language/xml/$bookCode.xml"; }
 if( $xhtmlXSL eq '' ) { die "Unspecified XSL transformation file\n$USAGE"; }
 

diff --git a/en/.publisher/rules/simple b/en/.publisher/rules/simple
index 44e7d28..a909806 100644 (file)
--- a/en/.publisher/rules/simple
+++ b/en/.publisher/rules/simple
@@ -166,6 +166,12 @@
     use-illustrators: :Brian Williams:JC Alvarez / Jonathan Blake:Jonathan Blake:;
     images: en/png/lw/28thos/ill/williams:en/png/lw/28thos/ill/alvarez-blake:en/png/lw/28thos/ill/blake;
 }
     use-illustrators: :Brian Williams:JC Alvarez / Jonathan Blake:Jonathan Blake:;
     images: en/png/lw/28thos/ill/williams:en/png/lw/28thos/ill/alvarez-blake:en/png/lw/28thos/ill/blake;
 }

+29tsoc {
+    book-series: lw;
+    language: en;
+    use-illustrators: :Brian Williams:;
+    images: en/png/lw/28thos/ill/williams;
+}

 01gstw {
     book-series: gs;
     language: en;
 01gstw {
     book-series: gs;
     language: en;

diff --git a/en/.publisher/rules/standard b/en/.publisher/rules/standard
index 7129b07..93fb29c 100644 (file)
--- a/en/.publisher/rules/standard
+++ b/en/.publisher/rules/standard
@@ -306,12 +306,6 @@
     images: en/png/lw/28thos/skins/standard:en/png/lw/28thos/ill/williams:en/png/lw/28thos/ill/alvarez-blake:en/png/lw/28thos/ill/blake;
     csst: en/.publisher/style/standard/main.csst:en/.publisher/style/standard/more.csst;
 }
     images: en/png/lw/28thos/skins/standard:en/png/lw/28thos/ill/williams:en/png/lw/28thos/ill/alvarez-blake:en/png/lw/28thos/ill/blake;
     csst: en/.publisher/style/standard/main.csst:en/.publisher/style/standard/more.csst;
 }

-29tsoc {
-    book-series: lw;
-    language: en;
-    use-illustrators: :JC Alvarez / Jonathan Blake:Jonathan Blake:;
-    csst: en/.publisher/style/standard/main.csst:en/.publisher/style/standard/more.csst;
-}

 01gstw {
     book-series: gs;
     language: en;
 01gstw {
     book-series: gs;
     language: en;