From 559f55abf0cc03a4d812d8374652c67e1cfd7127 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Thu, 22 May 2014 11:43:26 +0000
Subject: [PATCH] fix Prince run-time under new fonts-free world order

---
 prince/prince.spec |   2 +-
 prince/prince.txt  | 321 +++------------------------------------------
 2 files changed, 16 insertions(+), 307 deletions(-)

diff --git a/prince/prince.spec b/prince/prince.spec
index 099c464846..08ae1930d7 100644
--- a/prince/prince.spec
+++ b/prince/prince.spec
@@ -39,7 +39,7 @@ Class:        EVAL
 Group:        Typesetting
 License:      Commercial
 Version:      %{V_openpkg}
-Release:      20140413
+Release:      20140522
 
 #   list of sources
 Source0:      http://www.princexml.com/download/prince-%{V_freebsd}-freebsd82-static.tar.gz
diff --git a/prince/prince.txt b/prince/prince.txt
index 8decb3560d..4730c40a81 100644
--- a/prince/prince.txt
+++ b/prince/prince.txt
@@ -1,239 +1,11 @@
 <file name="fonts.css">
 
-@import url("fonts-sans-arial.css");
-@import url("fonts-serif-times.css");
-@import url("fonts-monospace-courier.css");
-@import url("fonts-cursive-comic.css");
-@import url("fonts-fantasy-impact.css");
+@import url("fonts-liberation-sans.css");
+@import url("fonts-liberation-serif.css");
+@import url("fonts-liberation-mono.css");
 
 </file>
-<file name="fonts-cursive-comic.css">
-
-/*  Microsoft Comic Sans  */
-@font-face {
-    font-family: cursive;
-    font-style: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/Comic.ttf")
-}
-@font-face {
-    font-family: cursive;
-    font-style: normal;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/ComicBd.ttf")
-}
-
-</file>
-<file name="fonts-fantasy-impact.css">
-
-/*  Microsoft Impact  */
-@font-face {
-    font-family: fantasy;
-    font-style: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/Impact.ttf")
-}
-
-</file>
-<file name="fonts-monospace-courier.css">
-
-/*  Microsoft Courier  */
-@font-face {
-    font-family: monospace;
-    font-style: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/cour.ttf");
-}
-@font-face {
-    font-family: monospace;
-    font-style: normal;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/courbd.ttf");
-}
-@font-face {
-    font-family: monospace;
-    font-style: italic;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/couri.ttf");
-}
-@font-face {
-    font-family: monospace;
-    font-style: italic;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/courbi.ttf");
-}
-
-</file>
-<file name="fonts-monospace-dejavu.css">
-
-/*  DejaVu Mono  */
-@font-face {
-    font-family: monospace;
-    font-style: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSansMono.ttf") !important;
-}
-@font-face {
-    font-family: monospace;
-    font-style: normal;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSansMono-Bold.ttf") !important;
-}
-@font-face {
-    font-family: monospace;
-    font-style: italic;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSansMono-Oblique.ttf") !important;
-}
-@font-face {
-    font-family: monospace;
-    font-style: italic;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSansMono-BoldOblique.ttf") !important;
-}
-
-</file>
-<file name="fonts-monospace-liberation.css">
-
-/*  Liberation Mono  */
-@font-face {
-    font-family: monospace;
-    font-style: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/Liberation/LiberationSansMono-Regular.ttf") !important;
-}
-@font-face {
-    font-family: monospace;
-    font-style: normal;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/Liberation/LiberationSansMono-Bold.ttf") !important;
-}
-@font-face {
-    font-family: monospace;
-    font-style: italic;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/Liberation/LiberationSansMono-Italic.ttf") !important;
-}
-@font-face {
-    font-family: monospace;
-    font-style: italic;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/Liberation/LiberationSansMono-BoldItalic.ttf") !important;
-}
-
-</file>
-<file name="fonts-sans-arial.css">
-
-/*  Microsoft Arial  */
-@font-face {
-    font-family: sans-serif;
-    font-style: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/Arial.ttf");
-}
-@font-face {
-    font-family: sans-serif;
-    font-style: normal;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/Arialbd.ttf");
-}
-@font-face {
-    font-family: sans-serif;
-    font-style: italic;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/Ariali.ttf");
-}
-@font-face {
-    font-family: sans-serif;
-    font-style: italic;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/Arialbi.ttf");
-}
-
-</file>
-<file name="fonts-sans-dejavu.css">
-
-/*  DejaVu Sans  */
-@font-face {
-    font-family: sans-serif;
-    font-style: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSans.ttf") !important;
-}
-@font-face {
-    font-family: sans-serif;
-    font-style: normal;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSans-Bold.ttf") !important;
-}
-@font-face {
-    font-family: sans-serif;
-    font-style: italic;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSans-Oblique.ttf") !important;
-}
-@font-face {
-    font-family: sans-serif;
-    font-style: italic;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSans-BoldOblique.ttf") !important;
-}
-
-/*  DejaVu Sans Condensed  */
-@font-face {
-    font-family: sans-serif;
-    font-style: normal;
-    font-weight: normal;
-    font-stretch: condensed;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSansCondensed.ttf") !important;
-}
-@font-face {
-    font-family: sans-serif;
-    font-style: normal;
-    font-weight: bold;
-    font-stretch: condensed;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSansCondensed-Bold.ttf") !important;
-}
-@font-face {
-    font-family: sans-serif;
-    font-style: italic;
-    font-weight: normal;
-    font-stretch: condensed;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSansCondensed-Oblique.ttf") !important;
-}
-@font-face {
-    font-family: sans-serif;
-    font-style: italic;
-    font-weight: bold;
-    font-stretch: condensed;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSansCondensed-BoldOblique.ttf") !important;
-}
-
-</file>
-<file name="fonts-sans-liberation.css">
+<file name="fonts-liberation-sans.css">
 
 /*  Liberation Sans  */
 @font-face {
@@ -266,70 +38,7 @@
 }
 
 </file>
-<file name="fonts-serif-dejavu.css">
-
-/*  DejaVu Serif  */
-@font-face {
-    font-family: serif;
-    font-style: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSerif.ttf") !important;
-}
-@font-face {
-    font-family: serif;
-    font-style: normal;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSerif-Bold.ttf") !important;
-}
-@font-face {
-    font-family: serif;
-    font-style: italic;
-    font-weight: normal;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSerif-Italic.ttf") !important;
-}
-@font-face {
-    font-family: serif;
-    font-style: italic;
-    font-weight: bold;
-    font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSerif-BoldItalic.ttf") !important;
-}
-
-/*  DejaVu Serif Condensed  */
-@font-face {
-    font-family: serif;
-    font-style: normal;
-    font-weight: normal;
-    font-stretch: condensed;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSerifCondensed.ttf") !important;
-}
-@font-face {
-    font-family: serif;
-    font-style: normal;
-    font-weight: bold;
-    font-stretch: condensed;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSerifCondensed-Bold.ttf") !important;
-}
-@font-face {
-    font-family: serif;
-    font-style: italic;
-    font-weight: normal;
-    font-stretch: condensed;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSerifCondensed-Italic.ttf") !important;
-}
-@font-face {
-    font-family: serif;
-    font-style: italic;
-    font-weight: bold;
-    font-stretch: condensed;
-    src: url("@l_prefix@/share/fonts-free/DejaVu/DejaVuSerifCondensed-BoldItalic.ttf") !important;
-}
-
-</file>
-<file name="fonts-serif-liberation.css">
+<file name="fonts-liberation-serif.css">
 
 /*  Liberation Serif  */
 @font-face {
@@ -362,36 +71,36 @@
 }
 
 </file>
-<file name="fonts-serif-times.css">
+<file name="fonts-liberation-mono.css">
 
-/*  Microsoft Times  */
+/*  Liberation Mono  */
 @font-face {
-    font-family: serif;
+    font-family: monospace;
     font-style: normal;
     font-weight: normal;
     font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/Times.ttf");
+    src: url("@l_prefix@/share/fonts-free/Liberation/LiberationMono-Regular.ttf") !important;
 }
 @font-face {
-    font-family: serif;
+    font-family: monospace;
     font-style: normal;
     font-weight: bold;
     font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/Timesbd.ttf");
+    src: url("@l_prefix@/share/fonts-free/Liberation/LiberationMono-Bold.ttf") !important;
 }
 @font-face {
-    font-family: serif;
+    font-family: monospace;
     font-style: italic;
     font-weight: normal;
     font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/Timesi.ttf");
+    src: url("@l_prefix@/share/fonts-free/Liberation/LiberationMono-Italic.ttf") !important;
 }
 @font-face {
-    font-family: serif;
+    font-family: monospace;
     font-style: italic;
     font-weight: bold;
     font-stretch: normal;
-    src: url("@l_prefix@/share/fonts-free/CoreFonts/Timesbi.ttf");
+    src: url("@l_prefix@/share/fonts-free/Liberation/LiberationMono-BoldItalic.ttf") !important;
 }
 
 </file>