E-pub tests and css changes

nlbdev · May 24, 2016 · 5ce88d0 · 5ce88d0
1 parent 2bcffce
commit 5ce88d0
Show file tree

Hide file tree

Showing 7 changed files with 247 additions and 156 deletions.
diff --git a/src/main/resources/css/nlb-default.scss b/src/main/resources/css/nlb-default.scss
@@ -5,7 +5,10 @@ last updated 27.04.2016 KL: 14:00
 
 /* Declare parameters. Values are passed in from nlb:dtbook-to-pef. */
 $show-print-page-numbers: false !default;
+$show-braille-page-numbers: false !default;
 $line-spacing: false !default;
+$include-note-references: true !default;
+$choice-of-colophon: true !default;
 
 /* -------------------------------------------------------------------------- */
 /*                displaying Original and Braille Page                        */
@@ -32,12 +35,14 @@ $line-spacing: false !default;
 					content: -obfl-marker-indicator(pagenum, '⠿');
 				}
 			}
-
-		@bottom-center
-			{
-				content: counter(page);
+		@if $show-braille-page-numbers 
+			{	
+				@bottom-center
+					{
+						content: counter(page);
+					}
 			}
-}
+	}
 
 pagenum , span[epub|type~='pagebreak'] ,  div[epub|type~='pagebreak']
 	{
@@ -94,12 +99,22 @@ bodymatter , *[epub|type~='bodymatter']
     flow: front;
   }
 
-.titlepage, .colophon
+.titlepage
 	{
 		display: block;
 		page-break-before: always;
 		flow: titlepage;
 	}
+
+@if $choice-of-colophon
+	{
+		.colophon 
+		{
+			display: block;
+			page-break-before: always;
+			flow: titlepage;
+		}
+	}
 
 #generated-volume-toc
 	{
@@ -205,11 +220,16 @@ level1,
 		display: block;
 	}
 
-blockquote, sidebar, aside[epub|type~='sidebar'], epigraph, aside[epub|type~='epigraph'] , note, aside[epub|type~='note'] , noteref, a[epub|type~='noteref'],
+blockquote, sidebar, aside[epub|type~='sidebar'], epigraph, aside[epub|type~='epigraph'] ,  noteref, a[epub|type~='noteref'],
 	.Rammetekst,   poem  ,section[epub|type~='z3998:poem']  ,div[epub|type~='z3998:poem'] , linegroup , section.linegroup , div.linegroup , line , p.line
 	{
 		display: block;
 	}
+
+note, aside[epub|type~='note'] 
+	{
+		display: if($include-note-references, block, none);
+	}
 
 doctitle, h1[epub|type~='fulltitle'], h1[epub|type~='z3998:covertitle'] ,docauthor , h1[epub|type~='z3998:author']
 	{

diff --git a/src/main/resources/liblouis/no-no-chardefs6.uti b/src/main/resources/liblouis/no-no-chardefs6.uti
@@ -146,10 +146,11 @@ uplow \x01EA\x01EB 23456     # o with ogonek
 uplow Đđ 1456                # d with stroke
 uplow Ðð 156                 # Eth
 uplow Ŋŋ 1246                # Eng
-uplow Þþ 35-2345                # Thorn
+uplow Þþ 35-2345             # Thorn
 uplow Üü 1245                # u with diaeresis
 uplow Ŧŧ 1256                # t with stroke
-uplow Ṥṥ  156                  # Latin Letter S with Acute and Dot Above
+uplow Ṥṥ  156                 # Latin Letter S with Acute and Dot Above
+uplow Šš 156         		 # Latin Letter S with Caron
 
 math + 235                   # plus x002B
 math / 34 solidus            # x002F

diff --git a/src/main/resources/liblouis/no-no-g0.utb b/src/main/resources/liblouis/no-no-g0.utb
@@ -8,8 +8,8 @@ include no-no-chardefs6.uti
 include http://www.liblouis.org/tables/litdigits6Dots.uti
 include http://www.liblouis.org/tables/braille-patterns.cti # unicode braille
 
-lowword \x2013 36-36         # make double when surrounded by white spaces
-lowword - 36-36              # make double when hyphen surrounded by white spaces
+#lowword \x2013 36-36         # make double when surrounded by white spaces
+#lowword - 36-36              # make double when hyphen surrounded by white spaces
 
 numsign 3456
 capsign 6                    # single capital letter indicator

diff --git a/src/main/resources/liblouis/no-no-latinLetterDef6Dots_diacritics.uti b/src/main/resources/liblouis/no-no-latinLetterDef6Dots_diacritics.uti
@@ -69,7 +69,6 @@ uplow Ľľ 4-123        # Latin Letter L with Caron
 uplow Ňň 4-1345       # Latin Letter N with Caron
 uplow Ǒǒ 4-135        # Latin Letter O with Caron
 uplow Řř 4-1235       # Latin Letter R with Caron
-uplow Šš 4-234        # Latin Letter S with Caron
 uplow Ťť 4-2345       # Latin Letter T with Caron
 uplow Ǔǔ 4-136        # Latin Letter U with Caron
 sign  ǅ  4-1356       # Latin Capital Letter D with Small Letter Z with Caron

diff --git a/src/test/java/NLBTest.java b/src/test/java/NLBTest.java
@@ -130,7 +130,7 @@ public void runXProcSpec() throws Exception {
 		for (String test : new String[]{
 			"test_css_formatter",
 			"test_css_translator",
-			// "test_dtbook-to-pef",
+			"test_dtbook-to-pef",
 			"test_dtbook-to-pef_hyphenation",
 			"test_epub3-to-pef",
 			"test_html-to-pef",