update IDs in markup.
add a test case for text-combine-upright with calc().