Skip to content

Commit b97c4fc

Browse files
committed
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.
1 parent 4d40c5a commit b97c4fc

File tree

5 files changed

+14
-67
lines changed

5 files changed

+14
-67
lines changed

after/syntax/css/css-inline-3.vim

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
" TODO: create cssInlineProp and cssInlineAttr
2-
syn match cssFontProp contained "\<initial-letter\(-align\)\="
3-
syn keyword cssFontAttr contained ideographic
1+
syn match cssFontProp contained "\<\(dominant\|alignment\)-baseline\>"
2+
syn match cssFontProp contained "\<baseline-shift\>"
3+
syn match cssFontProp contained "\<initial-letter\(-\(align\|wrap\)\)\="
4+
syn keyword cssFontAttr contained mathematical ideographic

after/syntax/css/css3-linebox.vim

Lines changed: 0 additions & 16 deletions
This file was deleted.

after/syntax/html.vim

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ syn include @htmlCss syntax/css/css3-content.vim
1010
syn include @htmlCss syntax/css/css3-exclusions.vim
1111
syn include @htmlCss syntax/css/css3-fonts.vim
1212
syn include @htmlCss syntax/css/css3-images.vim
13-
syn include @htmlCss syntax/css/css3-linebox.vim
1413
syn include @htmlCss syntax/css/css3-multicol.vim
1514
syn include @htmlCss syntax/css/css3-page.vim
1615
syn include @htmlCss syntax/css/css3-positioning.vim

test/test.css

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,12 @@
273273
}
274274

275275
.inline {
276-
initial-letter: ideographic;
276+
dominant-baseline: mathematical;
277+
alignment-baseline: ideographic;
278+
baseline-shift: auto;
279+
initial-letter: auto;
277280
initial-letter-align: auto;
281+
initial-letter-wrap: auto;
278282
}
279283

280284
.line-grid {
@@ -285,28 +289,6 @@
285289
display: last-baseline;
286290
}
287291

288-
.linebox {
289-
alignment-adjust: central;
290-
alignment-baseline: mathematical;
291-
baseline-shift: before-edge;
292-
dominate-baseline: after-edge;
293-
drop-initial-after-adjust: text-before-edge;
294-
drop-initial-after-align: text-after-edge;
295-
drop-initial-before-adjust: use-script;
296-
drop-initial-before-align: caps-height;
297-
drop-initial-size: exclude-ruby;
298-
drop-initial-value: include-ruby;
299-
inline-box-align: consider-shift;
300-
line-stacking: disregard-shift;
301-
line-stacking-ruby: inline-line-height;
302-
line-stacking-shift: block-line-height;
303-
line-stacking-strategy: max-height;
304-
text-height: grid-height;
305-
display: font-size;
306-
display: text-size;
307-
display: max-size;
308-
}
309-
310292
.lists::marker {
311293
marker-side: marker;
312294
counter-set: list-container;

test/test.html

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,12 @@
303303
</style>
304304
<style>
305305
.inline {
306-
initial-letter: ideographic;
306+
dominant-baseline: mathematical;
307+
alignment-baseline: ideographic;
308+
baseline-shift: auto;
309+
initial-letter: auto;
307310
initial-letter-align: auto;
311+
initial-letter-wrap: auto;
308312
}
309313
</style>
310314
<style>
@@ -317,29 +321,6 @@
317321
}
318322
</style>
319323
<style>
320-
.linebox {
321-
alignment-adjust: central;
322-
alignment-baseline: mathematical;
323-
baseline-shift: before-edge;
324-
dominate-baseline: after-edge;
325-
drop-initial-after-adjust: text-before-edge;
326-
drop-initial-after-align: text-after-edge;
327-
drop-initial-before-adjust: use-script;
328-
drop-initial-before-align: caps-height;
329-
drop-initial-size: exclude-ruby;
330-
drop-initial-value: include-ruby;
331-
inline-box-align: consider-shift;
332-
line-stacking: disregard-shift;
333-
line-stacking-ruby: inline-line-height;
334-
line-stacking-shift: block-line-height;
335-
line-stacking-strategy: max-height;
336-
text-height: grid-height;
337-
display: font-size;
338-
display: text-size;
339-
display: max-size;
340-
}
341-
</style>
342-
<style>
343324
.lists::marker {
344325
display: auto;
345326
}

0 commit comments

Comments
 (0)