Merge pull request #514 from chrox/master

fix font-family property ignored if no generic-family is provided
dirty hack to prevent infinite loop on up skip puncutuation
This should fix #517.