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.

Sign up for GitHub

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

Jump to bottom

Unihan phase2 #1901

Merged
merged 24 commits into from
Feb 7, 2020
Merged

Unihan phase2 #1901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0ff1c87
fix(WD-NonStandard): remove invalid unicode property names
duncdrum Jun 29, 2019
3856ee4
add german translation to unicodeName spec
duncdrum Sep 1, 2018
d5f2e9e
doc(WD-NonStandard): add placeholder for future phases,
duncdrum Jun 29, 2019
4183441
feat(gaijiProp): add gaijiProp Phase 0 See #1805
duncdrum Jul 1, 2019
587a066
feat(xxxProp): add three new elements
duncdrum Jun 30, 2019
ee890b9
ignore(web.css,detest) add placeholder
duncdrum Jul 1, 2019
ce276d0
feat(charProp,value): deprecate old elements
duncdrum Jul 1, 2019
6eb3ab4
doc(WD): adjust examples and prose to new elements phase 2 see #1805
duncdrum Jul 1, 2019
7732213
feat(unicode|localName): deprecate orphaned charProp children
duncdrum Jul 2, 2019
9f32c01
doc(WD): update unicode reference tables
duncdrum Jul 2, 2019
ec0984f
feat(glyph|charName): deprecate two more elements
duncdrum Jul 2, 2019
a6afded
doc(WD): adjust guidelines for deprecated elements
duncdrum Jul 2, 2019
257f4fd
ref(newSpec): update new content models and char glyph
duncdrum Jul 2, 2019
1bade95
ignore(expecte-result): drama
duncdrum Jul 2, 2019
43ada53
chore(WD): keeping up appearances
duncdrum Jul 4, 2019
c9c9876
fix(att.gaijiProp): workaround spec generation bug
duncdrum Jul 11, 2019
961491e
Re-factor to use version= attribute from class
sydb Oct 9, 2019
498ee2b
Revert datatype:
sydb Oct 9, 2019
b18994b
fix(Specs): repeat validUntil attribute on deprecated elements
duncdrum Dec 13, 2019
ad39d53
Update P5/Source/Specs/unicodeProp.xml
duncdrum Jan 29, 2020
d444854
Update P5/Source/Specs/unicodeProp.xml
duncdrum Jan 29, 2020
ca2f7e6
Update P5/Source/Specs/unicodeName.xml
duncdrum Jan 29, 2020
f0d3748
Apply suggestions from code review
duncdrum Jan 29, 2020
245d60b
Apply suggestions from code review
duncdrum Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,149 changes: 563 additions & 586 deletions P5/Source/Guidelines/en/WD-NonStandardCharacters.xml
View file
Open in desktop

Large diffs are not rendered by default.

168 changes: 84 additions & 84 deletions P5/Source/Guidelines/guidelines-web.css
View file
Open in desktop

Large diffs are not rendered by default.

79 changes: 79 additions & 0 deletions P5/Source/Specs/att.gaijiProp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright TEI Consortium.
Dual-licensed under CC-by and BSD2 licences
See the file COPYING.txt for details
$Date$
$Id$
-->
<?xml-model href="http://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
<classSpec ident="att.gaijiProp" module="gaiji" type="atts" xmlns="http://www.tei-c.org/ns/1.0">
<desc versionDate="2020-01-28" xml:lang="en">provides attributes for defining the properties of
non-standard characters or glyphs. </desc>
<desc versionDate="2020-01-28" xml:lang="de">liefert Attribute zur Definition der Eigenschaften
von nicht standardisierten Zeichen und Glyphen.</desc>
duncdrum marked this conversation as resolved.
Show resolved Hide resolved
<desc versionDate="2020-02-05" xml:lang="it">fornisce attributi per definire le proprietà di caratteri o glifi non standard</desc>
<attList org="group">
<attDef ident="name" usage="req">
<desc versionDate="2020-01-28" xml:lang="en">provides the name of the character or glyph
property being defined.</desc>
<datatype maxOccurs="1">
<dataRef key="teidata.xmlName"/>
</datatype>
</attDef>
<attDef ident="value" usage="req">
<desc versionDate="2020-01-28" xml:lang="en">provides the value of the character or
glyph property being defined.</desc>
<datatype>
<dataRef key="teidata.text"/>
</datatype>
</attDef>
<attDef ident="version" usage="opt">
<desc versionDate="2020-01-28" xml:lang="en">specifies the version number of the Unicode
Standard in which this property name is defined.</desc>
<desc versionDate="2019-07-11" xml:lang="de">gibt die Versionsnummer eines externen
Standards an, in dem dieser Eigenschaftsname definiert ist.</desc>
<datatype>
<dataRef key="teidata.enumerated"/>
</datatype>
<valList type="semi">
<valItem ident="1.0.1"/>
<valItem ident="1.1"/>
<valItem ident="2.0"/>
<valItem ident="2.1"/>
<valItem ident="3.0"/>
<valItem ident="3.1"/>
<valItem ident="3.2"/>
<valItem ident="4.0"/>
<valItem ident="4.1"/>
<valItem ident="5.0"/>
<valItem ident="5.1"/>
<valItem ident="5.2"/>
<valItem ident="6.0"/>
<valItem ident="6.1"/>
<valItem ident="6.2"/>
<valItem ident="6.3"/>
<valItem ident="7.0"/>
<valItem ident="8.0"/>
<valItem ident="9.0"/>
<valItem ident="10.0"/>
<valItem ident="11.0"/>
<valItem ident="12.0"/>
<valItem ident="12.1"/>
<valItem ident="unassigned"/>
</valList>
</attDef>
</attList>
<exemplum versionDate="2019-07-01" xml:lang="en">
<p>In this example a definition for the Unicode property <name>Decomposition Mapping</name>
is provided.</p>
<egXML source="#UND" xmlns="http://www.tei-c.org/ns/Examples"> <unicodeProp
name="Decomposition_Mapping" value="circle"/> </egXML>
</exemplum>
<remarks versionDate="2019-06-29" xml:lang="en">
<p>All name-only attributes need an xs:boolean attribute value inside <att>value</att>.</p>
</remarks>
<listRef>
<ptr target="#WD"/>
</listRef>
</classSpec>
75 changes: 26 additions & 49 deletions P5/Source/Specs/char.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><!--
Copyright TEI Consortium.
Dual-licensed under CC-by and BSD2 licences
Copyright TEI Consortium.
Dual-licensed under CC-by and BSD2 licences
See the file COPYING.txt for details
$Date$
$Id$
--><?xml-model href="http://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?><elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="gaiji" xml:id="CHAR" ident="char">
--><?xml-model href="http://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
<elementSpec ident="char" module="gaiji" xml:id="CHAR" xmlns="http://www.tei-c.org/ns/1.0">
<gloss versionDate="2005-01-14" xml:lang="en">character</gloss>
<gloss versionDate="2007-12-20" xml:lang="ko">문자</gloss>
<gloss versionDate="2007-05-02" xml:lang="zh-TW">文字</gloss>
Expand All @@ -16,67 +17,43 @@ otherwise available in the document character set-->.</desc>
<desc versionDate="2007-12-20" xml:lang="ko">문자에 관한 기술 정보를 제공한다.</desc>
<desc versionDate="2007-05-02" xml:lang="zh-TW">提供一個文字的描述性資訊。</desc>
<desc versionDate="2008-04-05" xml:lang="ja">文字に関する情報を示す．</desc>
<desc versionDate="2007-06-12" xml:lang="fr">fournit des informations descriptives sur un
caractère</desc>
<desc versionDate="2007-06-12" xml:lang="fr">fournit des informations descriptives sur un caractère</desc>
<desc versionDate="2007-05-04" xml:lang="es">proporciona información descriptiva sobre un carácter.</desc>
<desc versionDate="2007-01-21" xml:lang="it">fornisce informazioni descrittive su di un carattere.</desc>
<classes>
<memberOf key="att.global"/>
</classes>
<content>
<sequence>

<elementRef key="charName" minOccurs="0"/>


<classRef key="model.descLike" minOccurs="0" maxOccurs="unbounded"/>


<elementRef key="charProp" minOccurs="0" maxOccurs="unbounded"/>


<elementRef key="mapping" minOccurs="0" maxOccurs="unbounded"/>


<elementRef key="figure" minOccurs="0" maxOccurs="unbounded"/>


<classRef key="model.graphicLike" minOccurs="0" maxOccurs="unbounded"/>


<classRef key="model.noteLike" minOccurs="0" maxOccurs="unbounded"/>

</sequence>
<alternate minOccurs="0" maxOccurs="unbounded">
<elementRef key="charName"/>
<elementRef key="charProp"/>
<elementRef key="unicodeProp"/>
<elementRef key="unihanProp"/>
<elementRef key="localProp"/>
<elementRef key="mapping"/>
<elementRef key="figure"/>
<classRef key="model.graphicLike"/>
<classRef key="model.noteLike"/>
<classRef key="model.descLike"/>
</alternate>
</content>
<exemplum xml:lang="und">
<exemplum versionDate="2019-07-01" xml:lang="und">
<egXML xmlns="http://www.tei-c.org/ns/Examples">
<char xml:id="circledU4EBA">
<charName>CIRCLED IDEOGRAPH 4EBA</charName>
<charProp>
<unicodeName>character-decomposition-mapping</unicodeName>
<value>circle</value>
</charProp>
<charProp>
<localName>daikanwa</localName>
<value>36</value>
</charProp>
<localProp name="Name" value="CIRCLED IDEOGRAPH 4EBA"/>
<localProp name="daikanwa" value="36"/>
<unicodeProp name="Decomposition_Mapping" value="circle"/>
<mapping type="standard">人</mapping>
</char>
</egXML>
</exemplum>
<exemplum versionDate="2008-04-06" xml:lang="fr">
<exemplum versionDate="2019-07-01" xml:lang="fr">
<egXML xmlns="http://www.tei-c.org/ns/Examples">
<char xml:id="fr_circledU4EBA">
<charName>IDEOGRAMME ENCADRE 4EBA</charName>
<charProp>
<unicodeName>table de correspondance qui donne la composition des caractères.</unicodeName>
<value>encadrement</value>
</charProp>
<charProp>
<localName>daikanwa</localName>
<value>36</value>
</charProp>
<mapping type="standard"> 人 </mapping>
<localProp name="nom" value="IDEOGRAMME ENCADRE 4EBA"/>
<localProp name="daikanwa" value="36"/>
<unicodeProp name="Decomposition_Mapping" value="circle"/>
<mapping type="standard">人</mapping>
</char>
</egXML>
</exemplum>
Expand Down
10 changes: 3 additions & 7 deletions P5/Source/Specs/charDecl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?><!--
Copyright TEI Consortium.
Dual-licensed under CC-by and BSD2 licences
Copyright TEI Consortium.
Dual-licensed under CC-by and BSD2 licences
See the file COPYING.txt for details
$Date$
$Id$
Expand Down Expand Up @@ -28,18 +28,14 @@ $Id$
<content>
<!--(desc?, (char|glyph)+)-->
<sequence>

<elementRef key="desc" minOccurs="0"/>


<alternate minOccurs="1" maxOccurs="unbounded">
<elementRef key="char"/>
<elementRef key="glyph"/>
</alternate>

</sequence>
</content>
<exemplum xml:lang="und">
<exemplum versionDate="2019-06-01" xml:lang="und">
<egXML xmlns="http://www.tei-c.org/ns/Examples">
<charDecl>
<char xml:id="aENL">
Expand Down
110 changes: 57 additions & 53 deletions P5/Source/Specs/charName.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?><!--
Copyright TEI Consortium.
Dual-licensed under CC-by and BSD2 licences
Copyright TEI Consortium.
Dual-licensed under CC-by and BSD2 licences
See the file COPYING.txt for details
$Date$
$Id$
--><?xml-model href="http://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?><elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="gaiji" xml:id="CHARNAME" ident="charName">
<gloss versionDate="2005-01-14" xml:lang="en">character name</gloss>
<gloss versionDate="2007-12-20" xml:lang="ko">문자명</gloss>
<gloss versionDate="2007-05-02" xml:lang="zh-TW">文字名稱</gloss>
<gloss versionDate="2007-06-12" xml:lang="fr">nom de caractère</gloss>
<gloss versionDate="2007-05-04" xml:lang="es">nombre de carácter</gloss>
<gloss versionDate="2007-01-21" xml:lang="it">nome del carattere.</gloss>
<desc versionDate="2005-01-14" xml:lang="en">contains the name of a character, expressed following Unicode conventions.</desc>
<desc versionDate="2007-12-20" xml:lang="ko">유니코드로 표현된 문자명을 포함한다.</desc>
<desc versionDate="2007-05-02" xml:lang="zh-TW">包含一文字名稱，其表示法根據統一碼協定 (Unicode)。</desc>
<desc versionDate="2008-04-05" xml:lang="ja">当該文字の名前をユニコードに従って示す．</desc>
<desc versionDate="2007-06-12" xml:lang="fr">contient le nom d'un caractère exprimé selon les
conventions de l'Unicode</desc>
<desc versionDate="2007-05-04" xml:lang="es">contiene el nombre de un carácter, expresado según las
convenciones Unicode.</desc>
<desc versionDate="2007-01-21" xml:lang="it">contiene il nome di un carattere, espresso secondo le
convenzioni Unicode.</desc>
<classes>
<memberOf key="att.global"/>
</classes>
<content>
<textNode/>
<!--s:assert> some schematron rules here</s:assert-->
</content>
<exemplum xml:lang="und">
<egXML xmlns="http://www.tei-c.org/ns/Examples">
<charName>CIRCLED IDEOGRAPH 4EBA</charName>
</egXML>
</exemplum>
<exemplum versionDate="2008-04-06" xml:lang="fr">
<egXML xmlns="http://www.tei-c.org/ns/Examples">
<charName>IDEOGRAMME ENCADRE 4EBA</charName>
</egXML>
</exemplum>
<remarks versionDate="2005-01-14" xml:lang="en">
<p>The name must follow Unicode conventions for character naming. Projects working in similar
fields are recommended to coordinate and publish their list of <gi>charName</gi>s to
facilitate data exchange.</p>
</remarks>
<remarks xml:lang="fr" versionDate="2007-06-12">
<p>Le nom doit respecter les conventions Unicode pour le nommage des caractères. Il est
recommandé, pour des projets portant sur des champs similaires, de coordonner et de publier leur
liste de <gi>charName</gi>s pour faciliter l'échange de données.</p>
</remarks>
<remarks xml:lang="ja" versionDate="2008-04-05">
<p> 当該文字名はユニコードに従う必要がある．分野が関連するプロジェクト では，データ交換を容易にするため，要素<gi>charName</gi>のリストを
調整し，公開することが望まれる．</p>
</remarks>
<listRef>
<ptr target="#D25-20"/>
</listRef>
--><?xml-model href="http://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
<elementSpec ident="charName" module="gaiji" validUntil="2021-07-09" xml:id="CHARNAME"
xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron">
<desc type="deprecationInfo" versionDate="2020-01-29" xml:lang="en">The use of <gi>charName</gi>
is being replaced by either <gi>unicodeProp</gi>, <gi>unihanProp</gi>, or
<gi>localProp</gi>, likely with a <att>name</att> value of <val>Name</val>.</desc>
<gloss versionDate="2005-01-14" xml:lang="en">character name</gloss>
<gloss versionDate="2007-12-20" xml:lang="ko">문자명</gloss>
<gloss versionDate="2007-05-02" xml:lang="zh-TW">文字名稱</gloss>
<gloss versionDate="2007-06-12" xml:lang="fr">nom de caractère</gloss>
<gloss versionDate="2007-05-04" xml:lang="es">nombre de carácter</gloss>
<gloss versionDate="2007-01-21" xml:lang="it">nome del carattere.</gloss>
<desc versionDate="2005-01-14" xml:lang="en">contains the name of a character, expressed
following Unicode conventions.</desc>
<desc versionDate="2007-12-20" xml:lang="ko">유니코드로 표현된 문자명을 포함한다.</desc>
<desc versionDate="2007-05-02" xml:lang="zh-TW">包含一文字名稱，其表示法根據統一碼協定 (Unicode)。</desc>
<desc versionDate="2008-04-05" xml:lang="ja">当該文字の名前をユニコードに従って示す．</desc>
<desc versionDate="2007-06-12" xml:lang="fr">contient le nom d'un caractère exprimé selon les
conventions de l'Unicode</desc>
<desc versionDate="2007-05-04" xml:lang="es">contiene el nombre de un carácter, expresado según
las convenciones Unicode.</desc>
<desc versionDate="2007-01-21" xml:lang="it">contiene il nome di un carattere, espresso secondo
le convenzioni Unicode.</desc>
<classes>
<memberOf key="att.global"/>
</classes>
<content>
<textNode/>
<!--s:assert> some schematron rules here</s:assert-->
</content>
<exemplum xml:lang="und">
<egXML xmlns="http://www.tei-c.org/ns/Examples"> <charName>CIRCLED IDEOGRAPH 4EBA</charName>
</egXML>
</exemplum>
<exemplum versionDate="2008-04-06" xml:lang="fr">
<egXML xmlns="http://www.tei-c.org/ns/Examples"> <charName>IDEOGRAMME ENCADRE
4EBA</charName> </egXML>
</exemplum>
<remarks versionDate="2005-01-14" xml:lang="en">
<p>The name must follow Unicode conventions for character naming. Projects working in
similar fields are recommended to coordinate and publish their list of
<gi>charName</gi>s to facilitate data exchange.</p>
</remarks>
<remarks versionDate="2007-06-12" xml:lang="fr">
<p>Le nom doit respecter les conventions Unicode pour le nommage des caractères. Il est
recommandé, pour des projets portant sur des champs similaires, de coordonner et de
publier leur liste de <gi>charName</gi>s pour faciliter l'échange de données.</p>
</remarks>
<remarks versionDate="2008-04-05" xml:lang="ja">
<p> 当該文字名はユニコードに従う必要がある．分野が関連するプロジェクト では，データ交換を容易にするため，要素<gi>charName</gi>のリストを
調整し，公開することが望まれる．</p>
</remarks>
<listRef>
<ptr target="#D25-20"/>
</listRef>
</elementSpec>
Loading