Merge remote-tracking branch 'origin/RB-2.3'

Author: devernay

.gitignore

@@ -13,51 +13,7 @@ build64
 sed*
 *latex*
 DerivedData
-Documentation/html
-Documentation/pdf
-#Documentation/source/_group*
-#Documentation/source/_prefs.rst
-#Documentation/source/plugins
-breakpadclient.pri
-breakpadpro.pri
-google-breakpad/
-tools/normalize/normalize.xcodeproj/
-tools/utils/generateGLIncludes.xcodeproj/
-tools/utils/generateGLIncludes.pro.user
-libs/hoedown/hoedown.xcodeproj/
-libs/libtess/libtess.xcodeproj/
-libs/libtess/tess.xcodeproj/
-libs/ceres/ceres.xcodeproj/
-libs/openMVG/openMVG.xcodeproj/
-libs/libmv/LibMV.xcodeproj/
-libs/glog/glog.xcodeproj/
-libs/gflags/gflags.xcodeproj/
-libs/qhttpserver/qhttpserver.xcodeproj/
-libs/qhttpserver/src/qhttpserver.xcodeproj/
-libs/yaml-cpp/yaml-cpp-natron.xcodeproj/
-ProjectConverter/NatronProjectConverter
-PythonBin/natron-python
-natron-python.xcodeproj/
-Natron.xcodeproj/
-Project-xcode-breakpad.xcodeproj/
-Natron-bin.xcodeproj/
-Serialization.xcodeproj/
-NatronProjectConverter.xcodeproj/
-NatronRenderer-bin.xcodeproj/
-NatronRenderer.xcodeproj/
-NatronCrashReporter.xcodeproj/
-NatronRendererCrashReporter.xcodeproj/
-BreakpadClient.xcodeproj/
-CrashReporter/*
-CrashReporterCLI/*
-BreakpadClient/*
-tools/normalize/normalize
-Tests.xcodeproj/
-HostSupport.xcodeproj/
-Gui.xcodeproj/
-Engine.xcodeproj/
-Project.xcodeproj/
-natron-python.xcodeproj/
+.pro.user
 *.sln
 *.xcworkspace
 *xcuserdata
@@ -67,14 +23,7 @@ natron-python.xcodeproj/
 *Release
 *release
 *debug
-Cache
-TestImages
-TestWrite
-TODO.txt
-.pro.user
-config.pri
 *.vcxproj
-Info.plist
 *Win32
 qrc_*.cpp
 *GeneratedFiles
@@ -238,22 +187,16 @@ Makefile
 *.gcda
 *.gcno
 *.gcov
-Tests/Tests
-ofxTestLog.txt
-test_dot_generator0.jpg
-Tests/Plugins
 pch
 *.filters
 
 # Python
 *.pyc
 
-Renderer/NatronRenderer
 
 *tmp*
 *commits-hash.sh*
 
-CrashReporterCLI/NatronRendererCrashReporter
 *repo.sh*
 *local.sh*
 OpenColorIO-Configs
@@ -265,7 +208,61 @@ allfileshas.txt
 bigobjects.txt
 bigtosmall.txt
 
-
-
+App/Natron
+BreakpadClient.xcodeproj/
+BreakpadClient/*
+Cache
+CrashReporter/*
+CrashReporterCLI/*
+CrashReporterCLI/NatronRendererCrashReporter
+Documentation/html
+Documentation/pdf
+Engine.xcodeproj/
+Gui.xcodeproj/
+HostSupport.xcodeproj/
+Info.plist
+Natron-bin.xcodeproj/
+Natron.xcodeproj/
+NatronCrashReporter.xcodeproj/
+NatronProjectConverter.xcodeproj/
+NatronRenderer-bin.xcodeproj/
+NatronRenderer.xcodeproj/
+NatronRendererCrashReporter.xcodeproj/
+Project-xcode-breakpad.xcodeproj/
+Project.xcodeproj/
+ProjectConverter/NatronProjectConverter
+PythonBin/natron-python
+PythonBin/natron-python
+Renderer/NatronRenderer
+Serialization.xcodeproj/
+TODO.txt
+TestImages
+TestWrite
+Tests.xcodeproj/
+Tests/Plugins
+Tests/Tests
+breakpadclient.pri
+breakpadpro.pri
+config.pri
+google-breakpad/
+libs/ceres/ceres.xcodeproj/
+libs/gflags/gflags.xcodeproj/
+libs/glog/glog.xcodeproj/
+libs/hoedown/hoedown.xcodeproj/
+libs/libmv/LibMV.xcodeproj/
+libs/libtess/libtess.xcodeproj/
+libs/libtess/tess.xcodeproj/
+libs/openMVG/openMVG.xcodeproj/
+libs/qhttpserver/qhttpserver.xcodeproj/
+libs/qhttpserver/src/qhttpserver.xcodeproj/
+libs/yaml-cpp/yaml-cpp-natron.xcodeproj/
+natron-python.xcodeproj/
+natron-python.xcodeproj/
+ofxTestLog.txt
+test_dot_generator0.jpg
+tools/normalize/normalize
+tools/normalize/normalize
+tools/normalize/normalize.xcodeproj/
 tools/utils/generateGLIncludes
-
+tools/utils/generateGLIncludes.pro.user
+tools/utils/generateGLIncludes.xcodeproj/

Gui/Resources/etc/fonts/conf.d/10-hinting-slight.conf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintslight</const></edit>
+  </match>
+</fontconfig>

Gui/Resources/etc/fonts/conf.d/10-scale-bitmap-fonts.conf

@@ -2,8 +2,13 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
+<!--
+  If font is bitmap, calculate scale factor.
+  Note that color bitmap fonts have scalable=true, while
+  non-color ones have scalable=false.  Both groups have outline=false.
+  -->
 <match target="font">
-  <test name="scalable" compare="eq">
+  <test name="outline" compare="eq">
     <bool>false</bool>
   </test>
   <edit name="pixelsizefixupfactor" mode="assign">
@@ -13,10 +18,20 @@
     </divide>
   </edit>
 </match>
+<!--
+  For non-scalable bitmap fonts (ie. non-color), skip
+  minor scaling if hinting is enabled.
+  -->
 <match target="font">
+  <test name="outline" compare="eq">
+    <bool>false</bool>
+  </test>
   <test name="scalable" compare="eq">
     <bool>false</bool>
   </test>
+  <test name="hinting" compare="eq">
+    <bool>true</bool>
+  </test>
   <edit name="scalingnotneeded" mode="assign">
     <and>
       <less>
@@ -30,20 +45,7 @@
     </and>
   </edit>
 </match>
-<!--
-  So far we determined the scale factor.  Now, check and if
-  scaling is NOT desirable, just reset the scale factor to 1.0.
-  -->
 <match target="font">
-  <test name="scalable" compare="eq">
-    <bool>false</bool>
-  </test>
-  <test name="pixelsize" target="pattern" compare="less">
-    <double>64</double>
-  </test>
-  <test name="hinting" compare="eq">
-    <bool>true</bool>
-  </test>
   <test name="scalingnotneeded" compare="eq">
     <bool>true</bool>
   </test>
@@ -55,7 +57,7 @@
   If we *are* going to scale, go ahead and do it.
   -->
 <match target="font">
-  <test name="scalable" compare="eq">
+  <test name="outline" compare="eq">
     <bool>false</bool>
   </test>
   <test name="pixelsizefixupfactor" compare="not_eq">