Merge pull request #3 from liZe/master

Minor fixes for WeasyPrint
zopyx · Feb 13, 2020 · 238ab2e · 238ab2e
2 parents 23a39fe + a73df68
commit 238ab2e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/lessons/Makefile b/lessons/Makefile
@@ -10,7 +10,7 @@ antennahouse:
 	-run.sh -d  index.html -o antennahouse.pdf
 
 weasyprint:
-	-weasyprint  index.html weasyprint.pdf
+	-weasyprint  -e utf-8 index.html weasyprint.pdf
 
 
 clean:

diff --git a/lessons/lesson-hyphenation-long-words/styles.css b/lessons/lesson-hyphenation-long-words/styles.css
@@ -27,6 +27,7 @@ p.hyphenate {
     border: 1px solid grey;
     hyphenate-before: 4;
     hyphenate-after: 3;
+    hyphenate-limit-chars: 1 4 3;
     hyphens: auto;
     -epub-hyphens: auto;
     -webkit-hyphens: auto;

diff --git a/lessons/lesson-ligatures/styles.css b/lessons/lesson-ligatures/styles.css
@@ -16,13 +16,15 @@ div.demo {
 }
 
 .with-ligatures {
+    font-variant-ligatures: normal;
     -ah-ligature-mode: auto;
     -webkit-font-kerning: auto;
     font-kerning: none;
 }
 
 
 .without-ligatures {
+    font-variant-ligatures: none;
     -ah-ligature-mode: none;
     font-variant-ligatures: none;
 }

diff --git a/lessons/lesson-named-pages/styles.css b/lessons/lesson-named-pages/styles.css
@@ -14,7 +14,7 @@ h1 {
 }
 
 @page Bizarre {
-    size: a5 landscape;
+    size: 148mm 105mm;
     background: blue;
     color: pink;
     border: 3px dashed yellow;

diff --git a/lessons/lesson-page-areas/styles.css b/lessons/lesson-page-areas/styles.css
@@ -95,4 +95,7 @@
     prince-bleed: 10mm;
     marks: crop cross;
 
+    /* WeasyPrint */
+    bleed: 10mm;
+
 }