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

Rewrite 2.3.5 section 2 on type sizes #208

Merged
merged 22 commits into from
Jun 6, 2019
Merged

Rewrite 2.3.5 section 2 on type sizes #208

merged 22 commits into from
Jun 6, 2019

Conversation

huijing
Copy link
Contributor

@huijing huijing commented Apr 2, 2019

index.html Outdated Show resolved Hide resolved
index.html Outdated
<p data-lang="en">There are two traditional size systems for Chinese characters, an old one and a new one. The following tables shows the equivalence of the old size system and the new size system in the Western point system respectively.</p>
<table class="charsize" id="oldsize-en" data-lang="en">
<p data-lang="en">There have been different size systems for Chinese characters. The size system in traditional metal type utilized hào (literally No. ) units, while in the phototypesetting era, <a href="https://www.w3.org/TR/jlreq/#elements_of_kihonhanmen">Q</a> were used as the sizing units instead. When it came to desktop publishing, font sizes were determined by the DTP point system which was built into the software itself. Currently, the traditional hào-system are still used for typesetting in many Chinese publications.</p>
<p data-lang="en">These hào-system were not standardized by the various foundries in the past. In addition, point-systems were also different in Anglo-Americas, Europe Continental, DTP and so on, which resulted in numerous conversion methods between hào-system and point-system. The following table lists their most common corresponding conversions as a reference. It is not normative information.</p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some more:

This hao system was ...

"Anglo-Americas, Europe Continental" sounds odd, but maybe those are technical terms. Seems like adjectives without a noun though ('systems'?).

hth

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, these 2 are technical terms, should be as adjectives, for the noun "point(s)".
And, there is a little typo, not "Anglo-Americas" but "Anglo-American"
I will fix it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Edited.

@huijing
Copy link
Contributor Author

huijing commented Apr 13, 2019

很抱歉,我又把两个issue的修正不小心合起来了

@xfq
Copy link
Member

xfq commented Apr 14, 2019

@huijing I reverted the previous commit and submitted a new PR with --author="huijing".

See #211

@r12a
Copy link
Contributor

r12a commented May 14, 2019

@huijing after discussion with Fuqiao this morning, I'm making some sweeping edits to the clreq source at the moment that will produce conflicts with your PRs. Could you hold off for a short while, while i complete them? I'll ping you when it's safe again. Cheers.

@r12a
Copy link
Contributor

r12a commented May 14, 2019

@huijing i think i'm finished for now. To resolve the conflicts i think you just need to do the following:

Everywhere you see data-lang="en", replace with its-locale-filter-list="en" lang="en" and do the equivalent for zh-hans and zh-hant. It looks like you already picked up the new id for the one li element involved.

@huijing
Copy link
Contributor Author

huijing commented May 14, 2019

@r12a sure thing. I'll run through and fix them.

@huijing
Copy link
Contributor Author

huijing commented May 16, 2019

I've resolved the merge conflicts, I think I've caught all the data-lang changes, so if anyone could review this?

@r12a
Copy link
Contributor

r12a commented May 16, 2019

@huijing the commit you just made appears to have conflict markup in it. Did you know?

@r12a
Copy link
Contributor

r12a commented May 16, 2019

Ah, we crossed messages. But at https://github.com/w3c/clreq/pull/208/files i'm still seeing <<<<<<< HEAD etc. Which i suspect is not intended.

@huijing
Copy link
Contributor Author

huijing commented May 17, 2019

Ah, I missed it when I did a second merge with the clreq branch. I've resolved it now.

index.html Outdated Show resolved Hide resolved
index.html Outdated Show resolved Hide resolved
index.html Outdated Show resolved Hide resolved
@r12a
Copy link
Contributor

r12a commented Jun 5, 2019

LGTM.

@xfq xfq merged commit 01d9714 into w3c:gh-pages Jun 6, 2019
@xfq
Copy link
Member

xfq commented Jun 6, 2019

Merging. Thank you! 🎉

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.

None yet

4 participants