From 1264db8893b6c0e760106a37cff0d65373948c55 Mon Sep 17 00:00:00 2001
From: Bert Frees
Date: Mon, 8 Apr 2019 16:48:38 +0200
Subject: [PATCH] [mod-nlb] Add options "Inkluder strong" and "Inkluder em"
see issue https://github.com/nlbdev/pipeline/issues/217
---
.../src/main/resources/css/nlb-default.scss | 2 ++
.../main/resources/css/text-formatting.scss | 20 +++++++++++++------
.../src/main/resources/xml/dtbook-to-pef.xpl | 2 ++
.../src/main/resources/xml/epub3-to-pef.xpl | 2 ++
.../src/main/resources/xml/html-to-pef.xpl | 2 ++
.../src/main/resources/xml/xml-to-pef.xpl | 12 +++++++++++
6 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/modules/nlb/book-to-pef/src/main/resources/css/nlb-default.scss b/modules/nlb/book-to-pef/src/main/resources/css/nlb-default.scss
index 1f74876f5d..e162241fdc 100644
--- a/modules/nlb/book-to-pef/src/main/resources/css/nlb-default.scss
+++ b/modules/nlb/book-to-pef/src/main/resources/css/nlb-default.scss
@@ -14,6 +14,8 @@ $page-width: 40 !default;
$hyphenation: true !default;
$force-norwegian: true !default;
$duplex: true !default;
+$include-strong: true !default;
+$include-em: true !default;
@import "page-numbers";
@import "line-spacing";
diff --git a/modules/nlb/book-to-pef/src/main/resources/css/text-formatting.scss b/modules/nlb/book-to-pef/src/main/resources/css/text-formatting.scss
index fc0f51c188..665e0e29cf 100644
--- a/modules/nlb/book-to-pef/src/main/resources/css/text-formatting.scss
+++ b/modules/nlb/book-to-pef/src/main/resources/css/text-formatting.scss
@@ -26,15 +26,23 @@
close: "⠐⠂";
}
-strong, b {
- text-transform: strong;
- :root:not(:has(em, i)) & {
- text-transform: em;
+@if ($include-strong) {
+ strong, b {
+ @if ($include-em) {
+ text-transform: strong;
+ :root:not(:has(em, i)) & {
+ text-transform: em;
+ }
+ } @else {
+ text-transform: em;
+ }
}
}
-em, i {
- text-transform: em;
+@if ($include-em) {
+ em, i {
+ text-transform: em;
+ }
}
u {
diff --git a/modules/nlb/book-to-pef/src/main/resources/xml/dtbook-to-pef.xpl b/modules/nlb/book-to-pef/src/main/resources/xml/dtbook-to-pef.xpl
index 8bef3ccd39..e767388a71 100644
--- a/modules/nlb/book-to-pef/src/main/resources/xml/dtbook-to-pef.xpl
+++ b/modules/nlb/book-to-pef/src/main/resources/xml/dtbook-to-pef.xpl
@@ -69,6 +69,8 @@
+
+
diff --git a/modules/nlb/book-to-pef/src/main/resources/xml/epub3-to-pef.xpl b/modules/nlb/book-to-pef/src/main/resources/xml/epub3-to-pef.xpl
index 9e9fb7a57f..87783eceb2 100644
--- a/modules/nlb/book-to-pef/src/main/resources/xml/epub3-to-pef.xpl
+++ b/modules/nlb/book-to-pef/src/main/resources/xml/epub3-to-pef.xpl
@@ -64,6 +64,8 @@
+
+
diff --git a/modules/nlb/book-to-pef/src/main/resources/xml/html-to-pef.xpl b/modules/nlb/book-to-pef/src/main/resources/xml/html-to-pef.xpl
index ea5e6e083f..28f6498f42 100644
--- a/modules/nlb/book-to-pef/src/main/resources/xml/html-to-pef.xpl
+++ b/modules/nlb/book-to-pef/src/main/resources/xml/html-to-pef.xpl
@@ -70,6 +70,8 @@
+
+
diff --git a/modules/nlb/book-to-pef/src/main/resources/xml/xml-to-pef.xpl b/modules/nlb/book-to-pef/src/main/resources/xml/xml-to-pef.xpl
index 91c928c528..3569a99e12 100644
--- a/modules/nlb/book-to-pef/src/main/resources/xml/xml-to-pef.xpl
+++ b/modules/nlb/book-to-pef/src/main/resources/xml/xml-to-pef.xpl
@@ -149,6 +149,18 @@ Dette kan være nyttig for å løse problemer med formatering av PEF'en.
+
+
+ Tekstelementer: Inkluder em
+ Når boksen er tom, blir em utelatt fra produksjonen.
+
+
+
+
+ Tekstelementer: Inkluder strong
+ Når boksen er tom, vil strong bli utelatt fra produksjonen.
+
+
Tekstelementer: Inkluder noter