[323896] add missing property values
diff --git a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-css2.xml b/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-css2.xml
index a81acbe..3031984 100644
--- a/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-css2.xml
+++ b/bundles/org.eclipse.wst.css.core/cssprofile/cssprofile-css2.xml
@@ -489,6 +489,8 @@
<function name="attr"/>
<keyword name="open-quote"/>
<keyword name="close-quote"/>
+ <keyword name="none"/>
+ <keyword name="normal"/>
<keyword name="no-open-quote"/>
<keyword name="no-close-quote"/>
<keyword name="inherit"/>
@@ -532,6 +534,7 @@
<keyword name="crosshair"/>
<keyword name="default"/>
<keyword name="pointer"/>
+ <keyword name="progress"/>
<keyword name="move"/>
<keyword name="e-resize"/>
<keyword name="ne-resize"/>
@@ -556,6 +559,7 @@
<property-def name="display"
inherited="no" mediagroup="all" category="visual">
<keyword name="inline"/>
+ <keyword name="inline-block"/>
<keyword name="block"/>
<keyword name="list-item"/>
<keyword name="run-in"/>
@@ -1129,6 +1133,8 @@
inherited="yes" mediagroup="visual" category="text">
<keyword name="normal"/>
<keyword name="pre"/>
+ <keyword name="pre-line"/>
+ <keyword name="pre-wrap"/>
<keyword name="nowrap"/>
<keyword name="inherit"/>
</property-def>
@@ -1308,6 +1314,7 @@
<keyword name="maroon"/>
<keyword name="navy"/>
<keyword name="olive"/>
+ <keyword name="orange"/>
<keyword name="purple"/>
<keyword name="red"/>
<keyword name="silver"/>
@@ -1826,6 +1833,9 @@
<keyword-def name="inline">
<keyword-value>inline</keyword-value>
</keyword-def>
+ <keyword-def name="inline-block">
+ <keyword-value>inline-block</keyword-value>
+ </keyword-def>
<keyword-def name="inline-table">
<keyword-value>inline-table</keyword-value>
</keyword-def>
@@ -1988,6 +1998,9 @@
<keyword-def name="open-quote">
<keyword-value>open-quote</keyword-value>
</keyword-def>
+ <keyword-def name="orange">
+ <keyword-value>orange</keyword-value>
+ </keyword-def>
<keyword-def name="outset">
<keyword-value>outset</keyword-value>
</keyword-def>
@@ -2006,6 +2019,15 @@
<keyword-def name="pre">
<keyword-value>pre</keyword-value>
</keyword-def>
+ <keyword-def name="pre-line">
+ <keyword-value>pre-line</keyword-value>
+ </keyword-def>
+ <keyword-def name="pre-wrap">
+ <keyword-value>pre-wrap</keyword-value>
+ </keyword-def>
+ <keyword-def name="progress">
+ <keyword-value>progress</keyword-value>
+ </keyword-def>
<keyword-def name="purple">
<keyword-value>purple</keyword-value>
</keyword-def>
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/IValID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/IValID.java
index f49c1a1..b8600de 100644
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/IValID.java
+++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/IValID.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -116,6 +116,7 @@
public final static String V_INFOBACKGROUND = "InfoBackground"; //$NON-NLS-1$
public final static String V_INFOTEXT = "InfoText"; //$NON-NLS-1$
public final static String V_INLINE = "inline"; //$NON-NLS-1$
+ public final static String V_INLINE_BLOCK = "inline-block"; //$NON-NLS-1$
public final static String V_INLINE_TABLE = "inline-table"; //$NON-NLS-1$
public final static String V_INSET = "inset"; //$NON-NLS-1$
public final static String V_INSIDE = "inside"; //$NON-NLS-1$
@@ -170,12 +171,16 @@
public final static String V_OLIVE = "olive"; //$NON-NLS-1$
public final static String V_ONCE = "once"; //$NON-NLS-1$
public final static String V_OPEN_QUOTE = "open-quote"; //$NON-NLS-1$
+ public final static String V_ORANGE = "orange"; //$NON-NLS-1$
public final static String V_OUTSET = "outset"; //$NON-NLS-1$
public final static String V_OUTSIDE = "outside"; //$NON-NLS-1$
public final static String V_OVERLINE = "overline"; //$NON-NLS-1$
public final static String V_POINTER = "pointer"; //$NON-NLS-1$
public final static String V_PORTRAIT = "portrait"; //$NON-NLS-1$
public final static String V_PRE = "pre"; //$NON-NLS-1$
+ public final static String V_PRE_LINE = "pre-line"; //$NON-NLS-1$
+ public final static String V_PRE_WRAP = "pre-wrap"; //$NON-NLS-1$
+ public final static String V_PROGRESS = "progress"; //$NON-NLS-1$
public final static String V_PURPLE = "purple"; //$NON-NLS-1$
public final static String V_RED = "red"; //$NON-NLS-1$
public final static String V_RELATIVE = "relative"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNode.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNode.java
index 52a84df..d5b96c0 100644
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNode.java
+++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNode.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -389,6 +389,8 @@
prop.appendChild(IValID.V_CLOSE_QUOTE);
prop.appendChild(IValID.V_NO_OPEN_QUOTE);
prop.appendChild(IValID.V_NO_CLOSE_QUOTE);
+ prop.appendChild(IValID.V_NONE);
+ prop.appendChild(IValID.V_NORMAL);
prop.setMaxValueCount(-1); // infinite
prop.appendMediaGroup(IMediaGroupID.M_ALL);
@@ -434,6 +436,7 @@
prop.appendChild(IValID.V_CROSSHAIR);
prop.appendChild(IValID.V_DEFAULT);
prop.appendChild(IValID.V_POINTER);
+ prop.appendChild(IValID.V_PROGRESS);
prop.appendChild(IValID.V_MOVE);
prop.appendChild(IValID.V_E_RESIZE);
prop.appendChild(IValID.V_NE_RESIZE);
@@ -459,6 +462,7 @@
// display
prop = PropCMProperty.getInstanceOf(PropCMProperty.P_DISPLAY);
prop.appendChild(IValID.V_INLINE);
+ prop.appendChild(IValID.V_INLINE_BLOCK);
prop.appendChild(IValID.V_BLOCK);
prop.appendChild(IValID.V_LIST_ITEM);
prop.appendChild(IValID.V_RUN_IN);
@@ -1059,6 +1063,8 @@
prop = PropCMProperty.getInstanceOf(PropCMProperty.P_WHITE_SPACE);
prop.appendChild(IValID.V_NORMAL);
prop.appendChild(IValID.V_PRE);
+ prop.appendChild(IValID.V_PRE_LINE);
+ prop.appendChild(IValID.V_PRE_WRAP);
prop.appendChild(IValID.V_NOWRAP);
prop.appendMediaGroup(IMediaGroupID.M_VISUAL);
@@ -1272,6 +1278,7 @@
cont.appendChild(IValID.V_MAROON);
cont.appendChild(IValID.V_NAVY);
cont.appendChild(IValID.V_OLIVE);
+ cont.appendChild(IValID.V_ORANGE);
cont.appendChild(IValID.V_PURPLE);
cont.appendChild(IValID.V_RED);
cont.appendChild(IValID.V_SILVER);
