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

Add tts:display 'inlineBlock' value to schemas; update rnc schemas to… #875

Merged
merged 3 commits into from Jul 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
164 changes: 82 additions & 82 deletions spec/rnc/ttml2-animation.rnc
@@ -1,82 +1,82 @@
# .......................................................................
# TTML2 Animation Module ................................................
# .......................................................................
namespace xlink = "http://www.w3.org/1999/xlink"
# animate reference attribute; must reference /head/animation/{animate,set}
TTAF.animate.attrib
= attribute animate { xsd:IDREFS }?
# animation binding attribute class
TTAF.AnimationBinding.attrib.class &=
TTAF.animate.attrib
# animation - generic animation container
TTAF.animation =
element animation {
TTAF.animation.attlist,
TTAF.animation.content
}
TTAF.animation.attlist &=
TTAF.Core.attrib.class
TTAF.animation.content.extra = empty
TTAF.animation.content =
(TTAF.Metadata.class*,
TTAF.animation.animate*,
TTAF.animation.content.extra*)
# animate - general animation
TTAF.animation.animate =
element animate {
TTAF.animation.animate.attlist,
TTAF.animation.animate.content
}
TTAF.animation.animate.attlist &=
TTAF.Core.attrib.class,
TTAF.Core.Condition.attrib.class,
TTAF.Styled.NoBinding.attrib.class,
TTAF.Timed.attrib.class,
attribute calcMode { TTAF.CalcMode.datatype }?,
attribute fill { TTAF.Fill.datatype }?,
attribute keySplines { TTAF.KeySplines.datatype }?,
attribute keyTimes { TTAF.KeyTimes.datatype }?,
attribute repeatCount { TTAF.RepeatCount.datatype }?
TTAF.animation.animate.content.extra = empty
TTAF.animation.animate.content =
(TTAF.Metadata.class*,
TTAF.animation.animate.content.extra*)
# set - discrete animation
TTAF.animation.set =
element set {
TTAF.animation.set.attlist,
TTAF.animation.set.content
}
TTAF.animation.set.attlist &=
TTAF.Core.attrib.class,
TTAF.Core.Condition.attrib.class,
TTAF.Styled.NoBinding.attrib.class,
TTAF.Timed.attrib.class,
attribute fill { TTAF.Fill.datatype }?,
attribute repeatCount { TTAF.RepeatCount.datatype }?
TTAF.animation.set.content.extra = empty
TTAF.animation.set.content =
(TTAF.Metadata.class*,
TTAF.animation.set.content.extra*)
TTAF.Animation.extra = empty
TTAF.Animation.class |=
TTAF.animation.animate |
TTAF.animation.set |
TTAF.Animation.extra
# .......................................................................
# .......................................................................
# .......................................................................
# .......................................................................
# TTML2 Animation Module ................................................
# .......................................................................

namespace xlink = "http://www.w3.org/1999/xlink"

# animate reference attribute; must reference /head/animation/{animate,set}
TTAF.animate.attrib
= attribute animate { xsd:IDREFS }?

# animation binding attribute class
TTAF.AnimationBinding.attrib.class &=
TTAF.animate.attrib

# animation - generic animation container
TTAF.animation =
element animation {
TTAF.animation.attlist,
TTAF.animation.content
}

TTAF.animation.attlist &=
TTAF.Core.attrib.class

TTAF.animation.content.extra = empty
TTAF.animation.content =
(TTAF.Metadata.class*,
TTAF.animation.animate*,
TTAF.animation.content.extra*)

# animate - general animation
TTAF.animation.animate =
element animate {
TTAF.animation.animate.attlist,
TTAF.animation.animate.content
}

TTAF.animation.animate.attlist &=
TTAF.Core.attrib.class,
TTAF.Core.Condition.attrib.class,
TTAF.Styled.NoBinding.attrib.class,
TTAF.Timed.attrib.class,
attribute calcMode { TTAF.CalcMode.datatype }?,
attribute fill { TTAF.Fill.datatype }?,
attribute keySplines { TTAF.KeySplines.datatype }?,
attribute keyTimes { TTAF.KeyTimes.datatype }?,
attribute repeatCount { TTAF.RepeatCount.datatype }?

TTAF.animation.animate.content.extra = empty
TTAF.animation.animate.content =
(TTAF.Metadata.class*,
TTAF.animation.animate.content.extra*)

# set - discrete animation
TTAF.animation.set =
element set {
TTAF.animation.set.attlist,
TTAF.animation.set.content
}

TTAF.animation.set.attlist &=
TTAF.Core.attrib.class,
TTAF.Core.Condition.attrib.class,
TTAF.Styled.NoBinding.attrib.class,
TTAF.Timed.attrib.class,
attribute fill { TTAF.Fill.datatype }?,
attribute repeatCount { TTAF.RepeatCount.datatype }?

TTAF.animation.set.content.extra = empty
TTAF.animation.set.content =
(TTAF.Metadata.class*,
TTAF.animation.set.content.extra*)

TTAF.Animation.extra = empty
TTAF.Animation.class |=
TTAF.animation.animate |
TTAF.animation.set |
TTAF.Animation.extra

# .......................................................................
# .......................................................................
# .......................................................................
72 changes: 36 additions & 36 deletions spec/rnc/ttml2-audio-attribs.rnc
@@ -1,36 +1,36 @@
# .......................................................................
# TTML2 Styling Attributes Module .......................................
# .......................................................................
namespace tt = "http://www.w3.org/ns/ttml"
namespace tta = "http://www.w3.org/ns/ttml#audio"
namespace local = ""
# Standard Audio Attributes
TTAF.gain.attrib
= attribute tta:gain { TTAF.Gain.datatype }?
TTAF.pan.attrib
= attribute tta:pan { TTAF.Pan.datatype }?
TTAF.pitch.attrib
= attribute tta:pitch { TTAF.Pitch.datatype }?
TTAF.speak.attrib
= attribute tta:speak { TTAF.Speak.datatype }?
# Audio Attribute Class
TTAF.AudioEmbedded.attrib.class &=
TTAF.gain.attrib,
TTAF.pan.attrib
# Content audio attribute Class
TTAF.Audio.attrib.class &=
TTAF.gain.attrib,
TTAF.pan.attrib,
TTAF.pitch.attrib,
TTAF.speak.attrib
# .......................................................................
# .......................................................................
# .......................................................................
# .......................................................................
# TTML2 Styling Attributes Module .......................................
# .......................................................................

namespace tt = "http://www.w3.org/ns/ttml"
namespace tta = "http://www.w3.org/ns/ttml#audio"
namespace local = ""

# Standard Audio Attributes

TTAF.gain.attrib
= attribute tta:gain { TTAF.Gain.datatype }?
TTAF.pan.attrib
= attribute tta:pan { TTAF.Pan.datatype }?
TTAF.pitch.attrib
= attribute tta:pitch { TTAF.Pitch.datatype }?
TTAF.speak.attrib
= attribute tta:speak { TTAF.Speak.datatype }?

# Audio Attribute Class

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

# Content audio attribute Class

TTAF.Audio.attrib.class &=
TTAF.gain.attrib,
TTAF.pan.attrib,
TTAF.pitch.attrib,
TTAF.speak.attrib

# .......................................................................
# .......................................................................
# .......................................................................
66 changes: 33 additions & 33 deletions spec/rnc/ttml2-classes.rnc
@@ -1,33 +1,33 @@
# .......................................................................
# TTML2 Class Declarations Module .......................................
# .......................................................................
# attribute group classes
TTAF.Core.attrib.class = empty
TTAF.Core.Condition.attrib.class = empty
TTAF.Metadata.attrib.class = empty
TTAF.Parameter.attrib.class = empty
TTAF.RegionBinding.attrib.class = empty
TTAF.StyleBinding.attrib.class = empty
TTAF.Styled.attrib.class = empty
TTAF.Styled.NoBinding.attrib.class = empty
TTAF.Styling.attrib.class = empty
TTAF.Timed.attrib.class = empty
TTAF.TimedContainer.attrib.class = empty
TTAF.TimingInterval.attrib.class = empty
# element group classes
TTAF.Animation.class = empty
TTAF.Block.class = empty
TTAF.BlockNoDiv.class = empty
TTAF.BlockOrEmbedded.class = empty
TTAF.Inline.class = empty
TTAF.InlineNoSpan.class = empty
TTAF.InlineOrEmbedded.class = empty
TTAF.MetadataNoAgent.class = empty
TTAF.Metadata.class = empty
TTAF.MetadataItems.class = empty
# .......................................................................
# .......................................................................
# .......................................................................
# .......................................................................
# TTML2 Class Declarations Module .......................................
# .......................................................................

# attribute group classes
TTAF.Core.attrib.class = empty
TTAF.Core.Condition.attrib.class = empty
TTAF.Metadata.attrib.class = empty
TTAF.Parameter.attrib.class = empty
TTAF.RegionBinding.attrib.class = empty
TTAF.StyleBinding.attrib.class = empty
TTAF.Styled.attrib.class = empty
TTAF.Styled.NoBinding.attrib.class = empty
TTAF.Styling.attrib.class = empty
TTAF.Timed.attrib.class = empty
TTAF.TimedContainer.attrib.class = empty
TTAF.TimingInterval.attrib.class = empty

# element group classes
TTAF.Animation.class = empty
TTAF.Block.class = empty
TTAF.BlockNoDiv.class = empty
TTAF.BlockOrEmbedded.class = empty
TTAF.Inline.class = empty
TTAF.InlineNoSpan.class = empty
TTAF.InlineOrEmbedded.class = empty
TTAF.MetadataNoAgent.class = empty
TTAF.Metadata.class = empty
TTAF.MetadataItems.class = empty

# .......................................................................
# .......................................................................
# .......................................................................