Fix TTS-2000 by not install ahem.ttf font in tizen

Signed-off-by: Cui, Jieqiong <jieqiongx.cui@intel.com>

diff --git a/tct-multicolumn-css3-tests/multicolumn/csswg/COPYING b/tct-multicolumn-css3-tests/multicolumn/csswg/COPYING
index c5bda92194e4ec420473764fe535f1a28e0aa8a0..eeac229cafa06fa4c12876b3d84c9e9a0294b872 100644 (file)
--- a/tct-multicolumn-css3-tests/multicolumn/csswg/COPYING
+++ b/tct-multicolumn-css3-tests/multicolumn/csswg/COPYING
@@ -43,6 +43,9 @@ multicol-basic-004.html
    +           -o-column-gap: 0;
    +           -o-column-rule: none;
 
+2. Using @font-face instead of AHEM font installation.
+
+
 These tests are copyright by W3C and/or the author listed in the test
 file. The tests are dual-licensed under the W3C Test Suite License:
 http://www.w3.org/Consortium/Legal/2008/04-testsuite-license

diff --git a/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-001.html b/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-001.html
index f1d5018a43dbc885140721880579cc20d128edd0..9a8cac024402012def83b637b7bfa3c84b9e3238 100644 (file)
--- a/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-001.html
+++ b/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-001.html
@@ -11,6 +11,10 @@
        <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
        <style type="text/css">
+               @font-face {
+                       font-family: Ahem;
+                       src: url("../support/AHEM____.TTF");
+               }
                .multicol-wrapper>*{
                        font-family: Ahem;
                }

diff --git a/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-002.html b/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-002.html
index ede2aa4bd5ae499d83d2a5584fbbc1342c6edb78..54f1fbc8569b7381186a90b5a89f03ae0e83fa4e 100644 (file)
--- a/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-002.html
+++ b/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-002.html
@@ -11,6 +11,10 @@
        <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
        <style type="text/css">
+               @font-face {
+                       font-family: Ahem;
+                       src: url("../support/AHEM____.TTF");
+               }
                .multicol-wrapper>*{
                        font-family: Ahem;
                }

diff --git a/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-003.html b/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-003.html
index 2fcb94176a6aeb65bedda6ed0690e00885cf2b50..2d55a80575f88df061e235c0c365b81c5e02b952 100644 (file)
--- a/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-003.html
+++ b/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-003.html
@@ -11,6 +11,10 @@
        <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
        <style type="text/css">
+               @font-face {
+                       font-family: Ahem;
+                       src: url("../support/AHEM____.TTF");
+               }
                .multicol-wrapper>*{
                        font-family: Ahem;
                }

diff --git a/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-004.html b/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-004.html
index ee2caa7b99096bf59b7959add1a756b145f8909b..ae2414de97571c82aadd5e79e1d9e85edc3603dc 100644 (file)
--- a/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-004.html
+++ b/tct-multicolumn-css3-tests/multicolumn/csswg/multicol-basic-004.html
@@ -11,6 +11,10 @@
        <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
        <style type="text/css">
+               @font-face {
+                       font-family: Ahem;
+                       src: url("../support/AHEM____.TTF");
+               }
                .multicol-wrapper>*{
                        font-family: Ahem;
                }

diff --git a/tct-multicolumn-css3-tests/multicolumn/csswg/reference/multicol-basic-ref.html b/tct-multicolumn-css3-tests/multicolumn/csswg/reference/multicol-basic-ref.html
index 82e0b239ebc8b5d2cc7ef33d34b072a70455f2e6..c9cf585fa1acb0c1af71d34295e4b90067c5ba86 100644 (file)
--- a/tct-multicolumn-css3-tests/multicolumn/csswg/reference/multicol-basic-ref.html
+++ b/tct-multicolumn-css3-tests/multicolumn/csswg/reference/multicol-basic-ref.html
@@ -8,6 +8,10 @@
        <meta name="flags" content="ahem"/>
 
        <style type="text/css">
+               @font-face {
+                       font-family: Ahem;
+                       src: url("../support/AHEM____.TTF");
+               }
                .multicol-wrapper>*{
                        font-family: Ahem;
                }
@@ -68,4 +72,4 @@
        </table>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/tct-multicolumn-css3-tests/multicolumn/support/AHEM.TTF b/tct-multicolumn-css3-tests/multicolumn/support/AHEM.TTF
deleted file mode 100644 (file)
index ac81cb0..0000000
Binary files a/tct-multicolumn-css3-tests/multicolumn/support/AHEM.TTF and /dev/null differ

diff --git a/tct-multicolumn-css3-tests/multicolumn/support/AHEM____.TTF b/tct-multicolumn-css3-tests/multicolumn/support/AHEM____.TTF
new file mode 100644 (file)
index 0000000..ac81cb0
Binary files /dev/null and b/tct-multicolumn-css3-tests/multicolumn/support/AHEM____.TTF differ

diff --git a/tct-multicolumn-css3-tests/multicolumn/support/COPYING b/tct-multicolumn-css3-tests/multicolumn/support/COPYING
index 8b0af8ae0c4fd8eda53ef28ce446c8cf43beac62..a55d6394654b0ac8504e6e48e4565b3c936f1721 100644 (file)
--- a/tct-multicolumn-css3-tests/multicolumn/support/COPYING
+++ b/tct-multicolumn-css3-tests/multicolumn/support/COPYING
@@ -11,10 +11,11 @@ under W3C's test suite licensing policy:
 http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright
 
 
--------------------------------
-AHEM.TTF comes from
-http://dev.w3.org/CSS/fonts/ahem/AHEM____.TTF
-with only file renamed to 'AHEM.TTF'.
+The AHEM____.TTF font comes from
+http://www.w3.org/Style/CSS/Test/Fonts/Ahem/
 
-The Ahem font belongs to the public domain as described in
-http://www.w3.org/Style/CSS/Test/Fonts/Ahem/COPYING
+The Ahem font in this directory belongs to the public domain. In
+jurisdictions that do not recognize public domain ownership of these
+files, the following Creative Commons Zero declaration applies:
+
+<http://labs.creativecommons.org/licenses/zero-waive/1.0/us/legalcode>

diff --git a/tct-multicolumn-css3-tests/tct-multicolumn-css3-tests.spec b/tct-multicolumn-css3-tests/tct-multicolumn-css3-tests.spec
index 75a6141b10fa512f18b6ba01cfbf3729140a4631..76b40de597d662cb645d0dd41d9ab326db2a7116 100755 (executable)
--- a/tct-multicolumn-css3-tests/tct-multicolumn-css3-tests.spec
+++ b/tct-multicolumn-css3-tests/tct-multicolumn-css3-tests.spec
@@ -110,19 +110,6 @@ if [ $? -eq 0 ]; then
         echo "Install /opt/%name/%name.wgt fail ..."
     fi
     sync
-    #### install font: AHEM.TTF ####
-    if [ -e /opt/tct-multicolumn-css3-tests/multicolumn/support/AHEM.TTF ]; then
-        [ -e /usr/share/fonts/winFonts/ ] && rm -rf /usr/share/fonts/winFonts/
-        mkdir -p /usr/share/fonts/winFonts
-        cp /opt/tct-multicolumn-css3-tests/multicolumn/support/AHEM.TTF /usr/share/fonts/winFonts/
-        chmod 777 /usr/share/fonts/winFonts/AHEM.TTF
-        cd /usr/share/fonts/winFonts
-        mkfontscale
-        mkfontdir
-        fc-cache -fv
-    else
-        echo "Install font: AHEM:TTF fail, please check if exists file: /opt/tct-multicolumn-css3-tests/multicolumn/support/AHEM.TTF ..."
-    fi
 fi
 
 
@@ -153,9 +140,6 @@ if [ $? -eq 0 ]; then
         fi
         sync
     fi
-    #### uninstall font: AHEM.TTF ####
-    [ -e /usr/share/fonts/winFonts/ ] && rm -rf /usr/share/fonts/winFonts/
-    fc-cache -fv
 fi
 
 rm -rf /opt/unpacked_crx/%name