Follow WD-css-inline-3-20150917

See also: http://www.w3.org/TR/2015/WD-css-inline-3-20150917/

This commit also deprecates css3-linebox that I forgot to deprecate.
This commit is contained in:
Kyo Nagashima
2015-09-18 10:12:50 +09:00
parent 4d40c5a3b1
commit b97c4fcd5d
5 changed files with 14 additions and 67 deletions

View File

@@ -1,3 +1,4 @@
" TODO: create cssInlineProp and cssInlineAttr
syn match cssFontProp contained "\<initial-letter\(-align\)\="
syn keyword cssFontAttr contained ideographic
syn match cssFontProp contained "\<\(dominant\|alignment\)-baseline\>"
syn match cssFontProp contained "\<baseline-shift\>"
syn match cssFontProp contained "\<initial-letter\(-\(align\|wrap\)\)\="
syn keyword cssFontAttr contained mathematical ideographic

View File

@@ -1,16 +0,0 @@
" TODO: create cssLineboxProp group and cssLineboxAttr group
syn match cssFontProp contained "\<alignment-\(adjust\|baseline\)\>"
syn match cssFontProp contained "\<baseline-shift\>"
syn match cssFontProp contained "\<dominate-baseline\>"
syn match cssFontProp contained "\<drop-initial-\(after-\(adjust\|align\)\|before-\(adjust\|align\)\|size\|value\)\>"
syn match cssFontProp contained "\<inline-box-align\>"
syn match cssFontProp contained "\<line-stacking\(-\(ruby\|shift\|strategy\)\)\=\>"
syn match cssFontProp contained "\<text-height\>"
syn keyword cssFontAttr contained central mathematical
syn match cssFontAttr contained "\<\(text-\)\=\(before\|after\)-edge\>"
syn match cssFontAttr contained "\<use-script\>"
syn match cssFontAttr contained "\<caps-height\>"
syn match cssFontAttr contained "\<\(exclude\|include\)-ruby\>"
syn match cssFontAttr contained "\<\(consider\|disregard\)-shift\>"
syn match cssFontAttr contained "\<\(\(inline\|block\)-line\|max\|grid\)-height\>"
syn match cssFontAttr contained "\<\(font\|text\|max\)-size\>"

View File

@@ -10,7 +10,6 @@ syn include @htmlCss syntax/css/css3-content.vim
syn include @htmlCss syntax/css/css3-exclusions.vim
syn include @htmlCss syntax/css/css3-fonts.vim
syn include @htmlCss syntax/css/css3-images.vim
syn include @htmlCss syntax/css/css3-linebox.vim
syn include @htmlCss syntax/css/css3-multicol.vim
syn include @htmlCss syntax/css/css3-page.vim
syn include @htmlCss syntax/css/css3-positioning.vim

View File

@@ -273,8 +273,12 @@
}
.inline {
initial-letter: ideographic;
dominant-baseline: mathematical;
alignment-baseline: ideographic;
baseline-shift: auto;
initial-letter: auto;
initial-letter-align: auto;
initial-letter-wrap: auto;
}
.line-grid {
@@ -285,28 +289,6 @@
display: last-baseline;
}
.linebox {
alignment-adjust: central;
alignment-baseline: mathematical;
baseline-shift: before-edge;
dominate-baseline: after-edge;
drop-initial-after-adjust: text-before-edge;
drop-initial-after-align: text-after-edge;
drop-initial-before-adjust: use-script;
drop-initial-before-align: caps-height;
drop-initial-size: exclude-ruby;
drop-initial-value: include-ruby;
inline-box-align: consider-shift;
line-stacking: disregard-shift;
line-stacking-ruby: inline-line-height;
line-stacking-shift: block-line-height;
line-stacking-strategy: max-height;
text-height: grid-height;
display: font-size;
display: text-size;
display: max-size;
}
.lists::marker {
marker-side: marker;
counter-set: list-container;

View File

@@ -303,8 +303,12 @@
</style>
<style>
.inline {
initial-letter: ideographic;
dominant-baseline: mathematical;
alignment-baseline: ideographic;
baseline-shift: auto;
initial-letter: auto;
initial-letter-align: auto;
initial-letter-wrap: auto;
}
</style>
<style>
@@ -317,29 +321,6 @@
}
</style>
<style>
.linebox {
alignment-adjust: central;
alignment-baseline: mathematical;
baseline-shift: before-edge;
dominate-baseline: after-edge;
drop-initial-after-adjust: text-before-edge;
drop-initial-after-align: text-after-edge;
drop-initial-before-adjust: use-script;
drop-initial-before-align: caps-height;
drop-initial-size: exclude-ruby;
drop-initial-value: include-ruby;
inline-box-align: consider-shift;
line-stacking: disregard-shift;
line-stacking-ruby: inline-line-height;
line-stacking-shift: block-line-height;
line-stacking-strategy: max-height;
text-height: grid-height;
display: font-size;
display: text-size;
display: max-size;
}
</style>
<style>
.lists::marker {
display: auto;
}