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

Ensure audio styles are defined on style element (#941). #942

Merged
merged 2 commits into from
Aug 2, 2018
Merged

Ensure audio styles are defined on style element (#941). #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b52df4
Ensure audio styles are defined on style element (#941).
skynavga Jul 30, 2018
ec2af85
Merge branch 'master' into issue-0941-audio-styles
skynavga Aug 2, 2018
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
10 changes: 2 additions & 8 deletions spec/rnc/ttml2-audio-attribs.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,9 @@ TTAF.pitch.attrib
TTAF.speak.attrib
= attribute tta:speak { TTAF.Speak.datatype }?

# Audio Attribute Class
# Audio Styling Attribute Class

TTAF.AudioEmbedded.attrib.class &=
TTAF.gain.attrib,
TTAF.pan.attrib

# Content audio attribute Class

TTAF.Audio.attrib.class &=
TTAF.Styling.Audio.attrib.class &=
TTAF.gain.attrib,
TTAF.pan.attrib,
TTAF.pitch.attrib,
Expand Down
4 changes: 0 additions & 4 deletions spec/rnc/ttml2-content.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ TTAF.body.attlist &=
TTAF.AnimationBinding.attrib.class,
TTAF.RegionBinding.attrib.class,
TTAF.Styled.attrib.class,
TTAF.Audio.attrib.class,
TTAF.TimedContainer.attrib.class

TTAF.body.content.extra = empty
Expand All @@ -39,7 +38,6 @@ TTAF.div.attlist &=
TTAF.AnimationBinding.attrib.class,
TTAF.RegionBinding.attrib.class,
TTAF.Styled.attrib.class,
TTAF.Audio.attrib.class,
TTAF.TimedContainer.attrib.class

TTAF.div.content.extra = empty
Expand All @@ -63,7 +61,6 @@ TTAF.p.attlist &=
TTAF.AnimationBinding.attrib.class,
TTAF.RegionBinding.attrib.class,
TTAF.Styled.attrib.class,
TTAF.Audio.attrib.class,
TTAF.TimedContainer.attrib.class

TTAF.p.content.extra = empty
Expand All @@ -88,7 +85,6 @@ TTAF.span.attlist &=
TTAF.AnimationBinding.attrib.class,
TTAF.RegionBinding.attrib.class,
TTAF.Styled.attrib.class,
TTAF.Audio.attrib.class,
TTAF.TimedContainer.attrib.class,
TTAF.XLink.attrib.class

Expand Down
1 change: 0 additions & 1 deletion spec/rnc/ttml2-embedded.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ TTAF.audio =

TTAF.audio.attlist &=
TTAF.AnimationBinding.attrib.class,
TTAF.AudioEmbedded.attrib.class,
TTAF.Core.attrib.class,
TTAF.Core.Condition.attrib.class,
TTAF.Data.attrib.class,
Expand Down
20 changes: 0 additions & 20 deletions spec/rnc/ttml2-styling-attribs.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,26 +166,6 @@ TTAF.Styling.attrib.class &=
TTAF.writingMode.attrib,
TTAF.zIndex.attrib

# Style Binding Attribute Class

TTAF.StyleBinding.attrib.class &=
TTAF.style.attrib

# Styled Content Attribute Class

TTAF.Styled.extra.attrib = empty
TTAF.Styled.attrib.class &=
TTAF.Styling.attrib.class,
TTAF.StyleBinding.attrib.class,
TTAF.Styled.extra.attrib

# Styled Content without Binding Attribute Class

TTAF.Styled.NoBinding.extra.attrib = empty
TTAF.Styled.NoBinding.attrib.class &=
TTAF.Styling.attrib.class,
TTAF.Styled.extra.attrib

# .......................................................................
# .......................................................................
# .......................................................................
22 changes: 22 additions & 0 deletions spec/rnc/ttml2-styling.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,28 @@ TTAF.styling.defs.class =
TTAF.styling.style
| TTAF.styling.defs.extra

# Style Binding Attribute Class

TTAF.StyleBinding.attrib.class &=
TTAF.style.attrib

# Styled Content Attribute Class

TTAF.Styled.extra.attrib = empty
TTAF.Styled.attrib.class &=
TTAF.Styling.attrib.class,
TTAF.Styling.Audio.attrib.class,
TTAF.StyleBinding.attrib.class,
TTAF.Styled.extra.attrib

# Styled Content without Binding Attribute Class

TTAF.Styled.NoBinding.extra.attrib = empty
TTAF.Styled.NoBinding.attrib.class &=
TTAF.Styling.attrib.class,
TTAF.Styling.Audio.attrib.class,
TTAF.Styled.extra.attrib

# .......................................................................
# .......................................................................
# .......................................................................
6 changes: 1 addition & 5 deletions spec/xsd/ttml2-audio-attribs.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,10 @@
<xs:attribute name="pan" type="ttd:pan"/>
<xs:attribute name="pitch" type="ttd:pitch"/>
<xs:attribute name="speak" type="ttd:speak"/>
<xs:attributeGroup name="Audio.content.attrib.class">
<xs:attributeGroup name="Styling.Audio.attrib.class">
<xs:attribute ref="tta:gain"/>
<xs:attribute ref="tta:pan"/>
<xs:attribute ref="tta:pitch"/>
<xs:attribute ref="tta:speak"/>
</xs:attributeGroup>
<xs:attributeGroup name="Audio.audio.attrib.class">
<xs:attribute ref="tta:gain"/>
<xs:attribute ref="tta:pan"/>
</xs:attributeGroup>
</xs:schema>
9 changes: 0 additions & 9 deletions spec/xsd/ttml2-content.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
xmlns:tt="http://www.w3.org/ns/ttml"
xmlns:ttm="http://www.w3.org/ns/ttml#metadata"
xmlns:tts="http://www.w3.org/ns/ttml#styling"
xmlns:tta="http://www.w3.org/ns/ttml#audio"
xmlns:xlink="http://www.w3.org/1999/xlink">
<xs:include schemaLocation="ttml2-core-attribs.xsd"/>
<xs:include schemaLocation="ttml2-timing-attribs.xsd"/>
Expand All @@ -15,12 +14,8 @@
<xs:include schemaLocation="ttml2-styling.xsd"/>
<xs:import namespace="http://www.w3.org/ns/ttml#metadata"
schemaLocation="ttml2-metadata-attribs.xsd"/>
<xs:import namespace="http://www.w3.org/ns/ttml#audio"
schemaLocation="ttml2-audio-attribs.xsd"/>
<xs:import namespace="http://www.w3.org/1999/xlink"
schemaLocation="xlink.xsd"/>
<xs:import namespace="http://www.w3.org/ns/ttml#audio"
schemaLocation="ttml2-audio-attribs.xsd"/>
<xs:attributeGroup name="body.attlist">
<xs:attributeGroup ref="tt:Core.attrib.class"/>
<xs:attributeGroup ref="tt:Core.Condition.attrib.class"/>
Expand All @@ -29,7 +24,6 @@
<xs:attributeGroup ref="tt:RegionBinding.attrib.class"/>
<xs:attributeGroup ref="tt:Styled.attrib.class"/>
<xs:attributeGroup ref="ttm:Metadata.attrib.class"/>
<xs:attributeGroup ref="tta:Audio.content.attrib.class"/>
</xs:attributeGroup>
<xs:attributeGroup name="div.attlist">
<xs:attributeGroup ref="tt:Core.attrib.class"/>
Expand All @@ -39,7 +33,6 @@
<xs:attributeGroup ref="tt:RegionBinding.attrib.class"/>
<xs:attributeGroup ref="tt:Styled.attrib.class"/>
<xs:attributeGroup ref="ttm:Metadata.attrib.class"/>
<xs:attributeGroup ref="tta:Audio.content.attrib.class"/>
</xs:attributeGroup>
<xs:attributeGroup name="p.attlist">
<xs:attributeGroup ref="tt:Core.attrib.class"/>
Expand All @@ -49,7 +42,6 @@
<xs:attributeGroup ref="tt:RegionBinding.attrib.class"/>
<xs:attributeGroup ref="tt:Styled.attrib.class"/>
<xs:attributeGroup ref="ttm:Metadata.attrib.class"/>
<xs:attributeGroup ref="tta:Audio.content.attrib.class"/>
</xs:attributeGroup>
<xs:attributeGroup name="span.attlist">
<xs:attributeGroup ref="tt:Core.attrib.class"/>
Expand All @@ -58,7 +50,6 @@
<xs:attributeGroup ref="tt:AnimationBinding.attrib.class"/>
<xs:attributeGroup ref="tt:RegionBinding.attrib.class"/>
<xs:attributeGroup ref="tt:Styled.attrib.class"/>
<xs:attributeGroup ref="tta:Audio.content.attrib.class"/>
<xs:attributeGroup ref="ttm:Metadata.attrib.class"/>
<xs:attributeGroup ref="xlink:simpleAttrs"/>
</xs:attributeGroup>
Expand Down
4 changes: 0 additions & 4 deletions spec/xsd/ttml2-embedded.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@
xmlns:tt="http://www.w3.org/ns/ttml"
xmlns:ttd="http://www.w3.org/ns/ttml#datatype"
xmlns:ttm="http://www.w3.org/ns/ttml#metadata"
xmlns:tta="http://www.w3.org/ns/ttml#audio"
xmlns:xlink="http://www.w3.org/1999/xlink">
<xs:include schemaLocation="ttml2-core-attribs.xsd"/>
<xs:include schemaLocation="ttml2-metadata.xsd"/>
<xs:import namespace="http://www.w3.org/ns/ttml#metadata"
schemaLocation="ttml2-metadata-attribs.xsd"/>
<xs:import namespace="http://www.w3.org/ns/ttml#datatype"
schemaLocation="ttml2-datatypes.xsd"/>
<xs:import namespace="http://www.w3.org/ns/ttml#audio"
schemaLocation="ttml2-audio-attribs.xsd"/>
<xs:import namespace="http://www.w3.org/1999/xlink"
schemaLocation="xlink.xsd"/>
<xs:attributeGroup name="audio.attlist">
Expand All @@ -23,7 +20,6 @@
<xs:attributeGroup ref="tt:Styled.attrib.class"/>
<xs:attributeGroup ref="tt:TimedContainer.attrib.class"/>
<xs:attributeGroup ref="ttm:Metadata.attrib.class"/>
<xs:attributeGroup ref="tta:Audio.audio.attrib.class"/>
<xs:attribute name="clipBegin" type="ttd:timeCoordinate"/>
<xs:attribute name="clipEnd" type="ttd:timeCoordinate"/>
<xs:attribute name="src" type="ttd:dataSource"/>
Expand Down
7 changes: 6 additions & 1 deletion spec/xsd/ttml2-styling.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,25 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tt="http://www.w3.org/ns/ttml"
xmlns:ttm="http://www.w3.org/ns/ttml#metadata"
xmlns:tts="http://www.w3.org/ns/ttml#styling">
xmlns:tts="http://www.w3.org/ns/ttml#styling"
xmlns:tta="http://www.w3.org/ns/ttml#audio">
<xs:include schemaLocation="ttml2-core-attribs.xsd"/>
<xs:include schemaLocation="ttml2-metadata.xsd"/>
<xs:import namespace="http://www.w3.org/ns/ttml#styling"
schemaLocation="ttml2-styling-attribs.xsd"/>
<xs:import namespace="http://www.w3.org/ns/ttml#audio"
schemaLocation="ttml2-audio-attribs.xsd"/>
<xs:attributeGroup name="StyleBinding.attrib.class">
<xs:attribute name="style" type="xs:IDREFS"/>
</xs:attributeGroup>
<xs:attributeGroup name="Styled.attrib.class">
<xs:attributeGroup ref="tt:StyleBinding.attrib.class"/>
<xs:attributeGroup ref="tts:Styling.attrib.class"/>
<xs:attributeGroup ref="tta:Styling.Audio.attrib.class"/>
</xs:attributeGroup>
<xs:attributeGroup name="Styled.NoBinding.attrib.class">
<xs:attributeGroup ref="tts:Styling.attrib.class"/>
<xs:attributeGroup ref="tta:Styling.Audio.attrib.class"/>
</xs:attributeGroup>
<xs:attributeGroup name="styling.attlist">
<xs:attributeGroup ref="tt:Core.attrib.class"/>
Expand Down