Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rendering/font family #103

Merged
merged 29 commits into from
Jun 15, 2014
Merged

Rendering/font family #103

merged 29 commits into from
Jun 15, 2014

Conversation

Steditor
Copy link
Contributor

Finally the font-family support can be merged. (#54)

Developers have to copy the fonts folder to Resources/Scamper/fonts.
Travis and release sar-files will copy the fonts automatically.

You may use http://swt-scamper.azurewebsites.net/Scamper-Tests/font-family.html to test the implementation.

Steditor and others added 27 commits June 12, 2014 22:37
…evert font copy script as it was probably correct before...
… endEntry is not implemented in Travis' Transcript.
Conflicts:
	packages/HTML.package/CSSFontFormatter.class/methodProperties.json
	packages/HTML.package/DHtmlFormatter.class/instance/getTextAttributesFrom..st
	packages/HTML.package/DHtmlFormatter.class/methodProperties.json
	packages/HTML.package/DHtmlFormatterTest.class/methodProperties.json
	packages/HTML.package/StyleResolverTest.class/instance/test02LastRuleShouldOverrideAllOthers.st
	packages/HTML.package/monticello.meta/version
@Steditor Steditor modified the milestone: Release 0.5 Jun 15, 2014
@Steditor Steditor removed this from the Release 0.5 milestone Jun 15, 2014
@JenniferStamm
Copy link
Contributor

🐑

MrSerth added a commit that referenced this pull request Jun 15, 2014
@MrSerth MrSerth merged commit 60e31a4 into master Jun 15, 2014
@MrSerth MrSerth deleted the rendering/font-family branch June 15, 2014 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants