You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/09/10 17:04:21 UTC
svn commit: r1382925 - in /incubator/flex/sdk/branches/develop/mustella:
Assets/Fonts/Hebrew/ tests/gumbo/components/ButtonBar/SWFs/
tests/gumbo/components/ButtonBar/SWFs/Assets/
tests/gumbo/components/ButtonBar/Styles/ tests/gumbo/components/ButtonBar...
Author: cframpton
Date: Mon Sep 10 15:04:20 2012
New Revision: 1382925
URL: http://svn.apache.org/viewvc?rev=1382925&view=rev
Log:
Add Hebrew font with OFL. Modify ButtonBar tests to use this font so Hebrew will be embedded.
Added:
incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/
incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/Licenses.txt (with props)
incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/README.txt (with props)
incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/SILEOT.ttf (with props)
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/Assets/myStyles.css (with props)
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp1.mxml
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp2.mxml
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp3.mxml
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/ButtonBar_styles.mxml
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/direction_mxml_test1.png
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/direction_mxml_test2.png
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_as_css_test2.png
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_as_test2.png
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_mxml_test1.png
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_mxml_test2.png
Added: incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/Licenses.txt
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/Licenses.txt?rev=1382925&view=auto
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/Licenses.txt (added)
+++ incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/Licenses.txt Mon Sep 10 15:04:20 2012
@@ -0,0 +1,127 @@
+Hebrew layout intelligence copyright (c) 2003 & 2007 Ralph Hancock
+and John Hudson, and licensed under the MIT/X11 License (copied
+below).
+
+All other font software is copyright (c) 1997-2007, SIL International
+(http://www.sil.org/), with Reserved Font Names "SIL" and "Ezra", and
+is licensed under the SIL Open Font License, Version 1.1. This license is
+copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----
+MIT/X11 License (only for Hebrew layout intelligence)
+-----
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----
+
+PREAMBLE
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free
+and open framework in which fonts may be shared and improved in
+partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components
+as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software
+to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer
+or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or in
+the appropriate machine-readable metadata fields within text or binary
+files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS",
+WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR
+OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE
+USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
Propchange: incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/Licenses.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/Licenses.txt
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/README.txt
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/README.txt?rev=1382925&view=auto
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/README.txt (added)
+++ incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/README.txt Mon Sep 10 15:04:20 2012
@@ -0,0 +1,86 @@
+README
+Ezra SIL
+15 June 2007
+========================
+
+Thank you for choosing the Ezra SIL fonts. SIL International is an
+organization of linguists dedicated to the study and promotion of
+the thousands of minority languages around the world.
+
+We are happy to make these fonts available to the general
+public at no charge, under the terms of the SIL Open Font License
+(http://scripts.sil.org/OFL) and the MIT/X11 License (see Licenses.txt).
+
+More SIL fonts can be found at: http://scripts.sil.org
+
+Ezra SIL is a trademark of SIL International.
+
+See licenses.txt and OFL-FAQ.txt for details of the SIL Open Font License.
+See FONTLOG.txt for information on this and previous releases.
+
+TIPS
+====
+
+We do not offer technical support. The font has, however, been through
+some testing on various platforms to be sure it works in most situations.
+
+If you do find a problem, please do report it to <fonts AT sil DOT org>.
+We can't guarantee any direct response, but will try to fix reported bugs in
+future versions.
+
+Many problems can be solved, or at least explained, through an understanding
+of the encoding and use of the fonts. Here are some basic hints:
+
+Encoding:
+The fonts are encoded according to Unicode, so your application must support
+Unicode text in order to access letters other than the standard alphabet. Most
+applications provide basic Unicode support. However, since Hebrew is a
+right-to-left script your application must also support right-to-left behavior.
+In addition, the application must support OpenType to get correct diacritic
+placement.
+
+Encoding Conversion:
+Some TECkit mappings are provided for text conversion between legacy and Unicode.
+Unicode-Ezra-Chart17short.pdf provides a Unicode chart.
+
+Keyboarding on Windows:
+For information on the provided Keyman keyboard layout, print
+Ezra SIL Keyboard Chart23.pdf. The Keyman program is available from
+http://www.tavultesoft.com.
+
+For detailed installation instructions, print the installation
+guide: Keying in Hebrew.pdf or go to
+http://scripts.sil.org/KeyboardInstallationAndUse
+and select Keyman Install from the table of contents, if you are using the
+Keyman keyboard.
+
+Another Windows keyboard is an MSKLC keyboard provided by The
+Society of Biblical Literature. It can be found here:
+http://www.sbl-site.org/Resources/Resources_BiblicalFonts.aspx
+
+Keyboarding on Linux:
+For information on the dedicated keyboard layout, see KMFL
+(http://kmfl.sourceforge.net) and the corresponding kmfl-keyboard-SIL-Ezra
+package.
+
+Typographic Features:
+You should expect to get the same typographic features and diacritic
+placement as is found in the printed Biblia Hebraica Stuttgartensia 1967/77, 1983.
+If you require a different style of typography, you should use a different font
+or you may make your own, under the terms of the OFL. Please do not request of
+us changes to the font that are not found in the BHS.
+
+Source files:
+Sources for Ezra SIL are provided in the source package and on the website.
+The FontLab .vfb sources are available under the OFL and the VOLT .vtp sources
+for the Hebrew layout intelligence are provided under the MIT/X11 license.
+
+
+CONTACT
+========
+For more information please visit the Ezra SIL page on SIL International's
+Computers and Writing systems website:
+http://scripts.sil.org/EzraSIL_Home
+
+Or send an email to <fonts AT sil DOT org>
+
Propchange: incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/README.txt
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/SILEOT.ttf
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/SILEOT.ttf?rev=1382925&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/SILEOT.ttf
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/flex/sdk/branches/develop/mustella/Assets/Fonts/Hebrew/SILEOT.ttf
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/Assets/myStyles.css
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/Assets/myStyles.css?rev=1382925&view=auto
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/Assets/myStyles.css (added)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/Assets/myStyles.css Mon Sep 10 15:04:20 2012
@@ -0,0 +1,100 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+@font-face {
+ src: url("../../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Regular.ttf");
+ fontFamily: EmbeddedLobsterTwo;
+ embedAsCFF: true;
+}
+
+@font-face {
+ src: url("../../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Bold.ttf");
+ fontWeight: bold;
+ fontStyle: normal;
+ fontFamily: EmbeddedLobsterTwo;
+ embedAsCFF: true;
+}
+
+@font-face {
+ src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
+ fontFamily: EmbeddedVerdana;
+ embedAsCFF: true;
+}
+
+@font-face {
+ src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Bold.ttf");
+ fontWeight: bold;
+ fontFamily: EmbeddedVerdana;
+ embedAsCFF: true;
+}
+
+@font-face {
+ src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Italic.ttf");
+ fontStyle: italic;
+ fontFamily: EmbeddedVerdana;
+ embedAsCFF: true;
+}
+
+@font-face {
+ src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
+ fontFamily: EmbeddedArial;
+ embedAsCFF: true;
+}
+
+@font-face {
+ src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Bold.ttf");
+ fontWeight: bold;
+ fontFamily: EmbeddedArial;
+ embedAsCFF: true;
+}
+
+@font-face {
+ src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Italic.ttf");
+ fontStyle: italic;
+ fontFamily: EmbeddedArial;
+ embedAsCFF: true;
+}
+
+
+@font-face {
+ src: url("../../../../../Assets/Fonts/Hebrew/SILEOT.ttf");
+ fontWeight: normal;
+ fontStyle: normal;
+ fontFamily: EmbeddedArial;
+ embedAsCFF: true;
+}
+
+@font-face {
+ src: url("../../../../../Assets/Fonts/Hebrew/SILEOT.ttf");
+ fontWeight: bold;
+ fontStyle: normal;
+ fontFamily: EmbeddedArial;
+ embedAsCFF: true;
+}
+
+@font-face {
+ src: url("../../../../../Assets/Fonts/Hebrew/SILEOT.ttf");
+ fontWeight: normal;
+ fontStyle: italic;
+ fontFamily: EmbeddedArial;
+ embedAsCFF: true;
+}
+
+global{
+ kerning: "off";
+}
Propchange: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/Assets/myStyles.css
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp1.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp1.mxml?rev=1382925&r1=1382924&r2=1382925&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp1.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp1.mxml Mon Sep 10 15:04:20 2012
@@ -113,32 +113,10 @@
</fx:Script>
<!-- Embed fonts for cross platform compatibility of bitmap compares. -->
+<fx:Style source="Assets/myStyles.css"/>
<fx:Style>
-@namespace s "library://ns.adobe.com/flex/spark";
-@namespace mx "library://ns.adobe.com/flex/mx";
- @font-face {
- src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
- fontFamily: EmbeddedVerdana;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Bold.ttf");
- fontWeight: bold;
- fontFamily: EmbeddedVerdana;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Italic.ttf");
- fontStyle: italic;
- fontFamily: EmbeddedVerdana;
- embedAsCFF: true;
- }
-
- global{
- kerning: "off";
- }
+ @namespace s "library://ns.adobe.com/flex/spark";
+ @namespace mx "library://ns.adobe.com/flex/mx";
s|ButtonBar{
fontFamily: EmbeddedVerdana;
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp2.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp2.mxml?rev=1382925&r1=1382924&r2=1382925&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp2.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp2.mxml Mon Sep 10 15:04:20 2012
@@ -28,64 +28,10 @@
</fx:Script>
<!-- Embed fonts for cross platform compatibility of bitmap compares. -->
+<fx:Style source="Assets/myStyles.css"/>
<fx:Style>
-@namespace s "library://ns.adobe.com/flex/spark";
-@namespace mx "library://ns.adobe.com/flex/mx";
- @font-face {
- src: url("../../../../../Assets/Fonts/Cousine/Cousine-Regular.ttf");
- fontFamily: EmbeddedCousine;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
- fontFamily: EmbeddedVerdana;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Bold.ttf");
- fontWeight: bold;
- fontFamily: EmbeddedVerdana;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Italic.ttf");
- fontStyle: italic;
- fontFamily: EmbeddedVerdana;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Regular.ttf");
- fontFamily: EmbeddedArial;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Bold.ttf");
- fontWeight: bold;
- fontFamily: EmbeddedArial;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Italic.ttf");
- fontStyle: italic;
- fontFamily: EmbeddedArial;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Regular.ttf");
- fontFamily: EmbeddedArno;
- embedAsCFF: true;
- }
-
- global{
- kerning: "off";
- }
+ @namespace s "library://ns.adobe.com/flex/spark";
+ @namespace mx "library://ns.adobe.com/flex/mx";
s|ButtonBar {
fontFamily: EmbeddedVerdana;
@@ -100,13 +46,13 @@
}
.fontFamily1{
- fontFamily: EmbeddedCousine;
+ fontFamily: EmbeddedArial;
fontLookup: embeddedCFF;
fontAntiAliasType: normal;
}
.fontFamily2{
- fontFamily: EmbeddedArno;
+ fontFamily: EmbeddedLobsterTwo;
fontLookup: embeddedCFF;
fontAntiAliasType: normal;
}
@@ -324,15 +270,15 @@
<mx:VBox>
<s:ButtonBar id="fontFamilyBB1" dataProvider="{ac1}" fontSize="24" fontFamily="EmbeddedArial"
fontLookup="embeddedCFF" />
- <s:ButtonBar id="fontFamilyBB2" dataProvider="{ac1}" fontSize="24" fontFamily="EmbeddedArno"
+ <s:ButtonBar id="fontFamilyBB2" dataProvider="{ac1}" fontSize="24" fontFamily="EmbeddedLobsterTwo"
fontLookup="embeddedCFF" />
<s:ButtonBar id="fontSizeBB1" dataProvider="{ac1}" fontSize="8" />
<s:ButtonBar id="fontSizeBB2" dataProvider="{ac1}" fontSize="24" />
<s:ButtonBar id="fontWeightBB1" dataProvider="{ac1}" fontWeight="bold" />
<s:ButtonBar id="fontWeightBB2" dataProvider="{ac1}" fontWeight="normal" />
<s:ButtonBar id="colorBB1" dataProvider="{ac1}" color="0xff0000" />
- <s:ButtonBar id="directionBB1" dataProvider="{ac_hebrew}" direction="rtl" styleName="fontFamily1" />
- <s:ButtonBar id="directionBB2" dataProvider="{ac_hebrew}" direction="ltr" styleName="fontFamily1" />
+ <s:ButtonBar id="directionBB1" dataProvider="{ac_hebrew}" direction="rtl" styleName="fontFamily1" fontSize="24" />
+ <s:ButtonBar id="directionBB2" dataProvider="{ac_hebrew}" direction="ltr" styleName="fontFamily1" fontSize="24" />
<s:ButtonBar id="lineThroughBB1" dataProvider="{ac1}" lineThrough="true" />
<s:ButtonBar id="lineThroughBB2" dataProvider="{ac1}" lineThrough="false" />
<s:ButtonBar id="kerningBB1" dataProvider="{ac2}" kerning="on" />
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp3.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp3.mxml?rev=1382925&r1=1382924&r2=1382925&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp3.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/SWFs/ButtonBarApp3.mxml Mon Sep 10 15:04:20 2012
@@ -28,59 +28,11 @@
</fx:Script>
<!-- Embed fonts for cross platform compatibility of bitmap compares. -->
+<fx:Style source="Assets/myStyles.css"/>
<fx:Style>
-@namespace s "library://ns.adobe.com/flex/spark";
-@namespace mx "library://ns.adobe.com/flex/mx";
- @font-face {
- src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
- fontFamily: EmbeddedVerdana;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Bold.ttf");
- fontWeight: bold;
- fontFamily: EmbeddedVerdana;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Italic.ttf");
- fontStyle: italic;
- fontFamily: EmbeddedVerdana;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Regular.ttf");
- fontFamily: EmbeddedArial;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Bold.ttf");
- fontWeight: bold;
- fontFamily: EmbeddedArial;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Italic.ttf");
- fontStyle: italic;
- fontFamily: EmbeddedArial;
- embedAsCFF: true;
- }
-
- @font-face {
- src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Regular.ttf");
- fontFamily: EmbeddedArno;
- embedAsCFF: true;
- }
-
- global{
- kerning: "off";
- }
-
+ @namespace s "library://ns.adobe.com/flex/spark";
+ @namespace mx "library://ns.adobe.com/flex/mx";
+
s|ButtonBar{
fontFamily: EmbeddedVerdana;
fontLookup: embeddedCFF;
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/ButtonBar_styles.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/ButtonBar_styles.mxml?rev=1382925&r1=1382924&r2=1382925&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/ButtonBar_styles.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/ButtonBar_styles.mxml Mon Sep 10 15:04:20 2012
@@ -83,7 +83,7 @@ fontFamily: Does not work; see bug SDK-1
</setup>
<body>
<SetStyle target="runtimeBB1" styleName="fontFamily" value="EmbeddedArial" waitEvent="updateComplete" />
- <SetStyle target="runtimeBB1" styleName="fontFamily" value="EmbeddedArno" waitEvent="updateComplete" />
+ <SetStyle target="runtimeBB1" styleName="fontFamily" value="EmbeddedLobsterTwo" waitEvent="updateComplete" />
<CompareBitmap url="../Styles/baselines/$testID.png" target="runtimeBB1" />
</body>
</TestCase>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/direction_mxml_test1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/direction_mxml_test1.png?rev=1382925&r1=1382924&r2=1382925&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/direction_mxml_test2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/direction_mxml_test2.png?rev=1382925&r1=1382924&r2=1382925&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_as_css_test2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_as_css_test2.png?rev=1382925&r1=1382924&r2=1382925&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_as_test2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_as_test2.png?rev=1382925&r1=1382924&r2=1382925&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_mxml_test1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_mxml_test1.png?rev=1382925&r1=1382924&r2=1382925&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_mxml_test2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ButtonBar/Styles/baselines/fontFamily_mxml_test2.png?rev=1382925&r1=1382924&r2=1382925&view=diff
==============================================================================
Binary files - no diff available.