From 2f6f409c7a2355f0d9c2267856cb24694cfc25e6 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Wed, 25 May 2016 11:35:06 +0300
Subject: tdf#98792: Add the 'Nirmala UI' font as fallback for 'Gautami' for
 Telugu

Nirmala UI is the new pan-Indic font on Windows 8 and newer, and
apparently not optional. It supports the Devanagari, Bengali,
Gurmukhi, Gujarati, Oriya, Tamil, Telugu, Kannada, Malayalam, and
Sinhala scripts. So we should list it in many more places, I guess,
not just for Telugu.

Note that this commit does not really fix the root issue(s) in
tdf#98792, i.e. why the shaping is wrong when, and/or why the font (or
glyph?)  fallback works differently depending on whether the document
is passed on the command line or opened from the Start Centre. See bug
report for more notes.

Change-Id: Ife361475716123781fb4a4923701890206b28b26
---
 officecfg/registry/data/org/openoffice/VCL.xcu | 35 +++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 6 deletions(-)

(limited to 'officecfg')

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 3090922c2f26..52cacdaca18e 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -781,22 +781,22 @@
     </node>
     <node oor:name="te" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
+        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Nirmala UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
       </prop>
       <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Nirmala UI;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Nirmala UI;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Nirmala UI;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Nirmala UI;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Nirmala UI;Arial Unicode MS</value>
       </prop>
     </node>
     <node oor:name="ur" oor:op="replace">
@@ -2995,6 +2995,29 @@
           <value>Normal,Serif</value>
         </prop>
       </node>
+      <node oor:name="gautami" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>nirmalaui;arialunicodems;lucidaunicode</value>
+        </prop>
+        <prop oor:name="SubstFontsMS">
+          <value/>
+        </prop>
+        <prop oor:name="SubstFontsPS">
+          <value/>
+        </prop>
+        <prop oor:name="SubstFontsHTML">
+          <value>sans-serif</value>
+        </prop>
+        <prop oor:name="FontWeight">
+          <value>Normal</value>
+        </prop>
+        <prop oor:name="FontWidth">
+          <value>Normal</value>
+        </prop>
+        <prop oor:name="FontType">
+          <value>Normal,SansSerif</value>
+        </prop>
+      </node>
       <node oor:name="geneva" oor:op="replace">
         <prop oor:name="SubstFonts">
           <value>albanyamt;albany;arial;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
-- 
cgit