OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
4 * Copyright (C) 2013 Google Inc. All rights reserved. | 4 * Copyright (C) 2013 Google Inc. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 scope.fontDescription().setCommonLigaturesState(commonLigaturesState); | 455 scope.fontDescription().setCommonLigaturesState(commonLigaturesState); |
456 scope.fontDescription().setDiscretionaryLigaturesState(discretionaryLigature
sState); | 456 scope.fontDescription().setDiscretionaryLigaturesState(discretionaryLigature
sState); |
457 scope.fontDescription().setHistoricalLigaturesState(historicalLigaturesState
); | 457 scope.fontDescription().setHistoricalLigaturesState(historicalLigaturesState
); |
458 scope.fontDescription().setContextualLigaturesState(contextualLigaturesState
); | 458 scope.fontDescription().setContextualLigaturesState(contextualLigaturesState
); |
459 } | 459 } |
460 | 460 |
461 void FontBuilder::setScript(const String& locale) | 461 void FontBuilder::setScript(const String& locale) |
462 { | 462 { |
463 FontDescriptionChangeScope scope(this); | 463 FontDescriptionChangeScope scope(this); |
464 | 464 |
| 465 scope.fontDescription().setLocale(locale); |
465 scope.fontDescription().setScript(localeToScriptCodeForFontSelection(locale)
); | 466 scope.fontDescription().setScript(localeToScriptCodeForFontSelection(locale)
); |
466 } | 467 } |
467 | 468 |
468 void FontBuilder::setStyle(FontStyle italic) | 469 void FontBuilder::setStyle(FontStyle italic) |
469 { | 470 { |
470 FontDescriptionChangeScope scope(this); | 471 FontDescriptionChangeScope scope(this); |
471 | 472 |
472 scope.fontDescription().setStyle(italic); | 473 scope.fontDescription().setStyle(italic); |
473 } | 474 } |
474 | 475 |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
669 FontOrientation fontOrientation; | 670 FontOrientation fontOrientation; |
670 NonCJKGlyphOrientation glyphOrientation; | 671 NonCJKGlyphOrientation glyphOrientation; |
671 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; | 672 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; |
672 fontDescription.setOrientation(fontOrientation); | 673 fontDescription.setOrientation(fontOrientation); |
673 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); | 674 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); |
674 documentStyle->setFontDescription(fontDescription); | 675 documentStyle->setFontDescription(fontDescription); |
675 documentStyle->font().update(fontSelector); | 676 documentStyle->font().update(fontSelector); |
676 } | 677 } |
677 | 678 |
678 } | 679 } |
OLD | NEW |