Skip to content

Commit

Permalink
Merge pull request #363 from vivliostyle/disable_hyphenation_by_defau…
Browse files Browse the repository at this point in the history
…lt-r#541

Disable hyphenation by default
  • Loading branch information
kwkbtr committed Jun 21, 2017
2 parents 33d5f00 + 9a110a3 commit f8a7d2d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

- Place footnotes at the bottom of pages (or regions) rather than columns
- <https://github.com/vivliostyle/vivliostyle.js/pull/343>
- Disable hyphenation by default
- <https://github.com/vivliostyle/vivliostyle.js/pull/363>

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion src/adapt/expr.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ adapt.expr.Preferences;
* @return {adapt.expr.Preferences}
*/
adapt.expr.defaultPreferences = function() {
return {fontFamily:"serif", lineHeight:1.25, margin:8, hyphenate:true, columnWidth:25,
return {fontFamily:"serif", lineHeight:1.25, margin:8, hyphenate:false, columnWidth:25,
horizontal:false, nightMode:false, spreadView:false, pageBorder:1,
enabledMediaTypes:{"print": true}, defaultPaperSize: undefined};
};
Expand Down

0 comments on commit f8a7d2d

Please sign in to comment.