Merge lp:~jacobparker1992/elementaryos/croscore-elementary into lp:~elementary-os/elementaryos/default-settings-trusty

[Jacob Parker]

Relying on the addition of the fonts-croscore package, this addition will enable these fonts to be the default replacements for Arial, TNR, and Consolas in Midori.

[Cody Garver (codygarver)]

Sorry, I told you wrong about where to put that conf

bzr mv debian/31-croscore-elementary.conf .

review: Needs Fixing

[lp:~jacobparker1992/elementaryos/croscore-elementary]

116. By Jacob Parker on 2014-08-05

Cody wanted it like this.

117. By Jacob Parker on 2014-08-06

Accidentally missed a Liberation font

[Danielle Foré (danrabbit)]

Pacifico is great and I would like to add it, but I still don't want to remove Jenna Sue. They don't really look alike.

AFAICT, Playfair doesn't look anything like Limelight, so I don't think that substitution makes sense either.

Add those two back (keep Pacifico and Playfair) and you've got the 'ok' from me

[Cody Garver (codygarver)]

It was decided this config would instead go in our fonts branch

review: Disapprove

Unmerged revisions

117. By Jacob Parker on 2014-08-06

Accidentally missed a Liberation font

116. By Jacob Parker on 2014-08-05

Cody wanted it like this.

115. By Jacob Parker on 2014-08-04

Added configuration to get fonts-croscore in Midori

=== added file '31-croscore-elementary.conf'
--- 31-croscore-elementary.conf	1970-01-01 00:00:00 +0000
+++ 31-croscore-elementary.conf	2014-08-06 20:33:19 +0000
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+    <!-- The sans-serif font should be Tinos -->
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>serif</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Tinos</string>
+        </edit>
+    </match>
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>Times</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Tinos</string>
+        </edit>
+    </match>
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>Times New Roman</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Tinos</string>
+        </edit>
+    </match>
+
+    <!-- The sans-serif font should be Arimo -->
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>sans serif</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Arimo</string>
+        </edit>
+    </match>
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>sans</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Arimo</string>
+        </edit>
+    </match>
+    <!-- We need to ensure that layout tests that use "Helvetica" don't
+        fall back to the default serif font -->
+    <match target="pattern">
+      <test qual="any" name="family">
+        <string>Helvetica</string>
+      </test>
+      <edit name="family" mode="assign">
+        <string>Arimo</string>
+      </edit>
+    </match>
+    <match target="pattern">
+      <test qual="any" name="family">
+        <string>Arial</string>
+      </test>
+      <edit name="family" mode="assign">
+        <string>Arimo</string>
+      </edit>
+    </match>
+    <match target="pattern">
+      <test qual="any" name="family">
+        <string>Lucida Grande</string>
+      </test>
+      <edit name="family" mode="assign">
+        <string>Arimo</string>
+      </edit>
+    </match>
+
+    <!-- The Monospace font should be Cousine -->
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>monospace</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Cousine</string>
+        </edit>
+    </match>
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>mono</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Cousine</string>
+        </edit>
+    </match>
+    <!-- We need to ensure that layout tests that use "Courier", "Courier New",
+         and "Monaco" (all monospace fonts) don't fall back to the default
+         serif font -->
+    <match target="pattern">
+      <test qual="any" name="family">
+        <string>Courier</string>
+      </test>
+      <edit name="family" mode="assign">
+        <string>Cousine</string>
+      </edit>
+    </match>
+    <match target="pattern">
+      <test qual="any" name="family">
+        <string>Courier New</string>
+      </test>
+      <edit name="family" mode="assign">
+        <string>Cousine</string>
+      </edit>
+    </match>
+    <match target="pattern">
+      <test qual="any" name="family">
+        <string>Monaco</string>
+      </test>
+      <edit name="family" mode="assign">
+        <string>Cousine</string>
+      </edit>
+    </match>
+    
+</fontconfig>
\ No newline at end of file

=== modified file 'debian/install'
--- debian/install	2012-09-22 10:38:10 +0000
+++ debian/install	2014-08-06 20:33:19 +0000
@@ -1,3 +1,4 @@
 midori/config /etc/xdg/midori/
 plank/dock1 /etc/skel/.config/plank/
 settings.ini /etc/gtk-3.0/
+31-croscore-elementary.conf /etc/fonts/conf.d/
\ No newline at end of file