Fix the crash on #582. Combining characters are still not shown because this is not implemented. With @sonwow
Render border solid-style properly
Update Submodule
Add diamond test code